From 49aaab45e55d3c592cf573c56e8d7a3fcd2c5e59 Mon Sep 17 00:00:00 2001
From: Frank Yan <fyan@mozilla.com>
Date: Tue, 12 Apr 2011 20:54:26 -0700
Subject: [PATCH 001/509] Bug 502892 - disable non-functional html5 audio
 volume slider. r=dolske

---
 toolkit/content/widgets/videocontrols.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index 6811f9b6d509..de2504ad7c3c 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -934,10 +934,12 @@
                     var self = this;
                     this.muteButton.addEventListener("command", function() { self.toggleMute(); }, false);
                     this.playButton.addEventListener("command", function() { self.togglePause(); }, false);
-                    this.muteButton.addEventListener("mouseover",  function(e) { self.onVolumeMouseInOut(e); }, false);
-                    this.muteButton.addEventListener("mouseout",   function(e) { self.onVolumeMouseInOut(e); }, false);
-                    this.volumeStack.addEventListener("mouseover", function(e) { self.onVolumeMouseInOut(e); }, false);
-                    this.volumeStack.addEventListener("mouseout",  function(e) { self.onVolumeMouseInOut(e); }, false);
+                    if (!this.isAudioOnly) {
+                      this.muteButton.addEventListener("mouseover",  function(e) { self.onVolumeMouseInOut(e); }, false);
+                      this.muteButton.addEventListener("mouseout",   function(e) { self.onVolumeMouseInOut(e); }, false);
+                      this.volumeStack.addEventListener("mouseover", function(e) { self.onVolumeMouseInOut(e); }, false);
+                      this.volumeStack.addEventListener("mouseout",  function(e) { self.onVolumeMouseInOut(e); }, false);
+                    }
 
                     this.videocontrols.addEventListener("transitionend", function(e) { self.onTransitionEnd(e); }, false);
 

From 703daa24142b9e6aeda1b290be320a0d03b2e9b8 Mon Sep 17 00:00:00 2001
From: Frank Yan <fyan@mozilla.com>
Date: Tue, 12 Apr 2011 20:54:26 -0700
Subject: [PATCH 002/509] Bug 603646 - part 1: disable undo close tab when no
 browser window is active. r=dao

---
 browser/base/content/browser-sets.inc | 2 ++
 browser/base/content/browser.xul      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index ff0d083164c8..19a212a0774b 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -356,7 +356,9 @@
     <key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/>
 #endif
 
+#ifdef FULL_BROWSER_WINDOW
     <key id="key_undoCloseTab" command="History:UndoCloseTab" key="&tabCmd.commandkey;" modifiers="accel,shift"/>
+#endif
     <key id="key_undoCloseWindow" command="History:UndoCloseWindow" key="&newNavigatorCmd.key;" modifiers="accel,shift"/>
 
 #ifdef XP_GNOME
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7788534ee5bd..2b395a7059a9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -107,7 +107,9 @@
 
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
 # browser-sets.inc file for sharing with hiddenWindow.xul.
+#define FULL_BROWSER_WINDOW
 #include browser-sets.inc
+#undef FULL_BROWSER_WINDOW
 
   <popupset id="mainPopupSet">
     <menupopup id="tabContextMenu"

From 1267fd5fd15da012052a7b3e5f77567d001f946e Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 12 Apr 2011 23:33:01 -0700
Subject: [PATCH 003/509] Bug 641352 - Add
 nsHTMLTextAreaElement::IsValueEmpty() const. r=bz

---
 .../content/src/nsHTMLTextAreaElement.cpp     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 1aae5adcc7b2..6271080e8fed 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -295,6 +295,13 @@ protected:
    * Get the mutable state of the element.
    */
   PRBool IsMutable() const;
+
+  /**
+   * Returns whether the current value is the empty string.
+   *
+   * @return whether the current value is the empty string.
+   */
+  bool IsValueEmpty() const;
 };
 
 
@@ -1086,12 +1093,9 @@ nsHTMLTextAreaElement::IntrinsicState() const
   }
 
   if (HasAttr(kNameSpaceID_None, nsGkAtoms::placeholder) &&
-      !nsContentUtils::IsFocusedContent((nsIContent*)(this))) {
-    nsAutoString value;
-    GetValueInternal(value, PR_TRUE);
-    if (value.IsEmpty()) {
-      state |= NS_EVENT_STATE_MOZ_PLACEHOLDER;
-    }
+      !nsContentUtils::IsFocusedContent((nsIContent*)(this)) &&
+      IsValueEmpty()) {
+    state |= NS_EVENT_STATE_MOZ_PLACEHOLDER;
   }
 
   return state;
@@ -1250,6 +1254,15 @@ nsHTMLTextAreaElement::IsMutable() const
   return (!HasAttr(kNameSpaceID_None, nsGkAtoms::readonly) && !IsDisabled());
 }
 
+bool
+nsHTMLTextAreaElement::IsValueEmpty() const
+{
+  nsAutoString value;
+  GetValueInternal(value, PR_TRUE);
+
+  return value.IsEmpty();
+}
+
 // nsIConstraintValidation
 
 NS_IMETHODIMP
@@ -1297,10 +1310,7 @@ nsHTMLTextAreaElement::IsValueMissing() const
     return PR_FALSE;
   }
 
-  nsAutoString value;
-  GetValueInternal(value, PR_TRUE);
-
-  return value.IsEmpty();
+  return IsValueEmpty();
 }
 
 void

From d22c04efbe25a7d8e7cd0e91d838fef312658c0f Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 12 Apr 2011 23:34:02 -0700
Subject: [PATCH 004/509] Bug 519592 - Attempt to fix intermittent failure in
 content/html/content/test/test_bug514856.html. r=ehsan

---
 .../html/content/test/bug514856_iframe.html   |  2 +-
 content/html/content/test/test_bug514856.html | 46 +++++++++++--------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/content/html/content/test/bug514856_iframe.html b/content/html/content/test/bug514856_iframe.html
index 2791923b2016..2abf9e91e24e 100644
--- a/content/html/content/test/bug514856_iframe.html
+++ b/content/html/content/test/bug514856_iframe.html
@@ -14,7 +14,7 @@
   </head>
   <body>
     <a href="bug514856_iframe.html">
-      <img ismap="ismap" onclick="parent.clearTimeout(parent.timer);"
+      <img ismap="ismap"
            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9YGARc5KB0XV+IAAAAddEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q72QlbgAAAF1JREFUGNO9zL0NglAAxPEfdLTs4BZM4DIO4C7OwQg2JoQ9LE1exdlYvBBeZ7jqch9//q1uH4TLzw4d6+ErXMMcXuHWxId3KOETnnXXV6MJpcq2MLaI97CER3N0vr4MkhoXe0rZigAAAABJRU5ErkJggg==">
     </a>
   </body>
diff --git a/content/html/content/test/test_bug514856.html b/content/html/content/test/test_bug514856.html
index 7ce8462ff1c9..e917bfe01692 100644
--- a/content/html/content/test/test_bug514856.html
+++ b/content/html/content/test/test_bug514856.html
@@ -7,41 +7,45 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=514856
   <title>Test for Bug 514856</title>
   <script type="application/javascript" src="/MochiKit/packed.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTest()">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=514856">Mozilla Bug 514856</a>
 <p id="display"></p>
-<div id="content" style="display: none">
-  
+<div id="content">
+  <iframe id="testFrame" src="bug514856_iframe.html"></iframe>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 514856 **/
 
-SimpleTest.waitForExplicitFinish();
-
-var timer;
-
-function runTest() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+function beginTest() {
   var ifr = document.getElementById("testFrame");
-  ifr.setAttribute("onload", "testDone();");
-  // Retry until everything in the iframe is ready for the click. 
-  timer = setTimeout("runTest()", 10);
-  var wu = ifr.contentWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                            .getInterface(Components.interfaces.nsIDOMWindowUtils);
-  wu.sendMouseEvent("mousemove", 10, 10, 0, 0, 0);
-  wu.sendMouseEvent("mousemove", 12, 12, 0, 0, 0);
-  wu.sendMouseEvent("mousemove", 14, 14, 0, 0, 0);
-  wu.sendMouseEvent("mousedown", 16, 16, 0, 1, 0);
-  wu.sendMouseEvent("mouseup", 16, 16, 0, 1, 0);
+  var win = ifr.contentWindow;
+
+  // After the click, the load event should be fired.
+  ifr.addEventListener('load', function() {
+    testDone();
+  }, false);
+
+  // synthesizeMouse adds getBoundingClientRect left and top to the offsets but
+  // in that particular case, we don't want that.
+  var rect = ifr.getBoundingClientRect();
+  var left = rect.left;
+  var top = rect.top;
+
+  synthesizeMouse(ifr, 10 - left, 10 - top, { type: "mousemove" }, win);
+  synthesizeMouse(ifr, 12 - left, 12 - top, { type: "mousemove" }, win);
+  synthesizeMouse(ifr, 14 - left, 14 - top, { type: "mousemove" }, win);
+  synthesizeMouse(ifr, 16 - left, 16 - top, { }, win);
 }
 
 function testDone() {
   var ifr = document.getElementById("testFrame");
   var url = new String(ifr.contentWindow.location);
+
   is(url.indexOf("?10,10"), -1, "Shouldn't have ?10,10 in the URL!");
   is(url.indexOf("?12,12"), -1, "Shouldn't have ?12,12 in the URL!");
   is(url.indexOf("?14,14"), -1, "Shouldn't have ?14,14 in the URL!");
@@ -49,8 +53,10 @@ function testDone() {
   SimpleTest.finish();
 }
 
+SimpleTest.waitForExplicitFinish();
+SimpleTest.waitForFocus(beginTest);
+
 </script>
 </pre>
-<iframe id="testFrame" src="bug514856_iframe.html"></iframe>
 </body>
 </html>

From 5fd52f20d08405bf7f70173f101880bb25755fbc Mon Sep 17 00:00:00 2001
From: Christian Legnitto <clegnitto@mozilla.com>
Date: Tue, 12 Apr 2011 23:43:18 -0700
Subject: [PATCH 005/509] Bug 649373 - Remove PRE_RELEASE_SUFFIX. This is a
 wallpaper. r=rstrong, a=LegNeato

---
 browser/base/Makefile.in                  | 3 +--
 browser/installer/windows/Makefile.in     | 2 +-
 toolkit/mozapps/installer/package-name.mk | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 9315f2a50f42..0031e91c7588 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -62,8 +62,7 @@ EXTRA_JS_MODULES = \
 
 include $(topsrcdir)/config/rules.mk
 
-PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py \
-                        $(shell cat $(srcdir)/../config/version.txt))
+PRE_RELEASE_SUFFIX := ""
 
 DEFINES += \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index 2cad3d917699..7e41aea1bbaf 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -51,7 +51,7 @@ CONFIG_DIR = instgen
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
 APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt)
 DEFINES += -DAPP_VERSION=$(APP_VERSION)
-PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/config/printprereleasesuffix.py $(APP_VERSION))
+PRE_RELEASE_SUFFIX := ""
 DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
 
 INSTALLER_FILES = \
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index e25835a017ba..5b9870ce1519 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -112,10 +112,7 @@ MOZ_PKG_APPNAME_LC = $(shell echo $(MOZ_PKG_APPNAME) | tr '[A-Z]' '[a-z]')
 
 
 ifndef MOZ_PKG_LONGVERSION
-MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION) |\
-                       sed -e 's/a\([0-9][0-9]*\)$$/ Alpha \1/' |\
-                       sed -e 's/b\([0-9][0-9]*\)$$/ Beta \1/' |\
-                       sed -e 's/rc\([0-9][0-9]*\)$$/ RC \1/')
+MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION))
 endif
 
 ifeq (,$(filter-out Darwin OS2, $(OS_ARCH))) # Mac and OS2

From 3d078b9b8aa4837886db6b6717ea2180e552e893 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Wed, 13 Apr 2011 00:26:20 -0700
Subject: [PATCH 006/509] Bug 638067 - 'IndexedDB: Inserting data with multiple
 indexes on an autoIncrement object store throws an error'. r=sdwilsh.

---
 dom/indexedDB/IDBObjectStore.cpp              | 23 +++---
 dom/indexedDB/IDBTransaction.cpp              | 16 ++---
 dom/indexedDB/test/Makefile.in                |  1 +
 .../test/test_autoIncrement_indexes.html      | 71 +++++++++++++++++++
 4 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 dom/indexedDB/test/test_autoIncrement_indexes.html

diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index fa15e43a5dfb..0179e4626bdb 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -737,18 +737,21 @@ IDBObjectStore::UpdateIndexes(IDBTransaction* aTransaction,
                                aObjectDataId);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    NS_NAMED_LITERAL_CSTRING(objectDataKey, "object_data_key");
+    if (!updateInfo.info.autoIncrement) {
+      NS_NAMED_LITERAL_CSTRING(objectDataKey, "object_data_key");
 
-    if (aObjectStoreKey.IsInt()) {
-      rv = stmt->BindInt64ByName(objectDataKey, aObjectStoreKey.IntValue());
+      if (aObjectStoreKey.IsInt()) {
+        rv = stmt->BindInt64ByName(objectDataKey, aObjectStoreKey.IntValue());
+      }
+      else if (aObjectStoreKey.IsString()) {
+        rv = stmt->BindStringByName(objectDataKey,
+                                    aObjectStoreKey.StringValue());
+      }
+      else {
+        NS_NOTREACHED("Unknown key type!");
+      }
+      NS_ENSURE_SUCCESS(rv, rv);
     }
-    else if (aObjectStoreKey.IsString()) {
-      rv = stmt->BindStringByName(objectDataKey, aObjectStoreKey.StringValue());
-    }
-    else {
-      NS_NOTREACHED("Unknown key type!");
-    }
-    NS_ENSURE_SUCCESS(rv, rv);
 
     NS_NAMED_LITERAL_CSTRING(value, "value");
 
diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
index a9ba232e90f7..0817b75b154d 100644
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -479,27 +479,27 @@ IDBTransaction::IndexUpdateStatement(bool aAutoIncrement,
       if (aOverwrite) {
         return GetCachedStatement(
           "INSERT OR REPLACE INTO ai_unique_index_data "
-            "(index_id, ai_object_data_id, id, value) "
-          "VALUES (:index_id, :object_data_id, :object_data_key, :value)"
+            "(index_id, ai_object_data_id, value) "
+          "VALUES (:index_id, :object_data_id, :value)"
         );
       }
       return GetCachedStatement(
         "INSERT INTO ai_unique_index_data "
-          "(index_id, aI_object_data_id, id, value) "
-        "VALUES (:index_id, :object_data_id, :object_data_key, :value)"
+          "(index_id, aI_object_data_id, value) "
+        "VALUES (:index_id, :object_data_id, :value)"
       );
     }
     if (aOverwrite) {
       return GetCachedStatement(
         "INSERT OR REPLACE INTO ai_index_data "
-          "(index_id, ai_object_data_id, id, value) "
-        "VALUES (:index_id, :object_data_id, :object_data_key, :value)"
+          "(index_id, ai_object_data_id, value) "
+        "VALUES (:index_id, :object_data_id, :value)"
       );
     }
     return GetCachedStatement(
       "INSERT INTO ai_index_data "
-        "(index_id, ai_object_data_id, id, value) "
-      "VALUES (:index_id, :object_data_id, :object_data_key, :value)"
+        "(index_id, ai_object_data_id, value) "
+      "VALUES (:index_id, :object_data_id, :value)"
     );
   }
   if (aUnique) {
diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in
index 88596f94b925..555fbeaf93fd 100644
--- a/dom/indexedDB/test/Makefile.in
+++ b/dom/indexedDB/test/Makefile.in
@@ -53,6 +53,7 @@ TEST_FILES = \
   helpers.js \
   leaving_page_iframe.html \
   test_add_twice_failure.html \
+  test_autoIncrement_indexes.html \
   test_bad_keypath.html \
   test_bfcache.html \
   test_clear.html \
diff --git a/dom/indexedDB/test/test_autoIncrement_indexes.html b/dom/indexedDB/test/test_autoIncrement_indexes.html
new file mode 100644
index 000000000000..83afb1630fda
--- /dev/null
+++ b/dom/indexedDB/test/test_autoIncrement_indexes.html
@@ -0,0 +1,71 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>Indexed Database Property Test</title>
+
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7">
+    function testSteps()
+    {
+      let request = mozIndexedDB.open(window.location.pathname);
+      request.onerror = errorHandler;
+      request.onsuccess = grabEventAndContinueHandler;
+      let event = yield;
+
+      let db = request.result;
+      db.onerror = errorHandler;
+
+      db.setVersion("1").onsuccess = grabEventAndContinueHandler;
+      let event = yield;
+
+      let objectStore = db.createObjectStore("foo", { keyPath: "id",
+                                                      autoIncrement: true });
+      objectStore.createIndex("first","first");
+      objectStore.createIndex("second","second");
+      objectStore.createIndex("third","third");
+
+      let data = { first: "foo", second: "foo", third: "foo" };
+
+      objectStore.add(data).onsuccess = grabEventAndContinueHandler;
+      event = yield;
+
+      let key = event.target.result;
+      ok(key, "Added entry");
+
+      let objectStore = db.transaction("foo").objectStore("foo");
+      let first = objectStore.index("first");
+      let second = objectStore.index("second");
+      let third = objectStore.index("third");
+
+      first.get("foo").onsuccess = grabEventAndContinueHandler;
+      event = yield;
+
+      is (event.target.result.id, key, "Entry in first");
+
+      second.get("foo").onsuccess = grabEventAndContinueHandler;
+      event = yield;
+
+      is (event.target.result.id, key, "Entry in second");
+
+      third.get("foo").onsuccess = grabEventAndContinueHandler;
+      event = yield;
+
+      is (event.target.result.id, key, "Entry in third");
+
+      finishTest();
+      yield;
+    }
+  </script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+
+</head>
+
+<body onload="runTest();"></body>
+
+</html>

From b10116e2f8ffba74dc4f7bf7458acb9b1b515724 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 13 Apr 2011 08:28:34 +0100
Subject: [PATCH 007/509] bug 636957 - ensure DWrite font list is initialized
 in GetFontFamilyList(). r=jdaggett

---
 gfx/thebes/gfxDWriteFontList.cpp | 11 +++++++++++
 gfx/thebes/gfxDWriteFontList.h   |  2 ++
 gfx/thebes/gfxPlatformFontList.h |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 66dc00fe5d01..cee077d3482a 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1102,6 +1102,17 @@ gfxFontFamily* gfxDWriteFontList::FindFamily(const nsAString& aFamily)
     return gfxPlatformFontList::FindFamily(aFamily);
 }
 
+void
+gfxDWriteFontList::GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray)
+{
+    if (!mInitialized) {
+        mInitialized = PR_TRUE;
+        DelayedInitFontList();
+    }
+
+    return gfxPlatformFontList::GetFontFamilyList(aFamilyArray);
+}
+
 PRBool 
 gfxDWriteFontList::ResolveFontName(const nsAString& aFontName,
                                    nsAString& aResolvedFontName)
diff --git a/gfx/thebes/gfxDWriteFontList.h b/gfx/thebes/gfxDWriteFontList.h
index fa9cb0609ace..ed2d309f8841 100644
--- a/gfx/thebes/gfxDWriteFontList.h
+++ b/gfx/thebes/gfxDWriteFontList.h
@@ -225,6 +225,8 @@ public:
 
     virtual gfxFontFamily* FindFamily(const nsAString& aFamily);
 
+    virtual void GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray);
+
 private:
     friend class gfxDWriteFontFamily;
 
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
index 3c51a1de47d0..0f1f7ecad810 100644
--- a/gfx/thebes/gfxPlatformFontList.h
+++ b/gfx/thebes/gfxPlatformFontList.h
@@ -93,7 +93,7 @@ public:
 
     void ClearPrefFonts() { mPrefFonts.Clear(); }
 
-    void GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray);
+    virtual void GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray);
 
     gfxFontEntry* FindFontForChar(const PRUint32 aCh, gfxFont *aPrevFont);
 

From 212f73b280ea6ae2a3b97ef74cbc07b437b81427 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Tue, 12 Apr 2011 11:53:20 +0100
Subject: [PATCH 008/509] bug 633299 - don't discard font entries for
 @font-face rules that haven't changed. r=dbaron

---
 gfx/thebes/gfxUserFontSet.cpp     |  68 +++++---
 gfx/thebes/gfxUserFontSet.h       |  29 +++-
 layout/base/nsPresContext.cpp     | 241 +++--------------------------
 layout/base/nsPresContext.h       |   2 -
 layout/style/nsFontFaceLoader.cpp | 249 ++++++++++++++++++++++++++++++
 layout/style/nsFontFaceLoader.h   |  22 +++
 6 files changed, 360 insertions(+), 251 deletions(-)

diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
index 862259817c33..5224b3cdfc01 100644
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -108,7 +108,7 @@ gfxUserFontSet::~gfxUserFontSet()
 {
 }
 
-void
+gfxFontEntry*
 gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
                             const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList,
                             PRUint32 aWeight,
@@ -118,6 +118,8 @@ gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
                             const nsString& aLanguageOverride,
                             gfxSparseBitSet *aUnicodeRanges)
 {
+    gfxProxyFontEntry *proxyEntry = nsnull;
+
     nsAutoString key(aFamilyName);
     ToLowerCase(key);
 
@@ -135,29 +137,47 @@ gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
     }
 
     // construct a new face and add it into the family
-    if (family) {
-        nsTArray<gfxFontFeature> featureSettings;
-        gfxFontStyle::ParseFontFeatureSettings(aFeatureSettings,
-                                               featureSettings);
-        PRUint32 languageOverride =
-            gfxFontStyle::ParseFontLanguageOverride(aLanguageOverride);
-        gfxProxyFontEntry *proxyEntry = 
-            new gfxProxyFontEntry(aFontFaceSrcList, family, aWeight, aStretch, 
-                                  aItalicStyle,
-                                  featureSettings,
-                                  languageOverride,
-                                  aUnicodeRanges);
-        family->AddFontEntry(proxyEntry);
+    nsTArray<gfxFontFeature> featureSettings;
+    gfxFontStyle::ParseFontFeatureSettings(aFeatureSettings,
+                                           featureSettings);
+    PRUint32 languageOverride =
+        gfxFontStyle::ParseFontLanguageOverride(aLanguageOverride);
+    proxyEntry =
+        new gfxProxyFontEntry(aFontFaceSrcList, family, aWeight, aStretch,
+                              aItalicStyle,
+                              featureSettings,
+                              languageOverride,
+                              aUnicodeRanges);
+    family->AddFontEntry(proxyEntry);
 #ifdef PR_LOGGING
-        if (LOG_ENABLED()) {
-            LOG(("userfonts (%p) added (%s) with style: %s weight: %d stretch: %d", 
-                 this, NS_ConvertUTF16toUTF8(aFamilyName).get(), 
-                 (aItalicStyle & FONT_STYLE_ITALIC ? "italic" : 
-                     (aItalicStyle & FONT_STYLE_OBLIQUE ? "oblique" : "normal")), 
-                 aWeight, aStretch));
-        }
-#endif
+    if (LOG_ENABLED()) {
+        LOG(("userfonts (%p) added (%s) with style: %s weight: %d stretch: %d",
+             this, NS_ConvertUTF16toUTF8(aFamilyName).get(),
+             (aItalicStyle & FONT_STYLE_ITALIC ? "italic" :
+                 (aItalicStyle & FONT_STYLE_OBLIQUE ? "oblique" : "normal")),
+             aWeight, aStretch));
     }
+#endif
+
+    return proxyEntry;
+}
+
+void
+gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
+                            gfxFontEntry     *aFontEntry)
+{
+    nsAutoString key(aFamilyName);
+    ToLowerCase(key);
+
+    PRBool found;
+
+    gfxMixedFontFamily *family = mFontFamilies.GetWeak(key, &found);
+    if (!family) {
+        family = new gfxMixedFontFamily(aFamilyName);
+        mFontFamilies.Put(key, family);
+    }
+
+    family->AddFontEntry(aFontEntry);
 }
 
 gfxFontEntry*
@@ -541,7 +561,7 @@ gfxUserFontSet::OnLoadComplete(gfxFontEntry *aFontToLoad,
             fe->mFeatureSettings.AppendElements(pe->mFeatureSettings);
             fe->mLanguageOverride = pe->mLanguageOverride;
 
-            static_cast<gfxMixedFontFamily*>(pe->mFamily)->ReplaceFontEntry(pe, fe);
+            ReplaceFontEntry(pe, fe);
             IncrementGeneration();
 #ifdef PR_LOGGING
             if (LOG_ENABLED()) {
@@ -630,7 +650,7 @@ gfxUserFontSet::LoadNext(gfxProxyFontEntry *aProxyEntry)
                      PRUint32(mGeneration)));
                 fe->mFeatureSettings.AppendElements(aProxyEntry->mFeatureSettings);
                 fe->mLanguageOverride = aProxyEntry->mLanguageOverride;
-                static_cast<gfxMixedFontFamily*>(aProxyEntry->mFamily)->ReplaceFontEntry(aProxyEntry, fe);
+                ReplaceFontEntry(aProxyEntry, fe);
                 return STATUS_LOADED;
             } else {
                 LOG(("userfonts (%p) [src %d] failed local: (%s) for (%s)\n", 
diff --git a/gfx/thebes/gfxUserFontSet.h b/gfx/thebes/gfxUserFontSet.h
index 3231e63f125e..b63c232a04e0 100644
--- a/gfx/thebes/gfxUserFontSet.h
+++ b/gfx/thebes/gfxUserFontSet.h
@@ -94,6 +94,7 @@ public:
     void AddFontEntry(gfxFontEntry *aFontEntry) {
         nsRefPtr<gfxFontEntry> fe = aFontEntry;
         mAvailableFonts.AppendElement(fe);
+        aFontEntry->SetFamily(this);
     }
 
     void ReplaceFontEntry(gfxFontEntry *aOldFontEntry, gfxFontEntry *aNewFontEntry) 
@@ -103,6 +104,8 @@ public:
             gfxFontEntry *fe = mAvailableFonts[i];
             if (fe == aOldFontEntry) {
                 mAvailableFonts[i] = aNewFontEntry;
+                aOldFontEntry->SetFamily(nsnull);
+                aNewFontEntry->SetFamily(this);
                 return;
             }
         }
@@ -114,6 +117,7 @@ public:
         for (PRUint32 i = 0; i < numFonts; i++) {
             gfxFontEntry *fe = mAvailableFonts[i];
             if (fe == aFontEntry) {
+                aFontEntry->SetFamily(nsnull);
                 mAvailableFonts.RemoveElementAt(i);
                 return;
             }
@@ -172,14 +176,17 @@ public:
     // weight, stretch - 0 == unknown, [1, 9] otherwise
     // italic style = constants in gfxFontConstants.h, e.g. NS_FONT_STYLE_NORMAL
     // TODO: support for unicode ranges not yet implemented
-    void AddFontFace(const nsAString& aFamilyName,
-                     const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList,
-                     PRUint32 aWeight,
-                     PRUint32 aStretch,
-                     PRUint32 aItalicStyle,
-                     const nsString& aFeatureSettings,
-                     const nsString& aLanguageOverride,
-                     gfxSparseBitSet *aUnicodeRanges = nsnull);
+    gfxFontEntry *AddFontFace(const nsAString& aFamilyName,
+                              const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList,
+                              PRUint32 aWeight,
+                              PRUint32 aStretch,
+                              PRUint32 aItalicStyle,
+                              const nsString& aFeatureSettings,
+                              const nsString& aLanguageOverride,
+                              gfxSparseBitSet *aUnicodeRanges = nsnull);
+
+    // add in a font face for which we have the gfxFontEntry already
+    void AddFontFace(const nsAString& aFamilyName, gfxFontEntry* aFontEntry);
 
     // Whether there is a face with this family name
     PRBool HasFamily(const nsAString& aFamilyName) const
@@ -209,6 +216,12 @@ public:
                           const PRUint8 *aFontData, PRUint32 aLength,
                           nsresult aDownloadStatus);
 
+    // Replace a proxy with a real fontEntry; this is implemented in
+    // nsUserFontSet in order to keep track of the entry corresponding
+    // to each @font-face rule.
+    virtual void ReplaceFontEntry(gfxProxyFontEntry *aProxy,
+                                  gfxFontEntry *aFontEntry) = 0;
+
     // generation - each time a face is loaded, generation is
     // incremented so that the change can be recognized 
     PRUint64 GetGeneration() { return mGeneration; }
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 634796dda887..3a9fe36ae78c 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1772,177 +1772,6 @@ nsPresContext::HasAuthorSpecifiedRules(nsIFrame *aFrame, PRUint32 ruleTypeMask)
                                         UseDocumentColors());
 }
 
-static void
-InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet,
-                   PRUint8 aSheetType)
-{
-  NS_ABORT_IF_FALSE(aRule->GetType() == nsICSSRule::FONT_FACE_RULE,
-                    "InsertFontFaceRule passed a non-fontface CSS rule");
-
-  // aRule->List();
-
-  nsAutoString fontfamily;
-  nsCSSValue val;
-
-  PRUint32 unit;
-  PRUint32 weight = NS_STYLE_FONT_WEIGHT_NORMAL;
-  PRUint32 stretch = NS_STYLE_FONT_STRETCH_NORMAL;
-  PRUint32 italicStyle = FONT_STYLE_NORMAL;
-  nsString featureSettings, languageOverride;
-
-  // set up family name
-  aRule->GetDesc(eCSSFontDesc_Family, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_String) {
-    val.GetStringValue(fontfamily);
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face family name has unexpected unit");
-    // If there is no family name, this rule cannot contribute a
-    // usable font, so there is no point in processing it further.
-    return;
-  }
-
-  // set up weight
-  aRule->GetDesc(eCSSFontDesc_Weight, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Integer || unit == eCSSUnit_Enumerated) {
-    weight = val.GetIntValue();
-  } else if (unit == eCSSUnit_Normal) {
-    weight = NS_STYLE_FONT_WEIGHT_NORMAL;
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face weight has unexpected unit");
-  }
-
-  // set up stretch
-  aRule->GetDesc(eCSSFontDesc_Stretch, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Enumerated) {
-    stretch = val.GetIntValue();
-  } else if (unit == eCSSUnit_Normal) {
-    stretch = NS_STYLE_FONT_STRETCH_NORMAL;
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face stretch has unexpected unit");
-  }
-
-  // set up font style
-  aRule->GetDesc(eCSSFontDesc_Style, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Enumerated) {
-    italicStyle = val.GetIntValue();
-  } else if (unit == eCSSUnit_Normal) {
-    italicStyle = FONT_STYLE_NORMAL;
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face style has unexpected unit");
-  }
-
-  // set up font features
-  aRule->GetDesc(eCSSFontDesc_FontFeatureSettings, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Normal) {
-    // empty feature string
-  } else if (unit == eCSSUnit_String) {
-    val.GetStringValue(featureSettings);
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face font-feature-settings has unexpected unit");
-  }
-
-  // set up font language override
-  aRule->GetDesc(eCSSFontDesc_FontLanguageOverride, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Normal) {
-    // empty feature string
-  } else if (unit == eCSSUnit_String) {
-    val.GetStringValue(languageOverride);
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null,
-                 "@font-face font-language-override has unexpected unit");
-  }
-
-  // set up src array
-  nsTArray<gfxFontFaceSrc> srcArray;
-
-  aRule->GetDesc(eCSSFontDesc_Src, val);
-  unit = val.GetUnit();
-  if (unit == eCSSUnit_Array) {
-    nsCSSValue::Array *srcArr = val.GetArrayValue();
-    size_t numSrc = srcArr->Count();
-    
-    for (size_t i = 0; i < numSrc; i++) {
-      val = srcArr->Item(i);
-      unit = val.GetUnit();
-      gfxFontFaceSrc *face = srcArray.AppendElements(1);
-      if (!face)
-        return;
-            
-      switch (unit) {
-       
-      case eCSSUnit_Local_Font:
-        val.GetStringValue(face->mLocalName);
-        face->mIsLocal = PR_TRUE;
-        face->mURI = nsnull;
-        face->mFormatFlags = 0;
-        break;
-      case eCSSUnit_URL:
-        face->mIsLocal = PR_FALSE;
-        face->mURI = val.GetURLValue();
-        NS_ASSERTION(face->mURI, "null url in @font-face rule");
-        face->mReferrer = val.GetURLStructValue()->mReferrer;
-        face->mOriginPrincipal = val.GetURLStructValue()->mOriginPrincipal;
-        NS_ASSERTION(face->mOriginPrincipal, "null origin principal in @font-face rule");
-        
-        // agent and user stylesheets are treated slightly differently,
-        // the same-site origin check and access control headers are
-        // enforced against the sheet principal rather than the document
-        // principal to allow user stylesheets to include @font-face rules
-        face->mUseOriginPrincipal = (aSheetType == nsStyleSet::eUserSheet ||
-                                     aSheetType == nsStyleSet::eAgentSheet);
-                                     
-        face->mLocalName.Truncate();
-        face->mFormatFlags = 0;
-        while (i + 1 < numSrc && (val = srcArr->Item(i+1), 
-                 val.GetUnit() == eCSSUnit_Font_Format)) {
-          nsDependentString valueString(val.GetStringBufferValue());
-          if (valueString.LowerCaseEqualsASCII("woff")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_WOFF; 
-          } else if (valueString.LowerCaseEqualsASCII("opentype")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_OPENTYPE; 
-          } else if (valueString.LowerCaseEqualsASCII("truetype")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_TRUETYPE; 
-          } else if (valueString.LowerCaseEqualsASCII("truetype-aat")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_TRUETYPE_AAT; 
-          } else if (valueString.LowerCaseEqualsASCII("embedded-opentype")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_EOT;   
-          } else if (valueString.LowerCaseEqualsASCII("svg")) {
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_SVG;   
-          } else {
-            // unknown format specified, mark to distinguish from the 
-            // case where no format hints are specified
-            face->mFormatFlags |= gfxUserFontSet::FLAG_FORMAT_UNKNOWN;
-          }
-          i++;
-        }
-        break;
-      default:
-        NS_ASSERTION(unit == eCSSUnit_Local_Font || unit == eCSSUnit_URL,
-                     "strange unit type in font-face src array");
-        break;
-      }
-     }
-  } else {
-    NS_ASSERTION(unit == eCSSUnit_Null, "@font-face src has unexpected unit");
-  }
-  
-  if (!fontfamily.IsEmpty() && srcArray.Length() > 0) {
-    aFontSet->AddFontFace(fontfamily, srcArray, weight, stretch, italicStyle,
-                          featureSettings, languageOverride);
-  }
-}
-
 gfxUserFontSet*
 nsPresContext::GetUserFontSetInternal()
 {
@@ -1983,8 +1812,9 @@ nsPresContext::GetUserFontSetExternal()
 void
 nsPresContext::FlushUserFontSet()
 {
-  if (!mShell)
+  if (!mShell) {
     return; // we've been torn down
+  }
 
   if (!mGetUserFontSetCalled) {
     return; // No one cares about this font set yet, but we want to be careful
@@ -1994,59 +1824,36 @@ nsPresContext::FlushUserFontSet()
 
   if (mUserFontSetDirty) {
     if (gfxPlatform::GetPlatform()->DownloadableFontsEnabled()) {
-      nsRefPtr<gfxUserFontSet> oldUserFontSet = mUserFontSet;
-
       nsTArray<nsFontFaceRuleContainer> rules;
-      if (!mShell->StyleSet()->AppendFontFaceRules(this, rules))
-        return;
-
-      PRBool differ;
-      if (rules.Length() == mFontFaceRules.Length()) {
-        differ = PR_FALSE;
-        for (PRUint32 i = 0, i_end = rules.Length(); i < i_end; ++i) {
-          if (rules[i].mRule != mFontFaceRules[i].mRule ||
-              rules[i].mSheetType != mFontFaceRules[i].mSheetType) {
-            differ = PR_TRUE;
-            break;
-          }
-        }
-      } else {
-        differ = PR_TRUE;
-      }
-
-      // Only rebuild things if the set of @font-face rules is different.
-      if (differ) {
+      if (!mShell->StyleSet()->AppendFontFaceRules(this, rules)) {
         if (mUserFontSet) {
           mUserFontSet->Destroy();
           NS_RELEASE(mUserFontSet);
         }
-
-        if (rules.Length() > 0) {
-          nsUserFontSet *fs = new nsUserFontSet(this);
-          if (!fs)
-            return;
-          mUserFontSet = fs;
-          NS_ADDREF(mUserFontSet);
-
-          for (PRUint32 i = 0, i_end = rules.Length(); i < i_end; ++i) {
-            InsertFontFaceRule(rules[i].mRule, fs, rules[i].mSheetType);
-          }
-        }
+        return;
       }
 
-#ifdef DEBUG
-      PRBool success =
-#endif
-        rules.SwapElements(mFontFaceRules);
-      NS_ASSERTION(success, "should never fail given both are heap arrays");
+      PRBool changed = PR_FALSE;
 
-      if (mGetUserFontSetCalled && oldUserFontSet != mUserFontSet) {
-        // If we've changed, created, or destroyed a user font set, we
-        // need to trigger a style change reflow.
-        // We need to enqueue a style change reflow (for later) to
-        // reflect that we're dropping @font-face rules.  (However,
-        // without a reflow, nothing will happen to start any downloads
-        // that are needed.)
+      if (rules.Length() == 0) {
+        if (mUserFontSet) {
+          mUserFontSet->Destroy();
+          NS_RELEASE(mUserFontSet);
+          changed = PR_TRUE;
+        }
+      } else {
+        if (!mUserFontSet) {
+          mUserFontSet = new nsUserFontSet(this);
+          NS_ADDREF(mUserFontSet);
+        }
+        changed = mUserFontSet->UpdateRules(rules);
+      }
+
+      // We need to enqueue a style change reflow (for later) to
+      // reflect that we're modifying @font-face rules.  (However,
+      // without a reflow, nothing will happen to start any downloads
+      // that are needed.)
+      if (changed) {
         UserFontSetUpdated();
       }
     }
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 81c51b7c7220..7951a0ad74ed 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -1109,8 +1109,6 @@ protected:
 
   // container for per-context fonts (downloadable, SVG, etc.)
   nsUserFontSet*        mUserFontSet;
-  // The list of @font-face rules that we put into mUserFontSet
-  nsTArray<nsFontFaceRuleContainer> mFontFaceRules;
   
   PRInt32               mFontScaler;
   nscoord               mMinimumFontSizePref;
diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp
index 5a53bf1e4e51..60b35f13465f 100644
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -73,6 +73,8 @@
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
 
+#include "nsStyleSet.h"
+
 #ifdef PR_LOGGING
 static PRLogModuleInfo *gFontDownloaderLog = PR_NewLogModule("fontdownloader");
 #endif /* PR_LOGGING */
@@ -436,3 +438,250 @@ nsUserFontSet::StartLoad(gfxFontEntry *aFontToLoad,
 
   return rv;
 }
+
+PRBool
+nsUserFontSet::UpdateRules(const nsTArray<nsFontFaceRuleContainer>& aRules)
+{
+  nsTArray<FontFaceRuleRecord> oldRules;
+  mRules.SwapElements(oldRules);
+
+  // destroy the font family records; we need to re-create them
+  // because we might end up with faces in a different order,
+  // even if they're the same font entries as before
+  mFontFamilies.Clear();
+
+  PRBool modified = PR_FALSE;
+
+  for (PRUint32 i = 0, i_end = aRules.Length(); i < i_end; ++i) {
+    // insert each rule into our list, migrating old font entries if possible
+    // rather than creating new ones; set  modified  to true if we detect
+    // that rule ordering has changed, or if a new entry is created
+    InsertRule(aRules[i].mRule, aRules[i].mSheetType, oldRules, modified);
+  }
+
+  // if any rules are left in the old list, note that the set has changed
+  if (oldRules.Length() > 0) {
+    modified = PR_TRUE;
+  }
+
+  if (modified) {
+    IncrementGeneration();
+  }
+
+  return modified;
+}
+
+void
+nsUserFontSet::InsertRule(nsCSSFontFaceRule *aRule, PRUint8 aSheetType,
+                          nsTArray<FontFaceRuleRecord>& aOldRules,
+                          PRBool& aFontSetModified)
+{
+  NS_ABORT_IF_FALSE(aRule->GetType() == nsICSSRule::FONT_FACE_RULE,
+                    "InsertRule passed a non-fontface CSS rule");
+
+  // set up family name
+  nsAutoString fontfamily;
+  nsCSSValue val;
+  PRUint32 unit;
+
+  aRule->GetDesc(eCSSFontDesc_Family, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_String) {
+    val.GetStringValue(fontfamily);
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face family name has unexpected unit");
+  }
+  if (fontfamily.IsEmpty()) {
+    // If there is no family name, this rule cannot contribute a
+    // usable font, so there is no point in processing it further.
+    return;
+  }
+
+  // first, we check in oldRules; if the rule exists there, just move it
+  // to the new rule list, and put the entry into the appropriate family
+  for (PRUint32 i = 0; i < aOldRules.Length(); ++i) {
+    const FontFaceRuleRecord& ruleRec = aOldRules[i];
+    if (ruleRec.mContainer.mRule == aRule &&
+        ruleRec.mContainer.mSheetType == aSheetType) {
+      AddFontFace(fontfamily, ruleRec.mFontEntry);
+      mRules.AppendElement(ruleRec);
+      aOldRules.RemoveElementAt(i);
+      // note the set has been modified if an old rule was skipped to find
+      // this one - something has been dropped, or ordering changed
+      if (i > 0) {
+        aFontSetModified = PR_TRUE;
+      }
+      return;
+    }
+  }
+
+  // this is a new rule:
+
+  PRUint32 weight = NS_STYLE_FONT_WEIGHT_NORMAL;
+  PRUint32 stretch = NS_STYLE_FONT_STRETCH_NORMAL;
+  PRUint32 italicStyle = FONT_STYLE_NORMAL;
+  nsString featureSettings, languageOverride;
+
+  // set up weight
+  aRule->GetDesc(eCSSFontDesc_Weight, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Integer || unit == eCSSUnit_Enumerated) {
+    weight = val.GetIntValue();
+  } else if (unit == eCSSUnit_Normal) {
+    weight = NS_STYLE_FONT_WEIGHT_NORMAL;
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face weight has unexpected unit");
+  }
+
+  // set up stretch
+  aRule->GetDesc(eCSSFontDesc_Stretch, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Enumerated) {
+    stretch = val.GetIntValue();
+  } else if (unit == eCSSUnit_Normal) {
+    stretch = NS_STYLE_FONT_STRETCH_NORMAL;
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face stretch has unexpected unit");
+  }
+
+  // set up font style
+  aRule->GetDesc(eCSSFontDesc_Style, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Enumerated) {
+    italicStyle = val.GetIntValue();
+  } else if (unit == eCSSUnit_Normal) {
+    italicStyle = FONT_STYLE_NORMAL;
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face style has unexpected unit");
+  }
+
+  // set up font features
+  aRule->GetDesc(eCSSFontDesc_FontFeatureSettings, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Normal) {
+    // empty feature string
+  } else if (unit == eCSSUnit_String) {
+    val.GetStringValue(featureSettings);
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face font-feature-settings has unexpected unit");
+  }
+
+  // set up font language override
+  aRule->GetDesc(eCSSFontDesc_FontLanguageOverride, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Normal) {
+    // empty feature string
+  } else if (unit == eCSSUnit_String) {
+    val.GetStringValue(languageOverride);
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null,
+                 "@font-face font-language-override has unexpected unit");
+  }
+
+  // set up src array
+  nsTArray<gfxFontFaceSrc> srcArray;
+
+  aRule->GetDesc(eCSSFontDesc_Src, val);
+  unit = val.GetUnit();
+  if (unit == eCSSUnit_Array) {
+    nsCSSValue::Array *srcArr = val.GetArrayValue();
+    size_t numSrc = srcArr->Count();
+    
+    for (size_t i = 0; i < numSrc; i++) {
+      val = srcArr->Item(i);
+      unit = val.GetUnit();
+      gfxFontFaceSrc *face = srcArray.AppendElements(1);
+      if (!face)
+        return;
+
+      switch (unit) {
+
+      case eCSSUnit_Local_Font:
+        val.GetStringValue(face->mLocalName);
+        face->mIsLocal = PR_TRUE;
+        face->mURI = nsnull;
+        face->mFormatFlags = 0;
+        break;
+      case eCSSUnit_URL:
+        face->mIsLocal = PR_FALSE;
+        face->mURI = val.GetURLValue();
+        NS_ASSERTION(face->mURI, "null url in @font-face rule");
+        face->mReferrer = val.GetURLStructValue()->mReferrer;
+        face->mOriginPrincipal = val.GetURLStructValue()->mOriginPrincipal;
+        NS_ASSERTION(face->mOriginPrincipal, "null origin principal in @font-face rule");
+
+        // agent and user stylesheets are treated slightly differently,
+        // the same-site origin check and access control headers are
+        // enforced against the sheet principal rather than the document
+        // principal to allow user stylesheets to include @font-face rules
+        face->mUseOriginPrincipal = (aSheetType == nsStyleSet::eUserSheet ||
+                                     aSheetType == nsStyleSet::eAgentSheet);
+
+        face->mLocalName.Truncate();
+        face->mFormatFlags = 0;
+        while (i + 1 < numSrc && (val = srcArr->Item(i+1), 
+                 val.GetUnit() == eCSSUnit_Font_Format)) {
+          nsDependentString valueString(val.GetStringBufferValue());
+          if (valueString.LowerCaseEqualsASCII("woff")) {
+            face->mFormatFlags |= FLAG_FORMAT_WOFF;
+          } else if (valueString.LowerCaseEqualsASCII("opentype")) {
+            face->mFormatFlags |= FLAG_FORMAT_OPENTYPE;
+          } else if (valueString.LowerCaseEqualsASCII("truetype")) {
+            face->mFormatFlags |= FLAG_FORMAT_TRUETYPE;
+          } else if (valueString.LowerCaseEqualsASCII("truetype-aat")) {
+            face->mFormatFlags |= FLAG_FORMAT_TRUETYPE_AAT;
+          } else if (valueString.LowerCaseEqualsASCII("embedded-opentype")) {
+            face->mFormatFlags |= FLAG_FORMAT_EOT;
+          } else if (valueString.LowerCaseEqualsASCII("svg")) {
+            face->mFormatFlags |= FLAG_FORMAT_SVG;
+          } else {
+            // unknown format specified, mark to distinguish from the
+            // case where no format hints are specified
+            face->mFormatFlags |= FLAG_FORMAT_UNKNOWN;
+          }
+          i++;
+        }
+        break;
+      default:
+        NS_ASSERTION(unit == eCSSUnit_Local_Font || unit == eCSSUnit_URL,
+                     "strange unit type in font-face src array");
+        break;
+      }
+     }
+  } else {
+    NS_ASSERTION(unit == eCSSUnit_Null, "@font-face src has unexpected unit");
+  }
+
+  if (srcArray.Length() > 0) {
+    FontFaceRuleRecord ruleRec;
+    ruleRec.mContainer.mRule = aRule;
+    ruleRec.mContainer.mSheetType = aSheetType;
+    ruleRec.mFontEntry = AddFontFace(fontfamily, srcArray,
+                                     weight, stretch, italicStyle,
+                                     featureSettings, languageOverride);
+    if (ruleRec.mFontEntry) {
+      mRules.AppendElement(ruleRec);
+    }
+    // this was a new rule and fontEntry, so note that the set was modified
+    aFontSetModified = PR_TRUE;
+  }
+}
+
+void
+nsUserFontSet::ReplaceFontEntry(gfxProxyFontEntry *aProxy,
+                                gfxFontEntry *aFontEntry)
+{
+  for (PRUint32 i = 0; i < mRules.Length(); ++i) {
+    if (mRules[i].mFontEntry == aProxy) {
+      mRules[i].mFontEntry = aFontEntry;
+      break;
+    }
+  }
+  static_cast<gfxMixedFontFamily*>(aProxy->Family())->
+    ReplaceFontEntry(aProxy, aFontEntry);
+}
diff --git a/layout/style/nsFontFaceLoader.h b/layout/style/nsFontFaceLoader.h
index 42236a754d0e..e7379823cdaa 100644
--- a/layout/style/nsFontFaceLoader.h
+++ b/layout/style/nsFontFaceLoader.h
@@ -50,6 +50,7 @@
 #include "gfxUserFontSet.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
+#include "nsCSSRules.h"
 
 class nsIRequest;
 class nsISupports;
@@ -57,6 +58,7 @@ class nsPresContext;
 class nsIPrincipal;
 
 class nsFontFaceLoader;
+class nsCSSFontFaceRule;
 
 // nsUserFontSet - defines the loading mechanism for downloadable fonts
 class nsUserFontSet : public gfxUserFontSet
@@ -77,15 +79,35 @@ public:
   // It's removed from the mLoaders set.
   void RemoveLoader(nsFontFaceLoader *aLoader);
 
+  PRBool UpdateRules(const nsTArray<nsFontFaceRuleContainer>& aRules);
+
   nsPresContext *GetPresContext() { return mPresContext; }
 
+  virtual void ReplaceFontEntry(gfxProxyFontEntry *aProxy,
+                                gfxFontEntry *aFontEntry);
+
 protected:
+  // The font-set keeps track of the collection of rules, and their
+  // corresponding font entries (whether proxies or real entries),
+  // so that we can update the set without having to throw away
+  // all the existing fonts.
+  struct FontFaceRuleRecord {
+    nsRefPtr<gfxFontEntry>       mFontEntry;
+    nsFontFaceRuleContainer      mContainer;
+  };
+
+  void InsertRule(nsCSSFontFaceRule *aRule, PRUint8 aSheetType,
+                  nsTArray<FontFaceRuleRecord>& oldRules,
+                  PRBool& aFontSetModified);
+
   nsPresContext *mPresContext;  // weak reference
 
   // Set of all loaders pointing to us. These are not strong pointers,
   // but that's OK because nsFontFaceLoader always calls RemoveLoader on
   // us before it dies (unless we die first).
   nsTHashtable< nsPtrHashKey<nsFontFaceLoader> > mLoaders;
+
+  nsTArray<FontFaceRuleRecord>   mRules;
 };
 
 class nsFontFaceLoader : public nsIStreamLoaderObserver

From d8ec2275fb32de86cdad8c9f7191fdd97f89e03b Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 13 Apr 2011 09:44:23 +0200
Subject: [PATCH 009/509] Bug 644692 - Fix bsdiff build failure with system
 bzip2. r=ted

---
 other-licenses/bsdiff/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index d9132ba9fa6d..5f281b0ba820 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -48,7 +48,11 @@ include $(DEPTH)/config/autoconf.mk
 HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
 HOST_CSRCS = bsdiff.c
 
+ifdef MOZ_NATIVE_BZ2
+HOST_LIBS += $(BZ2_LIBS)
+else
 HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
+endif
 
 ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)

From 89c6e0c32c0af8efa568303ff81bc5d426000a44 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 13 Apr 2011 09:45:42 +0200
Subject: [PATCH 010/509] Bug 643112 - Fix IPC build on Linux powerpc.
 r=bsmedberg

---
 ipc/chromium/Makefile.in              | 1 -
 ipc/chromium/src/build/build_config.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
index bc1551d1d1bd..65ecaadfece8 100644
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -246,7 +246,6 @@ ifdef OS_LINUX # {
 CPPSRCS += \
   atomicops_internals_x86_gcc.cc \
   base_paths_linux.cc \
-  data_pack.cc \
   file_util_linux.cc \
   file_version_info_linux.cc \
   idle_timer_none.cc \
diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
index 06ee253ad858..f7293d9b11b3 100644
--- a/ipc/chromium/src/build/build_config.h
+++ b/ipc/chromium/src/build/build_config.h
@@ -57,7 +57,7 @@
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
 #define WCHAR_T_IS_UNSIGNED 1
-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
 #define ARCH_CPU_PPC 1
 #define ARCH_CPU_32_BITS 1
 #else

From 098a3e7f1c5c204116d31c5e94c0989f4d2916ab Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 13 Apr 2011 09:50:51 +0200
Subject: [PATCH 011/509] Bug 564410 - Use png_set_filter to make system libpng
 not use write filters. r=glennrp

---
 modules/libpr0n/encoders/png/nsPNGEncoder.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.cpp b/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
index 6ca7eabd58e5..3539abd74deb 100644
--- a/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
@@ -272,6 +272,10 @@ NS_IMETHODIMP nsPNGEncoder::AddImageFrame(const PRUint8* aData,
     return NS_ERROR_INVALID_ARG;
   }
 
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+  png_set_filter(mPNG, PNG_FILTER_TYPE_BASE, PNG_FILTER_VALUE_NONE);
+#endif
+
   // write each row: if we add more input formats, we may want to
   // generalize the conversions
   if (aInputFormat == INPUT_FORMAT_HOSTARGB) {

From fe3ae3c16ab859529bb107ac53c5f8c3bb0a7f32 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 13 Apr 2011 09:58:13 +0200
Subject: [PATCH 012/509] Bug 561032 - Move Firefox branding into
 browser/branding/official. r=gavin,r=pike

--HG--
rename : other-licenses/branding/firefox/LICENSE => browser/branding/official/LICENSE
rename : other-licenses/branding/firefox/Makefile.in => browser/branding/official/Makefile.in
rename : other-licenses/branding/firefox/background.png => browser/branding/official/background.png
rename : other-licenses/branding/firefox/branding.nsi => browser/branding/official/branding.nsi
rename : other-licenses/branding/firefox/configure.sh => browser/branding/official/configure.sh
rename : other-licenses/branding/firefox/content/Makefile.in => browser/branding/official/content/Makefile.in
rename : other-licenses/branding/firefox/content/about-logo.png => browser/branding/official/content/about-logo.png
rename : other-licenses/branding/firefox/content/about-wordmark.png => browser/branding/official/content/about-wordmark.png
rename : other-licenses/branding/firefox/content/about.png => browser/branding/official/content/about.png
rename : other-licenses/branding/firefox/content/icon48.png => browser/branding/official/content/icon48.png
rename : other-licenses/branding/firefox/content/icon64.png => browser/branding/official/content/icon64.png
rename : other-licenses/branding/firefox/content/jar.mn => browser/branding/official/content/jar.mn
rename : other-licenses/branding/firefox/default16.png => browser/branding/official/default16.png
rename : other-licenses/branding/firefox/default22.png => browser/branding/official/default22.png
rename : other-licenses/branding/firefox/default24.png => browser/branding/official/default24.png
rename : other-licenses/branding/firefox/default256.png => browser/branding/official/default256.png
rename : other-licenses/branding/firefox/default32.png => browser/branding/official/default32.png
rename : other-licenses/branding/firefox/default48.png => browser/branding/official/default48.png
rename : other-licenses/branding/firefox/disk.icns => browser/branding/official/disk.icns
rename : other-licenses/branding/firefox/document-os2.ico => browser/branding/official/document-os2.ico
rename : other-licenses/branding/firefox/document.icns => browser/branding/official/document.icns
rename : other-licenses/branding/firefox/document.ico => browser/branding/official/document.ico
rename : other-licenses/branding/firefox/document.png => browser/branding/official/document.png
rename : other-licenses/branding/firefox/dsstore => browser/branding/official/dsstore
rename : other-licenses/branding/firefox/firefox-os2.ico => browser/branding/official/firefox-os2.ico
rename : other-licenses/branding/firefox/firefox.icns => browser/branding/official/firefox.icns
rename : other-licenses/branding/firefox/firefox.ico => browser/branding/official/firefox.ico
rename : other-licenses/branding/firefox/locales/Makefile.in => browser/branding/official/locales/Makefile.in
rename : other-licenses/branding/firefox/locales/browserconfig.properties => browser/branding/official/locales/browserconfig.properties
rename : other-licenses/branding/firefox/locales/en-US/brand.dtd => browser/branding/official/locales/en-US/brand.dtd
rename : other-licenses/branding/firefox/locales/en-US/brand.properties => browser/branding/official/locales/en-US/brand.properties
rename : other-licenses/branding/firefox/locales/jar.mn => browser/branding/official/locales/jar.mn
rename : other-licenses/branding/firefox/mozicon128.png => browser/branding/official/mozicon128.png
rename : other-licenses/branding/firefox/pref/firefox-branding.js => browser/branding/official/pref/firefox-branding.js
rename : other-licenses/branding/firefox/splash.bmp => browser/branding/official/splash.bmp
rename : other-licenses/branding/firefox/wizHeader.bmp => browser/branding/official/wizHeader.bmp
rename : other-licenses/branding/firefox/wizHeaderRTL.bmp => browser/branding/official/wizHeaderRTL.bmp
rename : other-licenses/branding/firefox/wizWatermark.bmp => browser/branding/official/wizWatermark.bmp
---
 .../firefox => browser/branding/official}/LICENSE   |   0
 .../branding/official}/Makefile.in                  |   0
 .../branding/official}/background.png               | Bin
 .../branding/official}/branding.nsi                 |   0
 .../branding/official}/configure.sh                 |   0
 .../branding/official}/content/Makefile.in          |   0
 .../branding/official}/content/about-logo.png       | Bin
 .../branding/official}/content/about-wordmark.png   | Bin
 .../branding/official}/content/about.png            | Bin
 .../branding/official}/content/icon48.png           | Bin
 .../branding/official}/content/icon64.png           | Bin
 .../branding/official}/content/jar.mn               |   0
 .../branding/official}/default16.png                | Bin
 .../branding/official}/default22.png                | Bin
 .../branding/official}/default24.png                | Bin
 .../branding/official}/default256.png               | Bin
 .../branding/official}/default32.png                | Bin
 .../branding/official}/default48.png                | Bin
 .../firefox => browser/branding/official}/disk.icns | Bin
 .../branding/official}/document-os2.ico             | Bin
 .../branding/official}/document.icns                | Bin
 .../branding/official}/document.ico                 | Bin
 .../branding/official}/document.png                 | Bin
 .../firefox => browser/branding/official}/dsstore   | Bin
 .../branding/official}/firefox-os2.ico              | Bin
 .../branding/official}/firefox.icns                 | Bin
 .../branding/official}/firefox.ico                  | Bin
 .../branding/official}/locales/Makefile.in          |   2 +-
 .../official}/locales/browserconfig.properties      |   0
 .../branding/official}/locales/en-US/brand.dtd      |   0
 .../official}/locales/en-US/brand.properties        |   0
 .../branding/official}/locales/jar.mn               |   0
 .../branding/official}/mozicon128.png               | Bin
 .../branding/official}/pref/firefox-branding.js     |   0
 .../branding/official}/splash.bmp                   | Bin
 .../branding/official}/wizHeader.bmp                | Bin
 .../branding/official}/wizHeaderRTL.bmp             | Bin
 .../branding/official}/wizWatermark.bmp             | Bin
 browser/confvars.sh                                 |   2 +-
 browser/locales/filter.py                           |   1 +
 browser/locales/l10n.ini                            |   1 +
 41 files changed, 4 insertions(+), 2 deletions(-)
 rename {other-licenses/branding/firefox => browser/branding/official}/LICENSE (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/Makefile.in (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/background.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/branding.nsi (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/configure.sh (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/Makefile.in (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/about-logo.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/about-wordmark.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/about.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/icon48.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/icon64.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/content/jar.mn (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default16.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default22.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default24.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default256.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default32.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/default48.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/disk.icns (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/document-os2.ico (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/document.icns (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/document.ico (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/document.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/dsstore (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/firefox-os2.ico (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/firefox.icns (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/firefox.ico (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/locales/Makefile.in (97%)
 rename {other-licenses/branding/firefox => browser/branding/official}/locales/browserconfig.properties (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/locales/en-US/brand.dtd (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/locales/en-US/brand.properties (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/locales/jar.mn (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/mozicon128.png (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/pref/firefox-branding.js (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/splash.bmp (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/wizHeader.bmp (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/wizHeaderRTL.bmp (100%)
 rename {other-licenses/branding/firefox => browser/branding/official}/wizWatermark.bmp (100%)

diff --git a/other-licenses/branding/firefox/LICENSE b/browser/branding/official/LICENSE
similarity index 100%
rename from other-licenses/branding/firefox/LICENSE
rename to browser/branding/official/LICENSE
diff --git a/other-licenses/branding/firefox/Makefile.in b/browser/branding/official/Makefile.in
similarity index 100%
rename from other-licenses/branding/firefox/Makefile.in
rename to browser/branding/official/Makefile.in
diff --git a/other-licenses/branding/firefox/background.png b/browser/branding/official/background.png
similarity index 100%
rename from other-licenses/branding/firefox/background.png
rename to browser/branding/official/background.png
diff --git a/other-licenses/branding/firefox/branding.nsi b/browser/branding/official/branding.nsi
similarity index 100%
rename from other-licenses/branding/firefox/branding.nsi
rename to browser/branding/official/branding.nsi
diff --git a/other-licenses/branding/firefox/configure.sh b/browser/branding/official/configure.sh
similarity index 100%
rename from other-licenses/branding/firefox/configure.sh
rename to browser/branding/official/configure.sh
diff --git a/other-licenses/branding/firefox/content/Makefile.in b/browser/branding/official/content/Makefile.in
similarity index 100%
rename from other-licenses/branding/firefox/content/Makefile.in
rename to browser/branding/official/content/Makefile.in
diff --git a/other-licenses/branding/firefox/content/about-logo.png b/browser/branding/official/content/about-logo.png
similarity index 100%
rename from other-licenses/branding/firefox/content/about-logo.png
rename to browser/branding/official/content/about-logo.png
diff --git a/other-licenses/branding/firefox/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png
similarity index 100%
rename from other-licenses/branding/firefox/content/about-wordmark.png
rename to browser/branding/official/content/about-wordmark.png
diff --git a/other-licenses/branding/firefox/content/about.png b/browser/branding/official/content/about.png
similarity index 100%
rename from other-licenses/branding/firefox/content/about.png
rename to browser/branding/official/content/about.png
diff --git a/other-licenses/branding/firefox/content/icon48.png b/browser/branding/official/content/icon48.png
similarity index 100%
rename from other-licenses/branding/firefox/content/icon48.png
rename to browser/branding/official/content/icon48.png
diff --git a/other-licenses/branding/firefox/content/icon64.png b/browser/branding/official/content/icon64.png
similarity index 100%
rename from other-licenses/branding/firefox/content/icon64.png
rename to browser/branding/official/content/icon64.png
diff --git a/other-licenses/branding/firefox/content/jar.mn b/browser/branding/official/content/jar.mn
similarity index 100%
rename from other-licenses/branding/firefox/content/jar.mn
rename to browser/branding/official/content/jar.mn
diff --git a/other-licenses/branding/firefox/default16.png b/browser/branding/official/default16.png
similarity index 100%
rename from other-licenses/branding/firefox/default16.png
rename to browser/branding/official/default16.png
diff --git a/other-licenses/branding/firefox/default22.png b/browser/branding/official/default22.png
similarity index 100%
rename from other-licenses/branding/firefox/default22.png
rename to browser/branding/official/default22.png
diff --git a/other-licenses/branding/firefox/default24.png b/browser/branding/official/default24.png
similarity index 100%
rename from other-licenses/branding/firefox/default24.png
rename to browser/branding/official/default24.png
diff --git a/other-licenses/branding/firefox/default256.png b/browser/branding/official/default256.png
similarity index 100%
rename from other-licenses/branding/firefox/default256.png
rename to browser/branding/official/default256.png
diff --git a/other-licenses/branding/firefox/default32.png b/browser/branding/official/default32.png
similarity index 100%
rename from other-licenses/branding/firefox/default32.png
rename to browser/branding/official/default32.png
diff --git a/other-licenses/branding/firefox/default48.png b/browser/branding/official/default48.png
similarity index 100%
rename from other-licenses/branding/firefox/default48.png
rename to browser/branding/official/default48.png
diff --git a/other-licenses/branding/firefox/disk.icns b/browser/branding/official/disk.icns
similarity index 100%
rename from other-licenses/branding/firefox/disk.icns
rename to browser/branding/official/disk.icns
diff --git a/other-licenses/branding/firefox/document-os2.ico b/browser/branding/official/document-os2.ico
similarity index 100%
rename from other-licenses/branding/firefox/document-os2.ico
rename to browser/branding/official/document-os2.ico
diff --git a/other-licenses/branding/firefox/document.icns b/browser/branding/official/document.icns
similarity index 100%
rename from other-licenses/branding/firefox/document.icns
rename to browser/branding/official/document.icns
diff --git a/other-licenses/branding/firefox/document.ico b/browser/branding/official/document.ico
similarity index 100%
rename from other-licenses/branding/firefox/document.ico
rename to browser/branding/official/document.ico
diff --git a/other-licenses/branding/firefox/document.png b/browser/branding/official/document.png
similarity index 100%
rename from other-licenses/branding/firefox/document.png
rename to browser/branding/official/document.png
diff --git a/other-licenses/branding/firefox/dsstore b/browser/branding/official/dsstore
similarity index 100%
rename from other-licenses/branding/firefox/dsstore
rename to browser/branding/official/dsstore
diff --git a/other-licenses/branding/firefox/firefox-os2.ico b/browser/branding/official/firefox-os2.ico
similarity index 100%
rename from other-licenses/branding/firefox/firefox-os2.ico
rename to browser/branding/official/firefox-os2.ico
diff --git a/other-licenses/branding/firefox/firefox.icns b/browser/branding/official/firefox.icns
similarity index 100%
rename from other-licenses/branding/firefox/firefox.icns
rename to browser/branding/official/firefox.icns
diff --git a/other-licenses/branding/firefox/firefox.ico b/browser/branding/official/firefox.ico
similarity index 100%
rename from other-licenses/branding/firefox/firefox.ico
rename to browser/branding/official/firefox.ico
diff --git a/other-licenses/branding/firefox/locales/Makefile.in b/browser/branding/official/locales/Makefile.in
similarity index 97%
rename from other-licenses/branding/firefox/locales/Makefile.in
rename to browser/branding/official/locales/Makefile.in
index 73db1e88fd0f..9cda9a0206b5 100644
--- a/other-licenses/branding/firefox/locales/Makefile.in
+++ b/browser/branding/official/locales/Makefile.in
@@ -38,7 +38,7 @@ DEPTH          = ../../../..
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = other-licenses/branding/firefox/locales
+relativesrcdir = browser/branding/official/locales
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/other-licenses/branding/firefox/locales/browserconfig.properties b/browser/branding/official/locales/browserconfig.properties
similarity index 100%
rename from other-licenses/branding/firefox/locales/browserconfig.properties
rename to browser/branding/official/locales/browserconfig.properties
diff --git a/other-licenses/branding/firefox/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
similarity index 100%
rename from other-licenses/branding/firefox/locales/en-US/brand.dtd
rename to browser/branding/official/locales/en-US/brand.dtd
diff --git a/other-licenses/branding/firefox/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
similarity index 100%
rename from other-licenses/branding/firefox/locales/en-US/brand.properties
rename to browser/branding/official/locales/en-US/brand.properties
diff --git a/other-licenses/branding/firefox/locales/jar.mn b/browser/branding/official/locales/jar.mn
similarity index 100%
rename from other-licenses/branding/firefox/locales/jar.mn
rename to browser/branding/official/locales/jar.mn
diff --git a/other-licenses/branding/firefox/mozicon128.png b/browser/branding/official/mozicon128.png
similarity index 100%
rename from other-licenses/branding/firefox/mozicon128.png
rename to browser/branding/official/mozicon128.png
diff --git a/other-licenses/branding/firefox/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
similarity index 100%
rename from other-licenses/branding/firefox/pref/firefox-branding.js
rename to browser/branding/official/pref/firefox-branding.js
diff --git a/other-licenses/branding/firefox/splash.bmp b/browser/branding/official/splash.bmp
similarity index 100%
rename from other-licenses/branding/firefox/splash.bmp
rename to browser/branding/official/splash.bmp
diff --git a/other-licenses/branding/firefox/wizHeader.bmp b/browser/branding/official/wizHeader.bmp
similarity index 100%
rename from other-licenses/branding/firefox/wizHeader.bmp
rename to browser/branding/official/wizHeader.bmp
diff --git a/other-licenses/branding/firefox/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp
similarity index 100%
rename from other-licenses/branding/firefox/wizHeaderRTL.bmp
rename to browser/branding/official/wizHeaderRTL.bmp
diff --git a/other-licenses/branding/firefox/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp
similarity index 100%
rename from other-licenses/branding/firefox/wizWatermark.bmp
rename to browser/branding/official/wizWatermark.bmp
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 534d182a65ce..d3f315b0b594 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -51,4 +51,4 @@ MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 MOZ_BRANDING_DIRECTORY=browser/branding/nightly
-MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/firefox
+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
index be4fe3bd28cf..cdbc96da154f 100755
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -4,6 +4,7 @@ def test(mod, path, entity = None):
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "browser", "extensions/reporter", "extensions/spellcheck",
                  "other-licenses/branding/firefox",
+                 "browser/branding/official",
                  "services/sync"):
     return False
   if mod != "browser" and mod != "extensions/spellcheck":
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
index 5f20be6973f4..c379dfd8d816 100644
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -6,6 +6,7 @@ all = browser/locales/all-locales
 dirs = browser
      extensions/reporter
      other-licenses/branding/firefox
+     browser/branding/official
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars

From c808d636dca0c81947f0b10a86b9e1d5737ec84b Mon Sep 17 00:00:00 2001
From: Simon Montagu <smontagu@smontagu.org>
Date: Wed, 13 Apr 2011 12:23:49 +0300
Subject: [PATCH 013/509] Make all nsBidiPresUtils methods static. Bug 624798,
 r=roc

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  63 +-
 layout/base/nsBidi.h                          |   6 +-
 layout/base/nsBidiPresUtils.cpp               | 659 ++++++++----------
 layout/base/nsBidiPresUtils.h                 | 242 +++----
 layout/base/nsLayoutUtils.cpp                 |  36 +-
 layout/base/nsPresContext.cpp                 |  22 -
 layout/base/nsPresContext.h                   |  14 -
 layout/base/nsPresShell.cpp                   |  20 -
 layout/generic/nsBlockFrame.cpp               |  12 +-
 layout/generic/nsFrameList.cpp                |  26 +-
 layout/generic/nsImageFrame.cpp               |  26 +-
 layout/generic/nsLineBox.cpp                  |   4 +-
 layout/generic/nsTextFrameThebes.cpp          |   1 -
 layout/svg/base/src/nsSVGGlyphFrame.cpp       |  81 ++-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  48 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   2 +-
 16 files changed, 550 insertions(+), 712 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 936005dc6bb8..14f1010bf31b 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -105,6 +105,7 @@
 
 #include "nsFrameManager.h"
 #include "nsFrameLoader.h"
+#include "nsBidi.h"
 #include "nsBidiPresUtils.h"
 #include "Layers.h"
 #include "CanvasUtils.h"
@@ -2656,10 +2657,6 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
 
     nsIDocument* document = presShell->GetDocument();
 
-    nsBidiPresUtils* bidiUtils = presShell->GetPresContext()->GetBidiUtils();
-    if (!bidiUtils)
-        return NS_ERROR_FAILURE;
-
     // replace all the whitespace characters with U+0020 SPACE
     nsAutoString textToDraw(aRawText);
     TextReplaceWhitespaceCharacters(textToDraw);
@@ -2705,15 +2702,17 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
 
     // calls bidi algo twice since it needs the full text width and the
     // bounding boxes before rendering anything
-    rv = bidiUtils->ProcessText(textToDraw.get(),
-                                textToDraw.Length(),
-                                isRTL ? NSBIDI_RTL : NSBIDI_LTR,
-                                presShell->GetPresContext(),
-                                processor,
-                                nsBidiPresUtils::MODE_MEASURE,
-                                nsnull,
-                                0,
-                                &totalWidth);
+    nsBidi bidiEngine;
+    rv = nsBidiPresUtils::ProcessText(textToDraw.get(),
+                                      textToDraw.Length(),
+                                      isRTL ? NSBIDI_RTL : NSBIDI_LTR,
+                                      presShell->GetPresContext(),
+                                      processor,
+                                      nsBidiPresUtils::MODE_MEASURE,
+                                      nsnull,
+                                      0,
+                                      &totalWidth,
+                                      &bidiEngine);
     if (NS_FAILED(rv))
         return rv;
 
@@ -2811,15 +2810,16 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
             ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
             processor.mThebes = ctx;
 
-            rv = bidiUtils->ProcessText(textToDraw.get(),
-                                        textToDraw.Length(),
-                                        isRTL ? NSBIDI_RTL : NSBIDI_LTR,
-                                        presShell->GetPresContext(),
-                                        processor,
-                                        nsBidiPresUtils::MODE_DRAW,
-                                        nsnull,
-                                        0,
-                                        nsnull);
+            rv = nsBidiPresUtils::ProcessText(textToDraw.get(),
+                                              textToDraw.Length(),
+                                              isRTL ? NSBIDI_RTL : NSBIDI_LTR,
+                                              presShell->GetPresContext(),
+                                              processor,
+                                              nsBidiPresUtils::MODE_DRAW,
+                                              nsnull,
+                                              0,
+                                              nsnull,
+                                              &bidiEngine);
             if (NS_FAILED(rv))
                 return rv;
 
@@ -2848,15 +2848,16 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
         ApplyStyle(STYLE_FILL);
     }
 
-    rv = bidiUtils->ProcessText(textToDraw.get(),
-                                textToDraw.Length(),
-                                isRTL ? NSBIDI_RTL : NSBIDI_LTR,
-                                presShell->GetPresContext(),
-                                processor,
-                                nsBidiPresUtils::MODE_DRAW,
-                                nsnull,
-                                0,
-                                nsnull);
+    rv = nsBidiPresUtils::ProcessText(textToDraw.get(),
+                                      textToDraw.Length(),
+                                      isRTL ? NSBIDI_RTL : NSBIDI_LTR,
+                                      presShell->GetPresContext(),
+                                      processor,
+                                      nsBidiPresUtils::MODE_DRAW,
+                                      nsnull,
+                                      0,
+                                      nsnull,
+                                      &bidiEngine);
 
     // this needs to be restored before function can return
     if (doUseIntermediateSurface) {
diff --git a/layout/base/nsBidi.h b/layout/base/nsBidi.h
index 4d2dc4276d36..6cdd1795cb24 100644
--- a/layout/base/nsBidi.h
+++ b/layout/base/nsBidi.h
@@ -773,7 +773,7 @@ public:
    *      The array does not need to be initialized.<p>
    *      The index map will result in <code>aIndexMap[aLogicalIndex]==aVisualIndex</code>.
    */
-  nsresult ReorderLogical(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap);
+  static nsresult ReorderLogical(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap);
 #endif // FULL_BIDI_ENGINE
   /**
    * This is a convenience function that does not use a nsBidi object.
@@ -794,7 +794,7 @@ public:
    *      The array does not need to be initialized.<p>
    *      The index map will result in <code>aIndexMap[aVisualIndex]==aLogicalIndex</code>.
    */
-  nsresult ReorderVisual(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap);
+  static nsresult ReorderVisual(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap);
 
 #ifdef FULL_BIDI_ENGINE
   /**
@@ -917,7 +917,7 @@ private:
 
   void ReorderLine(nsBidiLevel aMinLevel, nsBidiLevel aMaxLevel);
 
-  PRBool PrepareReorder(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap, nsBidiLevel *aMinLevel, nsBidiLevel *aMaxLevel);
+  static PRBool PrepareReorder(const nsBidiLevel *aLevels, PRInt32 aLength, PRInt32 *aIndexMap, nsBidiLevel *aMinLevel, nsBidiLevel *aMaxLevel);
 
   PRInt32 doWriteReverse(const PRUnichar *src, PRInt32 srcLength,
                          PRUnichar *dest, PRUint16 options);
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 7b1b5574f68d..5df62524074a 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -71,41 +71,187 @@ static const PRUnichar kRLE              = 0x202B;
 static const PRUnichar kLRO              = 0x202D;
 static const PRUnichar kRLO              = 0x202E;
 static const PRUnichar kPDF              = 0x202C;
-static const PRUnichar ALEF              = 0x05D0;
-
-#define CHAR_IS_HEBREW(c) ((0x0590 <= (c)) && ((c)<= 0x05FF))
-// Note: The above code are moved from gfx/src/windows/nsRenderingContextWin.cpp
 
 #define NS_BIDI_CONTROL_FRAME ((nsIFrame*)0xfffb1d1)
 
-nsBidiPresUtils::nsBidiPresUtils() : mArraySize(8),
-                                     mIndexMap(nsnull),
-                                     mLevels(nsnull),
-                                     mSuccess(NS_ERROR_FAILURE),
-                                     mBidiEngine(nsnull)
-{
-  mBidiEngine = new nsBidi();
-  if (mBidiEngine && mContentToFrameIndex.Init()) {
-    mSuccess = NS_OK;
-  }
-}
+struct BidiParagraphData {
+  nsString            mBuffer;
+  nsAutoTArray<PRUnichar, 16> mEmbeddingStack;
+  nsTArray<nsIFrame*> mLogicalFrames;
+  nsDataHashtable<nsISupportsHashKey, PRInt32> mContentToFrameIndex;
+  PRPackedBool        mIsVisual;
+  nsBidiLevel         mParaLevel;
+  nsIContent*         mPrevContent;
+  nsAutoPtr<nsBidi>   mBidiEngine;
 
-nsBidiPresUtils::~nsBidiPresUtils()
-{
-  if (mLevels) {
-    delete[] mLevels;
-  }
-  if (mIndexMap) {
-    delete[] mIndexMap;
-  }
-  delete mBidiEngine;
-}
+  void Init(nsBlockFrame *aBlockFrame)
+  {
+    mContentToFrameIndex.Init();
+    mBidiEngine = new nsBidi();
+    mPrevContent = nsnull;
+    mParaLevel =
+     (NS_STYLE_DIRECTION_RTL == aBlockFrame->GetStyleVisibility()->mDirection) ?
+        NSBIDI_RTL : NSBIDI_LTR;
 
-PRBool
-nsBidiPresUtils::IsSuccessful() const
-{ 
-  return NS_SUCCEEDED(mSuccess); 
-}
+    mIsVisual = aBlockFrame->PresContext()->IsVisualMode();
+    if (mIsVisual) {
+      /**
+       * Drill up in content to detect whether this is an element that needs to
+       * be rendered with logical order even on visual pages.
+       *
+       * We always use logical order on form controls, firstly so that text
+       * entry will be in logical order, but also because visual pages were
+       * written with the assumption that even if the browser had no support
+       * for right-to-left text rendering, it would use native widgets with
+       * bidi support to display form controls.
+       *
+       * We also use logical order in XUL elements, since we expect that if a
+       * XUL element appears in a visual page, it will be generated by an XBL
+       * binding and contain localized text which will be in logical order.
+       */
+      for (nsIContent* content = aBlockFrame->GetContent() ; content; 
+           content = content->GetParent()) {
+        if (content->IsNodeOfType(nsINode::eHTML_FORM_CONTROL) ||
+            content->IsXUL()) {
+          mIsVisual = PR_FALSE;
+          break;
+        }
+      }
+    }
+  }
+
+  nsresult SetPara()
+  {
+    return mBidiEngine->SetPara(mBuffer.get(), BufferLength(),
+                                mParaLevel, nsnull);
+  }
+
+  nsresult CountRuns(PRInt32 *runCount){ return mBidiEngine->CountRuns(runCount); }
+
+  nsresult GetLogicalRun(PRInt32 aLogicalStart, 
+                         PRInt32* aLogicalLimit,
+                         nsBidiLevel* aLevel)
+  {
+    nsresult rv = mBidiEngine->GetLogicalRun(aLogicalStart,
+                                             aLogicalLimit, aLevel);
+    if (mIsVisual || NS_FAILED(rv))
+      *aLevel = mParaLevel;
+    return rv;
+  }
+
+  void ResetData()
+  {
+    mLogicalFrames.Clear();
+    mContentToFrameIndex.Clear();
+    mBuffer.SetLength(0);
+    for (PRUint32 i = 0; i < mEmbeddingStack.Length(); ++i) {
+      mBuffer.Append(mEmbeddingStack[i]);
+      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+    }
+  }
+
+  void AppendFrame(nsIFrame* aFrame, nsIContent* aContent = nsnull)
+  {
+    if (aContent) {
+      mContentToFrameIndex.Put(aContent, FrameCount());
+    }
+    mLogicalFrames.AppendElement(aFrame);
+  }
+
+  PRInt32 GetLastFrameForContent(nsIContent *aContent)
+  {
+    PRInt32 index = 0;
+    mContentToFrameIndex.Get(aContent, &index);
+    return index;
+  }
+
+  PRInt32 FrameCount(){ return mLogicalFrames.Length(); }
+
+  PRInt32 BufferLength(){ return mBuffer.Length(); }
+
+  nsIFrame* FrameAt(PRInt32 aIndex){ return mLogicalFrames[aIndex]; }
+
+  void AppendUnichar(PRUnichar aCh){ mBuffer.Append(aCh); }
+
+  void AppendString(const nsDependentSubstring& aString){ mBuffer.Append(aString); }
+
+  void PushBidiControl(PRUnichar aCh)
+  {
+    mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+    mBuffer.Append(aCh);
+    mEmbeddingStack.AppendElement(aCh);
+  }
+
+  void PopBidiControl()
+  {
+    mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+    mBuffer.Append(kPDF);
+    NS_ASSERTION(mEmbeddingStack.Length(), "embedding/override underflow");
+    mEmbeddingStack.TruncateLength(mEmbeddingStack.Length() - 1);
+  }
+
+  void ClearBidiControls()
+  {
+    for (PRUint32 i = 0; i < mEmbeddingStack.Length(); ++i) {
+      mBuffer.Append(kPDF);
+      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+    }
+  }
+};
+
+struct BidiLineData {
+  nsTArray<nsIFrame*> mLogicalFrames;
+  nsTArray<nsIFrame*> mVisualFrames;
+  nsTArray<PRInt32> mIndexMap;
+  nsAutoTArray<PRUint8, 18> mLevels;
+  PRBool mIsReordered;
+
+  BidiLineData(nsIFrame* aFirstFrameOnLine, PRInt32   aNumFramesOnLine)
+  {
+    /**
+     * Initialize the logically-ordered array of frames using the top-level
+     * frames of a single line
+     */
+    mLogicalFrames.Clear();
+
+    PRBool isReordered = PR_FALSE;
+    PRBool hasRTLFrames = PR_FALSE;
+
+    for (nsIFrame* frame = aFirstFrameOnLine;
+         frame && aNumFramesOnLine--;
+         frame = frame->GetNextSibling()) {
+      AppendFrame(frame);
+      PRUint8 level = nsBidiPresUtils::GetFrameEmbeddingLevel(frame);
+      mLevels.AppendElement(level);
+      mIndexMap.AppendElement(0);
+      if (level & 1) {
+        hasRTLFrames = PR_TRUE;
+      }
+    }
+
+    // Reorder the line
+    nsBidi::ReorderVisual(mLevels.Elements(), FrameCount(),
+                          mIndexMap.Elements());
+
+    for (PRInt32 i = 0; i < FrameCount(); i++) {
+      mVisualFrames.AppendElement(LogicalFrameAt(mIndexMap[i]));
+      if (i != mIndexMap[i]) {
+        isReordered = PR_TRUE;
+      }
+    }
+
+    // If there's an RTL frame, assume the line is reordered
+    mIsReordered = isReordered || hasRTLFrames;
+  }
+
+  void AppendFrame(nsIFrame* aFrame){ mLogicalFrames.AppendElement(aFrame); }
+
+  PRInt32 FrameCount(){ return mLogicalFrames.Length(); }
+
+  nsIFrame* LogicalFrameAt(PRInt32 aIndex){ return mLogicalFrames[aIndex]; }
+
+  nsIFrame* VisualFrameAt(PRInt32 aIndex){ return mVisualFrames[aIndex]; }
+};
 
 /* Some helper methods for Resolve() */
 
@@ -327,58 +473,15 @@ AdvanceLineIteratorToFrame(nsIFrame* aFrame,
 nsresult
 nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
 {
-  mLogicalFrames.Clear();
-  mContentToFrameIndex.Clear();
-  mBuffer.SetLength(0);
-  mEmbeddingStack.Clear();
-  
-  nsPresContext *presContext = aBlockFrame->PresContext();
-
-  const nsStyleVisibility* vis = aBlockFrame->GetStyleVisibility();
-
-  mParaLevel = (NS_STYLE_DIRECTION_RTL == vis->mDirection) ?
-                NSBIDI_RTL : NSBIDI_LTR;
-
-  mLineIter = new nsBlockInFlowLineIterator(aBlockFrame,
-                                            aBlockFrame->begin_lines(),
-                                            PR_FALSE);
-  if (mLineIter->GetLine() == aBlockFrame->end_lines()) {
-    // Advance to first valid line (might be in a next-continuation)
-    mLineIter->Next();
-  }
-
-  mIsVisual = presContext->IsVisualMode();
-  if (mIsVisual) {
-    /**
-     * Drill up in content to detect whether this is an element that needs to be
-     * rendered with logical order even on visual pages.
-     *
-     * We always use logical order on form controls, firstly so that text entry
-     * will be in logical order, but also because visual pages were written with
-     * the assumption that even if the browser had no support for right-to-left
-     * text rendering, it would use native widgets with bidi support to display
-     * form controls.
-     *
-     * We also use logical order in XUL elements, since we expect that if a XUL
-     * element appears in a visual page, it will be generated by an XBL binding
-     * and contain localized text which will be in logical order.
-     */
-    for (nsIContent* content = aBlockFrame->GetContent() ; content; 
-         content = content->GetParent()) {
-      if (content->IsNodeOfType(nsINode::eHTML_FORM_CONTROL) ||
-          content->IsXUL()) {
-        mIsVisual = PR_FALSE;
-        break;
-      }
-    }
-  }
-  mPrevFrame = nsnull;
+  BidiParagraphData bpd;
+  bpd.Init(aBlockFrame);
 
   // handle bidi-override being set on the block itself before calling
   // TraverseFrames.
   const nsStyleTextReset* text = aBlockFrame->GetStyleTextReset();
   PRUnichar ch = 0;
   if (text->mUnicodeBidi == NS_STYLE_UNICODE_BIDI_OVERRIDE) {
+    const nsStyleVisibility* vis = aBlockFrame->GetStyleVisibility();
     if (NS_STYLE_DIRECTION_RTL == vis->mDirection) {
       ch = kRLO;
     }
@@ -386,74 +489,73 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
       ch = kLRO;
     }
     if (ch != 0) {
-      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-      mBuffer.Append(ch);
-      mEmbeddingStack.AppendElement(ch);
+      bpd.PushBidiControl(ch);
     }
   }
-  mPrevContent = nsnull;
   for (nsBlockFrame* block = aBlockFrame; block;
        block = static_cast<nsBlockFrame*>(block->GetNextContinuation())) {
     block->RemoveStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
-    TraverseFrames(aBlockFrame, block->GetFirstChild(nsnull));
+    TraverseFrames(aBlockFrame, block->GetFirstChild(nsnull), &bpd);
   }
 
   if (ch != 0) {
-    mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-    mBuffer.Append(kPDF);
-    NS_ASSERTION(mEmbeddingStack.Length(), "embedding/override underflow");
-    mEmbeddingStack.TruncateLength(mEmbeddingStack.Length() - 1);
+    bpd.PopBidiControl();
   }
 
   // Resolve final paragraph
-  ResolveParagraph(aBlockFrame);
-  return mSuccess;
+  return ResolveParagraph(aBlockFrame, &bpd);
 }
 
-void
-nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
+nsresult
+nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame,
+                                  BidiParagraphData* aBpd)
 {
   nsPresContext *presContext = aBlockFrame->PresContext();
-  PRInt32 bufferLength = mBuffer.Length();
 
-  if (bufferLength < 1) {
-    mSuccess = NS_OK;
-    return;
+  if (aBpd->BufferLength() < 1) {
+    return NS_OK;
   }
-  mBuffer.ReplaceChar("\t\r\n", kSpace);
+  aBpd->mBuffer.ReplaceChar("\t\r\n", kSpace);
 
   PRInt32 runCount;
-  PRUint8 embeddingLevel = mParaLevel;
+  PRUint8 embeddingLevel = aBpd->mParaLevel;
 
-  mSuccess = mBidiEngine->SetPara(mBuffer.get(), bufferLength, mParaLevel, nsnull);
-  if (NS_FAILED(mSuccess) ) {
-      return;
-  }
+  nsresult rv = aBpd->SetPara();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = aBpd->CountRuns(&runCount);
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  mSuccess = mBidiEngine->CountRuns(&runCount);
-  if (NS_FAILED(mSuccess) ) {
-    return;
-  }
   PRInt32     runLength      = 0;   // the length of the current run of text
   PRInt32     lineOffset     = 0;   // the start of the current run
   PRInt32     logicalLimit   = 0;   // the end of the current run + 1
   PRInt32     numRun         = -1;
   PRInt32     fragmentLength = 0;   // the length of the current text frame
   PRInt32     frameIndex     = -1;  // index to the frames in mLogicalFrames
-  PRInt32     frameCount     = mLogicalFrames.Length();
+  PRInt32     frameCount     = aBpd->FrameCount();
   PRInt32     contentOffset  = 0;   // offset of current frame in its content node
   PRBool      isTextFrame    = PR_FALSE;
   nsIFrame*   frame = nsnull;
   nsIContent* content = nsnull;
-  PRInt32     contentTextLength;
+  PRInt32     contentTextLength = 0;
 
   FramePropertyTable *propTable = presContext->PropertyTable();
+  
+  nsBlockInFlowLineIterator lineIter(aBlockFrame,
+                                     aBlockFrame->begin_lines(),
+                                     PR_FALSE);
+  if (lineIter.GetLine() == aBlockFrame->end_lines()) {
+    // Advance to first valid line (might be in a next-continuation)
+    lineIter.Next();
+  }
+  nsIFrame* prevFrame = nsnull;
+
   PRBool lineNeedsUpdate = PR_FALSE;
   
 #ifdef DEBUG
 #ifdef NOISY_BIDI
   printf("Before Resolve(), aBlockFrame=0x%p, mBuffer='%s', frameCount=%d\n",
-         (void*)aBlockFrame, NS_ConvertUTF16toUTF8(mBuffer).get(), frameCount);
+         (void*)aBlockFrame, NS_ConvertUTF16toUTF8(aBpd->mBuffer).get(), frameCount);
 #ifdef REALLY_NOISY_BIDI
   printf(" block frame tree=:\n");
   aBlockFrame->List(stdout, 0);
@@ -467,7 +569,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
       if (++frameIndex >= frameCount) {
         break;
       }
-      frame = mLogicalFrames[frameIndex];
+      frame = aBpd->FrameAt(frameIndex);
       lineNeedsUpdate = PR_TRUE;
       if (frame == NS_BIDI_CONTROL_FRAME ||
           nsGkAtoms::textFrame != frame->GetType()) {
@@ -481,7 +583,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
       else {
         content = frame->GetContent();
         if (!content) {
-          mSuccess = NS_OK;
+          rv = NS_OK;
           break;
         }
         contentTextLength = content->TextLength();
@@ -492,7 +594,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
           propTable->Set(frame, nsIFrame::EmbeddingLevelProperty(),
                          NS_INT32_TO_PTR(embeddingLevel));
           propTable->Set(frame, nsIFrame::BaseLevelProperty(),
-                         NS_INT32_TO_PTR(mParaLevel));
+                         NS_INT32_TO_PTR(aBpd->mParaLevel));
           continue;
         }
         PRInt32 start, end;
@@ -511,14 +613,11 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
         break;
       }
       lineOffset = logicalLimit;
-      if (NS_FAILED(mBidiEngine->GetLogicalRun(
+      if (NS_FAILED(aBpd->GetLogicalRun(
               lineOffset, &logicalLimit, &embeddingLevel) ) ) {
         break;
       }
       runLength = logicalLimit - lineOffset;
-      if (mIsVisual) {
-        embeddingLevel = mParaLevel;
-      }
     } // if (runLength <= 0)
 
     if (frame == NS_BIDI_CONTROL_FRAME) {
@@ -529,7 +628,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
       propTable->Set(frame, nsIFrame::EmbeddingLevelProperty(),
                      NS_INT32_TO_PTR(embeddingLevel));
       propTable->Set(frame, nsIFrame::BaseLevelProperty(),
-                     NS_INT32_TO_PTR(mParaLevel));
+                     NS_INT32_TO_PTR(aBpd->mParaLevel));
       if (isTextFrame) {
         if ( (runLength > 0) && (runLength < fragmentLength) ) {
           /*
@@ -537,16 +636,16 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
            * Create a non-fluid continuation frame for the next directional run.
            */
           if (lineNeedsUpdate) {
-            AdvanceLineIteratorToFrame(frame, mLineIter, mPrevFrame);
+            AdvanceLineIteratorToFrame(frame, &lineIter, prevFrame);
             lineNeedsUpdate = PR_FALSE;
           }
-          mLineIter->GetLine()->MarkDirty();
+          lineIter.GetLine()->MarkDirty();
           nsIFrame* nextBidi;
           PRInt32 runEnd = contentOffset + runLength;
-          EnsureBidiContinuation(frame, &nextBidi, frameIndex,
-                                 contentOffset,
-                                 runEnd);
-          if (NS_FAILED(mSuccess)) {
+          rv = EnsureBidiContinuation(frame, &nextBidi, frameIndex,
+                                      contentOffset,
+                                      runEnd);
+          if (NS_FAILED(rv)) {
             break;
           }
           nextBidi->AdjustOffsetsForBidi(runEnd,
@@ -561,10 +660,10 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
              * further non-fluid continuations to fluid continuations and advance
              * frameIndex to the last frame in the content node
              */
-            PRInt32 newIndex = 0;
-            mContentToFrameIndex.Get(content, &newIndex);
+            PRInt32 newIndex = aBpd->GetLastFrameForContent(content);
             if (newIndex > frameIndex) {
-              RemoveBidiContinuation(frame, frameIndex, newIndex, lineOffset);
+              RemoveBidiContinuation(aBpd, frame, 
+                                     frameIndex, newIndex, lineOffset);
               frameIndex = newIndex;
             }
           } else if (fragmentLength > 0 && runLength > fragmentLength) {
@@ -577,9 +676,10 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
             PRInt32 newIndex = frameIndex;
             do {
             } while (++newIndex < frameCount &&
-                     mLogicalFrames[newIndex] == NS_BIDI_CONTROL_FRAME);
+                     aBpd->FrameAt(newIndex) == NS_BIDI_CONTROL_FRAME);
             if (newIndex < frameCount) {
-              RemoveBidiContinuation(frame, frameIndex, newIndex, lineOffset);
+              RemoveBidiContinuation(aBpd, frame, 
+                                     frameIndex, newIndex, lineOffset);
             }
           } else if (runLength == fragmentLength &&
                      numRun + 1 < runCount) {
@@ -596,10 +696,10 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
           }
           frame->AdjustOffsetsForBidi(contentOffset, contentOffset + fragmentLength);
           if (lineNeedsUpdate) {
-            AdvanceLineIteratorToFrame(frame, mLineIter, mPrevFrame);
+            AdvanceLineIteratorToFrame(frame, &lineIter, prevFrame);
             lineNeedsUpdate = PR_FALSE;
           }
-          mLineIter->GetLine()->MarkDirty();
+          lineIter.GetLine()->MarkDirty();
         }
       } // isTextFrame
       else {
@@ -655,6 +755,8 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
   printf("===\n");
 #endif
 #endif
+
+  return rv;
 }
 
 // Should this frame be treated as a leaf (e.g. when building mLogicalFrames)?
@@ -666,7 +768,8 @@ PRBool IsBidiLeaf(nsIFrame* aFrame) {
 
 void
 nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
-                                nsIFrame*     aCurrentFrame)
+                                nsIFrame*     aCurrentFrame,
+                                BidiParagraphData* aBpd)
 {
   if (!aCurrentFrame)
     return;
@@ -724,9 +827,7 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
       // Add a dummy frame pointer representing a bidi control code before the
       // first frame of an element specifying embedding or override
       if (ch != 0 && !frame->GetPrevContinuation()) {
-        mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-        mBuffer.Append(ch);
-        mEmbeddingStack.AppendElement(ch);
+        aBpd->PushBidiControl(ch);
       }
     }
 
@@ -737,18 +838,15 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
        * frame in the array with a given content.
        */
       nsIContent* content = frame->GetContent();
-      if (content) {
-        mContentToFrameIndex.Put(content, mLogicalFrames.Length());
-      }
-      mLogicalFrames.AppendElement(frame);
+      aBpd->AppendFrame(frame, content);
 
       // Append the content of the frame to the paragraph buffer
       nsIAtom* frameType = frame->GetType();
       if (nsGkAtoms::textFrame == frameType) {
-        if (content != mPrevContent) {
-          mPrevContent = content;
+        if (content != aBpd->mPrevContent) {
+          aBpd->mPrevContent = content;
           if (!frame->GetStyleContext()->GetStyleText()->NewlineIsSignificant()) {
-            content->AppendTextTo(mBuffer);
+            content->AppendTextTo(aBpd->mBuffer);
           } else {
             /*
              * For preformatted text we have to do bidi resolution on each line
@@ -769,7 +867,7 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
                  * If there is no newline in the frame, just save the text and
                  * do bidi resolution later
                  */
-                mBuffer.Append(Substring(text, start));
+                aBpd->AppendString(Substring(text, start));
                 break;
               }
 
@@ -785,11 +883,11 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
                * into the next continuation
                */
               while (end < endLine) {
-                mBuffer.Append(Substring(text, start, end - start));
+                aBpd->AppendString(Substring(text, start, end - start));
                 frame = frame->GetNextContinuation();
                 NS_ASSERTION(frame, "Premature end of continuation chain");
                 frame->GetOffsets(start, end);
-                mLogicalFrames.AppendElement(frame);
+                aBpd->AppendFrame(frame);
 
                 /*
                  * If we have already overshot the saved next-sibling while
@@ -800,7 +898,7 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
                 }
               }
 
-              mBuffer.Append(Substring(text, start, endLine - start));
+              aBpd->AppendString(Substring(text, start, endLine - start));
 
               if (PRUint32(endLine) < text.Length()) {
                 next = frame->GetNextInFlow();
@@ -818,11 +916,11 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
                 nsTextFrame* textFrame = static_cast<nsTextFrame*>(frame);
                 textFrame->SetLength(endLine - start, nsnull);
               }
-              ResolveParagraphWithinBlock(aBlockFrame);
+              ResolveParagraphWithinBlock(aBlockFrame, aBpd);
 
               if (next) {
                 frame = next;
-                mLogicalFrames.AppendElement(frame);
+                aBpd->AppendFrame(frame);
               }
 
               /*
@@ -838,68 +936,46 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame* aBlockFrame,
         }
       } else if (nsGkAtoms::brFrame == frameType) {
         // break frame -- append line separator
-        mBuffer.Append(kLineSeparator);
-        ResolveParagraphWithinBlock(aBlockFrame);
+        aBpd->AppendUnichar(kLineSeparator);
+        ResolveParagraphWithinBlock(aBlockFrame, aBpd);
       } else { 
         // other frame type -- see the Unicode Bidi Algorithm:
         // "...inline objects (such as graphics) are treated as if they are ...
         // U+FFFC"
-        mBuffer.Append(kObjectSubstitute);
+        aBpd->AppendUnichar(kObjectSubstitute);
         if (!frame->GetStyleContext()->GetStyleDisplay()->IsInlineOutside()) {
           // if it is not inline, end the paragraph
-          ResolveParagraphWithinBlock(aBlockFrame);
+          ResolveParagraphWithinBlock(aBlockFrame, aBpd);
         }
       }
     }
     else {
       // For a non-leaf frame, recurse into TraverseFrames
       nsIFrame* kid = frame->GetFirstChild(nsnull);
-      TraverseFrames(aBlockFrame, kid);
+      TraverseFrames(aBlockFrame, kid, aBpd);
     }
 
     // If the element is attributed by dir, indicate direction pop (add PDF frame)
     if (ch != 0 && isLastFrame) {
       // Add a dummy frame pointer representing a bidi control code after the
       // last frame of an element specifying embedding or override
-      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-      mBuffer.Append(kPDF);
-      NS_ASSERTION(mEmbeddingStack.Length(), "embedding/override underflow");
-      mEmbeddingStack.TruncateLength(mEmbeddingStack.Length() - 1);
+      aBpd->PopBidiControl();
     }
     childFrame = nextSibling;
   } while (childFrame);
 }
 
 void
-nsBidiPresUtils::ResolveParagraphWithinBlock(nsBlockFrame* aBlockFrame)
+nsBidiPresUtils::ResolveParagraphWithinBlock(nsBlockFrame* aBlockFrame,
+                                             BidiParagraphData* aBpd)
 {
-  nsIPresShell* shell;
-  nsStyleContext* styleContext;
+  aBpd->ClearBidiControls();
 
-  if (mEmbeddingStack.Length() > 0) {
-    shell = aBlockFrame->PresContext()->PresShell();
-    styleContext = aBlockFrame->GetStyleContext();
-
-    // pop all embeddings and overrides
-    for (PRUint32 i = 0; i < mEmbeddingStack.Length(); ++i) {
-      mBuffer.Append(kPDF);
-      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-    }
-  }
-
-  ResolveParagraph(aBlockFrame);
+  ResolveParagraph(aBlockFrame, aBpd);
 
   // Clear the frame array and paragraph buffer, and restore the stored 
   // embeddings and overrides
-  mLogicalFrames.Clear();
-  mContentToFrameIndex.Clear();
-  mBuffer.SetLength(0);
-  if (mEmbeddingStack.Length() > 0) {
-    for (PRUint32 i = 0; i < mEmbeddingStack.Length(); ++i) {
-      mBuffer.Append(mEmbeddingStack[i]);
-      mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
-    }
-  } 
+  aBpd->ResetData();
 }
 
 void
@@ -915,78 +991,8 @@ nsBidiPresUtils::ReorderFrames(nsIFrame*            aFirstFrameOnLine,
     // to -1 makes InitLogicalArrayFromLine look at all of them.
     aNumFramesOnLine = -1;
   }
-
-  InitLogicalArrayFromLine(aFirstFrameOnLine, aNumFramesOnLine);
-
-  PRBool isReordered;
-  PRBool hasRTLFrames;
-  Reorder(isReordered, hasRTLFrames);
-  RepositionInlineFrames(aFirstFrameOnLine);
-}
-
-nsresult
-nsBidiPresUtils::Reorder(PRBool& aReordered, PRBool& aHasRTLFrames)
-{
-  aReordered = PR_FALSE;
-  aHasRTLFrames = PR_FALSE;
-  PRInt32 count = mLogicalFrames.Length();
-
-  if (mArraySize < count) {
-    mArraySize = count << 1;
-    if (mLevels) {
-      delete[] mLevels;
-      mLevels = nsnull;
-    }
-    if (mIndexMap) {
-      delete[] mIndexMap;
-      mIndexMap = nsnull;
-    }
-  }
-  if (!mLevels) {
-    mLevels = new PRUint8[mArraySize];
-    if (!mLevels) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  memset(mLevels, 0, sizeof(PRUint8) * mArraySize);
-
-  nsIFrame* frame;
-  PRInt32   i;
-
-  for (i = 0; i < count; i++) {
-    frame = mLogicalFrames[i];
-    mLevels[i] = GetFrameEmbeddingLevel(frame);
-    if (mLevels[i] & 1) {
-      aHasRTLFrames = PR_TRUE;
-    }      
-  }
-  if (!mIndexMap) {
-    mIndexMap = new PRInt32[mArraySize];
-  }
-  if (!mIndexMap) {
-    mSuccess = NS_ERROR_OUT_OF_MEMORY;
-  }
-  else {
-    memset(mIndexMap, 0, sizeof(PRUint32) * mArraySize);
-
-    mSuccess = mBidiEngine->ReorderVisual(mLevels, count, mIndexMap);
-
-    if (NS_SUCCEEDED(mSuccess) ) {
-      mVisualFrames.Clear();
-
-      for (i = 0; i < count; i++) {
-        mVisualFrames.AppendElement(mLogicalFrames[mIndexMap[i]]);
-        if (i != mIndexMap[i]) {
-          aReordered = PR_TRUE;
-        }
-      }
-    } // NS_SUCCEEDED(mSuccess)
-  } // indexMap
-
-  if (NS_FAILED(mSuccess) ) {
-    aReordered = PR_FALSE;
-  }
-  return mSuccess;
+  BidiLineData bld(aFirstFrameOnLine, aNumFramesOnLine);
+  RepositionInlineFrames(&bld, aFirstFrameOnLine);
 }
 
 nsBidiLevel
@@ -1016,7 +1022,7 @@ void
 nsBidiPresUtils::IsLeftOrRightMost(nsIFrame*              aFrame,
                                    nsContinuationStates*  aContinuationStates,
                                    PRBool&                aIsLeftMost /* out */,
-                                   PRBool&                aIsRightMost /* out */) const
+                                   PRBool&                aIsRightMost /* out */)
 {
   const nsStyleVisibility* vis = aFrame->GetStyleVisibility();
   PRBool isLTR = (NS_STYLE_DIRECTION_LTR == vis->mDirection);
@@ -1110,7 +1116,7 @@ void
 nsBidiPresUtils::RepositionFrame(nsIFrame*              aFrame,
                                  PRBool                 aIsOddLevel,
                                  nscoord&               aLeft,
-                                 nsContinuationStates*  aContinuationStates) const
+                                 nsContinuationStates*  aContinuationStates)
 {
   if (!aFrame)
     return;
@@ -1195,7 +1201,7 @@ nsBidiPresUtils::RepositionFrame(nsIFrame*              aFrame,
 
 void
 nsBidiPresUtils::InitContinuationStates(nsIFrame*              aFrame,
-                                        nsContinuationStates*  aContinuationStates) const
+                                        nsContinuationStates*  aContinuationStates)
 {
   nsFrameContinuationState* state = aContinuationStates->PutEntry(aFrame);
   state->mFirstVisualFrame = nsnull;
@@ -1214,7 +1220,8 @@ nsBidiPresUtils::InitContinuationStates(nsIFrame*              aFrame,
 }
 
 void
-nsBidiPresUtils::RepositionInlineFrames(nsIFrame* aFirstChild) const
+nsBidiPresUtils::RepositionInlineFrames(BidiLineData *aBld,
+                                        nsIFrame* aFirstChild)
 {
   const nsStyleVisibility* vis = aFirstChild->GetStyleVisibility();
   PRBool isLTR = (NS_STYLE_DIRECTION_LTR == vis->mDirection);
@@ -1230,7 +1237,7 @@ nsBidiPresUtils::RepositionInlineFrames(nsIFrame* aFirstChild) const
 
   nscoord left = aFirstChild->GetPosition().x - leftSpace;
   nsIFrame* frame;
-  PRInt32 count = mVisualFrames.Length();
+  PRInt32 count = aBld->mVisualFrames.Length();
   PRInt32 index;
   nsContinuationStates continuationStates;
 
@@ -1239,52 +1246,36 @@ nsBidiPresUtils::RepositionInlineFrames(nsIFrame* aFirstChild) const
   // Initialize continuation states to (nsnull, 0) for
   // each frame on the line.
   for (index = 0; index < count; index++) {
-    InitContinuationStates(mVisualFrames[index], &continuationStates);
+    InitContinuationStates(aBld->VisualFrameAt(index), &continuationStates);
   }
 
   // Reposition frames in visual order
   for (index = 0; index < count; index++) {
-    frame = mVisualFrames[index];
+    frame = aBld->VisualFrameAt(index);
     RepositionFrame(frame,
-                    (mLevels[mIndexMap[index]] & 1),
+                    (aBld->mLevels[aBld->mIndexMap[index]] & 1),
                     left,
                     &continuationStates);
   } // for
 }
 
-void 
-nsBidiPresUtils::InitLogicalArrayFromLine(nsIFrame* aFirstFrameOnLine,
-                                          PRInt32   aNumFramesOnLine) {
-  mLogicalFrames.Clear();
-  for (nsIFrame* frame = aFirstFrameOnLine;
-       frame && aNumFramesOnLine--;
-       frame = frame->GetNextSibling()) {
-    mLogicalFrames.AppendElement(frame);
-  }
-}
-
 PRBool
 nsBidiPresUtils::CheckLineOrder(nsIFrame*  aFirstFrameOnLine,
                                 PRInt32    aNumFramesOnLine,
                                 nsIFrame** aFirstVisual,
                                 nsIFrame** aLastVisual)
 {
-  InitLogicalArrayFromLine(aFirstFrameOnLine, aNumFramesOnLine);
-  
-  PRBool isReordered;
-  PRBool hasRTLFrames;
-  Reorder(isReordered, hasRTLFrames);
-  PRInt32 count = mLogicalFrames.Length();
+  BidiLineData bld(aFirstFrameOnLine, aNumFramesOnLine);
+  PRInt32 count = bld.FrameCount();
   
   if (aFirstVisual) {
-    *aFirstVisual = mVisualFrames[0];
+    *aFirstVisual = bld.VisualFrameAt(0);
   }
   if (aLastVisual) {
-    *aLastVisual = mVisualFrames[count-1];
+    *aLastVisual = bld.VisualFrameAt(count-1);
   }
   
-  // If there's an RTL frame, assume the line is reordered
-  return isReordered || hasRTLFrames;
+  return bld.mIsReordered;
 }
 
 nsIFrame*
@@ -1292,19 +1283,16 @@ nsBidiPresUtils::GetFrameToRightOf(const nsIFrame*  aFrame,
                                    nsIFrame*        aFirstFrameOnLine,
                                    PRInt32          aNumFramesOnLine)
 {
-  InitLogicalArrayFromLine(aFirstFrameOnLine, aNumFramesOnLine);
-  
-  PRBool isReordered;
-  PRBool hasRTLFrames;
-  Reorder(isReordered, hasRTLFrames);
-  PRInt32 count = mVisualFrames.Length();
+  BidiLineData bld(aFirstFrameOnLine, aNumFramesOnLine);
+
+  PRInt32 count = bld.mVisualFrames.Length();
 
   if (aFrame == nsnull)
-    return mVisualFrames[0];
+    return bld.VisualFrameAt(0);
   
   for (PRInt32 i = 0; i < count - 1; i++) {
-    if (mVisualFrames[i] == aFrame) {
-      return mVisualFrames[i+1];
+    if (bld.VisualFrameAt(i) == aFrame) {
+      return bld.VisualFrameAt(i+1);
     }
   }
   
@@ -1316,26 +1304,23 @@ nsBidiPresUtils::GetFrameToLeftOf(const nsIFrame*  aFrame,
                                   nsIFrame*        aFirstFrameOnLine,
                                   PRInt32          aNumFramesOnLine)
 {
-  InitLogicalArrayFromLine(aFirstFrameOnLine, aNumFramesOnLine);
-  
-  PRBool isReordered;
-  PRBool hasRTLFrames;
-  Reorder(isReordered, hasRTLFrames);
-  PRInt32 count = mVisualFrames.Length();
+  BidiLineData bld(aFirstFrameOnLine, aNumFramesOnLine);
+
+  PRInt32 count = bld.mVisualFrames.Length();
   
   if (aFrame == nsnull)
-    return mVisualFrames[count-1];
+    return bld.VisualFrameAt(count-1);
   
   for (PRInt32 i = 1; i < count; i++) {
-    if (mVisualFrames[i] == aFrame) {
-      return mVisualFrames[i-1];
+    if (bld.VisualFrameAt(i) == aFrame) {
+      return bld.VisualFrameAt(i-1);
     }
   }
   
   return nsnull;
 }
 
-inline void
+inline nsresult
 nsBidiPresUtils::EnsureBidiContinuation(nsIFrame*       aFrame,
                                         nsIFrame**      aNewFrame,
                                         PRInt32&        aFrameIndex,
@@ -1346,14 +1331,15 @@ nsBidiPresUtils::EnsureBidiContinuation(nsIFrame*       aFrame,
   NS_PRECONDITION(aFrame, "aFrame is null");
 
   aFrame->AdjustOffsetsForBidi(aStart, aEnd);
-  mSuccess = CreateContinuation(aFrame, aNewFrame, PR_FALSE);
+  return CreateContinuation(aFrame, aNewFrame, PR_FALSE);
 }
 
 void
-nsBidiPresUtils::RemoveBidiContinuation(nsIFrame*       aFrame,
+nsBidiPresUtils::RemoveBidiContinuation(BidiParagraphData *aBpd,
+                                        nsIFrame*       aFrame,
                                         PRInt32         aFirstIndex,
                                         PRInt32         aLastIndex,
-                                        PRInt32&        aOffset) const
+                                        PRInt32&        aOffset)
 {
   FrameProperties props = aFrame->Properties();
   nsBidiLevel embeddingLevel =
@@ -1362,7 +1348,7 @@ nsBidiPresUtils::RemoveBidiContinuation(nsIFrame*       aFrame,
     (nsBidiLevel)NS_PTR_TO_INT32(props.Get(nsIFrame::BaseLevelProperty()));
 
   for (PRInt32 index = aFirstIndex + 1; index <= aLastIndex; index++) {
-    nsIFrame* frame = mLogicalFrames[index];
+    nsIFrame* frame = aBpd->FrameAt(index);
     if (frame == NS_BIDI_CONTROL_FRAME) {
       ++aOffset;
     }
@@ -1456,7 +1442,7 @@ nsBidiPresUtils::FormatUnicodeText(nsPresContext*  aPresContext,
 
 void
 nsBidiPresUtils::StripBidiControlCharacters(PRUnichar* aText,
-                                            PRInt32&   aTextLength) const
+                                            PRInt32&   aTextLength)
 {
   if ( (nsnull == aText) || (aTextLength < 1) ) {
     return;
@@ -1499,13 +1485,15 @@ RemoveDiacritics(PRUnichar* aText,
 #endif
 
 void
-nsBidiPresUtils::CalculateCharType(PRInt32& aOffset,
+nsBidiPresUtils::CalculateCharType(nsBidi* aBidiEngine,
+                                   const PRUnichar* aText,
+                                   PRInt32& aOffset,
                                    PRInt32  aCharTypeLimit,
                                    PRInt32& aRunLimit,
                                    PRInt32& aRunLength,
                                    PRInt32& aRunCount,
                                    PRUint8& aCharType,
-                                   PRUint8& aPrevCharType) const
+                                   PRUint8& aPrevCharType)
 
 {
   PRBool     strongTypeFound = PR_FALSE;
@@ -1518,14 +1506,14 @@ nsBidiPresUtils::CalculateCharType(PRInt32& aOffset,
     // Make sure we give RTL chartype to all characters that would be classified
     // as Right-To-Left by a bidi platform.
     // (May differ from the UnicodeData, eg we set RTL chartype to some NSMs.)
-    if (IS_HEBREW_CHAR(mBuffer[offset]) ) {
+    if (IS_HEBREW_CHAR(aText[offset]) ) {
       charType = eCharType_RightToLeft;
     }
-    else if (IS_ARABIC_ALPHABETIC(mBuffer[offset]) ) {
+    else if (IS_ARABIC_ALPHABETIC(aText[offset]) ) {
       charType = eCharType_RightToLeftArabic;
     }
     else {
-      mBidiEngine->GetCharTypeAt(offset, &charType);
+      aBidiEngine->GetCharTypeAt(offset, &charType);
     }
 
     if (!CHARTYPE_IS_WEAK(charType) ) {
@@ -1568,24 +1556,25 @@ nsresult nsBidiPresUtils::ProcessText(const PRUnichar*       aText,
                                       Mode                   aMode,
                                       nsBidiPositionResolve* aPosResolve,
                                       PRInt32                aPosResolveCount,
-                                      nscoord*               aWidth)
+                                      nscoord*               aWidth,
+                                      nsBidi*                aBidiEngine)
 {
   NS_ASSERTION((aPosResolve == nsnull) != (aPosResolveCount > 0), "Incorrect aPosResolve / aPosResolveCount arguments");
 
   PRInt32 runCount;
 
-  mBuffer.Assign(aText, aLength);
+  nsAutoString textBuffer(aText, aLength);
 
-  nsresult rv = mBidiEngine->SetPara(mBuffer.get(), aLength, aBaseDirection, nsnull);
+  nsresult rv = aBidiEngine->SetPara(aText, aLength, aBaseDirection, nsnull);
   if (NS_FAILED(rv))
     return rv;
 
-  rv = mBidiEngine->CountRuns(&runCount);
+  rv = aBidiEngine->CountRuns(&runCount);
   if (NS_FAILED(rv))
     return rv;
 
   nscoord xOffset = 0;
-  nscoord width, xEndRun;
+  nscoord width, xEndRun = 0;
   nscoord totalWidth = 0;
   PRInt32 i, start, limit, length;
   PRUint32 visualStart = 0;
@@ -1601,11 +1590,11 @@ nsresult nsBidiPresUtils::ProcessText(const PRUnichar*       aText,
   }
 
   for (i = 0; i < runCount; i++) {
-    rv = mBidiEngine->GetVisualRun(i, &start, &length, &aBaseDirection);
+    rv = aBidiEngine->GetVisualRun(i, &start, &length, &aBaseDirection);
     if (NS_FAILED(rv))
       return rv;
 
-    rv = mBidiEngine->GetLogicalRun(start, &limit, &level);
+    rv = aBidiEngine->GetLogicalRun(start, &limit, &level);
     if (NS_FAILED(rv))
       return rv;
 
@@ -1637,7 +1626,7 @@ nsresult nsBidiPresUtils::ProcessText(const PRUnichar*       aText,
     while (subRunCount > 0) {
       // CalculateCharType can increment subRunCount if the run
       // contains mixed character types
-      CalculateCharType(lineOffset, typeLimit, subRunLimit, subRunLength, subRunCount, charType, prevType);
+      CalculateCharType(aBidiEngine, aText, lineOffset, typeLimit, subRunLimit, subRunLength, subRunCount, charType, prevType);
       
       nsAutoString runVisualText;
       runVisualText.Assign(aText + start, subRunLength);
@@ -1828,9 +1817,9 @@ nsresult nsBidiPresUtils::ProcessTextForRenderingContext(const PRUnichar*
                                                          nscoord*               aWidth)
 {
   nsIRenderingContextBidiProcessor processor(&aRenderingContext, &aTextRunConstructionContext, nsPoint(aX, aY));
-
+  nsBidi bidiEngine;
   return ProcessText(aText, aLength, aBaseDirection, aPresContext, processor,
-                     aMode, aPosResolve, aPosResolveCount, aWidth);
+                     aMode, aPosResolve, aPosResolveCount, aWidth, &bidiEngine);
 }
 
 /* static */
@@ -1952,8 +1941,9 @@ void nsBidiPresUtils::CopyLogicalToVisual(const nsAString& aSource,
       aDest.SetLength(0);
     }
   } else {
+    nsBidi bidiEngine;
     if (!WriteLogicalToVisual(fromBegin.get(), srcLength, toBegin.get(),
-                             aBaseDirection, mBidiEngine)) {
+                             aBaseDirection, &bidiEngine)) {
       aDest.SetLength(0);
     }
   }
@@ -1965,37 +1955,4 @@ void nsBidiPresUtils::CopyLogicalToVisual(const nsAString& aSource,
                   aDest);
   }
 }
-
-PRUint32 nsBidiPresUtils::EstimateMemoryUsed()
-{
-  PRUint32 size = 0;
-
-  size += sizeof(nsBidiPresUtils);
-  size += mBuffer.Length() * sizeof(PRUnichar);
-  size += moz_malloc_usable_size(mBidiEngine->mDirPropsMemory);
-  size += moz_malloc_usable_size(mBidiEngine->mLevelsMemory);
-  size += moz_malloc_usable_size(mBidiEngine->mRunsMemory);
-
-  return size;
-}
-
-static PLDHashOperator
-TraverseKey(nsISupports *aKey, PRInt32 aData, void *aUserArg)
-{
-  nsCycleCollectionTraversalCallback *cb =
-    static_cast<nsCycleCollectionTraversalCallback*>(aUserArg);
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, "mContentToFrameIndex key");
-  cb->NoteXPCOMChild(aKey);
-  return PL_DHASH_NEXT;
-}
-
-void nsBidiPresUtils::Traverse(nsCycleCollectionTraversalCallback &cb) const
-{
-  mContentToFrameIndex.EnumerateRead(TraverseKey, &cb);
-}
-
-void nsBidiPresUtils::Unlink()
-{
-  mContentToFrameIndex.Clear();
-}
 #endif // IBMBIDI
diff --git a/layout/base/nsBidiPresUtils.h b/layout/base/nsBidiPresUtils.h
index 2b2513082206..a815a45e2b87 100644
--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@@ -55,6 +55,9 @@
 #undef DrawText
 #endif
 
+struct BidiParagraphData;
+struct BidiLineData;
+
 /**
  * A structure representing some continuation state for each frame on the line,
  * used to determine the first and the last continuation frame for each
@@ -174,9 +177,11 @@ public:
    *
    *  @lina 06/18/2000
    */
-  nsresult Resolve(nsBlockFrame* aBlockFrame);
-  void ResolveParagraph(nsBlockFrame* aBlockFrame);
-  void ResolveParagraphWithinBlock(nsBlockFrame* aBlockFrame);
+  static nsresult Resolve(nsBlockFrame* aBlockFrame);
+  static nsresult ResolveParagraph(nsBlockFrame* aBlockFrame,
+                                   BidiParagraphData* aBpd);
+  static void ResolveParagraphWithinBlock(nsBlockFrame* aBlockFrame,
+                                          BidiParagraphData* aBpd);
 
   /**
    * Reorder this line using Bidi engine.
@@ -184,8 +189,8 @@ public:
    * 
    * @lina 05/02/2000
    */
-  void ReorderFrames(nsIFrame*            aFirstFrameOnLine,
-                     PRInt32              aNumFramesOnLine);
+  static void ReorderFrames(nsIFrame*            aFirstFrameOnLine,
+                            PRInt32              aNumFramesOnLine);
 
   /**
    * Format Unicode text, taking into account bidi capabilities
@@ -194,11 +199,11 @@ public:
    *
    * @lina 06/18/2000 
    */
-  nsresult FormatUnicodeText(nsPresContext* aPresContext,
-                             PRUnichar*      aText,
-                             PRInt32&        aTextLength,
-                             nsCharType      aCharType,
-                             PRBool          aIsOddLevel);
+  static nsresult FormatUnicodeText(nsPresContext* aPresContext,
+                                    PRUnichar*      aText,
+                                    PRInt32&        aTextLength,
+                                    nsCharType      aCharType,
+                                    PRBool          aIsOddLevel);
 
   /**
    * Reorder plain text using the Unicode Bidi algorithm and send it to
@@ -217,26 +222,26 @@ public:
    * @param[in,out] aPosResolve array of logical positions to resolve into visual positions; can be nsnull if this functionality is not required
    * @param aPosResolveCount number of items in the aPosResolve array
    */
-  nsresult RenderText(const PRUnichar*       aText,
-                      PRInt32                aLength,
-                      nsBidiDirection        aBaseDirection,
-                      nsPresContext*         aPresContext,
-                      nsIRenderingContext&   aRenderingContext,
-                      nsIRenderingContext&   aTextRunConstructionContext,
-                      nscoord                aX,
-                      nscoord                aY,
-                      nsBidiPositionResolve* aPosResolve = nsnull,
-                      PRInt32                aPosResolveCount = 0)
+  static nsresult RenderText(const PRUnichar*       aText,
+                             PRInt32                aLength,
+                             nsBidiDirection        aBaseDirection,
+                             nsPresContext*         aPresContext,
+                             nsIRenderingContext&   aRenderingContext,
+                             nsIRenderingContext&   aTextRunConstructionContext,
+                             nscoord                aX,
+                             nscoord                aY,
+                             nsBidiPositionResolve* aPosResolve = nsnull,
+                             PRInt32                aPosResolveCount = 0)
   {
     return ProcessTextForRenderingContext(aText, aLength, aBaseDirection, aPresContext, aRenderingContext,
                                           aTextRunConstructionContext, MODE_DRAW, aX, aY, aPosResolve, aPosResolveCount, nsnull);
   }
   
-  nscoord MeasureTextWidth(const PRUnichar*     aText,
-                           PRInt32              aLength,
-                           nsBidiDirection      aBaseDirection,
-                           nsPresContext*       aPresContext,
-                           nsIRenderingContext& aRenderingContext)
+  static nscoord MeasureTextWidth(const PRUnichar*     aText,
+                                  PRInt32              aLength,
+                                  nsBidiDirection      aBaseDirection,
+                                  nsPresContext*       aPresContext,
+                                  nsIRenderingContext& aRenderingContext)
   {
     nscoord length;
     nsresult rv = ProcessTextForRenderingContext(aText, aLength, aBaseDirection, aPresContext,
@@ -253,10 +258,10 @@ public:
    * @param[out] aLeftMost : leftmost frame on this line
    * @param[out] aRightMost : rightmost frame on this line
    */
-  PRBool CheckLineOrder(nsIFrame*  aFirstFrameOnLine,
-                        PRInt32    aNumFramesOnLine,
-                        nsIFrame** aLeftmost,
-                        nsIFrame** aRightmost);
+  static PRBool CheckLineOrder(nsIFrame*  aFirstFrameOnLine,
+                               PRInt32    aNumFramesOnLine,
+                               nsIFrame** aLeftmost,
+                               nsIFrame** aRightmost);
 
   /**
    * Get the frame to the right of the given frame, on the same line.
@@ -265,9 +270,9 @@ public:
    * @param aFirstFrameOnLine : first frame of the line to be tested
    * @param aNumFramesOnLine : number of frames on this line
    */
-  nsIFrame* GetFrameToRightOf(const nsIFrame*  aFrame,
-                              nsIFrame*        aFirstFrameOnLine,
-                              PRInt32          aNumFramesOnLine);
+  static nsIFrame* GetFrameToRightOf(const nsIFrame*  aFrame,
+                                     nsIFrame*        aFirstFrameOnLine,
+                                     PRInt32          aNumFramesOnLine);
     
   /**
    * Get the frame to the left of the given frame, on the same line.
@@ -276,9 +281,9 @@ public:
    * @param aFirstFrameOnLine : first frame of the line to be tested
    * @param aNumFramesOnLine : number of frames on this line
    */
-  nsIFrame* GetFrameToLeftOf(const nsIFrame*  aFrame,
-                             nsIFrame*        aFirstFrameOnLine,
-                             PRInt32          aNumFramesOnLine);
+  static nsIFrame* GetFrameToLeftOf(const nsIFrame*  aFrame,
+                                    nsIFrame*        aFirstFrameOnLine,
+                                    PRInt32          aNumFramesOnLine);
     
   /**
    * Get the bidi embedding level of the given (inline) frame.
@@ -312,15 +317,16 @@ public:
    * @param aPosResolveCount number of items in the aPosResolve array
    * @param[out] aWidth Pointer to where the width will be stored (may be null)
    */
-  nsresult ProcessText(const PRUnichar*       aText,
-                       PRInt32                aLength,
-                       nsBidiDirection        aBaseDirection,
-                       nsPresContext*         aPresContext,
-                       BidiProcessor&         aprocessor,
-                       Mode                   aMode,
-                       nsBidiPositionResolve* aPosResolve,
-                       PRInt32                aPosResolveCount,
-                       nscoord*               aWidth);
+  static nsresult ProcessText(const PRUnichar*       aText,
+                              PRInt32                aLength,
+                              nsBidiDirection        aBaseDirection,
+                              nsPresContext*         aPresContext,
+                              BidiProcessor&         aprocessor,
+                              Mode                   aMode,
+                              nsBidiPositionResolve* aPosResolve,
+                              PRInt32                aPosResolveCount,
+                              nscoord*               aWidth,
+                              nsBidi*                aBidiEngine);
 
   /**
    * Make a copy of a string, converting from logical to visual order
@@ -335,33 +341,24 @@ public:
    * @param aOverride if TRUE, the text has a bidi override, according to
    *                    the direction in aDir
    */
-  void CopyLogicalToVisual(const nsAString& aSource,
-                           nsAString& aDest,
-                           nsBidiLevel aBaseDirection,
-                           PRBool aOverride);
-
-  /**
-   * Guess at how much memory is being used by this nsBidiPresUtils instance,
-   * including memory used by nsBidi.
-   */
-  PRUint32 EstimateMemoryUsed();
-
-  void Traverse(nsCycleCollectionTraversalCallback &cb) const;
-  void Unlink();
+  static void CopyLogicalToVisual(const nsAString& aSource,
+                                  nsAString& aDest,
+                                  nsBidiLevel aBaseDirection,
+                                  PRBool aOverride);
 
 private:
-  nsresult ProcessTextForRenderingContext(const PRUnichar*       aText,
-                                          PRInt32                aLength,
-                                          nsBidiDirection        aBaseDirection,
-                                          nsPresContext*         aPresContext,
-                                          nsIRenderingContext&   aRenderingContext,
-                                          nsIRenderingContext&   aTextRunConstructionContext,
-                                          Mode                   aMode,
-                                          nscoord                aX, // DRAW only
-                                          nscoord                aY, // DRAW only
-                                          nsBidiPositionResolve* aPosResolve,  /* may be null */
-                                          PRInt32                aPosResolveCount,
-                                          nscoord*               aWidth /* may be null */);
+  static nsresult ProcessTextForRenderingContext(const PRUnichar*       aText,
+                                                 PRInt32                aLength,
+                                                 nsBidiDirection        aBaseDirection,
+                                                 nsPresContext*         aPresContext,
+                                                 nsIRenderingContext&   aRenderingContext,
+                                                 nsIRenderingContext&   aTextRunConstructionContext,
+                                                 Mode                   aMode,
+                                                 nscoord                aX, // DRAW only
+                                                 nscoord                aY, // DRAW only
+                                                 nsBidiPositionResolve* aPosResolve,  /* may be null */
+                                                 PRInt32                aPosResolveCount,
+                                                 nscoord*               aWidth /* may be null */);
 
   /**
    * Traverse the child frames of the block element and:
@@ -371,24 +368,8 @@ private:
    *  than one paragraph for bidi resolution, resolve the paragraph up to that
    *  point.
    */
-  void TraverseFrames(nsBlockFrame* aBlockFrame, nsIFrame* aCurrentFrame);
-
-  /**
-   * Initialize the logically-ordered array of frames
-   * using the top-level frames of a single line
-   */
-  void InitLogicalArrayFromLine(nsIFrame* aFirstFrameOnLine,
-                                PRInt32   aNumFramesOnLine);
-
-  /**
-   * Reorder the frame array from logical to visual order
-   * 
-   * @param aReordered TRUE on return if the visual order is different from
-   *                   the logical order
-   * @param aHasRTLFrames TRUE on return if at least one of the frames is RTL
-   *                      (and therefore might have reordered descendents)
-   */
-  nsresult Reorder(PRBool& aReordered, PRBool& aHasRTLFrames);
+  static void TraverseFrames(nsBlockFrame* aBlockFrame, nsIFrame* aCurrentFrame,
+                            BidiParagraphData *aBpd);
   
   /*
    * Position aFrame and it's descendants to their visual places. Also if aFrame
@@ -403,10 +384,10 @@ private:
    *                             adding its right margin)
    * @param aContinuationStates  A map from nsIFrame* to nsFrameContinuationState
    */
-  void RepositionFrame(nsIFrame*              aFrame,
-                       PRBool                 aIsOddLevel,
-                       nscoord&               aLeft,
-                       nsContinuationStates*  aContinuationStates) const;
+  static void RepositionFrame(nsIFrame*              aFrame,
+                              PRBool                 aIsOddLevel,
+                              nscoord&               aLeft,
+                              nsContinuationStates*  aContinuationStates);
 
   /*
    * Initialize the continuation state(nsFrameContinuationState) to
@@ -416,8 +397,8 @@ private:
    *                             be initialized
    * @param aContinuationStates  A map from nsIFrame* to nsFrameContinuationState
    */
-  void InitContinuationStates(nsIFrame*              aFrame,
-                              nsContinuationStates*  aContinuationStates) const;
+  static void InitContinuationStates(nsIFrame*              aFrame,
+                                     nsContinuationStates*  aContinuationStates);
 
   /*
    * Determine if aFrame is leftmost or rightmost, and set aIsLeftMost and
@@ -434,10 +415,10 @@ private:
    * @param[out] aIsLeftMost     TRUE means aFrame is leftmost frame or continuation
    * @param[out] aIsRightMost    TRUE means aFrame is rightmost frame or continuation
    */
-   void IsLeftOrRightMost(nsIFrame*              aFrame,
-                          nsContinuationStates*  aContinuationStates,
-                          PRBool&                aIsLeftMost /* out */,
-                          PRBool&                aIsRightMost /* out */) const;
+   static void IsLeftOrRightMost(nsIFrame*              aFrame,
+                                 nsContinuationStates*  aContinuationStates,
+                                 PRBool&                aIsLeftMost /* out */,
+                                 PRBool&                aIsRightMost /* out */);
 
   /**
    *  Adjust frame positions following their visual order
@@ -446,7 +427,8 @@ private:
    *
    *  @lina 04/11/2000
    */
-  void RepositionInlineFrames(nsIFrame* aFirstChild) const;
+  static void RepositionInlineFrames(BidiLineData *aBld,
+                                     nsIFrame* aFirstChild);
   
   /**
    * Helper method for Resolve()
@@ -463,12 +445,12 @@ private:
    * @see Resolve()
    * @see RemoveBidiContinuation()
    */
-  inline
-  void EnsureBidiContinuation(nsIFrame*       aFrame,
-                              nsIFrame**      aNewFrame,
-                              PRInt32&        aFrameIndex,
-                              PRInt32         aStart,
-                              PRInt32         aEnd);
+  static inline
+  nsresult EnsureBidiContinuation(nsIFrame*       aFrame,
+                                  nsIFrame**      aNewFrame,
+                                  PRInt32&        aFrameIndex,
+                                  PRInt32         aStart,
+                                  PRInt32         aEnd);
 
   /**
    * Helper method for Resolve()
@@ -486,20 +468,23 @@ private:
    * @see Resolve()
    * @see EnsureBidiContinuation()
    */
-  void RemoveBidiContinuation(nsIFrame*       aFrame,
-                              PRInt32         aFirstIndex,
-                              PRInt32         aLastIndex,
-                              PRInt32&        aOffset) const;
-  void CalculateCharType(PRInt32& aOffset,
-                         PRInt32  aCharTypeLimit,
-                         PRInt32& aRunLimit,
-                         PRInt32& aRunLength,
-                         PRInt32& aRunCount,
-                         PRUint8& aCharType,
-                         PRUint8& aPrevCharType) const;
+  static void RemoveBidiContinuation(BidiParagraphData* aBpd,
+                                     nsIFrame*       aFrame,
+                                     PRInt32         aFirstIndex,
+                                     PRInt32         aLastIndex,
+                                     PRInt32&        aOffset);
+  static void CalculateCharType(nsBidi* aBidiEngine,
+                                const PRUnichar* aText,
+                                PRInt32& aOffset,
+                                PRInt32  aCharTypeLimit,
+                                PRInt32& aRunLimit,
+                                PRInt32& aRunLength,
+                                PRInt32& aRunCount,
+                                PRUint8& aCharType,
+                                PRUint8& aPrevCharType);
   
-  void StripBidiControlCharacters(PRUnichar* aText,
-                                  PRInt32&   aTextLength) const;
+  static void StripBidiControlCharacters(PRUnichar* aText,
+                                         PRInt32&   aTextLength);
 
   static PRBool WriteLogicalToVisual(const PRUnichar* aSrc,
                                      PRUint32 aSrcLength,
@@ -507,26 +492,9 @@ private:
                                      nsBidiLevel aBaseDirection,
                                      nsBidi* aBidiEngine);
 
- static void WriteReverse(const PRUnichar* aSrc,
-                          PRUint32 aSrcLength,
-                          PRUnichar* aDest);
-
-  nsString        mBuffer;
-  nsTArray<PRUnichar> mEmbeddingStack;
-  nsTArray<nsIFrame*> mLogicalFrames;
-  nsTArray<nsIFrame*> mVisualFrames;
-  nsDataHashtable<nsISupportsHashKey, PRInt32> mContentToFrameIndex;
-  PRInt32         mArraySize;
-  PRInt32*        mIndexMap;
-  PRUint8*        mLevels;
-  nsresult        mSuccess;
-  PRPackedBool    mIsVisual;
-  nsBidiLevel     mParaLevel;
-  nsIFrame*       mPrevFrame;
-  nsIContent*     mPrevContent;
-
-  nsAutoPtr<nsBlockInFlowLineIterator> mLineIter;
-  nsBidi*         mBidiEngine;
+  static void WriteReverse(const PRUnichar* aSrc,
+                           PRUint32 aSrcLength,
+                           PRUnichar* aDest);
 };
 
 #endif /* nsBidiPresUtils_h___ */
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 7d3b417dd3b6..c0bec2f82367 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2804,19 +2804,15 @@ nsLayoutUtils::DrawString(const nsIFrame*      aFrame,
   nsresult rv = NS_ERROR_FAILURE;
   nsPresContext* presContext = aFrame->PresContext();
   if (presContext->BidiEnabled()) {
-    nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-
-    if (bidiUtils) {
-      if (aDirection == NS_STYLE_DIRECTION_INHERIT) {
-        aDirection = aFrame->GetStyleVisibility()->mDirection;
-      }
-      nsBidiDirection direction =
-        (NS_STYLE_DIRECTION_RTL == aDirection) ?
-        NSBIDI_RTL : NSBIDI_LTR;
-      rv = bidiUtils->RenderText(aString, aLength, direction,
-                                 presContext, *aContext, *aContext,
-                                 aPoint.x, aPoint.y);
+    if (aDirection == NS_STYLE_DIRECTION_INHERIT) {
+      aDirection = aFrame->GetStyleVisibility()->mDirection;
     }
+    nsBidiDirection direction =
+      (NS_STYLE_DIRECTION_RTL == aDirection) ?
+      NSBIDI_RTL : NSBIDI_LTR;
+    rv = nsBidiPresUtils::RenderText(aString, aLength, direction,
+                                     presContext, *aContext, *aContext,
+                                     aPoint.x, aPoint.y);
   }
   if (NS_FAILED(rv))
 #endif // IBMBIDI
@@ -2835,16 +2831,12 @@ nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
 #ifdef IBMBIDI
   nsPresContext* presContext = aFrame->PresContext();
   if (presContext->BidiEnabled()) {
-    nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-
-    if (bidiUtils) {
-      const nsStyleVisibility* vis = aFrame->GetStyleVisibility();
-      nsBidiDirection direction =
-        (NS_STYLE_DIRECTION_RTL == vis->mDirection) ?
-        NSBIDI_RTL : NSBIDI_LTR;
-      return bidiUtils->MeasureTextWidth(aString, aLength,
-                                         direction, presContext, *aContext);
-    }
+    const nsStyleVisibility* vis = aFrame->GetStyleVisibility();
+    nsBidiDirection direction =
+      (NS_STYLE_DIRECTION_RTL == vis->mDirection) ?
+      NSBIDI_RTL : NSBIDI_LTR;
+    return nsBidiPresUtils::MeasureTextWidth(aString, aLength,
+                                             direction, presContext, *aContext);
   }
 #endif // IBMBIDI
   aContext->SetTextRunRTL(PR_FALSE);
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 3a9fe36ae78c..9cbb66429e22 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -361,8 +361,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsPresContext)
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLangService); // a service
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPrintSettings);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPrefChangedTimer);
-  if (tmp->mBidiUtils)
-    tmp->mBidiUtils->Traverse(cb);
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsPresContext)
@@ -387,8 +385,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsPresContext)
     tmp->mPrefChangedTimer->Cancel();
     tmp->mPrefChangedTimer = nsnull;
   }
-  if (tmp->mBidiUtils)
-    tmp->mBidiUtils->Unlink();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 
@@ -1464,15 +1460,6 @@ nsPresContext::SetBidiEnabled() const
   }
 }
 
-nsBidiPresUtils*
-nsPresContext::GetBidiUtils()
-{
-  if (!mBidiUtils)
-    mBidiUtils = new nsBidiPresUtils;
-
-  return mBidiUtils;
-}
-
 void
 nsPresContext::SetBidi(PRUint32 aSource, PRBool aForceRestyle)
 {
@@ -1515,15 +1502,6 @@ nsPresContext::GetBidi() const
   return Document()->GetBidiOptions();
 }
 
-PRUint32
-nsPresContext::GetBidiMemoryUsed()
-{
-  if (!mBidiUtils)
-    return 0;
-
-  return mBidiUtils->EstimateMemoryUsed();
-}
-
 #endif //IBMBIDI
 
 PRBool
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 7951a0ad74ed..11e32c6336a4 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -752,11 +752,6 @@ public:
 
 //Mohamed
 
-  /**
-   * Get a Bidi presentation utilities object
-   */
-  NS_HIDDEN_(nsBidiPresUtils*) GetBidiUtils();
-
   /**
    * Set the Bidi options for the presentation context
    */  
@@ -769,10 +764,6 @@ public:
    * include nsIDocument.
    */  
   NS_HIDDEN_(PRUint32) GetBidi() const;
-
-  PRUint32 GetBidiMemoryUsed();
-#else
-  PRUint32 GetBidiMemoryUsed() { return 0; }
 #endif // IBMBIDI
 
   /**
@@ -1005,7 +996,6 @@ public:
     PRUint32 result = 0;
 
     result += sizeof(nsPresContext);
-    result += GetBidiMemoryUsed();
 
     return result;
   }
@@ -1094,10 +1084,6 @@ protected:
   PRInt32               mCurAppUnitsPerDevPixel;
   PRInt32               mAutoQualityMinFontSizePixelsPref;
 
-#ifdef IBMBIDI
-  nsAutoPtr<nsBidiPresUtils> mBidiUtils;
-#endif
-
   nsCOMPtr<nsITheme> mTheme;
   nsCOMPtr<nsILanguageAtomService> mLangService;
   nsCOMPtr<nsIPrintSettings> mPrintSettings;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 2ff4abdc022e..8b7da5ac0da3 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1408,15 +1408,6 @@ public:
     return PL_DHASH_NEXT;
   }
 
-  static PLDHashOperator LiveShellBidiSizeEnumerator(PresShellPtrKey *aEntry,
-                                                     void *userArg)
-  {
-    PresShell *aShell = static_cast<PresShell*>(aEntry->GetKey());
-    PRUint32 *val = (PRUint32*)userArg;
-    *val += aShell->mPresContext->GetBidiMemoryUsed();
-    return PL_DHASH_NEXT;
-  }
-
   static PRUint32
   EstimateShellsMemory(nsTHashtable<PresShellPtrKey>::Enumerator aEnumerator)
   {
@@ -1430,10 +1421,6 @@ public:
     return EstimateShellsMemory(LiveShellSizeEnumerator);
   }
 
-  static PRInt64 SizeOfBidiMemoryReporter(void *) {
-    return EstimateShellsMemory(LiveShellBidiSizeEnumerator);
-  }
-
 protected:
   void QueryIsActive();
   nsresult UpdateImageLockingState();
@@ -1649,12 +1636,6 @@ NS_MEMORY_REPORTER_IMPLEMENT(LayoutPresShell,
                              PresShell::SizeOfLayoutMemoryReporter,
                              nsnull)
 
-NS_MEMORY_REPORTER_IMPLEMENT(LayoutBidi,
-                             "layout/bidi",
-                             "Memory in use by layout Bidi processor.",
-                             PresShell::SizeOfBidiMemoryReporter,
-                             nsnull)
-
 PresShell::PresShell()
 {
   mSelection = nsnull;
@@ -1682,7 +1663,6 @@ PresShell::PresShell()
   static bool registeredReporter = false;
   if (!registeredReporter) {
     NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(LayoutPresShell));
-    NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(LayoutBidi));
     registeredReporter = true;
   }
 
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 1c4121a4d81a..06a5856864e9 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4239,11 +4239,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
   if (aState.mPresContext->BidiEnabled()) {
     if (!aState.mPresContext->IsVisualMode() ||
         GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
-      nsBidiPresUtils* bidiUtils = aState.mPresContext->GetBidiUtils();
-
-      if (bidiUtils && bidiUtils->IsSuccessful() ) {
-        bidiUtils->ReorderFrames(aLine->mFirstChild, aLine->GetChildCount());
-      } // bidiUtils
+      nsBidiPresUtils::ReorderFrames(aLine->mFirstChild, aLine->GetChildCount());
     } // not visual mode
   } // bidi enabled
 #endif // IBMBIDI
@@ -7179,11 +7175,7 @@ nsBlockFrame::ResolveBidi()
     return NS_OK;
   }
 
-  nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-  if (!bidiUtils)
-    return NS_ERROR_NULL_POINTER;
-
-  return bidiUtils->Resolve(this);
+  return nsBidiPresUtils::Resolve(this);
 }
 #endif
 
diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp
index 04ae0b6aca7e..517b6c6dd43f 100644
--- a/layout/generic/nsFrameList.cpp
+++ b/layout/generic/nsFrameList.cpp
@@ -452,7 +452,6 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
     return aFrame ? aFrame->GetPrevSibling() : LastChild();
 
   nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(mFirstChild);  
-  nsBidiPresUtils* bidiUtils = mFirstChild->PresContext()->GetBidiUtils();
 
   nsAutoLineIterator iter = parent->GetLineIterator();
   if (!iter) { 
@@ -460,9 +459,9 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
     if (parent->GetType() == nsGkAtoms::lineFrame) {
       // Line frames are not bidi-splittable, so need to consider bidi reordering
       if (baseLevel == NSBIDI_LTR) {
-        return bidiUtils->GetFrameToLeftOf(aFrame, mFirstChild, -1);
+        return nsBidiPresUtils::GetFrameToLeftOf(aFrame, mFirstChild, -1);
       } else { // RTL
-        return bidiUtils->GetFrameToRightOf(aFrame, mFirstChild, -1);
+        return nsBidiPresUtils::GetFrameToRightOf(aFrame, mFirstChild, -1);
       }
     } else {
       // Just get the next or prev sibling, depending on block and frame direction.
@@ -497,9 +496,9 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
     iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
 
     if (baseLevel == NSBIDI_LTR) {
-      frame = bidiUtils->GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
-      frame = bidiUtils->GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
     }
   }
 
@@ -508,9 +507,9 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
     iter->GetLine(thisLine - 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
 
     if (baseLevel == NSBIDI_LTR) {
-      frame = bidiUtils->GetFrameToLeftOf(nsnull, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToLeftOf(nsnull, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
-      frame = bidiUtils->GetFrameToRightOf(nsnull, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToRightOf(nsnull, firstFrameOnLine, numFramesOnLine);
     }
   }
   return frame;
@@ -527,7 +526,6 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
     return aFrame ? aFrame->GetPrevSibling() : mFirstChild;
 
   nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(mFirstChild);
-  nsBidiPresUtils* bidiUtils = mFirstChild->PresContext()->GetBidiUtils();
   
   nsAutoLineIterator iter = parent->GetLineIterator();
   if (!iter) { 
@@ -535,9 +533,9 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
     if (parent->GetType() == nsGkAtoms::lineFrame) {
       // Line frames are not bidi-splittable, so need to consider bidi reordering
       if (baseLevel == NSBIDI_LTR) {
-        return bidiUtils->GetFrameToRightOf(aFrame, mFirstChild, -1);
+        return nsBidiPresUtils::GetFrameToRightOf(aFrame, mFirstChild, -1);
       } else { // RTL
-        return bidiUtils->GetFrameToLeftOf(aFrame, mFirstChild, -1);
+        return nsBidiPresUtils::GetFrameToLeftOf(aFrame, mFirstChild, -1);
       }
     } else {
       // Just get the next or prev sibling, depending on block and frame direction.
@@ -572,9 +570,9 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
     iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
     
     if (baseLevel == NSBIDI_LTR) {
-      frame = bidiUtils->GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
-      frame = bidiUtils->GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
     }
   }
   
@@ -584,9 +582,9 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
     iter->GetLine(thisLine + 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
     
     if (baseLevel == NSBIDI_LTR) {
-      frame = bidiUtils->GetFrameToRightOf(nsnull, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToRightOf(nsnull, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
-      frame = bidiUtils->GetFrameToLeftOf(nsnull, firstFrameOnLine, numFramesOnLine);
+      frame = nsBidiPresUtils::GetFrameToLeftOf(nsnull, firstFrameOnLine, numFramesOnLine);
     }
   }
   return frame;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 60a8b1003731..ab3249826f60 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1007,21 +1007,17 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
     nsresult rv = NS_ERROR_FAILURE;
 
     if (aPresContext->BidiEnabled()) {
-      nsBidiPresUtils* bidiUtils =  aPresContext->GetBidiUtils();
-      
-      if (bidiUtils) {
-        const nsStyleVisibility* vis = GetStyleVisibility();
-        if (vis->mDirection == NS_STYLE_DIRECTION_RTL)
-          rv = bidiUtils->RenderText(str, maxFit, NSBIDI_RTL,
-                                     aPresContext, aRenderingContext,
-                                     aRenderingContext,
-                                     aRect.XMost() - strWidth, y + maxAscent);
-        else
-          rv = bidiUtils->RenderText(str, maxFit, NSBIDI_LTR,
-                                     aPresContext, aRenderingContext,
-                                     aRenderingContext,
-                                     aRect.x, y + maxAscent);
-      }
+      const nsStyleVisibility* vis = GetStyleVisibility();
+      if (vis->mDirection == NS_STYLE_DIRECTION_RTL)
+        rv = nsBidiPresUtils::RenderText(str, maxFit, NSBIDI_RTL,
+                                         aPresContext, aRenderingContext,
+                                         aRenderingContext,
+                                         aRect.XMost() - strWidth, y + maxAscent);
+      else
+        rv = nsBidiPresUtils::RenderText(str, maxFit, NSBIDI_LTR,
+                                         aPresContext, aRenderingContext,
+                                         aRenderingContext,
+                                         aRect.x, y + maxAscent);
     }
     if (NS_FAILED(rv))
       aRenderingContext.DrawString(str, maxFit, aRect.x, y + maxAscent);
diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
index b357558d217e..052e29dbfebd 100644
--- a/layout/generic/nsLineBox.cpp
+++ b/layout/generic/nsLineBox.cpp
@@ -663,11 +663,9 @@ nsLineIterator::CheckLineOrder(PRInt32                  aLine,
   
   nsPresContext* presContext = line->mFirstChild->PresContext();
 
-  nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-
   nsIFrame* leftmostFrame;
   nsIFrame* rightmostFrame;
-  *aIsReordered = bidiUtils->CheckLineOrder(line->mFirstChild, line->GetChildCount(), &leftmostFrame, &rightmostFrame);
+  *aIsReordered = nsBidiPresUtils::CheckLineOrder(line->mFirstChild, line->GetChildCount(), &leftmostFrame, &rightmostFrame);
 
   // map leftmost/rightmost to first/last according to paragraph direction
   *aFirstVisual = mRightToLeft ? rightmostFrame : leftmostFrame;
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 7737b48ea314..b6ea3b0d0551 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -108,7 +108,6 @@
 #endif
 #include "nsAutoPtr.h"
 
-#include "nsBidiPresUtils.h"
 #include "nsBidiUtils.h"
 
 #include "nsIThebesFontMetrics.h"
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index fa669121fdde..e8d1af66a510 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -1530,48 +1530,45 @@ nsSVGGlyphFrame::EnsureTextRun(float *aDrawScale, float *aMetricsScale,
     if (!GetCharacterData(text))
       return PR_FALSE;
 
-    nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-    if (bidiUtils) {
-      nsAutoString visualText;
-
-      /*
-       * XXXsmontagu: The SVG spec says:
-       *
-       * http://www.w3.org/TR/SVG11/text.html#DirectionProperty
-       *  "For the 'direction' property to have any effect, the 'unicode-bidi'
-       *   property's value must be embed or bidi-override."
-       *
-       * The SVGTiny spec, on the other hand, says 
-       *
-       * http://www.w3.org/TR/SVGTiny12/text.html#DirectionProperty
-       *  "For the 'direction' property to have any effect on an element that 
-       *   does not by itself establish a new text chunk (such as the 'tspan'
-       *   element in SVG 1.2 Tiny), the 'unicode-bidi' property's value must
-       *   be embed or bidi-override."
-       *
-       * Note that this is different from HTML/CSS, where setting the 'dir'
-       *  attribute on an inline element automatically sets unicode-bidi: embed
-       *
-       * Our current implementation of bidi in SVG does not distinguish between
-       * different text elements, but treats every text container frame as a
-       * new text chunk, so we always set the base direction according to the
-       * direction property
-       *
-       * See also XXXsmontagu comments in nsSVGTextFrame::UpdateGlyphPositioning
-       */
-        
-      // Get the unicodeBidi property from the parent, because it doesn't
-      // inherit
-      PRBool bidiOverride = (mParent->GetStyleTextReset()->mUnicodeBidi ==
-                             NS_STYLE_UNICODE_BIDI_OVERRIDE);
-      nsBidiLevel baseDirection =
-        GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL ?
-          NSBIDI_RTL : NSBIDI_LTR;
-      bidiUtils->CopyLogicalToVisual(text, visualText,
-                                     baseDirection, bidiOverride);
-      if (!visualText.IsEmpty()) {
-        text = visualText;
-      }
+    nsAutoString visualText;
+      
+    /*
+     * XXXsmontagu: The SVG spec says:
+     *
+     * http://www.w3.org/TR/SVG11/text.html#DirectionProperty
+     *  "For the 'direction' property to have any effect, the 'unicode-bidi'
+     *   property's value must be embed or bidi-override."
+     *
+     * The SVGTiny spec, on the other hand, says 
+     *
+     * http://www.w3.org/TR/SVGTiny12/text.html#DirectionProperty
+     *  "For the 'direction' property to have any effect on an element that 
+     *   does not by itself establish a new text chunk (such as the 'tspan'
+     *   element in SVG 1.2 Tiny), the 'unicode-bidi' property's value must
+     *   be embed or bidi-override."
+     *
+     * Note that this is different from HTML/CSS, where setting the 'dir'
+     *  attribute on an inline element automatically sets unicode-bidi: embed
+     *
+     * Our current implementation of bidi in SVG does not distinguish between
+     * different text elements, but treats every text container frame as a
+     * new text chunk, so we always set the base direction according to the
+     * direction property
+     *
+     * See also XXXsmontagu comments in nsSVGTextFrame::UpdateGlyphPositioning
+     */
+    
+    // Get the unicodeBidi property from the parent, because it doesn't
+    // inherit
+    PRBool bidiOverride = (mParent->GetStyleTextReset()->mUnicodeBidi ==
+                           NS_STYLE_UNICODE_BIDI_OVERRIDE);
+    nsBidiLevel baseDirection =
+      GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL ?
+        NSBIDI_RTL : NSBIDI_LTR;
+    nsBidiPresUtils::CopyLogicalToVisual(text, visualText,
+                                         baseDirection, bidiOverride);
+    if (!visualText.IsEmpty()) {
+      text = visualText;
     }
 
     gfxMatrix m;
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 1c97b1b68b0f..d9f3ece1f044 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -533,32 +533,28 @@ nsTextBoxFrame::DrawText(nsIRenderingContext& aRenderingContext,
 
     if (mState & NS_FRAME_IS_BIDI) {
       presContext->SetBidiEnabled();
-      nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
-
-      if (bidiUtils) {
-        const nsStyleVisibility* vis = GetStyleVisibility();
-        nsBidiDirection direction = (NS_STYLE_DIRECTION_RTL == vis->mDirection) ? NSBIDI_RTL : NSBIDI_LTR;
-        if (mAccessKeyInfo && mAccessKeyInfo->mAccesskeyIndex != kNotFound) {
-           // We let the RenderText function calculate the mnemonic's
-           // underline position for us.
-           nsBidiPositionResolve posResolve;
-           posResolve.logicalIndex = mAccessKeyInfo->mAccesskeyIndex;
-           rv = bidiUtils->RenderText(mCroppedTitle.get(), mCroppedTitle.Length(), direction,
-                                      presContext, aRenderingContext,
-                                      *refContext,
-                                      aTextRect.x, baseline,
-                                      &posResolve,
-                                      1);
-           mAccessKeyInfo->mBeforeWidth = posResolve.visualLeftTwips;
-           mAccessKeyInfo->mAccessWidth = posResolve.visualWidth;
-        }
-        else
-        {
-           rv = bidiUtils->RenderText(mCroppedTitle.get(), mCroppedTitle.Length(), direction,
-                                      presContext, aRenderingContext,
-                                      *refContext,
-                                      aTextRect.x, baseline);
-        }
+      const nsStyleVisibility* vis = GetStyleVisibility();
+      nsBidiDirection direction = (NS_STYLE_DIRECTION_RTL == vis->mDirection) ? NSBIDI_RTL : NSBIDI_LTR;
+      if (mAccessKeyInfo && mAccessKeyInfo->mAccesskeyIndex != kNotFound) {
+          // We let the RenderText function calculate the mnemonic's
+          // underline position for us.
+          nsBidiPositionResolve posResolve;
+          posResolve.logicalIndex = mAccessKeyInfo->mAccesskeyIndex;
+          rv = nsBidiPresUtils::RenderText(mCroppedTitle.get(), mCroppedTitle.Length(), direction,
+                                           presContext, aRenderingContext,
+                                           *refContext,
+                                           aTextRect.x, baseline,
+                                           &posResolve,
+                                           1);
+          mAccessKeyInfo->mBeforeWidth = posResolve.visualLeftTwips;
+          mAccessKeyInfo->mAccessWidth = posResolve.visualWidth;
+      }
+      else
+      {
+          rv = nsBidiPresUtils::RenderText(mCroppedTitle.get(), mCroppedTitle.Length(), direction,
+                                           presContext, aRenderingContext,
+                                           *refContext,
+                                           aTextRect.x, baseline);
       }
     }
     if (NS_FAILED(rv) )
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index cdf16a785ce7..fb99c744348f 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -108,7 +108,7 @@
 #include "nsTreeBoxObject.h"
 
 #ifdef IBMBIDI
-#include "nsBidiPresUtils.h"
+#include "nsBidiUtils.h"
 #endif
 
 // Enumeration function that cancels all the image requests in our cache

From d70ab6f02de41e70ab5c944c1d2dd38a753e920f Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Wed, 13 Apr 2011 08:59:29 -0400
Subject: [PATCH 014/509] bug 607741 - Raise max sockets open from 50 to up to
 550. r=jduell

--HG--
extra : rebase_source : cdcfdf33e201ba83ab9b3370facf8c7a16fe469d
---
 .../base/src/nsSocketTransportService2.cpp    | 169 +++++++++++++++---
 netwerk/base/src/nsSocketTransportService2.h  |  24 ++-
 netwerk/protocol/http/nsHttpHandler.cpp       |   6 +-
 3 files changed, 169 insertions(+), 30 deletions(-)

diff --git a/netwerk/base/src/nsSocketTransportService2.cpp b/netwerk/base/src/nsSocketTransportService2.cpp
index c24e624cc3d0..27cbf5de4e7b 100644
--- a/netwerk/base/src/nsSocketTransportService2.cpp
+++ b/netwerk/base/src/nsSocketTransportService2.cpp
@@ -64,6 +64,11 @@ nsSocketTransportService *gSocketTransportService = nsnull;
 PRThread                 *gSocketThread           = nsnull;
 
 #define SEND_BUFFER_PREF "network.tcp.sendbuffer"
+#define SOCKET_LIMIT_TARGET 550U
+#define SOCKET_LIMIT_MIN     50U
+
+PRUint32 nsSocketTransportService::gMaxCount;
+PRCallOnceType nsSocketTransportService::gMaxCountInitOnce;
 
 //-----------------------------------------------------------------------------
 // ctor/dtor (called on the main/UI thread by the service manager)
@@ -75,6 +80,8 @@ nsSocketTransportService::nsSocketTransportService()
     , mLock("nsSocketTransportService::mLock")
     , mInitialized(PR_FALSE)
     , mShuttingDown(PR_FALSE)
+    , mActiveListSize(SOCKET_LIMIT_MIN)
+    , mIdleListSize(SOCKET_LIMIT_MIN)
     , mActiveCount(0)
     , mIdleCount(0)
     , mSendBufferSize(0)
@@ -85,6 +92,14 @@ nsSocketTransportService::nsSocketTransportService()
 
     NS_ASSERTION(NS_IsMainThread(), "wrong thread");
 
+    PR_CallOnce(&gMaxCountInitOnce, DiscoverMaxCount);
+    mActiveList = (SocketContext *)
+        moz_xmalloc(sizeof(SocketContext) * mActiveListSize);
+    mIdleList = (SocketContext *)
+        moz_xmalloc(sizeof(SocketContext) * mIdleListSize);
+    mPollList = (PRPollDesc *)
+        moz_xmalloc(sizeof(PRPollDesc) * (mActiveListSize + 1));
+
     NS_ASSERTION(!gSocketTransportService, "must not instantiate twice");
     gSocketTransportService = this;
 }
@@ -97,6 +112,9 @@ nsSocketTransportService::~nsSocketTransportService()
     if (mThreadEvent)
         PR_DestroyPollableEvent(mThreadEvent);
 
+    moz_free(mActiveList);
+    moz_free(mIdleList);
+    moz_free(mPollList);
     gSocketTransportService = nsnull;
 }
 
@@ -177,9 +195,11 @@ nsSocketTransportService::AttachSocket(PRFileDesc *fd, nsASocketHandler *handler
 }
 
 nsresult
-nsSocketTransportService::DetachSocket(SocketContext *sock)
+nsSocketTransportService::DetachSocket(SocketContext *listHead, SocketContext *sock)
 {
     SOCKET_LOG(("nsSocketTransportService::DetachSocket [handler=%x]\n", sock->mHandler));
+    NS_ABORT_IF_FALSE((listHead == mActiveList) || (listHead == mIdleList),
+                      "DetachSocket invalid head");
 
     // inform the handler that this socket is going away
     sock->mHandler->OnSocketDetached(sock->mFD);
@@ -188,9 +208,7 @@ nsSocketTransportService::DetachSocket(SocketContext *sock)
     sock->mFD = nsnull;
     NS_RELEASE(sock->mHandler);
 
-    // find out what list this is on.
-    PRUint32 index = sock - mActiveList;
-    if (index < NS_SOCKET_MAX_COUNT)
+    if (listHead == mActiveList)
         RemoveFromPollList(sock);
     else
         RemoveFromIdleList(sock);
@@ -211,13 +229,18 @@ nsSocketTransportService::DetachSocket(SocketContext *sock)
 nsresult
 nsSocketTransportService::AddToPollList(SocketContext *sock)
 {
+    NS_ABORT_IF_FALSE(!(((PRUint32)(sock - mActiveList)) < mActiveListSize),
+                      "AddToPollList Socket Already Active");
+
     SOCKET_LOG(("nsSocketTransportService::AddToPollList [handler=%x]\n", sock->mHandler));
-
-    if (mActiveCount == NS_SOCKET_MAX_COUNT) {
-        NS_ERROR("too many active sockets");
-        return NS_ERROR_UNEXPECTED;
+    if (mActiveCount == mActiveListSize) {
+        SOCKET_LOG(("  Active List size of %d met\n", mActiveCount));
+        if (!GrowActiveList()) {
+            NS_ERROR("too many active sockets");
+            return NS_ERROR_OUT_OF_MEMORY;
+        }
     }
-
+    
     mActiveList[mActiveCount] = *sock;
     mActiveCount++;
 
@@ -235,7 +258,7 @@ nsSocketTransportService::RemoveFromPollList(SocketContext *sock)
     SOCKET_LOG(("nsSocketTransportService::RemoveFromPollList [handler=%x]\n", sock->mHandler));
 
     PRUint32 index = sock - mActiveList;
-    NS_ASSERTION(index < NS_SOCKET_MAX_COUNT, "invalid index");
+    NS_ABORT_IF_FALSE(index < mActiveListSize, "invalid index");
 
     SOCKET_LOG(("  index=%u mActiveCount=%u\n", index, mActiveCount));
 
@@ -251,11 +274,16 @@ nsSocketTransportService::RemoveFromPollList(SocketContext *sock)
 nsresult
 nsSocketTransportService::AddToIdleList(SocketContext *sock)
 {
-    SOCKET_LOG(("nsSocketTransportService::AddToIdleList [handler=%x]\n", sock->mHandler));
+    NS_ABORT_IF_FALSE(!(((PRUint32)(sock - mIdleList)) < mIdleListSize),
+                      "AddToIdlelList Socket Already Idle");
 
-    if (mIdleCount == NS_SOCKET_MAX_COUNT) {
-        NS_ERROR("too many idle sockets");
-        return NS_ERROR_UNEXPECTED;
+    SOCKET_LOG(("nsSocketTransportService::AddToIdleList [handler=%x]\n", sock->mHandler));
+    if (mIdleCount == mIdleListSize) {
+        SOCKET_LOG(("  Idle List size of %d met\n", mIdleCount));
+        if (!GrowIdleList()) {
+            NS_ERROR("too many idle sockets");
+            return NS_ERROR_OUT_OF_MEMORY;
+        }
     }
 
     mIdleList[mIdleCount] = *sock;
@@ -270,8 +298,8 @@ nsSocketTransportService::RemoveFromIdleList(SocketContext *sock)
 {
     SOCKET_LOG(("nsSocketTransportService::RemoveFromIdleList [handler=%x]\n", sock->mHandler));
 
-    PRUint32 index = sock - &mIdleList[0];
-    NS_ASSERTION(index < NS_SOCKET_MAX_COUNT, "invalid index");
+    PRUint32 index = sock - mIdleList;
+    NS_ASSERTION(index < mIdleListSize, "invalid index in idle list");
 
     if (index != mIdleCount-1)
         mIdleList[index] = mIdleList[mIdleCount-1];
@@ -285,7 +313,7 @@ nsSocketTransportService::MoveToIdleList(SocketContext *sock)
 {
     nsresult rv = AddToIdleList(sock);
     if (NS_FAILED(rv))
-        DetachSocket(sock);
+        DetachSocket(mActiveList, sock);
     else
         RemoveFromPollList(sock);
 }
@@ -295,11 +323,43 @@ nsSocketTransportService::MoveToPollList(SocketContext *sock)
 {
     nsresult rv = AddToPollList(sock);
     if (NS_FAILED(rv))
-        DetachSocket(sock);
+        DetachSocket(mIdleList, sock);
     else
         RemoveFromIdleList(sock);
 }
 
+PRBool
+nsSocketTransportService::GrowActiveList()
+{
+    PRInt32 toAdd = gMaxCount - mActiveListSize;
+    if (toAdd > 100)
+        toAdd = 100;
+    if (toAdd < 1)
+        return PR_FALSE;
+    
+    mActiveListSize += toAdd;
+    mActiveList = (SocketContext *)
+        moz_xrealloc(mActiveList, sizeof(SocketContext) * mActiveListSize);
+    mPollList = (PRPollDesc *)
+        moz_xrealloc(mPollList, sizeof(PRPollDesc) * (mActiveListSize + 1));
+    return PR_TRUE;
+}
+
+PRBool
+nsSocketTransportService::GrowIdleList()
+{
+    PRInt32 toAdd = gMaxCount - mIdleListSize;
+    if (toAdd > 100)
+        toAdd = 100;
+    if (toAdd < 1)
+        return PR_FALSE;
+
+    mIdleListSize += toAdd;
+    mIdleList = (SocketContext *)
+        moz_xrealloc(mIdleList, sizeof(SocketContext) * mIdleListSize);
+    return PR_TRUE;
+}
+
 PRIntervalTime
 nsSocketTransportService::PollTimeout()
 {
@@ -594,9 +654,9 @@ nsSocketTransportService::Run()
     // detach any sockets
     PRInt32 i;
     for (i=mActiveCount-1; i>=0; --i)
-        DetachSocket(&mActiveList[i]);
+        DetachSocket(mActiveList, &mActiveList[i]);
     for (i=mIdleCount-1; i>=0; --i)
-        DetachSocket(&mIdleList[i]);
+        DetachSocket(mIdleList, &mIdleList[i]);
 
     // Final pass over the event queue. This makes sure that events posted by
     // socket detach handlers get processed.
@@ -635,7 +695,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
             mActiveList[i].mHandler->mPollFlags));
         //---
         if (NS_FAILED(mActiveList[i].mHandler->mCondition))
-            DetachSocket(&mActiveList[i]);
+            DetachSocket(mActiveList, &mActiveList[i]);
         else {
             PRUint16 in_flags = mActiveList[i].mHandler->mPollFlags;
             if (in_flags == 0)
@@ -655,7 +715,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
             mIdleList[i].mHandler->mPollFlags));
         //---
         if (NS_FAILED(mIdleList[i].mHandler->mCondition))
-            DetachSocket(&mIdleList[i]);
+            DetachSocket(mIdleList, &mIdleList[i]);
         else if (mIdleList[i].mHandler->mPollFlags != 0)
             MoveToPollList(&mIdleList[i]);
     }
@@ -702,7 +762,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
         //
         for (i=mActiveCount-1; i>=0; --i) {
             if (NS_FAILED(mActiveList[i].mHandler->mCondition))
-                DetachSocket(&mActiveList[i]);
+                DetachSocket(mActiveList, &mActiveList[i]);
         }
 
         if (n != 0 && mPollList[0].out_flags == PR_POLL_READ) {
@@ -771,3 +831,66 @@ nsSocketTransportService::GetSendBufferSize(PRInt32 *value)
 }
 
 
+/// ugly OS specific includes are placed at the bottom of the src for clarity
+
+#if defined(XP_WIN)
+#include <windows.h>
+#elif defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
+#include <sys/resource.h>
+#endif
+
+PRStatus
+nsSocketTransportService::DiscoverMaxCount()
+{
+    gMaxCount = SOCKET_LIMIT_MIN;
+
+#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
+    // On unix and os x network sockets and file
+    // descriptors are the same. OS X comes defaulted at 256,
+    // most linux at 1000. We can reliably use [sg]rlimit to
+    // query that and raise it. We will try to raise it 250 past
+    // our target number of SOCKET_LIMIT_TARGET so that some descriptors
+    // are still available for other things.
+
+    struct rlimit rlimitData;
+    if (getrlimit(RLIMIT_NOFILE, &rlimitData) == -1)
+        return PR_SUCCESS;
+    if (rlimitData.rlim_cur >=  SOCKET_LIMIT_TARGET + 250) {
+        gMaxCount = SOCKET_LIMIT_TARGET;
+        return PR_SUCCESS;
+    }
+
+    PRInt32 maxallowed = rlimitData.rlim_max;
+    if (maxallowed == -1) {                       /* no limit */
+        maxallowed = SOCKET_LIMIT_TARGET + 250;
+    } else if ((PRUint32)maxallowed < SOCKET_LIMIT_MIN + 250) {
+        return PR_SUCCESS;
+    } else if ((PRUint32)maxallowed > SOCKET_LIMIT_TARGET + 250) {
+        maxallowed = SOCKET_LIMIT_TARGET + 250;
+    }
+
+    rlimitData.rlim_cur = maxallowed;
+    setrlimit(RLIMIT_NOFILE, &rlimitData);
+    if (getrlimit(RLIMIT_NOFILE, &rlimitData) != -1)
+        if (rlimitData.rlim_cur > SOCKET_LIMIT_MIN + 250)
+            gMaxCount = rlimitData.rlim_cur - 250;
+
+#elif defined(XP_WIN) && !defined(WIN_CE)
+    // win 95, 98, etc had a limit of 100 - so we will just
+    // use the historical 50 in every case older than XP (0x501).
+    // >= XP is confirmed to have at least 1000
+
+    OSVERSIONINFO osInfo = { sizeof(OSVERSIONINFO) };
+    if (GetVersionEx(&osInfo)) {
+        PRInt32 version = 
+            (osInfo.dwMajorVersion & 0xff) << 8 | 
+            (osInfo.dwMinorVersion & 0xff);
+        if (version >= 0x501)                    /* xp or later */
+            gMaxCount = SOCKET_LIMIT_TARGET;
+    }
+#else
+    // other platforms are harder to test - so leave at safe legacy value
+#endif
+
+    return PR_SUCCESS;
+}
diff --git a/netwerk/base/src/nsSocketTransportService2.h b/netwerk/base/src/nsSocketTransportService2.h
index 3468fb901017..2a30c9bc2d35 100644
--- a/netwerk/base/src/nsSocketTransportService2.h
+++ b/netwerk/base/src/nsSocketTransportService2.h
@@ -47,6 +47,7 @@
 #include "pldhash.h"
 #include "prinrval.h"
 #include "prlog.h"
+#include "prinit.h"
 #include "prio.h"
 #include "nsASocketHandler.h"
 #include "nsIObserver.h"
@@ -65,7 +66,6 @@ extern PRLogModuleInfo *gSocketTransportLog;
 
 //-----------------------------------------------------------------------------
 
-#define NS_SOCKET_MAX_COUNT    50
 #define NS_SOCKET_POLL_TIMEOUT PR_INTERVAL_NO_TIMEOUT
 
 //-----------------------------------------------------------------------------
@@ -89,6 +89,12 @@ public:
 
     nsSocketTransportService();
 
+    // Max Socket count may need to get initialized/used by nsHttpHandler
+    // before this class is initialized.
+    static PRUint32 gMaxCount;
+    static PRCallOnceType gMaxCountInitOnce;
+    static PRStatus DiscoverMaxCount();
+
     //
     // the number of sockets that can be attached at any given time is
     // limited.  this is done because some operating systems (e.g., Win9x)
@@ -97,7 +103,7 @@ public:
     // call CanAttachSocket and check the result before creating a socket.
     //
     PRBool CanAttachSocket() {
-        return mActiveCount + mIdleCount < NS_SOCKET_MAX_COUNT;
+        return mActiveCount + mIdleCount < gMaxCount;
     }
 
 protected:
@@ -153,19 +159,25 @@ private:
         PRUint16          mElapsedTime;  // time elapsed w/o activity
     };
 
-    SocketContext mActiveList [ NS_SOCKET_MAX_COUNT ];
-    SocketContext mIdleList   [ NS_SOCKET_MAX_COUNT ];
+    SocketContext *mActiveList;                   /* mListSize entries */
+    SocketContext *mIdleList;                     /* mListSize entries */
 
+    PRUint32 mActiveListSize;
+    PRUint32 mIdleListSize;
     PRUint32 mActiveCount;
     PRUint32 mIdleCount;
 
-    nsresult DetachSocket(SocketContext *);
+    nsresult DetachSocket(SocketContext *, SocketContext *);
     nsresult AddToIdleList(SocketContext *);
     nsresult AddToPollList(SocketContext *);
     void RemoveFromIdleList(SocketContext *);
     void RemoveFromPollList(SocketContext *);
     void MoveToIdleList(SocketContext *sock);
     void MoveToPollList(SocketContext *sock);
+
+    PRBool GrowActiveList();
+    PRBool GrowIdleList();
+    void   InitMaxCount();
     
     //-------------------------------------------------------------------------
     // poll list (socket thread only)
@@ -174,7 +186,7 @@ private:
     // event cannot be created).
     //-------------------------------------------------------------------------
 
-    PRPollDesc mPollList[ NS_SOCKET_MAX_COUNT + 1 ];
+    PRPollDesc *mPollList;                        /* mListSize + 1 entries */
 
     PRIntervalTime PollTimeout();            // computes ideal poll timeout
     nsresult       DoPollIteration(PRBool wait);
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 2f31f96814f2..baf2e99ca504 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -844,7 +844,11 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
     if (PREF_CHANGED(HTTP_PREF("max-connections"))) {
         rv = prefs->GetIntPref(HTTP_PREF("max-connections"), &val);
         if (NS_SUCCEEDED(rv)) {
-            mMaxConnections = (PRUint16) NS_CLAMP(val, 1, NS_SOCKET_MAX_COUNT);
+            PR_CallOnce(&nsSocketTransportService::gMaxCountInitOnce,
+                        nsSocketTransportService::DiscoverMaxCount);
+            mMaxConnections =
+                (PRUint16) NS_CLAMP((PRUint32)val, 1,
+                                    nsSocketTransportService::gMaxCount);
             if (mConnMgr)
                 mConnMgr->UpdateParam(nsHttpConnectionMgr::MAX_CONNECTIONS,
                                       mMaxConnections);

From 970bd84f4dbb24c3a92f58c7b9718bde5467ecf6 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 8 Apr 2011 12:53:47 -0700
Subject: [PATCH 015/509] bug 648570: increase http idle pconn pool from 30 to
 256 on desktop. r=jduell

--HG--
extra : rebase_source : 69818fd62f5dfd71cebdb717f686d88b790d32a5
---
 modules/libpref/src/init/all.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index a647f2251f4d..7740c152e82a 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -700,8 +700,11 @@ pref("network.http.proxy.keep-alive", true);
 // the packet is lost or delayed on the route.
 pref("network.http.keep-alive.timeout", 115);
 
-// limit the absolute number of http connections.
-pref("network.http.max-connections", 30);
+// Limit the absolute number of http connections.
+// Note: the socket transport service will clamp the number below 256 if the OS
+// cannot allocate that many FDs, and it also always tries to reserve up to 250
+// file descriptors for things other than sockets.   
+pref("network.http.max-connections", 256);
 
 // limit the absolute number of http connections that can be established per
 // host.  if a http proxy server is enabled, then the "server" is the proxy

From cd179a175bd0a86b633ea666587c044dbc6303e2 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 13 Apr 2011 14:35:06 +0100
Subject: [PATCH 016/509] Backed out changeset 80451fb8f11c (bug 585152) as per
 discussion in the bug.

---
 browser/base/content/tabbrowser.xml                 |  2 +-
 .../base/content/test/browser_inspector_domPanel.js |  8 ++++----
 .../components/places/tests/unit/test_placesTxn.js  | 13 ++++---------
 .../components/sessionstore/src/nsSessionStore.js   |  8 ++++----
 .../sessionstore/test/browser/browser_248970_b.js   |  2 +-
 .../sessionstore/test/browser/browser_345898.js     |  4 ++--
 .../sessionstore/test/browser/browser_346337.js     |  2 +-
 .../sessionstore/test/browser/browser_350525.js     |  4 ++--
 .../sessionstore/test/browser/browser_393716.js     |  4 ++--
 .../sessionstore/test/browser/browser_394759.js     |  2 +-
 .../test/browser/browser_394759_privatebrowsing.js  |  2 +-
 .../sessionstore/test/browser/browser_448741.js     |  2 +-
 .../sessionstore/test/browser/browser_459906.js     |  2 +-
 .../sessionstore/test/browser/browser_465215.js     |  2 +-
 .../sessionstore/test/browser/browser_465223.js     |  2 +-
 .../sessionstore/test/browser/browser_476161.js     |  2 +-
 .../sessionstore/test/browser/browser_477657.js     |  2 +-
 .../sessionstore/test/browser/browser_524745.js     |  2 +-
 .../test/browser/browser_586068-cascaded_restore.js |  2 +-
 .../sessionstore/test/browser/browser_590268.js     |  3 +--
 .../sessionstore/test/browser/browser_607016.js     |  2 +-
 .../components/sessionstore/test/browser/head.js    |  2 +-
 content/base/test/test_CrossSiteXHR_cache.html      |  2 +-
 content/html/content/test/test_bug209275.xhtml      |  2 +-
 content/html/content/test/test_bug481335.xhtml      |  2 +-
 docshell/test/bug413310-post.sjs                    |  2 +-
 dom/tests/mochitest/whatwg/test_bug500328.html      |  2 +-
 .../cookie/test/unit/test_permmanager_expiration.js |  2 +-
 .../test/unit/test_permmanager_notifications.js     |  2 +-
 js/src/jsdate.cpp                                   | 10 ++--------
 layout/tools/reftest/reftest.js                     |  2 +-
 .../components/console/hudservice/HUDService.jsm    |  2 +-
 .../browser/browser_webconsole_basic_net_logging.js |  2 +-
 .../browser_webconsole_bug_583816_tab_focus.js      |  2 +-
 .../downloads/test/unit/test_bug_401430.js          |  2 +-
 toolkit/content/widgets/toolbar.xml                 |  2 +-
 36 files changed, 49 insertions(+), 61 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 05370f5801bf..7e5c9c0c66e2 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1271,7 +1271,7 @@
             notificationbox.appendChild(stack);
 
             var position = this.tabs.length - 1;
-            var uniqueId = "panel" + Math.floor(Date.now()) + position;
+            var uniqueId = "panel" + Date.now() + position;
             notificationbox.id = uniqueId;
             t.linkedPanel = uniqueId;
             t.linkedBrowser = b;
diff --git a/browser/base/content/test/browser_inspector_domPanel.js b/browser/base/content/test/browser_inspector_domPanel.js
index aed83263c438..4d3f80fcd7c2 100644
--- a/browser/base/content/test/browser_inspector_domPanel.js
+++ b/browser/base/content/test/browser_inspector_domPanel.js
@@ -65,25 +65,25 @@ function createDocument()
 function nodeGenerator()
 {
   let body = doc.body;
-  newProperty = "rand" + Math.floor(Date.now());
+  newProperty = "rand" + Date.now();
   body[newProperty] = Math.round(Math.random() * 100);
   InspectorUI.inspectNode(body);
   yield;
 
   let h1 = doc.querySelector("h1");
-  newProperty = "rand2" + Math.floor(Date.now());
+  newProperty = "rand2" + Date.now();
   h1[newProperty] = "test" + Math.random();
   InspectorUI.inspectNode(h1);
   yield;
 
   let first = doc.getElementById("first");
-  newProperty = "rand3" + Math.floor(Date.now());
+  newProperty = "rand3" + Date.now();
   first[newProperty] = null;
   InspectorUI.inspectNode(first);
   yield;
 
   let closing = doc.getElementById("closing");
-  newProperty = "bazbaz" + Math.floor(Date.now());
+  newProperty = "bazbaz" + Date.now();
   closing[newProperty] = false;
   InspectorUI.inspectNode(closing);
   yield;
diff --git a/browser/components/places/tests/unit/test_placesTxn.js b/browser/components/places/tests/unit/test_placesTxn.js
index 9519bfb0739c..df6c16d3769b 100644
--- a/browser/components/places/tests/unit/test_placesTxn.js
+++ b/browser/components/places/tests/unit/test_placesTxn.js
@@ -100,11 +100,6 @@ bmsvc.addObserver(observer, false);
 var bmStartIndex = 0;
 
 // main
-
-function time() {
-    return (new Date()).getTime();
-}
-
 function run_test() {
   // get bookmarks root index
   var root = bmsvc.bookmarksMenuFolder;
@@ -542,7 +537,7 @@ function run_test() {
                       expires: Ci.nsIAnnotationService.EXPIRE_NEVER };
   var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
            getService(Ci.nsINavHistoryService);
-  hs.addVisit(uri("http://www.mozilla.org/"), time() * 1000, null,
+  hs.addVisit(uri("http://www.mozilla.org/"), Date.now() * 1000, null,
               hs.TRANSITION_TYPED, false, 0);
   var genPageAnnoTxn = ptSvc.setPageAnnotation(uri("http://www.mozilla.org/"), pageAnnoObj);
   genPageAnnoTxn.doTransaction();
@@ -617,7 +612,7 @@ function run_test() {
 
   // Test editing item date added
   var oldAdded = bmsvc.getItemDateAdded(bkmk1Id);
-  var newAdded = time();
+  var newAdded = Date.now();
   var eidaTxn = ptSvc.editItemDateAdded(bkmk1Id, newAdded);
   eidaTxn.doTransaction();
   do_check_eq(newAdded, bmsvc.getItemDateAdded(bkmk1Id));
@@ -626,7 +621,7 @@ function run_test() {
 
   // Test editing item last modified 
   var oldModified = bmsvc.getItemLastModified(bkmk1Id);
-  var newModified = time();
+  var newModified = Date.now();
   var eilmTxn = ptSvc.editItemLastModified(bkmk1Id, newModified);
   eilmTxn.doTransaction();
   do_check_eq(newModified, bmsvc.getItemLastModified(bkmk1Id));
@@ -734,7 +729,7 @@ function run_test() {
 
   // Test creating an item with child transactions.
   var childTxns = [];
-  var newDateAdded = time() - 20000;
+  var newDateAdded = Date.now() - 20000;
   childTxns.push(ptSvc.editItemDateAdded(null, newDateAdded));
   var itemChildAnnoObj = { name: "testAnno/testInt",
                            type: Ci.nsIAnnotationService.TYPE_INT32,
diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index daa184cc010c..9ac5e47a8f71 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -713,7 +713,7 @@ SessionStoreService.prototype = {
       return;
 
     // assign it a unique identifier (timestamp)
-    aWindow.__SSi = "window" + Math.floor(Date.now());
+    aWindow.__SSi = "window" + Date.now();
 
     // and create its data object
     this._windows[aWindow.__SSi] = { tabs: [], selected: 0, _closedTabs: [] };
@@ -843,7 +843,7 @@ SessionStoreService.prototype = {
     let isFullyLoaded = this._isWindowLoaded(aWindow);
     if (!isFullyLoaded) {
       if (!aWindow.__SSi)
-        aWindow.__SSi = "window" + Math.floor(Date.now());
+        aWindow.__SSi = "window" + Date.now();
       this._windows[aWindow.__SSi] = this._statesToRestore[aWindow.__SS_restoreID];
       delete this._statesToRestore[aWindow.__SS_restoreID];
       delete aWindow.__SS_restoreID;
@@ -2981,7 +2981,7 @@ SessionStoreService.prototype = {
       // start might already be in use)
       var id = aIdMap[aEntry.ID] || 0;
       if (!id) {
-        for (id = Math.floor(Date.now()); id in aIdMap.used; id++);
+        for (id = Date.now(); id in aIdMap.used; id++);
         aIdMap[aEntry.ID] = id;
         aIdMap.used[id] = true;
       }
@@ -3751,7 +3751,7 @@ SessionStoreService.prototype = {
         // Assign a unique ID to correlate the window to be opened with the
         // remaining data
         window.__lastSessionWindowID = pinnedWindowState.__lastSessionWindowID
-                                     = "" + Math.floor(Date.now()) + Math.random();
+                                     = "" + Date.now() + Math.random();
 
         // Extract the cookies that belong with each pinned tab
         this._splitCookiesFromWindow(window, pinnedWindowState);
diff --git a/browser/components/sessionstore/test/browser/browser_248970_b.js b/browser/components/sessionstore/test/browser/browser_248970_b.js
index 99df81792f3c..a05c98ad3ce6 100644
--- a/browser/components/sessionstore/test/browser/browser_248970_b.js
+++ b/browser/components/sessionstore/test/browser/browser_248970_b.js
@@ -51,7 +51,7 @@ function test() {
   filePath = file.path;
 
   let fieldList = {
-    "//input[@name='input']":     Math.floor(Date.now()).toString(),
+    "//input[@name='input']":     Date.now().toString(),
     "//input[@name='spaced 1']":  Math.random().toString(),
     "//input[3]":                 "three",
     "//input[@type='checkbox']":  true,
diff --git a/browser/components/sessionstore/test/browser/browser_345898.js b/browser/components/sessionstore/test/browser/browser_345898.js
index 1d1bde0f629f..9b4a6534dc40 100644
--- a/browser/components/sessionstore/test/browser/browser_345898.js
+++ b/browser/components/sessionstore/test/browser/browser_345898.js
@@ -78,8 +78,8 @@ function test() {
      "Invalid window for setWindowValue throws");
   ok(test(function() ss.deleteWindowValue({}, "")),
      "Invalid window for deleteWindowValue throws");
-  ok(test(function() ss.deleteWindowValue(window, Math.floor(Date.now()).toString())),
+  ok(test(function() ss.deleteWindowValue(window, Date.now().toString())),
      "Nonexistent value for deleteWindowValue throws");
-  ok(test(function() ss.deleteTabValue(gBrowser.selectedTab, Math.floor(Date.now()).toString())),
+  ok(test(function() ss.deleteTabValue(gBrowser.selectedTab, Date.now().toString())),
      "Nonexistent value for deleteTabValue throws");
 }
diff --git a/browser/components/sessionstore/test/browser/browser_346337.js b/browser/components/sessionstore/test/browser/browser_346337.js
index ae4d9f1509d8..e1e36806d73a 100644
--- a/browser/components/sessionstore/test/browser/browser_346337.js
+++ b/browser/components/sessionstore/test/browser/browser_346337.js
@@ -51,7 +51,7 @@ function test() {
   filePath2 = file.path;
   
   let fieldList = {
-    "//input[@name='input']":     Math.floor(Date.now()).toString(),
+    "//input[@name='input']":     Date.now().toString(),
     "//input[@name='spaced 1']":  Math.random().toString(),
     "//input[3]":                 "three",
     "//input[@type='checkbox']":  true,
diff --git a/browser/components/sessionstore/test/browser/browser_350525.js b/browser/components/sessionstore/test/browser/browser_350525.js
index 399c1f754570..05100c58c3b9 100644
--- a/browser/components/sessionstore/test/browser/browser_350525.js
+++ b/browser/components/sessionstore/test/browser/browser_350525.js
@@ -24,7 +24,7 @@ function test() {
   ////////////////////////////
   // setWindowValue, et al. //
   ////////////////////////////
-  let key = "Unique name: " + Math.floor(Date.now());
+  let key = "Unique name: " + Date.now();
   let value = "Unique value: " + Math.random();
   
   // test adding
@@ -43,7 +43,7 @@ function test() {
   // setTabValue, et al. //
   /////////////////////////
   key = "Unique name: " + Math.random();
-  value = "Unique value: " + Math.floor(Date.now());
+  value = "Unique value: " + Date.now();
   let tab = tabbrowser.addTab();
   tab.linkedBrowser.stop();
   
diff --git a/browser/components/sessionstore/test/browser/browser_393716.js b/browser/components/sessionstore/test/browser/browser_393716.js
index e30002def324..83bc8ff3f592 100644
--- a/browser/components/sessionstore/test/browser/browser_393716.js
+++ b/browser/components/sessionstore/test/browser/browser_393716.js
@@ -13,7 +13,7 @@ function test() {
   /////////////////
   // getTabState //
   /////////////////
-  let key = "Unique key: " + Math.floor(Date.now());
+  let key = "Unique key: " + Date.now();
   let value = "Unique value: " + Math.random();
   let testURL = "about:config";
   
@@ -44,7 +44,7 @@ function test() {
   //////////////////////////////////
   let key2 = "key2";
   let value2 = "Value " + Math.random();
-  let value3 = "Another value: " + Math.floor(Date.now());
+  let value3 = "Another value: " + Date.now();
   let state = { entries: [{ url: testURL }], extData: { key2: value2 } };
   
   // create a new tab
diff --git a/browser/components/sessionstore/test/browser/browser_394759.js b/browser/components/sessionstore/test/browser/browser_394759.js
index 00d91e67aa35..abd73b936642 100644
--- a/browser/components/sessionstore/test/browser/browser_394759.js
+++ b/browser/components/sessionstore/test/browser/browser_394759.js
@@ -60,7 +60,7 @@ function test() {
   
     let testURL = "about:config";
     let uniqueKey = "bug 394759";
-    let uniqueValue = "unik" + Math.floor(Date.now());
+    let uniqueValue = "unik" + Date.now();
     let uniqueText = "pi != " + Math.random();
   
   
diff --git a/browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js b/browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
index d71dab5033f0..6ea99ed00b6a 100644
--- a/browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
+++ b/browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
@@ -105,7 +105,7 @@ function continue_test() {
   is(closedWindowCount, 0, "Correctly set window count");
 
   // Prevent VM timers issues, cache now and increment it manually.
-  let now = Math.floor(Date.now());
+  let now = Date.now();
   const TESTS = [
     { url: "about:config",
       key: "bug 394759 Non-PB",
diff --git a/browser/components/sessionstore/test/browser/browser_448741.js b/browser/components/sessionstore/test/browser/browser_448741.js
index 605daa46e609..b6c098e8f506 100644
--- a/browser/components/sessionstore/test/browser/browser_448741.js
+++ b/browser/components/sessionstore/test/browser/browser_448741.js
@@ -42,7 +42,7 @@ function test() {
   waitForExplicitFinish();
 
   let uniqueName = "bug 448741";
-  let uniqueValue = "as good as unique: " + Math.floor(Date.now());
+  let uniqueValue = "as good as unique: " + Date.now();
 
   // set a unique value on a new, blank tab
   var tab = gBrowser.addTab();
diff --git a/browser/components/sessionstore/test/browser/browser_459906.js b/browser/components/sessionstore/test/browser/browser_459906.js
index 8290bca200a5..2886385a80a6 100644
--- a/browser/components/sessionstore/test/browser/browser_459906.js
+++ b/browser/components/sessionstore/test/browser/browser_459906.js
@@ -41,7 +41,7 @@ function test() {
 
   let testURL = "http://mochi.test:8888/browser/" +
     "browser/components/sessionstore/test/browser/browser_459906_sample.html";
-  let uniqueValue = "<b>Unique:</b> " + Math.floor(Date.now());
+  let uniqueValue = "<b>Unique:</b> " + Date.now();
 
   var frameCount = 0;
   let tab = gBrowser.addTab(testURL);
diff --git a/browser/components/sessionstore/test/browser/browser_465215.js b/browser/components/sessionstore/test/browser/browser_465215.js
index 634e8b382774..81a2403a4397 100644
--- a/browser/components/sessionstore/test/browser/browser_465215.js
+++ b/browser/components/sessionstore/test/browser/browser_465215.js
@@ -41,7 +41,7 @@ function test() {
   waitForExplicitFinish();
   
   let uniqueName = "bug 465215";
-  let uniqueValue1 = "as good as unique: " + Math.floor(Date.now());
+  let uniqueValue1 = "as good as unique: " + Date.now();
   let uniqueValue2 = "as good as unique: " + Math.random();
   
   // set a unique value on a new, blank tab
diff --git a/browser/components/sessionstore/test/browser/browser_465223.js b/browser/components/sessionstore/test/browser/browser_465223.js
index 65ce11c17174..6e39b20debcf 100644
--- a/browser/components/sessionstore/test/browser/browser_465223.js
+++ b/browser/components/sessionstore/test/browser/browser_465223.js
@@ -54,7 +54,7 @@ function test() {
   
   let uniqueKey1 = "bug 465223.1";
   let uniqueKey2 = "bug 465223.2";
-  let uniqueValue1 = "unik" + Math.floor(Date.now());
+  let uniqueValue1 = "unik" + Date.now();
   let uniqueValue2 = "pi != " + Math.random();
   
   // open a window and set a value on it
diff --git a/browser/components/sessionstore/test/browser/browser_476161.js b/browser/components/sessionstore/test/browser/browser_476161.js
index e8d37aa6560e..a92c9737fdca 100644
--- a/browser/components/sessionstore/test/browser/browser_476161.js
+++ b/browser/components/sessionstore/test/browser/browser_476161.js
@@ -47,7 +47,7 @@ function test() {
     let doc = tab.linkedBrowser.contentDocument;
     
     doc.getElementById("modify1").value += Math.random();
-    doc.getElementById("modify2").value += " " + Math.floor(Date.now());
+    doc.getElementById("modify2").value += " " + Date.now();
     
     let tab2 = gBrowser.duplicateTab(tab);
     tab2.linkedBrowser.addEventListener("load", function(aEvent) {
diff --git a/browser/components/sessionstore/test/browser/browser_477657.js b/browser/components/sessionstore/test/browser/browser_477657.js
index 1f449e4540f9..68b4f3e1fe07 100644
--- a/browser/components/sessionstore/test/browser/browser_477657.js
+++ b/browser/components/sessionstore/test/browser/browser_477657.js
@@ -67,7 +67,7 @@ function test() {
     }] };
     
     let uniqueKey = "bug 477657";
-    let uniqueValue = "unik" + Math.floor(Date.now());
+    let uniqueValue = "unik" + Date.now();
   
     ss.setWindowValue(newWin, uniqueKey, uniqueValue);
     is(ss.getWindowValue(newWin, uniqueKey), uniqueValue,
diff --git a/browser/components/sessionstore/test/browser/browser_524745.js b/browser/components/sessionstore/test/browser/browser_524745.js
index c9ac386d8d62..0d10c7998ac4 100644
--- a/browser/components/sessionstore/test/browser/browser_524745.js
+++ b/browser/components/sessionstore/test/browser/browser_524745.js
@@ -52,7 +52,7 @@ function test() {
   let ss = Cc["@mozilla.org/browser/sessionstore;1"].
            getService(Ci.nsISessionStore);
   let uniqKey = "bug524745";
-  let uniqVal = Math.floor(Date.now());
+  let uniqVal = Date.now();
 
   waitForExplicitFinish();
 
diff --git a/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js b/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
index 0c823e390394..ef6122bd1c2c 100644
--- a/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
+++ b/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
@@ -761,5 +761,5 @@ function countTabs() {
 }
 
 function r() {
-  return "" + Math.floor(Date.now()) + Math.random();
+  return "" + Date.now() + Math.random();
 }
diff --git a/browser/components/sessionstore/test/browser/browser_590268.js b/browser/components/sessionstore/test/browser/browser_590268.js
index bdcca3a435f4..a44666c49a9c 100644
--- a/browser/components/sessionstore/test/browser/browser_590268.js
+++ b/browser/components/sessionstore/test/browser/browser_590268.js
@@ -1,5 +1,4 @@
 /* ***** BEGIN LICENSE BLOCK *****
- *
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -174,5 +173,5 @@ function test() {
 
 // Helper function to create a random value
 function r() {
-  return "" + Math.floor(Date.now()) + Math.random();
+  return "" + Date.now() + Math.random();
 }
diff --git a/browser/components/sessionstore/test/browser/browser_607016.js b/browser/components/sessionstore/test/browser/browser_607016.js
index d70a6337b8b5..7b2e93c0288a 100644
--- a/browser/components/sessionstore/test/browser/browser_607016.js
+++ b/browser/components/sessionstore/test/browser/browser_607016.js
@@ -150,5 +150,5 @@ function test() {
 
 // Helper function to create a random value
 function r() {
-  return "" + Math.floor(Date.now()) + Math.random();
+  return "" + Date.now() + Math.random();
 }
diff --git a/browser/components/sessionstore/test/browser/head.js b/browser/components/sessionstore/test/browser/head.js
index 283943b18905..6aca5141445f 100644
--- a/browser/components/sessionstore/test/browser/head.js
+++ b/browser/components/sessionstore/test/browser/head.js
@@ -100,5 +100,5 @@ function waitForSaveState(aSaveStateCallback) {
 };
 
 function r() {
-  return Math.floor(Date.now()) + Math.random();
+  return Date.now() + Math.random();
 }
diff --git a/content/base/test/test_CrossSiteXHR_cache.html b/content/base/test/test_CrossSiteXHR_cache.html
index d51e9130196e..9e3f1fe42a41 100644
--- a/content/base/test/test_CrossSiteXHR_cache.html
+++ b/content/base/test/test_CrossSiteXHR_cache.html
@@ -423,7 +423,7 @@ function runTest() {
              "file_CrossSiteXHR_cache_server.sjs?";
   setStateURL = baseURL + "setState=";
 
-  var unique = Math.floor(Date.now());
+  var unique = Date.now();
   for each (test in tests) {
     if (test.newTest) {
       unique++;
diff --git a/content/html/content/test/test_bug209275.xhtml b/content/html/content/test/test_bug209275.xhtml
index 56e7c326e42a..ef53e897bf68 100644
--- a/content/html/content/test/test_bug209275.xhtml
+++ b/content/html/content/test/test_bug209275.xhtml
@@ -113,7 +113,7 @@ function run() {
   const unvisitedFill = "rgb(0, 0, 255)";
   const visitedFill = "rgb(128, 0, 128)";
 
-  const rand = Math.floor(Date.now()) + "-" + Math.random();
+  const rand = Date.now() + "-" + Math.random();
 
   // Now we can start the tests in earnest.
 
diff --git a/content/html/content/test/test_bug481335.xhtml b/content/html/content/test/test_bug481335.xhtml
index 35cfa021bea2..525ff0e11e5a 100644
--- a/content/html/content/test/test_bug481335.xhtml
+++ b/content/html/content/test/test_bug481335.xhtml
@@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=481335
 
 /** Test for Bug 481335 **/
 SimpleTest.waitForExplicitFinish();
-var rand = Math.floor(Date.now()) + "-" + Math.random();
+var rand = Date.now() + "-" + Math.random();
 
 is($("t").href, "",
    "Unexpected href before set");
diff --git a/docshell/test/bug413310-post.sjs b/docshell/test/bug413310-post.sjs
index 70234a7ae995..b8d85dd3cf24 100644
--- a/docshell/test/bug413310-post.sjs
+++ b/docshell/test/bug413310-post.sjs
@@ -2,6 +2,6 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/html");
   response.write("<body onload='window.parent.onloadCount++'>" +
                  request.method + " " +
-		 Math.floor(Date.now()) +
+		 Date.now() +
 		 "</body>");
 }
diff --git a/dom/tests/mochitest/whatwg/test_bug500328.html b/dom/tests/mochitest/whatwg/test_bug500328.html
index 299eda2af33f..962a360e93ce 100644
--- a/dom/tests/mochitest/whatwg/test_bug500328.html
+++ b/dom/tests/mochitest/whatwg/test_bug500328.html
@@ -346,7 +346,7 @@ function runTest() {
   statusMsg("Done loading file_bug500328_1.html for the second time.");
 
   var ifLink = iframeCw.document.getElementById("link-anchor1");
-  var rand = Math.floor(Date.now()) + "-" + Math.random();
+  var rand = Date.now() + "-" + Math.random();
   ifLink.href = rand;
 
   // Poll the document until the link has the correct color, or this test times
diff --git a/extensions/cookie/test/unit/test_permmanager_expiration.js b/extensions/cookie/test/unit/test_permmanager_expiration.js
index c0ffe5c2605d..6a97b6e1b426 100644
--- a/extensions/cookie/test/unit/test_permmanager_expiration.js
+++ b/extensions/cookie/test/unit/test_permmanager_expiration.js
@@ -21,7 +21,7 @@ function do_run_test() {
 
   let pm = Services.permissions;
   let permURI = NetUtil.newURI("http://example.com");
-  let now = Math.floor(Date.now());
+  let now = Number(Date.now());
 
   // add a permission with *now* expiration
   pm.add(permURI, "test/expiration-perm-exp", 1, pm.EXPIRE_TIME, now);
diff --git a/extensions/cookie/test/unit/test_permmanager_notifications.js b/extensions/cookie/test/unit/test_permmanager_notifications.js
index 66ad16d18a35..7e9f25313def 100644
--- a/extensions/cookie/test/unit/test_permmanager_notifications.js
+++ b/extensions/cookie/test/unit/test_permmanager_notifications.js
@@ -22,7 +22,7 @@ function do_run_test() {
 
   let pm = Services.permissions;
   let permURI = NetUtil.newURI("http://example.com");
-  let now = (new Date()).getTime();
+  let now = Number(Date.now());
   let permType = "test/expiration-perm";
 
   let observer = new permission_observer(test_generator, now, permType);
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index ef65e527fdf3..e7fd47eb4613 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1189,16 +1189,10 @@ NowAsMillis()
     return (jsdouble) (PRMJ_Now() / PRMJ_USEC_PER_MSEC);
 }
 
-static inline jsdouble
-NowAsFractionalsMillis()
-{
-    return (jsdouble) (PRMJ_Now() / double(PRMJ_USEC_PER_MSEC));
-}
-
 static JSBool
 date_now(JSContext *cx, uintN argc, Value *vp)
 {
-    vp->setDouble(NowAsFractionalsMillis());
+    vp->setDouble(NowAsMillis());
     return JS_TRUE;
 }
 
@@ -1206,7 +1200,7 @@ date_now(JSContext *cx, uintN argc, Value *vp)
 static jsdouble FASTCALL
 date_now_tn(JSContext*)
 {
-    return NowAsFractionalsMillis();
+    return NowAsMillis();
 }
 #endif
 
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 8ab3c7498abe..0344ea832e65 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -778,7 +778,7 @@ function ServeFiles(manifestURL, depth, aURL, files)
     }
 
     gCount++;
-    var path = "/" + Math.floor(Date.now()) + "/" + gCount;
+    var path = "/" + Date.now() + "/" + gCount;
     gServer.registerDirectory(path + "/", directory);
 
     var secMan = CC[NS_SCRIPTSECURITYMANAGER_CONTRACTID]
diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 6537de01233e..20d87ca6a188 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -4963,7 +4963,7 @@ ConsoleUtils = {
    */
   timestamp: function ConsoleUtils_timestamp()
   {
-    return Math.floor(Date.now());
+    return Date.now();
   },
 
   /**
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
index fc76153a9972..36313aa45bf4 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
@@ -41,7 +41,7 @@
 // Tests that the page's resources are displayed in the console as they're
 // loaded
 
-const TEST_NETWORK_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network.html" + "?_date=" + Math.floor(Date.now());
+const TEST_NETWORK_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network.html" + "?_date=" + Date.now();
 
 function test() {
   addTab("data:text/html,Web Console basic network logging test");
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
index b2f0138aa435..abacfd0b3c9b 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
@@ -40,7 +40,7 @@ function firstTab(aEvent) {
   is(inputNode.getAttribute("focused"), "true", "inputNode is still focused");
   isnot(this.value, "doc", "input autocompleted");
 
-  HUD.jsterm.setInputValue("foobarbaz" + Math.floor(Date.now()));
+  HUD.jsterm.setInputValue("foobarbaz" + Date.now());
 
   EventUtils.synthesizeKey("VK_TAB", {});
 
diff --git a/toolkit/components/downloads/test/unit/test_bug_401430.js b/toolkit/components/downloads/test/unit/test_bug_401430.js
index 91f9f182bbcf..2029dad0ea13 100644
--- a/toolkit/components/downloads/test/unit/test_bug_401430.js
+++ b/toolkit/components/downloads/test/unit/test_bug_401430.js
@@ -44,7 +44,7 @@ const dm = Cc["@mozilla.org/download-manager;1"].getService(nsIDownloadManager);
 // U+00E3 : LATIN SMALL LETTER A WITH TILDE
 // U+041B : CYRILLIC CAPITAL LETTER EL
 // U+3056 : HIRAGANA LETTER ZA
-const resultFileName = "test\u00e3\u041b\u3056" + Math.floor(Date.now()) + ".doc";
+const resultFileName = "test\u00e3\u041b\u3056" + Date.now() + ".doc";
 
 // Milliseconds between polls.
 const POLL_REGISTRY_TIMEOUT = 200;
diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index e8d7c25ddc6b..8c720390a58d 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -296,7 +296,7 @@
                 // Due to timers resolution Date.now() can be the same for
                 // elements created in small timeframes.  So ids are
                 // differentiated through a unique count suffix.
-                newItem.id = aId + Math.floor(Date.now()) + (++this._newElementCount);
+                newItem.id = aId + Date.now() + (++this._newElementCount);
                 if (aId == "spring")
                   newItem.flex = 1;
                 break;

From 6b0a6c93bb75d0c4aad7e2200b77a38390e9eb02 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 017/509] bug 606574 - Implement event loop instrumentation
 using native events, core implementation + GTK2 implementation.
 r=karlt,cjones

---
 config/autoconf.mk.in                |   2 +
 configure.in                         |   6 +
 toolkit/xre/EventTracer.cpp          | 182 +++++++++++++++++++++++++++
 toolkit/xre/EventTracer.h            |  54 ++++++++
 toolkit/xre/Makefile.in              |   4 +
 toolkit/xre/nsAppRunner.cpp          |  16 +++
 widget/public/Makefile.in            |   7 +-
 widget/public/WidgetTraceEvent.h     |  50 ++++++++
 widget/src/gtk2/Makefile.in          |  35 +++---
 widget/src/gtk2/WidgetTraceEvent.cpp |  86 +++++++++++++
 10 files changed, 424 insertions(+), 18 deletions(-)
 create mode 100644 toolkit/xre/EventTracer.cpp
 create mode 100644 toolkit/xre/EventTracer.h
 create mode 100644 widget/public/WidgetTraceEvent.h
 create mode 100644 widget/src/gtk2/WidgetTraceEvent.cpp

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 8b94e1e081eb..90868412620d 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -716,6 +716,8 @@ ANDROID_PACKAGE_NAME = @ANDROID_PACKAGE_NAME@
 
 JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@
 
+MOZ_INSTRUMENT_EVENT_LOOP = @MOZ_INSTRUMENT_EVENT_LOOP@
+
 # We only want to do the pymake sanity on Windows, other os's can cope
 ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 # Ensure invariants between GNU Make and pymake
diff --git a/configure.in b/configure.in
index 8f667097278f..8a87470e1bde 100644
--- a/configure.in
+++ b/configure.in
@@ -5220,6 +5220,7 @@ cairo-gtk2|cairo-gtk2-x11)
     TK_LIBS='$(MOZ_GTK2_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     MOZ_PDF_PRINTING=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2-dfb)
@@ -5302,6 +5303,10 @@ if test "$MOZ_ENABLE_XREMOTE"; then
     AC_DEFINE(MOZ_ENABLE_XREMOTE)
 fi
 
+if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
+   AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
+fi
+
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK2"; then
     if test "$MOZ_X11"; then
@@ -9185,6 +9190,7 @@ AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_ASM_SUFFIX)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
+AC_SUBST(MOZ_INSTRUMENT_EVENT_LOOP)
 AC_SUBST(LIBJPEG_TURBO_AS)
 AC_SUBST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(LIBJPEG_TURBO_X86_ASM)
diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp
new file mode 100644
index 000000000000..46b89d2d92f2
--- /dev/null
+++ b/toolkit/xre/EventTracer.cpp
@@ -0,0 +1,182 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Event loop instrumentation. This code attempts to measure the
+ * latency of the UI-thread event loop by firing native events at it from
+ * a background thread, and measuring how long it takes for them
+ * to be serviced. The measurement interval (kMeasureInterval, below)
+ * is also used as the upper bound of acceptable response time.
+ * When an event takes longer than that interval to be serviced,
+ * a sample will be written to the log.
+ *
+ * Usage:
+ *
+ * Set MOZ_INSTRUMENT_EVENT_LOOP=1 in the environment to enable
+ * this instrumentation. Currently only the UI process is instrumented.
+ *
+ * Set MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT in the environment to a
+ * file path to contain the log output, the default is to log to stdout.
+ *
+ * All logged output lines start with MOZ_EVENT_TRACE. All timestamps
+ * output are milliseconds since the epoch (PRTime / 1000).
+ *
+ * On startup, a line of the form:
+ *   MOZ_EVENT_TRACE start <timestamp>
+ * will be output.
+ *
+ * On shutdown, a line of the form:
+ *   MOZ_EVENT_TRACE stop <timestamp>
+ * will be output.
+ *
+ * When an event servicing time exceeds the threshold, a line of the form:
+ *   MOZ_EVENT_TRACE sample <timestamp> <duration>
+ * will be output, where <duration> is the number of milliseconds that
+ * it took for the event to be serviced.
+ */
+
+#include "EventTracer.h"
+
+#include <stdio.h>
+
+#include "mozilla/TimeStamp.h"
+#include "mozilla/WidgetTraceEvent.h"
+#include <prenv.h>
+#include <prinrval.h>
+#include <prthread.h>
+#include <prtime.h>
+
+using mozilla::TimeDuration;
+using mozilla::TimeStamp;
+using mozilla::FireAndWaitForTracerEvent;
+
+namespace {
+
+PRThread* sTracerThread = NULL;
+bool sExit = false;
+
+/*
+ * The tracer thread fires events at the native event loop roughly
+ * every kMeasureInterval. It will sleep to attempt not to send them
+ * more quickly, but if the response time is longer than kMeasureInterval
+ * it will not send another event until the previous response is received.
+ *
+ * The output defaults to stdout, but can be redirected to a file by
+ * settting the environment variable MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT
+ * to the name of a file to use.
+ */
+void TracerThread(void *arg)
+{
+  // This should be set to the maximum latency we'd like to allow
+  // for responsiveness.
+  const PRIntervalTime kMeasureInterval = PR_MillisecondsToInterval(50);
+
+  FILE* log = NULL;
+  char* envfile = PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT");
+  if (envfile) {
+    log = fopen(envfile, "w");
+  }
+  if (log == NULL)
+    log = stdout;
+
+  fprintf(log, "MOZ_EVENT_TRACE start %llu\n", PR_Now() / PR_USEC_PER_MSEC);
+
+  while (!sExit) {
+    TimeStamp start(TimeStamp::Now());
+    PRIntervalTime next_sleep = kMeasureInterval;
+
+    //TODO: only wait up to a maximum of kMeasureInterval, return
+    // early if that threshold is exceeded and dump a stack trace
+    // or do something else useful.
+    if (FireAndWaitForTracerEvent()) {
+      TimeDuration duration = TimeStamp::Now() - start;
+      // Only report samples that exceed our measurement interval.
+      if (duration.ToMilliseconds() > kMeasureInterval) {
+        fprintf(log, "MOZ_EVENT_TRACE sample %llu %d\n",
+                PR_Now() / PR_USEC_PER_MSEC,
+                int(duration.ToSecondsSigDigits() * 1000));
+      }
+
+      if (next_sleep > duration.ToMilliseconds()) {
+        next_sleep -= int(duration.ToMilliseconds());
+      }
+      else {
+        // Don't sleep at all if this event took longer than the measure
+        // interval to deliver.
+        next_sleep = 0;
+      }
+    }
+
+    if (next_sleep != 0 && !sExit) {
+      PR_Sleep(next_sleep);
+    }
+  }
+
+  fprintf(log, "MOZ_EVENT_TRACE stop %llu\n", PR_Now() / PR_USEC_PER_MSEC);
+
+  if (log != stdout)
+    fclose(log);
+}
+
+} // namespace
+
+namespace mozilla {
+
+bool InitEventTracing()
+{
+  // Create a thread that will fire events back at the
+  // main thread to measure responsiveness.
+  NS_ABORT_IF_FALSE(!sTracerThread, "Event tracing already initialized!");
+  sTracerThread = PR_CreateThread(PR_USER_THREAD,
+                                  TracerThread,
+                                  NULL,
+                                  PR_PRIORITY_NORMAL,
+                                  PR_GLOBAL_THREAD,
+                                  PR_JOINABLE_THREAD,
+                                  0);
+  return sTracerThread != NULL;
+}
+
+void ShutdownEventTracing()
+{
+  sExit = true;
+  if (sTracerThread)
+    PR_JoinThread(sTracerThread);
+  sTracerThread = NULL;
+}
+
+}  // namespace mozilla
diff --git a/toolkit/xre/EventTracer.h b/toolkit/xre/EventTracer.h
new file mode 100644
index 000000000000..2becc53c9e62
--- /dev/null
+++ b/toolkit/xre/EventTracer.h
@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef XRE_EVENTTRACER_H_
+#define XRE_EVENTTRACER_H_
+
+namespace mozilla {
+
+// Create a thread that will fire events back at the
+// main thread to measure responsiveness. Return true
+// if the thread was created successfully.
+bool InitEventTracing();
+
+// Signal the background thread to stop, and join it.
+// Must be called from the same thread that called InitEventTracing.
+void ShutdownEventTracing();
+
+}  // namespace mozilla
+
+#endif /* XRE_EVENTTRACER_H_ */
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 4507fc1eb0a4..648b29476660 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,6 +66,10 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
+ifdef MOZ_INSTRUMENT_EVENT_LOOP
+CPPSRCS += EventTracer.cpp
+endif
+
 ifdef MOZ_SPLASHSCREEN
 ifeq ($(OS_ARCH),WINCE)
 CPPSRCS += nsSplashScreenWin.cpp
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index a47192f65001..8b4db05235f3 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -62,6 +62,10 @@ using mozilla::dom::ContentParent;
 #include "nsAppRunner.h"
 #include "nsUpdateDriver.h"
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+#include "EventTracer.h"
+#endif
+
 #ifdef XP_MACOSX
 #include "MacLaunchHelper.h"
 #include "MacApplicationDelegate.h"
@@ -3744,6 +3748,13 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
           nativeApp->Enable();
         }
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+        bool event_tracing_running = false;
+        if (PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP")) {
+          event_tracing_running = mozilla::InitEventTracing();
+        }
+#endif /* MOZ_INSTRUMENT_EVENT_LOOP */
+
         NS_TIME_FUNCTION_MARK("Next: Run");
 
         NS_TIME_FUNCTION_MARK("appStartup->Run");
@@ -3763,6 +3774,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
         NS_TIME_FUNCTION_MARK("appStartup->Run done");
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+        if (event_tracing_running)
+          mozilla::ShutdownEventTracing();
+#endif
+
         // Check for an application initiated restart.  This is one that
         // corresponds to nsIAppStartup.quit(eRestart)
         if (rv == NS_SUCCESS_RESTART_APP)
diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in
index 30383b9e7a8b..92dd0bbbd746 100644
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -46,12 +46,17 @@ MODULE		= widget
 XPIDL_MODULE	= widget
 GRE_MODULE	= 1
 
-EXPORTS_NAMESPACES = IPC
+EXPORTS_NAMESPACES = IPC mozilla
 
 EXPORTS_IPC = \
 		nsGUIEventIPC.h \
 		$(NULL)
 
+ifdef MOZ_INSTRUMENT_EVENT_LOOP
+EXPORTS_mozilla = \
+  WidgetTraceEvent.h
+endif
+
 EXPORTS		= \
 		nsIWidget.h \
 		nsGUIEvent.h \
diff --git a/widget/public/WidgetTraceEvent.h b/widget/public/WidgetTraceEvent.h
new file mode 100644
index 000000000000..7866610d7bf9
--- /dev/null
+++ b/widget/public/WidgetTraceEvent.h
@@ -0,0 +1,50 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
+#define WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
+
+namespace mozilla {
+
+// Fire a tracer event at the UI-thread event loop, and block until
+// the event is processed. This should only be called by
+// a thread that's not the UI thread.
+bool FireAndWaitForTracerEvent();
+
+}
+
+#endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index a8351d8f9d84..ad75f29de139 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -62,23 +62,24 @@ ifdef ACCESSIBILITY
 CSRCS += maiRedundantObjectFactory.c
 endif
 
-CPPSRCS		= \
-		nsWindow.cpp \
-		nsAppShell.cpp \
-		nsWidgetFactory.cpp \
-		nsToolkit.cpp \
-		nsBidiKeyboard.cpp \
-		nsLookAndFeel.cpp \
-		nsGtkKeyUtils.cpp \
-		nsFilePicker.cpp \
-		nsSound.cpp \
-		nsNativeKeyBindings.cpp \
-		nsScreenGtk.cpp \
-		nsScreenManagerGtk.cpp \
-		nsImageToPixbuf.cpp \
-		nsAccessibilityHelper.cpp \
-		nsGtkIMModule.cpp \
-		$(NULL)
+CPPSRCS = \
+  nsWindow.cpp \
+  nsAppShell.cpp \
+  nsWidgetFactory.cpp \
+  nsToolkit.cpp \
+  nsBidiKeyboard.cpp \
+  nsLookAndFeel.cpp \
+  nsGtkKeyUtils.cpp \
+  nsFilePicker.cpp \
+  nsSound.cpp \
+  nsNativeKeyBindings.cpp \
+  nsScreenGtk.cpp \
+  nsScreenManagerGtk.cpp \
+  nsImageToPixbuf.cpp \
+  nsAccessibilityHelper.cpp \
+  nsGtkIMModule.cpp \
+  WidgetTraceEvent.cpp \
+  $(NULL)
 
 ifdef MOZ_X11
 CPPSRCS         += nsIdleServiceGTK.cpp
diff --git a/widget/src/gtk2/WidgetTraceEvent.cpp b/widget/src/gtk2/WidgetTraceEvent.cpp
new file mode 100644
index 000000000000..95753ae3b230
--- /dev/null
+++ b/widget/src/gtk2/WidgetTraceEvent.cpp
@@ -0,0 +1,86 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "mozilla/WidgetTraceEvent.h"
+
+#include <glib.h>
+#include <mozilla/CondVar.h>
+#include <mozilla/Mutex.h>
+#include <stdio.h>
+
+using mozilla::CondVar;
+using mozilla::Mutex;
+using mozilla::MutexAutoLock;
+
+namespace {
+
+Mutex sMutex("Event tracer thread mutex");
+CondVar sCondVar(sMutex, "Event tracer thread condvar");
+bool sTracerProcessed = false;
+
+// This function is called from the main (UI) thread.
+gboolean TracerCallback(gpointer data)
+{
+  MutexAutoLock lock(sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  sTracerProcessed = true;
+  sCondVar.Notify();
+  return FALSE;
+}
+
+} // namespace
+
+namespace mozilla {
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  // Send a default-priority idle event through the
+  // event loop, and wait for it to finish.
+  MutexAutoLock lock(sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  g_idle_add_full(G_PRIORITY_DEFAULT,
+                  TracerCallback,
+                  NULL,
+                  NULL);
+  while (!sTracerProcessed)
+    sCondVar.Wait();
+  sTracerProcessed = false;
+  return true;
+}
+
+}  // namespace mozilla

From ab4ffe654b52e427823350679e9c989be4cbe420 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 018/509] bug 606574 - Win32 event loop instrumentation. r=jimm

---
 configure.in                            |   1 +
 widget/public/WidgetTraceEvent.h        |   3 +
 widget/src/windows/Makefile.in          |  53 ++++-----
 widget/src/windows/WidgetTraceEvent.cpp | 148 ++++++++++++++++++++++++
 widget/src/windows/nsWindow.cpp         |   8 ++
 widget/src/windows/nsWindowDefs.h       |   2 +
 6 files changed, 189 insertions(+), 26 deletions(-)
 create mode 100644 widget/src/windows/WidgetTraceEvent.cpp

diff --git a/configure.in b/configure.in
index 8a87470e1bde..a3e75682d8ea 100644
--- a/configure.in
+++ b/configure.in
@@ -5203,6 +5203,7 @@ cairo-windows)
         ;;
     esac
     MOZ_PDF_PRINTING=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2|cairo-gtk2-x11)
diff --git a/widget/public/WidgetTraceEvent.h b/widget/public/WidgetTraceEvent.h
index 7866610d7bf9..80ca85b85a51 100644
--- a/widget/public/WidgetTraceEvent.h
+++ b/widget/public/WidgetTraceEvent.h
@@ -45,6 +45,9 @@ namespace mozilla {
 // a thread that's not the UI thread.
 bool FireAndWaitForTracerEvent();
 
+// Signal that the event has been received by the event loop.
+void SignalTracerThread();
+
 }
 
 #endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in
index 876fb6c165fe..ba09e342de5b 100644
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -47,32 +47,33 @@ LIBRARY_NAME	= widget_windows
 LIBXUL_LIBRARY = 1
 
 
-CPPSRCS		= \
-	nsWindow.cpp \
-	nsWindowGfx.cpp \
-	nsWindowDbg.cpp \
-	nsAppShell.cpp \
-	nsToolkit.cpp \
-	nsFilePicker.cpp \
-	nsScreenWin.cpp	\
-	nsScreenManagerWin.cpp \
-	nsLookAndFeel.cpp \
-	nsUXThemeData.cpp \
-	nsNativeThemeWin.cpp \
-	nsWinGesture.cpp \
-	nsIdleServiceWin.cpp \
-	nsSound.cpp \
-	nsIMM32Handler.cpp \
-	WindowHook.cpp \
-	WinTaskbar.cpp \
-	TaskbarPreview.cpp \
-	TaskbarTabPreview.cpp \
-	TaskbarWindowPreview.cpp \
-	TaskbarPreviewButton.cpp \
- 	JumpListBuilder.cpp \
- 	JumpListItem.cpp \
-	GfxInfo.cpp \
-	$(NULL)
+CPPSRCS = \
+  nsWindow.cpp \
+  nsWindowGfx.cpp \
+  nsWindowDbg.cpp \
+  nsAppShell.cpp \
+  nsToolkit.cpp \
+  nsFilePicker.cpp \
+  nsScreenWin.cpp  \
+  nsScreenManagerWin.cpp \
+  nsLookAndFeel.cpp \
+  nsUXThemeData.cpp \
+  nsNativeThemeWin.cpp \
+  nsWinGesture.cpp \
+  nsIdleServiceWin.cpp \
+  nsSound.cpp \
+  nsIMM32Handler.cpp \
+  WindowHook.cpp \
+  WinTaskbar.cpp \
+  TaskbarPreview.cpp \
+  TaskbarTabPreview.cpp \
+  TaskbarWindowPreview.cpp \
+  TaskbarPreviewButton.cpp \
+  JumpListBuilder.cpp \
+  JumpListItem.cpp \
+  GfxInfo.cpp \
+  WidgetTraceEvent.cpp \
+  $(NULL)
 
 ifdef MOZ_CRASHREPORTER
 CPPSRCS += LSPAnnotator.cpp
diff --git a/widget/src/windows/WidgetTraceEvent.cpp b/widget/src/windows/WidgetTraceEvent.cpp
new file mode 100644
index 000000000000..0e2f629e180a
--- /dev/null
+++ b/widget/src/windows/WidgetTraceEvent.cpp
@@ -0,0 +1,148 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Windows widget support for event loop instrumentation.
+ * See toolkit/xre/EventTracer.cpp for more details.
+ */
+
+#include <stdio.h>
+#include <windows.h>
+
+#include "mozilla/WidgetTraceEvent.h"
+#include "nsAppShellCID.h"
+#include "nsComponentManagerUtils.h"
+#include "nsCOMPtr.h"
+#include "nsIAppShellService.h"
+#include "nsIBaseWindow.h"
+#include "nsIDocShell.h"
+#include "nsIWidget.h"
+#include "nsIXULWindow.h"
+#include "nsAutoPtr.h"
+#include "nsServiceManagerUtils.h"
+#include "nsThreadUtils.h"
+#include "nsWindowDefs.h"
+
+namespace {
+
+// Used for signaling the background thread from the main thread.
+HANDLE event_handle = NULL;
+
+// We need a runnable in order to find the hidden window on the main
+// thread.
+class HWNDGetter : public nsRunnable {
+public:
+  HWNDGetter() : hidden_window_hwnd(NULL) {}
+
+  HWND hidden_window_hwnd;
+
+  NS_IMETHOD Run() {
+    // Jump through some hoops to locate the hidden window.
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
+    nsCOMPtr<nsIXULWindow> hiddenWindow;
+
+    nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    nsCOMPtr<nsIDocShell> docShell;
+    rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell));
+    if (NS_FAILED(rv) || !docShell) {
+      return rv;
+    }
+
+    nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell));
+    
+    if (!baseWindow)
+      return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsIWidget> widget;
+    baseWindow->GetMainWidget(getter_AddRefs(widget));
+
+    if (!widget)
+      return NS_ERROR_FAILURE;
+
+    hidden_window_hwnd = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW);
+
+    return NS_OK;
+  }
+};
+
+HWND GetHiddenWindowHWND()
+{
+  // Need to dispatch this to the main thread because plenty of
+  // the things it wants to access are main-thread-only.
+  nsRefPtr<HWNDGetter> getter = new HWNDGetter();
+  NS_DispatchToMainThread(getter, NS_DISPATCH_SYNC);
+  return getter->hidden_window_hwnd;
+}
+
+} // namespace
+
+namespace mozilla {
+
+// This function is called from the main (UI) thread.
+void SignalTracerThread()
+{
+  if (event_handle != NULL)
+    SetEvent(event_handle);
+}
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  // First, try to find the hidden window.
+  static HWND hidden_window = NULL;
+  if (hidden_window == NULL) {
+    hidden_window = GetHiddenWindowHWND();
+  }
+
+  if (hidden_window == NULL)
+    return false;
+
+  if (event_handle == NULL)
+    event_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+
+  // Post the tracer message into the hidden window's message queue,
+  // and then block until it's processed.
+  PostMessage(hidden_window, MOZ_WM_TRACE, 0, 0);
+  WaitForSingleObject(event_handle, INFINITE);
+  return true;
+}
+
+}  // namespace mozilla
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 4284ef3fd1ae..18c253a170f1 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -118,6 +118,7 @@
 #include "prprf.h"
 #include "prmem.h"
 
+#include "mozilla/WidgetTraceEvent.h"
 #include "nsIAppShell.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIDOMNSUIEvent.h"
@@ -4596,6 +4597,13 @@ LRESULT CALLBACK nsWindow::WindowProcInternal(HWND hWnd, UINT msg, WPARAM wParam
     }
   }
 
+  if (msg == MOZ_WM_TRACE) {
+    // This is a tracer event for measuring event loop latency.
+    // See WidgetTraceEvent.cpp for more details.
+    mozilla::SignalTracerThread();
+    return 0;
+  }
+
   // Get the window which caused the event and ask it to process the message
   nsWindow *someWindow = GetNSWindowPtr(hWnd);
 
diff --git a/widget/src/windows/nsWindowDefs.h b/widget/src/windows/nsWindowDefs.h
index 1dc97098a804..8856b47e4cef 100644
--- a/widget/src/windows/nsWindowDefs.h
+++ b/widget/src/windows/nsWindowDefs.h
@@ -56,6 +56,8 @@
 // A magic APP message that can be sent to quit, sort of like a QUERYENDSESSION/ENDSESSION,
 // but without the query.
 #define MOZ_WM_APP_QUIT                   (WM_APP+0x0300)
+// Used as a "tracer" event to probe event loop latency.
+#define MOZ_WM_TRACE                      (WM_APP+0x0301)
 
 // GetWindowsVersion constants
 #define WIN2K_VERSION                     0x500

From d1e7a921a412db161ef0d46664f9f9401649ae46 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 019/509] bug 606574 - Cocoa event loop instrumentation.
 r=smichaud

---
 configure.in                          |  1 +
 toolkit/xre/MacApplicationDelegate.mm |  6 +-
 widget/src/cocoa/CustomCocoaEvents.h  | 51 +++++++++++++++
 widget/src/cocoa/Makefile.in          | 69 ++++++++++----------
 widget/src/cocoa/WidgetTraceEvent.mm  | 92 +++++++++++++++++++++++++++
 widget/src/cocoa/nsAppShell.mm        | 29 ++++++++-
 6 files changed, 209 insertions(+), 39 deletions(-)
 create mode 100644 widget/src/cocoa/CustomCocoaEvents.h
 create mode 100644 widget/src/cocoa/WidgetTraceEvent.mm

diff --git a/configure.in b/configure.in
index a3e75682d8ea..7dc86741cd80 100644
--- a/configure.in
+++ b/configure.in
@@ -5281,6 +5281,7 @@ cairo-cocoa)
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     MOZ_FS_LAYOUT=bundle
     MOZ_WEBGL=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-android)
diff --git a/toolkit/xre/MacApplicationDelegate.mm b/toolkit/xre/MacApplicationDelegate.mm
index ea495d89f00c..1c431d7fe053 100644
--- a/toolkit/xre/MacApplicationDelegate.mm
+++ b/toolkit/xre/MacApplicationDelegate.mm
@@ -88,6 +88,8 @@ private:
 
 static PRBool sProcessedGetURLEvent = PR_FALSE;
 
+@class GeckoNSApplication;
+
 // Methods that can be called from non-Objective-C code.
 
 // This is needed, on relaunch, to force the OS to use the "Cocoa Dock API"
@@ -97,7 +99,7 @@ EnsureUseCocoaDockAPI()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  [NSApplication sharedApplication];
+  [GeckoNSApplication sharedApplication];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -112,7 +114,7 @@ SetupMacApplicationDelegate()
   AutoAutoreleasePool pool;
 
   // Ensure that ProcessPendingGetURLAppleEvents() doesn't regress bug 377166.
-  [NSApplication sharedApplication];
+  [GeckoNSApplication sharedApplication];
 
   // This call makes it so that application:openFile: doesn't get bogus calls
   // from Cocoa doing its own parsing of the argument string. And yes, we need
diff --git a/widget/src/cocoa/CustomCocoaEvents.h b/widget/src/cocoa/CustomCocoaEvents.h
new file mode 100644
index 000000000000..f4ccf779f84a
--- /dev/null
+++ b/widget/src/cocoa/CustomCocoaEvents.h
@@ -0,0 +1,51 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file defines constants to be used in the "subtype" field of
+ * NSApplicationDefined type NSEvents.
+ */
+
+#ifndef WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
+#define WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
+
+// Empty event, just used for prodding the event loop into responding.
+const short kEventSubtypeNone = 0;
+// Tracer event, used for timing the event loop responsiveness.
+const short kEventSubtypeTrace = 1;
+
+#endif /* WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_ */
diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index d7965d21dfde..e5806ee0564a 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -60,40 +60,41 @@ EXPORTS = \
 		$(NULL)
 
 CMMSRCS = \
-		nsBidiKeyboard.mm \
-		nsClipboard.mm \
-		nsMenuX.mm \
-		nsMenuBarX.mm \
-		nsMenuItemX.mm \
-		nsMenuItemIconX.mm \
-		nsMenuUtilsX.mm \
-		nsMenuGroupOwnerX.mm \
-		nsFilePicker.mm \
-		nsDragService.mm \
-		nsToolkit.mm \
-		nsAppShell.mm \
-		nsCocoaUtils.mm \
-		nsCocoaWindow.mm \
-		nsChildView.mm \
-		nsWindowMap.mm \
-		nsWidgetFactory.mm \
-		nsCursorManager.mm \
-		nsMacCursor.mm \
-		nsScreenCocoa.mm \
-		nsScreenManagerCocoa.mm \
-		nsSound.mm \
-		nsLookAndFeel.mm \
-		nsNativeThemeCocoa.mm \
-		nsDeviceContextSpecX.mm \
-		nsPrintDialogX.mm \
-		nsPrintOptionsX.mm \
-		nsPrintSettingsX.mm \
-		nsIdleServiceX.mm \
-		nsCocoaTextInputHandler.mm \
-		nsMacDockSupport.mm \
-		nsStandaloneNativeMenu.mm \
-		GfxInfo.mm \
-		$(NULL)
+  nsBidiKeyboard.mm \
+  nsClipboard.mm \
+  nsMenuX.mm \
+  nsMenuBarX.mm \
+  nsMenuItemX.mm \
+  nsMenuItemIconX.mm \
+  nsMenuUtilsX.mm \
+  nsMenuGroupOwnerX.mm \
+  nsFilePicker.mm \
+  nsDragService.mm \
+  nsToolkit.mm \
+  nsAppShell.mm \
+  nsCocoaUtils.mm \
+  nsCocoaWindow.mm \
+  nsChildView.mm \
+  nsWindowMap.mm \
+  nsWidgetFactory.mm \
+  nsCursorManager.mm \
+  nsMacCursor.mm \
+  nsScreenCocoa.mm \
+  nsScreenManagerCocoa.mm \
+  nsSound.mm \
+  nsLookAndFeel.mm \
+  nsNativeThemeCocoa.mm \
+  nsDeviceContextSpecX.mm \
+  nsPrintDialogX.mm \
+  nsPrintOptionsX.mm \
+  nsPrintSettingsX.mm \
+  nsIdleServiceX.mm \
+  nsCocoaTextInputHandler.mm \
+  nsMacDockSupport.mm \
+  nsStandaloneNativeMenu.mm \
+  GfxInfo.mm \
+  WidgetTraceEvent.mm \
+  $(NULL)
 
 ifeq (x86_64,$(TARGET_CPU))
 CMMSRCS += ComplexTextInputPanel.mm
diff --git a/widget/src/cocoa/WidgetTraceEvent.mm b/widget/src/cocoa/WidgetTraceEvent.mm
new file mode 100644
index 000000000000..f904a147c261
--- /dev/null
+++ b/widget/src/cocoa/WidgetTraceEvent.mm
@@ -0,0 +1,92 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <Cocoa/Cocoa.h>
+#include "CustomCocoaEvents.h"
+#include <Foundation/NSAutoreleasePool.h>
+#include <mozilla/CondVar.h>
+#include <mozilla/Mutex.h>
+#include "mozilla/WidgetTraceEvent.h"
+
+using mozilla::CondVar;
+using mozilla::Mutex;
+using mozilla::MutexAutoLock;
+
+namespace {
+
+Mutex sMutex("Event tracer thread mutex");
+CondVar sCondVar(sMutex, "Event tracer thread condvar");
+bool sTracerProcessed;
+
+}
+
+namespace mozilla {
+
+// This function is called from the main (UI) thread.
+void SignalTracerThread()
+{
+  MutexAutoLock lock(sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  sTracerProcessed = true;
+  sCondVar.Notify();
+}
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+  MutexAutoLock lock(sMutex);
+  sTracerProcessed = false;
+  // Post an application-defined event to the main thread's event queue
+  // and wait for it to get processed.
+  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+                                      location:NSMakePoint(0,0)
+                                 modifierFlags:0
+                                     timestamp:0
+                                  windowNumber:0
+                                       context:NULL
+                                       subtype:kEventSubtypeTrace
+                                         data1:0
+                                         data2:0]
+             atStart:NO];
+  while (!sTracerProcessed)
+    sCondVar.Wait();
+  [pool release];
+  return true;
+}
+
+}  // namespace mozilla
diff --git a/widget/src/cocoa/nsAppShell.mm b/widget/src/cocoa/nsAppShell.mm
index 0491a8bef31f..f128e5acdd02 100644
--- a/widget/src/cocoa/nsAppShell.mm
+++ b/widget/src/cocoa/nsAppShell.mm
@@ -43,6 +43,8 @@
 #import <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 
+#include "CustomCocoaEvents.h"
+#include "mozilla/WidgetTraceEvent.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
@@ -169,6 +171,27 @@ PRBool nsCocoaAppModalWindowList::GeckoModalAboveCocoaModal()
   return (topItem.mWidget != nsnull);
 }
 
+// GeckoNSApplication
+//
+// Subclass of NSApplication for filtering out certain events.
+@interface GeckoNSApplication : NSApplication
+{
+}
+@end
+
+@implementation GeckoNSApplication
+- (void)sendEvent:(NSEvent *)anEvent
+{
+  if ([anEvent type] == NSApplicationDefined &&
+      [anEvent subtype] == kEventSubtypeTrace) {
+    mozilla::SignalTracerThread();
+    return;
+  }
+  [super sendEvent:anEvent];
+}
+@end
+
+
 // AppShellDelegate
 //
 // Cocoa bridge class.  An object of this class is registered to receive
@@ -286,7 +309,7 @@ nsAppShell::Init()
   [NSBundle loadNibFile:
                      [NSString stringWithUTF8String:(const char*)nibPath.get()]
       externalNameTable:
-           [NSDictionary dictionaryWithObject:[NSApplication sharedApplication]
+           [NSDictionary dictionaryWithObject:[GeckoNSApplication sharedApplication]
                                        forKey:@"NSOwner"]
                withZone:NSDefaultMallocZone()];
 
@@ -388,7 +411,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                        timestamp:0
                                     windowNumber:0
                                          context:NULL
-                                         subtype:0
+                                         subtype:kEventSubtypeNone
                                            data1:0
                                            data2:0]
              atStart:NO];
@@ -410,7 +433,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                      timestamp:0
                                   windowNumber:0
                                        context:NULL
-                                       subtype:0
+                                       subtype:kEventSubtypeNone
                                          data1:0
                                          data2:0]
            atStart:NO];

From cb4acc863c165c22f5a860b1dff91970dca106e4 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Thu, 24 Mar 2011 18:03:14 -0400
Subject: [PATCH 020/509] Bug 619002 - When deleting text from edit fields the
 wrong text is reported through at-spi r=fernando,ginn.chen f=surkov

---
 accessible/src/atk/nsAccessNodeWrap.cpp |  4 ++++
 accessible/src/atk/nsAccessNodeWrap.h   |  7 +++++++
 accessible/src/atk/nsAccessibleWrap.cpp | 23 ++++++++++++++++++-----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/accessible/src/atk/nsAccessNodeWrap.cpp b/accessible/src/atk/nsAccessNodeWrap.cpp
index 446cbfe6c4af..8c4b6463169a 100644
--- a/accessible/src/atk/nsAccessNodeWrap.cpp
+++ b/accessible/src/atk/nsAccessNodeWrap.cpp
@@ -38,6 +38,9 @@
 
 #include "nsAccessNodeWrap.h"
 #include "nsApplicationAccessibleWrap.h"
+#include "nsMaiInterfaceText.h"
+
+PRBool nsAccessNodeWrap::gHaveNewTextSignals = PR_FALSE;
 
 /* For documentation of the accessibility architecture, 
  * see http://lxr.mozilla.org/seamonkey/source/accessible/accessible-docs.html
@@ -68,6 +71,7 @@ nsAccessNodeWrap::~nsAccessNodeWrap()
 void nsAccessNodeWrap::InitAccessibility()
 {
   nsAccessNode::InitXPAccessibility();
+  gHaveNewTextSignals = g_signal_lookup("text-insert", ATK_TYPE_TEXT);
 }
 
 void nsAccessNodeWrap::ShutdownAccessibility()
diff --git a/accessible/src/atk/nsAccessNodeWrap.h b/accessible/src/atk/nsAccessNodeWrap.h
index 22ceab81bb57..6ee2215a8505 100644
--- a/accessible/src/atk/nsAccessNodeWrap.h
+++ b/accessible/src/atk/nsAccessNodeWrap.h
@@ -53,6 +53,13 @@ public: // construction, destruction
 
     static void InitAccessibility();
     static void ShutdownAccessibility();
+
+    /*
+     * do we have text-remove and text-insert signals if not we need to use
+     * text-changed see nsAccessibleWrap::FireAtkTextChangedEvent() and
+     * bug 619002
+     */
+    static PRBool gHaveNewTextSignals;
 };
 
 #endif
diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp
index e1137ff0139c..7473d71d2836 100644
--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -1361,14 +1361,27 @@ nsAccessibleWrap::FireAtkTextChangedEvent(AccEvent* aEvent,
     PRInt32 start = event->GetStartOffset();
     PRUint32 length = event->GetLength();
     PRBool isInserted = event->IsTextInserted();
-
     PRBool isFromUserInput = aEvent->IsFromUserInput();
+    char* signal_name = nsnull;
 
-    char *signal_name = g_strconcat(isInserted ? "text_changed::insert" : "text_changed::delete",
-                                    isFromUserInput ? "" : kNonUserInputEvent, NULL);
-    g_signal_emit_by_name(aObject, signal_name, start, length);
-    g_free (signal_name);
+    if (gHaveNewTextSignals) {
+        nsAutoString text;
+        event->GetModifiedText(text);
+        signal_name = g_strconcat(isInserted ? "text-insert" : "text-remove",
+                                  isFromUserInput ? "" : "::system", NULL);
+        g_signal_emit_by_name(aObject, signal_name, start, length,
+                              NS_ConvertUTF16toUTF8(text).get());
+    } else {
+        // XXX remove this code and the gHaveNewTextSignals check when we can
+        // stop supporting old atk since it doesn't really work anyway
+        // see bug 619002
+        signal_name = g_strconcat(isInserted ? "text_changed::insert" :
+                                  "text_changed::delete",
+                                  isFromUserInput ? "" : kNonUserInputEvent, NULL);
+        g_signal_emit_by_name(aObject, signal_name, start, length);
+    }
 
+    g_free(signal_name);
     return NS_OK;
 }
 

From bcac02daf13c7ed52f72a5e3826104761698fde9 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Tue, 12 Apr 2011 15:38:06 -0400
Subject: [PATCH 021/509] Bug 647453 - Removed serialized JS from omnijar,
 r=taras,khuey

---
 browser/installer/Makefile.in         | 14 ++++++++++++--
 browser/installer/precompile_cache.js | 25 ++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index acea03715aa5..fcfd352c68e7 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -122,13 +122,23 @@ ifdef RUN_TEST_PROGRAM
 _ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
 endif
 
+ifndef MOZ_DEBUG
+# The precompile_cache.js script outputs a list of files that were
+# serialized and do not need to be included in the omnijar anymore
+STRIP_ORIGINAL_FILES = zip -d omni.jar `cat sc_log.txt`
+else
+STRIP_ORIGINAL_FILES = true
+endif
+
 GENERATE_CACHE = \
-  $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \
+  $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip", "sc_log.txt");' && \
   rm -rf jsloader && \
   $(UNZIP) startupCache.zip && \
   rm startupCache.zip && \
   find jsloader | xargs touch -t 201001010000 && \
-  $(ZIP) -r9mX omni.jar jsloader
+  $(ZIP) -r9mX omni.jar jsloader && \
+  $(STRIP_ORIGINAL_FILES) && \
+  rm sc_log.txt
 endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
diff --git a/browser/installer/precompile_cache.js b/browser/installer/precompile_cache.js
index ff3593255b84..942b4af5367b 100644
--- a/browser/installer/precompile_cache.js
+++ b/browser/installer/precompile_cache.js
@@ -43,6 +43,14 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
+const MODE_RDONLY   = 0x01;
+const MODE_WRONLY   = 0x02;
+const MODE_CREATE   = 0x08;
+const MODE_APPEND   = 0x10;
+const MODE_TRUNCATE = 0x20;
+
+var out;
+
 function setenv(name, val) {
   try {
     var environment = Components.classes["@mozilla.org/process/environment;1"].
@@ -71,6 +79,7 @@ function load_entries(entries, prefix) {
       continue;
     if (c.indexOf("services-crypto") >= 0)
       continue;
+    out.writeString(c + "\n");
     load(prefix + c);
   }
 }
@@ -78,6 +87,7 @@ function load_entries(entries, prefix) {
 function load_custom_entries(entries, subst) {
   while (entries.hasMore()) {
     var c = entries.getNext();
+    out.writeString(c + "\n");
     load("resource://" + subst + "/" + c.replace("modules/" + subst + "/", ""));
   }
 }
@@ -94,7 +104,7 @@ function openJar(file) {
   return zipreader;
 }
 
-function populate_startupcache(omnijarName, startupcacheName) {
+function populate_startupcache(omnijarName, startupcacheName, logName) {
   var file = getGreDir();
   file.append(omnijarName);
   zipreader = openJar(file);
@@ -103,6 +113,18 @@ function populate_startupcache(omnijarName, startupcacheName) {
   scFile.append(startupcacheName);
   setenv("MOZ_STARTUP_CACHE", scFile.path);
 
+  var logFile = getGreDir();
+  logFile.append(logName);
+  var stream = Cc["@mozilla.org/network/file-output-stream;1"]
+                 .createInstance(Ci.nsIFileOutputStream);
+
+  stream.init(logFile, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, 0666, 0);
+
+  out = Cc["@mozilla.org/intl/converter-output-stream;1"]
+          .createInstance(Ci.nsIConverterOutputStream);
+
+  out.init(stream, "UTF-8", 0, 0);
+
   // the sync part below doesn't work as smoothly
   let ioService = Cc["@mozilla.org/network/io-service;1"].
     getService(Ci.nsIIOService);
@@ -126,4 +148,5 @@ function populate_startupcache(omnijarName, startupcacheName) {
   load_entries(zipreader.findEntries("modules/*js"), "resource://gre/");
   load_entries(zipreader.findEntries("modules/*jsm"), "resource://gre/");
   zipreader.close();
+  out.close();
 }

From 148bcf55fdc9981ba963fbb568f16ea517de6689 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Tue, 12 Apr 2011 15:39:50 -0400
Subject: [PATCH 022/509] Bug 647462 - Video layer should not be ARGB by
 default; r=chris.double

---
 layout/generic/nsVideoFrame.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index e82ed168606a..ea936495f0e7 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -276,6 +276,7 @@ nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   layer->SetContainer(container);
   layer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(this));
+  layer->SetContentFlags(Layer::CONTENT_OPAQUE);
   // Set a transform on the layer to draw the video in the right place
   gfxMatrix transform;
   transform.Translate(r.pos);

From 53789e73f2c0f98900e839867dc23918dcf41d79 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
Date: Tue, 12 Apr 2011 15:45:24 -0400
Subject: [PATCH 023/509] Bug 624133 - Update libpng to version 1.4.7. r=joe

---
 modules/libimg/png/CHANGES      | 187 +++++++++-
 modules/libimg/png/LICENSE      |   6 +-
 modules/libimg/png/MOZCHANGES   |   2 +
 modules/libimg/png/README       |  12 +-
 modules/libimg/png/mozpngconf.h |  16 +-
 modules/libimg/png/png.c        |  30 +-
 modules/libimg/png/png.h        | 594 +++++++++++++++++---------------
 modules/libimg/png/pngconf.h    | 137 +++++---
 modules/libimg/png/pngerror.c   |  12 +-
 modules/libimg/png/pngget.c     | 160 ++++-----
 modules/libimg/png/pngmem.c     |   6 +-
 modules/libimg/png/pngpread.c   | 121 +++----
 modules/libimg/png/pngpriv.h    |  37 +-
 modules/libimg/png/pngread.c    |  85 ++---
 modules/libimg/png/pngrio.c     |   6 +-
 modules/libimg/png/pngrtran.c   |  45 ++-
 modules/libimg/png/pngrutil.c   | 251 ++++++++------
 modules/libimg/png/pngset.c     |  61 ++--
 modules/libimg/png/pngtrans.c   |   8 +-
 modules/libimg/png/pngwrite.c   |  34 +-
 modules/libimg/png/pngwtran.c   |   3 +
 modules/libimg/png/pngwutil.c   |  86 +++--
 22 files changed, 1126 insertions(+), 773 deletions(-)

diff --git a/modules/libimg/png/CHANGES b/modules/libimg/png/CHANGES
index 0dff4892299f..6574a0bea482 100644
--- a/modules/libimg/png/CHANGES
+++ b/modules/libimg/png/CHANGES
@@ -1479,7 +1479,7 @@ version 1.2.9beta5 [March 4, 2006]
   Removed trailing blanks from source files.
   Put version and date of latest change in each source file, and changed
     copyright year accordingly.
-  More cleanup of configure.ac, Makefile.ac, and associated scripts.
+  More cleanup of configure.ac, Makefile.am, and associated scripts.
   Restored scripts/makefile.elf which was inadvertently deleted.
 
 version 1.2.9beta6 [March 6, 2006]
@@ -2610,6 +2610,191 @@ version 1.4.3rc03 [June 23, 2010]
 version 1.4.3 [June 26, 2010]
   Updated some of the "last changed" dates.
 
+version 1.4.4beta01 [July 12, 2010]
+  Removed extraneous new_push_process_row.c file.
+  Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5
+  Removed some newly-added TAB characters from pngpread.c.
+  Fixed some indentation in pngpread.c and pngrutil.c
+  Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans)
+  Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {')
+  Put "#ifndef PNG_EXTERN, #endif" around "#define PNG_EXTERN" in pngpriv.h
+
+version 1.4.4beta02 [July 24, 2010]
+  Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2
+  Moved the definition of png_snprintf() outside of the enclosing
+    #ifdef blocks in pngconf.h
+  Added a special case typedef of png_longjmp_ptr for WATCOM.
+
+version 1.4.4beta03 [July 24, 2010]
+  Removed reference to cbuilder5/* from Makefile.in and Makefile.am
+  Eliminated the new special case typedef of png_longjmp_ptr for WATCOM
+    and made a special case "#define PNGAPI" in pngconf.h instead.
+
+version 1.4.4beta04 [July 31, 2010]
+  Updated the read macros and functions from 1.5.0beta38.
+
+version 1.4.4beta05 [August 6, 2010]
+  Updated projects/visualc71 so it can find scripts/pnglibconf.h
+  Removed unused png_mem_* defines from pngconf.h.
+  Correct use of _WINDOWS_ in pngconf.h
+
+version 1.4.4beta06 [August 11, 2010]
+  Don't try to use version-script with cygwin/mingw.
+  Revised contrib/gregbook to work under cygwin/mingw.
+
+version 1.4.4beta07 [August 26, 2010]
+  Updated prebuilt aclocal.m4 and ltmain.sh
+  Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov)
+  Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for
+    installing libpng in /usr/lib64 (Funda Wang).
+  Revised CMakeLists.txt to put the man pages in share/man/man* not man/man*
+  Revised CMakeLists.txt to make symlinks instead of copies when installing.
+  Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)
+  Moved "#include pngusr.h" ahead of PNG_USER_PRIVATEBUILD test in pngconf.h
+  Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c
+  Eliminated new unnecessary #if tests regarding the sCAL chunk from pngrutil.c
+
+version 1.4.4beta08 [September 2, 2010]
+  Updated the xcode project to work with libpng-1.4.x and added iOS targets
+    for simulator and device (Philippe Hausler).
+
+version 1.4.4rc01 [September 10, 2010]
+  No changes.
+
+version 1.4.4rc02 [September 13, 2010]
+  Revised CMakeLists.txt (Philip Lowman).
+
+version 1.4.4rc03 [September 14, 2010]
+  Removed an extraneous close-double-quote from CMakeLists.txt
+  Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c
+
+version 1.4.4rc04 [September 16, 2010]
+  Fixed indentation and removed debugging message from CMakeLists.txt
+  Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER,
+    $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE
+
+version 1.4.4rc05 [September 20, 2010]
+  Rebuilt configure scripts with automake-1.11.1 instead of automake-1.11.
+  Removed unused mkinstalldirs file.
+
+version 1.4.4 [September 23, 2010]
+  No changes.
+
+version 1.4.5beta01 [September 25, 2010]
+  Fixed possible configure.ac bug introduced in version 1.4.4rc05.
+  Rebuilt configure scripts with autoconf-2.68 instead of autoconf-2.65
+
+version 1.4.5beta02 [October 5, 2010]
+  Reverted configure scripts to autoconf-2.65
+  Fixed problem with symbols creation in Makefile.am which was assuming that
+    all versions of cpp write to standard output by default (Martin Banky). The
+    bug was introduced in libpng-1.2.9beta5.
+
+version 1.4.5beta03 [October 8, 2010]
+  Wrapped long lines in CMakeLists.txt and introduced ${libpng_public_hdrs}
+  Undid Makefile.am revision of 1.4.5beta02.
+
+version 1.4.5beta04 [November 8, 2010]
+  Check for out-of-range text compression mode in png_set_text().
+
+version 1.4.5rc01 [November 19, 2010]
+  No changes.
+
+version 1.4.5beta05 [November 20, 2010]
+  Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
+  Moved reading of file signature into png_read_sig (Cosmin)
+  Fixed atomicity of chunk header serialization (Cosmin)
+  Added test for io_state in pngtest.c (Cosmin)
+  Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts.
+
+version 1.4.5beta06 [November 21, 2010]
+  Restored the parentheses in pngrutil.c; they are needed when the
+    png_get_*int_*() functions are compiled (i.e., when PNG_USE_READ_MACROS
+    is not defined).
+  Make the "png_get_uint_16" macro return a png_uint_32 in libpng-1.4 for API
+    compatibility.
+  Changes to remove gcc warnings (John Bowler)
+    Certain optional gcc warning flags resulted in warnings in libpng code.
+    With these changes only -Wconversion and -Wcast-qual cannot be turned on.
+    Changes are trivial rearrangements of code.  -Wconversion is not possible
+    for pngrutil.c (because of the widespread use of += et al on variables
+    smaller than (int) or (unsigned int)) and -Wcast-qual is not possible
+    with pngwio.c and pngwutil.c because the 'write' callback and zlib
+    compression both fail to declare their input buffers with 'const'.
+
+version 1.4.5beta07 [November 25, 2010]
+  Reverted png_get_uint_16 macro to beta05 and added comment about the
+    potential API incompatibility.
+
+version 1.4.5rc02 [December 2, 2010]
+  No changes.
+
+version 1.4.5rc03 [December 3, 2010]
+  Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions.
+
+version 1.4.5 [December 9, 2010]
+  Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h
+
+version 1.4.6beta01 [December 29, 2010]
+  Fixed bug in background transformation handling in pngrtran.c (it was
+    looking for the flag in png_ptr->transformations instead of in
+    png_ptr->flags) (David Raymond).
+
+version 1.4.6beta02 [January 14, 2011]
+  Fixed misspelled macros in contrib/pngminim (Cosmin).
+  Updated CMakeLists.txt (Clifford Yapp).
+
+version 1.4.6beta03 [January 14, 2011]
+  Fixed some typecasts in png_debug statements (Cosmin).
+
+version 1.4.6beta04 [January 22, 2011]
+  Updated documentation of png_set|get_tRNS() (Thomas Klausner).
+  Added png_const_structp and png_const_infop types, and used them in
+    prototypes for most png_get_*() functions.
+  In the manual, describe the png_get_IHDR() arguments in the correct order.
+  Ported change in png_do_rgb_to_gray() from libpng-1.5.1, to make
+    it more robust against internal libpng coding errors.
+
+version 1.4.6beta05 [January 23, 2011]
+
+  Updated the synopses in the manual to reflect recent changes.
+  Fixed a typo in the *.def files and deleted entries that are now
+    declared in pngpriv.h
+
+version 1.4.6beta06 [March 19, 2011]
+  Updated contrib/pngsuite/README to add the word "modify".
+  Added the private PNG_UNUSED() macro definition in pngconf.h.
+
+version 1.4.6beta07 [March 22, 2011]
+  ifdef out mask arrays in pngread.c when interlacing is not supported.
+  Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h
+  Added -D_CRT_SECURE_NO_DEPRECATE to CFLAGS in makefile.vcwin32
+  Fixed mistake in the descriptions of user read_transform and write_transform
+    function prototypes in the manual.  The row_info struct is png_row_infop.
+  Added a request in the manual that applications do not use "png_" or
+    "PNG_" to begin any of their own symbols.
+  Fixed incorrect examples of callback prototypes in the manual, that were
+    introduced in libpng-1.0.0.
+  Removed "strip" from contrib/pngminim/*/makefile.
+  Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail
+    to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill)
+
+version 1.4.6rc01 [March 31, 2011]
+  No changes.
+
+version 1.4.6rc02 [April 6, 2011]
+  Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).
+
+version 1.4.6 [April 8, 2011]
+  No changes.
+
+version 1.4.7rc01 [April 9, 2011]
+  Relocated misplaced new declarations in pngwutil.c.
+
+version 1.4.7 [April 10, 2011]
+  Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5.
+
+
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/modules/libimg/png/LICENSE b/modules/libimg/png/LICENSE
index dd89a6684784..4915b94409c0 100644
--- a/modules/libimg/png/LICENSE
+++ b/modules/libimg/png/LICENSE
@@ -10,8 +10,8 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.4.3, June 26, 2010, are
-Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, are
+Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 26, 2010
+April 10, 2011
diff --git a/modules/libimg/png/MOZCHANGES b/modules/libimg/png/MOZCHANGES
index 5bb742bf917f..3772db631a54 100644
--- a/modules/libimg/png/MOZCHANGES
+++ b/modules/libimg/png/MOZCHANGES
@@ -1,6 +1,8 @@
 
 Changes made to pristine png source by mozilla.org developers.
 
+2011/04/08  -- Synced with libpng-1.4.7 (bug #624133).
+
 2010/06/30  -- Synced with libpng-1.4.3 (bug #564792).
 
 2010/02/26  -- Synced with libpng-1.4.1 (bug #544747).
diff --git a/modules/libimg/png/README b/modules/libimg/png/README
index 799f3ebe0227..fe1b500e0699 100644
--- a/modules/libimg/png/README
+++ b/modules/libimg/png/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.3 - June 26, 2010 (shared library 14.0)
+README for libpng version 1.4.7 - April 10, 2011 (shared library 14.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -185,9 +185,9 @@ Files in this distribution:
        makefile.std     =>  Generic UNIX makefile (cc, creates static
                             libpng.a)
        makefile.elf     =>  Linux/ELF makefile symbol versioning,
-                            gcc, creates libpng14.so.14.1.4.3)
+                            (gcc, creates libpng14.so.14.1.4.7)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.14.1.4.3)
+                            (gcc, creates libpng14.so.14.1.4.7)
        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
        makefile.knr     =>  Archaic UNIX Makefile that converts files with
                             ansi2knr (Requires ansi2knr.c from
@@ -209,12 +209,12 @@ Files in this distribution:
        makefile.openbsd =>  OpenBSD makefile
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
        makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng14.so.14.1.4.3)
+                            (gcc, creates libpng14.so.14.1.4.7)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng14.so.14.1.4.3)
+                            (gcc, creates libpng14.so.14.1.4.7)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng14.so.14.1.4.3)
+                            (gcc, creates libpng14.so.14.1.4.7)
        makefile.32sunu  =>  Sun Ultra 32-bit makefile
        makefile.64sunu  =>  Sun Ultra 64-bit makefile
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
diff --git a/modules/libimg/png/mozpngconf.h b/modules/libimg/png/mozpngconf.h
index efa24dbe72ef..b2f7de8f48c0 100644
--- a/modules/libimg/png/mozpngconf.h
+++ b/modules/libimg/png/mozpngconf.h
@@ -42,15 +42,23 @@
 
 #define PNG_NO_GLOBAL_ARRAYS
 
+#ifdef _MSC_VER
+/* The PNG_PEDANTIC_WARNINGS (attributes) fail to build with some MSC
+ * compilers; we'll play it safe and disable them for all MSC compilers.
+ */
+#define PNG_NO_PEDANTIC_WARNINGS
+#endif
+
 #ifndef MOZ_PNG_READ
 #define PNG_NO_READ_SUPPORTED
 #endif
+#define PNG_NO_READ_BGR
 #define PNG_NO_SET_USER_LIMITS
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_ASSEMBLER_CODE
 #define PNG_NO_WARN_UNINITIALIZED_ROW
 #define PNG_NO_READ_BACKGROUND
-#define PNG_NO_READ_DITHER
+#define PNG_NO_READ_QUANTIZE
 #define PNG_NO_READ_INVERT
 #define PNG_NO_READ_SHIFT
 #define PNG_NO_READ_PACK
@@ -61,8 +69,10 @@
 #define PNG_NO_READ_INVERT_ALPHA
 #define PNG_NO_READ_RGB_TO_GRAY
 #define PNG_NO_READ_USER_TRANSFORM
+
 #define PNG_NO_READ_bKGD
 #define PNG_NO_READ_hIST
+#define PNG_NO_READ_oFFs
 #define PNG_NO_READ_pCAL
 #define PNG_NO_READ_pHYs
 #define PNG_NO_READ_sBIT
@@ -75,7 +85,6 @@
 #define PNG_NO_READ_EMPTY_PLTE
 #define PNG_NO_READ_OPT_PLTE
 #define PNG_NO_READ_STRIP_ALPHA
-#define PNG_NO_READ_oFFs
 #define PNG_NO_SEQUENTIAL_READ_SUPPORTED
 
 #ifndef MOZ_PNG_WRITE
@@ -118,6 +127,7 @@
 
 #define PNG_NO_HANDLE_AS_UNKNOWN
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -126,7 +136,7 @@
 #define PNG_NO_ZALLOC_ZERO
 #define PNG_NO_ERROR_NUMBERS
 #define PNG_NO_EASY_ACCESS
-
+#define PNG_NO_TIME_RFC1123
 
 /* Mangle names of exported libpng functions so different libpng versions
    can coexist. It is recommended that if you do this, you give your
diff --git a/modules/libimg/png/png.c b/modules/libimg/png/png.c
index dab4f36459dc..2316a8e25fda 100644
--- a/modules/libimg/png/png.c
+++ b/modules/libimg/png/png.c
@@ -1,8 +1,8 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.4.2 [May 6, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -17,11 +17,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_3 Your_png_h_is_not_version_1_4_3;
-
-/* Version information for C files.  This had better match the version
- * string defined in png.h.
- */
+typedef version_1_4_7 Your_png_h_is_not_version_1_4_7;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -543,21 +539,21 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
 
 png_charp PNGAPI
-png_get_copyright(png_structp png_ptr)
+png_get_copyright(png_const_structp png_ptr)
 {
-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
 #ifdef PNG_STRING_COPYRIGHT
       return PNG_STRING_COPYRIGHT
 #else
 #ifdef __STDC__
    return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version 1.4.3 - June 26, 2010" PNG_STRING_NEWLINE \
+     "libpng version 1.4.7 - April 10, 2011" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE);
 #else
-      return ((png_charp) "libpng version 1.4.3 - June 26, 2010\
+      return ((png_charp) "libpng version 1.4.7 - April 10, 2011\
       Copyright (c) 1998-2010 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
@@ -574,23 +570,23 @@ png_get_copyright(png_structp png_ptr)
  * it is guaranteed that png.c uses the correct version of png.h.
  */
 png_charp PNGAPI
-png_get_libpng_ver(png_structp png_ptr)
+png_get_libpng_ver(png_const_structp png_ptr)
 {
    /* Version of *.c files used when building libpng */
-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
    return ((png_charp) PNG_LIBPNG_VER_STRING);
 }
 
 png_charp PNGAPI
-png_get_header_ver(png_structp png_ptr)
+png_get_header_ver(png_const_structp png_ptr)
 {
    /* Version of *.h files used when building libpng */
-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
    return ((png_charp) PNG_LIBPNG_VER_STRING);
 }
 
 png_charp PNGAPI
-png_get_header_version(png_structp png_ptr)
+png_get_header_version(png_const_structp png_ptr)
 {
    /* Returns longer string containing both version and date */
    png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
@@ -678,7 +674,7 @@ png_convert_size(size_t size)
 */
 
 void /* PRIVATE */
-png_64bit_product (long v1, long v2, unsigned long *hi_product,
+png_64bit_product(long v1, long v2, unsigned long *hi_product,
    unsigned long *lo_product)
 {
    int a, b, c, d;
diff --git a/modules/libimg/png/png.h b/modules/libimg/png/png.h
index 400d30db3e09..543af1399f47 100644
--- a/modules/libimg/png/png.h
+++ b/modules/libimg/png/png.h
@@ -1,8 +1,8 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.4.3 - June 26, 2010
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * libpng version 1.4.7 - April 10, 2011
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -11,7 +11,7 @@
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.4.3 - June 26, 2010: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.7 - April 10, 2011: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -145,6 +145,19 @@
  *    1.4.3beta01-05          14    10403  14.so.14.3[.0]
  *    1.4.3rc01-03            14    10403  14.so.14.3[.0]
  *    1.4.3                   14    10403  14.so.14.3[.0]
+ *    1.4.4beta01-08          14    10404  14.so.14.4[.0]
+ *    1.4.4rc01-05            14    10404  14.so.14.4[.0]
+ *    1.4.4                   14    10404  14.so.14.4[.0]
+ *    1.4.5beta01-04          14    10405  14.so.14.5[.0]
+ *    1.4.5rc01               14    10405  14.so.14.5[.0]
+ *    1.4.5beta05-07          14    10405  14.so.14.5[.0]
+ *    1.4.5rc02-03            14    10405  14.so.14.5[.0]
+ *    1.4.5                   14    10405  14.so.14.5[.0]
+ *    1.4.6beta01-07          14    10406  14.so.14.6[.0]
+ *    1.4.6rc01               14    10406  14.so.14.6[.0]
+ *    1.4.6                   14    10406  14.so.14.6[.0]
+ *    1.4.7rc01               14    10407  14.so.14.7[.0]
+ *    1.4.7                   14    10407  14.so.14.7[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -176,7 +189,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.3, June 26, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, are
  * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -288,13 +301,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    June 26, 2010
+ *    April 10, 2011
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.4.3 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.7 are Y2K compliant.  It is my belief that earlier
  *    versions were also Y2K compliant.
  *
  *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -350,9 +363,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.3"
+#define PNG_LIBPNG_VER_STRING "1.4.7"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.3 - June 26, 2010\n"
+   " libpng version 1.4.7 - April 10, 2011\n"
 
 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -360,7 +373,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   4
-#define PNG_LIBPNG_VER_RELEASE 3
+#define PNG_LIBPNG_VER_RELEASE 7
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
@@ -390,7 +403,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10403 /* 1.4.3 */
+#define PNG_LIBPNG_VER 10407 /* 1.4.7 */
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* Include the compression library's header */
@@ -910,6 +923,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
 } png_info;
 
 typedef png_info FAR * png_infop;
+typedef PNG_CONST png_info FAR * png_const_infop;
 typedef png_info FAR * FAR * png_infopp;
 
 /* Maximum positive integer used in PNG is (2^31)-1 */
@@ -1034,6 +1048,7 @@ typedef png_row_info FAR * FAR * png_row_infopp;
  */
 typedef struct png_struct_def png_struct;
 typedef png_struct FAR * png_structp;
+typedef PNG_CONST png_struct FAR * png_const_structp;
 
 typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
 typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
@@ -1051,7 +1066,7 @@ typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
    png_uint_32, int));
 
 #ifdef PNG_APNG_SUPPORTED
-typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp, 
+typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp,
    png_uint_32));
 #endif
 #endif
@@ -1530,7 +1545,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef png_structp version_1_4_3;
+typedef png_structp version_1_4_7;
 
 typedef png_struct FAR * FAR * png_structpp;
 
@@ -1541,12 +1556,12 @@ typedef png_struct FAR * FAR * png_structpp;
  */
 
 /* Returns the version number of the library */
-extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
+PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
 
 /* Tell lib we have already handled the first <num_bytes> magic bytes.
  * Handling more than 8 bytes from the beginning of the file is an error.
  */
-extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
    int num_bytes));
 
 /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
@@ -1554,7 +1569,7 @@ extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
  * signature, and non-zero otherwise.  Having num_to_check == 0 or
  * start > 7 will always fail (ie return non-zero).
  */
-extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
    png_size_t num_to_check));
 
 /* Simple signature checking function.  This is the same as calling
@@ -1563,19 +1578,19 @@ extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
 #define png_check_sig(sig,n) !png_sig_cmp((sig), 0, (n))
 
 /* Allocate and initialize png_ptr struct for reading, and any other memory. */
-extern PNG_EXPORT(png_structp,png_create_read_struct)
+PNG_EXPORT(png_structp,png_create_read_struct)
    PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
    png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;
 
 /* Allocate and initialize png_ptr struct for writing, and any other memory */
-extern PNG_EXPORT(png_structp,png_create_write_struct)
+PNG_EXPORT(png_structp,png_create_write_struct)
    PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
    png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;
 
-extern PNG_EXPORT(png_size_t,png_get_compression_buffer_size)
-   PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_size_t,png_get_compression_buffer_size)
+   PNGARG((png_const_structp png_ptr));
 
-extern PNG_EXPORT(void,png_set_compression_buffer_size)
+PNG_EXPORT(void,png_set_compression_buffer_size)
    PNGARG((png_structp png_ptr, png_size_t size));
 
 /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
@@ -1589,7 +1604,7 @@ extern PNG_EXPORT(void,png_set_compression_buffer_size)
  * allocated by the library - the call will return NULL on a mismatch
  * indicating an ABI mismatch.
  */
-extern PNG_EXPORT(jmp_buf*, png_set_longjmp_fn)
+PNG_EXPORT(jmp_buf*, png_set_longjmp_fn)
    PNGARG((png_structp png_ptr, png_longjmp_ptr longjmp_fn, size_t
        jmp_buf_size));
 #  define png_jmpbuf(png_ptr) \
@@ -1601,170 +1616,170 @@ extern PNG_EXPORT(jmp_buf*, png_set_longjmp_fn)
 
 #ifdef PNG_READ_SUPPORTED
 /* Reset the compression stream */
-extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
+PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
 #endif
 
 /* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
 #ifdef PNG_USER_MEM_SUPPORTED
-extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+PNG_EXPORT(png_structp,png_create_read_struct_2)
    PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
    png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;
-extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+PNG_EXPORT(png_structp,png_create_write_struct_2)
    PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
    png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;
 #endif
 
 /* Write the PNG file signature. */
-extern PNG_EXPORT(void,png_write_sig) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_write_sig) PNGARG((png_structp png_ptr));
 
 /* Write a PNG chunk - size, type, (optional) data, CRC. */
-extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
    png_bytep chunk_name, png_bytep data, png_size_t length));
 
 /* Write the start of a PNG chunk - length and chunk name. */
-extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
    png_bytep chunk_name, png_uint_32 length));
 
 /* Write the data of a PNG chunk started with png_write_chunk_start(). */
-extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
    png_bytep data, png_size_t length));
 
 /* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
 
 /* Allocate and initialize the info structure */
-extern PNG_EXPORT(png_infop,png_create_info_struct)
+PNG_EXPORT(png_infop,png_create_info_struct)
    PNGARG((png_structp png_ptr)) PNG_ALLOCATED;
 
-extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
+PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
     png_size_t png_info_struct_size));
 
 /* Writes all the PNG information before the image. */
-extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
-extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the information before the actual image data. */
-extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
 #endif
 
 #ifdef PNG_TIME_RFC1123_SUPPORTED
-extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+PNG_EXPORT(png_charp,png_convert_to_rfc1123)
    PNGARG((png_structp png_ptr, png_timep ptime));
 #endif
 
 #ifdef PNG_CONVERT_tIME_SUPPORTED
 /* Convert from a struct tm to png_time */
-extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
    struct tm FAR * ttime));
 
 /* Convert from time_t to png_time.  Uses gmtime() */
-extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
    time_t ttime));
 #endif /* PNG_CONVERT_tIME_SUPPORTED */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
+PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
   png_ptr));
-extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* Use blue, green, red order for pixels. */
-extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 /* Expand the grayscale to 24-bit RGB if necessary. */
-extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 /* Reduce RGB to grayscale. */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
    int error_action, double red, double green ));
 #endif
-extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
    int error_action, png_fixed_point red, png_fixed_point green ));
-extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_const_structp
    png_ptr));
 #endif
 
-extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
    png_colorp palette));
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
 /* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
    png_uint_32 filler, int flags));
 /* The values of the PNG_FILLER_ defines should NOT be changed */
 #define PNG_FILLER_BEFORE 0
 #define PNG_FILLER_AFTER 1
 /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
    png_uint_32 filler, int flags));
 #endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
 
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
 /* Swap bytes in 16-bit depth files. */
-extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
 /* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
     defined(PNG_WRITE_PACKSWAP_SUPPORTED)
 /* Swap packing order of pixels in bytes. */
-extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
 /* Converts files to legal bit depths. */
-extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
    png_color_8p true_bits));
 #endif
 
 #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
     defined(PNG_WRITE_INTERLACING_SUPPORTED)
 /* Have the code handle the interlacing.  Returns the number of passes. */
-extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
 /* Invert monochrome files */
-extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
 /* Handle alpha and tRNS by replacing with a background color. */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
    png_color_16p background_color, int background_gamma_code,
    int need_expand, double background_gamma));
 #endif
@@ -1776,14 +1791,14 @@ extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_READ_16_TO_8_SUPPORTED
 /* Strip the second byte of information from a 16-bit depth file. */
-extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
 /* Turn on quantizing, and reduce the palette to the number of colors
  * available.  Prior to libpng-1.4.2, this was png_set_dither().
  */
-extern PNG_EXPORT(void,png_set_quantize) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_quantize) PNGARG((png_structp png_ptr,
    png_colorp palette, int num_palette, int maximum_colors,
    png_uint_16p histogram, int full_quantize));
 #endif
@@ -1793,7 +1808,7 @@ extern PNG_EXPORT(void,png_set_quantize) PNGARG((png_structp png_ptr,
 #ifdef PNG_READ_GAMMA_SUPPORTED
 /* Handle gamma correction. Screen_gamma=(display_exponent) */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
    double screen_gamma, double default_file_gamma));
 #endif
 #endif
@@ -1801,85 +1816,85 @@ extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 /* Set how many lines between output flushes - 0 for no flushing */
-extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
 /* Flush the current PNG output buffer */
-extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
 #endif
 
 /* Optional update palette with requested transformations */
-extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
 
 /* Optional call to update the users info structure */
-extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read one or more rows of image data. */
-extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
    png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read a row of data. */
-extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
    png_bytep row,
    png_bytep display_row));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the whole image into memory at once. */
-extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
    png_bytepp image));
 #endif
 
 /* Write a row of image data */
-extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
    png_bytep row));
 
 /* Write a few rows of image data */
-extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
    png_bytepp row, png_uint_32 num_rows));
 
 /* Write the image data */
-extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
    png_bytepp image));
 
 #ifdef PNG_WRITE_APNG_SUPPORTED
 extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
    png_infop png_info, png_bytepp row_pointers,
    png_uint_32 width, png_uint_32 height,
-   png_uint_32 x_offset, png_uint_32 y_offset, 
+   png_uint_32 x_offset, png_uint_32 y_offset,
    png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
    png_byte blend_op));
 
 extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
    png_infop png_info));
 #endif
-   
+
 /* Write the end of the PNG file. */
-extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the end of the PNG file. */
-extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
 #endif
 
 /* Free any memory associated with the png_info_struct */
-extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
    png_infopp info_ptr_ptr));
 
 /* Free any memory associated with the png_struct and the png_info_structs */
-extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
    png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
 
 /* Free any memory associated with the png_struct and the png_info_structs */
-extern PNG_EXPORT(void,png_destroy_write_struct)
+PNG_EXPORT(void,png_destroy_write_struct)
    PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
 
 /* Set the libpng method of handling chunk CRC errors */
-extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
    int crit_action, int ancil_action));
 
 /* Values for png_set_crc_action() to say how to handle CRC errors in
@@ -1909,7 +1924,7 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
 /* Set the filtering method(s) used by libpng.  Currently, the only valid
  * value for "method" is 0.
  */
-extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
    int filters));
 
 /* Flags for png_set_filter() to say which filters to use.  The flags
@@ -1966,7 +1981,7 @@ extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
  * to the UNWEIGHTED method, but with added encoding time/computation.
  */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
    int heuristic_method, int num_weights, png_doublep filter_weights,
    png_doublep filter_costs));
 #endif
@@ -1987,19 +2002,19 @@ extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
  * for PNG images, and do considerably fewer caclulations.  In the future,
  * these values may not correspond directly to the zlib compression levels.
  */
-extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
    int level));
 
-extern PNG_EXPORT(void,png_set_compression_mem_level)
+PNG_EXPORT(void,png_set_compression_mem_level)
    PNGARG((png_structp png_ptr, int mem_level));
 
-extern PNG_EXPORT(void,png_set_compression_strategy)
+PNG_EXPORT(void,png_set_compression_strategy)
    PNGARG((png_structp png_ptr, int strategy));
 
-extern PNG_EXPORT(void,png_set_compression_window_bits)
+PNG_EXPORT(void,png_set_compression_window_bits)
    PNGARG((png_structp png_ptr, int window_bits));
 
-extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
    int method));
 
 /* These next functions are called for input/output, memory, and error
@@ -2013,7 +2028,7 @@ extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_STDIO_SUPPORTED
 /* Initialize the input/output for the PNG file to the default functions. */
-extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr,
     png_FILE_p fp));
 #endif
 
@@ -2025,11 +2040,11 @@ extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr,
  * default function will be used.
  */
 
-extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
 
 /* Return the user pointer associated with the error functions */
-extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_const_structp png_ptr));
 
 /* Replace the default data output functions with a user supplied one(s).
  * If buffered output is not used, then output_flush_fn can be set to NULL.
@@ -2041,54 +2056,54 @@ extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
  * default flush function, which uses the standard *FILE structure, will
  * be used.
  */
-extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
    png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
 
 /* Replace the default data input function with a user supplied one. */
-extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
    png_voidp io_ptr, png_rw_ptr read_data_fn));
 
 /* Return the user pointer associated with the I/O functions */
-extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
 
-extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
    png_read_status_ptr read_row_fn));
 
-extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
    png_write_status_ptr write_row_fn));
 
 #ifdef PNG_USER_MEM_SUPPORTED
 /* Replace the default memory allocation functions with user supplied one(s). */
-extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
 /* Return the user pointer associated with the memory functions */
-extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_const_structp png_ptr));
 #endif
 
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
    png_ptr, png_user_transform_ptr read_user_transform_fn));
 #endif
 
 #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
    png_ptr, png_user_transform_ptr write_user_transform_fn));
 #endif
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
+PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
    png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
    int user_transform_channels));
 /* Return the user pointer associated with the user transform functions */
-extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
-   PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
+   PNGARG((png_const_structp png_ptr));
 #endif
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
-extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
+PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_const_structp
    png_ptr));
 #endif
 
@@ -2096,50 +2111,52 @@ extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
 /* Sets the function callbacks for the push reader, and a pointer to a
  * user-defined structure available to the callback functions.
  */
-extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
    png_voidp progressive_ptr,
    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
    png_progressive_end_ptr end_fn));
+
 #ifdef PNG_READ_APNG_SUPPORTED
-extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr,
+extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp
+   png_ptr,
    png_progressive_frame_ptr frame_info_fn,
    png_progressive_frame_ptr frame_end_fn));
 #endif
 
 /* Returns the user pointer associated with the push read functions */
-extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-   PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+   PNGARG((png_const_structp png_ptr));
 
 /* Function to be called when data becomes available */
-extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
 
 /* Function that combines rows.  Not very much different than the
  * png_combine_row() call.  Is this even used?????
  */
-extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
    png_bytep old_row, png_bytep new_row));
 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 
-extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
    png_alloc_size_t size)) PNG_ALLOCATED;
 /* Added at libpng version 1.4.0 */
-extern PNG_EXPORT(png_voidp,png_calloc) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_voidp,png_calloc) PNGARG((png_structp png_ptr,
    png_alloc_size_t size)) PNG_ALLOCATED;
 
 /* Added at libpng version 1.2.4 */
-extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
    png_alloc_size_t size)) PNG_ALLOCATED;
 
 /* Frees a pointer allocated by png_malloc() */
-extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
 
 /* Free data that was allocated internally */
-extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 free_me, int num));
 /* Reassign responsibility for freeing existing data, whether allocated
  * by libpng or by the application */
-extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int freer, png_uint_32 mask));
 /* Assignments for png_data_freer */
 #define PNG_DESTROY_WILL_FREE_DATA 1
@@ -2161,45 +2178,45 @@ extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
 #define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
 
 #ifdef PNG_USER_MEM_SUPPORTED
-extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
    png_alloc_size_t size)) PNG_ALLOCATED;
-extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
    png_voidp ptr));
 #endif
 
 #ifndef PNG_NO_ERROR_TEXT
 /* Fatal error in PNG image of libpng - can't continue */
-extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
    png_const_charp error_message)) PNG_NORETURN;
 
 /* The same, but the chunk name is prepended to the error string. */
-extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
    png_const_charp error_message)) PNG_NORETURN;
 
 #else
 /* Fatal error in PNG image of libpng - can't continue */
-extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr)) PNG_NORETURN;
+PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr)) PNG_NORETURN;
 #endif
 
 /* Non-fatal error in libpng.  Can continue, but may have a problem. */
-extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
    png_const_charp warning_message));
 
 /* Non-fatal error in libpng, chunk name is prepended to message. */
-extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
    png_const_charp warning_message));
 
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 /* Benign error in libpng.  Can continue, but may have a problem.
  * User can choose whether to handle as a fatal error or as a warning. */
-extern PNG_EXPORT(void,png_benign_error) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_benign_error) PNGARG((png_structp png_ptr,
    png_const_charp warning_message));
 
 /* Same, chunk name is prepended to message. */
-extern PNG_EXPORT(void,png_chunk_benign_error) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_chunk_benign_error) PNGARG((png_structp png_ptr,
    png_const_charp warning_message));
 
-extern PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp
+PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp
    png_ptr, int allowed));
 #endif
 
@@ -2216,109 +2233,109 @@ extern PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp
  * png_info_struct.
  */
 /* Returns "flag" if chunk data is valid in info_ptr. */
-extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
-png_infop info_ptr, png_uint_32 flag));
+PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_uint_32 flag));
 
 /* Returns number of bytes needed to hold a transformed row. */
-extern PNG_EXPORT(png_size_t,png_get_rowbytes) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_size_t,png_get_rowbytes) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* Returns row_pointers, which is an array of pointers to scanlines that was
  * returned from png_read_png().
  */
-extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr));
 /* Set row_pointers, which is an array of pointers to scanlines for use
  * by png_write_png().
  */
-extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_bytepp row_pointers));
 #endif
 
 /* Returns number of color channels in image. */
-extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr));
 
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Returns image width in pixels. */
-extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image height in pixels. */
-extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image bit_depth. */
-extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image color_type. */
-extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image filter_type. */
-extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image interlace_type. */
-extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image compression_type. */
-extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns image resolution in pixels per meter, from pHYs chunk data. */
-extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 /* Returns pixel aspect ratio, computed from pHYs chunk data.  */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 #endif
 
 /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
+PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr));
 
 #endif /* PNG_EASY_ACCESS_SUPPORTED */
 
 /* Returns pointer to signature string read from PNG header */
-extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_const_structp png_ptr,
+   png_infop info_ptr));
 
 #ifdef PNG_bKGD_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_const_structp png_ptr,
    png_infop info_ptr, png_color_16p *background));
 #endif
 
 #ifdef PNG_bKGD_SUPPORTED
-extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_color_16p background));
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x,
    double *red_y, double *green_x, double *green_y, double *blue_x,
    double *blue_y));
 #endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
+PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
    *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
    png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
    *int_blue_x, png_fixed_point *int_blue_y));
@@ -2327,12 +2344,12 @@ extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_cHRM_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
    png_infop info_ptr, double white_x, double white_y, double red_x,
    double red_y, double green_x, double green_y, double blue_x, double blue_y));
 #endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
@@ -2342,132 +2359,132 @@ extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_gAMA_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double *file_gamma));
+PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, double *file_gamma));
 #endif
-extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point *int_file_gamma));
+PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_fixed_point *int_file_gamma));
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
    png_infop info_ptr, double file_gamma));
 #endif
-extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_fixed_point int_file_gamma));
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_16p *hist));
+PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_uint_16p *hist));
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_16p hist));
 #endif
 
-extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
    int *bit_depth, int *color_type, int *interlace_method,
    int *compression_method, int *filter_method));
 
-extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
    int color_type, int interlace_method, int compression_method,
    int filter_method));
 
 #ifdef PNG_oFFs_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
    int *unit_type));
 #endif
 
 #ifdef PNG_oFFs_SUPPORTED
-extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
    int unit_type));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
    int *type, int *nparams, png_charp *units, png_charpp *params));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
    int type, int nparams, png_charp units, png_charpp params));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
 #endif
 
-extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_colorp *palette, int *num_palette));
+PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_colorp *palette, int *num_palette));
 
-extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_colorp palette, int num_palette));
 
 #ifdef PNG_sBIT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_const_structp png_ptr,
    png_infop info_ptr, png_color_8p *sig_bit));
 #endif
 
 #ifdef PNG_sBIT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_color_8p sig_bit));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *intent));
+PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, int *intent));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int intent));
-extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int intent));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charpp name, int *compression_type,
+PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_charpp name, int *compression_type,
    png_charpp profile, png_uint_32 *proflen));
    /* Note to maintainer: profile should be png_bytepp */
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_charp name, int compression_type,
    png_charp profile, png_uint_32 proflen));
    /* Note to maintainer: profile should be png_bytep */
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_sPLT_tpp entries));
+PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_sPLT_tpp entries));
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_sPLT_tp entries, int nentries));
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED
 /* png_get_text also returns the number of text chunks in *num_text */
-extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_textp *text_ptr, int *num_text));
+PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_textp *text_ptr, int *num_text));
 #endif
 
 /* Note while png_set_text() will accept a structure whose text,
@@ -2478,28 +2495,28 @@ extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
  */
 
 #ifdef PNG_TEXT_SUPPORTED
-extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_textp text_ptr, int num_text));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_const_structp png_ptr,
    png_infop info_ptr, png_timep *mod_time));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_timep mod_time));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_const_structp png_ptr,
    png_infop info_ptr, png_bytep *trans_alpha, int *num_trans,
    png_color_16p *trans_color));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_bytep trans_alpha, int num_trans,
    png_color_16p trans_color));
 #endif
@@ -2509,23 +2526,23 @@ extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
 
 #ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *unit, double *width, double *height));
+PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, int *unit, double *width, double *height));
 #else
 #ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
 #endif
 #endif
 #endif /* PNG_sCAL_SUPPORTED */
 
 #ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int unit, double width, double height));
 #else
 #ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
 #endif
 #endif
@@ -2534,21 +2551,21 @@ extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
 #ifdef PNG_APNG_SUPPORTED
 extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
-extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr, 
+extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
 extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr,
    png_infop info_ptr));
-extern PNG_EXPORT(png_uint_32,png_get_num_plays) 
+extern PNG_EXPORT(png_uint_32,png_get_num_plays)
    PNGARG((png_structp png_ptr, png_infop info_ptr));
 
-extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL) 
-   PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, 
-   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, 
+extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
+   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
    png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
    png_byte *blend_op));
-extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL) 
-   PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width, 
-   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, 
+extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
+   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
    png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
    png_byte blend_op));
 extern PNG_EXPORT(void,png_ensure_fcTL_is_valid)
@@ -2594,47 +2611,47 @@ extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr,
            = 2: keep only if safe-to-copy
            = 3: keep even if unsafe-to-copy
 */
-extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
+PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
    png_ptr, int keep, png_bytep chunk_list, int num_chunks));
 PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
    chunk_name));
 #endif
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
-extern PNG_EXPORT(void, png_set_unknown_chunk_location)
+PNG_EXPORT(void, png_set_unknown_chunk_location)
    PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
-   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
+PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_const_structp
+   png_ptr, png_const_infop info_ptr, png_unknown_chunkpp entries));
 #endif
 
 /* Png_free_data() will turn off the "valid" flag for anything it frees.
  * If you need to turn it off for a chunk that your application has freed,
  * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
  */
-extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
    png_infop info_ptr, int mask));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* The "params" pointer is currently not used and is for future expansion. */
-extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
                         png_infop info_ptr,
                         int transforms,
                         png_voidp params));
-extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
+PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
                         png_infop info_ptr,
                         int transforms,
                         png_voidp params));
 #endif
 
-extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp
+PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_const_structp png_ptr));
+PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_const_structp png_ptr));
+PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_const_structp
     png_ptr));
-extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_const_structp png_ptr));
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
+PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
    png_ptr, png_uint_32 mng_features_permitted));
 #endif
 
@@ -2648,57 +2665,58 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
  * messages before passing them to the error or warning handler.
  */
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
+PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
    png_ptr, png_uint_32 strip_mode));
 #endif
 
 /* Added in libpng-1.2.6 */
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
+PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
    png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
-extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
+PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_const_structp
    png_ptr));
-extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
+PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_const_structp
    png_ptr));
 /* Added in libpng-1.4.0 */
-extern PNG_EXPORT(void,png_set_chunk_cache_max) PNGARG((png_structp
+PNG_EXPORT(void,png_set_chunk_cache_max) PNGARG((png_structp
    png_ptr, png_uint_32 user_chunk_cache_max));
-extern PNG_EXPORT(png_uint_32,png_get_chunk_cache_max)
-   PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_uint_32,png_get_chunk_cache_max)
+   PNGARG((png_const_structp png_ptr));
 /* Added in libpng-1.4.1 */
-extern PNG_EXPORT(void,png_set_chunk_malloc_max) PNGARG((png_structp
+PNG_EXPORT(void,png_set_chunk_malloc_max) PNGARG((png_structp
    png_ptr, png_alloc_size_t user_chunk_cache_max));
-extern PNG_EXPORT(png_alloc_size_t,png_get_chunk_malloc_max)
-   PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_alloc_size_t,png_get_chunk_malloc_max)
+   PNGARG((png_const_structp png_ptr));
 #endif
 
 #if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
-PNG_EXPORT(png_uint_32,png_get_pixels_per_inch) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_uint_32,png_get_pixels_per_inch)
+   PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_EXPORT(png_uint_32,png_get_x_pixels_per_inch) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_uint_32,png_get_x_pixels_per_inch)
+   PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_EXPORT(png_uint_32,png_get_y_pixels_per_inch) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(png_uint_32,png_get_y_pixels_per_inch)
+   PNGARG((png_const_structp png_ptr, png_const_infop info_ptr));
 
-PNG_EXPORT(float,png_get_x_offset_inches) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(float,png_get_x_offset_inches) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr));
 
-PNG_EXPORT(float,png_get_y_offset_inches) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
+PNG_EXPORT(float,png_get_y_offset_inches) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr));
 
 #ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(png_uint_32,png_get_pHYs_dpi) PNGARG((png_structp png_ptr,
-png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+PNG_EXPORT(png_uint_32,png_get_pHYs_dpi) PNGARG((png_const_structp png_ptr,
+   png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
+   int *unit_type));
 #endif /* PNG_pHYs_SUPPORTED */
 #endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
 
 /* Added in libpng-1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((png_structp png_ptr));
+PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((png_const_structp png_ptr));
 
-extern PNG_EXPORT(png_bytep,png_get_io_chunk_name)
+PNG_EXPORT(png_bytep,png_get_io_chunk_name)
    PNGARG((png_structp png_ptr));
 
 /* The flags returned by png_get_io_state() are the following: */
@@ -2764,44 +2782,52 @@ extern PNG_EXPORT(png_bytep,png_get_io_chunk_name)
  * The png_get_int_32() routine assumes we are using two's complement
  * format for negative values, which is almost certainly true.
  */
-/* We could make special-case BIG_ENDIAN macros that do direct reads here */
 #  define png_get_uint_32(buf) \
      (((png_uint_32)(*(buf)) << 24) + \
       ((png_uint_32)(*((buf) + 1)) << 16) + \
       ((png_uint_32)(*((buf) + 2)) << 8) + \
       ((png_uint_32)(*((buf) + 3))))
+
+  /* The following definition introduces an API incompatibility (but not
+   * an ABI incompatibility) with libpng-1.4.0 through 1.4.4.  Prior to
+   * libpng-1.4.5 the macro, which is used by default, returned (incorrectly)
+   * a (png_uint_32), while the function, if used instead, correctly returned
+   * a (png_uint_16).
+   *
+   * Libpng versions 1.0.x and 1.2.x only used a function so are not affected
+   * by this potential API incompatibility between macros.
+   */
 #  define png_get_uint_16(buf) \
-     (((png_uint_32)(*(buf)) << 8) + \
-      ((png_uint_32)(*((buf) + 1))))
-#ifdef PNG_GET_INT_32_SUPPORTED
+     ((png_uint_16) \
+       (((unsigned int)(*(buf)) << 8) + \
+        ((unsigned int)(*((buf) + 1)))))
+
 #  define png_get_int_32(buf) \
-     (((png_int_32)(*(buf)) << 24) + \
-      ((png_int_32)(*((buf) + 1)) << 16) + \
-      ((png_int_32)(*((buf) + 2)) << 8) + \
-      ((png_int_32)(*((buf) + 3))))
-#endif
+     ((png_int_32)((*(buf) & 0x80) \
+      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
+      : (png_int_32)png_get_uint_32(buf)))
 #else
-extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
-extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
+PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
+PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
 #ifdef PNG_GET_INT_32_SUPPORTED
-extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
+PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
 #endif
 #endif
-extern PNG_EXPORT(png_uint_32,png_get_uint_31)
+PNG_EXPORT(png_uint_32,png_get_uint_31)
   PNGARG((png_structp png_ptr, png_bytep buf));
 /* No png_get_int_16 -- may be added if there's a real need for it. */
 
 /* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-extern PNG_EXPORT(void,png_save_uint_32)
+PNG_EXPORT(void,png_save_uint_32)
    PNGARG((png_bytep buf, png_uint_32 i));
-extern PNG_EXPORT(void,png_save_int_32)
+PNG_EXPORT(void,png_save_int_32)
    PNGARG((png_bytep buf, png_int_32 i));
 
 /* Place a 16-bit number into a buffer in PNG byte order.
  * The parameter is declared unsigned int, not png_uint_16,
  * just to avoid potential problems on pre-ANSI C compilers.
  */
-extern PNG_EXPORT(void,png_save_uint_16)
+PNG_EXPORT(void,png_save_uint_16)
    PNGARG((png_bytep buf, unsigned int i));
 /* No png_save_int_16 -- may be added if there's a real need for it. */
 
diff --git a/modules/libimg/png/pngconf.h b/modules/libimg/png/pngconf.h
index 5e7be7ae6f39..7775bff9f7fb 100644
--- a/modules/libimg/png/pngconf.h
+++ b/modules/libimg/png/pngconf.h
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.3 - June 26, 2010
+ * libpng version 1.4.7 - April 10, 2011
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -46,14 +46,14 @@
  * includes the resource compiler for Windows DLL configurations.
  */
 #ifdef PNG_USER_CONFIG
+#  include "pngusr.h"
 #  ifndef PNG_USER_PRIVATEBUILD
 #    define PNG_USER_PRIVATEBUILD
 #  endif
-#  include "pngusr.h"
 #endif
 
 /*
- * If you create a private DLL you need to define in "pngusr.h" the followings:
+ * If you create a private DLL you should define in "pngusr.h" the following:
  * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
  *        the DLL was built>
  *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
@@ -61,7 +61,7 @@
  *        distinguish your DLL from those of the official release. These
  *        correspond to the trailing letters that come after the version
  *        number and must match your private DLL name>
- *  e.g. // private DLL "libpng13gx.dll"
+ *  e.g. // private DLL "libpng14gx.dll"
  *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
  *
  * The following macros are also at your disposal if you want to complete the
@@ -86,6 +86,18 @@
 
 /* End of material added to libpng-1.2.8 */
 
+/* Added at libpng-1.4.6 */
+#ifndef PNG_UNUSED
+/* Unused formal parameter warnings are silenced using the following macro
+ * which is expected to have no bad effects on performance (optimizing
+ * compilers will probably remove it entirely).  Note that if you replace
+ * it with something other than whitespace, you must include the terminating
+ * semicolon.
+ */
+#  define PNG_UNUSED(param) (void)param;
+#endif
+/* End of material added to libpng-1.4.6 */
+
 #ifndef PNG_VERSION_INFO_ONLY
 
 /* This is the size of the compression buffer, and thus the size of
@@ -271,11 +283,19 @@
  * #define PNG_NO_STDIO
  */
 
+#ifdef _WIN32_WCE
+#  define PNG_NO_CONSOLE_IO
+#  define PNG_NO_STDIO
+#  define PNG_NO_TIME_RFC1123
+#  ifdef PNG_DEBUG
+#    undef PNG_DEBUG
+#  endif
+#endif
+
 #if !defined(PNG_NO_STDIO) && !defined(PNG_STDIO_SUPPORTED)
 #  define PNG_STDIO_SUPPORTED
 #endif
 
-
 #ifdef PNG_BUILD_DLL
 #  if !defined(PNG_CONSOLE_IO_SUPPORTED) && !defined(PNG_NO_CONSOLE_IO)
 #    define PNG_NO_CONSOLE_IO
@@ -441,7 +461,7 @@
 
 /* The following uses const char * instead of char * for error
  * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
+ * If you do not want to use const, define PNG_NO_CONST.
  */
 
 #ifndef PNG_CONST
@@ -456,8 +476,10 @@
  * library that you will not be using.  I wish I could figure out how to
  * automate this, but I can't do that without making it seriously hard
  * on the users.  So if you are not using an ability, change the #define
- * to and #undef, and that part of the library will not be compiled.  If
- * your linker can't find a function, you may want to make sure the
+ * to an #undef, or pass in PNG_NO_feature and that part of the library
+ * will not be compiled.
+
+ * If your linker can't find a function, you may want to make sure the
  * ability is defined here.  Some of these depend upon some others being
  * defined.  I haven't figured out all the interactions here, so you may
  * have to experiment awhile to get everything to compile.  If you are
@@ -1129,7 +1151,7 @@ typedef unsigned char png_byte;
 #else
    typedef size_t png_size_t;
 #endif
-#define png_sizeof(x) sizeof(x)
+#define png_sizeof(x) (sizeof (x))
 
 /* The following is needed for medium model support.  It cannot be in the
  * pngpriv.h header.  Needs modification for other compilers besides
@@ -1251,6 +1273,13 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  define PNG_DLL
 #endif
 
+/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
+ * you may get warnings regarding the linkage of png_zalloc and png_zfree.
+ * Don't ignore those warnings; you must also reset the default calling
+ * convention in your compiler to match your PNGAPI, and you must build
+ * zlib and your applications the same way you build libpng.
+ */
+
 #ifdef __CYGWIN__
 #  undef PNGAPI
 #  define PNGAPI __cdecl
@@ -1258,14 +1287,11 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  define PNG_IMPEXP
 #endif
 
-#define PNG_USE_LOCAL_ARRAYS /* Not used in libpng, defined for legacy apps */
-
-/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
- * you may get warnings regarding the linkage of png_zalloc and png_zfree.
- * Don't ignore those warnings; you must also reset the default calling
- * convention in your compiler to match your PNGAPI, and you must build
- * zlib and your applications the same way you build libpng.
- */
+#ifdef __WATCOMC__
+#  ifndef PNGAPI
+#    define PNGAPI
+#  endif
+#endif
 
 #if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
 #  ifndef PNG_NO_MODULEDEF
@@ -1350,6 +1376,8 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
 #endif
 
+#define PNG_USE_LOCAL_ARRAYS /* Not used in libpng, defined for legacy apps */
+
 /* Support for compiler specific function attributes.  These are used
  * so that where compiler support is available incorrect use of API
  * functions in png.h will generate compiler warnings.
@@ -1378,15 +1406,15 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #    endif
 #    ifndef PNG_ALLOCATED
 #      define PNG_ALLOCATED  __attribute__((__malloc__))
+#    endif
+#    ifndef PNG_DEPRECATED
+#      define PNG_DEPRECATED __attribute__((__deprecated__))
 #    endif
 
     /* This specifically protects structure members that should only be
      * accessed from within the library, therefore should be empty during
      * a library build.
      */
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __attribute__((__deprecated__))
-#    endif
 #    ifndef PNG_DEPSTRUCT
 #      define PNG_DEPSTRUCT  __attribute__((__deprecated__))
 #    endif
@@ -1427,7 +1455,7 @@ typedef char            FAR * FAR * FAR * png_charppp;
 
 /* memory model/platform independent fns */
 #ifndef PNG_ABORT
-#  ifdef _WINDOWS_
+#  if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_))
 #     define PNG_ABORT() ExitProcess(0)
 #  else
 #     define PNG_ABORT() abort()
@@ -1448,7 +1476,8 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  define png_memset  _fmemset
 #  define png_sprintf sprintf
 #else
-#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */
+#  if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_))
+#    /* Favor Windows over C runtime fns */
 #    define CVT_PTR(ptr)         (ptr)
 #    define CVT_PTR_NOCHECK(ptr) (ptr)
 #    define png_strcpy  lstrcpyA
@@ -1468,31 +1497,32 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #    define png_memcpy  memcpy
 #    define png_memset  memset
 #    define png_sprintf sprintf
-#    ifndef PNG_NO_SNPRINTF
-#      ifdef _MSC_VER
-#        define png_snprintf _snprintf   /* Added to v 1.2.19 */
-#        define png_snprintf2 _snprintf
-#        define png_snprintf6 _snprintf
-#      else
-#        define png_snprintf snprintf   /* Added to v 1.2.19 */
-#        define png_snprintf2 snprintf
-#        define png_snprintf6 snprintf
-#      endif
-#    else
-       /* You don't have or don't want to use snprintf().  Caution: Using
-        * sprintf instead of snprintf exposes your application to accidental
-        * or malevolent buffer overflows.  If you don't have snprintf()
-        * as a general rule you should provide one (you can get one from
-        * Portable OpenSSH).
-        */
-#      define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
-#      define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
-#      define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
-          sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
-#    endif
 #  endif
 #endif
 
+#ifndef PNG_NO_SNPRINTF
+#  ifdef _MSC_VER
+#    define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#    define png_snprintf2 _snprintf
+#    define png_snprintf6 _snprintf
+#  else
+#    define png_snprintf snprintf   /* Added to v 1.2.19 */
+#    define png_snprintf2 snprintf
+#    define png_snprintf6 snprintf
+#  endif
+#else
+   /* You don't have or don't want to use snprintf().  Caution: Using
+    * sprintf instead of snprintf exposes your application to accidental
+    * or malevolent buffer overflows.  If you don't have snprintf()
+    * as a general rule you should provide one (you can get one from
+    * Portable OpenSSH).
+    */
+#  define png_snprintf(s1,n,fmt,x1) png_sprintf(s1,fmt,x1)
+#  define png_snprintf2(s1,n,fmt,x1,x2) png_sprintf(s1,fmt,x1,x2)
+#  define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+      png_sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#endif
+
 /* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
  * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
  * to png_alloc_size_t are not necessary; in fact, it is recommended
@@ -1503,22 +1533,19 @@ typedef char            FAR * FAR * FAR * png_charppp;
  * to encounter practical situations that require such conversions.
  */
 #if defined(__TURBOC__) && !defined(__FLAT__)
-#  define  png_mem_alloc farmalloc
-#  define  png_mem_free  farfree
    typedef unsigned long png_alloc_size_t;
 #else
 #  if defined(_MSC_VER) && defined(MAXSEG_64K)
-#    define  png_mem_alloc(s) halloc(s, 1)
-#    define  png_mem_free     hfree
      typedef unsigned long    png_alloc_size_t;
 #  else
-#    if defined(_WINDOWS_) && (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-#      define  png_mem_alloc(s) HeapAlloc(GetProcessHeap(), 0, s)
-#      define  png_mem_free(p)  HeapFree(GetProcessHeap(), 0, p)
-       typedef DWORD            png_alloc_size_t;
+     /* This is an attempt to detect an old Windows system where (int) is
+      * actually 16 bits, in that case png_malloc must have an argument with a
+      * bigger size to accomodate the requirements of the library.
+      */
+#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
+        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
+       typedef DWORD         png_alloc_size_t;
 #    else
-#      define  png_mem_alloc malloc
-#      define  png_mem_free  free
        typedef png_size_t    png_alloc_size_t;
 #    endif
 #  endif
diff --git a/modules/libimg/png/pngerror.c b/modules/libimg/png/pngerror.c
index 633eae29f9eb..c196b11ce049 100644
--- a/modules/libimg/png/pngerror.c
+++ b/modules/libimg/png/pngerror.c
@@ -1,8 +1,8 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.4.0 [January 3, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -306,7 +306,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
    /* Here if not setjmp support or if png_ptr is null. */
    PNG_ABORT();
 #ifndef PNG_CONSOLE_IO_SUPPORTED
-   error_message = error_message; /* Make compiler happy */
+   PNG_UNUSED(error_message) /* Make compiler happy */
 #endif
 }
 
@@ -352,9 +352,9 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)
      fprintf(stderr, PNG_STRING_NEWLINE);
    }
 #else
-   warning_message = warning_message; /* Make compiler happy */
+   PNG_UNUSED(warning_message) /* Make compiler happy */
 #endif
-   png_ptr = png_ptr; /* Make compiler happy */
+   PNG_UNUSED(png_ptr) /* Make compiler happy */
 }
 #endif /* PNG_WARNINGS_SUPPORTED */
 
@@ -380,7 +380,7 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_error_ptr(png_structp png_ptr)
+png_get_error_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return NULL;
diff --git a/modules/libimg/png/pngget.c b/modules/libimg/png/pngget.c
index 32d4e4a7248e..6af81a8e6c84 100644
--- a/modules/libimg/png/pngget.c
+++ b/modules/libimg/png/pngget.c
@@ -1,8 +1,8 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.4.2 [May 6, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [April 10, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -18,7 +18,8 @@
 #include "pngpriv.h"
 
 png_uint_32 PNGAPI
-png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_uint_32 flag)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->valid & flag);
@@ -28,7 +29,7 @@ png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
 }
 
 png_size_t PNGAPI
-png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->rowbytes);
@@ -39,7 +40,7 @@ png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 png_bytepp PNGAPI
-png_get_rows(png_structp png_ptr, png_infop info_ptr)
+png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->row_pointers);
@@ -52,7 +53,7 @@ png_get_rows(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Easy access to info, added in libpng-0.99 */
 png_uint_32 PNGAPI
-png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->width;
@@ -61,7 +62,7 @@ png_get_image_width(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->height;
@@ -70,7 +71,7 @@ png_get_image_height(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->bit_depth;
@@ -79,7 +80,7 @@ png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->color_type;
@@ -88,7 +89,7 @@ png_get_color_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->filter_type;
@@ -97,7 +98,7 @@ png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->interlace_type;
@@ -106,7 +107,7 @@ png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->compression_type;
@@ -115,7 +116,7 @@ png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 #ifdef PNG_pHYs_SUPPORTED
@@ -136,7 +137,7 @@ png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 #ifdef PNG_pHYs_SUPPORTED
@@ -157,7 +158,7 @@ png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 #ifdef PNG_pHYs_SUPPORTED
@@ -180,7 +181,7 @@ png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
    {
    if (png_ptr != NULL && info_ptr != NULL)
 #ifdef PNG_pHYs_SUPPORTED
@@ -204,7 +205,7 @@ png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
 #endif
 
 png_int_32 PNGAPI
-png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 #ifdef PNG_oFFs_SUPPORTED
@@ -226,7 +227,7 @@ png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 
@@ -248,7 +249,7 @@ png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 
@@ -270,7 +271,7 @@ png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
 
@@ -293,35 +294,35 @@ png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
 
 #if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
 png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
      *.0254 +.5));
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
      *.0254 +.5));
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
      *.0254 +.5));
 }
 
 float PNGAPI
-png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
      *.00003937);
 }
 
 float PNGAPI
-png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
      *.00003937);
@@ -329,7 +330,7 @@ png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
@@ -369,7 +370,7 @@ png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
 #endif  /* PNG_EASY_ACCESS_SUPPORTED */
 
 png_byte PNGAPI
-png_get_channels(png_structp png_ptr, png_infop info_ptr)
+png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->channels);
@@ -378,7 +379,7 @@ png_get_channels(png_structp png_ptr, png_infop info_ptr)
 }
 
 png_bytep PNGAPI
-png_get_signature(png_structp png_ptr, png_infop info_ptr)
+png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->signature);
@@ -388,7 +389,7 @@ png_get_signature(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_bKGD_SUPPORTED
 png_uint_32 PNGAPI
-png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
    png_color_16p *background)
 {
    if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
@@ -406,7 +407,7 @@ png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_cHRM_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
    double *white_x, double *white_y, double *red_x, double *red_y,
    double *green_x, double *green_y, double *blue_x, double *blue_y)
 {
@@ -437,7 +438,7 @@ png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
 #endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
    png_fixed_point *blue_x, png_fixed_point *blue_y)
@@ -472,7 +473,7 @@ png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_gAMA_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr, double *file_gamma)
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
 
@@ -487,7 +488,7 @@ png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
 #endif
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
     png_fixed_point *int_file_gamma)
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
@@ -505,7 +506,8 @@ png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sRGB_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
+    int *file_srgb_intent)
 {
    png_debug1(1, "in %s retrieval function", "sRGB");
 
@@ -521,7 +523,7 @@ png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
 
 #ifdef PNG_iCCP_SUPPORTED
 png_uint_32 PNGAPI
-png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
              png_charpp name, int *compression_type,
              png_charpp profile, png_uint_32 *proflen)
 {
@@ -545,7 +547,7 @@ png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sPLT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
              png_sPLT_tpp spalettes)
 {
    if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
@@ -559,7 +561,8 @@ png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_hIST_SUPPORTED
 png_uint_32 PNGAPI
-png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_uint_16p *hist)
 {
    png_debug1(1, "in %s retrieval function", "hIST");
 
@@ -614,7 +617,7 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_oFFs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
 {
    png_debug1(1, "in %s retrieval function", "oFFs");
@@ -633,7 +636,7 @@ png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_pCAL_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
    png_charp *units, png_charpp *params)
 {
@@ -659,7 +662,7 @@ png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
              int *unit, double *width, double *height)
 {
     if (png_ptr != NULL && info_ptr != NULL &&
@@ -675,7 +678,7 @@ png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
 #else
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
              int *unit, png_charpp width, png_charpp height)
 {
     if (png_ptr != NULL && info_ptr != NULL &&
@@ -694,7 +697,7 @@ png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
@@ -727,7 +730,8 @@ png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
 #endif
 
 png_uint_32 PNGAPI
-png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_colorp *palette,
    int *num_palette)
 {
    png_debug1(1, "in %s retrieval function", "PLTE");
@@ -745,7 +749,8 @@ png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
 
 #ifdef PNG_sBIT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
+    png_color_8p *sig_bit)
 {
    png_debug1(1, "in %s retrieval function", "sBIT");
 
@@ -761,8 +766,8 @@ png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
 
 #ifdef PNG_TEXT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
-   int *num_text)
+png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
+    png_textp *text_ptr, int *num_text)
 {
    if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
    {
@@ -786,7 +791,8 @@ png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
 
 #ifdef PNG_tIME_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+png_get_tIME(png_const_structp png_ptr, png_infop info_ptr,
+    png_timep *mod_time)
 {
    png_debug1(1, "in %s retrieval function", "tIME");
 
@@ -802,7 +808,7 @@ png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
 
 #ifdef PNG_tRNS_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
 {
    png_uint_32 retval = 0;
@@ -848,7 +854,7 @@ png_get_acTL(png_structp png_ptr, png_infop info_ptr,
              png_uint_32 *num_frames, png_uint_32 *num_plays)
 {
     png_debug1(1, "in %s retrieval function", "acTL");
-    
+
     if (png_ptr != NULL && info_ptr != NULL &&
         (info_ptr->valid & PNG_INFO_acTL) &&
         num_frames != NULL && num_plays != NULL)
@@ -857,7 +863,7 @@ png_get_acTL(png_structp png_ptr, png_infop info_ptr,
         *num_plays = info_ptr->num_plays;
         return (1);
     }
-    
+
     return (0);
 }
 
@@ -865,7 +871,7 @@ png_uint_32 PNGAPI
 png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_num_frames()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->num_frames);
     return (0);
@@ -875,7 +881,7 @@ png_uint_32 PNGAPI
 png_get_num_plays(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_num_plays()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->num_plays);
     return (0);
@@ -889,11 +895,11 @@ png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
              png_byte *dispose_op, png_byte *blend_op)
 {
     png_debug1(1, "in %s retrieval function", "fcTL");
-    
+
     if (png_ptr != NULL && info_ptr != NULL &&
         (info_ptr->valid & PNG_INFO_fcTL) &&
-        width != NULL && height != NULL && 
-        x_offset != NULL && x_offset != NULL && 
+        width != NULL && height != NULL &&
+        x_offset != NULL && x_offset != NULL &&
         delay_num != NULL && delay_den != NULL &&
 	dispose_op != NULL && blend_op != NULL)
     {
@@ -907,7 +913,7 @@ png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
         *blend_op = info_ptr->next_frame_blend_op;
         return (1);
     }
-    
+
     return (0);
 }
 
@@ -915,7 +921,7 @@ png_uint_32 PNGAPI
 png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_width()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_width);
     return (0);
@@ -925,7 +931,7 @@ png_uint_32 PNGAPI
 png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_height()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_height);
     return (0);
@@ -935,7 +941,7 @@ png_uint_32 PNGAPI
 png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_x_offset()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_x_offset);
     return (0);
@@ -945,7 +951,7 @@ png_uint_32 PNGAPI
 png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_y_offset()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_y_offset);
     return (0);
@@ -955,7 +961,7 @@ png_uint_16 PNGAPI
 png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_delay_num()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_delay_num);
     return (0);
@@ -965,7 +971,7 @@ png_uint_16 PNGAPI
 png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_delay_den()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_delay_den);
     return (0);
@@ -975,7 +981,7 @@ png_byte PNGAPI
 png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_dispose_op()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_dispose_op);
     return (0);
@@ -985,7 +991,7 @@ png_byte PNGAPI
 png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_get_next_frame_blend_op()");
-    
+
     if (png_ptr != NULL && info_ptr != NULL)
         return (info_ptr->next_frame_blend_op);
     return (0);
@@ -995,16 +1001,17 @@ png_byte PNGAPI
 png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr)
 {
     png_debug(1, "in png_first_frame_is_hidden()");
-    
+
     if (png_ptr != NULL)
        return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN);
-    
+
     return 0;
 }
 #endif /* PNG_APNG_SUPPORTED */
+
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 png_uint_32 PNGAPI
-png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
              png_unknown_chunkpp unknowns)
 {
    if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
@@ -1018,7 +1025,7 @@ png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 png_byte PNGAPI
-png_get_rgb_to_gray_status (png_structp png_ptr)
+png_get_rgb_to_gray_status(png_const_structp png_ptr)
 {
    return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
 }
@@ -1026,14 +1033,14 @@ png_get_rgb_to_gray_status (png_structp png_ptr)
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
 png_voidp PNGAPI
-png_get_user_chunk_ptr(png_structp png_ptr)
+png_get_user_chunk_ptr(png_const_structp png_ptr)
 {
    return (png_ptr? png_ptr->user_chunk_ptr : NULL);
 }
 #endif
 
 png_size_t PNGAPI
-png_get_compression_buffer_size(png_structp png_ptr)
+png_get_compression_buffer_size(png_const_structp png_ptr)
 {
    return (png_ptr ? png_ptr->zbuf_size : 0L);
 }
@@ -1043,25 +1050,24 @@ png_get_compression_buffer_size(png_structp png_ptr)
 /* These functions were added to libpng 1.2.6 and were enabled
  * by default in libpng-1.4.0 */
 png_uint_32 PNGAPI
-png_get_user_width_max (png_structp png_ptr)
+png_get_user_width_max(png_const_structp png_ptr)
 {
     return (png_ptr? png_ptr->user_width_max : 0);
 }
 png_uint_32 PNGAPI
-png_get_user_height_max (png_structp png_ptr)
+png_get_user_height_max(png_const_structp png_ptr)
 {
     return (png_ptr? png_ptr->user_height_max : 0);
 }
-
 /* This function was added to libpng 1.4.0 */
 png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_structp png_ptr)
+png_get_chunk_cache_max(png_const_structp png_ptr)
 {
     return (png_ptr? png_ptr->user_chunk_cache_max : 0);
 }
 /* This function was added to libpng 1.4.1 */
 png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_structp png_ptr)
+png_get_chunk_malloc_max(png_const_structp png_ptr)
 {
     return (png_ptr?
        png_ptr->user_chunk_malloc_max : 0);
@@ -1071,13 +1077,13 @@ png_get_chunk_malloc_max (png_structp png_ptr)
 /* These functions were added to libpng 1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
 png_uint_32 PNGAPI
-png_get_io_state (png_structp png_ptr)
+png_get_io_state(png_const_structp png_ptr)
 {
     return png_ptr->io_state;
 }
 
 png_bytep PNGAPI
-png_get_io_chunk_name (png_structp png_ptr)
+png_get_io_chunk_name(png_structp png_ptr)
 {
    return png_ptr->chunk_name;
 }
diff --git a/modules/libimg/png/pngmem.c b/modules/libimg/png/pngmem.c
index c8a3f6f59af1..911f36881ca6 100644
--- a/modules/libimg/png/pngmem.c
+++ b/modules/libimg/png/pngmem.c
@@ -1,8 +1,8 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.4.2 [May 6, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [April 10, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -601,7 +601,7 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_mem_ptr(png_structp png_ptr)
+png_get_mem_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
diff --git a/modules/libimg/png/pngpread.c b/modules/libimg/png/pngpread.c
index 4af9b96b1b0a..391d75392e00 100644
--- a/modules/libimg/png/pngpread.c
+++ b/modules/libimg/png/pngpread.c
@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.4.3 [June 26, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -234,9 +234,9 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
       png_check_chunk_name(png_ptr, png_ptr->chunk_name);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
    }
-   
+
 #ifdef PNG_READ_APNG_SUPPORTED
-   if (png_ptr->num_frames_read > 0 && 
+   if (png_ptr->num_frames_read > 0 &&
        png_ptr->num_frames_read < info_ptr->num_frames)
    {
       if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
@@ -244,7 +244,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
          /* Discard trailing IDATs for the first frame */
          if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1)
             png_error(png_ptr, "out of place IDAT");
-         
+
          if (png_ptr->push_length + 4 > png_ptr->buffer_size)
          {
             png_push_save_buffer(png_ptr);
@@ -262,13 +262,13 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
             return;
          }
          png_ensure_sequence_number(png_ptr, 4);
-         
+
          if (!(png_ptr->mode & PNG_HAVE_fcTL))
          {
             /* Discard trailing fdATs for frames other than the first */
             if (png_ptr->num_frames_read < 2)
                png_error(png_ptr, "out of place fdAT");
-            
+
             if (png_ptr->push_length + 4 > png_ptr->buffer_size)
             {
                png_push_save_buffer(png_ptr);
@@ -284,7 +284,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
             png_ptr->idat_size = png_ptr->push_length - 4;
             png_ptr->mode |= PNG_HAVE_IDAT;
             png_ptr->process_mode = PNG_READ_IDAT_MODE;
-            
+
             return;
          }
       }
@@ -295,23 +295,23 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
             png_push_save_buffer(png_ptr);
             return;
          }
-         
+
          png_read_reset(png_ptr);
          png_ptr->mode &= ~PNG_HAVE_fcTL;
-         
+
          png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
-         
+
          if (!(png_ptr->mode & PNG_HAVE_fcTL))
             png_error(png_ptr, "missing required fcTL chunk");
-         
+
          png_read_reinit(png_ptr, info_ptr);
          png_progressive_read_reset(png_ptr);
-         
+
          if (png_ptr->frame_info_fn != NULL)
             (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read);
-         
+
          png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-         
+
          return;
       }
       else
@@ -327,11 +327,11 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
          png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
          return;
       }
-      
+
       return;
    }
 #endif /* PNG_READ_APNG_SUPPORTED */
-   
+
    if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
       if (png_ptr->mode & PNG_AFTER_IDAT)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
@@ -921,7 +921,7 @@ png_push_read_IDAT(png_structp png_ptr)
               return;
           }
       }
-      else 
+      else
 #endif
 #ifdef PNG_READ_APNG_SUPPORTED
       if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)
@@ -942,7 +942,7 @@ png_push_read_IDAT(png_structp png_ptr)
       }
 
       png_ptr->idat_size = png_ptr->push_length;
-      
+
 #ifdef PNG_READ_APNG_SUPPORTED
       if (png_ptr->num_frames_read > 0)
       {
@@ -1032,7 +1032,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
     * or the stream marked as finished.
     */
    while (png_ptr->zstream.avail_in > 0 &&
-	  !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+      !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
    {
       int ret;
 
@@ -1061,49 +1061,49 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
       /* Check for any failure before proceeding. */
       if (ret != Z_OK && ret != Z_STREAM_END)
       {
-	 /* Terminate the decompression. */
-	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         /* Terminate the decompression. */
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
 
          /* This may be a truncated stream (missing or
-	  * damaged end code).  Treat that as a warning.
-	  */
+          * damaged end code).  Treat that as a warning.
+          */
          if (png_ptr->row_number >= png_ptr->num_rows ||
-	     png_ptr->pass > 6)
-	    png_warning(png_ptr, "Truncated compressed data in IDAT");
-	 else
-	    png_error(png_ptr, "Decompression error in IDAT");
+             png_ptr->pass > 6)
+            png_warning(png_ptr, "Truncated compressed data in IDAT");
+         else
+            png_error(png_ptr, "Decompression error in IDAT");
 
-	 /* Skip the check on unprocessed input */
+         /* Skip the check on unprocessed input */
          return;
       }
 
       /* Did inflate output any data? */
       if (png_ptr->zstream.next_out != png_ptr->row_buf)
       {
-	 /* Is this unexpected data after the last row?
-	  * If it is, artificially terminate the LZ output
-	  * here.
-	  */
+         /* Is this unexpected data after the last row?
+          * If it is, artificially terminate the LZ output
+          * here.
+          */
          if (png_ptr->row_number >= png_ptr->num_rows ||
-	     png_ptr->pass > 6)
+             png_ptr->pass > 6)
          {
-	    /* Extra data. */
-	    png_warning(png_ptr, "Extra compressed data in IDAT");
+            /* Extra data. */
+            png_warning(png_ptr, "Extra compressed data in IDAT");
             png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-	    /* Do no more processing; skip the unprocessed
-	     * input check below.
-	     */
+            /* Do no more processing; skip the unprocessed
+             * input check below.
+             */
             return;
-	 }
+         }
 
-	 /* Do we have a complete row? */
-	 if (png_ptr->zstream.avail_out == 0)
-	    png_push_process_row(png_ptr);
+         /* Do we have a complete row? */
+         if (png_ptr->zstream.avail_out == 0)
+            png_push_process_row(png_ptr);
       }
 
       /* And check for the end of the stream. */
       if (ret == Z_STREAM_END)
-	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
    }
 
    /* All the data should have been processed, if anything
@@ -1177,7 +1177,7 @@ png_push_process_row(png_structp png_ptr)
 
             if (png_ptr->pass == 6 && png_ptr->height <= 4)
             {
-                  png_push_have_row(png_ptr, NULL);
+                png_push_have_row(png_ptr, NULL);
                 png_read_push_finish_row(png_ptr);
             }
 
@@ -1217,7 +1217,7 @@ png_push_process_row(png_structp png_ptr)
 
             for (i = 0; i < 4 && png_ptr->pass == 2; i++)
             {
-                  png_push_have_row(png_ptr, NULL);
+               png_push_have_row(png_ptr, NULL);
                png_read_push_finish_row(png_ptr);
             }
 
@@ -1267,13 +1267,13 @@ png_push_process_row(png_structp png_ptr)
 
             for (i = 0; i < 2 && png_ptr->pass == 4; i++)
             {
-                  png_push_have_row(png_ptr, NULL);
+               png_push_have_row(png_ptr, NULL);
                png_read_push_finish_row(png_ptr);
             }
 
             if (png_ptr->pass == 6) /* Pass 5 might be empty */
             {
-                  png_push_have_row(png_ptr, NULL);
+               png_push_have_row(png_ptr, NULL);
                png_read_push_finish_row(png_ptr);
             }
 
@@ -1292,12 +1292,14 @@ png_push_process_row(png_structp png_ptr)
 
             if (png_ptr->pass == 6) /* Skip top generated row */
             {
-                  png_push_have_row(png_ptr, NULL);
+               png_push_have_row(png_ptr, NULL);
                png_read_push_finish_row(png_ptr);
             }
 
             break;
          }
+
+         default:
          case 6:
          {
             png_push_have_row(png_ptr, png_ptr->row_buf + 1);
@@ -1306,7 +1308,7 @@ png_push_process_row(png_structp png_ptr)
             if (png_ptr->pass != 6)
                break;
 
-                  png_push_have_row(png_ptr, NULL);
+            png_push_have_row(png_ptr, NULL);
             png_read_push_finish_row(png_ptr);
          }
       }
@@ -1391,7 +1393,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place tEXt");
-         info_ptr = info_ptr; /* To quiet some compiler warnings */
+         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
       }
 
 #ifdef PNG_MAX_MALLOC_64K
@@ -1489,7 +1491,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place zTXt");
-         info_ptr = info_ptr; /* To quiet some compiler warnings */
+         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
       }
 
 #ifdef PNG_MAX_MALLOC_64K
@@ -1690,7 +1692,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place iTXt");
-         info_ptr = info_ptr; /* To quiet some compiler warnings */
+         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
       }
 
 #ifdef PNG_MAX_MALLOC_64K
@@ -1817,15 +1819,14 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
    {
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
       if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
+         PNG_HANDLE_CHUNK_ALWAYS
 #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
+         && png_ptr->read_user_chunk_fn == NULL
 #endif
-          )
+         )
 #endif
          png_chunk_error(png_ptr, "unknown critical chunk");
-
-      info_ptr = info_ptr; /* To quiet some compiler warnings */
+         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
    }
 
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
@@ -1915,7 +1916,7 @@ png_push_have_row(png_structp png_ptr, png_bytep row)
 }
 
 void PNGAPI
-png_progressive_combine_row (png_structp png_ptr,
+png_progressive_combine_row(png_structp png_ptr,
    png_bytep old_row, png_bytep new_row)
 {
    PNG_CONST int FARDATA png_pass_dsp_mask[7] =
@@ -1955,7 +1956,7 @@ png_set_progressive_frame_fn(png_structp png_ptr,
 #endif
 
 png_voidp PNGAPI
-png_get_progressive_ptr(png_structp png_ptr)
+png_get_progressive_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
diff --git a/modules/libimg/png/pngpriv.h b/modules/libimg/png/pngpriv.h
index e73f1088e722..3406469a17c7 100644
--- a/modules/libimg/png/pngpriv.h
+++ b/modules/libimg/png/pngpriv.h
@@ -1,9 +1,9 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * libpng version 1.4.3 - June 26, 2010
+ * libpng version 1.4.7 - April 10, 2011
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -28,14 +28,16 @@
 
 #include <stdlib.h>
 
+#ifndef PNG_EXTERN
 /* The functions exported by PNG_EXTERN are internal functions, which
  * aren't usually used outside the library (as far as I know), so it is
  * debatable if they should be exported at all.  In the future, when it
  * is possible to have run-time registry of chunk-handling functions,
  * some of these will be made available again.
-#define PNG_EXTERN extern
+#  define PNG_EXTERN extern
  */
-#define PNG_EXTERN
+#  define PNG_EXTERN
+#endif
 
 /* Other defines specific to compilers can go here.  Try to keep
  * them inside an appropriate ifdef/endif pair for portability.
@@ -75,10 +77,6 @@
 #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
     defined(_WIN32) || defined(__WIN32__)
 #  include <windows.h>  /* defines _WINDOWS_ macro */
-/* I have no idea why is this necessary... */
-#  ifdef _MSC_VER
-#    include <malloc.h>
-#  endif
 #endif
 
 /* Various modes of operation.  Note that after an init, mode is set to
@@ -301,6 +299,9 @@ PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
 PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
    png_size_t length));
 
+/* Read and check the PNG file signature */
+PNG_EXTERN void png_read_sig PNGARG((png_structp png_ptr, png_infop info_ptr));
+
 /* Read the chunk header (length + type name) */
 PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
 
@@ -481,9 +482,9 @@ PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
 PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr,
    png_uint_32 num_frames, png_uint_32 num_plays));
 
-PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr, 
-   png_uint_32 width, png_uint_32 height, 
-   png_uint_32 x_offset, png_uint_32 y_offset, 
+PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr,
+   png_uint_32 width, png_uint_32 height,
+   png_uint_32 x_offset, png_uint_32 y_offset,
    png_uint_16 delay_num, png_uint_16 delay_den,
    png_byte dispose_op, png_byte blend_op));
 #endif
@@ -550,7 +551,7 @@ PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr));
 #ifdef PNG_WRITE_APNG_SUPPORTED
 /* Private, reset some things to become ready for writing next frame */
 PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, 
+PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr,
    png_infop info_ptr, png_uint_32 width, png_uint_32 height));
 #endif
 
@@ -706,7 +707,7 @@ PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
 #endif
 
 #ifdef PNG_READ_iCCP_SUPPORTED
-extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
+PNG_EXTERN void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
    png_uint_32 length));
 #endif /* PNG_READ_iCCP_SUPPORTED */
 
@@ -741,7 +742,7 @@ PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
 #endif
 
 #ifdef PNG_READ_sPLT_SUPPORTED
-extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
+PNG_EXTERN void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
    png_uint_32 length));
 #endif /* PNG_READ_sPLT_SUPPORTED */
 
@@ -778,7 +779,7 @@ PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr,
 PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr));
 PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr,
    png_uint_32 length));
-PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, 
+PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr,
    png_uint_32 length));
 #endif
 
@@ -874,14 +875,14 @@ PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
    int filter_type));
 
 /* Free all memory used by the read (old method - NOT DLL EXPORTED) */
-extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
    png_infop end_info_ptr));
 
 /* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
-extern void png_write_destroy PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_write_destroy PNGARG((png_structp png_ptr));
 
 #ifdef USE_FAR_KEYWORD  /* memory model conversion function */
-extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+PNG_EXTERN void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
    int check));
 #endif /* USE_FAR_KEYWORD */
 
diff --git a/modules/libimg/png/pngread.c b/modules/libimg/png/pngread.c
index f614f7f7c32b..2f20550abd2f 100644
--- a/modules/libimg/png/pngread.c
+++ b/modules/libimg/png/pngread.c
@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.4.1 [February 25, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -214,34 +214,12 @@ void PNGAPI
 png_read_info(png_structp png_ptr, png_infop info_ptr)
 {
    png_debug(1, "in png_read_info");
- 
+
    if (png_ptr == NULL || info_ptr == NULL)
       return;
- 
-   /* If we haven't checked all of the PNG signature bytes, do so now. */
-   if (png_ptr->sig_bytes < 8)
-   {
-      png_size_t num_checked = png_ptr->sig_bytes,
-                 num_to_check = 8 - num_checked;
 
-#ifdef PNG_IO_STATE_SUPPORTED
-      png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
-#endif
-
-      png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
-      png_ptr->sig_bytes = 8;
-
-      if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-      {
-         if (num_checked < 4 &&
-             png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-            png_error(png_ptr, "Not a PNG file");
-         else
-            png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-      }
-      if (num_checked < 3)
-         png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-   }
+   /* Read and check the PNG file signature. */
+   png_read_sig(png_ptr, info_ptr);
 
    for (;;)
    {
@@ -442,22 +420,22 @@ void PNGAPI
 png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
 {
     png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */
-    
+
     png_debug(0, "Reading frame head");
-    
+
     if (!(png_ptr->mode & PNG_HAVE_acTL))
         png_error(png_ptr, "attempt to png_read_frame_head() but "
                            "no acTL present");
-    
+
     /* do nothing for the main IDAT */
     if (png_ptr->num_frames_read == 0)
         return;
-    
+
     png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */
-    
+
     png_read_reset(png_ptr);
     png_ptr->mode &= ~PNG_HAVE_fcTL;
-    
+
     have_chunk_after_DAT = 0;
     for (;;)
     {
@@ -466,13 +444,13 @@ png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
         PNG_fcTL;
         png_byte chunk_length[4];
         png_uint_32 length;
-        
+
         png_read_data(png_ptr, chunk_length, 4);
         length = png_get_uint_31(png_ptr, chunk_length);
-        
+
         png_reset_crc(png_ptr);
         png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-        
+
         if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
         {
             /* discard trailing IDATs for the first frame */
@@ -488,7 +466,7 @@ png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
         else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
         {
             png_ensure_sequence_number(png_ptr, length);
-            
+
             /* discard trailing fdATs for frames other than the first */
             if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1)
                 png_crc_finish(png_ptr, length - 4);
@@ -496,7 +474,7 @@ png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
             {
                 png_ptr->idat_size = length - 4;
                 png_ptr->mode |= PNG_HAVE_IDAT;
-                
+
                 break;
             }
             else
@@ -517,7 +495,7 @@ void PNGAPI
 png_read_update_info(png_structp png_ptr, png_infop info_ptr)
 {
    png_debug(1, "in png_read_update_info");
- 
+
    if (png_ptr == NULL)
       return;
    if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
@@ -539,7 +517,7 @@ void PNGAPI
 png_start_read_image(png_structp png_ptr)
 {
    png_debug(1, "in png_start_read_image");
- 
+
    if (png_ptr == NULL)
       return;
    if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
@@ -556,14 +534,16 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
    PNG_fdAT;
    PNG_IEND;
 #endif
+#ifdef PNG_READ_INTERLACING_SUPPORTED
    PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
       0xff};
    PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
    int ret;
- 
+#endif
+
    if (png_ptr == NULL)
       return;
- 
+
    png_debug2(1, "in png_read_row (row %lu, pass %d)",
       (unsigned long) png_ptr->row_number, png_ptr->pass);
 
@@ -619,6 +599,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 1:
             if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
             {
@@ -629,6 +610,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 2:
             if ((png_ptr->row_number & 0x07) != 4)
             {
@@ -639,6 +621,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 3:
             if ((png_ptr->row_number & 3) || png_ptr->width < 3)
             {
@@ -649,6 +632,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 4:
             if ((png_ptr->row_number & 3) != 2)
             {
@@ -659,6 +643,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 5:
             if ((png_ptr->row_number & 1) || png_ptr->width < 2)
             {
@@ -669,6 +654,8 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
+         default:
          case 6:
             if (!(png_ptr->row_number & 1))
             {
@@ -822,7 +809,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
    png_bytepp dp;
 
    png_debug(1, "in png_read_rows");
- 
+
    if (png_ptr == NULL)
       return;
    rp = row;
@@ -873,7 +860,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
    png_bytepp rp;
 
    png_debug(1, "in png_read_image");
- 
+
    if (png_ptr == NULL)
       return;
 
@@ -911,7 +898,7 @@ void PNGAPI
 png_read_end(png_structp png_ptr, png_infop info_ptr)
 {
    png_debug(1, "in png_read_end");
- 
+
    if (png_ptr == NULL)
       return;
    png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
@@ -1096,7 +1083,7 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
 #endif
 
    png_debug(1, "in png_destroy_read_struct");
- 
+
    if (png_ptr_ptr != NULL)
       png_ptr = *png_ptr_ptr;
    if (png_ptr == NULL)
@@ -1172,7 +1159,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr,
 #endif
 
    png_debug(1, "in png_read_destroy");
- 
+
    if (info_ptr != NULL)
       png_info_destroy(png_ptr, info_ptr);
 
@@ -1455,8 +1442,8 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
    /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
    png_read_end(png_ptr, info_ptr);
 
-   transforms = transforms; /* Quiet compiler warnings */
-   params = params;
+   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
+   PNG_UNUSED(params)
 
 }
 #endif /* PNG_INFO_IMAGE_SUPPORTED */
diff --git a/modules/libimg/png/pngrio.c b/modules/libimg/png/pngrio.c
index 59059caf6927..710f4f0f460c 100644
--- a/modules/libimg/png/pngrio.c
+++ b/modules/libimg/png/pngrio.c
@@ -1,8 +1,8 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.4.1 [February 25, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -33,7 +33,7 @@ void /* PRIVATE */
 png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
    png_debug1(4, "reading %d bytes", (int)length);
- 
+
    if (png_ptr->read_data_fn != NULL)
       (*(png_ptr->read_data_fn))(png_ptr, data, length);
    else
diff --git a/modules/libimg/png/pngrtran.c b/modules/libimg/png/pngrtran.c
index b5e8f1a26f2b..8bb8c2b232fd 100644
--- a/modules/libimg/png/pngrtran.c
+++ b/modules/libimg/png/pngrtran.c
@@ -1,8 +1,8 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.4.2 [May 6, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [%RDATE%]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -26,7 +26,7 @@ void PNGAPI
 png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
 {
    png_debug(1, "in png_set_crc_action");
- 
+
    if (png_ptr == NULL)
       return;
 
@@ -98,7 +98,7 @@ png_set_background(png_structp png_ptr,
    int need_expand, double background_gamma)
 {
    png_debug(1, "in png_set_background");
- 
+
    if (png_ptr == NULL)
       return;
    if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
@@ -686,6 +686,11 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
               break;
 
       case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+         break;
+
+      default:
+         png_error(png_ptr, "invalid error action in png_set_rgb_to_gray");
+         break;
    }
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
 #ifdef PNG_READ_EXPAND_SUPPORTED
@@ -828,6 +833,8 @@ png_init_read_transformations(png_structp png_ptr)
                }
                break;
 
+            default:
+
             case 8:
 
             case 16:
@@ -1001,7 +1008,7 @@ png_init_read_transformations(png_structp png_ptr)
              */
             png_ptr->transformations &= ~PNG_BACKGROUND;
             png_ptr->transformations &= ~PNG_GAMMA;
-            png_ptr->transformations |= PNG_STRIP_ALPHA;
+            png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
          }
          /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
          else
@@ -1028,6 +1035,9 @@ png_init_read_transformations(png_structp png_ptr)
                   gs = 1.0 / (png_ptr->background_gamma *
                      png_ptr->screen_gamma);
                   break;
+
+               default:
+                  png_error(png_ptr, "invalid background gamma type");
             }
 
             png_ptr->background_1.gray = (png_uint_16)(pow(
@@ -1121,7 +1131,7 @@ png_init_read_transformations(png_structp png_ptr)
 
       /* Handled alpha, still need to strip the channel. */
       png_ptr->transformations &= ~PNG_BACKGROUND;
-      png_ptr->transformations |= PNG_STRIP_ALPHA;
+      png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
    }
 #endif /* PNG_READ_BACKGROUND_SUPPORTED */
 
@@ -1626,6 +1636,9 @@ png_do_unpack(png_row_infop row_info, png_bytep row)
             }
             break;
          }
+
+         default:
+            break;
       }
       row_info->bit_depth = 8;
       row_info->pixel_depth = (png_byte)(8 * row_info->channels);
@@ -1682,6 +1695,9 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
 
       switch (row_info->bit_depth)
       {
+         default:
+            break;
+
          case 2:
          {
             png_bytep bp;
@@ -2274,7 +2290,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
 
    png_debug(1, "in png_do_rgb_to_gray");
 
-   if (
+   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
       (row_info->color_type & PNG_COLOR_MASK_COLOR))
    {
       png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
@@ -2798,6 +2814,9 @@ png_do_background(png_row_infop row_info, png_bytep row,
                   }
                   break;
                }
+
+               default:
+                  break;
             }
             break;
          }
@@ -3230,6 +3249,9 @@ png_do_background(png_row_infop row_info, png_bytep row,
             }
             break;
          }
+
+         default:
+            break;
       }
 
       if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
@@ -3428,6 +3450,9 @@ png_do_gamma(png_row_infop row_info, png_bytep row,
             }
             break;
          }
+
+         default:
+            break;
       }
    }
 }
@@ -3522,6 +3547,9 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,
                }
                break;
             }
+
+            default:
+               break;
          }
          row_info->bit_depth = 8;
          row_info->pixel_depth = 8;
@@ -3672,6 +3700,9 @@ png_do_expand(png_row_infop row_info, png_bytep row,
                   }
                   break;
                }
+
+               default:
+                  break;
             }
 
             row_info->bit_depth = 8;
diff --git a/modules/libimg/png/pngrutil.c b/modules/libimg/png/pngrutil.c
index 6b5eb2b8ef7a..c540b94b67ab 100644
--- a/modules/libimg/png/pngrutil.c
+++ b/modules/libimg/png/pngrutil.c
@@ -1,8 +1,8 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.4.3 [June 26, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -23,50 +23,98 @@
 png_uint_32 PNGAPI
 png_get_uint_31(png_structp png_ptr, png_bytep buf)
 {
-   png_uint_32 i = png_get_uint_32(buf);
-   if (i > PNG_UINT_31_MAX)
-     png_error(png_ptr, "PNG unsigned integer out of range");
-   return (i);
-}
-#ifndef PNG_USE_READ_MACROS
-/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
-png_uint_32 PNGAPI
-png_get_uint_32(png_bytep buf)
-{
-   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
-      ((png_uint_32)(*(buf + 1)) << 16) +
-      ((png_uint_32)(*(buf + 2)) << 8) +
-      (png_uint_32)(*(buf + 3));
+   png_uint_32 val = png_get_uint_32(buf);
 
-   return (i);
+   if (val > PNG_UINT_31_MAX)
+     png_error(png_ptr, "PNG unsigned integer out of range");
+   return (val);
+}
+
+#ifndef PNG_USE_READ_MACROS
+/* The parentheses around "PNGAPI function_name" in the following three
+ * functions are necessary because they allow the macros to co-exist with
+ * these (unused but exported) functions.
+ */
+
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32 (PNGAPI
+png_get_uint_32)(png_bytep buf)
+{
+   png_uint_32 uval = png_get_uint_32(buf);
+   if ((uval & 0x80000000L) == 0) /* non-negative */
+      return uval;
+
+   uval = (uval ^ 0xffffffffL) + 1;  /* 2's complement: -x = ~x+1 */
+   return -(png_int_32)uval;
 }
 
 /* Grab a signed 32-bit integer from a buffer in big-endian format.  The
- * data is stored in the PNG file in two's complement format, and it is
- * assumed that the machine format for signed integers is the same.
+ * data is stored in the PNG file in two's complement format and there
+ * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
+ * the following code does a two's complement to native conversion.
  */
-png_int_32 PNGAPI
-png_get_int_32(png_bytep buf)
+png_int_32 (PNGAPI
+png_get_int_32)(png_bytep buf)
 {
-   png_int_32 i = ((png_int_32)(*buf) << 24) +
-      ((png_int_32)(*(buf + 1)) << 16) +
-      ((png_int_32)(*(buf + 2)) << 8) +
-      (png_int_32)(*(buf + 3));
+   png_uint_32 uval = png_get_uint_32(buf);
+   if ((uval & 0x80000000L) == 0) /* non-negative */
+      return uval;
 
-   return (i);
+   uval = (uval ^ 0xffffffffL) + 1;  /* 2's complement: -x = ~x+1 */
+   return -(png_int_32)uval;
 }
 
 /* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
-png_uint_16 PNGAPI
-png_get_uint_16(png_bytep buf)
+png_uint_16 (PNGAPI
+png_get_uint_16)(png_bytep buf)
 {
-   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
-      (png_uint_16)(*(buf + 1)));
+   /* ANSI-C requires an int value to accomodate at least 16 bits so this
+    * works and allows the compiler not to worry about possible narrowing
+    * on 32 bit systems.  (Pre-ANSI systems did not make integers smaller
+    * than 16 bits either.)
+    */
+   unsigned int val =
+       ((unsigned int)(*buf) << 8) +
+       ((unsigned int)(*(buf + 1)));
 
-   return (i);
+   return (png_uint_16)val;
 }
 #endif /* PNG_USE_READ_MACROS */
 
+/* Read and check the PNG file signature */
+void /* PRIVATE */
+png_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+   png_size_t num_checked, num_to_check;
+
+   /* Exit if the user application does not expect a signature. */
+   if (png_ptr->sig_bytes >= 8)
+      return;
+
+   num_checked = png_ptr->sig_bytes;
+   num_to_check = 8 - num_checked;
+
+#ifdef PNG_IO_STATE_SUPPORTED
+   png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
+#endif
+
+   /* The signature must be serialized in a single I/O call. */
+   png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+   png_ptr->sig_bytes = 8;
+
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   {
+      if (num_checked < 4 &&
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+         png_error(png_ptr, "Not a PNG file");
+
+      else
+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+   }
+   if (num_checked < 3)
+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+}
+
 /* Read the chunk header (length + type name).
  * Put the type name into png_ptr->chunk_name, and return the length.
  */
@@ -77,32 +125,31 @@ png_read_chunk_header(png_structp png_ptr)
    png_uint_32 length;
 
 #ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk header is being read.
-    * PNG_IO_CHUNK_HDR requires a single I/O call.
-    */
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
 #endif
 
-   /* Read the length and the chunk name */
+   /* Read the length and the chunk name.
+    * This must be performed in a single I/O call.
+    */
    png_read_data(png_ptr, buf, 8);
    length = png_get_uint_31(png_ptr, buf);
 
-   /* Put the chunk name into png_ptr->chunk_name */
+   /* Put the chunk name into png_ptr->chunk_name. */
    png_memcpy(png_ptr->chunk_name, buf + 4, 4);
 
    png_debug2(0, "Reading %s chunk, length = %lu",
-      png_ptr->chunk_name, length);
+      png_ptr->chunk_name, (unsigned long)length);
 
-   /* Reset the crc and run it over the chunk name */
+   /* Reset the crc and run it over the chunk name. */
    png_reset_crc(png_ptr);
    png_calculate_crc(png_ptr, png_ptr->chunk_name, 4);
 
-   /* Check to see if chunk name is valid */
+   /* Check to see if chunk name is valid. */
    png_check_chunk_name(png_ptr, png_ptr->chunk_name);
 
 #ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that chunk data will (possibly) be read.
-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
+   /* It is unspecified how many I/O calls will be performed
+    * during the serialization of the chunk data.
     */
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
 #endif
@@ -116,6 +163,7 @@ png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
 {
    if (png_ptr == NULL)
       return;
+
    png_read_data(png_ptr, buf, length);
    png_calculate_crc(png_ptr, buf, length);
 }
@@ -135,6 +183,7 @@ png_crc_finish(png_structp png_ptr, png_uint_32 skip)
    {
       png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
    }
+
    if (i)
    {
       png_crc_read(png_ptr, png_ptr->zbuf, i);
@@ -149,11 +198,13 @@ png_crc_finish(png_structp png_ptr, png_uint_32 skip)
       {
          png_chunk_warning(png_ptr, "CRC error");
       }
+
       else
       {
          png_chunk_benign_error(png_ptr, "CRC error");
          return (0);
       }
+
       return (1);
    }
 
@@ -176,6 +227,7 @@ png_crc_error(png_structp png_ptr)
           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
          need_crc = 0;
    }
+
    else                                                    /* critical */
    {
       if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
@@ -183,11 +235,10 @@ png_crc_error(png_structp png_ptr)
    }
 
 #ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk CRC is being read */
-   /* PNG_IO_CHUNK_CRC requires the I/O to be done at once */
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;
 #endif
 
+   /* The chunk CRC must be serialized in a single I/O call. */
    png_read_data(png_ptr, crc_bytes, 4);
 
    if (need_crc)
@@ -195,6 +246,7 @@ png_crc_error(png_structp png_ptr)
       crc = png_get_uint_32(crc_bytes);
       return ((int)(crc != png_ptr->crc));
    }
+
    else
       return (0);
 }
@@ -234,6 +286,7 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
             if (avail < copy) copy = avail;
             png_memcpy(output + count, png_ptr->zbuf, copy);
          }
+
          count += avail;
       }
 
@@ -267,9 +320,11 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
                case Z_BUF_ERROR:
                   msg = "Buffer error in compressed datastream in %s chunk";
                   break;
+
                case Z_DATA_ERROR:
                   msg = "Data error in compressed datastream in %s chunk";
                   break;
+
                default:
                   msg = "Incomplete compressed datastream in %s chunk";
                   break;
@@ -369,6 +424,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
             png_warning(png_ptr, "png_inflate logic error");
             png_free(png_ptr, text);
          }
+
          else
           png_warning(png_ptr, "Not enough memory to decompress chunk");
       }
@@ -652,7 +708,7 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
    png_crc_finish(png_ptr, length);
 
-   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */
+   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
 }
 
 #ifdef PNG_READ_gAMA_SUPPORTED
@@ -1165,9 +1221,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 {
    png_bytep entry_start;
    png_sPLT_t new_palette;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
    png_sPLT_entryp pp;
-#endif
    int data_length, entry_size, i;
    png_uint_32 skip = 0;
    png_size_t slength;
@@ -1306,7 +1360,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
           pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
           pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
       }
-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
    }
 #endif
 
@@ -1675,7 +1729,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
 
    png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)",
-      length + 1);
+      (unsigned long)(length + 1));
    png_free(png_ptr, png_ptr->chunkdata);
    png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
    if (png_ptr->chunkdata == NULL)
@@ -1813,7 +1867,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
 
    png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
-      length + 1);
+      (unsigned long)(length + 1));
    png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
    if (png_ptr->chunkdata == NULL)
    {
@@ -1880,9 +1934,6 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
       png_warning(png_ptr, "malformed height string in sCAL chunk");
       png_free(png_ptr, png_ptr->chunkdata);
       png_ptr->chunkdata = NULL;
-#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
-      png_free(png_ptr, swidth);
-#endif
       return;
    }
 #else
@@ -1893,9 +1944,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
       png_warning(png_ptr, "Out of memory while processing sCAL chunk height");
       png_free(png_ptr, png_ptr->chunkdata);
       png_ptr->chunkdata = NULL;
-#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
       png_free(png_ptr, swidth);
-#endif
       return;
    }
    png_memcpy(sheight, ep, png_strlen(ep));
@@ -2357,7 +2406,7 @@ png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
     png_uint_32 num_frames;
     png_uint_32 num_plays;
     png_uint_32 didSet;
-    
+
     png_debug(1, "in png_handle_acTL");
 
     if (!(png_ptr->mode & PNG_HAVE_IHDR))
@@ -2382,13 +2431,13 @@ png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
         png_crc_finish(png_ptr, length);
         return;
     }
-    
+
     png_crc_read(png_ptr, data, 8);
     png_crc_finish(png_ptr, 0);
-    
+
     num_frames = png_get_uint_31(png_ptr, data);
     num_plays = png_get_uint_31(png_ptr, data + 4);
-    
+
     /* the set function will do error checking on num_frames */
     didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays);
     if(didSet)
@@ -2407,9 +2456,11 @@ png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
     png_uint_16 delay_den;
     png_byte dispose_op;
     png_byte blend_op;
-    
+
     png_debug(1, "in png_handle_fcTL");
-    
+
+    png_ensure_sequence_number(png_ptr, length);
+   
     if (!(png_ptr->mode & PNG_HAVE_IHDR))
     {
         png_error(png_ptr, "Missing IHDR before fcTL");
@@ -2420,13 +2471,13 @@ png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
         * but correct. PNG_HAVE_IDAT is unset before the frame head is read
         * i can't think of a better message */
         png_warning(png_ptr, "Invalid fcTL after IDAT skipped");
-        png_crc_finish(png_ptr, length);
+        png_crc_finish(png_ptr, length-4);
         return;
     }
     else if (png_ptr->mode & PNG_HAVE_fcTL)
     {
         png_warning(png_ptr, "Duplicate fcTL within one frame skipped");
-        png_crc_finish(png_ptr, length);
+        png_crc_finish(png_ptr, length-4);
         return;
     }
     else if (length != 26)
@@ -2435,12 +2486,10 @@ png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
         png_crc_finish(png_ptr, length);
         return;
     }
-    
-    png_ensure_sequence_number(png_ptr, length);
-    
+
     png_crc_read(png_ptr, data, 22);
     png_crc_finish(png_ptr, 0);
-    
+
     width = png_get_uint_31(png_ptr, data);
     height = png_get_uint_31(png_ptr, data + 4);
     x_offset = png_get_uint_31(png_ptr, data + 8);
@@ -2449,21 +2498,29 @@ png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
     delay_den = png_get_uint_16(data + 18);
     dispose_op = data[20];
     blend_op = data[21];
-    
+
     if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0))
         png_error(png_ptr, "fcTL for the first frame must have zero offset");
-    if (png_ptr->num_frames_read == 0 && 
+    if (png_ptr->num_frames_read == 0 &&
         (width != info_ptr->width || height != info_ptr->height))
         png_error(png_ptr, "size in first frame's fcTL must match "
                            "the size in IHDR");
-    
-    /* the set function will do more error checking */
-    png_set_next_frame_fcTL(png_ptr, info_ptr, width, height, 
-                            x_offset, y_offset, delay_num, delay_den,
-                            dispose_op, blend_op);
-    
-    png_read_reinit(png_ptr, info_ptr);
-    
+
+    if (info_ptr != NULL)
+    {
+        if (png_ptr->num_frames_read == 0 &&
+            (width != info_ptr->width || height != info_ptr->height))
+            png_error(png_ptr, "size in first frame's fcTL must match "
+                               "the size in IHDR");
+        
+        /* the set function will do more error checking */
+        png_set_next_frame_fcTL(png_ptr, info_ptr, width, height,
+                                x_offset, y_offset, delay_num, delay_den,
+                                dispose_op, blend_op);
+        
+        png_read_reinit(png_ptr, info_ptr);
+    }
+
     png_ptr->mode |= PNG_HAVE_fcTL;
 }
 
@@ -2481,8 +2538,8 @@ void /* PRIVATE */
 png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 {
     png_ensure_sequence_number(png_ptr, length);
-    
-    /* This function is only called from png_read_end(), png_read_info(), 
+
+    /* This function is only called from png_read_end(), png_read_info(),
     * and png_push_read_chunk() which means that:
     * - the user doesn't want to read this frame
     * - or this is an out-of-place fdAT
@@ -2496,17 +2553,17 @@ png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length)
 {
     png_byte data[4];
     png_uint_32 sequence_number;
-    
+
     if (length < 4)
         png_error(png_ptr, "invalid fcTL or fdAT chunk found");
-    
+
     png_crc_read(png_ptr, data, 4);
     sequence_number = png_get_uint_31(png_ptr, data);
-    
+
     if (sequence_number != png_ptr->next_seq_num)
         png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence "
                            "number found");
-    
+
     png_ptr->next_seq_num++;
 }
 #endif /* PNG_READ_APNG_SUPPORTED */
@@ -2621,7 +2678,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    png_crc_finish(png_ptr, skip);
 
 #ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */
+   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
 #endif
 }
 
@@ -3077,7 +3134,7 @@ png_do_read_interlace(png_structp png_ptr)
       row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
    }
 #ifndef PNG_READ_PACKSWAP_SUPPORTED
-   transformations = transformations; /* Silence compiler warning */
+   PNG_UNUSED(transformations)  /* Silence compiler warning */
 #endif
 }
 #endif /* PNG_READ_INTERLACING_SUPPORTED */
@@ -3087,7 +3144,8 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
    png_bytep prev_row, int filter)
 {
    png_debug(1, "in png_read_filter_row");
-   png_debug2(2, "row = %lu, filter = %d", png_ptr->row_number, filter);
+   png_debug2(2, "row = %lu, filter = %d",
+      (unsigned long)png_ptr->row_number, filter);
    switch (filter)
    {
       case PNG_FILTER_VALUE_NONE:
@@ -3278,17 +3336,10 @@ png_read_finish_row(png_structp png_ptr)
          {
             while (!png_ptr->idat_size)
             {
-               png_byte chunk_length[4];
-
                png_crc_finish(png_ptr, 0);
-
-               png_read_data(png_ptr, chunk_length, 4);
-               png_ptr->idat_size = png_get_uint_31(png_ptr, chunk_length);
-               png_reset_crc(png_ptr);
-               png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+               png_ptr->idat_size = png_read_chunk_header(png_ptr);
                if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
                   png_error(png_ptr, "Not enough image data");
-
             }
             png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
             png_ptr->zstream.next_in = png_ptr->zbuf;
@@ -3535,13 +3586,13 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
 
    png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 
-   png_debug1(3, "width = %lu,", png_ptr->width);
-   png_debug1(3, "height = %lu,", png_ptr->height);
-   png_debug1(3, "iwidth = %lu,", png_ptr->iwidth);
-   png_debug1(3, "num_rows = %lu,", png_ptr->num_rows);
-   png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes);
+   png_debug1(3, "width = %lu,", (unsigned long)png_ptr->width);
+   png_debug1(3, "height = %lu,", (unsigned long)png_ptr->height);
+   png_debug1(3, "iwidth = %lu,", (unsigned long)png_ptr->iwidth);
+   png_debug1(3, "num_rows = %lu,", (unsigned long)png_ptr->num_rows);
+   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
    png_debug1(3, "irowbytes = %lu",
-       PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
+       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
 
    png_ptr->flags |= PNG_FLAG_ROW_INIT;
 }
@@ -3585,7 +3636,7 @@ png_progressive_read_reset(png_structp png_ptr)
 
     /* offset to next interlace block in the y direction */
     const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-    
+
     if (png_ptr->interlaced)
     {
         if (!(png_ptr->transformations & PNG_INTERLACE))
diff --git a/modules/libimg/png/pngset.c b/modules/libimg/png/pngset.c
index 10bf08e01571..d1f53473197a 100644
--- a/modules/libimg/png/pngset.c
+++ b/modules/libimg/png/pngset.c
@@ -1,8 +1,8 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.4.1 [February 25, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [January 14, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -260,7 +260,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
       info_ptr->rowbytes = 0;
    else
       info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-   
+
 #if defined(PNG_APNG_SUPPORTED)
    /* for non-animated png. this may be overwritten from an acTL chunk later */
    info_ptr->num_frames = 1;
@@ -695,6 +695,13 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
       if (text_ptr[i].key == NULL)
           continue;
 
+      if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
+          text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
+      {
+         png_warning(png_ptr, "text compression mode is out of range");
+         continue;
+      }
+
       key_len = png_strlen(text_ptr[i].key);
 
       if (text_ptr[i].compression <= 0)
@@ -939,49 +946,49 @@ png_set_sPLT(png_structp png_ptr,
 
 #if defined(PNG_APNG_SUPPORTED)
 png_uint_32 PNGAPI
-png_set_acTL(png_structp png_ptr, png_infop info_ptr, 
+png_set_acTL(png_structp png_ptr, png_infop info_ptr,
     png_uint_32 num_frames, png_uint_32 num_plays)
 {
     png_debug1(1, "in %s storage function", "acTL");
 
     if (png_ptr == NULL || info_ptr == NULL)
     {
-        png_warning(png_ptr, 
+        png_warning(png_ptr,
                     "Call to png_set_acTL() with NULL png_ptr "
                     "or info_ptr ignored");
         return (0);
     }
     if (num_frames == 0)
     {
-        png_warning(png_ptr, 
+        png_warning(png_ptr,
                     "Ignoring attempt to set acTL with num_frames zero");
         return (0);
     }
     if (num_frames > PNG_UINT_31_MAX)
     {
-        png_warning(png_ptr, 
+        png_warning(png_ptr,
                     "Ignoring attempt to set acTL with num_frames > 2^31-1");
         return (0);
     }
     if (num_plays > PNG_UINT_31_MAX)
     {
-        png_warning(png_ptr, 
+        png_warning(png_ptr,
                     "Ignoring attempt to set acTL with num_plays "
                     "> 2^31-1");
         return (0);
     }
-    
+
     info_ptr->num_frames = num_frames;
     info_ptr->num_plays = num_plays;
-    
+
     info_ptr->valid |= PNG_INFO_acTL;
-    
+
     return (1);
 }
 
 /* delay_num and delay_den can hold any 16-bit values including zero */
 png_uint_32 PNGAPI
-png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr, 
+png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
     png_uint_32 width, png_uint_32 height,
     png_uint_32 x_offset, png_uint_32 y_offset,
     png_uint_16 delay_num, png_uint_16 delay_den,
@@ -991,15 +998,15 @@ png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
 
     if (png_ptr == NULL || info_ptr == NULL)
     {
-        png_warning(png_ptr, 
+        png_warning(png_ptr,
                     "Call to png_set_fcTL() with NULL png_ptr or info_ptr "
                     "ignored");
         return (0);
     }
-    
-    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, 
+
+    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
                              delay_num, delay_den, dispose_op, blend_op);
-    
+
     /* For efficiency, ignore BLEND_OP_OVER when image is opaque.
      * See bug #441971 and #455140
      */
@@ -1023,20 +1030,20 @@ png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
     info_ptr->next_frame_delay_den = delay_den;
     info_ptr->next_frame_dispose_op = dispose_op;
     info_ptr->next_frame_blend_op = blend_op;
-    
+
     info_ptr->valid |= PNG_INFO_fcTL;
-    
+
     return (1);
 }
 
 void /* PRIVATE */
-png_ensure_fcTL_is_valid(png_structp png_ptr, 
+png_ensure_fcTL_is_valid(png_structp png_ptr,
     png_uint_32 width, png_uint_32 height,
     png_uint_32 x_offset, png_uint_32 y_offset,
     png_uint_16 delay_num, png_uint_16 delay_den,
     png_byte dispose_op, png_byte blend_op)
 {
-    if (width + x_offset > png_ptr->first_frame_width || 
+    if (width + x_offset > png_ptr->first_frame_width ||
         height + y_offset > png_ptr->first_frame_height)
         png_error(png_ptr, "dimensions of a frame are greater than"
                            "the ones in IHDR");
@@ -1064,15 +1071,15 @@ png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr,
                               png_byte is_hidden)
 {
     png_debug(1, "in png_first_frame_is_hidden()");
-    
+
     if (png_ptr == NULL)
         return 0;
-    
+
     if(is_hidden)
         png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
     else
         png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN;
-    
+
     return 1;
 }
 #endif /* PNG_APNG_SUPPORTED */
@@ -1149,7 +1156,7 @@ png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 png_uint_32 PNGAPI
-png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+png_permit_mng_features(png_structp png_ptr, png_uint_32 mng_features)
 {
    png_debug(1, "in png_permit_mng_features");
 
@@ -1263,7 +1270,7 @@ png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 /* This function was added to libpng 1.2.6 */
 void PNGAPI
-png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+png_set_user_limits(png_structp png_ptr, png_uint_32 user_width_max,
     png_uint_32 user_height_max)
 {
    /* Images with dimensions larger than these limits will be
@@ -1278,7 +1285,7 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
 
 /* This function was added to libpng 1.4.0 */
 void PNGAPI
-png_set_chunk_cache_max (png_structp png_ptr,
+png_set_chunk_cache_max(png_structp png_ptr,
    png_uint_32 user_chunk_cache_max)
 {
     if (png_ptr)
@@ -1287,7 +1294,7 @@ png_set_chunk_cache_max (png_structp png_ptr,
 
 /* This function was added to libpng 1.4.1 */
 void PNGAPI
-png_set_chunk_malloc_max (png_structp png_ptr,
+png_set_chunk_malloc_max(png_structp png_ptr,
    png_alloc_size_t user_chunk_malloc_max)
 {
     if (png_ptr)
diff --git a/modules/libimg/png/pngtrans.c b/modules/libimg/png/pngtrans.c
index f80679a19d18..05eb2d05a37e 100644
--- a/modules/libimg/png/pngtrans.c
+++ b/modules/libimg/png/pngtrans.c
@@ -1,8 +1,8 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.4.2 [April 29, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [April 10, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -662,7 +662,7 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp
  * are called.
  */
 png_voidp PNGAPI
-png_get_user_transform_ptr(png_structp png_ptr)
+png_get_user_transform_ptr(png_const_structp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
@@ -673,5 +673,5 @@ png_get_user_transform_ptr(png_structp png_ptr)
 #endif
 }
 #endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
-	  PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+          PNG_WRITE_USER_TRANSFORM_SUPPORTED */
 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/modules/libimg/png/pngwrite.c b/modules/libimg/png/pngwrite.c
index 00dc2a904c83..f38132a51f63 100644
--- a/modules/libimg/png/pngwrite.c
+++ b/modules/libimg/png/pngwrite.c
@@ -1,8 +1,8 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.4.0 [January 3, 2010]
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Last changed in libpng 1.4.6 [March 8, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -669,8 +669,8 @@ png_write_row(png_structp png_ptr, png_bytep row)
    if (png_ptr == NULL)
       return;
 
-   png_debug2(1, "in png_write_row (row %ld, pass %d)",
-      png_ptr->row_number, png_ptr->pass);
+   png_debug2(1, "in png_write_row (row %lu, pass %d)",
+      (unsigned long)png_ptr->row_number, png_ptr->pass);
 
    /* Initialize transformations and other stuff if first time */
    if (png_ptr->row_number == 0 && png_ptr->pass == 0)
@@ -786,7 +786,8 @@ png_write_row(png_structp png_ptr, png_bytep row)
       png_ptr->row_info.width);
 
    png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
-   png_debug1(3, "row_info->width = %lu", png_ptr->row_info.width);
+   png_debug1(3, "row_info->width = %lu",
+      (unsigned long)png_ptr->row_info.width);
    png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
    png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
    png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
@@ -1458,33 +1459,33 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
    /* It is REQUIRED to call this to finish writing the rest of the file */
    png_write_end(png_ptr, info_ptr);
 
-   transforms = transforms; /* Quiet compiler warnings */
-   params = params;
+   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
+   PNG_UNUSED(params)
 }
 #endif
 
 #if defined(PNG_WRITE_APNG_SUPPORTED)
 void PNGAPI
 png_write_frame_head(png_structp png_ptr, png_infop info_ptr,
-    png_bytepp row_pointers, png_uint_32 width, png_uint_32 height, 
-    png_uint_32 x_offset, png_uint_32 y_offset, 
+    png_bytepp row_pointers, png_uint_32 width, png_uint_32 height,
+    png_uint_32 x_offset, png_uint_32 y_offset,
     png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
     png_byte blend_op)
 {
     png_debug(1, "in png_write_frame_head");
-    
+
     /* there is a chance this has been set after png_write_info was called,
     * so it would be set but not written. is there a way to be sure? */
     if (!(info_ptr->valid & PNG_INFO_acTL))
         png_error(png_ptr, "png_write_frame_head(): acTL not set");
-    
+
     png_write_reset(png_ptr);
-    
+
     png_write_reinit(png_ptr, info_ptr, width, height);
-    
-    if ( !(png_ptr->num_frames_written == 0 && 
+
+    if ( !(png_ptr->num_frames_written == 0 &&
            (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) )
-        png_write_fcTL(png_ptr, width, height, x_offset, y_offset, 
+        png_write_fcTL(png_ptr, width, height, x_offset, y_offset,
                        delay_num, delay_den, dispose_op, blend_op);
 }
 
@@ -1492,9 +1493,8 @@ void PNGAPI
 png_write_frame_tail(png_structp png_ptr, png_infop png_info)
 {
     png_debug(1, "in png_write_frame_tail");
-    
+
     png_ptr->num_frames_written++;
 }
 #endif /* PNG_WRITE_APNG_SUPPORTED */
-
 #endif /* PNG_WRITE_SUPPORTED */
diff --git a/modules/libimg/png/pngwtran.c b/modules/libimg/png/pngwtran.c
index 070caa544de1..2925a9337722 100644
--- a/modules/libimg/png/pngwtran.c
+++ b/modules/libimg/png/pngwtran.c
@@ -195,6 +195,9 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
                *dp = (png_byte)v;
             break;
          }
+
+         default:
+            break;
       }
       row_info->bit_depth = (png_byte)bit_depth;
       row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
diff --git a/modules/libimg/png/pngwutil.c b/modules/libimg/png/pngwutil.c
index 0e6fad915252..69598735cbcb 100644
--- a/modules/libimg/png/pngwutil.c
+++ b/modules/libimg/png/pngwutil.c
@@ -246,10 +246,12 @@ png_text_compress(png_structp png_ptr,
     */
 
    /* Set up the compression buffers */
+   /* TODO: the following cast hides a potential overflow problem. */
    png_ptr->zstream.avail_in = (uInt)text_len;
+   /* NOTE: assume zlib doesn't overwrite the input */
    png_ptr->zstream.next_in = (Bytef *)text;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+   png_ptr->zstream.avail_out = png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = png_ptr->zbuf;
 
    /* This is the same compression loop as in png_write_row() */
    do
@@ -688,11 +690,29 @@ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
          if (length >= 2 &&
              png_ptr->height < 16384 && png_ptr->width < 16384)
          {
+            unsigned int z_cinfo;
+            unsigned int half_z_window_size;
+
+            /* Compute the maximum possible length of the datastream */
+
+            /* Number of pixels, plus for each row a filter byte and possible
+             * and possibly a padding byte, so increase the maximum
+             * size to account for these.
+             */
             png_uint_32 uncompressed_idat_size = png_ptr->height *
                ((png_ptr->width *
                png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
-            unsigned int z_cinfo = z_cmf >> 4;
-            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+
+            /* If it's interlaced, each block of 8 rows is sent as up to
+             * 14 rows, i.e., 6 additional rows, each with a filter byte
+             * and possibly a padding byte
+             */
+            if (png_ptr->interlaced)
+               uncompressed_idat_size += ((png_ptr->height + 7)/8) *
+                   (png_ptr->bit_depth < 8 ? 12 : 6);
+
+            z_cinfo = z_cmf >> 4;
+            half_z_window_size = 1 << (z_cinfo + 7);
             while (uncompressed_idat_size <= half_z_window_size &&
                    half_z_window_size >= 256)
             {
@@ -721,16 +741,16 @@ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
    else
    {
       png_byte buf[4];
-      
+
       png_write_chunk_start(png_ptr, (png_bytep)png_fdAT, 4 + length);
-      
+
       png_save_uint_32(buf, png_ptr->next_seq_num);
       png_write_chunk_data(png_ptr, buf, 4);
-      
+
       png_write_chunk_data(png_ptr, data, length);
-      
+
       png_write_chunk_end(png_ptr);
-      
+
       png_ptr->next_seq_num++;
    }
 #endif
@@ -1748,43 +1768,43 @@ png_write_acTL(png_structp png_ptr,
 {
     PNG_acTL;
     png_byte data[16];
-    
+
     png_debug(1, "in png_write_acTL");
-    
+
     png_ptr->num_frames_to_write = num_frames;
-    
+
     if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN)
         num_frames--;
-    
+
     png_save_uint_32(data, num_frames);
     png_save_uint_32(data + 4, num_plays);
-    
+
     png_write_chunk(png_ptr, (png_bytep)png_acTL, data, (png_size_t)8);
 }
 
 void /* PRIVATE */
-png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height, 
+png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
     png_uint_32 x_offset, png_uint_32 y_offset,
-    png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, 
+    png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
     png_byte blend_op)
 {
     PNG_fcTL;
     png_byte data[26];
-    
+
     png_debug(1, "in png_write_fcTL");
-    
+
     if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0))
         png_error(png_ptr, "x and/or y offset for the first frame aren't 0");
-    if (png_ptr->num_frames_written == 0 && 
-        (width != png_ptr->first_frame_width || 
+    if (png_ptr->num_frames_written == 0 &&
+        (width != png_ptr->first_frame_width ||
          height != png_ptr->first_frame_height))
         png_error(png_ptr, "width and/or height in the first frame's fcTL "
                            "don't match the ones in IHDR");
-    
+
     /* more error checking */
-    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, 
+    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
                              delay_num, delay_den, dispose_op, blend_op);
-    
+
     png_save_uint_32(data, png_ptr->next_seq_num);
     png_save_uint_32(data + 4, width);
     png_save_uint_32(data + 8, height);
@@ -1794,9 +1814,9 @@ png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
     png_save_uint_16(data + 22, delay_den);
     data[24] = dispose_op;
     data[25] = blend_op;
-    
+
     png_write_chunk(png_ptr, (png_bytep)png_fcTL, data, (png_size_t)26);
-    
+
     png_ptr->next_seq_num++;
 }
 #endif /* PNG_WRITE_APNG_SUPPORTED */
@@ -2883,24 +2903,24 @@ png_write_reset(png_structp png_ptr)
 }
 
 void /* PRIVATE */
-png_write_reinit(png_structp png_ptr, png_infop info_ptr, 
+png_write_reinit(png_structp png_ptr, png_infop info_ptr,
                  png_uint_32 width, png_uint_32 height)
 {
-    if (png_ptr->num_frames_written == 0 && 
-        (width != png_ptr->first_frame_width || 
+    if (png_ptr->num_frames_written == 0 &&
+        (width != png_ptr->first_frame_width ||
          height != png_ptr->first_frame_height))
         png_error(png_ptr, "width and/or height in the first frame's fcTL "
                            "don't match the ones in IHDR");
-    if (width > png_ptr->first_frame_width || 
+    if (width > png_ptr->first_frame_width ||
         height > png_ptr->first_frame_height)
         png_error(png_ptr, "width and/or height for a frame greater than"
                            "the ones in IHDR");
-    
-    png_set_IHDR(png_ptr, info_ptr, width, height, 
-                 info_ptr->bit_depth, info_ptr->color_type, 
+
+    png_set_IHDR(png_ptr, info_ptr, width, height,
+                 info_ptr->bit_depth, info_ptr->color_type,
                  info_ptr->interlace_type, info_ptr->compression_type,
                  info_ptr->filter_type);
-   
+
     png_ptr->width = width;
     png_ptr->height = height;
     png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);

From 1e7fb28afa9ff6626684e9412914f7d8fd4cff19 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Mon, 11 Apr 2011 11:19:05 +0800
Subject: [PATCH 024/509] Bug 640062 - Panorama tabs-from-other-windows button
 displays &nbsp; r=ian

---
 browser/base/content/tabview/search.js                      | 2 +-
 .../base/content/test/tabview/browser_tabview_bug595560.js  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/tabview/search.js b/browser/base/content/tabview/search.js
index e22bef0a2b09..b7d17ad62c3e 100644
--- a/browser/base/content/tabview/search.js
+++ b/browser/base/content/tabview/search.js
@@ -132,7 +132,7 @@ var TabUtils = {
     // of active Panoramas as well as for windows in which
     // Panorama has yet to be activated. We uses object sniffing to
     // determine the type of tab and then returns its name.     
-    return tab.label != undefined ? tab.label : tab.$tabTitle[0].innerHTML;
+    return tab.label != undefined ? tab.label : tab.$tabTitle[0].textContent;
   },
   
   // ---------
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595560.js b/browser/base/content/test/tabview/browser_tabview_bug595560.js
index f85dc54c5b7b..85fdca91debf 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug595560.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug595560.js
@@ -25,8 +25,10 @@ function onTabViewWindowLoaded() {
   window.removeEventListener("tabviewshown", onTabViewWindowLoaded, false);
   ok(TabView.isVisible(), "Tab View is visible");
 
-  let contentWindow = document.getElementById("tab-view").contentWindow;
-  testOne(contentWindow);
+  afterAllTabItemsUpdated(function() { 
+    let contentWindow = document.getElementById("tab-view").contentWindow;
+    testOne(contentWindow);
+  });
 }
 
 function testOne(contentWindow) {

From cc9f69880a6a36caf3b10e68a73618c5a4e55300 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Mon, 11 Apr 2011 16:15:38 +0800
Subject: [PATCH 025/509] Bug 601958 - TabView should directly call show and
 hide routines in the frame r=ian

---
 browser/base/content/browser-tabview.js | 11 ++++-------
 browser/base/content/tabview/ui.js      |  9 ---------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index f4ce5ec1af46..9f44218680c2 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -171,11 +171,10 @@ let TabView = {
   show: function() {
     if (this.isVisible())
       return;
-    
+
+    let self = this;
     this._initFrame(function() {
-      let event = document.createEvent("Events");
-      event.initEvent("tabviewshow", false, false);
-      dispatchEvent(event);
+      self._window.UI.showTabView(true);
     });
   },
 
@@ -184,9 +183,7 @@ let TabView = {
     if (!this.isVisible())
       return;
 
-    let event = document.createEvent("Events");
-    event.initEvent("tabviewhide", false, false);
-    dispatchEvent(event);
+    this._window.UI.exit();
   },
 
   // ----------
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 7ed660e2b1a4..d7fb0fec6e44 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -163,11 +163,6 @@ let UI = {
       this._storageSanity(data);
       this._pageBounds = data.pageBounds;
 
-      // ___ hook into the browser
-      gWindow.addEventListener("tabviewshow", function() {
-        self.showTabView(true);
-      }, false);
-
       // ___ currentTab
       this._currentTab = gBrowser.selectedTab;
 
@@ -226,10 +221,6 @@ let UI = {
         self.uninit();
       });
 
-      gWindow.addEventListener("tabviewhide", function() {
-        self.exit();
-      }, false);
-
       // ___ setup key handlers
       this._setTabViewFrameKeyHandlers();
 

From e5fb9d7f1803a5e24ea387c7ee230352560fd001 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Date: Tue, 12 Apr 2011 16:07:44 -0400
Subject: [PATCH 026/509] ts in browser/components/sessionstore/test/browser
 should use utility functions in head.js; r=zpao

---
 .../browser_586068-cascaded_restore.js        |  3 --
 .../test/browser/browser_590268.js            |  5 --
 .../test/browser/browser_600545.js            | 50 +------------------
 .../test/browser/browser_607016.js            |  4 --
 .../test/browser/browser_618151.js            | 13 -----
 5 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js b/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
index ef6122bd1c2c..52037cb388c7 100644
--- a/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
+++ b/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
@@ -760,6 +760,3 @@ function countTabs() {
   return [needsRestore, isRestoring, wasRestored];
 }
 
-function r() {
-  return "" + Date.now() + Math.random();
-}
diff --git a/browser/components/sessionstore/test/browser/browser_590268.js b/browser/components/sessionstore/test/browser/browser_590268.js
index a44666c49a9c..2ab3de505306 100644
--- a/browser/components/sessionstore/test/browser/browser_590268.js
+++ b/browser/components/sessionstore/test/browser/browser_590268.js
@@ -170,8 +170,3 @@ function test() {
   // Restore state
   ss.setBrowserState(JSON.stringify(state));
 }
-
-// Helper function to create a random value
-function r() {
-  return "" + Date.now() + Math.random();
-}
diff --git a/browser/components/sessionstore/test/browser/browser_600545.js b/browser/components/sessionstore/test/browser/browser_600545.js
index 780f1b5f5565..43b59a8879d2 100644
--- a/browser/components/sessionstore/test/browser/browser_600545.js
+++ b/browser/components/sessionstore/test/browser/browser_600545.js
@@ -50,54 +50,6 @@ function testBug600545() {
   // Set the pref to false to cause non-app tabs to be stripped out on a save
   Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", false);
 
-  // Need to wait for SessionStore's saveState function to be called
-  // so that non-pinned tabs will be stripped from non-active window
-  function waitForSaveState(aSaveStateCallback) {
-    let topic = "sessionstore-state-write";
-    Services.obs.addObserver(function() {
-      Services.obs.removeObserver(arguments.callee, topic, false);
-      executeSoon(aSaveStateCallback);
-    }, topic, false);
-  };
-
-  // Need to wait for all tabs to be restored before reading browser state
-  function waitForBrowserState(aState, aSetStateCallback) {
-    let tabsRestored = 0;
-    let expectedTabs = getStateTabCount(aState);
-
-    // We know that there are only 2 windows total, so just be specific
-    let newWin;
-
-    // Used to determine when tabs have been restored
-    function onTabRestored(aEvent) {
-      if (++tabsRestored == expectedTabs) {
-        gBrowser.tabContainer.removeEventListener("SSTabRestored", onTabRestored, true);
-        newWin.gBrowser.tabContainer.removeEventListener("SSTabRestored", onTabRestored, true);
-        executeSoon(aSetStateCallback);
-      }
-    }
-
-    // We also want to catch the 2nd window, so we need to observe domwindowopened
-    function windowObserver(aSubject, aTopic, aData) {
-      let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
-      if (aTopic == "domwindowopened") {
-        theWin.addEventListener("load", function() {
-          theWin.removeEventListener("load", arguments.callee, false);
-
-          // So we can remove the event listener in onTabRestored
-          newWin = theWin;
-
-          Services.ww.unregisterNotification(windowObserver);
-          theWin.gBrowser.tabContainer.addEventListener("SSTabRestored", onTabRestored, true);
-        }, false);
-      }
-    }
-
-    Services.ww.registerNotification(windowObserver);
-    gBrowser.tabContainer.addEventListener("SSTabRestored", onTabRestored, true);
-    ss.setBrowserState(JSON.stringify(aState));
-  }
-
   // This tests the following use case:
   // When multiple windows are open and browser.sessionstore.resume_from_crash
   // preference is false, tab session data for non-active window is stripped for
@@ -124,6 +76,8 @@ function testBug600545() {
   ] };
 
   waitForBrowserState(state, function() {
+    // Need to wait for SessionStore's saveState function to be called
+    // so that non-pinned tabs will be stripped from non-active window
     waitForSaveState(function () {
       let expectedNumberOfTabs = getStateTabCount(state);
       let retrievedState = JSON.parse(ss.getBrowserState());
diff --git a/browser/components/sessionstore/test/browser/browser_607016.js b/browser/components/sessionstore/test/browser/browser_607016.js
index 7b2e93c0288a..e2c77d51b901 100644
--- a/browser/components/sessionstore/test/browser/browser_607016.js
+++ b/browser/components/sessionstore/test/browser/browser_607016.js
@@ -148,7 +148,3 @@ function test() {
   ss.setBrowserState(JSON.stringify(state));
 }
 
-// Helper function to create a random value
-function r() {
-  return "" + Date.now() + Math.random();
-}
diff --git a/browser/components/sessionstore/test/browser/browser_618151.js b/browser/components/sessionstore/test/browser/browser_618151.js
index 8aa27e307d71..a6df99b495cd 100644
--- a/browser/components/sessionstore/test/browser/browser_618151.js
+++ b/browser/components/sessionstore/test/browser/browser_618151.js
@@ -80,19 +80,6 @@ function runNextTest() {
   }
 }
 
-// helper, works only for single window
-function waitForBrowserState(aState, aSetStateCallback) {
-  let tabsRestored = 0;
-  gBrowser.tabContainer.addEventListener("SSTabRestored", function() {
-    if (++tabsRestored == aState.windows[0].tabs.length) {
-      gBrowser.tabContainer.removeEventListener("SSTabRestored", arguments.callee, true);
-      executeSoon(aSetStateCallback);
-    }
-  }, true);
-  ss.setBrowserState(JSON.stringify(aState));
-}
-
-
 function test_setup() {
   function onSSTabRestored(aEvent) {
     gBrowser.tabContainer.removeEventListener("SSTabRestored", onSSTabRestored, false);

From 26d983614cd572ba3ac17b4f0e4ca1ab25c5030b Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Tue, 12 Apr 2011 16:10:09 -0400
Subject: [PATCH 027/509] Bug 611953 - Part 1: GNOME 3.0 readiness; r=roc,karlt

---
 .../shell/src/nsGNOMEShellService.cpp         | 45 ++++++++++++++++++-
 .../shell/src/nsGNOMEShellService.h           |  4 +-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
index ca7043209925..580309ce1331 100644
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -120,6 +120,9 @@ nsGNOMEShellService::Init()
   // the locale encoding.  If it's not set, they use UTF-8.
   mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
 
+  if (GetAppPathFromLauncher())
+    return NS_OK;
+
   nsCOMPtr<nsIProperties> dirSvc
     (do_GetService("@mozilla.org/file/directory_service;1"));
   NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
@@ -137,6 +140,34 @@ nsGNOMEShellService::Init()
 
 NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
 
+PRBool
+nsGNOMEShellService::GetAppPathFromLauncher()
+{
+  gchar *tmp;
+
+  const char *launcher = PR_GetEnv("MOZ_APP_LAUNCHER");
+  if (!launcher)
+    return PR_FALSE;
+
+  if (g_path_is_absolute(launcher)) {
+    mAppPath = launcher;
+    tmp = g_path_get_basename(launcher);
+    gchar *fullpath = g_find_program_in_path(tmp);
+    if (fullpath && mAppPath.Equals(fullpath))
+      mAppIsInPath = PR_TRUE;
+    g_free(fullpath);
+  } else {
+    tmp = g_find_program_in_path(launcher);
+    if (!tmp)
+      return PR_FALSE;
+    mAppPath = tmp;
+    mAppIsInPath = PR_TRUE;
+  }
+
+  g_free(tmp);
+  return PR_TRUE;
+}
+
 PRBool
 nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
 {
@@ -215,8 +246,18 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
 
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
   if (gconf) {
-    nsCAutoString appKeyValue(mAppPath);
-    appKeyValue.Append(" \"%s\"");
+    nsCAutoString appKeyValue;
+    if(mAppIsInPath) {
+      // mAppPath is in the users path, so use only the basename as the launcher
+      gchar *tmp = g_path_get_basename(mAppPath.get());
+      appKeyValue = tmp;
+      g_free(tmp);
+    } else {
+      appKeyValue = mAppPath;
+    }
+
+    appKeyValue.AppendLiteral(" %s");
+
     for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
       if (appProtocols[i].essential || aClaimAllTypes) {
         gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/src/nsGNOMEShellService.h
index 1fdbd0152b59..1f12252d79a9 100644
--- a/browser/components/shell/src/nsGNOMEShellService.h
+++ b/browser/components/shell/src/nsGNOMEShellService.h
@@ -43,7 +43,7 @@
 class nsGNOMEShellService : public nsIShellService
 {
 public:
-  nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) { }
+  nsGNOMEShellService() : mCheckedThisSession(PR_FALSE), mAppIsInPath(PR_FALSE) { }
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
@@ -55,9 +55,11 @@ private:
 
   NS_HIDDEN_(PRBool) KeyMatchesAppName(const char *aKeyValue) const;
 
+  NS_HIDDEN_(PRBool) GetAppPathFromLauncher();
   PRPackedBool mCheckedThisSession;
   PRPackedBool mUseLocaleFilenames;
   nsCString    mAppPath;
+  PRPackedBool mAppIsInPath;
 };
 
 #endif // nsgnomeshellservice_h____

From 1065d8285063564e7a39990cc573224c17cf22b3 Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Tue, 12 Apr 2011 16:10:51 -0400
Subject: [PATCH 028/509] Bug 611953 - Part 2: GNOME 3.0 readiness; r=roc,karlt

---
 toolkit/system/gnome/nsGIOService.cpp | 55 +++++++--------------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp
index de1cf9c5ded4..a01df6bd3067 100644
--- a/toolkit/system/gnome/nsGIOService.cpp
+++ b/toolkit/system/gnome/nsGIOService.cpp
@@ -106,15 +106,15 @@ nsGIOMimeApp::GetCommand(nsACString& aCommand)
 {
   get_commandline_t g_app_info_get_commandline_ptr;
 
-  void *libHandle = dlopen("libgio-2.0.so", RTLD_LAZY);
+  void *libHandle = dlopen("libgio-2.0.so.0", RTLD_LAZY);
   if (!libHandle) {
     return NS_ERROR_FAILURE;
   }
   dlerror(); /* clear any existing error */
   g_app_info_get_commandline_ptr =
     (get_commandline_t) dlsym(libHandle, "g_app_info_get_commandline");
-  if (dlerror() != NULL) {
-    const char cmd = *g_app_info_get_commandline_ptr(mApp);
+  if (dlerror() == NULL) {
+    const char *cmd = g_app_info_get_commandline_ptr(mApp);
     if (!cmd) {
       dlclose(libHandle);
       return NS_ERROR_FAILURE;
@@ -419,50 +419,23 @@ nsGIOService::CreateAppFromCommand(nsACString const& cmd,
   GAppInfo *app_info = NULL, *app_info_from_list = NULL;
   GList *apps = g_app_info_get_all();
   GList *apps_p = apps;
-  get_commandline_t g_app_info_get_commandline_ptr;
-
-  void *libHandle = dlopen("libgio-2.0.so", RTLD_LAZY);
-  if (!libHandle) {
-    return NS_ERROR_FAILURE;
-  }
-  dlerror(); /* clear any existing error */
-  g_app_info_get_commandline_ptr =
-    (get_commandline_t) dlsym(libHandle, "g_app_info_get_commandline");
-  if (dlerror() != NULL) {
-    g_app_info_get_commandline_ptr = NULL;
-  }
 
   // Try to find relevant and existing GAppInfo in all installed application
+  // We do this by comparing each GAppInfo's executable with out own
   while (apps_p) {
     app_info_from_list = (GAppInfo*) apps_p->data;
-    /* This is  a silly test. It just compares app names but not
-     * commands. This is due to old version of Glib/Gio. The required
-     * function which allows to do a regular check of existence of desktop file
-     * is possible by using function g_app_info_get_commandline. This function
-     * has been introduced in Glib 2.20. */
-    if (app_info_from_list && strcmp(g_app_info_get_name(app_info_from_list),
-                                     PromiseFlatCString(appName).get()) == 0 )
-    {
-      if (g_app_info_get_commandline_ptr)
-      {
-        /* Following test is only possible with Glib >= 2.20.
-         * Compare path only by using strncmp */
-        if (strncmp(g_app_info_get_commandline_ptr(app_info_from_list),
-                    PromiseFlatCString(cmd).get(),
-                    strlen(PromiseFlatCString(cmd).get())) == 0)
-        {
-          app_info = app_info_from_list;
-          break;
-        } else {
-          g_object_unref(app_info_from_list);
-        }
-      } else {
+    if (!app_info) {
+      // If the executable is not absolute, get it's full path
+      char *executable = g_find_program_in_path(g_app_info_get_executable(app_info_from_list));
+
+      if (executable && strcmp(executable, PromiseFlatCString(cmd).get()) == 0) {
+        g_object_ref (app_info_from_list);
         app_info = app_info_from_list;
-        break;
       }
-    } else {
-      g_object_unref(app_info_from_list);
+      g_free(executable);
     }
+
+    g_object_unref(app_info_from_list);
     apps_p = apps_p->next;
   }
   g_list_free(apps);
@@ -477,12 +450,10 @@ nsGIOService::CreateAppFromCommand(nsACString const& cmd,
   if (!app_info) {
     g_warning("Cannot create application info from command: %s", error->message);
     g_error_free(error);
-    dlclose(libHandle);
     return NS_ERROR_FAILURE;
   }
   nsGIOMimeApp *mozApp = new nsGIOMimeApp(app_info);
   NS_ENSURE_TRUE(mozApp, NS_ERROR_OUT_OF_MEMORY);
   NS_ADDREF(*appInfo = mozApp);
-  dlclose(libHandle);
   return NS_OK;
 }

From 7dcfbfecdee89ad0cca552d9b10fbdd631d4c01f Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Tue, 12 Apr 2011 16:11:20 -0400
Subject: [PATCH 029/509] Bug 611953 - Part 3: GNOME 3.0 readiness; r=roc,karlt

---
 .../shell/src/nsGNOMEShellService.cpp         | 141 ++++++++++++------
 .../shell/src/nsGNOMEShellService.h           |   1 +
 toolkit/system/gnome/nsGIOService.cpp         |  44 ++++++
 xpcom/system/nsIGIOService.idl                |   8 +-
 4 files changed, 146 insertions(+), 48 deletions(-)

diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
index 580309ce1331..2fde1ebe5876 100644
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -106,14 +106,14 @@ nsGNOMEShellService::Init()
 {
   nsresult rv;
 
-  // GConf _must_ be available, or we do not allow
+  // GConf or GIO _must_ be available, or we do not allow
   // CreateInstance to succeed.
 
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
   nsCOMPtr<nsIGIOService> giovfs =
     do_GetService(NS_GIOSERVICE_CONTRACTID);
 
-  if (!gconf)
+  if (!gconf && !giovfs)
     return NS_ERROR_NOT_AVAILABLE;
 
   // Check G_BROKEN_FILENAMES.  If it's set, then filenames in glib use
@@ -194,6 +194,27 @@ nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
   return matches;
 }
 
+PRBool
+nsGNOMEShellService::CheckHandlerMatchesAppName(const nsACString &handler) const
+{
+  gint argc;
+  gchar **argv;
+  nsCAutoString command(handler);
+
+  // The string will be something of the form: [/path/to/]browser "%s"
+  // We want to remove all of the parameters and get just the binary name.
+
+  if (g_shell_parse_argv(command.get(), &argc, &argv, NULL) && argc > 0) {
+    command.Assign(argv[0]);
+    g_strfreev(argv);
+  }
+
+  if (!KeyMatchesAppName(command.get()))
+    return PR_FALSE; // the handler is set to another app
+
+  return PR_TRUE;
+}
+
 NS_IMETHODIMP
 nsGNOMEShellService::IsDefaultBrowser(PRBool aStartupCheck,
                                       PRBool* aIsDefaultBrowser)
@@ -203,31 +224,37 @@ nsGNOMEShellService::IsDefaultBrowser(PRBool aStartupCheck,
     mCheckedThisSession = PR_TRUE;
 
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 
   PRBool enabled;
   nsCAutoString handler;
+  nsCOMPtr<nsIGIOMimeApp> gioApp;
 
   for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
     if (!appProtocols[i].essential)
       continue;
 
-    handler.Truncate();
-    gconf->GetAppForProtocol(nsDependentCString(appProtocols[i].name),
-                             &enabled, handler);
+    if (gconf) {
+      handler.Truncate();
+      gconf->GetAppForProtocol(nsDependentCString(appProtocols[i].name),
+                               &enabled, handler);
 
-    // The string will be something of the form: [/path/to/]browser "%s"
-    // We want to remove all of the parameters and get just the binary name.
-
-    gint argc;
-    gchar **argv;
-
-    if (g_shell_parse_argv(handler.get(), &argc, &argv, NULL) && argc > 0) {
-      handler.Assign(argv[0]);
-      g_strfreev(argv);
+      if (!CheckHandlerMatchesAppName(handler) || !enabled)
+        return NS_OK; // the handler is disabled or set to another app
     }
 
-    if (!KeyMatchesAppName(handler.get()) || !enabled)
-      return NS_OK; // the handler is disabled or set to another app
+    if (giovfs) {
+      handler.Truncate();
+      giovfs->GetAppForURIScheme(nsDependentCString(appProtocols[i].name),
+                                 getter_AddRefs(gioApp));
+      if (!gioApp)
+        return NS_OK;
+
+      gioApp->GetCommand(handler);
+
+      if (!CheckHandlerMatchesAppName(handler))
+        return NS_OK; // the handler is set to another app
+    }
   }
 
   *aIsDefaultBrowser = PR_TRUE;
@@ -245,9 +272,10 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
 #endif
 
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
   if (gconf) {
     nsCAutoString appKeyValue;
-    if(mAppIsInPath) {
+    if (mAppIsInPath) {
       // mAppPath is in the users path, so use only the basename as the launcher
       gchar *tmp = g_path_get_basename(mAppPath.get());
       appKeyValue = tmp;
@@ -266,13 +294,8 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
     }
   }
 
-  // set handler for .html and xhtml files and MIME types:
-  if (aClaimAllTypes) {
+  if (giovfs) {
     nsresult rv;
-    nsCOMPtr<nsIGIOService> giovfs =
-      do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
-    NS_ENSURE_SUCCESS(rv, NS_OK);
-
     nsCOMPtr<nsIStringBundleService> bundleService =
       do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -295,10 +318,20 @@ nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
                                       getter_AddRefs(appInfo));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Add mime types for html, xhtml extension and set app to just created appinfo.
-    for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
-      appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
-      appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
+    // set handler for the protocols
+    for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
+      if (appProtocols[i].essential || aClaimAllTypes) {
+        appInfo->SetAsDefaultForURIScheme(nsDependentCString(appProtocols[i].name));
+      }
+    }
+
+    // set handler for .html and xhtml files and MIME types:
+    if (aClaimAllTypes) {
+      // Add mime types for html, xhtml extension and set app to just created appinfo.
+      for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
+        appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
+        appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
+      }
     }
   }
 
@@ -408,24 +441,26 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
   // if the file was written successfully, set it as the system wallpaper
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
 
-  nsCAutoString options;
-  if (aPosition == BACKGROUND_TILE)
-    options.Assign("wallpaper");
-  else if (aPosition == BACKGROUND_STRETCH)
-    options.Assign("stretched");
-  else
-    options.Assign("centered");
+  if (gconf) {
+    nsCAutoString options;
+    if (aPosition == BACKGROUND_TILE)
+      options.Assign("wallpaper");
+    else if (aPosition == BACKGROUND_STRETCH)
+      options.Assign("stretched");
+    else
+      options.Assign("centered");
 
-  gconf->SetString(NS_LITERAL_CSTRING(kDesktopOptionsKey), options);
+    gconf->SetString(NS_LITERAL_CSTRING(kDesktopOptionsKey), options);
 
-  // Set the image to an empty string first to force a refresh
-  // (since we could be writing a new image on top of an existing
-  // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
-  gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey),
-                   EmptyCString());
+    // Set the image to an empty string first to force a refresh
+    // (since we could be writing a new image on top of an existing
+    // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
+    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey),
+                     EmptyCString());
 
-  gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath);
-  gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), PR_TRUE);
+    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath);
+    gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), PR_TRUE);
+  }
 
   return rv;
 }
@@ -439,7 +474,9 @@ nsGNOMEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
 
   nsCAutoString background;
-  gconf->GetString(NS_LITERAL_CSTRING(kDesktopColorKey), background);
+  if (gconf) {
+    gconf->GetString(NS_LITERAL_CSTRING(kDesktopColorKey), background);
+  }
 
   if (background.IsEmpty()) {
     *aColor = 0;
@@ -478,10 +515,12 @@ nsGNOMEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
   NS_ASSERTION(aColor <= 0xffffff, "aColor has extra bits");
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
 
-  nsCAutoString colorString;
-  ColorToCString(aColor, colorString);
+  if (gconf) {
+    nsCAutoString colorString;
+    ColorToCString(aColor, colorString);
 
-  gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), colorString);
+    gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), colorString);
+  }
 
   return NS_OK;
 }
@@ -497,7 +536,17 @@ nsGNOMEShellService::OpenApplication(PRInt32 aApplication)
   else
     return NS_ERROR_NOT_AVAILABLE;
 
+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+  if (giovfs) {
+    nsCOMPtr<nsIGIOMimeApp> gioApp;
+    giovfs->GetAppForURIScheme(scheme, getter_AddRefs(gioApp));
+    if (gioApp)
+      return gioApp->Launch(EmptyCString());
+  }
+
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+  if (!gconf)
+    return NS_ERROR_FAILURE;
 
   PRBool enabled;
   nsCAutoString appCommand;
diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/src/nsGNOMEShellService.h
index 1f12252d79a9..d5171b293702 100644
--- a/browser/components/shell/src/nsGNOMEShellService.h
+++ b/browser/components/shell/src/nsGNOMEShellService.h
@@ -54,6 +54,7 @@ private:
   ~nsGNOMEShellService() {}
 
   NS_HIDDEN_(PRBool) KeyMatchesAppName(const char *aKeyValue) const;
+  NS_HIDDEN_(PRBool) CheckHandlerMatchesAppName(const nsACString& handler) const;
 
   NS_HIDDEN_(PRBool) GetAppPathFromLauncher();
   PRPackedBool mCheckedThisSession;
diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp
index a01df6bd3067..675ae397c1b3 100644
--- a/toolkit/system/gnome/nsGIOService.cpp
+++ b/toolkit/system/gnome/nsGIOService.cpp
@@ -282,6 +282,33 @@ nsGIOMimeApp::SetAsDefaultForFileExtensions(nsACString const& fileExts)
   return NS_OK;
 }
 
+/**
+ * Set default application for URI's of a particular scheme
+ * @param aURIScheme string containing the URI scheme
+ * @return NS_OK when application was set as default for URI scheme,
+ * NS_ERROR_FAILURE otherwise
+ */
+NS_IMETHODIMP
+nsGIOMimeApp::SetAsDefaultForURIScheme(nsACString const& aURIScheme)
+{
+  GError *error = NULL;
+  nsCAutoString contentType("x-scheme-handler/");
+  contentType.Append(aURIScheme);
+
+  g_app_info_set_as_default_for_type(mApp,
+                                     contentType.get(),
+                                     &error);
+  if (error) {
+    g_warning("Cannot set application as default for URI scheme (%s): %s",
+              PromiseFlatCString(aURIScheme).get(),
+              error->message);
+    g_error_free(error);
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
 nsresult
 nsGIOService::Init()
 {
@@ -321,6 +348,23 @@ nsGIOService::GetMimeTypeFromExtension(const nsACString& aExtension,
 }
 // used in nsGNOMERegistry
 // -----------------------------------------------------------------------------
+NS_IMETHODIMP
+nsGIOService::GetAppForURIScheme(const nsACString& aURIScheme,
+                                 nsIGIOMimeApp** aApp)
+{
+  *aApp = nsnull;
+
+  GAppInfo *app_info = g_app_info_get_default_for_uri_scheme(
+                          PromiseFlatCString(aURIScheme).get());
+  if (app_info) {
+    nsGIOMimeApp *mozApp = new nsGIOMimeApp(app_info);
+    NS_ADDREF(*aApp = mozApp);
+  } else {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGIOService::GetAppForMimeType(const nsACString& aMimeType,
                                 nsIGIOMimeApp**   aApp)
diff --git a/xpcom/system/nsIGIOService.idl b/xpcom/system/nsIGIOService.idl
index b0489a660182..b5b320519d56 100644
--- a/xpcom/system/nsIGIOService.idl
+++ b/xpcom/system/nsIGIOService.idl
@@ -46,7 +46,7 @@ interface nsIURI;
    with nsIGIOService::GetAppForMimeType. */
 // 66009894-9877-405b-9321-bf30420e34e6 prev uuid
 
-[scriptable, uuid(e77021b4-4012-407d-b686-7a1f18050109)] 
+[scriptable, uuid(ca6bad0c-8a48-48ac-82c7-27bb8f510fbe)] 
 interface nsIGIOMimeApp : nsISupports
 {
   const long EXPECTS_URIS  = 0;
@@ -62,6 +62,7 @@ interface nsIGIOMimeApp : nsISupports
   void launch(in AUTF8String uri);
   void setAsDefaultForMimeType(in AUTF8String mimeType);
   void setAsDefaultForFileExtensions(in AUTF8String extensions);
+  void setAsDefaultForURIScheme(in AUTF8String uriScheme);
 };
 
 /*
@@ -77,7 +78,7 @@ interface nsIGIOMimeApp : nsISupports
  */
 
 // prev id dea20bf0-4e4d-48c5-b932-dc3e116dc64b
-[scriptable, uuid(47e372c2-78bb-4899-8114-56aa7d9cdac5)]
+[scriptable, uuid(eda22a30-84e1-4e16-9ca0-cd1553c2b34a)]
 interface nsIGIOService : nsISupports
 {
 
@@ -87,6 +88,9 @@ interface nsIGIOService : nsISupports
      should not include a leading dot. */
   AUTF8String        getMimeTypeFromExtension(in AUTF8String extension);
 
+  /* Obtain the preferred application for opening a given URI scheme */
+  nsIGIOMimeApp      getAppForURIScheme(in AUTF8String aURIScheme);
+
   /* Obtain the preferred application for opening a given MIME type */
   nsIGIOMimeApp      getAppForMimeType(in AUTF8String mimeType);
 

From 8b8416dd20a6bd1af7d17e5e76c79dc28015806e Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Tue, 12 Apr 2011 16:12:02 -0400
Subject: [PATCH 030/509] Bug 438284 - Remove incorrect translation note from
 profileSelection.properties

---
 .../en-US/chrome/mozapps/profile/profileSelection.properties    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
index a024daedad46..723e2f8c2f84 100644
--- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
@@ -1,5 +1,3 @@
-# LOCALIZATION NOTE: Do not translate <html:br/> 
-
 restartTitle=Close %S
 restartMessageNoUnlocker=%S is already running, but is not responding. To open a new window, you must first close the existing %S process, or restart your system.
 restartMessageUnlocker=%S is already running, but is not responding. The old %S process must be closed to open a new window.

From db3c6e19ee789103dc1b92a20a2f6adb5314788f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 12 Apr 2011 16:26:32 -0400
Subject: [PATCH 031/509] Backout changeset 3b7b6b0bd9ef (bug 647453) because
 it breaks packaging

---
 browser/installer/Makefile.in         | 14 ++------------
 browser/installer/precompile_cache.js | 25 +------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index fcfd352c68e7..acea03715aa5 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -122,23 +122,13 @@ ifdef RUN_TEST_PROGRAM
 _ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
 endif
 
-ifndef MOZ_DEBUG
-# The precompile_cache.js script outputs a list of files that were
-# serialized and do not need to be included in the omnijar anymore
-STRIP_ORIGINAL_FILES = zip -d omni.jar `cat sc_log.txt`
-else
-STRIP_ORIGINAL_FILES = true
-endif
-
 GENERATE_CACHE = \
-  $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip", "sc_log.txt");' && \
+  $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \
   rm -rf jsloader && \
   $(UNZIP) startupCache.zip && \
   rm startupCache.zip && \
   find jsloader | xargs touch -t 201001010000 && \
-  $(ZIP) -r9mX omni.jar jsloader && \
-  $(STRIP_ORIGINAL_FILES) && \
-  rm sc_log.txt
+  $(ZIP) -r9mX omni.jar jsloader
 endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
diff --git a/browser/installer/precompile_cache.js b/browser/installer/precompile_cache.js
index 942b4af5367b..ff3593255b84 100644
--- a/browser/installer/precompile_cache.js
+++ b/browser/installer/precompile_cache.js
@@ -43,14 +43,6 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const MODE_RDONLY   = 0x01;
-const MODE_WRONLY   = 0x02;
-const MODE_CREATE   = 0x08;
-const MODE_APPEND   = 0x10;
-const MODE_TRUNCATE = 0x20;
-
-var out;
-
 function setenv(name, val) {
   try {
     var environment = Components.classes["@mozilla.org/process/environment;1"].
@@ -79,7 +71,6 @@ function load_entries(entries, prefix) {
       continue;
     if (c.indexOf("services-crypto") >= 0)
       continue;
-    out.writeString(c + "\n");
     load(prefix + c);
   }
 }
@@ -87,7 +78,6 @@ function load_entries(entries, prefix) {
 function load_custom_entries(entries, subst) {
   while (entries.hasMore()) {
     var c = entries.getNext();
-    out.writeString(c + "\n");
     load("resource://" + subst + "/" + c.replace("modules/" + subst + "/", ""));
   }
 }
@@ -104,7 +94,7 @@ function openJar(file) {
   return zipreader;
 }
 
-function populate_startupcache(omnijarName, startupcacheName, logName) {
+function populate_startupcache(omnijarName, startupcacheName) {
   var file = getGreDir();
   file.append(omnijarName);
   zipreader = openJar(file);
@@ -113,18 +103,6 @@ function populate_startupcache(omnijarName, startupcacheName, logName) {
   scFile.append(startupcacheName);
   setenv("MOZ_STARTUP_CACHE", scFile.path);
 
-  var logFile = getGreDir();
-  logFile.append(logName);
-  var stream = Cc["@mozilla.org/network/file-output-stream;1"]
-                 .createInstance(Ci.nsIFileOutputStream);
-
-  stream.init(logFile, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, 0666, 0);
-
-  out = Cc["@mozilla.org/intl/converter-output-stream;1"]
-          .createInstance(Ci.nsIConverterOutputStream);
-
-  out.init(stream, "UTF-8", 0, 0);
-
   // the sync part below doesn't work as smoothly
   let ioService = Cc["@mozilla.org/network/io-service;1"].
     getService(Ci.nsIIOService);
@@ -148,5 +126,4 @@ function populate_startupcache(omnijarName, startupcacheName, logName) {
   load_entries(zipreader.findEntries("modules/*js"), "resource://gre/");
   load_entries(zipreader.findEntries("modules/*jsm"), "resource://gre/");
   zipreader.close();
-  out.close();
 }

From c1ef5ff2fe8d933738ac8c908a9b6a3d38b0a558 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 12 Apr 2011 18:42:23 -0400
Subject: [PATCH 032/509] Bug 649223 - Reftest for bug 366207 wastes two
 seconds, needlessly; r=bzbarsky

---
 layout/reftests/bugs/366207-1.xul | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/layout/reftests/bugs/366207-1.xul b/layout/reftests/bugs/366207-1.xul
index 37bf1a331788..275c93df15fa 100644
--- a/layout/reftests/bugs/366207-1.xul
+++ b/layout/reftests/bugs/366207-1.xul
@@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="setTimeout(boom, 1000)"
+        onload="loaded()"
 	class="reftest-wait">
         
 <hbox style="display: none">
@@ -21,7 +21,10 @@
     </content>
     <implementation>
       <constructor>
-        window.setTimeout(finish, 1000);
+        window.setTimeout(function() {
+          document.documentElement.clientHeight;
+          window.setTimeout(finish, 0);
+        }, 0);
       </constructor>
     </implementation>
   </binding>
@@ -29,6 +32,13 @@
 </hbox>
 
 <script>
+function loaded()
+{
+  setTimeout(function() {
+    document.documentElement.clientHeight;
+    setTimeout(boom, 0);
+  }, 0);
+}
 function boom()
 {
   document.documentElement.style.MozBinding = "url('#foo')"; 

From a50dce5c1926103d599a49d37034a1e7d888f17c Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Tue, 12 Apr 2011 20:54:18 -0400
Subject: [PATCH 033/509] Bug 648730 - Fix Kerberos/GSSAPI authentication on
 OpenBSD r=khuey

---
 toolkit/library/Makefile.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index aa4077caf23b..072f69dfa9c5 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -253,6 +253,11 @@ ifdef MOZ_ENABLE_LIBXUL
 include $(srcdir)/libxul-rules.mk
 endif
 
+ifeq ($(OS_ARCH),OpenBSD)
+# Needed by nsAuthGSSAPI
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
+endif
+
 ifdef MOZ_JAVAXPCOM
 dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
 	$(INSTALL) $^ .

From bf5566d7c101409efcae400764d4e8667e990185 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 12 Apr 2011 21:04:31 -0400
Subject: [PATCH 035/509] Bug 605098 - Kill navigator.securityPolicy; r=dveditz

---
 dom/base/nsGlobalWindow.cpp             | 6 ------
 dom/interfaces/base/nsIDOMNavigator.idl | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 362163fd76ec..ec762735c528 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -10713,12 +10713,6 @@ nsNavigator::GetProductSub(nsAString& aProductSub)
   return rv;
 }
 
-NS_IMETHODIMP
-nsNavigator::GetSecurityPolicy(nsAString& aSecurityPolicy)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsNavigator::GetMimeTypes(nsIDOMMimeTypeArray **aMimeTypes)
 {
diff --git a/dom/interfaces/base/nsIDOMNavigator.idl b/dom/interfaces/base/nsIDOMNavigator.idl
index 36a7ee7ad7e1..287169146965 100644
--- a/dom/interfaces/base/nsIDOMNavigator.idl
+++ b/dom/interfaces/base/nsIDOMNavigator.idl
@@ -39,7 +39,7 @@
 
 #include "domstubs.idl"
 
-[scriptable, uuid(777bd8a1-38c1-4b12-ba8f-ff6c2eb8c56b)]
+[scriptable, uuid(d7758ece-f088-4701-9ae4-1450192dca38)]
 interface nsIDOMNavigator : nsISupports
 {
   readonly attribute DOMString           appCodeName;
@@ -54,7 +54,6 @@ interface nsIDOMNavigator : nsISupports
   readonly attribute DOMString           product;
   readonly attribute DOMString           productSub;
   readonly attribute nsIDOMPluginArray   plugins;
-  readonly attribute DOMString           securityPolicy;
   readonly attribute DOMString           userAgent;
   readonly attribute boolean             cookieEnabled;
   readonly attribute boolean             onLine;

From 91c2118d0cba5d29feab00f4fb8e6d33f22c540d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 11 Apr 2011 22:03:50 -0400
Subject: [PATCH 036/509] Bug 637671 - Don't display the selection for a
 non-focused text element when restoring the selection state after a reframe;
 r=bzbarsky

---
 .../html/content/src/nsTextEditorState.cpp    | 20 ++++++++++++++++---
 content/html/content/src/nsTextEditorState.h  |  2 ++
 layout/reftests/editor/reftest.list           |  2 ++
 .../selection_visibility_after_reframe-2.html | 11 ++++++++++
 ...election_visibility_after_reframe-ref.html |  6 ++++++
 .../selection_visibility_after_reframe.html   | 14 +++++++++++++
 6 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 layout/reftests/editor/selection_visibility_after_reframe-2.html
 create mode 100644 layout/reftests/editor/selection_visibility_after_reframe-ref.html
 create mode 100644 layout/reftests/editor/selection_visibility_after_reframe.html

diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp
index a0be3a92fdac..a1f5daa48d6e 100644
--- a/content/html/content/src/nsTextEditorState.cpp
+++ b/content/html/content/src/nsTextEditorState.cpp
@@ -82,11 +82,13 @@ struct SelectionState {
 
 class RestoreSelectionState : public nsRunnable {
 public:
-  RestoreSelectionState(nsTextControlFrame *aFrame, PRInt32 aStart, PRInt32 aEnd)
+  RestoreSelectionState(nsTextEditorState *aState, nsTextControlFrame *aFrame,
+                        PRInt32 aStart, PRInt32 aEnd)
     : mFrame(aFrame),
       mWeakFrame(aFrame),
       mStart(aStart),
-      mEnd(aEnd)
+      mEnd(aEnd),
+      mTextEditorState(aState)
   {
   }
 
@@ -96,6 +98,7 @@ public:
       // need to block script to avoid nested PrepareEditor calls (bug 642800).
       nsAutoScriptBlocker scriptBlocker;
       mFrame->SetSelectionRange(mStart, mEnd);
+      mTextEditorState->HideSelectionIfBlurred();
     }
     return NS_OK;
   }
@@ -105,6 +108,7 @@ private:
   nsWeakFrame mWeakFrame;
   PRInt32 mStart;
   PRInt32 mEnd;
+  nsTextEditorState* mTextEditorState;
 };
 
 /*static*/
@@ -1385,7 +1389,7 @@ nsTextEditorState::PrepareEditor(const nsAString *aValue)
 
   // Restore our selection after being bound to a new frame
   if (mSelState) {
-    nsContentUtils::AddScriptRunner(new RestoreSelectionState(mBoundFrame, mSelState->mStart, mSelState->mEnd));
+    nsContentUtils::AddScriptRunner(new RestoreSelectionState(this, mBoundFrame, mSelState->mStart, mSelState->mEnd));
     mSelState = nsnull;
   }
 
@@ -2011,6 +2015,16 @@ nsTextEditorState::SetPlaceholderClass(PRBool aVisible,
                           classValue, aNotify);
 }
 
+void
+nsTextEditorState::HideSelectionIfBlurred()
+{
+  NS_ABORT_IF_FALSE(mSelCon, "Should have a selection controller if we have a frame!");
+  nsCOMPtr<nsIContent> content = do_QueryInterface(mTextCtrlElement);
+  if (!nsContentUtils::IsFocusedContent(content)) {
+    mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_HIDDEN);
+  }
+}
+
 NS_IMPL_ISUPPORTS1(nsAnonDivObserver, nsIMutationObserver)
 
 void
diff --git a/content/html/content/src/nsTextEditorState.h b/content/html/content/src/nsTextEditorState.h
index e97154c5f7f5..ec707dae03e0 100644
--- a/content/html/content/src/nsTextEditorState.h
+++ b/content/html/content/src/nsTextEditorState.h
@@ -210,6 +210,8 @@ public:
 
   void ClearValueCache() { mCachedValue.Truncate(); }
 
+  void HideSelectionIfBlurred();
+
 private:
   // not copy constructible
   nsTextEditorState(const nsTextEditorState&);
diff --git a/layout/reftests/editor/reftest.list b/layout/reftests/editor/reftest.list
index 69f7d2e4f330..9ac99591f856 100644
--- a/layout/reftests/editor/reftest.list
+++ b/layout/reftests/editor/reftest.list
@@ -60,3 +60,5 @@ fails-if(Android) != spellcheck-hyphen-multiple-invalid.html spellcheck-hyphen-m
 == caret_on_presshell_reinit.html caret_on_presshell_reinit-ref.html
 == caret_on_presshell_reinit-2.html caret_on_presshell_reinit-ref.html
 == 642800.html 642800-ref.html
+== selection_visibility_after_reframe.html selection_visibility_after_reframe-ref.html
+!= selection_visibility_after_reframe-2.html selection_visibility_after_reframe-ref.html
diff --git a/layout/reftests/editor/selection_visibility_after_reframe-2.html b/layout/reftests/editor/selection_visibility_after_reframe-2.html
new file mode 100644
index 000000000000..fb705cc36922
--- /dev/null
+++ b/layout/reftests/editor/selection_visibility_after_reframe-2.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <input value="foo">
+    <script>
+      var i = document.querySelector("input");
+      i.selectionStart = 1;
+      i.selectionEnd = 2;
+    </script>
+  </body>
+</html>
diff --git a/layout/reftests/editor/selection_visibility_after_reframe-ref.html b/layout/reftests/editor/selection_visibility_after_reframe-ref.html
new file mode 100644
index 000000000000..c227b39c8f70
--- /dev/null
+++ b/layout/reftests/editor/selection_visibility_after_reframe-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <input value="foo">
+  </body>
+</html>
diff --git a/layout/reftests/editor/selection_visibility_after_reframe.html b/layout/reftests/editor/selection_visibility_after_reframe.html
new file mode 100644
index 000000000000..b05f130a1372
--- /dev/null
+++ b/layout/reftests/editor/selection_visibility_after_reframe.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <input value="foo">
+    <script>
+      var i = document.querySelector("input");
+      i.selectionStart = 1;
+      i.selectionEnd = 2;
+      i.style.display = "none";
+      document.body.clientHeight;
+      i.style.display = "";
+    </script>
+  </body>
+</html>

From 95cfe4523048e51109e70fcd7bea2815afdc373f Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Wed, 13 Apr 2011 10:16:36 -0700
Subject: [PATCH 037/509] Fix partial DOS line endings in nsRect.cpp, rs=khuey,
 no bug

--HG--
extra : rebase_source : 0bf86cf3015a3eecb19282159277581656136734
---
 gfx/src/nsRect.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gfx/src/nsRect.cpp b/gfx/src/nsRect.cpp
index b33bfbf1045c..05ae2508c502 100644
--- a/gfx/src/nsRect.cpp
+++ b/gfx/src/nsRect.cpp
@@ -217,7 +217,7 @@ nsRect& nsRect::ExtendForScaling(float aXMult, float aYMult)
   NS_ASSERTION((IsFloatInteger(aXMult) || IsFloatInteger(1/aXMult)) &&
                (IsFloatInteger(aYMult) || IsFloatInteger(1/aYMult)),
                "Multiplication factors must be integers or 1/integer");
-               
+
   // Scale rect by multiplier, snap outwards to integers and then unscale.
   // We round the results to the nearest integer to prevent floating point errors.
   if (aXMult < 1) {
@@ -330,15 +330,14 @@ PRBool nsIntRect::UnionRect(const nsIntRect &aRect1, const nsIntRect &aRect2)
   return result;
 }
 
-// scale the rect but round to smallest containing rect
-nsIntRect& nsIntRect::ScaleRoundOut(float aXScale, float aYScale)
-{
-  nscoord right = NSToCoordCeil(float(XMost()) * aXScale);
-  nscoord bottom = NSToCoordCeil(float(YMost()) * aYScale);
-  x = NSToCoordFloor(float(x) * aXScale);
-  y = NSToCoordFloor(float(y) * aYScale);
-  width = (right - x);
-  height = (bottom - y);
-  return *this;
+// scale the rect but round to smallest containing rect
+nsIntRect& nsIntRect::ScaleRoundOut(float aXScale, float aYScale)
+{
+  nscoord right = NSToCoordCeil(float(XMost()) * aXScale);
+  nscoord bottom = NSToCoordCeil(float(YMost()) * aYScale);
+  x = NSToCoordFloor(float(x) * aXScale);
+  y = NSToCoordFloor(float(y) * aYScale);
+  width = (right - x);
+  height = (bottom - y);
+  return *this;
 }
-

From 8569b071886021da220888a783557ed12ba709d4 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 13 Apr 2011 10:45:00 -0700
Subject: [PATCH 038/509] Bug 649666 Do not create container layers for
 scrollboxes with (0, 0) scrollRange r=roc

---
 layout/generic/nsGfxScrollFrame.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index fa4dd392d6b8..8d97771df43d 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1983,6 +1983,8 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
      (XRE_GetProcessType() == GeckoProcessType_Content &&
      (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN ||
       styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN) &&
+     (scrollRange.width > 0 ||
+      scrollRange.height > 0) &&
      (!mIsRoot || !mOuter->PresContext()->IsRootContentDocument()));
 
   if (ShouldBuildLayer()) {

From 1ebf912e9362d11b3fd835002efa16246d35863a Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 13 Apr 2011 13:53:24 -0400
Subject: [PATCH 039/509] Bug 462172, fix up preventDefault call in drag
 synthesis test and move to a chrome test

--HG--
rename : testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul => testing/mochitest/chrome/test_synthesizeDragStart.xul
rename : testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul => testing/mochitest/chrome/test_synthesizeDrop.xul
---
 testing/mochitest/chrome/Makefile.in          |  2 +
 .../test_synthesizeDragStart.xul              |  0
 .../tests => chrome}/test_synthesizeDrop.xul  |  6 +--
 .../mochitest/tests/SimpleTest/Makefile.in    |  3 --
 .../tests/SimpleTest/tests/Makefile.in        | 49 -------------------
 5 files changed, 4 insertions(+), 56 deletions(-)
 rename testing/mochitest/{tests/SimpleTest/tests => chrome}/test_synthesizeDragStart.xul (100%)
 rename testing/mochitest/{tests/SimpleTest/tests => chrome}/test_synthesizeDrop.xul (95%)
 delete mode 100644 testing/mochitest/tests/SimpleTest/tests/Makefile.in

diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in
index 4e7fad935572..c6b73a5c0b1e 100644
--- a/testing/mochitest/chrome/Makefile.in
+++ b/testing/mochitest/chrome/Makefile.in
@@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STATIC_FILES = test_sample.xul \
+		test_synthesizeDragStart.xul \
+		test_synthesizeDrop.xul \
 		$(NULL)
 
 libs:: $(_STATIC_FILES)
diff --git a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul b/testing/mochitest/chrome/test_synthesizeDragStart.xul
similarity index 100%
rename from testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul
rename to testing/mochitest/chrome/test_synthesizeDragStart.xul
diff --git a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul b/testing/mochitest/chrome/test_synthesizeDrop.xul
similarity index 95%
rename from testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
rename to testing/mochitest/chrome/test_synthesizeDrop.xul
index d4b24bc4d675..0ffe88223e79 100644
--- a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
+++ b/testing/mochitest/chrome/test_synthesizeDrop.xul
@@ -41,8 +41,6 @@
  * Assure EventUtils can perform synthesizeDrop as specified
  */
 
-_tests\testing\mochitest\chrome\testing\mochitest\tests\SimpleTest\tests\test_synthesizeDrop.xul
-
 -->
 <window title="Mozilla Bug 462172 extra tests for synthesizeDrop"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -70,8 +68,8 @@ var drag1 = [[
 function doOnDrop(aEvent)
 {
   gData = aEvent.dataTransfer.getData(drag1[0][0].type);
-  aEvent.preventDefault; // cancels event and keeps dropEffect
-                         // as was before event.
+  aEvent.preventDefault(); // cancels event and keeps dropEffect
+                           // as was before event.
 }
 
 function doOnDragEnter(aEvent)
diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in
index d0000aa53087..99f3daa2cd6e 100644
--- a/testing/mochitest/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/SimpleTest/Makefile.in
@@ -41,9 +41,6 @@ VPATH		= @srcdir@
 relativesrcdir  = testing/mochitest/tests/SimpleTest
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = tests \
-       $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 _SIMPLETEST_FILES =	MozillaFileLogger.js \
 			quit.js \
diff --git a/testing/mochitest/tests/SimpleTest/tests/Makefile.in b/testing/mochitest/tests/SimpleTest/tests/Makefile.in
deleted file mode 100644
index 9919064e8b2e..000000000000
--- a/testing/mochitest/tests/SimpleTest/tests/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = testing/mochitest/tests/SimpleTest/tests
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-_CHROME_FILES =	test_synthesizeDragStart.xul \
-                test_synthesizeDrop.xul \
-			$(NULL)
-libs:: $(_CHROME_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)

From 2c8b7f99fd92c28b28dc4dfb594c57d9a1cedf0e Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 13 Apr 2011 13:53:24 -0400
Subject: [PATCH 040/509] Bug 590665, panels jump around when dragged across
 screens, so don't do flipping when moving one, r=roc

---
 layout/xul/base/src/nsMenuPopupFrame.cpp      | 86 +++++++++----------
 .../content/tests/chrome/window_largemenu.xul | 30 +++++--
 2 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index d8558e53eeac..565ad1efdf9d 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1235,52 +1235,50 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, PRBool aIsMove)
     vFlip = FlipStyle_Outside;
   }
 
-  // if a panel is being moved, don't flip it. But always do this for content
-  // shells, so that the popup doesn't extend outside the containing frame.
-  if (aIsMove && mPopupType == ePopupTypePanel && !mInContentShell) {
-    hFlip = vFlip = FlipStyle_None;
+  // If a panel is being moved, don't constrain or flip it. But always do this for
+  // content shells, so that the popup doesn't extend outside the containing frame.
+  if (mInContentShell || !aIsMove || mPopupType != ePopupTypePanel) {
+    nsRect screenRect = GetConstraintRect(anchorRect, rootScreenRect);
+
+    // ensure that anchorRect is on screen
+    if (!anchorRect.IntersectRect(anchorRect, screenRect)) {
+      anchorRect.width = anchorRect.height = 0;
+      // if the anchor isn't within the screen, move it to the edge of the screen.
+      if (anchorRect.x < screenRect.x)
+        anchorRect.x = screenRect.x;
+      if (anchorRect.XMost() > screenRect.XMost())
+        anchorRect.x = screenRect.XMost();
+      if (anchorRect.y < screenRect.y)
+        anchorRect.y = screenRect.y;
+      if (anchorRect.YMost() > screenRect.YMost())
+        anchorRect.y = screenRect.YMost();
+    }
+
+    // shrink the the popup down if it is larger than the screen size
+    if (mRect.width > screenRect.width)
+      mRect.width = screenRect.width;
+    if (mRect.height > screenRect.height)
+      mRect.height = screenRect.height;
+
+    // at this point the anchor (anchorRect) is within the available screen
+    // area (screenRect) and the popup is known to be no larger than the screen.
+    // Next, check if there is enough space to show the popup at full size when
+    // positioned at screenPoint. If not, flip the popups to the opposite side
+    // of their anchor point, or resize them as necessary.
+    mRect.width = FlipOrResize(screenPoint.x, mRect.width, screenRect.x,
+                               screenRect.XMost(), anchorRect.x, anchorRect.XMost(),
+                               margin.left, margin.right, offsetForContextMenu, hFlip, &mHFlip);
+
+    mRect.height = FlipOrResize(screenPoint.y, mRect.height, screenRect.y,
+                                screenRect.YMost(), anchorRect.y, anchorRect.YMost(),
+                                margin.top, margin.bottom, offsetForContextMenu, vFlip, &mVFlip);
+
+    NS_ASSERTION(screenPoint.x >= screenRect.x && screenPoint.y >= screenRect.y &&
+                 screenPoint.x + mRect.width <= screenRect.XMost() &&
+                 screenPoint.y + mRect.height <= screenRect.YMost(),
+                 "Popup is offscreen");
   }
 
-  nsRect screenRect = GetConstraintRect(anchorRect, rootScreenRect);
-
-  // ensure that anchorRect is on screen
-  if (!anchorRect.IntersectRect(anchorRect, screenRect)) {
-    anchorRect.width = anchorRect.height = 0;
-    // if the anchor isn't within the screen, move it to the edge of the screen.
-    if (anchorRect.x < screenRect.x)
-      anchorRect.x = screenRect.x;
-    if (anchorRect.XMost() > screenRect.XMost())
-      anchorRect.x = screenRect.XMost();
-    if (anchorRect.y < screenRect.y)
-      anchorRect.y = screenRect.y;
-    if (anchorRect.YMost() > screenRect.YMost())
-      anchorRect.y = screenRect.YMost();
-  }
-
-  // shrink the the popup down if it is larger than the screen size
-  if (mRect.width > screenRect.width)
-    mRect.width = screenRect.width;
-  if (mRect.height > screenRect.height)
-    mRect.height = screenRect.height;
-
-  // at this point the anchor (anchorRect) is within the available screen
-  // area (screenRect) and the popup is known to be no larger than the screen.
-  // Next, check if there is enough space to show the popup at full size when
-  // positioned at screenPoint. If not, flip the popups to the opposite side
-  // of their anchor point, or resize them as necessary.
-  mRect.width = FlipOrResize(screenPoint.x, mRect.width, screenRect.x,
-                             screenRect.XMost(), anchorRect.x, anchorRect.XMost(),
-                             margin.left, margin.right, offsetForContextMenu, hFlip, &mHFlip);
-
-  mRect.height = FlipOrResize(screenPoint.y, mRect.height, screenRect.y,
-                              screenRect.YMost(), anchorRect.y, anchorRect.YMost(),
-                              margin.top, margin.bottom, offsetForContextMenu, vFlip, &mVFlip);
-
-  NS_ASSERTION(screenPoint.x >= screenRect.x && screenPoint.y >= screenRect.y &&
-               screenPoint.x + mRect.width <= screenRect.XMost() &&
-               screenPoint.y + mRect.height <= screenRect.YMost(),
-               "Popup is offscreen");
-
   // determine the x and y position of the view by subtracting the desired
   // screen position from the screen position of the root frame.
   nsPoint viewPoint = screenPoint - rootScreenRect.TopLeft();
diff --git a/toolkit/content/tests/chrome/window_largemenu.xul b/toolkit/content/tests/chrome/window_largemenu.xul
index 49b975d6c05d..2cf5612e5889 100644
--- a/toolkit/content/tests/chrome/window_largemenu.xul
+++ b/toolkit/content/tests/chrome/window_largemenu.xul
@@ -264,7 +264,8 @@ function nextContextMenuTest(desiredHeight)
 function testPopupMovement()
 {
   var button = document.getElementById("label");
-  var popup = document.getElementById((gTests[gTestIndex] == "panel movement") ? "panel" : "popup");
+  var isPanelTest = (gTests[gTestIndex] == "panel movement");
+  var popup = document.getElementById(isPanelTest ? "panel" : "popup");
 
   var screenX, screenY, buttonScreenX, buttonScreenY;
   var rect = popup.getBoundingClientRect();
@@ -273,21 +274,36 @@ function testPopupMovement()
   popup.moveTo(1, 1);
   [screenX, screenY] = getScreenXY(popup);
 
-  var expectedx = overlapOSChrome ? 1 : (screen.availLeft < 1 ? 1 : screen.availLeft);
-  var expectedy = overlapOSChrome ? 1 : (screen.availTop < 1 ? 1 : screen.availTop);
+  var expectedx = 1, expectedy = 1;
+  if (!isPanelTest && !overlapOSChrome) {
+    if (screen.availLeft >= 1) expectedx = screen.availLeft;
+    if (screen.availTop >= 1) expectedy = screen.availTop;
+  }
   is(screenX, expectedx, gTests[gTestIndex] + " (1, 1) x");
   is(screenY, expectedy, gTests[gTestIndex] + " (1, 1) y");
 
   popup.moveTo(100, 8000);
-  var expectedy = (overlapOSChrome ? screen.height + screen.top : screen.availHeight + screen.availTop) -
-                  Math.round(rect.height) - 3;
+  if (isPanelTest) {
+    expectedy = 8000;
+  }
+  else {
+    expectedy = (overlapOSChrome ? screen.height + screen.top : screen.availHeight + screen.availTop) -
+                Math.round(rect.height) - 3;
+  }
+
   [screenX, screenY] = getScreenXY(popup);
   is(screenX, 100, gTests[gTestIndex] + " (100, 8000) x");
   is(screenY, expectedy, gTests[gTestIndex] + " (100, 8000) y");
 
   popup.moveTo(6000, 100);
-  expectedx = (overlapOSChrome ? screen.width + screen.left : screen.availWidth + screen.availLeft) -
-              Math.round(rect.width) - 3;
+
+  if (isPanelTest) {
+    expectedx = 6000;
+  }
+  else {
+    expectedx = (overlapOSChrome ? screen.width + screen.left : screen.availWidth + screen.availLeft) -
+                Math.round(rect.width) - 3;
+  }
 
   [screenX, screenY] = getScreenXY(popup);
   is(screenX, expectedx, gTests[gTestIndex] + " (6000, 100) x");

From 5fbfdbbb1cc94a80853d7f8339ec72abf81a4e22 Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 13 Apr 2011 13:53:24 -0400
Subject: [PATCH 041/509] Bug 126189, pass modifiers on to command events in
 menus when enter was pressed, r=neil

---
 layout/xul/base/src/nsMenuBarFrame.cpp        |  4 +-
 layout/xul/base/src/nsMenuBarFrame.h          |  2 +-
 layout/xul/base/src/nsMenuFrame.cpp           |  4 +-
 layout/xul/base/src/nsMenuFrame.h             |  2 +-
 layout/xul/base/src/nsMenuPopupFrame.cpp      |  4 +-
 layout/xul/base/src/nsMenuPopupFrame.h        |  2 +-
 layout/xul/base/src/nsXULPopupManager.cpp     | 15 ++++--
 .../tests/widgets/test_menulist_keynav.xul    | 47 ++++++++++++++++++-
 8 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/layout/xul/base/src/nsMenuBarFrame.cpp b/layout/xul/base/src/nsMenuBarFrame.cpp
index 02965e590a92..f1b80e536eb3 100644
--- a/layout/xul/base/src/nsMenuBarFrame.cpp
+++ b/layout/xul/base/src/nsMenuBarFrame.cpp
@@ -414,13 +414,13 @@ nsMenuBarFrame::ChangeMenuItem(nsMenuFrame* aMenuItem,
 }
 
 nsMenuFrame*
-nsMenuBarFrame::Enter()
+nsMenuBarFrame::Enter(nsGUIEvent* aEvent)
 {
   if (!mCurrentMenu)
     return nsnull;
 
   if (mCurrentMenu->IsOpen())
-    return mCurrentMenu->Enter();
+    return mCurrentMenu->Enter(aEvent);
 
   return mCurrentMenu;
 }
diff --git a/layout/xul/base/src/nsMenuBarFrame.h b/layout/xul/base/src/nsMenuBarFrame.h
index 34e131697507..67ad5cbb2091 100644
--- a/layout/xul/base/src/nsMenuBarFrame.h
+++ b/layout/xul/base/src/nsMenuBarFrame.h
@@ -112,7 +112,7 @@ public:
 
   // Called when Enter is pressed while the menubar is focused. If the current
   // menu is open, let the child handle the key.
-  nsMenuFrame* Enter();
+  nsMenuFrame* Enter(nsGUIEvent* aEvent);
 
   // Used to handle ALT+key combos
   nsMenuFrame* FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent);
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index 828015ac3778..9eeae9d7bc8d 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -832,7 +832,7 @@ nsMenuFrame::SetDebug(nsBoxLayoutState& aState, nsIFrame* aList, PRBool aDebug)
 // In either case, do nothing if the item is disabled.
 //
 nsMenuFrame*
-nsMenuFrame::Enter()
+nsMenuFrame::Enter(nsGUIEvent *aEvent)
 {
   if (IsDisabled()) {
 #ifdef XP_WIN
@@ -853,7 +853,7 @@ nsMenuFrame::Enter()
   if (!IsOpen()) {
     // The enter key press applies to us.
     if (!IsMenu() && mMenuParent)
-      Execute(0);          // Execute our event handler
+      Execute(aEvent);          // Execute our event handler
     else
       return this;
   }
diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/base/src/nsMenuFrame.h
index 950fbc872e4d..d6a69ae0a4c8 100644
--- a/layout/xul/base/src/nsMenuFrame.h
+++ b/layout/xul/base/src/nsMenuFrame.h
@@ -174,7 +174,7 @@ public:
   // one in its parent popup. This will carry out the command attached to
   // the menuitem. If the menu should be opened, this frame will be returned,
   // otherwise null will be returned.
-  nsMenuFrame* Enter();
+  nsMenuFrame* Enter(nsGUIEvent* aEvent);
 
   virtual void SetParent(nsIFrame* aParent);
 
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 565ad1efdf9d..01ea5c398b63 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1537,13 +1537,13 @@ nsMenuPopupFrame::ChangeMenuItem(nsMenuFrame* aMenuItem,
 }
 
 nsMenuFrame*
-nsMenuPopupFrame::Enter()
+nsMenuPopupFrame::Enter(nsGUIEvent* aEvent)
 {
   mIncrementalString.Truncate();
 
   // Give it to the child.
   if (mCurrentMenu)
-    return mCurrentMenu->Enter();
+    return mCurrentMenu->Enter(aEvent);
 
   return nsnull;
 }
diff --git a/layout/xul/base/src/nsMenuPopupFrame.h b/layout/xul/base/src/nsMenuPopupFrame.h
index 1ff8c27253e0..789d96954988 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.h
+++ b/layout/xul/base/src/nsMenuPopupFrame.h
@@ -234,7 +234,7 @@ public:
   // that menu, or null if no menu should be opened. Also, calling Enter will
   // reset the current incremental search string, calculated in
   // FindMenuWithShortcut.
-  nsMenuFrame* Enter();
+  nsMenuFrame* Enter(nsGUIEvent* aEvent);
 
   nsPopupType PopupType() const { return mPopupType; }
   PRBool IsMenu() { return mPopupType == ePopupTypeMenu; }
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index 4f17070d7d0b..2499cdeeb8b2 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -1731,6 +1731,13 @@ nsXULPopupManager::CancelMenuTimer(nsMenuParent* aMenuParent)
   }
 }
 
+static nsGUIEvent* DOMKeyEventToGUIEvent(nsIDOMEvent* aEvent)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aEvent));
+  nsEvent* evt = privateEvent ? privateEvent->GetInternalNSEvent() : nsnull;
+  return (evt->eventStructType == NS_KEY_EVENT) ? static_cast<nsGUIEvent *>(evt) : nsnull;
+}
+
 PRBool
 nsXULPopupManager::HandleShortcutNavigation(nsIDOMKeyEvent* aKeyEvent,
                                             nsMenuPopupFrame* aFrame)
@@ -1745,7 +1752,8 @@ nsXULPopupManager::HandleShortcutNavigation(nsIDOMKeyEvent* aKeyEvent,
     if (result) {
       aFrame->ChangeMenuItem(result, PR_FALSE);
       if (action) {
-        nsMenuFrame* menuToOpen = result->Enter();
+        nsGUIEvent* evt = DOMKeyEventToGUIEvent(aKeyEvent);
+        nsMenuFrame* menuToOpen = result->Enter(evt);
         if (menuToOpen) {
           nsCOMPtr<nsIContent> content = menuToOpen->GetContent();
           ShowMenu(content, PR_TRUE, PR_FALSE);
@@ -2178,10 +2186,11 @@ nsXULPopupManager::KeyPress(nsIDOMEvent* aKeyEvent)
     // Enter method will return a menu if one needs to be opened as a result.
     nsMenuFrame* menuToOpen = nsnull;
     nsMenuChainItem* item = GetTopVisibleMenu();
+    nsGUIEvent* evt = DOMKeyEventToGUIEvent(aKeyEvent);
     if (item)
-      menuToOpen = item->Frame()->Enter();
+      menuToOpen = item->Frame()->Enter(evt);
     else if (mActiveMenuBar)
-      menuToOpen = mActiveMenuBar->Enter();
+      menuToOpen = mActiveMenuBar->Enter(evt);
     if (menuToOpen) {
       nsCOMPtr<nsIContent> content = menuToOpen->GetContent();
       ShowMenu(content, PR_TRUE, PR_FALSE);
diff --git a/toolkit/content/tests/widgets/test_menulist_keynav.xul b/toolkit/content/tests/widgets/test_menulist_keynav.xul
index 8bef77c5df08..404c6c29ca77 100644
--- a/toolkit/content/tests/widgets/test_menulist_keynav.xul
+++ b/toolkit/content/tests/widgets/test_menulist_keynav.xul
@@ -27,6 +27,7 @@
 SimpleTest.waitForExplicitFinish();
 
 var gShowPopup = false;
+var gModifiers = 0;
 
 var iswin = (navigator.platform.indexOf("Win") == 0);
 
@@ -112,7 +113,7 @@ function differentPressed()
 
   list.open = false;
 
-  SimpleTest.finish();
+  checkEnter();
 }
 
 function keyCheck(list, key, index, testname)
@@ -122,6 +123,50 @@ function keyCheck(list, key, index, testname)
   is(list.selectedItem, item, testname + " selectedItem");
 }
 
+function checkModifiers(event)
+{
+  var expectedModifiers = (gModifiers == 1);
+  is(event.shiftKey, expectedModifiers, "shift key pressed");
+  is(event.ctrlKey, expectedModifiers, "ctrl key pressed");
+  is(event.altKey, expectedModifiers, "alt key pressed");
+  is(event.metaKey, expectedModifiers, "meta key pressed");
+  gModifiers++;
+}
+
+function checkEnter()
+{
+  var list = $("list");
+  list.addEventListener("popuphidden", checkEnterWithModifiers, false);
+  list.addEventListener("command", checkModifiers, false);
+  list.open = true;
+  synthesizeKey("VK_ENTER", { });
+}
+
+function checkEnterWithModifiers()
+{
+  is(gModifiers, 1, "modifiers checked when not set");
+
+  var list = $("list");
+  ok(!list.open, "list closed on enter press");
+  list.removeEventListener("popuphidden", checkEnterWithModifiers, false);
+
+  list.addEventListener("popuphidden", done, false);
+  list.open = true;
+
+  synthesizeKey("VK_ENTER", { shiftKey: true, ctrlKey: true, altKey: true, metaKey: true });
+}
+
+function done()
+{
+  is(gModifiers, 2, "modifiers checked when set");
+
+  var list = $("list");
+  ok(!list.open, "list closed on enter press with modifiers");
+  list.removeEventListener("popuphidden", done, false);
+
+  SimpleTest.finish();
+}
+
 SimpleTest.waitForFocus(runTests);
 
 ]]>

From 112ca7daaa8b115edf1ad2202371fbf191e0d091 Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 13 Apr 2011 13:53:24 -0400
Subject: [PATCH 042/509] Bug 608603, properly handle adjusting the day in the
 grid datepicker when switching to a month with fewer days, and add displayed
 month and year properties to datepicker, which can differ from the selection,
 r=neil

---
 .../content/tests/widgets/test_datepicker.xul | 69 ++++++++++++++++++-
 toolkit/content/widgets/datetimepicker.xml    | 65 +++++++++++++++--
 2 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/toolkit/content/tests/widgets/test_datepicker.xul b/toolkit/content/tests/widgets/test_datepicker.xul
index a336e5fa1624..3f52f9ad022b 100644
--- a/toolkit/content/tests/widgets/test_datepicker.xul
+++ b/toolkit/content/tests/widgets/test_datepicker.xul
@@ -133,6 +133,22 @@ function testtag_datepicker(dp, type, testid)
   setDateField("value", "2000-a-19", true, 2002, 6, 15);
   setDateField("dateValue", "none", true, 2002, 6, 15);
 
+  // grid and popup types can display a different month than the current one
+  var isGridOrPopup = (type == "grid" || type == "popup");
+  dp.displayedMonth = 3;
+  testtag_comparedate(dp, testid + "set displayedMonth",
+                      2002, isGridOrPopup ? 6 : 3, 15, 3);
+
+  dp.displayedYear = 2009;
+  testtag_comparedate(dp, testid + "set displayedYear",
+                      isGridOrPopup ? 2002 : 2009, isGridOrPopup ? 6 : 3, 15, 3, 2009);
+
+  if (isGridOrPopup) {
+    dp.value = "2008-02-29";
+    dp.displayedYear = 2009;
+    is(dp.displayedMonth, 1, "set displayedYear during leap year");
+  }
+
   is(dp.open, false, testid + "open false");
   if (type != "popup") {
     dp.open = true;
@@ -241,7 +257,56 @@ function testtag_datepicker_UI_grid(dp, type, testid)
   synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up");
   is(dp.value, "2003-02-15", testid + "key page up");
 
+  // check handling at the start and end of the month
+  dp.value = "2010-10-01";
+  synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-10-01");
+  is(dp.displayedMonth, 8, testid + "key page up 2010-10-01 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-10-01 displayedYear");
+
+  dp.value = "2010-10-01";
+  synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-10-01");
+  is(dp.displayedMonth, 10, testid + "key page down 2010-10-01 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page down 2010-10-01 displayedYear");
+
+  dp.value = "2010-10-31";
+  synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-10-31");
+  is(dp.displayedMonth, 8, testid + "key page up 2010-10-31 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-10-01 displayedYear");
+  dp.value = "2010-10-31";
+  synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-10-31");
+  is(dp.displayedMonth, 10, testid + "key page down 2010-10-31 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-10-31 displayedYear");
+
+  // check handling at the end of february
+  dp.value = "2010-03-31";
+  synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-03-31");
+  is(dp.displayedMonth, 1, testid + "key page up 2010-03-31 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-03-31 displayedYear");
+  synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-02-28");
+  is(dp.displayedMonth, 0, testid + "key page up 2010-02-28 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-02-28 displayedYear");
+
+  dp.value = "2010-01-31";
+  synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-01-31");
+  is(dp.displayedMonth, 1, testid + "key page down 2010-01-31 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-01-31 displayedYear");
+  synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-02-28");
+  is(dp.displayedMonth, 2, testid + "key page down 2010-02-28 displayedMonth");
+  is(dp.displayedYear, 2010, testid + "key page up 2010-02-28 displayedYear");
+
+  // check handling at the end of february during a leap year
+  dp.value = "2008-01-31";
+  synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2008-01-31");
+  is(dp.displayedMonth, 1, testid + "key page down 2008-01-31 displayedMonth");
+  is(dp.displayedYear, 2008, testid + "key page up 2008-01-31 displayedYear");
+  dp.value = "2008-03-31";
+  synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2008-03-31");
+  is(dp.displayedMonth, 1, testid + "key page up 2008-03-31 displayedMonth");
+  is(dp.displayedYear, 2008, testid + "key page up 2008-03-31 displayedYear");
+
   // the value of a read only datepicker cannot be changed
+  dp.value = "2003-02-15";
+
   dp.readOnly = true;
   synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "!change", testid + "key left read only");
   is(dp.value, "2003-02-15", testid + "key left read only");
@@ -314,7 +379,7 @@ function testtag_getdatestring(year, month, date)
   return year + "-" + month + "-" + date;
 }
 
-function testtag_comparedate(dp, testid, year, month, date)
+function testtag_comparedate(dp, testid, year, month, date, displayedMonth, displayedYear)
 {
   is(dp.value, testtag_getdatestring(year, month, date), testid + " value");
   if (testid.indexOf("initial") == -1)
@@ -330,6 +395,8 @@ function testtag_comparedate(dp, testid, year, month, date)
 
   is(dp.year, year, testid + " year");
   is(dp.month, month, testid + " month");
+  is(dp.displayedMonth, displayedMonth ? displayedMonth : month, testid + " displayedMonth");
+  is(dp.displayedYear, displayedYear ? displayedYear : year, testid + " displayedYear");
   is(dp.date, date, testid + " date");
 }
 
diff --git a/toolkit/content/widgets/datetimepicker.xml b/toolkit/content/widgets/datetimepicker.xml
index 40ec91a815a7..532269abe93a 100644
--- a/toolkit/content/widgets/datetimepicker.xml
+++ b/toolkit/content/widgets/datetimepicker.xml
@@ -20,7 +20,7 @@
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
-   -   Neil Deakin <enndeakin@sympatico.ca> (Original Author)
+   -   Neil Deakin <enndeakin@gmail.com> (Original Author)
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -645,6 +645,11 @@
       </property>
       <property name="open" onget="return false;" onset="return val;"/>
 
+      <property name="displayedMonth" onget="return this.month;"
+                onset="this.month = val; return val;"/>
+      <property name="displayedYear" onget="return this.year;"
+                onset="this.year = val; return val;"/>
+
       <method name="_setValueNoSync">
         <parameter name="aValue"/>
         <body>
@@ -989,6 +994,25 @@
         </setter>
       </property>
 
+      <property name="displayedMonth">
+        <getter>
+          return this._displayedDate.getMonth();
+        </getter>
+        <setter>
+          this._updateUI(this.monthField, val, true);
+          return val;
+        </setter>
+      </property>
+      <property name="displayedYear">
+        <getter>
+          return this._displayedDate.getFullYear();
+        </getter>
+        <setter>
+          this._updateUI(this.yearField, val, true);
+          return val;
+        </setter>
+      </property>
+
       <method name="_init">
         <body>
           <![CDATA[
@@ -1030,15 +1054,30 @@
       <method name="_updateUI">
         <parameter name="aField"/>
         <parameter name="aValue"/>
-        <parameter name="aIncDecMonth"/>
+        <parameter name="aCheckMonth"/>
         <body>
           <![CDATA[
             var date;
             var currentMonth;
-            if (aIncDecMonth) {
+            if (aCheckMonth) {
               if (!this._displayedDate)
                 this._displayedDate = this.dateValue;
-              this._displayedDate.setMonth(aValue);
+
+              var expectedMonth = aValue;
+              if (aField == this.monthField) {
+                this._displayedDate.setMonth(aValue);
+              }
+              else {
+                expectedMonth = this._displayedDate.getMonth();
+                this._displayedDate.setFullYear(aValue);
+              }
+
+              if (expectedMonth != -1 && expectedMonth != 12 &&
+                  expectedMonth != this._displayedDate.getMonth()) {
+                // If the month isn't what was expected, then the month overflowed.
+                // Setting the date to 0 will go back to the last day of the right month.
+                this._displayedDate.setDate(0);
+              }
 
               date = new Date(this._displayedDate);
               currentMonth = this._displayedDate.getMonth();
@@ -1251,6 +1290,24 @@
           ]]>
         </setter>
       </property>
+      <property name="displayedMonth">
+        <getter>
+          return document.getAnonymousElementByAttribute(this, "anonid", "grid").displayedMonth;
+        </getter>
+        <setter>
+          document.getAnonymousElementByAttribute(this, "anonid", "grid").displayedMonth = val;
+          return val;
+        </setter>
+      </property>
+      <property name="displayedYear">
+        <getter>
+          return document.getAnonymousElementByAttribute(this, "anonid", "grid").displayedYear;
+        </getter>
+        <setter>
+          document.getAnonymousElementByAttribute(this, "anonid", "grid").displayedYear = val;
+          return val;
+        </setter>
+      </property>
     </implementation>
   </binding>
 

From 1f6dacab440a97f50a02fe855d75fa9a5a71ae18 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 13 Apr 2011 14:08:43 -0400
Subject: [PATCH 043/509] Back out bug 606574 for leaking a Mutex and a CondVar
 in crashtests

---
 config/autoconf.mk.in                   |   2 -
 configure.in                            |   8 --
 toolkit/xre/EventTracer.cpp             | 182 ------------------------
 toolkit/xre/EventTracer.h               |  54 -------
 toolkit/xre/MacApplicationDelegate.mm   |   6 +-
 toolkit/xre/Makefile.in                 |   4 -
 toolkit/xre/nsAppRunner.cpp             |  16 ---
 widget/public/Makefile.in               |   7 +-
 widget/public/WidgetTraceEvent.h        |  53 -------
 widget/src/cocoa/CustomCocoaEvents.h    |  51 -------
 widget/src/cocoa/Makefile.in            |  69 +++++----
 widget/src/cocoa/WidgetTraceEvent.mm    |  92 ------------
 widget/src/cocoa/nsAppShell.mm          |  29 +---
 widget/src/gtk2/Makefile.in             |  35 +++--
 widget/src/gtk2/WidgetTraceEvent.cpp    |  86 -----------
 widget/src/windows/Makefile.in          |  53 ++++---
 widget/src/windows/WidgetTraceEvent.cpp | 148 -------------------
 widget/src/windows/nsWindow.cpp         |   8 --
 widget/src/windows/nsWindowDefs.h       |   2 -
 19 files changed, 83 insertions(+), 822 deletions(-)
 delete mode 100644 toolkit/xre/EventTracer.cpp
 delete mode 100644 toolkit/xre/EventTracer.h
 delete mode 100644 widget/public/WidgetTraceEvent.h
 delete mode 100644 widget/src/cocoa/CustomCocoaEvents.h
 delete mode 100644 widget/src/cocoa/WidgetTraceEvent.mm
 delete mode 100644 widget/src/gtk2/WidgetTraceEvent.cpp
 delete mode 100644 widget/src/windows/WidgetTraceEvent.cpp

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 90868412620d..8b94e1e081eb 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -716,8 +716,6 @@ ANDROID_PACKAGE_NAME = @ANDROID_PACKAGE_NAME@
 
 JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@
 
-MOZ_INSTRUMENT_EVENT_LOOP = @MOZ_INSTRUMENT_EVENT_LOOP@
-
 # We only want to do the pymake sanity on Windows, other os's can cope
 ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 # Ensure invariants between GNU Make and pymake
diff --git a/configure.in b/configure.in
index 7dc86741cd80..8f667097278f 100644
--- a/configure.in
+++ b/configure.in
@@ -5203,7 +5203,6 @@ cairo-windows)
         ;;
     esac
     MOZ_PDF_PRINTING=1
-    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2|cairo-gtk2-x11)
@@ -5221,7 +5220,6 @@ cairo-gtk2|cairo-gtk2-x11)
     TK_LIBS='$(MOZ_GTK2_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     MOZ_PDF_PRINTING=1
-    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2-dfb)
@@ -5281,7 +5279,6 @@ cairo-cocoa)
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     MOZ_FS_LAYOUT=bundle
     MOZ_WEBGL=1
-    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-android)
@@ -5305,10 +5302,6 @@ if test "$MOZ_ENABLE_XREMOTE"; then
     AC_DEFINE(MOZ_ENABLE_XREMOTE)
 fi
 
-if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
-   AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
-fi
-
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK2"; then
     if test "$MOZ_X11"; then
@@ -9192,7 +9185,6 @@ AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_ASM_SUFFIX)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
-AC_SUBST(MOZ_INSTRUMENT_EVENT_LOOP)
 AC_SUBST(LIBJPEG_TURBO_AS)
 AC_SUBST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(LIBJPEG_TURBO_X86_ASM)
diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp
deleted file mode 100644
index 46b89d2d92f2..000000000000
--- a/toolkit/xre/EventTracer.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Event loop instrumentation. This code attempts to measure the
- * latency of the UI-thread event loop by firing native events at it from
- * a background thread, and measuring how long it takes for them
- * to be serviced. The measurement interval (kMeasureInterval, below)
- * is also used as the upper bound of acceptable response time.
- * When an event takes longer than that interval to be serviced,
- * a sample will be written to the log.
- *
- * Usage:
- *
- * Set MOZ_INSTRUMENT_EVENT_LOOP=1 in the environment to enable
- * this instrumentation. Currently only the UI process is instrumented.
- *
- * Set MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT in the environment to a
- * file path to contain the log output, the default is to log to stdout.
- *
- * All logged output lines start with MOZ_EVENT_TRACE. All timestamps
- * output are milliseconds since the epoch (PRTime / 1000).
- *
- * On startup, a line of the form:
- *   MOZ_EVENT_TRACE start <timestamp>
- * will be output.
- *
- * On shutdown, a line of the form:
- *   MOZ_EVENT_TRACE stop <timestamp>
- * will be output.
- *
- * When an event servicing time exceeds the threshold, a line of the form:
- *   MOZ_EVENT_TRACE sample <timestamp> <duration>
- * will be output, where <duration> is the number of milliseconds that
- * it took for the event to be serviced.
- */
-
-#include "EventTracer.h"
-
-#include <stdio.h>
-
-#include "mozilla/TimeStamp.h"
-#include "mozilla/WidgetTraceEvent.h"
-#include <prenv.h>
-#include <prinrval.h>
-#include <prthread.h>
-#include <prtime.h>
-
-using mozilla::TimeDuration;
-using mozilla::TimeStamp;
-using mozilla::FireAndWaitForTracerEvent;
-
-namespace {
-
-PRThread* sTracerThread = NULL;
-bool sExit = false;
-
-/*
- * The tracer thread fires events at the native event loop roughly
- * every kMeasureInterval. It will sleep to attempt not to send them
- * more quickly, but if the response time is longer than kMeasureInterval
- * it will not send another event until the previous response is received.
- *
- * The output defaults to stdout, but can be redirected to a file by
- * settting the environment variable MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT
- * to the name of a file to use.
- */
-void TracerThread(void *arg)
-{
-  // This should be set to the maximum latency we'd like to allow
-  // for responsiveness.
-  const PRIntervalTime kMeasureInterval = PR_MillisecondsToInterval(50);
-
-  FILE* log = NULL;
-  char* envfile = PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT");
-  if (envfile) {
-    log = fopen(envfile, "w");
-  }
-  if (log == NULL)
-    log = stdout;
-
-  fprintf(log, "MOZ_EVENT_TRACE start %llu\n", PR_Now() / PR_USEC_PER_MSEC);
-
-  while (!sExit) {
-    TimeStamp start(TimeStamp::Now());
-    PRIntervalTime next_sleep = kMeasureInterval;
-
-    //TODO: only wait up to a maximum of kMeasureInterval, return
-    // early if that threshold is exceeded and dump a stack trace
-    // or do something else useful.
-    if (FireAndWaitForTracerEvent()) {
-      TimeDuration duration = TimeStamp::Now() - start;
-      // Only report samples that exceed our measurement interval.
-      if (duration.ToMilliseconds() > kMeasureInterval) {
-        fprintf(log, "MOZ_EVENT_TRACE sample %llu %d\n",
-                PR_Now() / PR_USEC_PER_MSEC,
-                int(duration.ToSecondsSigDigits() * 1000));
-      }
-
-      if (next_sleep > duration.ToMilliseconds()) {
-        next_sleep -= int(duration.ToMilliseconds());
-      }
-      else {
-        // Don't sleep at all if this event took longer than the measure
-        // interval to deliver.
-        next_sleep = 0;
-      }
-    }
-
-    if (next_sleep != 0 && !sExit) {
-      PR_Sleep(next_sleep);
-    }
-  }
-
-  fprintf(log, "MOZ_EVENT_TRACE stop %llu\n", PR_Now() / PR_USEC_PER_MSEC);
-
-  if (log != stdout)
-    fclose(log);
-}
-
-} // namespace
-
-namespace mozilla {
-
-bool InitEventTracing()
-{
-  // Create a thread that will fire events back at the
-  // main thread to measure responsiveness.
-  NS_ABORT_IF_FALSE(!sTracerThread, "Event tracing already initialized!");
-  sTracerThread = PR_CreateThread(PR_USER_THREAD,
-                                  TracerThread,
-                                  NULL,
-                                  PR_PRIORITY_NORMAL,
-                                  PR_GLOBAL_THREAD,
-                                  PR_JOINABLE_THREAD,
-                                  0);
-  return sTracerThread != NULL;
-}
-
-void ShutdownEventTracing()
-{
-  sExit = true;
-  if (sTracerThread)
-    PR_JoinThread(sTracerThread);
-  sTracerThread = NULL;
-}
-
-}  // namespace mozilla
diff --git a/toolkit/xre/EventTracer.h b/toolkit/xre/EventTracer.h
deleted file mode 100644
index 2becc53c9e62..000000000000
--- a/toolkit/xre/EventTracer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef XRE_EVENTTRACER_H_
-#define XRE_EVENTTRACER_H_
-
-namespace mozilla {
-
-// Create a thread that will fire events back at the
-// main thread to measure responsiveness. Return true
-// if the thread was created successfully.
-bool InitEventTracing();
-
-// Signal the background thread to stop, and join it.
-// Must be called from the same thread that called InitEventTracing.
-void ShutdownEventTracing();
-
-}  // namespace mozilla
-
-#endif /* XRE_EVENTTRACER_H_ */
diff --git a/toolkit/xre/MacApplicationDelegate.mm b/toolkit/xre/MacApplicationDelegate.mm
index 1c431d7fe053..ea495d89f00c 100644
--- a/toolkit/xre/MacApplicationDelegate.mm
+++ b/toolkit/xre/MacApplicationDelegate.mm
@@ -88,8 +88,6 @@ private:
 
 static PRBool sProcessedGetURLEvent = PR_FALSE;
 
-@class GeckoNSApplication;
-
 // Methods that can be called from non-Objective-C code.
 
 // This is needed, on relaunch, to force the OS to use the "Cocoa Dock API"
@@ -99,7 +97,7 @@ EnsureUseCocoaDockAPI()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  [GeckoNSApplication sharedApplication];
+  [NSApplication sharedApplication];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -114,7 +112,7 @@ SetupMacApplicationDelegate()
   AutoAutoreleasePool pool;
 
   // Ensure that ProcessPendingGetURLAppleEvents() doesn't regress bug 377166.
-  [GeckoNSApplication sharedApplication];
+  [NSApplication sharedApplication];
 
   // This call makes it so that application:openFile: doesn't get bogus calls
   // from Cocoa doing its own parsing of the argument string. And yes, we need
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 648b29476660..4507fc1eb0a4 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,10 +66,6 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
-ifdef MOZ_INSTRUMENT_EVENT_LOOP
-CPPSRCS += EventTracer.cpp
-endif
-
 ifdef MOZ_SPLASHSCREEN
 ifeq ($(OS_ARCH),WINCE)
 CPPSRCS += nsSplashScreenWin.cpp
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 8b4db05235f3..a47192f65001 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -62,10 +62,6 @@ using mozilla::dom::ContentParent;
 #include "nsAppRunner.h"
 #include "nsUpdateDriver.h"
 
-#ifdef MOZ_INSTRUMENT_EVENT_LOOP
-#include "EventTracer.h"
-#endif
-
 #ifdef XP_MACOSX
 #include "MacLaunchHelper.h"
 #include "MacApplicationDelegate.h"
@@ -3748,13 +3744,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
           nativeApp->Enable();
         }
 
-#ifdef MOZ_INSTRUMENT_EVENT_LOOP
-        bool event_tracing_running = false;
-        if (PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP")) {
-          event_tracing_running = mozilla::InitEventTracing();
-        }
-#endif /* MOZ_INSTRUMENT_EVENT_LOOP */
-
         NS_TIME_FUNCTION_MARK("Next: Run");
 
         NS_TIME_FUNCTION_MARK("appStartup->Run");
@@ -3774,11 +3763,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
         NS_TIME_FUNCTION_MARK("appStartup->Run done");
 
-#ifdef MOZ_INSTRUMENT_EVENT_LOOP
-        if (event_tracing_running)
-          mozilla::ShutdownEventTracing();
-#endif
-
         // Check for an application initiated restart.  This is one that
         // corresponds to nsIAppStartup.quit(eRestart)
         if (rv == NS_SUCCESS_RESTART_APP)
diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in
index 92dd0bbbd746..30383b9e7a8b 100644
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -46,17 +46,12 @@ MODULE		= widget
 XPIDL_MODULE	= widget
 GRE_MODULE	= 1
 
-EXPORTS_NAMESPACES = IPC mozilla
+EXPORTS_NAMESPACES = IPC
 
 EXPORTS_IPC = \
 		nsGUIEventIPC.h \
 		$(NULL)
 
-ifdef MOZ_INSTRUMENT_EVENT_LOOP
-EXPORTS_mozilla = \
-  WidgetTraceEvent.h
-endif
-
 EXPORTS		= \
 		nsIWidget.h \
 		nsGUIEvent.h \
diff --git a/widget/public/WidgetTraceEvent.h b/widget/public/WidgetTraceEvent.h
deleted file mode 100644
index 80ca85b85a51..000000000000
--- a/widget/public/WidgetTraceEvent.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
-#define WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
-
-namespace mozilla {
-
-// Fire a tracer event at the UI-thread event loop, and block until
-// the event is processed. This should only be called by
-// a thread that's not the UI thread.
-bool FireAndWaitForTracerEvent();
-
-// Signal that the event has been received by the event loop.
-void SignalTracerThread();
-
-}
-
-#endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/src/cocoa/CustomCocoaEvents.h b/widget/src/cocoa/CustomCocoaEvents.h
deleted file mode 100644
index f4ccf779f84a..000000000000
--- a/widget/src/cocoa/CustomCocoaEvents.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This file defines constants to be used in the "subtype" field of
- * NSApplicationDefined type NSEvents.
- */
-
-#ifndef WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
-#define WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
-
-// Empty event, just used for prodding the event loop into responding.
-const short kEventSubtypeNone = 0;
-// Tracer event, used for timing the event loop responsiveness.
-const short kEventSubtypeTrace = 1;
-
-#endif /* WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_ */
diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index e5806ee0564a..d7965d21dfde 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -60,41 +60,40 @@ EXPORTS = \
 		$(NULL)
 
 CMMSRCS = \
-  nsBidiKeyboard.mm \
-  nsClipboard.mm \
-  nsMenuX.mm \
-  nsMenuBarX.mm \
-  nsMenuItemX.mm \
-  nsMenuItemIconX.mm \
-  nsMenuUtilsX.mm \
-  nsMenuGroupOwnerX.mm \
-  nsFilePicker.mm \
-  nsDragService.mm \
-  nsToolkit.mm \
-  nsAppShell.mm \
-  nsCocoaUtils.mm \
-  nsCocoaWindow.mm \
-  nsChildView.mm \
-  nsWindowMap.mm \
-  nsWidgetFactory.mm \
-  nsCursorManager.mm \
-  nsMacCursor.mm \
-  nsScreenCocoa.mm \
-  nsScreenManagerCocoa.mm \
-  nsSound.mm \
-  nsLookAndFeel.mm \
-  nsNativeThemeCocoa.mm \
-  nsDeviceContextSpecX.mm \
-  nsPrintDialogX.mm \
-  nsPrintOptionsX.mm \
-  nsPrintSettingsX.mm \
-  nsIdleServiceX.mm \
-  nsCocoaTextInputHandler.mm \
-  nsMacDockSupport.mm \
-  nsStandaloneNativeMenu.mm \
-  GfxInfo.mm \
-  WidgetTraceEvent.mm \
-  $(NULL)
+		nsBidiKeyboard.mm \
+		nsClipboard.mm \
+		nsMenuX.mm \
+		nsMenuBarX.mm \
+		nsMenuItemX.mm \
+		nsMenuItemIconX.mm \
+		nsMenuUtilsX.mm \
+		nsMenuGroupOwnerX.mm \
+		nsFilePicker.mm \
+		nsDragService.mm \
+		nsToolkit.mm \
+		nsAppShell.mm \
+		nsCocoaUtils.mm \
+		nsCocoaWindow.mm \
+		nsChildView.mm \
+		nsWindowMap.mm \
+		nsWidgetFactory.mm \
+		nsCursorManager.mm \
+		nsMacCursor.mm \
+		nsScreenCocoa.mm \
+		nsScreenManagerCocoa.mm \
+		nsSound.mm \
+		nsLookAndFeel.mm \
+		nsNativeThemeCocoa.mm \
+		nsDeviceContextSpecX.mm \
+		nsPrintDialogX.mm \
+		nsPrintOptionsX.mm \
+		nsPrintSettingsX.mm \
+		nsIdleServiceX.mm \
+		nsCocoaTextInputHandler.mm \
+		nsMacDockSupport.mm \
+		nsStandaloneNativeMenu.mm \
+		GfxInfo.mm \
+		$(NULL)
 
 ifeq (x86_64,$(TARGET_CPU))
 CMMSRCS += ComplexTextInputPanel.mm
diff --git a/widget/src/cocoa/WidgetTraceEvent.mm b/widget/src/cocoa/WidgetTraceEvent.mm
deleted file mode 100644
index f904a147c261..000000000000
--- a/widget/src/cocoa/WidgetTraceEvent.mm
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <Cocoa/Cocoa.h>
-#include "CustomCocoaEvents.h"
-#include <Foundation/NSAutoreleasePool.h>
-#include <mozilla/CondVar.h>
-#include <mozilla/Mutex.h>
-#include "mozilla/WidgetTraceEvent.h"
-
-using mozilla::CondVar;
-using mozilla::Mutex;
-using mozilla::MutexAutoLock;
-
-namespace {
-
-Mutex sMutex("Event tracer thread mutex");
-CondVar sCondVar(sMutex, "Event tracer thread condvar");
-bool sTracerProcessed;
-
-}
-
-namespace mozilla {
-
-// This function is called from the main (UI) thread.
-void SignalTracerThread()
-{
-  MutexAutoLock lock(sMutex);
-  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
-  sTracerProcessed = true;
-  sCondVar.Notify();
-}
-
-// This function is called from the background tracer thread.
-bool FireAndWaitForTracerEvent()
-{
-  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  MutexAutoLock lock(sMutex);
-  sTracerProcessed = false;
-  // Post an application-defined event to the main thread's event queue
-  // and wait for it to get processed.
-  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
-                                      location:NSMakePoint(0,0)
-                                 modifierFlags:0
-                                     timestamp:0
-                                  windowNumber:0
-                                       context:NULL
-                                       subtype:kEventSubtypeTrace
-                                         data1:0
-                                         data2:0]
-             atStart:NO];
-  while (!sTracerProcessed)
-    sCondVar.Wait();
-  [pool release];
-  return true;
-}
-
-}  // namespace mozilla
diff --git a/widget/src/cocoa/nsAppShell.mm b/widget/src/cocoa/nsAppShell.mm
index f128e5acdd02..0491a8bef31f 100644
--- a/widget/src/cocoa/nsAppShell.mm
+++ b/widget/src/cocoa/nsAppShell.mm
@@ -43,8 +43,6 @@
 #import <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 
-#include "CustomCocoaEvents.h"
-#include "mozilla/WidgetTraceEvent.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
@@ -171,27 +169,6 @@ PRBool nsCocoaAppModalWindowList::GeckoModalAboveCocoaModal()
   return (topItem.mWidget != nsnull);
 }
 
-// GeckoNSApplication
-//
-// Subclass of NSApplication for filtering out certain events.
-@interface GeckoNSApplication : NSApplication
-{
-}
-@end
-
-@implementation GeckoNSApplication
-- (void)sendEvent:(NSEvent *)anEvent
-{
-  if ([anEvent type] == NSApplicationDefined &&
-      [anEvent subtype] == kEventSubtypeTrace) {
-    mozilla::SignalTracerThread();
-    return;
-  }
-  [super sendEvent:anEvent];
-}
-@end
-
-
 // AppShellDelegate
 //
 // Cocoa bridge class.  An object of this class is registered to receive
@@ -309,7 +286,7 @@ nsAppShell::Init()
   [NSBundle loadNibFile:
                      [NSString stringWithUTF8String:(const char*)nibPath.get()]
       externalNameTable:
-           [NSDictionary dictionaryWithObject:[GeckoNSApplication sharedApplication]
+           [NSDictionary dictionaryWithObject:[NSApplication sharedApplication]
                                        forKey:@"NSOwner"]
                withZone:NSDefaultMallocZone()];
 
@@ -411,7 +388,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                        timestamp:0
                                     windowNumber:0
                                          context:NULL
-                                         subtype:kEventSubtypeNone
+                                         subtype:0
                                            data1:0
                                            data2:0]
              atStart:NO];
@@ -433,7 +410,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                      timestamp:0
                                   windowNumber:0
                                        context:NULL
-                                       subtype:kEventSubtypeNone
+                                       subtype:0
                                          data1:0
                                          data2:0]
            atStart:NO];
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index ad75f29de139..a8351d8f9d84 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -62,24 +62,23 @@ ifdef ACCESSIBILITY
 CSRCS += maiRedundantObjectFactory.c
 endif
 
-CPPSRCS = \
-  nsWindow.cpp \
-  nsAppShell.cpp \
-  nsWidgetFactory.cpp \
-  nsToolkit.cpp \
-  nsBidiKeyboard.cpp \
-  nsLookAndFeel.cpp \
-  nsGtkKeyUtils.cpp \
-  nsFilePicker.cpp \
-  nsSound.cpp \
-  nsNativeKeyBindings.cpp \
-  nsScreenGtk.cpp \
-  nsScreenManagerGtk.cpp \
-  nsImageToPixbuf.cpp \
-  nsAccessibilityHelper.cpp \
-  nsGtkIMModule.cpp \
-  WidgetTraceEvent.cpp \
-  $(NULL)
+CPPSRCS		= \
+		nsWindow.cpp \
+		nsAppShell.cpp \
+		nsWidgetFactory.cpp \
+		nsToolkit.cpp \
+		nsBidiKeyboard.cpp \
+		nsLookAndFeel.cpp \
+		nsGtkKeyUtils.cpp \
+		nsFilePicker.cpp \
+		nsSound.cpp \
+		nsNativeKeyBindings.cpp \
+		nsScreenGtk.cpp \
+		nsScreenManagerGtk.cpp \
+		nsImageToPixbuf.cpp \
+		nsAccessibilityHelper.cpp \
+		nsGtkIMModule.cpp \
+		$(NULL)
 
 ifdef MOZ_X11
 CPPSRCS         += nsIdleServiceGTK.cpp
diff --git a/widget/src/gtk2/WidgetTraceEvent.cpp b/widget/src/gtk2/WidgetTraceEvent.cpp
deleted file mode 100644
index 95753ae3b230..000000000000
--- a/widget/src/gtk2/WidgetTraceEvent.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mozilla/WidgetTraceEvent.h"
-
-#include <glib.h>
-#include <mozilla/CondVar.h>
-#include <mozilla/Mutex.h>
-#include <stdio.h>
-
-using mozilla::CondVar;
-using mozilla::Mutex;
-using mozilla::MutexAutoLock;
-
-namespace {
-
-Mutex sMutex("Event tracer thread mutex");
-CondVar sCondVar(sMutex, "Event tracer thread condvar");
-bool sTracerProcessed = false;
-
-// This function is called from the main (UI) thread.
-gboolean TracerCallback(gpointer data)
-{
-  MutexAutoLock lock(sMutex);
-  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
-  sTracerProcessed = true;
-  sCondVar.Notify();
-  return FALSE;
-}
-
-} // namespace
-
-namespace mozilla {
-
-// This function is called from the background tracer thread.
-bool FireAndWaitForTracerEvent()
-{
-  // Send a default-priority idle event through the
-  // event loop, and wait for it to finish.
-  MutexAutoLock lock(sMutex);
-  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
-  g_idle_add_full(G_PRIORITY_DEFAULT,
-                  TracerCallback,
-                  NULL,
-                  NULL);
-  while (!sTracerProcessed)
-    sCondVar.Wait();
-  sTracerProcessed = false;
-  return true;
-}
-
-}  // namespace mozilla
diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in
index ba09e342de5b..876fb6c165fe 100644
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -47,33 +47,32 @@ LIBRARY_NAME	= widget_windows
 LIBXUL_LIBRARY = 1
 
 
-CPPSRCS = \
-  nsWindow.cpp \
-  nsWindowGfx.cpp \
-  nsWindowDbg.cpp \
-  nsAppShell.cpp \
-  nsToolkit.cpp \
-  nsFilePicker.cpp \
-  nsScreenWin.cpp  \
-  nsScreenManagerWin.cpp \
-  nsLookAndFeel.cpp \
-  nsUXThemeData.cpp \
-  nsNativeThemeWin.cpp \
-  nsWinGesture.cpp \
-  nsIdleServiceWin.cpp \
-  nsSound.cpp \
-  nsIMM32Handler.cpp \
-  WindowHook.cpp \
-  WinTaskbar.cpp \
-  TaskbarPreview.cpp \
-  TaskbarTabPreview.cpp \
-  TaskbarWindowPreview.cpp \
-  TaskbarPreviewButton.cpp \
-  JumpListBuilder.cpp \
-  JumpListItem.cpp \
-  GfxInfo.cpp \
-  WidgetTraceEvent.cpp \
-  $(NULL)
+CPPSRCS		= \
+	nsWindow.cpp \
+	nsWindowGfx.cpp \
+	nsWindowDbg.cpp \
+	nsAppShell.cpp \
+	nsToolkit.cpp \
+	nsFilePicker.cpp \
+	nsScreenWin.cpp	\
+	nsScreenManagerWin.cpp \
+	nsLookAndFeel.cpp \
+	nsUXThemeData.cpp \
+	nsNativeThemeWin.cpp \
+	nsWinGesture.cpp \
+	nsIdleServiceWin.cpp \
+	nsSound.cpp \
+	nsIMM32Handler.cpp \
+	WindowHook.cpp \
+	WinTaskbar.cpp \
+	TaskbarPreview.cpp \
+	TaskbarTabPreview.cpp \
+	TaskbarWindowPreview.cpp \
+	TaskbarPreviewButton.cpp \
+ 	JumpListBuilder.cpp \
+ 	JumpListItem.cpp \
+	GfxInfo.cpp \
+	$(NULL)
 
 ifdef MOZ_CRASHREPORTER
 CPPSRCS += LSPAnnotator.cpp
diff --git a/widget/src/windows/WidgetTraceEvent.cpp b/widget/src/windows/WidgetTraceEvent.cpp
deleted file mode 100644
index 0e2f629e180a..000000000000
--- a/widget/src/windows/WidgetTraceEvent.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ted Mielczarek <ted.mielczarek@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Windows widget support for event loop instrumentation.
- * See toolkit/xre/EventTracer.cpp for more details.
- */
-
-#include <stdio.h>
-#include <windows.h>
-
-#include "mozilla/WidgetTraceEvent.h"
-#include "nsAppShellCID.h"
-#include "nsComponentManagerUtils.h"
-#include "nsCOMPtr.h"
-#include "nsIAppShellService.h"
-#include "nsIBaseWindow.h"
-#include "nsIDocShell.h"
-#include "nsIWidget.h"
-#include "nsIXULWindow.h"
-#include "nsAutoPtr.h"
-#include "nsServiceManagerUtils.h"
-#include "nsThreadUtils.h"
-#include "nsWindowDefs.h"
-
-namespace {
-
-// Used for signaling the background thread from the main thread.
-HANDLE event_handle = NULL;
-
-// We need a runnable in order to find the hidden window on the main
-// thread.
-class HWNDGetter : public nsRunnable {
-public:
-  HWNDGetter() : hidden_window_hwnd(NULL) {}
-
-  HWND hidden_window_hwnd;
-
-  NS_IMETHOD Run() {
-    // Jump through some hoops to locate the hidden window.
-    nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
-    nsCOMPtr<nsIXULWindow> hiddenWindow;
-
-    nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow));
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    nsCOMPtr<nsIDocShell> docShell;
-    rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell));
-    if (NS_FAILED(rv) || !docShell) {
-      return rv;
-    }
-
-    nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell));
-    
-    if (!baseWindow)
-      return NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsIWidget> widget;
-    baseWindow->GetMainWidget(getter_AddRefs(widget));
-
-    if (!widget)
-      return NS_ERROR_FAILURE;
-
-    hidden_window_hwnd = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW);
-
-    return NS_OK;
-  }
-};
-
-HWND GetHiddenWindowHWND()
-{
-  // Need to dispatch this to the main thread because plenty of
-  // the things it wants to access are main-thread-only.
-  nsRefPtr<HWNDGetter> getter = new HWNDGetter();
-  NS_DispatchToMainThread(getter, NS_DISPATCH_SYNC);
-  return getter->hidden_window_hwnd;
-}
-
-} // namespace
-
-namespace mozilla {
-
-// This function is called from the main (UI) thread.
-void SignalTracerThread()
-{
-  if (event_handle != NULL)
-    SetEvent(event_handle);
-}
-
-// This function is called from the background tracer thread.
-bool FireAndWaitForTracerEvent()
-{
-  // First, try to find the hidden window.
-  static HWND hidden_window = NULL;
-  if (hidden_window == NULL) {
-    hidden_window = GetHiddenWindowHWND();
-  }
-
-  if (hidden_window == NULL)
-    return false;
-
-  if (event_handle == NULL)
-    event_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
-
-  // Post the tracer message into the hidden window's message queue,
-  // and then block until it's processed.
-  PostMessage(hidden_window, MOZ_WM_TRACE, 0, 0);
-  WaitForSingleObject(event_handle, INFINITE);
-  return true;
-}
-
-}  // namespace mozilla
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 18c253a170f1..4284ef3fd1ae 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -118,7 +118,6 @@
 #include "prprf.h"
 #include "prmem.h"
 
-#include "mozilla/WidgetTraceEvent.h"
 #include "nsIAppShell.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIDOMNSUIEvent.h"
@@ -4597,13 +4596,6 @@ LRESULT CALLBACK nsWindow::WindowProcInternal(HWND hWnd, UINT msg, WPARAM wParam
     }
   }
 
-  if (msg == MOZ_WM_TRACE) {
-    // This is a tracer event for measuring event loop latency.
-    // See WidgetTraceEvent.cpp for more details.
-    mozilla::SignalTracerThread();
-    return 0;
-  }
-
   // Get the window which caused the event and ask it to process the message
   nsWindow *someWindow = GetNSWindowPtr(hWnd);
 
diff --git a/widget/src/windows/nsWindowDefs.h b/widget/src/windows/nsWindowDefs.h
index 8856b47e4cef..1dc97098a804 100644
--- a/widget/src/windows/nsWindowDefs.h
+++ b/widget/src/windows/nsWindowDefs.h
@@ -56,8 +56,6 @@
 // A magic APP message that can be sent to quit, sort of like a QUERYENDSESSION/ENDSESSION,
 // but without the query.
 #define MOZ_WM_APP_QUIT                   (WM_APP+0x0300)
-// Used as a "tracer" event to probe event loop latency.
-#define MOZ_WM_TRACE                      (WM_APP+0x0301)
 
 // GetWindowsVersion constants
 #define WIN2K_VERSION                     0x500

From 9144e54f54c034344a26cf14d2d96c4736f4ec00 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 2 Mar 2011 22:32:58 +0100
Subject: [PATCH 044/509] Bug 638143 - Internal html:input of XUL numberbox
 shouldn't have type='number'. r=enndeakin

---
 toolkit/content/widgets/numberbox.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/numberbox.xml b/toolkit/content/widgets/numberbox.xml
index 82c8e62079ef..fab66a345541 100644
--- a/toolkit/content/widgets/numberbox.xml
+++ b/toolkit/content/widgets/numberbox.xml
@@ -16,7 +16,7 @@
     <content>
       <xul:hbox class="textbox-input-box numberbox-input-box" flex="1" xbl:inherits="context,disabled,focused">
         <html:input class="numberbox-input textbox-input" flex="1" anonid="input"
-                    xbl:inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
+                    xbl:inherits="onfocus,onblur,value,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
       </xul:hbox>
       <xul:spinbuttons anonid="buttons" xbl:inherits="disabled,hidden=hidespinbuttons"/>
     </content>

From 9a67cab0ae8e2062b13e71b5f371025ba917423d Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 045/509] bug 606574 - Implement event loop instrumentation
 using native events, core implementation + GTK2 implementation.
 r=karlt,cjones

--HG--
extra : rebase_source : bae5a25a76f4bb2f8ea4154923cfecbc4c39f128
---
 config/autoconf.mk.in                |   2 +
 configure.in                         |   6 +
 toolkit/xre/EventTracer.cpp          | 189 +++++++++++++++++++++++++++
 toolkit/xre/EventTracer.h            |  54 ++++++++
 toolkit/xre/Makefile.in              |   4 +
 toolkit/xre/nsAppRunner.cpp          |  16 +++
 widget/public/Makefile.in            |   7 +-
 widget/public/WidgetTraceEvent.h     |  57 ++++++++
 widget/src/gtk2/Makefile.in          |  35 ++---
 widget/src/gtk2/WidgetTraceEvent.cpp | 103 +++++++++++++++
 10 files changed, 455 insertions(+), 18 deletions(-)
 create mode 100644 toolkit/xre/EventTracer.cpp
 create mode 100644 toolkit/xre/EventTracer.h
 create mode 100644 widget/public/WidgetTraceEvent.h
 create mode 100644 widget/src/gtk2/WidgetTraceEvent.cpp

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index df94ce814cc0..532851a347bd 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -707,6 +707,8 @@ ANDROID_PACKAGE_NAME = @ANDROID_PACKAGE_NAME@
 
 JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@
 
+MOZ_INSTRUMENT_EVENT_LOOP = @MOZ_INSTRUMENT_EVENT_LOOP@
+
 # We only want to do the pymake sanity on Windows, other os's can cope
 ifeq ($(HOST_OS_ARCH),WINNT)
 # Ensure invariants between GNU Make and pymake
diff --git a/configure.in b/configure.in
index bddbe5a3b4f7..910a72650869 100644
--- a/configure.in
+++ b/configure.in
@@ -5040,6 +5040,7 @@ cairo-gtk2|cairo-gtk2-x11)
     TK_LIBS='$(MOZ_GTK2_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     MOZ_PDF_PRINTING=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2-dfb)
@@ -5122,6 +5123,10 @@ if test "$MOZ_ENABLE_XREMOTE"; then
     AC_DEFINE(MOZ_ENABLE_XREMOTE)
 fi
 
+if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
+   AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
+fi
+
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK2"; then
     if test "$MOZ_X11"; then
@@ -8992,6 +8997,7 @@ AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_ASM_SUFFIX)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
+AC_SUBST(MOZ_INSTRUMENT_EVENT_LOOP)
 AC_SUBST(LIBJPEG_TURBO_AS)
 AC_SUBST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(LIBJPEG_TURBO_X86_ASM)
diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp
new file mode 100644
index 000000000000..512e41160c6f
--- /dev/null
+++ b/toolkit/xre/EventTracer.cpp
@@ -0,0 +1,189 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Event loop instrumentation. This code attempts to measure the
+ * latency of the UI-thread event loop by firing native events at it from
+ * a background thread, and measuring how long it takes for them
+ * to be serviced. The measurement interval (kMeasureInterval, below)
+ * is also used as the upper bound of acceptable response time.
+ * When an event takes longer than that interval to be serviced,
+ * a sample will be written to the log.
+ *
+ * Usage:
+ *
+ * Set MOZ_INSTRUMENT_EVENT_LOOP=1 in the environment to enable
+ * this instrumentation. Currently only the UI process is instrumented.
+ *
+ * Set MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT in the environment to a
+ * file path to contain the log output, the default is to log to stdout.
+ *
+ * All logged output lines start with MOZ_EVENT_TRACE. All timestamps
+ * output are milliseconds since the epoch (PRTime / 1000).
+ *
+ * On startup, a line of the form:
+ *   MOZ_EVENT_TRACE start <timestamp>
+ * will be output.
+ *
+ * On shutdown, a line of the form:
+ *   MOZ_EVENT_TRACE stop <timestamp>
+ * will be output.
+ *
+ * When an event servicing time exceeds the threshold, a line of the form:
+ *   MOZ_EVENT_TRACE sample <timestamp> <duration>
+ * will be output, where <duration> is the number of milliseconds that
+ * it took for the event to be serviced.
+ */
+
+#include "EventTracer.h"
+
+#include <stdio.h>
+
+#include "mozilla/TimeStamp.h"
+#include "mozilla/WidgetTraceEvent.h"
+#include <prenv.h>
+#include <prinrval.h>
+#include <prthread.h>
+#include <prtime.h>
+
+using mozilla::TimeDuration;
+using mozilla::TimeStamp;
+using mozilla::FireAndWaitForTracerEvent;
+
+namespace {
+
+PRThread* sTracerThread = NULL;
+bool sExit = false;
+
+/*
+ * The tracer thread fires events at the native event loop roughly
+ * every kMeasureInterval. It will sleep to attempt not to send them
+ * more quickly, but if the response time is longer than kMeasureInterval
+ * it will not send another event until the previous response is received.
+ *
+ * The output defaults to stdout, but can be redirected to a file by
+ * settting the environment variable MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT
+ * to the name of a file to use.
+ */
+void TracerThread(void *arg)
+{
+  // This should be set to the maximum latency we'd like to allow
+  // for responsiveness.
+  const PRIntervalTime kMeasureInterval = PR_MillisecondsToInterval(50);
+
+  FILE* log = NULL;
+  char* envfile = PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP_OUTPUT");
+  if (envfile) {
+    log = fopen(envfile, "w");
+  }
+  if (log == NULL)
+    log = stdout;
+
+  fprintf(log, "MOZ_EVENT_TRACE start %llu\n", PR_Now() / PR_USEC_PER_MSEC);
+
+  while (!sExit) {
+    TimeStamp start(TimeStamp::Now());
+    PRIntervalTime next_sleep = kMeasureInterval;
+
+    //TODO: only wait up to a maximum of kMeasureInterval, return
+    // early if that threshold is exceeded and dump a stack trace
+    // or do something else useful.
+    if (FireAndWaitForTracerEvent()) {
+      TimeDuration duration = TimeStamp::Now() - start;
+      // Only report samples that exceed our measurement interval.
+      if (duration.ToMilliseconds() > kMeasureInterval) {
+        fprintf(log, "MOZ_EVENT_TRACE sample %llu %d\n",
+                PR_Now() / PR_USEC_PER_MSEC,
+                int(duration.ToSecondsSigDigits() * 1000));
+      }
+
+      if (next_sleep > duration.ToMilliseconds()) {
+        next_sleep -= int(duration.ToMilliseconds());
+      }
+      else {
+        // Don't sleep at all if this event took longer than the measure
+        // interval to deliver.
+        next_sleep = 0;
+      }
+    }
+
+    if (next_sleep != 0 && !sExit) {
+      PR_Sleep(next_sleep);
+    }
+  }
+
+  fprintf(log, "MOZ_EVENT_TRACE stop %llu\n", PR_Now() / PR_USEC_PER_MSEC);
+
+  if (log != stdout)
+    fclose(log);
+}
+
+} // namespace
+
+namespace mozilla {
+
+bool InitEventTracing()
+{
+  // Initialize the widget backend.
+  if (!InitWidgetTracing())
+    return false;
+
+  // Create a thread that will fire events back at the
+  // main thread to measure responsiveness.
+  NS_ABORT_IF_FALSE(!sTracerThread, "Event tracing already initialized!");
+  sTracerThread = PR_CreateThread(PR_USER_THREAD,
+                                  TracerThread,
+                                  NULL,
+                                  PR_PRIORITY_NORMAL,
+                                  PR_GLOBAL_THREAD,
+                                  PR_JOINABLE_THREAD,
+                                  0);
+  return sTracerThread != NULL;
+}
+
+void ShutdownEventTracing()
+{
+  sExit = true;
+  if (sTracerThread)
+    PR_JoinThread(sTracerThread);
+  sTracerThread = NULL;
+
+  // Allow the widget backend to clean up.
+  CleanUpWidgetTracing();
+}
+
+}  // namespace mozilla
diff --git a/toolkit/xre/EventTracer.h b/toolkit/xre/EventTracer.h
new file mode 100644
index 000000000000..2becc53c9e62
--- /dev/null
+++ b/toolkit/xre/EventTracer.h
@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef XRE_EVENTTRACER_H_
+#define XRE_EVENTTRACER_H_
+
+namespace mozilla {
+
+// Create a thread that will fire events back at the
+// main thread to measure responsiveness. Return true
+// if the thread was created successfully.
+bool InitEventTracing();
+
+// Signal the background thread to stop, and join it.
+// Must be called from the same thread that called InitEventTracing.
+void ShutdownEventTracing();
+
+}  // namespace mozilla
+
+#endif /* XRE_EVENTTRACER_H_ */
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 4507fc1eb0a4..648b29476660 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,6 +66,10 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
+ifdef MOZ_INSTRUMENT_EVENT_LOOP
+CPPSRCS += EventTracer.cpp
+endif
+
 ifdef MOZ_SPLASHSCREEN
 ifeq ($(OS_ARCH),WINCE)
 CPPSRCS += nsSplashScreenWin.cpp
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index a47192f65001..8b4db05235f3 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -62,6 +62,10 @@ using mozilla::dom::ContentParent;
 #include "nsAppRunner.h"
 #include "nsUpdateDriver.h"
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+#include "EventTracer.h"
+#endif
+
 #ifdef XP_MACOSX
 #include "MacLaunchHelper.h"
 #include "MacApplicationDelegate.h"
@@ -3744,6 +3748,13 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
           nativeApp->Enable();
         }
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+        bool event_tracing_running = false;
+        if (PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP")) {
+          event_tracing_running = mozilla::InitEventTracing();
+        }
+#endif /* MOZ_INSTRUMENT_EVENT_LOOP */
+
         NS_TIME_FUNCTION_MARK("Next: Run");
 
         NS_TIME_FUNCTION_MARK("appStartup->Run");
@@ -3763,6 +3774,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
         NS_TIME_FUNCTION_MARK("appStartup->Run done");
 
+#ifdef MOZ_INSTRUMENT_EVENT_LOOP
+        if (event_tracing_running)
+          mozilla::ShutdownEventTracing();
+#endif
+
         // Check for an application initiated restart.  This is one that
         // corresponds to nsIAppStartup.quit(eRestart)
         if (rv == NS_SUCCESS_RESTART_APP)
diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in
index 30383b9e7a8b..92dd0bbbd746 100644
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -46,12 +46,17 @@ MODULE		= widget
 XPIDL_MODULE	= widget
 GRE_MODULE	= 1
 
-EXPORTS_NAMESPACES = IPC
+EXPORTS_NAMESPACES = IPC mozilla
 
 EXPORTS_IPC = \
 		nsGUIEventIPC.h \
 		$(NULL)
 
+ifdef MOZ_INSTRUMENT_EVENT_LOOP
+EXPORTS_mozilla = \
+  WidgetTraceEvent.h
+endif
+
 EXPORTS		= \
 		nsIWidget.h \
 		nsGUIEvent.h \
diff --git a/widget/public/WidgetTraceEvent.h b/widget/public/WidgetTraceEvent.h
new file mode 100644
index 000000000000..0a4d7d98b12f
--- /dev/null
+++ b/widget/public/WidgetTraceEvent.h
@@ -0,0 +1,57 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
+#define WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
+
+namespace mozilla {
+
+// Perform any required initialization in the widget backend for
+// event tracing. Return true if initialization was successful.
+bool InitWidgetTracing();
+
+// Perform any required cleanup in the widget backend for event tracing.
+void CleanUpWidgetTracing();
+
+// Fire a tracer event at the UI-thread event loop, and block until
+// the event is processed. This should only be called by
+// a thread that's not the UI thread.
+bool FireAndWaitForTracerEvent();
+
+}
+
+#endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index a8351d8f9d84..ad75f29de139 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -62,23 +62,24 @@ ifdef ACCESSIBILITY
 CSRCS += maiRedundantObjectFactory.c
 endif
 
-CPPSRCS		= \
-		nsWindow.cpp \
-		nsAppShell.cpp \
-		nsWidgetFactory.cpp \
-		nsToolkit.cpp \
-		nsBidiKeyboard.cpp \
-		nsLookAndFeel.cpp \
-		nsGtkKeyUtils.cpp \
-		nsFilePicker.cpp \
-		nsSound.cpp \
-		nsNativeKeyBindings.cpp \
-		nsScreenGtk.cpp \
-		nsScreenManagerGtk.cpp \
-		nsImageToPixbuf.cpp \
-		nsAccessibilityHelper.cpp \
-		nsGtkIMModule.cpp \
-		$(NULL)
+CPPSRCS = \
+  nsWindow.cpp \
+  nsAppShell.cpp \
+  nsWidgetFactory.cpp \
+  nsToolkit.cpp \
+  nsBidiKeyboard.cpp \
+  nsLookAndFeel.cpp \
+  nsGtkKeyUtils.cpp \
+  nsFilePicker.cpp \
+  nsSound.cpp \
+  nsNativeKeyBindings.cpp \
+  nsScreenGtk.cpp \
+  nsScreenManagerGtk.cpp \
+  nsImageToPixbuf.cpp \
+  nsAccessibilityHelper.cpp \
+  nsGtkIMModule.cpp \
+  WidgetTraceEvent.cpp \
+  $(NULL)
 
 ifdef MOZ_X11
 CPPSRCS         += nsIdleServiceGTK.cpp
diff --git a/widget/src/gtk2/WidgetTraceEvent.cpp b/widget/src/gtk2/WidgetTraceEvent.cpp
new file mode 100644
index 000000000000..9635c0d5894c
--- /dev/null
+++ b/widget/src/gtk2/WidgetTraceEvent.cpp
@@ -0,0 +1,103 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "mozilla/WidgetTraceEvent.h"
+
+#include <glib.h>
+#include <mozilla/CondVar.h>
+#include <mozilla/Mutex.h>
+#include <stdio.h>
+
+using mozilla::CondVar;
+using mozilla::Mutex;
+using mozilla::MutexAutoLock;
+
+namespace {
+
+Mutex* sMutex = NULL;
+CondVar* sCondVar = NULL;
+bool sTracerProcessed = false;
+
+// This function is called from the main (UI) thread.
+gboolean TracerCallback(gpointer data)
+{
+  MutexAutoLock lock(*sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  sTracerProcessed = true;
+  sCondVar->Notify();
+  return FALSE;
+}
+
+} // namespace
+
+namespace mozilla {
+
+bool InitWidgetTracing()
+{
+  sMutex = new Mutex("Event tracer thread mutex");
+  sCondVar = new CondVar(*sMutex, "Event tracer thread condvar");
+  return sMutex && sCondVar;
+}
+
+void CleanUpWidgetTracing()
+{
+  delete sMutex;
+  delete sCondVar;
+  sMutex = NULL;
+  sCondVar = NULL;
+}
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  NS_ABORT_IF_FALSE(sMutex && sCondVar, "Tracing not initialized!");
+
+  // Send a default-priority idle event through the
+  // event loop, and wait for it to finish.
+  MutexAutoLock lock(*sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  g_idle_add_full(G_PRIORITY_DEFAULT,
+                  TracerCallback,
+                  NULL,
+                  NULL);
+  while (!sTracerProcessed)
+    sCondVar->Wait();
+  sTracerProcessed = false;
+  return true;
+}
+
+}  // namespace mozilla

From 16c350e1b2d600f08294e789222c9efc34f6a021 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 046/509] bug 606574 - Win32 event loop instrumentation. r=jimm

--HG--
extra : rebase_source : b32e6d3b02aa866c27564cd3ad995d1e3aa0fa4c
---
 configure.in                            |   1 +
 widget/public/WidgetTraceEvent.h        |   3 +
 widget/src/windows/Makefile.in          |  53 ++++----
 widget/src/windows/WidgetTraceEvent.cpp | 158 ++++++++++++++++++++++++
 widget/src/windows/nsWindow.cpp         |   8 ++
 widget/src/windows/nsWindowDefs.h       |   2 +
 6 files changed, 199 insertions(+), 26 deletions(-)
 create mode 100644 widget/src/windows/WidgetTraceEvent.cpp

diff --git a/configure.in b/configure.in
index 910a72650869..d0bbc7cb0159 100644
--- a/configure.in
+++ b/configure.in
@@ -5023,6 +5023,7 @@ cairo-windows)
     MOZ_WIDGET_TOOLKIT=windows
     MOZ_WEBGL=1
     MOZ_PDF_PRINTING=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-gtk2|cairo-gtk2-x11)
diff --git a/widget/public/WidgetTraceEvent.h b/widget/public/WidgetTraceEvent.h
index 0a4d7d98b12f..500ee0196e6a 100644
--- a/widget/public/WidgetTraceEvent.h
+++ b/widget/public/WidgetTraceEvent.h
@@ -52,6 +52,9 @@ void CleanUpWidgetTracing();
 // a thread that's not the UI thread.
 bool FireAndWaitForTracerEvent();
 
+// Signal that the event has been received by the event loop.
+void SignalTracerThread();
+
 }
 
 #endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in
index 876fb6c165fe..ba09e342de5b 100644
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -47,32 +47,33 @@ LIBRARY_NAME	= widget_windows
 LIBXUL_LIBRARY = 1
 
 
-CPPSRCS		= \
-	nsWindow.cpp \
-	nsWindowGfx.cpp \
-	nsWindowDbg.cpp \
-	nsAppShell.cpp \
-	nsToolkit.cpp \
-	nsFilePicker.cpp \
-	nsScreenWin.cpp	\
-	nsScreenManagerWin.cpp \
-	nsLookAndFeel.cpp \
-	nsUXThemeData.cpp \
-	nsNativeThemeWin.cpp \
-	nsWinGesture.cpp \
-	nsIdleServiceWin.cpp \
-	nsSound.cpp \
-	nsIMM32Handler.cpp \
-	WindowHook.cpp \
-	WinTaskbar.cpp \
-	TaskbarPreview.cpp \
-	TaskbarTabPreview.cpp \
-	TaskbarWindowPreview.cpp \
-	TaskbarPreviewButton.cpp \
- 	JumpListBuilder.cpp \
- 	JumpListItem.cpp \
-	GfxInfo.cpp \
-	$(NULL)
+CPPSRCS = \
+  nsWindow.cpp \
+  nsWindowGfx.cpp \
+  nsWindowDbg.cpp \
+  nsAppShell.cpp \
+  nsToolkit.cpp \
+  nsFilePicker.cpp \
+  nsScreenWin.cpp  \
+  nsScreenManagerWin.cpp \
+  nsLookAndFeel.cpp \
+  nsUXThemeData.cpp \
+  nsNativeThemeWin.cpp \
+  nsWinGesture.cpp \
+  nsIdleServiceWin.cpp \
+  nsSound.cpp \
+  nsIMM32Handler.cpp \
+  WindowHook.cpp \
+  WinTaskbar.cpp \
+  TaskbarPreview.cpp \
+  TaskbarTabPreview.cpp \
+  TaskbarWindowPreview.cpp \
+  TaskbarPreviewButton.cpp \
+  JumpListBuilder.cpp \
+  JumpListItem.cpp \
+  GfxInfo.cpp \
+  WidgetTraceEvent.cpp \
+  $(NULL)
 
 ifdef MOZ_CRASHREPORTER
 CPPSRCS += LSPAnnotator.cpp
diff --git a/widget/src/windows/WidgetTraceEvent.cpp b/widget/src/windows/WidgetTraceEvent.cpp
new file mode 100644
index 000000000000..fec950812277
--- /dev/null
+++ b/widget/src/windows/WidgetTraceEvent.cpp
@@ -0,0 +1,158 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Windows widget support for event loop instrumentation.
+ * See toolkit/xre/EventTracer.cpp for more details.
+ */
+
+#include <stdio.h>
+#include <windows.h>
+
+#include "mozilla/WidgetTraceEvent.h"
+#include "nsAppShellCID.h"
+#include "nsComponentManagerUtils.h"
+#include "nsCOMPtr.h"
+#include "nsIAppShellService.h"
+#include "nsIBaseWindow.h"
+#include "nsIDocShell.h"
+#include "nsIWidget.h"
+#include "nsIXULWindow.h"
+#include "nsAutoPtr.h"
+#include "nsServiceManagerUtils.h"
+#include "nsThreadUtils.h"
+#include "nsWindowDefs.h"
+
+namespace {
+
+// Used for signaling the background thread from the main thread.
+HANDLE sEventHandle = NULL;
+
+// We need a runnable in order to find the hidden window on the main
+// thread.
+class HWNDGetter : public nsRunnable {
+public:
+  HWNDGetter() : hidden_window_hwnd(NULL) {}
+
+  HWND hidden_window_hwnd;
+
+  NS_IMETHOD Run() {
+    // Jump through some hoops to locate the hidden window.
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
+    nsCOMPtr<nsIXULWindow> hiddenWindow;
+
+    nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    nsCOMPtr<nsIDocShell> docShell;
+    rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell));
+    if (NS_FAILED(rv) || !docShell) {
+      return rv;
+    }
+
+    nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell));
+    
+    if (!baseWindow)
+      return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsIWidget> widget;
+    baseWindow->GetMainWidget(getter_AddRefs(widget));
+
+    if (!widget)
+      return NS_ERROR_FAILURE;
+
+    hidden_window_hwnd = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW);
+
+    return NS_OK;
+  }
+};
+
+HWND GetHiddenWindowHWND()
+{
+  // Need to dispatch this to the main thread because plenty of
+  // the things it wants to access are main-thread-only.
+  nsRefPtr<HWNDGetter> getter = new HWNDGetter();
+  NS_DispatchToMainThread(getter, NS_DISPATCH_SYNC);
+  return getter->hidden_window_hwnd;
+}
+
+} // namespace
+
+namespace mozilla {
+
+bool InitWidgetTracing()
+{
+  sEventHandle = CreateEvent(NULL, FALSE, FALSE, NULL);
+  return sEventHandle != NULL;
+}
+
+void CleanUpWidgetTracing()
+{
+  CloseHandle(sEventHandle);
+}
+
+// This function is called from the main (UI) thread.
+void SignalTracerThread()
+{
+  if (sEventHandle != NULL)
+    SetEvent(sEventHandle);
+}
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  NS_ABORT_IF_FALSE(sEventHandle, "Tracing not initialized!");
+
+  // First, try to find the hidden window.
+  static HWND hidden_window = NULL;
+  if (hidden_window == NULL) {
+    hidden_window = GetHiddenWindowHWND();
+  }
+
+  if (hidden_window == NULL)
+    return false;
+
+  // Post the tracer message into the hidden window's message queue,
+  // and then block until it's processed.
+  PostMessage(hidden_window, MOZ_WM_TRACE, 0, 0);
+  WaitForSingleObject(sEventHandle, INFINITE);
+  return true;
+}
+
+}  // namespace mozilla
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 2ee73beada00..e7c632ce0b70 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -118,6 +118,7 @@
 #include "prprf.h"
 #include "prmem.h"
 
+#include "mozilla/WidgetTraceEvent.h"
 #include "nsIAppShell.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIDOMNSUIEvent.h"
@@ -4599,6 +4600,13 @@ LRESULT CALLBACK nsWindow::WindowProcInternal(HWND hWnd, UINT msg, WPARAM wParam
     }
   }
 
+  if (msg == MOZ_WM_TRACE) {
+    // This is a tracer event for measuring event loop latency.
+    // See WidgetTraceEvent.cpp for more details.
+    mozilla::SignalTracerThread();
+    return 0;
+  }
+
   // Get the window which caused the event and ask it to process the message
   nsWindow *someWindow = GetNSWindowPtr(hWnd);
 
diff --git a/widget/src/windows/nsWindowDefs.h b/widget/src/windows/nsWindowDefs.h
index fb06e3a2d714..52778cf2a9f0 100644
--- a/widget/src/windows/nsWindowDefs.h
+++ b/widget/src/windows/nsWindowDefs.h
@@ -56,6 +56,8 @@
 // A magic APP message that can be sent to quit, sort of like a QUERYENDSESSION/ENDSESSION,
 // but without the query.
 #define MOZ_WM_APP_QUIT                   (WM_APP+0x0300)
+// Used as a "tracer" event to probe event loop latency.
+#define MOZ_WM_TRACE                      (WM_APP+0x0301)
 
 // GetWindowsVersion constants
 #define WIN2K_VERSION                     0x500

From ada7d05879b1f077abb82416df314004adb40698 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 3 Mar 2011 11:20:02 -0500
Subject: [PATCH 047/509] bug 606574 - Cocoa event loop instrumentation.
 r=smichaud,cjones

--HG--
extra : rebase_source : 5970911521b53d504b3c51588f2f112a2da5efe1
---
 configure.in                          |   1 +
 toolkit/xre/MacApplicationDelegate.mm |   6 +-
 widget/src/cocoa/CustomCocoaEvents.h  |  51 ++++++++++++
 widget/src/cocoa/Makefile.in          |  69 ++++++++--------
 widget/src/cocoa/WidgetTraceEvent.mm  | 110 ++++++++++++++++++++++++++
 widget/src/cocoa/nsAppShell.mm        |  29 ++++++-
 6 files changed, 227 insertions(+), 39 deletions(-)
 create mode 100644 widget/src/cocoa/CustomCocoaEvents.h
 create mode 100644 widget/src/cocoa/WidgetTraceEvent.mm

diff --git a/configure.in b/configure.in
index d0bbc7cb0159..56ca63dcaa3d 100644
--- a/configure.in
+++ b/configure.in
@@ -5101,6 +5101,7 @@ cairo-cocoa)
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     MOZ_FS_LAYOUT=bundle
     MOZ_WEBGL=1
+    MOZ_INSTRUMENT_EVENT_LOOP=1
     ;;
 
 cairo-android)
diff --git a/toolkit/xre/MacApplicationDelegate.mm b/toolkit/xre/MacApplicationDelegate.mm
index ea495d89f00c..1c431d7fe053 100644
--- a/toolkit/xre/MacApplicationDelegate.mm
+++ b/toolkit/xre/MacApplicationDelegate.mm
@@ -88,6 +88,8 @@ private:
 
 static PRBool sProcessedGetURLEvent = PR_FALSE;
 
+@class GeckoNSApplication;
+
 // Methods that can be called from non-Objective-C code.
 
 // This is needed, on relaunch, to force the OS to use the "Cocoa Dock API"
@@ -97,7 +99,7 @@ EnsureUseCocoaDockAPI()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  [NSApplication sharedApplication];
+  [GeckoNSApplication sharedApplication];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -112,7 +114,7 @@ SetupMacApplicationDelegate()
   AutoAutoreleasePool pool;
 
   // Ensure that ProcessPendingGetURLAppleEvents() doesn't regress bug 377166.
-  [NSApplication sharedApplication];
+  [GeckoNSApplication sharedApplication];
 
   // This call makes it so that application:openFile: doesn't get bogus calls
   // from Cocoa doing its own parsing of the argument string. And yes, we need
diff --git a/widget/src/cocoa/CustomCocoaEvents.h b/widget/src/cocoa/CustomCocoaEvents.h
new file mode 100644
index 000000000000..f4ccf779f84a
--- /dev/null
+++ b/widget/src/cocoa/CustomCocoaEvents.h
@@ -0,0 +1,51 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file defines constants to be used in the "subtype" field of
+ * NSApplicationDefined type NSEvents.
+ */
+
+#ifndef WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
+#define WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
+
+// Empty event, just used for prodding the event loop into responding.
+const short kEventSubtypeNone = 0;
+// Tracer event, used for timing the event loop responsiveness.
+const short kEventSubtypeTrace = 1;
+
+#endif /* WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_ */
diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index d7965d21dfde..e5806ee0564a 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -60,40 +60,41 @@ EXPORTS = \
 		$(NULL)
 
 CMMSRCS = \
-		nsBidiKeyboard.mm \
-		nsClipboard.mm \
-		nsMenuX.mm \
-		nsMenuBarX.mm \
-		nsMenuItemX.mm \
-		nsMenuItemIconX.mm \
-		nsMenuUtilsX.mm \
-		nsMenuGroupOwnerX.mm \
-		nsFilePicker.mm \
-		nsDragService.mm \
-		nsToolkit.mm \
-		nsAppShell.mm \
-		nsCocoaUtils.mm \
-		nsCocoaWindow.mm \
-		nsChildView.mm \
-		nsWindowMap.mm \
-		nsWidgetFactory.mm \
-		nsCursorManager.mm \
-		nsMacCursor.mm \
-		nsScreenCocoa.mm \
-		nsScreenManagerCocoa.mm \
-		nsSound.mm \
-		nsLookAndFeel.mm \
-		nsNativeThemeCocoa.mm \
-		nsDeviceContextSpecX.mm \
-		nsPrintDialogX.mm \
-		nsPrintOptionsX.mm \
-		nsPrintSettingsX.mm \
-		nsIdleServiceX.mm \
-		nsCocoaTextInputHandler.mm \
-		nsMacDockSupport.mm \
-		nsStandaloneNativeMenu.mm \
-		GfxInfo.mm \
-		$(NULL)
+  nsBidiKeyboard.mm \
+  nsClipboard.mm \
+  nsMenuX.mm \
+  nsMenuBarX.mm \
+  nsMenuItemX.mm \
+  nsMenuItemIconX.mm \
+  nsMenuUtilsX.mm \
+  nsMenuGroupOwnerX.mm \
+  nsFilePicker.mm \
+  nsDragService.mm \
+  nsToolkit.mm \
+  nsAppShell.mm \
+  nsCocoaUtils.mm \
+  nsCocoaWindow.mm \
+  nsChildView.mm \
+  nsWindowMap.mm \
+  nsWidgetFactory.mm \
+  nsCursorManager.mm \
+  nsMacCursor.mm \
+  nsScreenCocoa.mm \
+  nsScreenManagerCocoa.mm \
+  nsSound.mm \
+  nsLookAndFeel.mm \
+  nsNativeThemeCocoa.mm \
+  nsDeviceContextSpecX.mm \
+  nsPrintDialogX.mm \
+  nsPrintOptionsX.mm \
+  nsPrintSettingsX.mm \
+  nsIdleServiceX.mm \
+  nsCocoaTextInputHandler.mm \
+  nsMacDockSupport.mm \
+  nsStandaloneNativeMenu.mm \
+  GfxInfo.mm \
+  WidgetTraceEvent.mm \
+  $(NULL)
 
 ifeq (x86_64,$(TARGET_CPU))
 CMMSRCS += ComplexTextInputPanel.mm
diff --git a/widget/src/cocoa/WidgetTraceEvent.mm b/widget/src/cocoa/WidgetTraceEvent.mm
new file mode 100644
index 000000000000..1777e96e0c54
--- /dev/null
+++ b/widget/src/cocoa/WidgetTraceEvent.mm
@@ -0,0 +1,110 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <Cocoa/Cocoa.h>
+#include "CustomCocoaEvents.h"
+#include <Foundation/NSAutoreleasePool.h>
+#include <mozilla/CondVar.h>
+#include <mozilla/Mutex.h>
+#include "mozilla/WidgetTraceEvent.h"
+
+using mozilla::CondVar;
+using mozilla::Mutex;
+using mozilla::MutexAutoLock;
+
+namespace {
+
+Mutex* sMutex = NULL;
+CondVar* sCondVar = NULL;
+bool sTracerProcessed = false;
+
+}
+
+namespace mozilla {
+
+bool InitWidgetTracing()
+{
+  sMutex = new Mutex("Event tracer thread mutex");
+  sCondVar = new CondVar(*sMutex, "Event tracer thread condvar");
+  return sMutex && sCondVar;
+}
+
+void CleanUpWidgetTracing()
+{
+  delete sMutex;
+  delete sCondVar;
+  sMutex = NULL;
+  sCondVar = NULL;
+}
+
+// This function is called from the main (UI) thread.
+void SignalTracerThread()
+{
+  MutexAutoLock lock(*sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+  sTracerProcessed = true;
+  sCondVar->Notify();
+}
+
+// This function is called from the background tracer thread.
+bool FireAndWaitForTracerEvent()
+{
+  NS_ABORT_IF_FALSE(sMutex && sCondVar, "Tracing not initialized!");
+  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+  MutexAutoLock lock(*sMutex);
+  NS_ABORT_IF_FALSE(!sTracerProcessed, "Tracer synchronization state is wrong");
+
+  // Post an application-defined event to the main thread's event queue
+  // and wait for it to get processed.
+  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+                                      location:NSMakePoint(0,0)
+                                 modifierFlags:0
+                                     timestamp:0
+                                  windowNumber:0
+                                       context:NULL
+                                       subtype:kEventSubtypeTrace
+                                         data1:0
+                                         data2:0]
+             atStart:NO];
+  while (!sTracerProcessed)
+    sCondVar->Wait();
+  sTracerProcessed = false;
+  [pool release];
+  return true;
+}
+
+}  // namespace mozilla
diff --git a/widget/src/cocoa/nsAppShell.mm b/widget/src/cocoa/nsAppShell.mm
index 0491a8bef31f..f128e5acdd02 100644
--- a/widget/src/cocoa/nsAppShell.mm
+++ b/widget/src/cocoa/nsAppShell.mm
@@ -43,6 +43,8 @@
 #import <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 
+#include "CustomCocoaEvents.h"
+#include "mozilla/WidgetTraceEvent.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
@@ -169,6 +171,27 @@ PRBool nsCocoaAppModalWindowList::GeckoModalAboveCocoaModal()
   return (topItem.mWidget != nsnull);
 }
 
+// GeckoNSApplication
+//
+// Subclass of NSApplication for filtering out certain events.
+@interface GeckoNSApplication : NSApplication
+{
+}
+@end
+
+@implementation GeckoNSApplication
+- (void)sendEvent:(NSEvent *)anEvent
+{
+  if ([anEvent type] == NSApplicationDefined &&
+      [anEvent subtype] == kEventSubtypeTrace) {
+    mozilla::SignalTracerThread();
+    return;
+  }
+  [super sendEvent:anEvent];
+}
+@end
+
+
 // AppShellDelegate
 //
 // Cocoa bridge class.  An object of this class is registered to receive
@@ -286,7 +309,7 @@ nsAppShell::Init()
   [NSBundle loadNibFile:
                      [NSString stringWithUTF8String:(const char*)nibPath.get()]
       externalNameTable:
-           [NSDictionary dictionaryWithObject:[NSApplication sharedApplication]
+           [NSDictionary dictionaryWithObject:[GeckoNSApplication sharedApplication]
                                        forKey:@"NSOwner"]
                withZone:NSDefaultMallocZone()];
 
@@ -388,7 +411,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                        timestamp:0
                                     windowNumber:0
                                          context:NULL
-                                         subtype:0
+                                         subtype:kEventSubtypeNone
                                            data1:0
                                            data2:0]
              atStart:NO];
@@ -410,7 +433,7 @@ nsAppShell::ProcessGeckoEvents(void* aInfo)
                                      timestamp:0
                                   windowNumber:0
                                        context:NULL
-                                       subtype:0
+                                       subtype:kEventSubtypeNone
                                          data1:0
                                          data2:0]
            atStart:NO];

From 715481c517859d3fbdcff8261f78c83f76158d66 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 11 Apr 2011 13:41:00 +0000
Subject: [PATCH 048/509] Bug 647820 - Don't use -mno-cygwin on mingw
 compilation (m-c part) r=ted.mielczarek

---
 configure.in                        | 8 ++++----
 js/src/configure.in                 | 8 ++++----
 netwerk/streamconv/test/Makefile.in | 4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 203d6e280ad4..b0e95c1fbd49 100644
--- a/configure.in
+++ b/configure.in
@@ -1932,7 +1932,7 @@ case "$host" in
         HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)"
         HOST_RANLIB='echo ranlib'
     else
-        HOST_CFLAGS="$HOST_CFLAGS -mno-cygwin"
+        HOST_CFLAGS="$HOST_CFLAGS -mwindows"
     fi
     HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11 -D_CRT_SECURE_NO_WARNINGS"
     HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
@@ -2392,9 +2392,9 @@ ia64*-hpux*)
     # #include <string> vs -I./dist/include/string issue so don't use it
     SYSTEM_MAKEDEPEND=
     if test -n "$GNU_CC"; then
-        CC="$CC -mno-cygwin"
-        CXX="$CXX -mno-cygwin"
-        CPP="$CPP -mno-cygwin"
+        CC="$CC -mwindows"
+        CXX="$CXX -mwindows"
+        CPP="$CPP -mwindows"
         CFLAGS="$CFLAGS -mms-bitfields"
         CXXFLAGS="$CXXFLAGS -mms-bitfields"
         DSO_LDOPTS='-shared'
diff --git a/js/src/configure.in b/js/src/configure.in
index b35e61eac5d1..05d02cefbaab 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1823,7 +1823,7 @@ case "$host" in
         HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)"
         HOST_RANLIB='echo ranlib'
     else
-        HOST_CFLAGS="$HOST_CFLAGS -mno-cygwin"
+        HOST_CFLAGS="$HOST_CFLAGS -mwindows"
     fi
     HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11 -D_CRT_SECURE_NO_WARNINGS"
     HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
@@ -2294,9 +2294,9 @@ ia64*-hpux*)
     # #include <string> vs -I./dist/include/string issue so don't use it
     SYSTEM_MAKEDEPEND=
     if test -n "$GNU_CC"; then
-        CC="$CC -mno-cygwin"
-        CXX="$CXX -mno-cygwin"
-        CPP="$CPP -mno-cygwin"
+        CC="$CC -mwindows"
+        CXX="$CXX -mwindows"
+        CPP="$CPP -mwindows"
         CFLAGS="$CFLAGS -mms-bitfields"
         CXXFLAGS="$CXXFLAGS -mms-bitfields"
         DSO_LDOPTS='-shared'
diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in
index 7d57878f4174..b61f39ef85e5 100644
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -60,7 +60,11 @@ LIBS		= \
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CXX
+LDFLAGS		+= -mconsole
+else
 LDFLAGS		+= -SUBSYSTEM:CONSOLE
+endif
 ifdef MOZ_NO_DEBUG_RTL
 DEFINES		+= -MOZ_NO_DEBUG_RTL
 endif

From 6c5524ea80d4a2f0018d2c141a6847aad605858d Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Tue, 19 Apr 2011 14:11:40 +1000
Subject: [PATCH 049/509] Bug 648866 - Remove WinCE code from main build system
 + that of js/src/. r=ted

---
 Makefile.in                               |  20 -
 allmakefiles.sh                           |  11 -
 build/Makefile.in                         |  18 +-
 build/binary-location.mk                  |   2 +-
 build/package/wince/make_wince_cab.py     | 456 ----------------------
 build/wince/shunt/Makefile.in             | 103 -----
 build/wince/shunt/environment.cpp         | 336 ----------------
 build/wince/shunt/include/direct.h        |   0
 build/wince/shunt/include/environment.h   |  63 ---
 build/wince/shunt/include/errno.h         |  38 --
 build/wince/shunt/include/fcntl.h         |   0
 build/wince/shunt/include/io.h            |   0
 build/wince/shunt/include/mbstring.h      |   0
 build/wince/shunt/include/mozce_shunt.h   | 240 ------------
 build/wince/shunt/include/process.h       |   3 -
 build/wince/shunt/include/signal.h        |   0
 build/wince/shunt/include/stdlib.h.in     |  88 -----
 build/wince/shunt/include/sys/Makefile.in |  49 ---
 build/wince/shunt/include/sys/stat.h      |   0
 build/wince/shunt/include/sys/types.h     |   0
 build/wince/shunt/include/windows.h.in    |  50 ---
 build/wince/shunt/include/ymath.h.in      |  52 ---
 build/wince/shunt/memory.cpp              |  76 ----
 build/wince/shunt/mozce_shunt.def.in      |  54 ---
 build/wince/shunt/shunt.cpp               | 271 -------------
 build/wince/shunt/time.cpp                | 229 -----------
 build/wince/shunt/time_conversions.h      | 156 --------
 build/wince/tools/Makefile                | 145 -------
 build/wince/tools/Makefile.in             |  62 ---
 build/wince/tools/arm-wince-as.c          |  17 -
 build/wince/tools/arm-wince-gcc.c         |  93 -----
 build/wince/tools/arm-wince-lib.c         |  16 -
 build/wince/tools/arm-wince-link.c        |  26 --
 build/wince/tools/arm-wince-res.c         |  21 -
 build/wince/tools/linkargs.c              |  56 ---
 build/wince/tools/linkargs.h              |   7 -
 build/wince/tools/toolspath.c             | 252 ------------
 build/wince/tools/toolspath.h             |  39 --
 config/autoconf.mk.in                     |   8 +-
 config/config.mk                          |  10 +-
 config/rules.mk                           |  42 +-
 configure.in                              | 255 ++----------
 js/src/config/autoconf.mk.in              |   7 +-
 js/src/config/config.mk                   |  10 +-
 js/src/config/rules.mk                    |  42 +-
 js/src/configure.in                       | 177 +--------
 46 files changed, 70 insertions(+), 3530 deletions(-)
 delete mode 100644 build/package/wince/make_wince_cab.py
 delete mode 100644 build/wince/shunt/Makefile.in
 delete mode 100644 build/wince/shunt/environment.cpp
 delete mode 100644 build/wince/shunt/include/direct.h
 delete mode 100644 build/wince/shunt/include/environment.h
 delete mode 100644 build/wince/shunt/include/errno.h
 delete mode 100644 build/wince/shunt/include/fcntl.h
 delete mode 100644 build/wince/shunt/include/io.h
 delete mode 100644 build/wince/shunt/include/mbstring.h
 delete mode 100644 build/wince/shunt/include/mozce_shunt.h
 delete mode 100644 build/wince/shunt/include/process.h
 delete mode 100644 build/wince/shunt/include/signal.h
 delete mode 100644 build/wince/shunt/include/stdlib.h.in
 delete mode 100644 build/wince/shunt/include/sys/Makefile.in
 delete mode 100644 build/wince/shunt/include/sys/stat.h
 delete mode 100644 build/wince/shunt/include/sys/types.h
 delete mode 100644 build/wince/shunt/include/windows.h.in
 delete mode 100644 build/wince/shunt/include/ymath.h.in
 delete mode 100644 build/wince/shunt/memory.cpp
 delete mode 100644 build/wince/shunt/mozce_shunt.def.in
 delete mode 100644 build/wince/shunt/shunt.cpp
 delete mode 100644 build/wince/shunt/time.cpp
 delete mode 100644 build/wince/shunt/time_conversions.h
 delete mode 100644 build/wince/tools/Makefile
 delete mode 100644 build/wince/tools/Makefile.in
 delete mode 100644 build/wince/tools/arm-wince-as.c
 delete mode 100644 build/wince/tools/arm-wince-gcc.c
 delete mode 100644 build/wince/tools/arm-wince-lib.c
 delete mode 100644 build/wince/tools/arm-wince-link.c
 delete mode 100644 build/wince/tools/arm-wince-res.c
 delete mode 100644 build/wince/tools/linkargs.c
 delete mode 100644 build/wince/tools/linkargs.h
 delete mode 100644 build/wince/tools/toolspath.c
 delete mode 100644 build/wince/tools/toolspath.h

diff --git a/Makefile.in b/Makefile.in
index f39835a029d7..f5fe8ec2bde6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,11 +88,6 @@ DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
-ifdef WINCE
-check::
-	$(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin
-endif
-
 default alldep all:: $(topsrcdir)/configure config.status
 	$(RM) -r $(DIST)/sdk
 	$(RM) -r $(DIST)/include
@@ -195,21 +190,6 @@ endif
 	  mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)
 	cd $(DIST)/crashreporter-symbols && \
           zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt"
-else
-ifdef WINCE
-ifdef SYMBOLSTORE_PATH
-	echo building symbol store with symstore.exe
-	$(RM) -r $(DIST)/symbols
-	$(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
-	$(NSINSTALL) -D $(DIST)/symbols
-	$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \
-	  -s $(DIST)/symbols/ -t "$(MOZ_PKG_APPNAME)" -v "$(MOZ_PKG_VERSION)"
-	echo packing symbols
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	cd $(DIST)/symbols && \
-	  zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" .
-endif # SYMBOLSTORE_PATH
-endif # WINCE
 endif # MOZ_CRASHREPORTER
 
 uploadsymbols:
diff --git a/allmakefiles.sh b/allmakefiles.sh
index abea7e3e134b..d290895f34eb 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -75,17 +75,6 @@ probes/Makefile
 extensions/Makefile
 "
 
-if [ "$WINCE" ]; then
-  add_makefiles "
-    build/wince/tools/Makefile
-    build/wince/shunt/Makefile
-    build/wince/shunt/include/windows.h
-    build/wince/shunt/include/ymath.h
-    build/wince/shunt/include/stdlib.h
-    build/wince/shunt/include/sys/Makefile
-  "
-fi
-
 if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" = "" ]; then
   add_makefiles "
     memory/jemalloc/Makefile
diff --git a/build/Makefile.in b/build/Makefile.in
index dc9a2a45f7b5..8ace44be7b8b 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = build
 
-ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
+ifeq (,$(filter WINNT OS2,$(OS_ARCH)))
 DIRS		= unix
 endif
 
@@ -53,22 +53,6 @@ ifeq (WINNT,$(OS_ARCH))
 DIRS = win32
 endif
 
-ifdef WINCE
-# We need jemalloc built before the shunt
-ifdef MOZ_MEMORY
-DIRS += wince/tools \
-	$(DEPTH)/memory/jemalloc \
-	wince/shunt \
-	$(DEPTH)/memory/mozalloc \
-	$(NULL)
-else
-DIRS += wince/tools \
-	wince/shunt \
-	$(DEPTH)/memory/mozalloc \
-	$(NULL)
-endif
-endif
-
 DIRS += pgo
 
 ifeq (Android,$(OS_TARGET))
diff --git a/build/binary-location.mk b/build/binary-location.mk
index 5006fdea0dba..81e46f3d7bd1 100644
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -37,7 +37,7 @@
 
 # finds the location of the browser and puts it in the variable $(browser_path)
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
diff --git a/build/package/wince/make_wince_cab.py b/build/package/wince/make_wince_cab.py
deleted file mode 100644
index 91a784985ae9..000000000000
--- a/build/package/wince/make_wince_cab.py
+++ /dev/null
@@ -1,456 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla build system.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  John Wolfe <wolfe@lobo.us>
-#  Vladimir Vukicevic <vladimir@pobox.com>
-#  Alex Pakhotin <alexp@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-################################################################
-#
-# make_wince_cab.py --- Given a directory, walk it and make an
-#          installer based upon the contents of that directory
-#
-# Usage:
-#   python make_wince_cab.py [-setupdll] [-s] [-faststart] [CABWIZ_PATH] SOURCE_DIR PROGRAM_NAME CAB_FINAL_NAME
-#
-# Walk through the relative directory SOURCE_DIR, parsing filenames
-#   Checks for duplicate filenames and renames where needed
-#   Then builds a WinMobile INF file based upon results
-# 
-# Each directory in SOURCE_DIR may have a file named
-# 'install-exceptions', which lists files in SOURCE_DIR that
-# need not be placed into an installation CAB file. The
-# 'install-exceptions' file itself is always ignored.
-# 
-# Blank lines and '#' comments in the 'install-exceptions' file are
-# ignored.
-#
-# ARGS:
-#   -setupdll - Make a small additional CAB including Setup.dll.
-#               This is to add Fennec to the system list of installed applications
-#               available in Settings - System - Remove Programs.
-#
-#   -s - Don't pass /compress to cabwiz (generate CAB compatible with Windows CE)
-#
-#   -faststart - Add FastStart shortcut
-#
-#   CABWIZ_PATH - If specified, will use this cabwiz.exe executable.  Otherwise, will attempt
-#                 to find one using $VSINSTALLDIR.
-#
-#   SOURCE_DIR - sub-directory which contains the target program 
-#                NOTE: It is assumed that the application name is SOURCE_DIR.exe
-#                EXAMPLE: source_dir=fennec, there should be a fennec/fennec.exe application
-#
-#   PROGRAM_NAME - Name of the program to place inside the INF file
-#
-#   CAB_FINAL_NAME - actual final name for the produced CAB file
-#
-# EXAMPLE OF COMMAND LINE:
-#   python make_wince_cab.py /c/Program\ Files/Microsoft\ Visual\ Studio\ 9.0/SmartDevices/SDK/SDKTools/cabwiz.exe dist/fennec Fennec fennec-0.11.en-US.wince-arm.cab
-#
-# NOTE: In our example, "fennec" is the directory [source_name]
-#                       "fennec.exe" is the application [$(source_name).exe], and
-#                       "Fennec" is the shortcut name [program_name]
-################################################################
-
-import sys
-import os
-from os.path import join
-from subprocess import call, STDOUT
-import fnmatch
-import string
-import shutil
-
-CompressFlag = "/compress"
-FaststartFlag = 0
-MakeSetupDllCab = 0
-
-class FileEntry:
-    def __init__(self, dirpath, dircount, filename, filecount, actual_filename):
-        self.dirpath = dirpath
-        self.dircount = dircount
-        self.filename = filename
-        self.filecount = filecount
-        self.actual_filename = actual_filename
-
-
-class DirEntry:
-    def __init__(self, dirpath, dircount, filecount):
-        self.dirpath = dirpath
-        self.dircount = dircount
-        self.filecount = filecount
-
-# Ignore detritus left lying around by editing tools.
-ignored_patterns = ['*~', '.#*', '#*#', '*.orig', '*.rej']
-
-file_entry_count = 0
-file_entries = []
-
-fcount = 0
-fnames = {}
-
-directories = {}
-files_in_directory = []
-
-# Return the contents of FILENAME, a 'install-exceptions' file, as
-# a dictionary whose keys are exactly the list of filenames, along
-# with the basename of FILENAME itself.  If FILENAME does not exist,
-# return the empty dictionary.
-def read_exceptions(filename):
-    exceptions = set()
-    if os.path.exists(filename):
-        f = file(filename)
-        for line in f:
-            line = line.strip()
-            if line and line[0] != '#':
-                exceptions.add(line)
-        exceptions.add( os.path.basename(filename) )
-        f.close()
-    return exceptions
-
-
-# Sorts two items based first upon directory count (index of
-# directory in list of directories), then upon filename.  A way of
-# getting a list sorted into directories, and then alphabetically by
-# filename within each directory. 
-def sort_dircount_then_filename(item1, item2):
-    # First Compare dirpaths
-    if item1.dircount != item2.dircount:
-        return cmp(item1.dircount, item2.dircount)
-
-    # Next compare filenames
-    next_result = cmp(item1.filename, item2.filename)
-    if next_result != 0:
-        return next_result
-
-    # Lastly, compare filecounts
-    return cmp(item1.filecount, item2.filecount)
-
-    
-def handle_duplicate_filename(dirpath, filename, filecount):
-    if filecount == 1:
-        return filename
-    file_parts = os.path.splitext(filename)
-    new_filename = "%s_%d%s" % (file_parts[0], filecount, file_parts[1])
-    old_relative_filename = join(dirpath, filename)
-    new_relative_filename = join(dirpath, new_filename)
-    shutil.copyfile(old_relative_filename, new_relative_filename)
-    return new_filename
-
-def add_new_entry(dirpath, dircount, filename, filecount):
-    global file_entries
-    global file_entry_count
-    actual_filename = handle_duplicate_filename(dirpath, filename, filecount)
-    file_entries.append( FileEntry(dirpath, dircount, filename, filecount, actual_filename) )
-    file_entry_count += 1
-
-
-def walk_tree(start_dir, ignore):
-    global fcount
-    global fnames
-    global directories
-    global files_in_directory
-    
-    dircount = 0;
-    files_in_directory = [0]
-
-    for (dirpath, dirnames, filenames) in os.walk(start_dir):
-        exceptions = read_exceptions(join(dirpath, 'install-exceptions'))
-
-        dircount += 1
-        directories[dirpath] = DirEntry(dirpath, dircount, len(filenames))
-
-        if len(filenames) < 1:
-            print "WARNING: No files in directory [%s]" % dirpath
-
-        for filename in filenames:
-            if len(exceptions) > 0 and filename in exceptions:
-                continue
-            if any(fnmatch.fnmatch(filename, p) for p in ignore):
-                continue
-            filecount = 1
-            if filename in fnames:
-                filecount = fnames[filename] + 1
-            fnames[filename] = filecount
-
-            add_new_entry(dirpath, dircount, filename, filecount)
-
-
-def output_inf_file_header(f, program_name):
-    f.write("""; Duplicated Filenames ==> One of the two files
-;   needs renaming before packaging up the CAB
-;
-; Technique: Rename the second directory's file to XXXX_1 prior to starting the CABWIZ,
-;   then take care of the name in the File.xxxxx section
-
-[Version]
-Signature   = "$Windows NT$"        ; required as-is
-Provider    = "Mozilla"             ; maximum of 30 characters, full app name will be \"<Provider> <AppName>\"
-CESignature = "$Windows CE$"        ; required as-is
-
-[CEStrings]
-AppName     = "%s"              ; maximum of 40 characters, full app name will be \"<Provider> <AppName>\"\n""" % program_name)
-
-    f.write("InstallDir  = %CE1%\\%AppName%       ; Program Files\Fennec\n\n")
-
-
-def output_sourcedisksnames_section(f, dirs):
-    f.write("[SourceDisksNames]                  ; directory that holds the application's files\n")
-    for dir in dirs:
-        f.write("""%d = , "%s",,%s\n""" % (directories[dir].dircount, dir, dir))
-    f.write(" \n")
-
-
-def output_sourcedisksfiles_section(f):
-    f.write("[SourceDisksFiles]                  ; list of files to be included in .cab\n")
-    for entry in sorted(file_entries, sort_dircount_then_filename):
-        f.write("%s=%d\n" % (entry.actual_filename, entry.dircount))
-    f.write("\n")
-
-
-def output_defaultinstall_section(f, dirs):
-    copyfileslist = ""
-    copyfilesrawlist=[]
-    for dir in dirs:
-        if directories[dir].filecount < 1:
-            continue
-        copyfilesrawlist.append( "Files.%s" % '.'.join( dir.split('\\') ) )
-        prefix = ", "
-    copyfileslist = ','.join(copyfilesrawlist)
-
-    f.write("""[DefaultInstall]                    ; operations to be completed during install
-CopyFiles   = %s
-AddReg      = RegData
-CEShortcuts = Shortcuts
-\n""" % copyfileslist)
-
-
-def output_destinationdirs_section(f, dirs):
-    f.write("[DestinationDirs]                   ; default destination directories for each operation section\n")
-    for dir in dirs:
-        dir_split = dir.split('\\')
-        mod_dir_string = '.'.join(dir_split)
-        if len(dir_split) > 1:
-            dir_minus_top_level = '\\'.join(dir_split[1:])
-        else:
-            dir_minus_top_level = ""
-        if dir_minus_top_level:
-            dir_minus_top_level = "\\%s" % dir_minus_top_level
-        if directories[dir].filecount < 1:
-            f.write(";Files.%s = 0, %%InstallDir%%%s          ; NO FILES IN THIS DIRECTORY\n" % (mod_dir_string, dir_minus_top_level))
-        else:
-            f.write("Files.%s = 0, %%InstallDir%%%s\n" % (mod_dir_string, dir_minus_top_level))
-    f.write("Shortcuts   = 0, %CE11%             ; \Windows\Start Menu\Programs\n\n")
-
-
-def output_directory_sections(f, dirs):
-    for dir in dirs:
-        if directories[dir].filecount < 1:
-            f.write(";[Files.%s]\n;===NO FILES===\n" % '.'.join( dir.split('\\') ))
-        else:
-            f.write("[Files.%s]\n" % '.'.join( dir.split('\\') ))
-            for entry in file_entries:
-                if entry.dirpath == dir:
-                    f.write("\"%s\",%s\n" % (entry.filename, entry.actual_filename))
-        f.write("\n")
-
-
-def output_registry_section(f):
-    f.write("""[RegData]                           ; registry key list
-HKCU,Software\%AppName%,MajorVersion,0x00010001,1
-HKCU,Software\%AppName%,MinorVersion,0x00010001,0
-\n""")
-
-
-def output_shortcuts_section(f, app_name):
-    f.write("[Shortcuts]\n")
-    f.write("%%AppName%%,0,%s,%%CE11%%\n" % app_name)
-    if FaststartFlag:
-        f.write("%%AppName%%faststart,0,%sfaststart.exe,%%CE4%%\n" % os.path.splitext(app_name)[0]);
-
-
-def output_inf_file(program_name, app_name):
-    global files_in_directory
-    inf_name = "%s.inf" % program_name
-    f = open(inf_name, 'w')
-    output_inf_file_header(f, program_name)
-    dirs = sorted(directories)
-    output_sourcedisksnames_section(f, dirs)
-    output_sourcedisksfiles_section(f)
-    output_defaultinstall_section(f, dirs)
-    output_destinationdirs_section(f, dirs)
-    output_directory_sections(f, dirs)
-    output_registry_section(f)
-    output_shortcuts_section(f, app_name)
-    f.close()
-
-
-
-def output_setup_dll_inf_file(source_dir, program_name, app_name):
-    inf_name = "%s.inf" % program_name
-    f = open(inf_name, 'w')
-
-    f.write("""; Additional CAB to create Fennec entry in the installed programs list
-
-[Version]
-Signature   = "$Windows NT$"        ; required as-is
-Provider    = "Mozilla"             ; maximum of 30 characters, full app name will be \"<Provider> <AppName>\"
-CESignature = "$Windows CE$"        ; required as-is
-
-[CEStrings]
-AppName     = "%s"              ; maximum of 40 characters, full app name will be \"<Provider> <AppName>\"\n""" % program_name)
-
-    f.write("InstallDir  = %CE1%\\%AppName%       ; Program Files\Fennec\n\n")
-
-    f.write("[SourceDisksNames]                  ; directory that holds the application's files\n")
-    f.write('1 = , "%s",,%s\n\n' % (source_dir, source_dir))
-
-    f.write("[SourceDisksFiles]                  ; list of files to be included in .cab\n")
-    f.write("Setup.dll = 1\n\n")
-
-    f.write("""[DefaultInstall]                    ; operations to be completed during install
-CopyFiles   = Files.%s
-AddReg      = RegData
-CESetupDLL  = "Setup.dll"
-\n""" % program_name)
-
-    f.write("[DestinationDirs]                   ; default destination directories for each operation section\n")
-    f.write("Files.%s = 0, %%InstallDir%%\n\n" % program_name)
-
-    f.write("""[Files.%s]
-;No files to copy
-
-[RegData]
-;No registry entries
-""" % program_name)
-
-    f.close()
-
-
-def make_cab_file(cabwiz_path, program_name, cab_final_name):
-    make_cab_command = "\"%s\" %s %s.inf" % (cabwiz_path, CompressFlag, program_name)
-    print "INFORMATION: Executing command to make %s CAB file (only works on BASH)" % program_name
-    print "    [%s]" % make_cab_command
-    sys.stdout.flush()
-
-    success = call([cabwiz_path, "%s.inf" % program_name, CompressFlag],
-                   stdout=open("NUL:","w"), stderr=STDOUT)
-
-    if not os.path.isfile("%s.CAB" % program_name):
-        print """***************************************************************************
-ERROR: CAB FILE NOT CREATED.
-       You can try running the command by hand:
-       %s
- ---- 
- NOTE: If you see an error like this:
-       Error: File XXXXXXXXXX.inf contains DirIDs, which are not supported
- -- 
- this may mean that your PYTHON is outputting Windows files WITHOUT CR-LF
- line endings.  Please verify that your INF file has CR-LF line endings.
-***************************************************************************""" % make_cab_command
-        sys.exit(2)
-
-    print "INFORMATION: Executing command to move %s.CAB to %s" % (program_name, cab_final_name)
-    sys.stdout.flush()
-    shutil.move("%s.CAB" % program_name, cab_final_name)
-
-
-def purge_copied_files():
-    for entry in file_entries:
-        if entry.filename != entry.actual_filename:
-            new_relative_filename = join(entry.dirpath, entry.actual_filename)
-            os.remove(new_relative_filename)
-
-
-def main():
-    args = sys.argv
-    if len(args) < 4 or len(args) > 7:
-        print >> sys.stderr, "Usage: %s [-setupdll] [-s] [-faststart] [CABWIZ_PATH] SOURCE_DIR PROGRAM_NAME CAB_FINAL_NAME" % args[0]
-        print >> sys.stderr, "Example: %s /c/Program\ Files/Microsoft\ Visual\ Studio\ 9.0/ fennec Fennec fennec-0.11.en-US.wince-arm.cab" % args[0]
-        sys.exit(1)
-
-    args = args[1:]
-
-    if args[0] == "-setupdll":
-        global MakeSetupDllCab
-        MakeSetupDllCab = 1
-        args = args[1:]
-
-    if args[0] == "-s":
-        global CompressFlag
-        CompressFlag = ""
-        args = args[1:]
-
-    if args[0] == "-faststart":
-        global FaststartFlag
-        FaststartFlag = 1
-        args = args[1:]
-
-    cabwiz_path = None
-    if len(args) == 4:
-        cabwiz_path = args[0]
-        args = args[1:]
-    else:
-        if "VSINSTALLDIR" in os.environ:
-            cabwiz_path = os.path.join(os.environ["VSINSTALLDIR"], "SmartDevices", "SDK", "SDKTools", "cabwiz.exe")
-
-    source_dir = args[0]
-    program_name = args[1]
-    app_name = "%s.exe" % source_dir
-    cab_final_name = args[2]
-
-    if cabwiz_path is None or not os.path.isfile(cabwiz_path):
-        print """***************************************************************************
-ERROR: CABWIZ_PATH is not a valid file, or cabwiz couldn't be found!
-       EXITING...
-***************************************************************************"""
-        sys.exit(2)
-
-    if MakeSetupDllCab:
-        output_setup_dll_inf_file(source_dir, program_name, app_name)
-        sys.stdout.flush()
-        make_cab_file(cabwiz_path, program_name, cab_final_name)
-        os.remove("%s/setup.dll" % source_dir)
-    else:
-        walk_tree(source_dir, ignored_patterns)
-        sys.stdout.flush()
-        output_inf_file(program_name, app_name)
-        sys.stdout.flush()
-        make_cab_file(cabwiz_path, program_name, cab_final_name)
-        purge_copied_files()
-
-
-# run main if run directly
-if __name__ == "__main__":
-    main()
diff --git a/build/wince/shunt/Makefile.in b/build/wince/shunt/Makefile.in
deleted file mode 100644
index fb846fee2bb8..000000000000
--- a/build/wince/shunt/Makefile.in
+++ /dev/null
@@ -1,103 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla core build scripts.
-#
-# The Initial Developer of the Original Code is
-# Brad Lassey <blassey@mozilla.com>
-#
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
-#
-# Contributor(s): 
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-MODULE = shunt
-
-TOPSRCDIR = $(topsrcdir)
-OBJDIR = $(DEPTH)
-
-export NO_SHUNT = 1
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = mozce_shunt
-LIBRARY_NAME = mozce_shunt
-FORCE_SHARED_LIB= 1
-DIST_INSTALL = 1
-
-EXPORTS_NAMESPACES = mozce_shunt
-EXPORTS_mozce_shunt = \
-  include/windows.h \
-  include/ymath.h \
-  include/stdlib.h \
-  include/direct.h \
-  include/errno.h \
-  include/fcntl.h \
-  include/io.h \
-  include/mbstring.h \
-  include/environment.h \
-  include/mozce_shunt.h \
-  include/process.h \
-  include/signal.h \
-  $(NULL)
-
-DIRS += include/sys
-
-ifdef MOZ_MEMORY
-CFLAGS += -DMOZ_MEMORY
-CXXFLAGS += -DMOZ_MEMORY
-EXPORTS_mozce_shunt += $(topsrcdir)/memory/jemalloc/jemalloc.h
-
-# We have to include the obj file directly, because we want to export
-# some of its symbols through our def file
-EXTRA_LIBS += $(OBJDIR)/memory/jemalloc/jemalloc.obj
-endif
-
-DEFFILE = mozce_shunt.def
-
-OS_LIBS = $(call EXPAND_LIBNAME, libcmt)
-
-CPPSRCS = \
-	shunt.cpp \
-	environment.cpp \
-	time.cpp \
-	memory.cpp \
-	$(NULL)
-
-DEFINES += -DMOZCE_SHUNT_EXPORTS -DIN_SHUNT
-
-include $(topsrcdir)/config/rules.mk
-
-mozce_shunt.def: mozce_shunt.def.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@
-
-.NOTPARALLEL:
-
diff --git a/build/wince/shunt/environment.cpp b/build/wince/shunt/environment.cpp
deleted file mode 100644
index 31f0e3d3cdd5..000000000000
--- a/build/wince/shunt/environment.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/* -*- Mode: C;  c-basic-offset: 2; tab-width: 4; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
- 
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* environment.h and environment.cpp are also included by app update */
-
-// WINCE_SKIP_SHUNT_INCLUDE is used by app update to prevent including of
-// mozce_shunt.h when it includes environment.cpp
-#ifndef WINCE_SKIP_SHUNT_INCLUDE
-#include "include/mozce_shunt.h"
-#endif
-#include "include/environment.h"
-#include "time_conversions.h"
-#include <stdlib.h>
-#include "Windows.h"
-
-////////////////////////////////////////////////////////
-//  Environment Variable Stuff
-////////////////////////////////////////////////////////
-
-typedef struct env_entry env_entry;
-
-#define ENV_IS_STATIC 0
-#define ENV_FREE_KEY 1
-#define ENV_FREE_BOTH 2
-
-struct env_entry {
-  char *key;
-  char *value;
-  int flag;
-  env_entry *next;
-};
-
-static bool env_ready = false;
-static env_entry *env_head = NULL;
-
-static env_entry *
-env_find_key(const char *key)
-{
-  env_entry *entry = env_head;
-  while (entry) {
-    if (strcmp(entry->key, key) == 0)
-      return entry;
-
-    entry = entry->next;
-  }
-
-  return NULL;
-}
-
-static void
-putenv_internal(char *key, char *value, int flag)
-{
-  env_entry *entry = env_find_key(key);
-  if (entry) {
-    // get rid of old key/value; if flag is set, then
-    // they're static strings and we don't touch them
-    if (entry->flag == ENV_FREE_BOTH)
-      free (entry->value);
-    if (entry->flag == ENV_FREE_KEY)
-      free (entry->key);
-  } else {
-    entry = new env_entry;
-    entry->next = env_head;
-    env_head = entry;
-  }
-
-  entry->key = key;
-  entry->value = value;
-  entry->flag = flag;
-}
-
-static void
-init_initial_env() {
-  env_ready = true;
-
-  putenv_internal("NSS_DEFAULT_DB_TYPE", "sql", ENV_IS_STATIC);
-  putenv_internal("NSPR_FD_CACHE_SIZE_LOW", "10", ENV_IS_STATIC);
-  putenv_internal("NSPR_FD_CACHE_SIZE_HIGH", "30", ENV_IS_STATIC);
-  putenv_internal("XRE_PROFILE_NAME", "default", ENV_IS_STATIC);
-  putenv_internal("tmp", "/Temp", ENV_IS_STATIC);
-}
-
-void
-putenv_copy(const char *k, const char *v)
-{
-  if (!env_ready)
-    init_initial_env();
-
-  putenv_internal(strdup(k), strdup(v), ENV_FREE_BOTH);
-}
-
-int
-putenv(const char *envstr)
-{
-  if (!env_ready)
-    init_initial_env();
-
-  char *key = strdup(envstr);
-  char *value = strchr(key, '=');
-  if (!value) {
-    free(key);
-    return -1;
-  }
-
-  *value++ = '\0';
-
-  putenv_internal(key, value, ENV_FREE_KEY);
-
-  return 0;
-}
-
-char *
-getenv(const char* name)
-{
-  if (!env_ready)
-    init_initial_env();
-
-  env_entry *entry = env_find_key(name);
-  if (entry && entry->value[0] != 0) {
-    return entry->value;
-  }
-
-  return NULL;
-}
-
-char
-GetEnvironmentVariableW(const WCHAR* lpName,
-                        WCHAR* lpBuffer,
-                        unsigned long nSize)
-{
-  char key[256];
-  int rv = WideCharToMultiByte(CP_ACP, 0, lpName, -1, key, 255, NULL, NULL);
-  if (rv <= 0)
-    return 0;
-
-  key[rv] = 0;
-  
-  char* val = getenv(key);
-  
-  if (!val)
-    return 0;
-
-  // strlen(val)+1, let MBTWC convert the nul byte for us
-  return MultiByteToWideChar(CP_ACP, 0, val, strlen(val)+1, lpBuffer, nSize);
-}
-
-char
-SetEnvironmentVariableW(const WCHAR* name,
-                        const WCHAR* value)
-{
-  char key[256];
-  char val[256];
-  int rv;
-
-  rv = WideCharToMultiByte(CP_ACP, 0, name, -1, key, 255, NULL, NULL);
-  if (rv < 0)
-    return rv;
-
-  key[rv] = 0;
-  
-  rv = WideCharToMultiByte(CP_ACP, 0, value, -1, val, 255, NULL, NULL);
-  if (rv < 0)
-    return rv;
-
-  val[rv] = 0;
-
-  putenv_copy(key, val);
-  return 0;
-}
-
-
-unsigned int ExpandEnvironmentStringsW(const WCHAR* lpSrc,
-                                       WCHAR* lpDst,
-                                       unsigned int nSize)
-{
-  if ( NULL == lpDst )
-    return 0;
-
-  unsigned int size = 0;
-  unsigned int index = 0;
-  unsigned int origLen = wcslen(lpSrc);
-
-  const WCHAR *pIn = lpSrc;
-  WCHAR *pOut = lpDst;
-
-  while ( index < origLen ) {
-
-    if (*pIn != L'%') {  // Regular char, copy over
-      if ( size++ < nSize ) *pOut = *pIn, pOut++;
-      index++, pIn++;
-      continue;
-    }
-
-    // Have a starting '%' - look for matching '%'
-    int envlen = 0;
-    const WCHAR *pTmp = pIn + 1;
-    while ( *pTmp != L'%' && *pTmp != L' ' ) {
-      envlen++, pTmp++;
-      if ( origLen < index + envlen ) {    // Ran past end of original
-        while ( envlen-- ) {
-          if ( size++ < nSize ) *pOut = *pIn, pOut++;
-          index++, pIn++;
-        }
-        break;
-      }
-    }
-
-    if ( *pTmp == L' ' ) { // Need to append through space
-      while ( envlen-- ) {
-        if ( size++ < nSize ) *pOut = *pIn, pOut++;
-        index++, pIn++;
-      }
-      continue;
-    }
-
-    pIn++; // Move past original %
-    if ( 0 == envlen ) {  // Encountered a "%%" - mapping to "%"
-      if ( size++ < nSize ) *pOut = *pIn, pOut++;
-      index += 2, pIn++;
-    } else {
-      // Encountered a "%something%" - mapping "something"
-      char key[256];
-      int k = WideCharToMultiByte(CP_ACP, 0, pIn, envlen, key, 255, NULL, NULL);
-      key[k] = 0;
-      char *pC = getenv(key);
-      if ( NULL != pC ) {
-        int n = MultiByteToWideChar( CP_ACP, 0, pC, -1, pOut, nSize - size );
-        if ( n > 0 ) {
-          size += n - 1;  // Account for trailing zero
-          pOut += n - 1;
-        }
-      }
-      index += envlen + 2;
-      pIn = ++pTmp;
-    }
-  }
-
-  if ( size < nSize ) lpDst[size] = 0;
-  return size;
-}
-
-WCHAR *
-mozce_GetEnvironmentCL()
-{
-  env_entry *entry = env_head;
-  int len = 0;
-  while (entry) {
-    if (entry->flag == ENV_IS_STATIC) {
-      entry = entry->next;
-      continue;
-    }
-
-    len += strlen(entry->key);
-    len += strlen(entry->value);
-
-    // for each env var, 11 chars of " --environ:", 3 chars of '"="', and a null at the end
-    len += 11 + 3 + 1;
-
-    entry = entry->next;
-  }
-
-  if (len == 0) {
-    return wcsdup(L"");
-  }
-
-  wchar_t *env = (wchar_t*) malloc(sizeof(wchar_t) * (len+1));
-  if (!env)
-    return NULL;
-
-  entry = env_head;
-
-  int pos = 0;
-  while (entry) {
-    if (entry->flag == ENV_IS_STATIC) {
-      entry = entry->next;
-      continue;
-    }
-
-    if (strchr(entry->key, '"') || strchr(entry->value, '"')) {
-      // argh, we don't have a good way of encoding the ", so let's just
-      // ignore this var for now
-      RETAILMSG(1, (L"Skipping environment variable with quote marks in key or value! %S -> %s\r\n", entry->key, entry->value));
-      entry = entry->next;
-      continue;
-    }
-
-    wcscpy (env+pos, L" --environ:\"");
-    pos += 12;
-    pos += MultiByteToWideChar(CP_ACP, 0, entry->key, strlen(entry->key), env+pos, len-pos);
-    env[pos++] = '=';
-    pos += MultiByteToWideChar(CP_ACP, 0, entry->value, strlen(entry->value), env+pos, len-pos);
-    env[pos++] = '\"';
-
-    entry = entry->next;
-  } 
-
-  env[pos] = '\0';
-
-  return env;
-  
-}
diff --git a/build/wince/shunt/include/direct.h b/build/wince/shunt/include/direct.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/environment.h b/build/wince/shunt/include/environment.h
deleted file mode 100644
index f22aff3f3086..000000000000
--- a/build/wince/shunt/include/environment.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Robert Strong <robert.bugzilla@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* environment.h and environment.cpp are also included by app update */
-
-#ifndef MOZCE_ENVIRONMENT_H
-#define MOZCE_ENVIRONMENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Environment stuff */
-char* getenv(const char* inName);
-int putenv(const char *a);
-char SetEnvironmentVariableW(const wchar_t * name, const wchar_t * value );
-char GetEnvironmentVariableW(const wchar_t * lpName, wchar_t* lpBuffer, unsigned long nSize);
-
-unsigned int ExpandEnvironmentStringsW(const wchar_t* lpSrc,
-				       wchar_t* lpDst,
-				       unsigned int nSize);
-
-wchar_t* mozce_GetEnvironmentCL();
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif //MOZCE_ENVIRONMENT_H
diff --git a/build/wince/shunt/include/errno.h b/build/wince/shunt/include/errno.h
deleted file mode 100644
index 8644e622db48..000000000000
--- a/build/wince/shunt/include/errno.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#define EPERM           1       /* Operation not permitted */
-#define ENOENT          2       /* No such file or directory */
-#define ESRCH           3       /* No such process */
-#define EINTR           4       /* Interrupted system call */
-#define EIO             5       /* Input/output error */
-#define ENXIO           6       /* Device not configured */
-#define E2BIG           7       /* Argument list too long */
-#define ENOEXEC         8       /* Exec format error */
-#define EBADF           9       /* Bad file descriptor */
-#define ECHILD          10      /* No child processes */
-#define EDEADLK         11      /* Resource deadlock avoided */
-#define ENOMEM          12      /* Cannot allocate memory */
-#define EACCES          13      /* Permission denied */
-#define EFAULT          14      /* Bad address */
-#define ENOTBLK         15      /* Block device required */
-#define EBUSY           16      /* Device busy */
-#define EEXIST          17      /* File exists */
-#define EXDEV           18      /* Cross-device link */
-#define ENODEV          19      /* Operation not supported by device */
-#define ENOTDIR         20      /* Not a directory */
-#define EISDIR          21      /* Is a directory */
-#define EINVAL          22      /* Invalid argument */
-#define ENFILE          23      /* Too many open files in system */
-#define EMFILE          24      /* Too many open files */
-#define ENOTTY          25      /* Inappropriate ioctl for device */
-#define ETXTBSY         26      /* Text file busy */
-#define EFBIG           27      /* File too large */
-#define ENOSPC          28      /* No space left on device */
-#define ESPIPE          29      /* Illegal seek */
-#define EROFS           30      /* Read-only file system */
-#define EMLINK          31      /* Too many links */
-#define EPIPE           32      /* Broken pipe */
-#define EDOM            33      /* Numerical argument out of domain */
-#define ERANGE          34      /* Result too large */
-#define EAGAIN          35      /* Resource temporarily unavailable */
-#define ENOTEMPTY       39      /* Directory not empty */
-
-
diff --git a/build/wince/shunt/include/fcntl.h b/build/wince/shunt/include/fcntl.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/io.h b/build/wince/shunt/include/io.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/mbstring.h b/build/wince/shunt/include/mbstring.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/mozce_shunt.h b/build/wince/shunt/include/mozce_shunt.h
deleted file mode 100644
index 155adb1b9789..000000000000
--- a/build/wince/shunt/include/mozce_shunt.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZCE_SHUNT_H
-#define MOZCE_SHUNT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _WCHAR_T_DEFINED
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-
-#ifdef __cplusplus
-}   //extern "C" 
-#endif
-
-#include "environment.h"
-
-#ifdef MOZ_MEMORY
-
-#ifdef __cplusplus
-
-// define these so we don't include <new> from either VC or
-// the CE5 SDK
-#define _NEW_
-#define _INC_NEW
-
-#ifndef __NOTHROW_T_DEFINED
-#define __NOTHROW_T_DEFINED
-namespace std {
-  struct nothrow_t {};
-  extern const nothrow_t nothrow;
-  struct bad_alloc {};
-};
-#endif
-
-// grab malloc and free prototypes
-#include "jemalloc.h"
-
-// mozalloc.h defines "normal" infallible operator new, but not
-// std::nothrow operator new, so we define that below.  This is inline
-// and exported from the shunt.
-inline void *operator new(size_t size, const std::nothrow_t&) throw() {
-  return malloc(size);
-}
-inline void *operator new[](size_t size, const std::nothrow_t&) throw() {
-  return malloc(size);
-}
-inline void operator delete(void* ptr, const std::nothrow_t&) throw() {
-  free(ptr);
-}
-inline void operator delete[](void* ptr, const std::nothrow_t&) throw() {
-  free(ptr);
-}
-
-// Placement new.  Just inline, not exported (which doesn't work for
-// some reason, but it's a noop in any case)
-inline void *operator new(size_t, void *p) {
-  return p;
-}
-inline void *operator new[](size_t, void *p) {
-  return p;
-}
-
-#ifndef IN_SHUNT
-// for Gecko, include infallible mozalloc allocators.  elsewhere, define
-// operator new() normally.
-// NB: this include guard needs to be kept in sync with the one in nscore.h
-#if defined(_MOZILLA_CONFIG_H_) && !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
-#  include "mozilla/mozalloc.h"
-#else
-
-inline void* operator new(size_t size) throw() {
-  return malloc(size);
-}
-inline void* operator new[](size_t size) throw() {
-  return malloc(size);
-}
-inline void operator delete(void* ptr) throw() {
-  free(ptr);
-}
-inline void operator delete[](void* ptr) throw() {
-  free(ptr);
-}
-
-#endif  // if defined(_MOZILLA_CONFIG_H_)
-#endif
-
-extern "C" {
-#endif
-
-#undef _strdup
-#undef strdup
-#undef _strndup
-#undef strndup
-#undef _wcsdup
-#undef wcsdup
-#undef _wcsndup
-#undef wcsndup
-
-char * __cdecl
-_strdup(const char*);
-
-wchar_t * __cdecl
-_wcsdup(const wchar_t *);
-
-char * __cdecl
-_strndup(const char *, unsigned int);
-
-wchar_t * __cdecl
-_wcsndup(const wchar_t *, unsigned int);
-  
-#ifdef __cplusplus
-}   //extern "C" 
-#endif
-
-#endif  // ifdef MOZ_MEMORY
-
-#define strdup  _strdup
-#define strndup _strndup
-#define wcsdup _wcsdup
-#define wcsndup _wcsndup
-
-
-#define strcmpi _stricmp
-#define stricmp _stricmp
-#define wgetcwd _wgetcwd
-#define vsnprintf _vsnprintf
-
-#define SHGetSpecialFolderPathW SHGetSpecialFolderPath
-#define SHGetPathFromIDListW    SHGetPathFromIDList
-#define FONTENUMPROCW           FONTENUMPROC
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* errno and family */
-extern int errno;
-char* strerror(int);
-
-/* abort */
-void abort(void);
-  
-/* Environment stuff */
-char* getenv(const char* inName);
-int putenv(const char *a);
-char SetEnvironmentVariableW(const wchar_t * name, const wchar_t * value );
-char GetEnvironmentVariableW(const wchar_t * lpName, wchar_t* lpBuffer, unsigned long nSize);
-  
-unsigned int ExpandEnvironmentStringsW(const wchar_t* lpSrc,
-				       wchar_t* lpDst,
-				       unsigned int nSize);
-
-/* File system stuff */
-wchar_t * _wgetcwd(wchar_t* dir, unsigned long size);
-wchar_t *_wfullpath(wchar_t *absPath, const wchar_t *relPath, unsigned long maxLength );
-int _unlink(const char *filename );
-int _wchdir(const wchar_t* path);
-  
-/* The time stuff should be defined here, but it can't be because it
-   is already defined in time.h.
-  
- size_t strftime(char *, size_t, const char *, const struct tm *)
- struct tm* localtime(const time_t* inTimeT)
- struct tm* mozce_gmtime_r(const time_t* inTimeT, struct tm* outRetval)
- struct tm* gmtime(const time_t* inTimeT)
- time_t mktime(struct tm* inTM)
- time_t time(time_t *)
- clock_t clock() 
-  
-*/
-
-struct tm;
-
-#ifndef _TIME_T_DEFINED
-typedef long time_t;
-#define _TIME_T_DEFINED
-#endif
-
-struct tm* gmtime_r(const time_t* inTimeT, struct tm* outRetval);
-struct tm* localtime_r(const time_t* inTimeT, struct tm* outRetval);
-
-/* Locale Stuff */
-  
-/* The locale stuff should be defined here, but it can't be because it
-   is already defined in locale.h.
-  
- struct lconv * localeconv(void)
-  
-*/
-
-
-wchar_t* mozce_GetEnvironmentCL();
-
-  /* square root of 1/2, missing from math.h */ 
-#define M_SQRT1_2  0.707106781186547524401
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif //MOZCE_SHUNT_H
diff --git a/build/wince/shunt/include/process.h b/build/wince/shunt/include/process.h
deleted file mode 100644
index c8a0b45b0df3..000000000000
--- a/build/wince/shunt/include/process.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#define _beginthreadex(security, stack_size, start_proc, arg, flags, pid) \
-  CreateThread(security, stack_size ? stack_size : 65536L,(LPTHREAD_START_ROUTINE) start_proc, arg, flags | STACK_SIZE_PARAM_IS_A_RESERVATION, pid)
diff --git a/build/wince/shunt/include/signal.h b/build/wince/shunt/include/signal.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/stdlib.h.in b/build/wince/shunt/include/stdlib.h.in
deleted file mode 100644
index dd14f6e0b3e2..000000000000
--- a/build/wince/shunt/include/stdlib.h.in
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Brad Lassey <blassey@mozilla.com>.
-
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef MOZCE_STDLIB_H
-#define MOZCE_STDLIB_H
-#ifdef MOZ_MEMORY
-
-#undef strdup
-#undef _strdup
-#undef wcsdup
-#undef _wcsdup
-#undef strndup
-#undef _strndup
-#undef wcsndup
-#undef _wcsndup
-
-#define free orig_free
-#define malloc orig_malloc
-#define calloc orig_calloc
-#define realloc orig_realloc
-#define _wcsdup orig_wcsdup
-#define _strdup orig_strup
-
-#endif
-
-#include "@WINCE_SDK_DIR@/Include/Armv4i/stdlib.h"
-
-#ifdef MOZ_MEMORY
-
-#undef free
-#undef malloc
-#undef calloc
-#undef realloc
-
-#undef strdup
-#undef _strdup
-#undef wcsdup
-#undef _wcsdup
-#undef strndup
-#undef _strndup
-#undef wcsndup
-#undef _wcsndup
-
-#define strdup _strdup
-#define strndup _strndup
-#define wcsdup _wcsdup
-#define wcsndup _wcsndup
-
-/* now include jemalloc.h to get the real malloc, free, etc. */
-#include "jemalloc.h"
-
-#endif
-
-#endif
diff --git a/build/wince/shunt/include/sys/Makefile.in b/build/wince/shunt/include/sys/Makefile.in
deleted file mode 100644
index 9e5ebc274c02..000000000000
--- a/build/wince/shunt/include/sys/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla core build scripts.
-#
-# The Initial Developer of the Original Code is
-# Brad Lassey <blassey@mozilla.com>
-#
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
-#
-# Contributor(s): 
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(srcdir)/stat.h $(srcdir)/types.h
-	$(INSTALL) $^ $(DIST)/include/mozce_shunt/sys
-
diff --git a/build/wince/shunt/include/sys/stat.h b/build/wince/shunt/include/sys/stat.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/sys/types.h b/build/wince/shunt/include/sys/types.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/build/wince/shunt/include/windows.h.in b/build/wince/shunt/include/windows.h.in
deleted file mode 100644
index 726a4c70fa26..000000000000
--- a/build/wince/shunt/include/windows.h.in
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef MOZCE_WINDOWS_H
-#define MOZCE_WINDOWS_H
-
-// This is to work around the inconistancy of GetProcAddress between 
-// windows desktop and wince, see bug 464190
-
-#include "@WINCE_SDK_DIR@/Include/Armv4i/windows.h"
-#ifdef GetProcAddress
-#undef GetProcAddress
-#endif
-#define GetProcAddress GetProcAddressA
-#endif
diff --git a/build/wince/shunt/include/ymath.h.in b/build/wince/shunt/include/ymath.h.in
deleted file mode 100644
index 105944ca7d2b..000000000000
--- a/build/wince/shunt/include/ymath.h.in
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef MOZCE_YMATH_H
-#define MOZCE_YMATH_H
-
-// This is to work around _FNan not being defined on wince, see bug 464180
-
-#include "@WINCE_SDK_DIR@/Include/Armv4i/ymath.h"
-#define _FMAX	    ((1 << (15 - _FOFF)) - 1)
-#define _FOFF	    7
-#define _FSIGN    0x8000
-#define INIT(w0)  {w0, 0}
-static const _Dconst _FNanWinCE = {INIT((_FMAX << _FOFF)
-  | (1 << (_FOFF - 1)))};
-#define _FNan _FNanWinCE
-#endif
diff --git a/build/wince/shunt/memory.cpp b/build/wince/shunt/memory.cpp
deleted file mode 100644
index c91bee22c794..000000000000
--- a/build/wince/shunt/memory.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C;  c-basic-offset: 2; tab-width: 4; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
- 
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "include/mozce_shunt.h"
-#include <stdlib.h>
-
-#ifdef MOZ_MEMORY
-
-// declare the nothrow object
-const std::nothrow_t std::nothrow;
-
-char*
-_strndup(const char *src, size_t len) {
-  char* dst = (char*)malloc(len + 1);
-  if(dst)
-    strncpy(dst, src, len + 1);
-  return dst;
-}
-
-
-char*
-_strdup(const char *src) {
-  size_t len = strlen(src);
-  return _strndup(src, len );
-}
-
-wchar_t * 
-_wcsndup(const wchar_t *src, size_t len) {
-  wchar_t* dst = (wchar_t*)malloc(sizeof(wchar_t) * (len + 1));
-  if(dst)
-    wcsncpy(dst, src, len + 1);
-  return dst;
-}
-
-wchar_t * 
-_wcsdup(const wchar_t *src) {
-  size_t len = wcslen(src);
-  return _wcsndup(src, len);
-}
-#endif
-
diff --git a/build/wince/shunt/mozce_shunt.def.in b/build/wince/shunt/mozce_shunt.def.in
deleted file mode 100644
index ac7273a4b1f9..000000000000
--- a/build/wince/shunt/mozce_shunt.def.in
+++ /dev/null
@@ -1,54 +0,0 @@
-LIBRARY mozce_shunt.dll
-EXPORTS
-ExpandEnvironmentStringsW
-GetEnvironmentVariableW
-SetEnvironmentVariableW
-_unlink
-_wfullpath
-_wgetcwd
-_wchdir
-abort
-clock
-errno
-gmtime
-gmtime_r
-localeconv
-localtime
-localtime_r
-mktime
-mozce_GetEnvironmentCL
-putenv
-getenv
-strerror
-strftime
-time
-
-#ifdef MOZ_MEMORY
-;; std::nothrow object
-?nothrow@std@@3Unothrow_t@1@B
-;; operator new
-??2@YAPAXI@Z
-;; operator new nothrow
-??2@YAPAXIABUnothrow_t@std@@@Z
-;; operator delete
-??3@YAXPAX@Z
-;; operator new[]
-??_U@YAPAXI@Z
-;; operator new[] nothrow
-??_U@YAPAXIABUnothrow_t@std@@@Z
-;; operator delete[]
-??_V@YAXPAX@Z
-malloc
-valloc
-calloc
-realloc
-free
-posix_memalign
-memalign
-malloc_usable_size
-jemalloc_stats
-_strdup
-_wcsdup
-_strndup
-_wcsndup
-#endif
diff --git a/build/wince/shunt/shunt.cpp b/build/wince/shunt/shunt.cpp
deleted file mode 100644
index 99d9d92eb133..000000000000
--- a/build/wince/shunt/shunt.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C;  c-basic-offset: 2; tab-width: 4; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
- 
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
- 
-#include "include/mozce_shunt.h"
-#include "time_conversions.h"
-#include <stdlib.h>
-#include "Windows.h"
-
-// from environment.cpp
-void putenv_copy(const char *k, const char *v);
-
-////////////////////////////////////////////////////////
-//  special folder stuff
-////////////////////////////////////////////////////////
-
-typedef struct MOZCE_SHUNT_SPECIAL_FOLDER_INFO
-{
-  int   nFolder;
-  char *folderEnvName;
-} MozceShuntSpecialFolderInfo;
-
-// TAKEN DIRECTLY FROM MICROSOFT SHELLAPI.H HEADER FILE 
-// supported SHGetSpecialFolderPath nFolder ids
-#define CSIDL_DESKTOP            0x0000
-#define CSIDL_PROGRAMS           0x0002      // \Windows\Start Menu\Programs
-#define CSIDL_PERSONAL           0x0005
-#define CSIDL_WINDOWS            0x0024      // \Windows
-#define CSIDL_PROGRAM_FILES      0x0026      // \Program Files
-
-#define CSIDL_APPDATA            0x001A      // NOT IN SHELLAPI.H header file
-#define CSIDL_PROFILE            0x0028      // NOT IN SHELLAPI.H header file
-
-MozceShuntSpecialFolderInfo mozceSpecialFoldersToEnvVars[] = {
-  { CSIDL_APPDATA,  "APPDATA" },
-  { CSIDL_PROGRAM_FILES, "ProgramFiles" },
-  { CSIDL_WINDOWS,  "windir" },
-
-  //  { CSIDL_PROFILE,  "HOMEPATH" },     // No return on WinMobile 6 Pro
-  //  { CSIDL_PROFILE,  "USERPROFILE" },  // No return on WinMobile 6 Pro
-  //  { int, "ALLUSERSPROFILE" },         // Only one profile on WinCE
-  //  { int, "CommonProgramFiles" },
-  //  { int, "COMPUTERNAME" },
-  //  { int, "HOMEDRIVE" },
-  //  { int, "SystemDrive" },
-  //  { int, "SystemRoot" },
-  //  { int, "TEMP" },
-
-  { NULL, NULL }
-};
-
-static void InitializeSpecialFolderEnvVars()
-{
-  MozceShuntSpecialFolderInfo *p = mozceSpecialFoldersToEnvVars;
-  while ( p && p->nFolder && p->folderEnvName ) {
-    WCHAR wPath[MAX_PATH];
-    char  cPath[MAX_PATH];
-    if ( SHGetSpecialFolderPath(NULL, wPath, p->nFolder, FALSE) )
-      if ( 0 != WideCharToMultiByte(CP_ACP, 0, wPath, -1, cPath, MAX_PATH, 0, 0) )
-        putenv_copy(p->folderEnvName, cPath);
-    p++;
-  }
-}
-
-////////////////////////////////////////////////////////
-//  errno
-////////////////////////////////////////////////////////
-
-char* strerror(int inErrno)
-{
-  return "Unknown Error";
-}
-
-int errno = 0;
-
-
-////////////////////////////////////////////////////////
-//  File System Stuff
-////////////////////////////////////////////////////////
-
-wchar_t * _wgetcwd(wchar_t * dir, unsigned long size)
-{
-  wchar_t tmp[MAX_PATH] = {0};
-  GetEnvironmentVariableW(L"CWD", tmp, size);
-  if (tmp && tmp[0]) {
-    if (wcslen(tmp) > size)
-      return 0;
-    if (!dir) {
-      dir = (wchar_t*)malloc(sizeof(wchar_t) * (wcslen(tmp) + 2));
-      if (!dir)
-        return 0;
-    }
-    wcscpy(dir, tmp);
-  } else {
-    unsigned long i;
-    if (!dir) {
-      dir = (wchar_t*)malloc(sizeof(wchar_t) * (MAX_PATH + 1));
-      if (!dir)
-        return 0;
-    }
-    if (!GetModuleFileNameW(GetModuleHandle (NULL), dir, MAX_PATH))
-      return 0;
-    for (i = wcslen(dir); i && dir[i] != '\\'; i--) {}
-    dir[i + 1] = '\0';
-    SetEnvironmentVariableW(L"CWD", dir);
-  }
-  size_t len = wcslen(dir);
-  if (dir[len - 1] != '\\' && (len + 2) < size) {
-    dir[len] = '\\';
-    dir[len + 1] = '\0';
-  }
-  return dir;
-}
-
-wchar_t *_wfullpath( wchar_t *absPath, const wchar_t *relPath, unsigned long maxLength )
-{
-  if(absPath == NULL){
-    absPath = (wchar_t *)malloc(maxLength*sizeof(wchar_t));
-  }
-  wchar_t cwd[MAX_PATH];
-  if (NULL == _wgetcwd( cwd, MAX_PATH))
-    return NULL;
-
-  unsigned long len = wcslen(cwd);
-  if(!(cwd[len-1] == TCHAR('/') || cwd[len-1] == TCHAR('\\'))&& len< maxLength){
-    cwd[len] = TCHAR('\\');
-    cwd[++len] = TCHAR('\0');
-  }
-  if(len+wcslen(relPath) < maxLength){
-#if (_WIN32_WCE > 300)
-    if ( 0 < CeGetCanonicalPathName(relPath[0] == L'\\'? relPath : 
-                                                         wcscat(cwd,relPath), 
-                                    absPath, maxLength, 0))
-      return absPath;
-#else
-    #error Need CeGetCanonicalPathName to build.
-    // NO ACTUAL CeGetCanonicalPathName function in earlier versions of WinCE
-#endif
-  }
-  return NULL;
-}
-
-int _wchdir(const WCHAR* path) {
-  return SetEnvironmentVariableW(L"CWD", path);
-}
-
-int _unlink(const char *filename)
-{
-  wchar_t wname[MAX_PATH];
-  
-  MultiByteToWideChar(CP_ACP,
-                      0,
-                      filename,
-                      strlen(filename)+1,
-                      wname,
-                      MAX_PATH );
-  return DeleteFileW(wname)?0:-1;
-}
-
-void abort(void)
-{
-#if defined(DEBUG)
-  DebugBreak();
-#endif
-  TerminateProcess((HANDLE) GetCurrentProcessId(), 3);
-}
-
-////////////////////////////////////////////////////////
-//  Locale Stuff
-////////////////////////////////////////////////////////
-
-#define localeconv __not_supported_on_device_localeconv
-#include <locale.h>
-#undef localeconv
-
-extern "C" {
-  struct lconv * localeconv(void);
-}
-
-static struct lconv s_locale_conv =
-  {
-    ".",   /* decimal_point */
-    ",",   /* thousands_sep */
-    "333", /* grouping */
-    "$",   /* int_curr_symbol */
-    "$",   /* currency_symbol */
-    "",    /* mon_decimal_point */
-    "",    /* mon_thousands_sep */
-    "",    /* mon_grouping */
-    "+",   /* positive_sign */
-    "-",   /* negative_sign */
-    '2',   /* int_frac_digits */
-    '2',   /* frac_digits */
-    1,     /* p_cs_precedes */
-    1,     /* p_sep_by_space */
-    1,     /* n_cs_precedes */
-    1,     /* n_sep_by_space */
-    1,     /* p_sign_posn */
-    1,     /* n_sign_posn */
-  };
-
-struct lconv * localeconv(void)
-{
-  return &s_locale_conv;
-}
-
-
-////////////////////////////////////////////////////////
-//  DllMain
-////////////////////////////////////////////////////////
-
-BOOL WINAPI DllMain(HANDLE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
-{
-  // Perform actions based on the reason for calling.
-  switch( fdwReason ) 
-  { 
-    case DLL_PROCESS_ATTACH:
-      // Initialize once for each new process.
-      // Return FALSE to fail DLL load.
-      InitializeSpecialFolderEnvVars();
-      break;
-
-    case DLL_THREAD_ATTACH:
-      // Do thread-specific initialization.
-      break;
-
-    case DLL_THREAD_DETACH:
-      // Do thread-specific cleanup.
-      break;
-
-    case DLL_PROCESS_DETACH:
-      // Perform any necessary cleanup.
-      break;
-  }
-  return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
diff --git a/build/wince/shunt/time.cpp b/build/wince/shunt/time.cpp
deleted file mode 100644
index a6abc9888f32..000000000000
--- a/build/wince/shunt/time.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/* -*- Mode: C;  c-basic-offset: 2; tab-width: 4; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
- 
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
- 
-#include "include/mozce_shunt.h"
-#include "time_conversions.h"
-#include <stdlib.h>
-#include <Windows.h>
-#include <altcecrt.h>
-
-////////////////////////////////////////////////////////
-//  Time Stuff
-////////////////////////////////////////////////////////
-
-// This is the kind of crap that makes me hate microsoft.  defined in their system headers, but not implemented anywhere.
-#define strftime __not_supported_on_device_strftime
-#define localtime __not_supported_on_device_localtime
-#define mktime __not_supported_on_device_mktime
-#define gmtime __not_supported_on_device_gmtime
-#define time __not_supported_on_device_time
-#define clock __not_supported_on_device_clock
-#include <time.h>
-#undef strftime
-#undef localtime
-#undef mktime
-#undef gmtime
-#undef time
-#undef clock
-
-extern "C" {
-  size_t strftime(char *, size_t, const char *, const struct tm *);
-  struct tm* localtime(const time_t* inTimeT);
-  time_t mktime(struct tm* inTM);
-  struct tm* gmtime(const time_t* inTimeT);
-  time_t time(time_t *);
-  clock_t clock();
-}
-
-static const int sDaysOfYear[12] = {
-  0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
-};
-static struct tm tmStorage;
-
-size_t strftime(char *out, size_t maxsize, const char *pat, const struct tm *time)
-{
-  size_t ret = 0;
-  size_t wpatlen = MultiByteToWideChar(CP_ACP, 0, pat, -1, 0, 0);
-  if (wpatlen) {
-    wchar_t* wpat = (wchar_t*)calloc(wpatlen, sizeof(wchar_t));
-    if (wpat) {
-      wchar_t* tmpBuf = (wchar_t*)calloc(maxsize, sizeof(wchar_t));
-      if (tmpBuf) {
-        if (MultiByteToWideChar(CP_ACP, 0, pat, -1, wpat, wpatlen)) {
-          if (wcsftime(tmpBuf, maxsize, wpat, time))
-            ret = ::WideCharToMultiByte(CP_ACP, 0, tmpBuf, -1, out, maxsize, 0, 0);
-        }
-        free(tmpBuf);
-      }
-      free(wpat);
-    }
-  }
-  return ret;
-}
-
-struct tm* gmtime_r(const time_t* inTimeT, struct tm* outRetval)
-{
-  struct tm* retval = NULL;
-  
-  if(NULL != inTimeT) {
-    SYSTEMTIME winGMTime;
-    
-    time_t_2_SYSTEMTIME(winGMTime, *inTimeT);
-    
-    outRetval->tm_sec = (int)winGMTime.wSecond;
-    outRetval->tm_min = (int)winGMTime.wMinute;
-    outRetval->tm_hour = (int)winGMTime.wHour;
-    outRetval->tm_mday = (int)winGMTime.wDay;
-    outRetval->tm_mon = (int)(winGMTime.wMonth - 1);
-    outRetval->tm_year = (int)(winGMTime.wYear - 1900);
-    outRetval->tm_wday = (int)winGMTime.wDayOfWeek;
-    outRetval->tm_isdst = -1;
-    
-    outRetval->tm_yday = (int)winGMTime.wDay + sDaysOfYear[outRetval->tm_mon];
-    if(0 == (winGMTime.wYear & 3)) {
-      if(2 < winGMTime.wMonth) {
-        if(0 == winGMTime.wYear % 100) {
-          if(0 == winGMTime.wYear % 400) {
-            outRetval->tm_yday++;
-          }
-        }else {
-          outRetval->tm_yday++;
-        }
-      }
-    }
-    retval = outRetval;
-  }
-  return retval;
-}
-
-struct tm* localtime_r(const time_t* inTimeT,struct tm* outRetval)
-{
-  struct tm* retval = NULL;
-  
-  if(NULL != inTimeT && NULL != outRetval) {
-    SYSTEMTIME winLocalTime;
-    
-    time_t_2_LOCALSYSTEMTIME(winLocalTime, *inTimeT);
-    
-    outRetval->tm_sec = (int)winLocalTime.wSecond;
-    outRetval->tm_min = (int)winLocalTime.wMinute;
-    outRetval->tm_hour = (int)winLocalTime.wHour;
-    outRetval->tm_mday = (int)winLocalTime.wDay;
-    outRetval->tm_mon = (int)(winLocalTime.wMonth - 1);
-    outRetval->tm_year = (int)(winLocalTime.wYear - 1900);
-    outRetval->tm_wday = (int)winLocalTime.wDayOfWeek;
-    outRetval->tm_isdst = -1;
-    
-    outRetval->tm_yday = (int)winLocalTime.wDay + sDaysOfYear[outRetval->tm_mon];
-    if(0 == (winLocalTime.wYear & 3)) {
-      if(2 < winLocalTime.wMonth) {
-        if(0 == winLocalTime.wYear % 100) {
-          if(0 == winLocalTime.wYear % 400) {
-            outRetval->tm_yday++;
-          }
-        } else {
-          outRetval->tm_yday++;
-        }
-      }
-    }
-    retval = outRetval;
-  }
-  return retval;
-}
-
-
-struct tm* localtime(const time_t* inTimeT)
-{
-  return localtime_r(inTimeT, &tmStorage);
-}
-
-struct tm* gmtime(const time_t* inTimeT)
-{
-  return gmtime_r(inTimeT, &tmStorage);
-}
-
-
-time_t mktime(struct tm* inTM)
-{
-  time_t retval = (time_t)-1;
-  
-  if(NULL != inTM) {
-    SYSTEMTIME winTime;
-    struct tm* gmTime = NULL;
-    
-    memset(&winTime, 0, sizeof(winTime));
-    
-    /*
-     * Ignore tm_wday and tm_yday.
-     * We likely have some problems with dst.
-     */
-    winTime.wSecond = inTM->tm_sec;
-    winTime.wMinute = inTM->tm_min;
-    winTime.wHour = inTM->tm_hour;
-    winTime.wDay = inTM->tm_mday;
-    winTime.wMonth = inTM->tm_mon + 1;
-    winTime.wYear = inTM->tm_year + 1900;
-    
-    /*
-     * First get our time_t.
-     */
-    SYSTEMTIME_2_time_t(retval, winTime);
-    
-    /*
-     * Now overwrite the struct passed in with what we believe it should be.
-     */
-    gmTime = gmtime_r(&retval, inTM);
-  }
-  return retval;
-}
-
-time_t time(time_t *)
-{
-  time_t retval;
-  SYSTEMTIME winTime;
-  ::GetSystemTime(&winTime);
-  SYSTEMTIME_2_time_t(retval, winTime);
-  return retval;
-}
-
-clock_t clock() 
-{
-  return -1;
-}
-
diff --git a/build/wince/shunt/time_conversions.h b/build/wince/shunt/time_conversions.h
deleted file mode 100644
index 20260f6f2967..000000000000
--- a/build/wince/shunt/time_conversions.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code, released
- * Jan 28, 2003.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Garrett Arch Blythe, 28-January-2003
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if !defined(__time_conversions_h)
-#define __time_conversions_h
-
-
-#define TIME_BEGIN_MACRO do {
-#define TIME_END_MACRO } while(0);
-
-/*
- * FILETIME has an epoch of 1601.
- * Precomputed the 1970 epoch so we do not have to below.
- */
-#define FILETIME_1970 116444736000000000i64
-
-/*
- * Marco to support add/sub/mul/div on a FILETIME level.
- */
-#define FILETIME_ARITH(outFileTime, inFileTime, inOperation, inValue) \
-    TIME_BEGIN_MACRO \
-        ULARGE_INTEGER buffer1; \
-        \
-        buffer1.LowPart = inFileTime.dwLowDateTime; \
-        buffer1.HighPart = inFileTime.dwHighDateTime; \
-        buffer1.QuadPart = buffer1.QuadPart inOperation inValue; \
-        outFileTime.dwLowDateTime = buffer1.LowPart; \
-        outFileTime.dwHighDateTime = buffer1.HighPart; \
-    TIME_END_MACRO
-
-/*
- * FILETIME is in 100 nanosecond units.
- * Provide macros for conversion to other second units.
- */
-#define FILETIME_2_MICROSECONDS(outTime, inFileTime) \
-    TIME_BEGIN_MACRO \
-        ULARGE_INTEGER buffer2; \
-        \
-        buffer2.LowPart = inFileTime.dwLowDateTime; \
-        buffer2.HighPart = inFileTime.dwHighDateTime; \
-        outTime = buffer2.QuadPart / 10i64; \
-    TIME_END_MACRO
-#define FILETIME_2_MILLISECONDS(outTime, inFileTime) \
-    TIME_BEGIN_MACRO \
-        ULARGE_INTEGER buffer3; \
-        \
-        buffer3.LowPart = inFileTime.dwLowDateTime; \
-        buffer3.HighPart = inFileTime.dwHighDateTime; \
-        outTime = buffer3.QuadPart / 10000i64; \
-    TIME_END_MACRO
-#define FILETIME_2_SECONDS(outTime, inFileTime) \
-    TIME_BEGIN_MACRO \
-        ULARGE_INTEGER buffer4; \
-        \
-        buffer4.LowPart = inFileTime.dwLowDateTime; \
-        buffer4.HighPart = inFileTime.dwHighDateTime; \
-        outTime = buffer4.QuadPart / 10000000i64; \
-    TIME_END_MACRO
-#define SECONDS_2_FILETIME(outFileTime, inTime) \
-    TIME_BEGIN_MACRO \
-        ULARGE_INTEGER buffer5; \
-        \
-        buffer5.QuadPart = (ULONGLONG)inTime * 10000000i64; \
-        outFileTime.dwLowDateTime = buffer5.LowPart; \
-        outFileTime.dwHighDateTime = buffer5.HighPart; \
-    TIME_END_MACRO
-
-/*
- * Conversions from FILETIME 1601 epoch time to LIBC 1970 time.epoch.
- */
-#define FILETIME_2_time_t(outTimeT, inFileTime) \
-    TIME_BEGIN_MACRO \
-        FILETIME result6; \
-        ULONGLONG conversion6; \
-        \
-        FILETIME_ARITH(result6, inFileTime, -, FILETIME_1970); \
-        FILETIME_2_SECONDS(conversion6, result6); \
-        outTimeT = (time_t)conversion6; \
-    TIME_END_MACRO
-#define time_t_2_FILETIME(outFileTime, inTimeT) \
-    TIME_BEGIN_MACRO \
-        FILETIME conversion7; \
-        \
-        SECONDS_2_FILETIME(conversion7, inTimeT); \
-        FILETIME_ARITH(outFileTime, conversion7, +, FILETIME_1970); \
-    TIME_END_MACRO
-
-
-/*
- * Sometimes SYSTEMTIME needs to be handled as well.
- */
-#define SYSTEMTIME_2_time_t(outTimeT, inSystemTime) \
-    TIME_BEGIN_MACRO \
-        FILETIME result8; \
-        \
-        SystemTimeToFileTime(&inSystemTime, &result8); \
-        FILETIME_2_time_t(outTimeT, result8); \
-    TIME_END_MACRO
-#define time_t_2_SYSTEMTIME(outSystemTime, inTimeT) \
-    TIME_BEGIN_MACRO \
-        FILETIME conversion9; \
-        \
-        time_t_2_FILETIME(conversion9, inTimeT); \
-        FileTimeToSystemTime(&conversion9, &outSystemTime); \
-    TIME_END_MACRO
-#define time_t_2_LOCALSYSTEMTIME(outSystemTime, inTimeT) \
-    TIME_BEGIN_MACRO \
-        FILETIME conversion10; \
-        FILETIME localConversion10; \
-        \
-        time_t_2_FILETIME(conversion10, inTimeT); \
-        FileTimeToLocalFileTime(&conversion10, &localConversion10); \
-        FileTimeToSystemTime(&localConversion10, &outSystemTime); \
-    TIME_END_MACRO
-
-
-
-#endif /* __time_conversions_h */
-
diff --git a/build/wince/tools/Makefile b/build/wince/tools/Makefile
deleted file mode 100644
index fdfc61d22ad7..000000000000
--- a/build/wince/tools/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla CE Shunt Library.
-#
-# The Initial Developer of the Original Code is Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#	John Wolfe (wolfe@lobo.us)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# this file is used directly during configure as well as included from Makefile.in
-
-DEVENV_FLAG=-
-
-CC=cl -O2
-
-MOZCE_DEVENV=vs$(MOZ_MSVCVERSION)
-
-MOZCE_TOOLS_DIR=$(TOPSRCDIR)/build/wince/tools
-
-ifdef MOZCE_NOT_CONFIGURE
-MOZCE_TOOLS_BIN_DIR=$(OBJDIR)/build/wince/tools
-else
-# if we're building the tools in configure, we want them to go directly to the sdk 
-# so they get rebuilt once we have a full environment
-MOZCE_TOOLS_BIN_DIR=$(OBJDIR)/dist/sdk/bin
-endif
-
-BUILD_SWITCH=$(DEVENV_FLAG)Build
-REBUILD_SWITCH=$(DEVENV_FLAG)Rebuild
-CLEAN_SWITCH=$(DEVENV_FLAG)clean
-
-ifeq ($(VCINSTALLDIR),)
-$(error Environment variable VCINSTALLDIR not set! Are you using MozillaBuild?)
-endif
-
-ifeq ($(WINCE_SDK_DIR),)
-$(error Environment variable WINCE_SDK_DIR not set! It must be passed to make if not running from configure)
-endif
-
-ifeq ($(MOZ_MSVCVERSION),)
-$(error Environment variable MOZ_MSVCVERSION not set! Are you using MozillaBuild?)
-endif
-
-CFLAGS += \
-  -DVC_PATH='"$(subst \,\\,$(VCINSTALLDIR))\\"' \
-  -DWM_SDK_PATH='"$(subst \,\\,$(WINCE_SDK_DIR))\\"' \
-  -DMOZCE_DEVENV='"$(MOZCE_DEVENV)"' \
-  -DTOPSRCDIR='"$(TOPSRCDIR)"' \
-  $(NULL)
-
-ifneq ($(WINDOWSSDKDIR),)
-CFLAGS += -DWIN_SDK_PATH='"$(subst \,\\,$(WINDOWSSDKDIR))"'
-else
-ifeq ($(SDKDIR),)
-$(error Environment variable WINDOWSSDKDIR not set! Are you using MozillaBuild?)
-else
-CFLAGS += -DWIN_SDK_PATH='"$(subst \,\\,$(SDKDIR))"'
-endif
-endif
-
-ifdef VPATH
-CFLAGS	+= -DSHUNT_INC='"$(OBJDIR)/dist/include/mozce_shunt"'
-CFLAGS	+= -DSHUNT_LIB='"$(OBJDIR)/dist/lib"'
-CFLAGS	+= -DJEMALLOC_LIB='"$(OBJDIR)/dist/lib/jemalloc.lib"'
-endif
-CFLAGS += -DEBUG -Zi
-
-SDK_TOOLS = $(MOZCE_TOOLS_BIN_DIR)/$(target)-as.exe \
-            $(MOZCE_TOOLS_BIN_DIR)/$(target)-gcc.exe \
-            $(MOZCE_TOOLS_BIN_DIR)/$(target)-lib.exe \
-            $(MOZCE_TOOLS_BIN_DIR)/$(target)-link.exe \
-            $(MOZCE_TOOLS_BIN_DIR)/$(target)-res.exe 
-
-all: libs export
-
-libs: $(SDK_TOOLS)
-
-clean: clobber
-
-
-clobber:
-	rm $(MOZCE_TOOLS_BIN_DIR)/*.exe  
-
-$(MOZCE_TOOLS_BIN_DIR)/linkargs.obj:	$(MOZCE_TOOLS_DIR)/linkargs.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -c -Fo$(MOZCE_TOOLS_BIN_DIR)/linkargs.obj $(MOZCE_TOOLS_DIR)/linkargs.c
-
-$(MOZCE_TOOLS_BIN_DIR)/toolspath.obj:	$(MOZCE_TOOLS_DIR)/toolspath.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -c -Fo$(MOZCE_TOOLS_BIN_DIR)/toolspath.obj $(MOZCE_TOOLS_DIR)/toolspath.c
-
-$(MOZCE_TOOLS_BIN_DIR)/$(target)-as.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-as.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-as.c -link $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-
-$(MOZCE_TOOLS_BIN_DIR)/$(target)-gcc.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-gcc.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile $(MOZCE_TOOLS_BIN_DIR)/linkargs.obj $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-gcc.c -link $(MOZCE_TOOLS_BIN_DIR)/linkargs.obj $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-
-$(MOZCE_TOOLS_BIN_DIR)/$(target)-lib.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-lib.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-lib.c -link $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-
-$(MOZCE_TOOLS_BIN_DIR)/$(target)-link.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-link.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile $(MOZCE_TOOLS_BIN_DIR)/linkargs.obj $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-link.c -link $(MOZCE_TOOLS_BIN_DIR)/linkargs.obj $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-
-$(MOZCE_TOOLS_BIN_DIR)/$(target)-res.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-res.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
-	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-res.c -link $(MOZCE_TOOLS_BIN_DIR)/toolspath.obj
-
-
-export:: $(SDK_TOOLS)
-ifdef MOZCE_NOT_CONFIGURE
-	mkdir -p $(OBJDIR)/dist/sdk/bin
-	cp $^ $(OBJDIR)/dist/sdk/bin
-endif
diff --git a/build/wince/tools/Makefile.in b/build/wince/tools/Makefile.in
deleted file mode 100644
index a4a8b27e8bc7..000000000000
--- a/build/wince/tools/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla core build scripts.
-#
-# The Initial Developer of the Original Code is
-# Brad Lassey <blassey@mozilla.com>
-#
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
-#
-# Contributor(s): 
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-
-TOPSRCDIR = $(topsrcdir)
-OBJDIR = $(shell cd $(DEPTH); pwd -W)
-CFLAGS += -DHAVE_SHUNT
-MOZCE_NOT_CONFIGURE=1
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_MEMORY
-CFLAGS += -DMOZ_MEMORY
-endif
-
-include $(topsrcdir)/build/wince/tools/Makefile
-
-export::
-
-tools::
-
-check::
-
-.NOTPARALLEL:
diff --git a/build/wince/tools/arm-wince-as.c b/build/wince/tools/arm-wince-as.c
deleted file mode 100644
index acd9b40587f5..000000000000
--- a/build/wince/tools/arm-wince-as.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "toolspath.h"
-
-int 
-main(int argc, char **argv)
-{  
-  char* args[1000];
-  int i = 0;
-  
-  args[i++] = ASM_PATH;
-
-  // armasm.exe requires a space between -I and the path. See bug 508721
-  args[i++] = "-I \"" WCE_INC "\""; 
-
-  i += argpath_conv(&argv[1], &args[i]);
-
-  return run(args);
-}
diff --git a/build/wince/tools/arm-wince-gcc.c b/build/wince/tools/arm-wince-gcc.c
deleted file mode 100644
index 60973acc7dcd..000000000000
--- a/build/wince/tools/arm-wince-gcc.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "toolspath.h"
-#include "linkargs.h"
-
-int
-main(int argc, char **argv)
-{
-  int startOfArgvs;
-  int i = 0;
-  int j = 0;
-  int link = 0;
-  int s = 0;
-  int k = 0;
-
-  char* args[1000];
-  char  outputFileArg[1000];
-
-  args[i++] = CL_PATH;
-
-#ifdef HAVE_SHUNT   // simple test to see if we're in configure or not
-  if(!getenv("NO_SHUNT")) {
-    args[i++] = "/I\"" SHUNT_INC "\"";
-    args[i++] = "/FI\"mozce_shunt.h\"";
-  }
-#endif
-#ifdef MOZ_MEMORY
-  args[i++] = "/DMOZ_MEMORY";
-#endif
-  args[i++] = "/I\"" ATL_INC "\"";
-  args[i++] = "/DMOZCE_STATIC_BUILD";
-  args[i++] = "/DUNICODE";
-  args[i++] = "/D_UNICODE_";
-  args[i++] = "/DARM";
-  args[i++] = "/D_ARM_";
-  args[i++] = "/DWINCE";
-  args[i++] = "/D_WIN32_WCE=0x502";
-  args[i++] = "/DUNDER_CE";
-//  args[i++] = "/DWIN32_PLATFORM_WFSP";
-  args[i++] = "/DWIN32_PLATFORM_PSPC";
-//  args[i++] = "/DPOCKETPC2003_UI_MODEL";
-  args[i++] = "/D_WINDOWS";
-  args[i++] = "/DNO_ERRNO";
-  args[i++] = "/D_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA";
-
-  args[i++] = "/GS-";                  // disable security checks
-  args[i++] = "/GR-";                  // disable C++ RTTI
-
-  startOfArgvs = i;
-
-  i += argpath_conv(&argv[1], &args[i]);
-
-  // if /Fe is passed, then link
-  //
-  // if -o is passed, then blank out this argument, and place a "/Fo"
-  // before the next argument
-  while(argv[j])
-    {
-      if (strncmp(argv[j], "-o", 2) == 0)
-	{
-	  printf("%s is -o\n",argv[j]);
-
-
-	  link = strstr(args[startOfArgvs+j], ".obj") ? 0:1;
-
-
-	  // If we are outputting a .OBJ file, then we are
-	  // NOT linking, and we need to do some fancy
-	  // footwork to output "/FoFILENAME" as an argument
-	  args[startOfArgvs+j-1] = "";
-	  strcpy(outputFileArg, ( strstr(args[startOfArgvs+j], ".exe") )?"/Fe":"/Fo");
-	  strcat(outputFileArg, args[startOfArgvs+j]);
-	  args[startOfArgvs+j] = outputFileArg;
-	}
-      if (strcmp(argv[j], "-link") ||
-	  strcmp(argv[j], "-LINK") ||
-	  strcmp(argv[j], "/link") ||
-	  strcmp(argv[j], "/LINK")) 
-	link = 1;
-	  
-      checkLinkArgs(&k, &s, &i, &j, args, argv);
-      j++;
-    }
-
-  if (link)
-    {
-      args[i++] = "/link";
-      addLinkArgs(k, s, &i, &j, args, argv);
-    }
-
-  args[i] = NULL;
-
-  //  dumpargs(args);
-  return run(args);
-}
diff --git a/build/wince/tools/arm-wince-lib.c b/build/wince/tools/arm-wince-lib.c
deleted file mode 100644
index 1c0e79b3df1b..000000000000
--- a/build/wince/tools/arm-wince-lib.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "toolspath.h"
-
-
-int 
-main(int argc, char **argv)
-{
-  char* args[1000];
-  int i = 0;
-
-  args[i++] = LIB_PATH;
-
-  argpath_conv(&argv[1], &args[i]);
-
-  return run(args);
-
-}
diff --git a/build/wince/tools/arm-wince-link.c b/build/wince/tools/arm-wince-link.c
deleted file mode 100644
index 55d2d4f5bd5f..000000000000
--- a/build/wince/tools/arm-wince-link.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "toolspath.h"
-#include "linkargs.h"
-
-int
-main(int argc, char **argv)
-{
-  int iRetVal;
-  char* args[1000];
-  int i = 0;
-  int j = 0;
-  int k = 0;
-  int s = 0;
-
-  // if -DLL is not passed, then change the entry to 'main'
-  while(argv[j]) {
-    checkLinkArgs(&k, &s, &i, &j, args, argv);
-    j++;
-  }
-  args[i++] = LINK_PATH;
-  addLinkArgs(k, s, &i, &j, args, argv);
-
-  argpath_conv(&argv[1], &args[i]);
-
-  return run(args);
-}
-
diff --git a/build/wince/tools/arm-wince-res.c b/build/wince/tools/arm-wince-res.c
deleted file mode 100644
index 323136b19e4b..000000000000
--- a/build/wince/tools/arm-wince-res.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "toolspath.h"
-
-int
-main(int argc, char **argv)
-{
-  int iRetVal;
-  char* args[1000];
-  int i = 0;
-  int j = 0;
-  int k = 0;
-  int s = 0;
-  args[i++] = RC_PATH;
-  args[i++] = "/I\"" WCE_RC_INC "\"";
-  args[i++] = "/I\"" WM_SDK_INC "\"";
-
-  argpath_conv(&argv[1], &args[i]);
-
-  //dumpargs(args);
-
-  return run(args);
-}
diff --git a/build/wince/tools/linkargs.c b/build/wince/tools/linkargs.c
deleted file mode 100644
index f60844f90300..000000000000
--- a/build/wince/tools/linkargs.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "toolspath.h"
-#include "linkargs.h"
-
-void checkLinkArgs(int* k, int* s, int* i, int* j, char** args, char** argv) {
-      if (strncmp(argv[*j], "-DLL", 4) == 0 ||
-	  strncmp(argv[*j], "/DLL", 4) == 0) {
-	*k = 1;
-      }
-      if (strncmp(argv[*j], "-entry", 6) == 0 ||
-	  strncmp(argv[*j], "/entry", 6) == 0 ||
-	  strncmp(argv[*j], "-ENTRY", 6) == 0 ||
-	  strncmp(argv[*j], "/ENTRY",6 ) == 0) {
-	*k = 1;
-      }
-      if (strncmp(argv[*j], "-subsystem:", 11) == 0 ||
-	  strncmp(argv[*j], "/subsystem:", 11) == 0 ||
-	  strncmp(argv[*j], "-SUBSYSTEM:", 11) == 0 ||
-	  strncmp(argv[*j], "/SUBSYSTEM:", 11) == 0) {
-	*s = 1;
-      }
-}
-
-void addLinkArgs(int k, int s, int *i, int *j, char** args, char** argv) {
-  args[(*i)++] = "/LIBPATH:\"" WCE_LIB "\"";
-  args[(*i)++] = "/LIBPATH:\"" WCE_CRT "\"";
-  args[(*i)++] = "/LIBPATH:\"" ATL_LIB "\"";
-  args[(*i)++] = "/NODEFAULTLIB";
-
-  args[(*i)++] = "/MAP";
-  args[(*i)++] = "/MAPINFO:EXPORTS";
-
-  if (getenv("LOCK_DLLS") != NULL) {
-    // lock our dlls in memory
-    args[(*i)++] = "/SECTION:.text,\!P";
-    args[(*i)++] = "/SECTION:.rdata,\!P";
-  }
-
-#ifdef HAVE_SHUNT   // simple test to see if we're in configure or not
-  if(getenv("NO_SHUNT") == NULL) {
-    args[(*i)++] = "/LIBPATH:\"" SHUNT_LIB "\"";
-    args[(*i)++] = "mozce_shunt.lib";
-  }
-#endif
-
-  args[(*i)++] = "corelibc.lib";
-  args[(*i)++] = "coredll.lib";
-  args[(*i)++] = "ceshell.lib";
-  args[(*i)++] = "mmtimer.lib";
-
-  if (k==0)
-    args[(*i)++] = "/ENTRY:mainACRTStartup";
-
-  if (s==0){
-    args[(*i)++] = "/subsystem:\"WINDOWSCE,5.02\"";
-  }
-}
diff --git a/build/wince/tools/linkargs.h b/build/wince/tools/linkargs.h
deleted file mode 100644
index f3a7ea9dd2f5..000000000000
--- a/build/wince/tools/linkargs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef LINKARGS_H
-#define LINKARGS_H
-
-void checkLinkArgs(int* k, int* s, int* i, int* j, char** args, char** argv);
-void addLinkArgs(int k, int s, int *i, int *j, char** args, char** argv);
-
-#endif
diff --git a/build/wince/tools/toolspath.c b/build/wince/tools/toolspath.c
deleted file mode 100644
index f701777aff46..000000000000
--- a/build/wince/tools/toolspath.c
+++ /dev/null
@@ -1,252 +0,0 @@
-#include "toolspath.h"
-int argpath_conv(char **args_in, char **args_out)
-{
-  int i = 0;
-
-  while (args_in[i])
-  {
-    char *offset;
-
-    args_out[i] = args_in[i];
-
-    if (args_in[i])
-    {
-      // First, look for the case of "Fo" and "Fe" options
-      if ( (args_out[i][0] == '-' || args_out[i][0] == '/') &&
-           (args_out[i][1] == 'F') && ((args_out[i][2] == 'o') || (args_out[i][2] == 'e')) &&
-           (args_out[i][3] == '/') && (strlen(args_out[i]) > 5) ) {
-
-        strcpy(noleak_buffers[next_buffer], args_in[i]);
-
-        noleak_buffers[next_buffer][0] = '/';
-        noleak_buffers[next_buffer][3] = noleak_buffers[next_buffer][4];
-        noleak_buffers[next_buffer][4] = ':';
-
-        args_out[i] = noleak_buffers[next_buffer];
-
-        next_buffer++;
-      }
-      else if ((args_out[i][0] == '/') && (args_out[i][2] == '/'))
-      {
-        // Assume this is a pathname, and adjust accordingly
-        //printf("ARGS_IN: PATHNAME ASSUMED: %s\n", args_in[i]);
-
-        strcpy(noleak_buffers[next_buffer], args_in[i]);
-
-        noleak_buffers[next_buffer][0] = noleak_buffers[next_buffer][1];
-        noleak_buffers[next_buffer][1] = ':';
-
-        args_out[i] = noleak_buffers[next_buffer];
-        //printf("ARGS_OUT: PATHNAME MODIFIED TO BE: %s\n", args_out[i]);
-
-        next_buffer++;
-      }
-      else if ((args_out[i][0] == '\\') && (args_out[i][2] == '\\'))
-      {
-        // Assume this is a pathname, and adjust accordingly
-        //printf("ARGS_IN: PATHNAME ASSUMED: %s\n", args_in[i]);
-
-        strcpy(noleak_buffers[next_buffer], args_in[i]);
-
-        noleak_buffers[next_buffer][0] = noleak_buffers[next_buffer][1];
-        noleak_buffers[next_buffer][1] = ':';
-
-        args_out[i] = noleak_buffers[next_buffer];
-        //printf("ARGS_OUT: PATHNAME MODIFIED TO BE: %s\n", args_out[i]);
-
-        next_buffer++;
-      }
-      else if ((args_out[i][0] == '\\') && (args_out[i][1] == '\\') &&
-               (args_out[i][3] == '\\') && (args_out[i][4] == '\\'))
-      {
-        // Assume this is a pathname, and adjust accordingly
-        //printf("ARGS_IN: PATHNAME ASSUMED: %s\n", args_in[i]);
-
-        noleak_buffers[next_buffer][0] = args_in[i][2];
-        noleak_buffers[next_buffer][1] = ':';
-        noleak_buffers[next_buffer][2] = '\0';
-
-        strcpy(noleak_buffers[next_buffer], &args_in[i][3]);
-
-        args_out[i] = noleak_buffers[next_buffer];
-        //printf("ARGS_OUT: PATHNAME MODIFIED TO BE: %s\n", args_out[i]);
-
-        next_buffer++;
-      }
-      else if ( strstr(args_out[i], "OUT:") || strstr(args_out[i], "DEF:") )
-      {
-        // Deal with -OUT:/c/....
-        //
-        // NOTE: THERE IS A BUG IN THIS IMPLEMENTATION IF 
-        //       THERE IS A SPACE IN THE TOPSRCDIR PATH.
-        //
-        // Should really check for spaces, then double-quote
-        // the path if any space is found.
-        // -- wolfe@lobo.us  25-Aug-08
-        if ((args_out[i][5] == '/') && (args_out[i][7] == '/'))
-        {
-          // Assume this is a pathname, and adjust accordingly
-          //printf("ARGS_IN: PATHNAME ASSUMED: %s\n", args_in[i]);
-
-          strcpy(noleak_buffers[next_buffer], args_in[i]);
-
-          noleak_buffers[next_buffer][5] = noleak_buffers[next_buffer][6];
-          noleak_buffers[next_buffer][6] = ':';
-
-          args_out[i] = noleak_buffers[next_buffer];
-          //printf("ARGS_OUT: PATHNAME MODIFIED TO BE: %s\n", args_out[i]);
-        }
-        // Deal with -OUT:"/c/...."
-        else if ((args_out[i][6] == '/') && (args_out[i][8] == '/'))
-        {
-          // Assume this is a pathname, and adjust accordingly
-          //printf("ARGS_IN: PATHNAME ASSUMED: %s\n", args_in[i]);
-
-          strcpy(noleak_buffers[next_buffer], args_in[i]);
-
-          noleak_buffers[next_buffer][6] = noleak_buffers[next_buffer][7];
-          noleak_buffers[next_buffer][7] = ':';
-
-          args_out[i] = noleak_buffers[next_buffer];
-          //printf("ARGS_OUT: PATHNAME MODIFIED TO BE: %s\n", args_out[i]);
-        }
-
-        next_buffer++;
-      }
-      else
-      {
-        char *offset = strstr(args_out[i], "/cygdrive/");
-
-        if (offset) {
-
-          strcpy(offset, offset+9);
-          offset[0] = offset[1];
-          offset[1] = ':';
-          offset[2] = '/';
-        }
-
-        if ( (args_out[i][0] == '-' || args_out[i][0] == '/') &&
-             (args_out[i][1] == 'D'))
-        {
-
-          offset = strstr(args_out[i]+2, "=");
-          if (offset)
-          {
-            char* equalsChar = offset;
-
-            if (equalsChar[1] == '"')
-            {
-              *equalsChar = '\0';
-
-              strcpy(noleak_buffers[next_buffer], args_out[i]);
-
-              *equalsChar = '=';
-
-              strcat(noleak_buffers[next_buffer], "=\\\"");
-              strcat(noleak_buffers[next_buffer], equalsChar+1);
-              strcat(noleak_buffers[next_buffer], "\\\"");
-
-              args_out[i] = noleak_buffers[next_buffer];
-
-              next_buffer++;
-            }
-          }
-        }
-      }
-
-      if (next_buffer > MAX_NOLEAK_BUFFERS) {
-        printf("OOPS - next_buffer > MAX_NOLEAK_BUFFERS\n");
-        exit(-1);
-      }
-    }
-    i++;
-  }
-  args_out[i] = NULL;
-  return i;
-}
-
-void dumpargs(char** args)
-{
- int i = 0;
-
- if (args[0] == NULL)
-   printf(":: first element is null!\n");
-
- while(args[i])
-   printf("%s ", args[i++]);
-
- printf("\n");
- fflush(stdout);
- fflush(stderr);
-}
-
-
-DWORD run(char** args)
-{
-
- DWORD exitCode;
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
-
- char theCmdLine[1024*32] = {'\0'};
-
- int totalLen = 0;
- int i, j;
-
-
- // Clear any link env variable that might get us tangled up
- _putenv("LINK=");
- _putenv("LIBPATH=");
- _putenv("CC=");
-
- _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" WCE_INC);
- _putenv("LIB=" WCE_LIB ";" WCE_CRT);
-
- i = strlen(args[0]);
- for (j=0; j<i; j++)
- {
-   if (args[0][j] == '/')
-     args[0][j] = '\\';
- }
-
- for (j=0; args[j]; j++)
- {
-   int len = strlen(args[j]);
-   strcat(&theCmdLine[totalLen], args[j]);
-   totalLen += len;
-
-   strcat(&theCmdLine[totalLen], " ");
-   totalLen++;
- }
-
- ZeroMemory( &si, sizeof(si) );
- si.cb = sizeof(si);
- ZeroMemory( &pi, sizeof(pi));
-
- // See bug 508721.
- // lpApplicationName (first parameter) when provided conflicts with
- // the first token in the lpCommandLine (second parameter).
- // So we pass the whole command line including the EXE in lpCommandLine.
- // See http://support.microsoft.com/kb/175986 for more info.
- CreateProcess(NULL,
-               theCmdLine,
-               NULL,
-               NULL,
-               0,
-               0,
-               NULL,
-               NULL,
-               &si,              // Pointer to STARTUPINFO structure.
-               &pi);
-
-
- // Wait until child process exits.
- WaitForSingleObject( pi.hProcess, INFINITE );
- GetExitCodeProcess(pi.hProcess, &exitCode);
- // Close process and thread handles.
- CloseHandle( pi.hProcess );
- CloseHandle( pi.hThread );
-
- return exitCode;
-}
-
diff --git a/build/wince/tools/toolspath.h b/build/wince/tools/toolspath.h
deleted file mode 100644
index b3d0765b3093..000000000000
--- a/build/wince/tools/toolspath.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef TOOLPATH_H
-#define TOOLPATH_H
-
-#include <windows.h>
-#include <stdio.h>
-#include <process.h>
-
-#define WCE_BIN    VC_PATH "ce\\bin\\x86_arm\\"
-#define WCE_RC_BIN WIN_SDK_PATH  "bin\\"
-#define WCE_CRT    VC_PATH "ce\\lib\\armv4i"
-#define WM_SDK_INC    WM_SDK_PATH "Include/Armv4i"
-#define WCE_LIB    WM_SDK_PATH "Lib/Armv4i"
-#define WCE_RC_INC  VC_PATH "ce\\atlmfc\\include"
-#define WCE_INC  VC_PATH "ce\\include"
-#define ATL_INC  VC_PATH "ce\\atlmfc\\include"
-#define ATL_LIB  VC_PATH "ce\\atlmfc\\lib\\armv4i"
-
-#ifndef SHUNT_LIB
-#define SHUNT_LIB ""
-#endif
-
-#ifndef SHUNT_INC
-#define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
-#endif
-
-#define ASM_PATH  "\"" WCE_BIN "armasm.exe\""
-#define CL_PATH   "\"" WCE_BIN "cl.exe\""
-#define LIB_PATH  "\"" WCE_BIN "lib.exe\""
-#define LINK_PATH "\"" WCE_BIN "link.exe\""
-#define RC_PATH   "\"" WCE_RC_BIN "rc.exe\""
-
-#define MAX_NOLEAK_BUFFERS 1000
-char noleak_buffers[MAX_NOLEAK_BUFFERS][1024];
-static int next_buffer = 0;
-int argpath_conv(char **args_in, char **args_out);
-void dumpargs(char** args);
-DWORD run(char** args);
-
-#endif
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 5a70a2e3ceed..df94ce814cc0 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -655,10 +655,6 @@ MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
-WINCE		= @WINCE@
-WINCE_SDK_DIR   = @WINCE_SDK_DIR@
-
-WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
@@ -712,7 +708,7 @@ ANDROID_PACKAGE_NAME = @ANDROID_PACKAGE_NAME@
 JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@
 
 # We only want to do the pymake sanity on Windows, other os's can cope
-ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 # Ensure invariants between GNU Make and pymake
 # Checked here since we want the sane error in a file that
 # actually can be found regardless of path-style.
@@ -722,4 +718,4 @@ endif
 ifeq (1_a,$(.PYMAKE)_$(firstword a$(subst /, ,$(srcdir))))
 $(error MSYS-style srcdir being used with Pymake. Did you mean to run GNU Make instead? [see-also: https://developer.mozilla.org/en/Gmake_vs._Pymake])
 endif
-endif # Windows
+endif # WINNT
diff --git a/config/config.mk b/config/config.mk
index f52607b39aa0..568bf0c2e1cb 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -147,7 +147,7 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
 
 ifdef MOZ_MEMORY
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifneq ($(OS_ARCH),WINNT)
 JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
 # If we are linking jemalloc into a program, we want the jemalloc symbols
 # to be exported
@@ -398,7 +398,7 @@ endif
 # Force _all_ exported methods to be |_declspec(dllexport)| when we're
 # building them into the executable.
 
-ifeq (,$(filter-out WINNT WINCE OS2, $(OS_ARCH)))
+ifeq (,$(filter-out WINNT OS2, $(OS_ARCH)))
 ifdef BUILD_STATIC_LIBS
 DEFINES += \
         -D_IMPL_NS_GFX \
@@ -589,13 +589,11 @@ endif
 # we link statically or dynamic?  Assuming dynamic for now.
 
 ifneq (WINNT_,$(OS_ARCH)_$(GNU_CC))
-ifneq (,$(filter-out WINCE,$(OS_ARCH)))
 LIBS_DIR	= -L$(DIST)/bin -L$(DIST)/lib
 ifdef LIBXUL_SDK
 LIBS_DIR	+= -L$(LIBXUL_SDK)/bin -L$(LIBXUL_SDK)/lib
 endif
 endif
-endif
 
 # Default location of include files
 IDL_DIR		= $(DIST)/idl
@@ -805,9 +803,6 @@ MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
 endif
 MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
 
-ifdef WINCE
-RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
-else
 ifeq (OS2,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
 else
@@ -815,7 +810,6 @@ ifneq (WINNT,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
 endif # ! WINNT
 endif # ! OS2
-endif # ! WINCE
 
 #
 # Java macros
diff --git a/config/rules.mk b/config/rules.mk
index c70470430595..9bf282722560 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -82,7 +82,7 @@ else
   ELOG :=
 endif
 
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 _VPATH_SRCS = $(abspath $<)
 else
 _VPATH_SRCS = $<
@@ -246,7 +246,7 @@ ifdef LIB_IS_C_ONLY
 MKSHLIB			= $(MKCSHLIB)
 endif
 
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 IMPORT_LIBRARY		:= $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
 endif
 
@@ -302,7 +302,7 @@ ifdef JAVA_LIBRARY_NAME
 JAVA_LIBRARY := $(JAVA_LIBRARY_NAME).jar
 endif
 
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 
 #
@@ -357,7 +357,7 @@ OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
 endif # Solaris Sun Studio C++
 
-ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
@@ -666,21 +666,11 @@ OUTOPTION = -Fo# eol
 else
 OUTOPTION = -o # eol
 endif # WINNT && !GNU_CC
-ifneq (,$(filter WINCE,$(OS_ARCH)))
-OUTOPTION = -Fo# eol
-endif
-
-ifeq ($(OS_ARCH), WINCE)
-OUTOPTION = -Fo# eol
-HOST_OUTOPTION = -Fo# eol
-else
 
 ifeq (,$(CROSS_COMPILE))
 HOST_OUTOPTION = $(OUTOPTION)
 else
 HOST_OUTOPTION = -o # eol
-endif
-
 endif
 ################################################################################
 
@@ -865,7 +855,7 @@ ifndef NO_COMPONENTS_MANIFEST
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
 endif
 else # ! IS_COMPONENT
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
 else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
@@ -965,9 +955,6 @@ alltags:
 #
 $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
 	@$(RM) $@.manifest
-ifeq (WINCE,$(OS_ARCH))
-	$(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -997,7 +984,6 @@ else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
-endif # WINCE
 
 ifdef ENABLE_STRIP
 	$(STRIP) $@
@@ -1007,9 +993,6 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 endif
 
 $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -1033,7 +1016,6 @@ else
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif # HOST_CPP_PROG_LINK
 endif
-endif
 
 #
 # This is an attempt to support generation of multiple binaries
@@ -1044,9 +1026,6 @@ endif
 # creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
 #
 $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(EXPAND_LD) -nologo  -entry:mainACRTStartup -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -1063,7 +1042,6 @@ else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
-endif # WINCE
 
 ifdef ENABLE_STRIP
 	$(STRIP) $@
@@ -1073,9 +1051,6 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 endif
 
 $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(HOST_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-else
 ifeq (WINNT_,$(HOST_OS_ARCH)_$(GNU_CC))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 else
@@ -1085,7 +1060,6 @@ else
 	$(HOST_CC) $(HOST_OUTOPTION)$@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif
 endif
-endif
 
 #
 # Purify target.  Solaris/sparc only to start.
@@ -1124,7 +1098,7 @@ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEP
 $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 	$(EXPAND_LIBS_GEN) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) > $@
 
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
 endif
 
@@ -1382,7 +1356,7 @@ endif
 ###############################################################################
 # Java rules
 ###############################################################################
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SEP := ;
 else
 SEP := :
@@ -1394,7 +1368,7 @@ SPACE := $(EMPTY) $(EMPTY)
 # MSYS has its own special path form, but javac expects the source and class
 # paths to be in the DOS form (i.e. e:/builds/...).  This function does the
 # appropriate conversion on Windows, but is a noop on other systems.
-ifeq (,$(filter-out WINNT WINCE, $(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 #  We use 'pwd -W' to get DOS form of the path.  However, since the given path
 #  could be a file or a non-existent path, we cannot call 'pwd -W' directly
 #  on the path.  Instead, we extract the root path (i.e. "c:/"), call 'pwd -W'
diff --git a/configure.in b/configure.in
index 80e899be25cb..a3567e00c024 100644
--- a/configure.in
+++ b/configure.in
@@ -357,47 +357,6 @@ AR_FLAGS='cr $@'
 
 if test "$COMPILE_ENVIRONMENT"; then
 
-dnl Do some special WinCE toolchain stuff
-case "$target" in
-*wince|*winmo)
-
-    MOZ_ARG_WITH_STRING(wince-sdk,
-    [  --with-wince-sdk=WINCE_SDK_DIR
-                          The path to the Windows CE SDK],
-    WINCE_SDK_DIR=$withval)
-
-    AC_DEFINE(WINCE)
-    
-    export WINCE=1
-
-    echo -----------------------------------------------------------------------------
-    echo Building Windows CE Shunt Library and Tool Chain
-    echo Using SDK in:
-    echo $WINCE_SDK_DIR
-
-    ac_exeext=.exe
-
-    _pwd=`pwd -W`
-    _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
-    make WINCE_SDK_DIR="$WINCE_SDK_DIR" \
-         TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
-         -C $srcdir/build/wince/tools
-
-    CC="$_pwd/dist/sdk/bin/$target-gcc.exe"
-    CXX="$_pwd/dist/sdk/bin/$target-gcc.exe"
-    CPP="$_pwd/dist/sdk/bin/$target-gcc.exe -E -nologo"
-    CXXCPP="$_pwd/dist/sdk/bin/$target-gcc.exe -TP -E -nologo"
-    LD="$_pwd/dist/sdk/bin/$target-link.exe"
-    AR="$_pwd/dist/sdk/bin/$target-lib.exe"
-    AS="$_pwd/dist/sdk/bin/$target-as.exe"
-    RC="$_pwd/dist/sdk/bin/$target-res.exe"
-
-
-    echo -----------------------------------------------------------------------------
-
-    ;;
-esac
-
 if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
@@ -567,19 +526,12 @@ if test "$GXX" = yes; then
    fi
 fi
 
+dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
-case "$target" in
-*-wince|*-winmo)
-    WINVER=500
-    WINSDK_TARGETVER=502
-    ;;
-*)
-    WINVER=502
-    dnl Target the Windows 7 SDK by default
-    WINSDK_TARGETVER=601
-    ;;
-esac
+WINVER=502
+dnl Target the Windows 7 SDK by default
+WINSDK_TARGETVER=601
 
 MOZ_ARG_WITH_STRING(windows-version,
 [  --with-windows-version=WINSDK_TARGETVER
@@ -608,7 +560,7 @@ fi
 fi
 
 case "$target" in
-*-mingw*|*-wince|*-winmo)
+*-mingw*)
     if test "$GCC" != "yes"; then
         # Check to see if we are really running in a msvc environemnt
         _WIN32_MSVC=1
@@ -931,15 +883,9 @@ if test -n "$_WIN32_MSVC"; then
 
     # Since we're skipping compiler and library checks, hard-code
     # some facts here.
-    case "$target" in
-    *-wince|*-winmo)
-        ;;
-    *)
-        AC_DEFINE(HAVE_IO_H)
-        AC_DEFINE(HAVE_SETBUF)
-        AC_DEFINE(HAVE_ISATTY)
-        ;;
-    esac
+    AC_DEFINE(HAVE_IO_H)
+    AC_DEFINE(HAVE_SETBUF)
+    AC_DEFINE(HAVE_ISATTY)
 fi
 
 fi # COMPILE_ENVIRONMENT
@@ -1274,8 +1220,6 @@ if test -n "$CROSS_COMPILE"; then
         gnu*)         OS_ARCH=GNU ;;
         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
         mingw*)       OS_ARCH=WINNT ;;
-        wince*)       OS_ARCH=WINCE ;;
-        winmo*)       OS_ARCH=WINCE ;;
         darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
     esac
     case "${target}" in
@@ -1479,19 +1423,6 @@ UnixWare)
     OS_ARCH=UNIXWARE
     OS_RELEASE=`uname -v`
     ;;
-WINCE)
-    OS_ARCH=WINCE
-    case "${target_os}" in
-    *winmo)
-        OS_TARGET=WINMO
-        WINCE_WINDOWS_MOBILE=1
-        AC_DEFINE(WINCE_WINDOWS_MOBILE)
-        ;;
-    *)
-        OS_TARGET=WINCE
-        ;;
-    esac
-    ;;
 Darwin)
     case "${target_cpu}" in
     powerpc*)
@@ -1923,7 +1854,7 @@ dnl ========================================================
 dnl System overrides of the defaults for host
 dnl ========================================================
 case "$host" in
-*mingw*|*wince|*winmo)
+*mingw*)
     if test -n "$_WIN32_MSVC"; then
         HOST_AR=lib
         HOST_AR_FLAGS='-NOLOGO -OUT:"$@"'
@@ -2282,105 +2213,6 @@ ia64*-hpux*)
     esac
     ;;
 
-*-wince*|*-winmo*)
-    TARGET_COMPILER_ABI=msvc
-    _PLATFORM_DEFAULT_TOOLKIT=cairo-windows
-    MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
-    MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
-    AR_LIST="$AR -list"
-    AR_EXTRACT=
-    AR_DELETE="$AR d"
-    AR_FLAGS='-OUT:"$@"'
-    MOZ_MEMORY=1
-    NSS_DISABLE_DBM=1
-    MOZ_OGG=
-    ac_configure_args="$ac_configure_args --enable-win32-target=WINCE"
-
-    if test "$AS_BIN"; then
-        AS="$AS_BIN"
-    fi
-    DSO_CFLAGS=
-    DSO_PIC_CFLAGS=
-    DLL_SUFFIX=.dll
-    BIN_SUFFIX='.exe'
-    if test -z "$RC"; then 
-        RC=rc.exe  
-    fi
-    # certain versions of cygwin's makedepend barf on the 
-    # #include <string> vs -I./dist/include/string issue so don't use it
-    SYSTEM_MAKEDEPEND=
-
-    HOST_CC=cl
-    HOST_CXX=cl
-    HOST_LD=link
-    HOST_AR='lib'
-    HOST_AR_FLAGS='-OUT:$@'
-    HOST_RANLIB='echo ranlib'
-    HOST_CFLAGS="$HOST_CFLAGS -D_X86_"
-        
-        
-    WARNINGS_AS_ERRORS='-WX'
-    MOZ_OPTIMIZE_FLAGS='-Ox'
-    AR_FLAGS='-NOLOGO -OUT:"$@"'
-    ASM_SUFFIX=asm
-    CFLAGS="$CFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
-    CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
-    DLL_PREFIX=
-    DOXYGEN=:
-    DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE
-    DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    GARBAGE=
-    IMPORT_LIB_SUFFIX=lib
-    dnl Need to force-link against mozalloc because it's used in the shunt
-    LIBS="$LIBS \$(LIBXUL_DIST)/lib/mozalloc.lib"
-    LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    LIB_PREFIX=
-    LIB_SUFFIX=lib 
-    MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
-    MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
-    MKSHLIB_FORCE_ALL=
-    MKSHLIB_UNFORCE_ALL=
-    MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
-    MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
-    MOZ_DEBUG_FLAGS='-Zi'
-    MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
-    MOZ_FIX_LINK_PATHS=
-    OBJ_SUFFIX=obj
-    RANLIB='echo not_ranlib'
-    STRIP='echo not_strip'
-    TARGET_NSPR_MDCPUCFG='\"md/_wince.cfg\"'
-    UNZIP=unzip
-    XARGS=xargs
-    XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    ZIP=zip
-    MOZ_TREE_FREETYPE=1
-
-    AC_DEFINE(HAVE_SNPRINTF)
-    AC_DEFINE(_WINDOWS)
-    AC_DEFINE(WIN32)
-    AC_DEFINE(XP_WIN)
-    AC_DEFINE(XP_WIN32)
-    AC_DEFINE(HW_THREADS)
-    AC_DEFINE(STDC_HEADERS)
-    AC_DEFINE(NEW_H, <new>)
-    AC_DEFINE(WIN32_LEAN_AND_MEAN)
-    AC_DEFINE(HAVE_LOCALTIME_R)
-
-    TARGET_MD_ARCH=win32
-    _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
-    BIN_SUFFIX='.exe'
-    MOZ_USER_DIR="Mozilla"
-
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-
-    # Sanity check for WINCE_WINDOWS_MOBILE
-    # XXX disabled until we can fix the mobile tinderbox
-    ##if test "$WINCE_WINDOWS_MOBILE"; then
-    ##   MOZ_CHECK_HEADER(tpcshell.h, [],
-    ##        AC_MSG_ERROR([Can't find tpcshell.h in your SDK; are you sure you don't need --disable-windows-mobile-components?]))
-    ##fi
-;;
-
 *-mingw*)
     DSO_CFLAGS=
     DSO_PIC_CFLAGS=
@@ -2897,7 +2729,7 @@ case "$target" in
 *-aix4.3*|*-aix5*)
     NO_LD_ARCHIVE_FLAGS=
     ;;
-*-mingw*|*-wince|*-winmo)
+*-mingw*)
     if test -z "$GNU_CC"; then
         NO_LD_ARCHIVE_FLAGS=
     fi
@@ -2931,7 +2763,7 @@ case "$target" in
     *-darwin*)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list'
         ;;
-    *-mingw*|*-wince|*-winmo)
+    *-mingw*)
         if test -n "$GNU_CC"; then
            MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         fi
@@ -3883,7 +3715,7 @@ if test "$ac_cv_func_gnu_get_libc_version" = "yes"; then
 fi
 
 case $target_os in
-    darwin*|mingw*|os2*|wince*|winmo*)
+    darwin*|mingw*|os2*)
         ;;
     *)
     
@@ -4623,10 +4455,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then
                 AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it]))
     CFLAGS=$_SAVE_CFLAGS
 else
-    if test "$OS_ARCH" = "WINCE"; then
-        NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
-        NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
-    elif test "$OS_ARCH" = "WINNT"; then
+    if test "$OS_ARCH" = "WINNT"; then
         NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
         if test -n "$GNU_CC"; then
             NSPR_LIBS="-L${LIBXUL_DIST}/lib -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
@@ -4700,7 +4529,7 @@ else
         \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nss$NSS_VERSION\$(DLL_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION\$(DLL_SUFFIX)"
 
-   if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "WINCE" -o "$OS_ARCH" = "OS2"; then
+   if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2"; then
        NSS_LIBS="\
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(LIB_SUFFIX) \
@@ -4999,7 +4828,7 @@ XPC_IDISPATCH_SUPPORT=
 
 
 case "${target}" in
-*android*|*darwin*|*wince*|*winmo*)
+*android*|*darwin*)
     ACCESSIBILITY=
     ;;
 *)
@@ -5152,7 +4981,7 @@ MOZ_ARG_HEADER(Toolkit Options)
                             Mac OS X - cairo-cocoa
                             Neutrino/QNX - photon
                             OS/2 - cairo-os2
-                            Win32/WinCE - cairo-windows
+                            Win32 - cairo-windows
                             Gtk2 with DirectFB - cairo-gtk2-dfb
                             * - cairo-gtk2
                             * - cairo-qt],
@@ -5189,11 +5018,6 @@ photon)
 cairo-windows)
     MOZ_WIDGET_TOOLKIT=windows
     MOZ_WEBGL=1
-    case "${target}" in
-    *-wince*)
-        NS_PRINTING=
-        ;;
-    esac
     MOZ_PDF_PRINTING=1
     ;;
 
@@ -6575,7 +6399,7 @@ dnl ========================================================
 dnl Installer
 dnl ========================================================
 case "$target_os" in
-    aix*|solaris*|linux*|mingw*|os2*|wince*|winmo*)
+    aix*|solaris*|linux*|mingw*|os2*)
         MOZ_INSTALLER=1
         ;;
 esac
@@ -7511,17 +7335,6 @@ else
     DLLFLAGS="$DLLFLAGS $MOZ_MEMORY_LDFLAGS"
     export DLLFLAGS
     ;;
-  *-*wince)
-    AC_DEFINE(MOZ_MEMORY_WINCE)
-    AC_DEFINE(MOZ_MEMORY_WINDOWS)
-    if test -z "$WINCE_WINDOWS_MOBILE"; then
-      AC_DEFINE(MOZ_MEMORY_WINCE6)
-    fi
-    ;;
-  *-*winmo)
-    AC_DEFINE(MOZ_MEMORY_WINCE)
-    AC_DEFINE(MOZ_MEMORY_WINDOWS)
-    ;;
   *-android*)
     AC_DEFINE(MOZ_MEMORY_LINUX)
     AC_DEFINE(MOZ_MEMORY_ANDROID)
@@ -8601,19 +8414,13 @@ if test "$MOZ_TREE_CAIRO"; then
         ;;
       windows)
         WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
-        if test -z "$WINCE"; then
-            WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
-            if test "$MOZ_WINSDK_TARGETVER" -ge "06010000"; then
-                WIN32_DWRITE_FONT_FEATURE="#define CAIRO_HAS_DWRITE_FONT 1"
-                WIN32_D2D_SURFACE_FEATURE="#define CAIRO_HAS_D2D_SURFACE 1"
-                MOZ_ENABLE_D2D_SURFACE=1
-                MOZ_ENABLE_DWRITE_FONT=1
-            else
-                WIN32_DWRITE_FONT_FEATURE=
-                WIN32_D2D_SURFACE_FEATURE=
-            fi
+        WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
+        if test "$MOZ_WINSDK_TARGETVER" -ge "06010000"; then
+            WIN32_DWRITE_FONT_FEATURE="#define CAIRO_HAS_DWRITE_FONT 1"
+            WIN32_D2D_SURFACE_FEATURE="#define CAIRO_HAS_D2D_SURFACE 1"
+            MOZ_ENABLE_D2D_SURFACE=1
+            MOZ_ENABLE_DWRITE_FONT=1
         else
-            WIN32_FONT_FEATURE=
             WIN32_DWRITE_FONT_FEATURE=
             WIN32_D2D_SURFACE_FEATURE=
         fi
@@ -8827,8 +8634,7 @@ if test "$NECKO_WIFI" -a \
         "$OS_ARCH" != "Linux" -a \
         "$OS_ARCH" != "Darwin" -a \
         "$OS_ARCH" != "SunOS" -a \
-        "$OS_ARCH" != "WINNT" -a \
-        "$OS_ARCH" != "WINCE"; then
+        "$OS_ARCH" != "WINNT"; then
   AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
 fi
 
@@ -8866,12 +8672,7 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
-  if test "$OS_ARCH" = "WINCE" -a `echo $OS_TEST | grep -ic arm` = 1; then
-    # Disable ctypes for arm/wince.
-    BUILD_CTYPES=
-  else
     AC_DEFINE(BUILD_CTYPES)
-  fi
 fi
 
 dnl NECKO_ configuration options are not global
@@ -9049,10 +8850,6 @@ AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(PYTHON)
 AC_SUBST(MAKENSISU)
 
-AC_SUBST(WINCE)
-AC_SUBST(WINCE_SDK_DIR)
-AC_SUBST(WINCE_WINDOWS_MOBILE)
-
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
@@ -9276,7 +9073,7 @@ dnl ========================================================
 if test "$OS_ARCH" = "Darwin"; then
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_ASYNC_DNS)
-elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" -a "$OS_ARCH" != "WINCE"; then
+elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_ASYNC_DNS)
 fi
@@ -9499,7 +9296,7 @@ fi
 if test -z "$MOZ_NATIVE_NSPR"; then
     # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
     AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
-    if test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "WINCE"; then
+    if test "$OS_ARCH" != "WINNT"; then
        NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
        $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
        NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 102b38d5307e..9cfbe9e9676a 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -321,9 +321,6 @@ MOZ_MEMORY_LDFLAGS = @MOZ_MEMORY_LDFLAGS@
 # Codesighs tools option, enables win32 mapfiles.
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
-WINCE		= @WINCE@
-WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
-
 QEMU_CANT_RUN_JS_SHELL = @QEMU_CANT_RUN_JS_SHELL@
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
@@ -346,7 +343,7 @@ JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@
 HAVE_LINUX_PERF_EVENT_H = @HAVE_LINUX_PERF_EVENT_H@
 
 # We only want to do the pymake sanity on Windows, other os's can cope
-ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 # Ensure invariants between GNU Make and pymake
 # Checked here since we want the sane error in a file that
 # actually can be found regardless of path-style.
@@ -356,4 +353,4 @@ endif
 ifeq (1_a,$(.PYMAKE)_$(firstword a$(subst /, ,$(srcdir))))
 $(error MSYS-style srcdir being used with Pymake. Did you mean to run GNU Make instead? [see-also: https://developer.mozilla.org/en/Gmake_vs._Pymake])
 endif
-endif # Windows
+endif # WINNT
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index f52607b39aa0..568bf0c2e1cb 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -147,7 +147,7 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
 
 ifdef MOZ_MEMORY
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifneq ($(OS_ARCH),WINNT)
 JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
 # If we are linking jemalloc into a program, we want the jemalloc symbols
 # to be exported
@@ -398,7 +398,7 @@ endif
 # Force _all_ exported methods to be |_declspec(dllexport)| when we're
 # building them into the executable.
 
-ifeq (,$(filter-out WINNT WINCE OS2, $(OS_ARCH)))
+ifeq (,$(filter-out WINNT OS2, $(OS_ARCH)))
 ifdef BUILD_STATIC_LIBS
 DEFINES += \
         -D_IMPL_NS_GFX \
@@ -589,13 +589,11 @@ endif
 # we link statically or dynamic?  Assuming dynamic for now.
 
 ifneq (WINNT_,$(OS_ARCH)_$(GNU_CC))
-ifneq (,$(filter-out WINCE,$(OS_ARCH)))
 LIBS_DIR	= -L$(DIST)/bin -L$(DIST)/lib
 ifdef LIBXUL_SDK
 LIBS_DIR	+= -L$(LIBXUL_SDK)/bin -L$(LIBXUL_SDK)/lib
 endif
 endif
-endif
 
 # Default location of include files
 IDL_DIR		= $(DIST)/idl
@@ -805,9 +803,6 @@ MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
 endif
 MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
 
-ifdef WINCE
-RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
-else
 ifeq (OS2,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
 else
@@ -815,7 +810,6 @@ ifneq (WINNT,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
 endif # ! WINNT
 endif # ! OS2
-endif # ! WINCE
 
 #
 # Java macros
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index c70470430595..9bf282722560 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -82,7 +82,7 @@ else
   ELOG :=
 endif
 
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 _VPATH_SRCS = $(abspath $<)
 else
 _VPATH_SRCS = $<
@@ -246,7 +246,7 @@ ifdef LIB_IS_C_ONLY
 MKSHLIB			= $(MKCSHLIB)
 endif
 
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 IMPORT_LIBRARY		:= $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
 endif
 
@@ -302,7 +302,7 @@ ifdef JAVA_LIBRARY_NAME
 JAVA_LIBRARY := $(JAVA_LIBRARY_NAME).jar
 endif
 
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 
 #
@@ -357,7 +357,7 @@ OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
 endif # Solaris Sun Studio C++
 
-ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
@@ -666,21 +666,11 @@ OUTOPTION = -Fo# eol
 else
 OUTOPTION = -o # eol
 endif # WINNT && !GNU_CC
-ifneq (,$(filter WINCE,$(OS_ARCH)))
-OUTOPTION = -Fo# eol
-endif
-
-ifeq ($(OS_ARCH), WINCE)
-OUTOPTION = -Fo# eol
-HOST_OUTOPTION = -Fo# eol
-else
 
 ifeq (,$(CROSS_COMPILE))
 HOST_OUTOPTION = $(OUTOPTION)
 else
 HOST_OUTOPTION = -o # eol
-endif
-
 endif
 ################################################################################
 
@@ -865,7 +855,7 @@ ifndef NO_COMPONENTS_MANIFEST
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
 endif
 else # ! IS_COMPONENT
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
 else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
@@ -965,9 +955,6 @@ alltags:
 #
 $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
 	@$(RM) $@.manifest
-ifeq (WINCE,$(OS_ARCH))
-	$(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -997,7 +984,6 @@ else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
-endif # WINCE
 
 ifdef ENABLE_STRIP
 	$(STRIP) $@
@@ -1007,9 +993,6 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 endif
 
 $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -1033,7 +1016,6 @@ else
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif # HOST_CPP_PROG_LINK
 endif
-endif
 
 #
 # This is an attempt to support generation of multiple binaries
@@ -1044,9 +1026,6 @@ endif
 # creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
 #
 $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(EXPAND_LD) -nologo  -entry:mainACRTStartup -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 ifdef MSMANIFEST_TOOL
@@ -1063,7 +1042,6 @@ else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
-endif # WINCE
 
 ifdef ENABLE_STRIP
 	$(STRIP) $@
@@ -1073,9 +1051,6 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 endif
 
 $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
-ifeq (WINCE,$(OS_ARCH))
-	$(HOST_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-else
 ifeq (WINNT_,$(HOST_OS_ARCH)_$(GNU_CC))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 else
@@ -1085,7 +1060,6 @@ else
 	$(HOST_CC) $(HOST_OUTOPTION)$@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif
 endif
-endif
 
 #
 # Purify target.  Solaris/sparc only to start.
@@ -1124,7 +1098,7 @@ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEP
 $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 	$(EXPAND_LIBS_GEN) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) > $@
 
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
 endif
 
@@ -1382,7 +1356,7 @@ endif
 ###############################################################################
 # Java rules
 ###############################################################################
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SEP := ;
 else
 SEP := :
@@ -1394,7 +1368,7 @@ SPACE := $(EMPTY) $(EMPTY)
 # MSYS has its own special path form, but javac expects the source and class
 # paths to be in the DOS form (i.e. e:/builds/...).  This function does the
 # appropriate conversion on Windows, but is a noop on other systems.
-ifeq (,$(filter-out WINNT WINCE, $(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 #  We use 'pwd -W' to get DOS form of the path.  However, since the given path
 #  could be a file or a non-existent path, we cannot call 'pwd -W' directly
 #  on the path.  Instead, we extract the root path (i.e. "c:/"), call 'pwd -W'
diff --git a/js/src/configure.in b/js/src/configure.in
index d41ea4c3e16e..0ff6e040de70 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -568,17 +568,9 @@ fi
 
 dnl Special win32 checks
 dnl ========================================================
-case "$target" in
-*-wince|*-winmo)
-    WINVER=500
-    WINSDK_TARGETVER=502
-    ;;
-*)
-    WINVER=502
-    dnl Target the Windows 7 SDK by default
-    WINSDK_TARGETVER=601
-    ;;
-esac
+WINVER=502
+dnl Target the Windows 7 SDK by default
+WINSDK_TARGETVER=601
 
 MOZ_ARG_WITH_STRING(windows-version,
 [  --with-windows-version=WINSDK_TARGETVER
@@ -600,7 +592,7 @@ case "$WINSDK_TARGETVER" in
 esac
 
 case "$target" in
-*-mingw*|*-wince|*-winmo)
+*-mingw*)
     if test "$GCC" != "yes"; then
         # Check to see if we are really running in a msvc environemnt
         _WIN32_MSVC=1
@@ -894,24 +886,17 @@ if test -n "$_WIN32_MSVC"; then
     # some facts here.
 
     # Common to all MSVC environments:
+
     # Windows lacks <stdint.h>, but has __int8, and so on.
     AC_DEFINE(JS_HAVE___INTN)
     AC_DEFINE(HAVE_LOCALECONV)
+    AC_DEFINE(HAVE_SYSTEMTIMETOFILETIME)
+    AC_DEFINE(HAVE_GETSYSTEMTIMEASFILETIME)
 
-    case "$target" in
-    *-wince|*-winmo)
-        AC_DEFINE(HAVE_SYSTEMTIMETOFILETIME)
-        AC_DEFINE(JS_CRTDEFS_H_HAS_INTPTR_T)
-        ;;
-    *)
-        AC_DEFINE(HAVE_SYSTEMTIMETOFILETIME)
-        AC_DEFINE(HAVE_GETSYSTEMTIMEASFILETIME)
-        # Windows <stddef.h> defines intptr_t and uintptr_t.
-        # VS2005: http://msdn.microsoft.com/en-us/library/323b6b3k(VS.80).aspx
-        # VS2008: http://msdn.microsoft.com/en-us/library/323b6b3k.aspx
-        AC_DEFINE(JS_STDDEF_H_HAS_INTPTR_T)
-        ;;
-    esac
+    # Windows <stddef.h> defines intptr_t and uintptr_t.
+    # VS2005: http://msdn.microsoft.com/en-us/library/323b6b3k(VS.80).aspx
+    # VS2008: http://msdn.microsoft.com/en-us/library/323b6b3k.aspx
+    AC_DEFINE(JS_STDDEF_H_HAS_INTPTR_T)
 fi
 
 fi # COMPILE_ENVIRONMENT
@@ -1224,8 +1209,6 @@ if test -n "$CROSS_COMPILE"; then
         gnu*)         OS_ARCH=GNU ;;
         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
         mingw*)       OS_ARCH=WINNT ;;
-        wince*)       OS_ARCH=WINCE ;;
-        winmo*)       OS_ARCH=WINCE ;;
         darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
     esac
     case "${target}" in
@@ -1434,19 +1417,6 @@ UnixWare)
     OS_ARCH=UNIXWARE
     OS_RELEASE=`uname -v`
     ;;
-WINCE)
-    OS_ARCH=WINCE
-    case "${target_os}" in
-    *winmo)
-        OS_TARGET=WINMO
-        WINCE_WINDOWS_MOBILE=1
-        AC_DEFINE(WINCE_WINDOWS_MOBILE)
-        ;;
-    *)
-        OS_TARGET=WINCE
-        ;;
-    esac
-    ;;
 Darwin)
     case "${target_cpu}" in
     powerpc*)
@@ -1810,7 +1780,7 @@ dnl ========================================================
 dnl System overrides of the defaults for host
 dnl ========================================================
 case "$host" in
-*mingw*|*wince|*winmo)
+*mingw*)
     # we need Python 2.5 on Windows
     PYTHON_VERSION=2.5
     if test -n "$_WIN32_MSVC"; then
@@ -2157,102 +2127,6 @@ ia64*-hpux*)
     esac
     ;;
 
-*-wince*|*-winmo*)
-    TARGET_COMPILER_ABI=msvc
-    MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
-    AR_LIST="$AR -list"
-    AR_EXTRACT=
-    AR_DELETE="$AR d"
-    AR_FLAGS='-OUT:"$@"'
-    AS="$AS_BIN"
-
-    DSO_CFLAGS=
-    DSO_PIC_CFLAGS=
-    DLL_SUFFIX=.dll
-    BIN_SUFFIX='.exe'
-    if test -z "$RC"; then 
-        RC=rc.exe  
-    fi
-    # certain versions of cygwin's makedepend barf on the 
-    # #include <string> vs -I./dist/include/string issue so don't use it
-    SYSTEM_MAKEDEPEND=
-
-    HOST_CC=cl
-    HOST_CXX=cl
-    HOST_LD=link
-    HOST_AR='lib'
-    HOST_AR_FLAGS='-OUT:$@'
-    HOST_RANLIB='echo ranlib'
-    HOST_CFLAGS="$HOST_CFLAGS -D_X86_"
-        
-        
-    WARNINGS_AS_ERRORS='-WX'
-    MOZ_OPTIMIZE_FLAGS='-Ox'
-    AR_FLAGS='-NOLOGO -OUT:"$@"'
-    ASM_SUFFIX=asm
-    CFLAGS="$CFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
-    CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
-    DLL_PREFIX=
-    DOXYGEN=:
-    DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE
-    DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    GARBAGE=
-    IMPORT_LIB_SUFFIX=lib
-    dnl Need to force-link against mozalloc because it's used in the shunt
-    LIBS="$LIBS \$(LIBXUL_DIST)/lib/mozalloc.lib"
-    LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    LIB_PREFIX=
-    LIB_SUFFIX=lib 
-    MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
-    MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
-    MKSHLIB_FORCE_ALL=
-    MKSHLIB_UNFORCE_ALL=
-    MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
-    MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
-    MOZ_DEBUG_FLAGS='-Zi'
-    MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
-    MOZ_FIX_LINK_PATHS=
-    MOZ_JS_LIBS='$(libdir)/mozjs.lib'
-    OBJ_SUFFIX=obj
-    RANLIB='echo not_ranlib'
-    STRIP='echo not_strip'
-    TARGET_NSPR_MDCPUCFG='\"md/_wince.cfg\"'
-    UNZIP=unzip
-    XARGS=xargs
-    XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-    ZIP=zip
-
-    AC_DEFINE(HAVE_SNPRINTF)
-    AC_DEFINE(_WINDOWS)
-    AC_DEFINE(WIN32)
-    AC_DEFINE(XP_WIN)
-    AC_DEFINE(XP_WIN32)
-    AC_DEFINE(HW_THREADS)
-    AC_DEFINE(STDC_HEADERS)
-    AC_DEFINE(NEW_H, <new>)
-    AC_DEFINE(WIN32_LEAN_AND_MEAN)
-    AC_DEFINE(HAVE_LOCALTIME_R)
-
-    TARGET_MD_ARCH=win32
-    _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
-    BIN_SUFFIX='.exe'
-    MOZ_USER_DIR="Mozilla"
-
-    dnl Default to Windows Mobile components enabled
-    WINCE_WINDOWS_MOBILE=1
-
-    MOZ_ARG_DISABLE_BOOL(windows-mobile-components,
-    [  --disable-windows-mobile-components
-                          Disable Windows Mobile specific components from
-                          CE build],
-    WINCE_WINDOWS_MOBILE=,
-    WINCE_WINDOWS_MOBILE=1)
- 
-    if test "$WINCE_WINDOWS_MOBILE"; then
-        AC_DEFINE(WINCE_WINDOWS_MOBILE)
-    fi
-;;
-
 *-symbian*)
 
     AC_DEFINE(XP_UNIX)
@@ -2789,7 +2663,7 @@ case "$target" in
 *-aix4.3*|*-aix5*)
     NO_LD_ARCHIVE_FLAGS=
     ;;
-*-mingw*|*-wince|*-winmo)
+*-mingw*)
     if test -z "$GNU_CC"; then
         NO_LD_ARCHIVE_FLAGS=
     fi
@@ -2821,7 +2695,7 @@ case "$target" in
     *-darwin*)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list'
         ;;
-    *-mingw*|*-wince|*-winmo)
+    *-mingw*)
         if test -n "$GNU_CC"; then
            MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         fi
@@ -2953,7 +2827,7 @@ case "$target" in
 *-gnu*)
     AC_DEFINE(AVMPLUS_UNIX)
     ;;
-*-mingw*|*-wince|*-winmo)
+*-mingw*)
     AC_DEFINE(AVMPLUS_WIN32)
     ;;
 *-os2*)
@@ -3778,7 +3652,7 @@ if test "$ac_cv_func_gnu_get_libc_version" = "yes"; then
 fi
 
 case $target_os in
-    darwin*|mingw*|os2*|wince*|winmo*)
+    darwin*|mingw*|os2*)
         ;;
     *)
     
@@ -4870,17 +4744,6 @@ if test "$MOZ_MEMORY"; then
     AC_DEFINE(MOZ_MEMORY_WINDOWS)
     # the interesting bits will get passed down in MOZ_MEMORY_LDFLAGS
     ;;
-  *-*wince)
-    AC_DEFINE(MOZ_MEMORY_WINCE)
-    AC_DEFINE(MOZ_MEMORY_WINDOWS)
-    if test -z "$WINCE_WINDOWS_MOBILE"; then
-      AC_DEFINE(MOZ_MEMORY_WINCE6)
-    fi
-    ;;
-  *-*winmo)
-    AC_DEFINE(MOZ_MEMORY_WINCE)
-    AC_DEFINE(MOZ_MEMORY_WINDOWS)
-    ;;
   *-android*)
     AC_DEFINE(MOZ_MEMORY_LINUX)
     AC_DEFINE(MOZ_MEMORY_ANDROID)
@@ -5552,7 +5415,7 @@ EDITLINE_LIBS=
 JS_DISABLE_SHELL=
 
 case "$target" in
-*-mingw*|*-wince*|*-winmo*)
+*-mingw*)
     NO_EDITLINE=1
     ;;
 *-symbian*)
@@ -5694,10 +5557,6 @@ AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(MOZ_TOOLS_DIR)
 AC_SUBST(PYTHON)
 
-AC_SUBST(WINCE)
-AC_SUBST(WINCE_SDK_DIR)
-AC_SUBST(WINCE_WINDOWS_MOBILE)
-
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
@@ -5845,7 +5704,7 @@ if test "$OS_ARCH" = "Darwin"; then
   AC_DEFINE(XP_MACOSX)
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_ASYNC_DNS)
-elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" -a "$OS_ARCH" != "WINCE"; then
+elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
   AC_DEFINE(XP_UNIX)
   AC_DEFINE(UNIX_ASYNC_DNS)
 fi

From a5b747bfa7567c5d21e3f0220669ba112b1080a1 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Tue, 19 Apr 2011 12:55:11 +0100
Subject: [PATCH 050/509] Bug 649726 - Move nsHTMLContainerFrame static view
 methods to nsContainerFrame. r=bz.

---
 layout/base/nsBidiPresUtils.cpp         |   2 +-
 layout/base/nsCSSFrameConstructor.cpp   |  40 ++--
 layout/generic/nsBlockFrame.cpp         |   4 +-
 layout/generic/nsCanvasFrame.cpp        |   4 +-
 layout/generic/nsColumnSetFrame.cpp     |   4 +-
 layout/generic/nsContainerFrame.cpp     | 240 +++++++++++++++++++++++-
 layout/generic/nsContainerFrame.h       |  17 ++
 layout/generic/nsFirstLetterFrame.cpp   |   4 +-
 layout/generic/nsHTMLContainerFrame.cpp | 222 ----------------------
 layout/generic/nsHTMLContainerFrame.h   |  17 --
 layout/generic/nsInlineFrame.cpp        |  14 +-
 layout/generic/nsSubDocumentFrame.cpp   |   2 +-
 layout/xul/base/src/nsDeckFrame.cpp     |   2 +-
 13 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 5a0d7a57f9ed..b5d6ee2063d2 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -287,7 +287,7 @@ SplitInlineAncestors(nsIFrame*     aFrame)
     nsFrameList tail = container->StealFramesAfter(frame);
 
     // Reparent views as necessary
-    rv = nsHTMLContainerFrame::ReparentFrameViewList(presContext, tail, parent, newParent);
+    rv = nsContainerFrame::ReparentFrameViewList(presContext, tail, parent, newParent);
     if (NS_FAILED(rv)) {
       return rv;
     }
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 2b1bac72d322..73834f6f8b98 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1331,8 +1331,8 @@ MoveChildrenTo(nsPresContext* aPresContext,
 
   if (aNewParent->HasView() || aOldParent->HasView() || !sameGrandParent) {
     // Move the frames into the new view
-    nsHTMLContainerFrame::ReparentFrameViewList(aPresContext, aFrameList,
-                                                aOldParent, aNewParent);
+    nsContainerFrame::ReparentFrameViewList(aPresContext, aFrameList,
+                                            aOldParent, aNewParent);
   }
 
   for (nsFrameList::Enumerator e(aFrameList); !e.AtEnd(); e.Next()) {
@@ -1907,7 +1907,7 @@ nsCSSFrameConstructor::ConstructTable(nsFrameConstructorState& aState,
   // Init the table outer frame and see if we need to create a view, e.g.
   // the frame is absolutely positioned  
   InitAndRestoreFrame(aState, content, geometricParent, nsnull, newFrame);  
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
   // Create the inner table frame
   nsIFrame* innerFrame;
@@ -1987,7 +1987,7 @@ nsCSSFrameConstructor::ConstructTableRow(nsFrameConstructorState& aState,
     return NS_ERROR_OUT_OF_MEMORY;
   }
   InitAndRestoreFrame(aState, content, aParentFrame, nsnull, newFrame);
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
   nsFrameItems childItems;
   nsresult rv;
@@ -2088,7 +2088,7 @@ nsCSSFrameConstructor::ConstructTableCell(nsFrameConstructorState& aState,
 
   // Initialize the table cell frame
   InitAndRestoreFrame(aState, content, aParentFrame, nsnull, newFrame);
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
   
   // Resolve pseudo style and initialize the body cell frame
   nsRefPtr<nsStyleContext> innerPseudoStyle;
@@ -2438,7 +2438,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element*                 aDocEle
       processChildren = PR_TRUE;
 
       // See if we need to create a view
-      nsHTMLContainerFrame::CreateViewForFrame(contentFrame, PR_FALSE);
+      nsContainerFrame::CreateViewForFrame(contentFrame, PR_FALSE);
     } else {
       return NS_ERROR_FAILURE;
     }
@@ -2957,7 +2957,7 @@ nsCSSFrameConstructor::ConstructButtonFrame(nsFrameConstructorState& aState,
     return rv;
   }
   // See if we need to create a view
-  nsHTMLContainerFrame::CreateViewForFrame(buttonFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(buttonFrame, PR_FALSE);
 
   nsRefPtr<nsStyleContext> innerBlockContext;
   innerBlockContext =
@@ -3085,7 +3085,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
                           aState.GetGeometricParent(aStyleDisplay, aParentFrame),
                           nsnull, comboboxFrame);
 
-      nsHTMLContainerFrame::CreateViewForFrame(comboboxFrame, PR_FALSE);
+      nsContainerFrame::CreateViewForFrame(comboboxFrame, PR_FALSE);
 
       rv = aState.AddChild(comboboxFrame, aFrameItems, content, styleContext,
                            aParentFrame);
@@ -3224,7 +3224,7 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsFrameConstructorState& aState,
     }
   }
       
-  nsHTMLContainerFrame::CreateViewForFrame(scrollFrame, aBuildCombobox);
+  nsContainerFrame::CreateViewForFrame(scrollFrame, aBuildCombobox);
 
   BuildScrollFrame(aState, aContent, aStyleContext, scrolledFrame,
                    geometricParent, scrollFrame);
@@ -3275,7 +3275,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState,
 
   // See if we need to create a view, e.g. the frame is absolutely
   // positioned
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
   // Resolve style and initialize the frame
   nsRefPtr<nsStyleContext> fieldsetContentStyle;
@@ -3756,8 +3756,8 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
                                newFrame);
       NS_ASSERTION(NS_SUCCEEDED(rv), "InitAndRestoreFrame failed");
       // See whether we need to create a view
-      nsHTMLContainerFrame::CreateViewForFrame(newFrame,
-                                               (bits & FCDATA_FORCE_VIEW) != 0);
+      nsContainerFrame::CreateViewForFrame(newFrame,
+                                           (bits & FCDATA_FORCE_VIEW) != 0);
       frameToAddToList = newFrame;
     }
 
@@ -4235,7 +4235,7 @@ nsCSSFrameConstructor::BeginBuildingScrollFrame(nsFrameConstructorState& aState,
     InitAndRestoreFrame(aState, aContent, aParentFrame, nsnull, gfxScrollFrame);
 
     // Create a view
-    nsHTMLContainerFrame::CreateViewForFrame(gfxScrollFrame, PR_FALSE);
+    nsContainerFrame::CreateViewForFrame(gfxScrollFrame, PR_FALSE);
   }
 
   // if there are any anonymous children for the scroll frame, create
@@ -4917,7 +4917,7 @@ nsCSSFrameConstructor::ConstructSVGForeignObjectFrame(nsFrameConstructorState& a
 
   // We don't allow this frame to be out of flow
   InitAndRestoreFrame(aState, content, aParentFrame, nsnull, newFrame);
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
   nsresult rv = aState.AddChild(newFrame, aFrameItems, content, styleContext,
                                 aParentFrame, PR_FALSE, PR_FALSE);
@@ -8383,7 +8383,7 @@ nsCSSFrameConstructor::CreateContinuingOuterTableFrame(nsIPresShell*    aPresShe
 
   if (newFrame) {
     newFrame->Init(aContent, aParentFrame, aFrame);
-    nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+    nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
     // Create a continuing inner table frame, and if there's a caption then
     // replicate the caption
@@ -8429,7 +8429,7 @@ nsCSSFrameConstructor::CreateContinuingTableFrame(nsIPresShell* aPresShell,
 
   if (newFrame) {
     newFrame->Init(aContent, aParentFrame, aFrame);
-    nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+    nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
     // Replicate any header/footer frames
     nsFrameItems  childFrames;
@@ -8509,7 +8509,7 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
 
     if (newFrame) {
       newFrame->Init(content, aParentFrame, aFrame);
-      nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+      nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
     }
     
   } else if (nsGkAtoms::inlineFrame == frameType) {
@@ -10648,7 +10648,7 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
 
     InitAndRestoreFrame(aState, aContent, aParentFrame, nsnull, columnSetFrame);
     // See if we need to create a view
-    nsHTMLContainerFrame::CreateViewForFrame(columnSetFrame, PR_FALSE);
+    nsContainerFrame::CreateViewForFrame(columnSetFrame, PR_FALSE);
     blockStyle = mPresShell->StyleSet()->
       ResolveAnonymousBoxStyle(nsCSSAnonBoxes::columnContent, aStyleContext);
     parent = columnSetFrame;
@@ -10788,7 +10788,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
                                                   // this is part of the fix for bug 42372
 
   // Any inline frame might need a view (because of opacity, or fixed background)
-  nsHTMLContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
+  nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
 
   if (positioned) {                            
     // Relatively positioned frames becomes a container for child
@@ -10877,7 +10877,7 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState,
                         PR_FALSE);
 
     // Any frame could have a view
-    nsHTMLContainerFrame::CreateViewForFrame(blockFrame, PR_FALSE);
+    nsContainerFrame::CreateViewForFrame(blockFrame, PR_FALSE);
 
     // Find the first non-block child which defines the end of our block kids
     // and the start of our next inline's kids
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index a10d10197d2f..476460559a5c 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -674,8 +674,8 @@ static void ReparentFrame(nsIFrame* aFrame, nsIFrame* aOldParent,
 
   // When pushing and pulling frames we need to check for whether any
   // views need to be reparented
-  nsHTMLContainerFrame::ReparentFrameView(aFrame->PresContext(), aFrame,
-                                          aOldParent, aNewParent);
+  nsContainerFrame::ReparentFrameView(aFrame->PresContext(), aFrame,
+                                      aOldParent, aNewParent);
 }
  
 //////////////////////////////////////////////////////////////////////
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index 3a6b32d44b97..7f7d413739c1 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -439,8 +439,8 @@ nsCanvasFrame::Reflow(nsPresContext*           aPresContext,
     if (overflow) {
       NS_ASSERTION(overflow->OnlyChild(),
                    "must have doc root as canvas frame's only child");
-      nsHTMLContainerFrame::ReparentFrameViewList(aPresContext, *overflow,
-                                                  prevCanvasFrame, this);
+      nsContainerFrame::ReparentFrameViewList(aPresContext, *overflow,
+                                              prevCanvasFrame, this);
       // Prepend overflow to the our child list. There may already be
       // children placeholders for fixed-pos elements, which don't get
       // reflowed but must not be lost until the canvas frame is destroyed.
diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index f217e79e1504..ed2748694070 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -869,8 +869,8 @@ nsColumnSetFrame::DrainOverflowColumns()
   if (prev) {
     nsAutoPtr<nsFrameList> overflows(prev->StealOverflowFrames());
     if (overflows) {
-      nsHTMLContainerFrame::ReparentFrameViewList(PresContext(), *overflows,
-                                                  prev, this);
+      nsContainerFrame::ReparentFrameViewList(PresContext(), *overflows,
+                                              prev, this);
 
       mFrames.InsertFrames(this, nsnull, *overflows);
     }
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 070480c927f3..4564a68f928e 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -407,6 +407,106 @@ nsContainerFrame::PeekOffsetCharacter(PRBool aForward, PRInt32* aOffset,
 /////////////////////////////////////////////////////////////////////////////
 // Helper member functions
 
+static nsresult
+ReparentFrameViewTo(nsIFrame*       aFrame,
+                    nsIViewManager* aViewManager,
+                    nsIView*        aNewParentView,
+                    nsIView*        aOldParentView)
+{
+
+  // XXX What to do about placeholder views for "position: fixed" elements?
+  // They should be reparented too.
+
+  // Does aFrame have a view?
+  if (aFrame->HasView()) {
+#ifdef MOZ_XUL
+    if (aFrame->GetType() == nsGkAtoms::menuPopupFrame) {
+      // This view must be parented by the root view, don't reparent it.
+      return NS_OK;
+    }
+#endif
+    nsIView* view = aFrame->GetView();
+    // Verify that the current parent view is what we think it is
+    //nsIView*  parentView;
+    //NS_ASSERTION(parentView == aOldParentView, "unexpected parent view");
+
+    aViewManager->RemoveChild(view);
+    
+    // The view will remember the Z-order and other attributes that have been set on it.
+    nsIView* insertBefore = nsLayoutUtils::FindSiblingViewFor(aNewParentView, aFrame);
+    aViewManager->InsertChild(aNewParentView, view, insertBefore, insertBefore != nsnull);
+  } else {
+    PRInt32 listIndex = 0;
+    nsIAtom* listName = nsnull;
+    // This loop iterates through every child list name, and also
+    // executes once with listName == nsnull.
+    do {
+      // Iterate the child frames, and check each child frame to see if it has
+      // a view
+      nsIFrame* childFrame = aFrame->GetFirstChild(listName);
+      for (; childFrame; childFrame = childFrame->GetNextSibling()) {
+        ReparentFrameViewTo(childFrame, aViewManager,
+                            aNewParentView, aOldParentView);
+      }
+      listName = aFrame->GetAdditionalChildListName(listIndex++);
+    } while (listName);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsContainerFrame::CreateViewForFrame(nsIFrame* aFrame,
+                                     PRBool aForce)
+{
+  if (aFrame->HasView()) {
+    return NS_OK;
+  }
+
+  // If we don't yet have a view, see if we need a view
+  if (!aForce && !aFrame->NeedsView()) {
+    // don't need a view
+    return NS_OK;
+  }
+
+  nsIView* parentView = aFrame->GetParent()->GetClosestView();
+  NS_ASSERTION(parentView, "no parent with view");
+
+  nsIViewManager* viewManager = parentView->GetViewManager();
+  NS_ASSERTION(viewManager, "null view manager");
+
+  // Create a view
+  nsIView* view = viewManager->CreateView(aFrame->GetRect(), parentView);
+  if (!view)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  SyncFrameViewProperties(aFrame->PresContext(), aFrame, nsnull, view);
+
+  nsIView* insertBefore = nsLayoutUtils::FindSiblingViewFor(parentView, aFrame);
+  // we insert this view 'above' the insertBefore view, unless insertBefore is null,
+  // in which case we want to call with aAbove == PR_FALSE to insert at the beginning
+  // in document order
+  viewManager->InsertChild(parentView, view, insertBefore, insertBefore != nsnull);
+
+  // REVIEW: Don't create a widget for fixed-pos elements anymore.
+  // ComputeRepaintRegionForCopy will calculate the right area to repaint
+  // when we scroll.
+  // Reparent views on any child frames (or their descendants) to this
+  // view. We can just call ReparentFrameViewTo on this frame because
+  // we know this frame has no view, so it will crawl the children. Also,
+  // we know that any descendants with views must have 'parentView' as their
+  // parent view.
+  ReparentFrameViewTo(aFrame, viewManager, view, parentView);
+
+  // Remember our view
+  aFrame->SetView(view);
+
+  NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
+               ("nsHTMLContainerFrame::CreateViewForFrame: frame=%p view=%p",
+                aFrame));
+  return NS_OK;
+}
+
 /**
  * Position the view associated with |aKidFrame|, if there is one. A
  * container frame should call this method after positioning a frame,
@@ -436,6 +536,128 @@ nsContainerFrame::PositionFrameView(nsIFrame* aKidFrame)
   vm->MoveViewTo(view, pt.x, pt.y);
 }
 
+nsresult
+nsContainerFrame::ReparentFrameView(nsPresContext* aPresContext,
+                                    nsIFrame*       aChildFrame,
+                                    nsIFrame*       aOldParentFrame,
+                                    nsIFrame*       aNewParentFrame)
+{
+  NS_PRECONDITION(aChildFrame, "null child frame pointer");
+  NS_PRECONDITION(aOldParentFrame, "null old parent frame pointer");
+  NS_PRECONDITION(aNewParentFrame, "null new parent frame pointer");
+  NS_PRECONDITION(aOldParentFrame != aNewParentFrame, "same old and new parent frame");
+
+  // See if either the old parent frame or the new parent frame have a view
+  while (!aOldParentFrame->HasView() && !aNewParentFrame->HasView()) {
+    // Walk up both the old parent frame and the new parent frame nodes
+    // stopping when we either find a common parent or views for one
+    // or both of the frames.
+    //
+    // This works well in the common case where we push/pull and the old parent
+    // frame and the new parent frame are part of the same flow. They will
+    // typically be the same distance (height wise) from the
+    aOldParentFrame = aOldParentFrame->GetParent();
+    aNewParentFrame = aNewParentFrame->GetParent();
+    
+    // We should never walk all the way to the root frame without finding
+    // a view
+    NS_ASSERTION(aOldParentFrame && aNewParentFrame, "didn't find view");
+
+    // See if we reached a common ancestor
+    if (aOldParentFrame == aNewParentFrame) {
+      break;
+    }
+  }
+
+  // See if we found a common parent frame
+  if (aOldParentFrame == aNewParentFrame) {
+    // We found a common parent and there are no views between the old parent
+    // and the common parent or the new parent frame and the common parent.
+    // Because neither the old parent frame nor the new parent frame have views,
+    // then any child views don't need reparenting
+    return NS_OK;
+  }
+
+  // We found views for one or both of the ancestor frames before we
+  // found a common ancestor.
+  nsIView* oldParentView = aOldParentFrame->GetClosestView();
+  nsIView* newParentView = aNewParentFrame->GetClosestView();
+  
+  // See if the old parent frame and the new parent frame are in the
+  // same view sub-hierarchy. If they are then we don't have to do
+  // anything
+  if (oldParentView != newParentView) {
+    // They're not so we need to reparent any child views
+    return ReparentFrameViewTo(aChildFrame, oldParentView->GetViewManager(), newParentView,
+                               oldParentView);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsContainerFrame::ReparentFrameViewList(nsPresContext*     aPresContext,
+                                        const nsFrameList& aChildFrameList,
+                                        nsIFrame*          aOldParentFrame,
+                                        nsIFrame*          aNewParentFrame)
+{
+  NS_PRECONDITION(aChildFrameList.NotEmpty(), "empty child frame list");
+  NS_PRECONDITION(aOldParentFrame, "null old parent frame pointer");
+  NS_PRECONDITION(aNewParentFrame, "null new parent frame pointer");
+  NS_PRECONDITION(aOldParentFrame != aNewParentFrame, "same old and new parent frame");
+
+  // See if either the old parent frame or the new parent frame have a view
+  while (!aOldParentFrame->HasView() && !aNewParentFrame->HasView()) {
+    // Walk up both the old parent frame and the new parent frame nodes
+    // stopping when we either find a common parent or views for one
+    // or both of the frames.
+    //
+    // This works well in the common case where we push/pull and the old parent
+    // frame and the new parent frame are part of the same flow. They will
+    // typically be the same distance (height wise) from the
+    aOldParentFrame = aOldParentFrame->GetParent();
+    aNewParentFrame = aNewParentFrame->GetParent();
+    
+    // We should never walk all the way to the root frame without finding
+    // a view
+    NS_ASSERTION(aOldParentFrame && aNewParentFrame, "didn't find view");
+
+    // See if we reached a common ancestor
+    if (aOldParentFrame == aNewParentFrame) {
+      break;
+    }
+  }
+
+
+  // See if we found a common parent frame
+  if (aOldParentFrame == aNewParentFrame) {
+    // We found a common parent and there are no views between the old parent
+    // and the common parent or the new parent frame and the common parent.
+    // Because neither the old parent frame nor the new parent frame have views,
+    // then any child views don't need reparenting
+    return NS_OK;
+  }
+
+  // We found views for one or both of the ancestor frames before we
+  // found a common ancestor.
+  nsIView* oldParentView = aOldParentFrame->GetClosestView();
+  nsIView* newParentView = aNewParentFrame->GetClosestView();
+  
+  // See if the old parent frame and the new parent frame are in the
+  // same view sub-hierarchy. If they are then we don't have to do
+  // anything
+  if (oldParentView != newParentView) {
+    nsIViewManager* viewManager = oldParentView->GetViewManager();
+
+    // They're not so we need to reparent any child views
+    for (nsFrameList::Enumerator e(aChildFrameList); !e.AtEnd(); e.Next()) {
+      ReparentFrameViewTo(e.get(), viewManager, newParentView, oldParentView);
+    }
+  }
+
+  return NS_OK;
+}
+
 static nsIWidget*
 GetPresContextContainerWidget(nsPresContext* aPresContext)
 {
@@ -880,8 +1102,8 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext*           aPres
                                     ExcessOverflowContainersProperty());
       if (excessFrames) {
         excessFrames->ApplySetParent(this);
-        nsHTMLContainerFrame::ReparentFrameViewList(aPresContext, *excessFrames,
-                                                    prev, this);
+        nsContainerFrame::ReparentFrameViewList(aPresContext, *excessFrames,
+                                                prev, this);
         overflowContainers = excessFrames;
         rv = SetPropTableFrames(aPresContext, overflowContainers,
                                 OverflowContainersProperty());
@@ -1264,7 +1486,7 @@ nsContainerFrame::PushChildren(nsPresContext* aPresContext,
     // When pushing and pulling frames we need to check for whether any
     // views need to be reparented.
     for (nsIFrame* f = aFromChild; f; f = f->GetNextSibling()) {
-      nsHTMLContainerFrame::ReparentFrameView(aPresContext, f, this, nextInFlow);
+      nsContainerFrame::ReparentFrameView(aPresContext, f, this, nextInFlow);
     }
     nextInFlow->mFrames.InsertFrames(nextInFlow, nsnull, tail);
   }
@@ -1298,9 +1520,9 @@ nsContainerFrame::MoveOverflowToChildList(nsPresContext* aPresContext)
                    "bad overflow list");
       // When pushing and pulling frames we need to check for whether any
       // views need to be reparented.
-      nsHTMLContainerFrame::ReparentFrameViewList(aPresContext,
-                                                  *prevOverflowFrames,
-                                                  prevInFlow, this);
+      nsContainerFrame::ReparentFrameViewList(aPresContext,
+                                              *prevOverflowFrames,
+                                              prevInFlow, this);
       mFrames.AppendFrames(this, *prevOverflowFrames);
       result = PR_TRUE;
     }
@@ -1448,9 +1670,9 @@ nsOverflowContinuationTracker::Insert(nsIFrame*       aOverflowCont,
       SetUpListWalker();
     }
     if (aOverflowCont->GetParent() != mParent) {
-      nsHTMLContainerFrame::ReparentFrameView(presContext, aOverflowCont,
-                                              aOverflowCont->GetParent(),
-                                              mParent);
+      nsContainerFrame::ReparentFrameView(presContext, aOverflowCont,
+                                          aOverflowCont->GetParent(),
+                                          mParent);
     }
     mOverflowContList->InsertFrame(mParent, mPrevOverflowCont, aOverflowCont);
     aReflowStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
index 2c413a88f99e..f1e19c9fa186 100644
--- a/layout/generic/nsContainerFrame.h
+++ b/layout/generic/nsContainerFrame.h
@@ -117,9 +117,26 @@ public:
                                      nsIFrame*      aNextInFlow,
                                      PRBool         aDeletingEmptyFrames);
 
+  /**
+   * Helper method to wrap views around frames. Used by containers
+   * under special circumstances (can be used by leaf frames as well)
+   */
+  static nsresult CreateViewForFrame(nsIFrame* aFrame,
+                                     PRBool aForce);
+
   // Positions the frame's view based on the frame's origin
   static void PositionFrameView(nsIFrame* aKidFrame);
 
+  static nsresult ReparentFrameView(nsPresContext* aPresContext,
+                                    nsIFrame*       aChildFrame,
+                                    nsIFrame*       aOldParentFrame,
+                                    nsIFrame*       aNewParentFrame);
+
+  static nsresult ReparentFrameViewList(nsPresContext*     aPresContext,
+                                        const nsFrameList& aChildFrameList,
+                                        nsIFrame*          aOldParentFrame,
+                                        nsIFrame*          aNewParentFrame);
+
   // Set the view's size and position after its frame has been reflowed.
   //
   // Flags:
diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp
index 1d498d9a380f..d20f5346cbe3 100644
--- a/layout/generic/nsFirstLetterFrame.cpp
+++ b/layout/generic/nsFirstLetterFrame.cpp
@@ -369,8 +369,8 @@ nsFirstLetterFrame::DrainOverflowFrames(nsPresContext* aPresContext)
 
       // When pushing and pulling frames we need to check for whether any
       // views need to be reparented.
-      nsHTMLContainerFrame::ReparentFrameViewList(aPresContext, *overflowFrames,
-                                                  prevInFlow, this);
+      nsContainerFrame::ReparentFrameViewList(aPresContext, *overflowFrames,
+                                              prevInFlow, this);
       mFrames.InsertFrames(this, nsnull, *overflowFrames);
     }
   }
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index 572c1b997322..ca8eb1380662 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -634,226 +634,4 @@ nsHTMLContainerFrame::CreateNextInFlow(nsPresContext* aPresContext,
   return NS_OK;
 }
 
-static nsresult
-ReparentFrameViewTo(nsIFrame*       aFrame,
-                    nsIViewManager* aViewManager,
-                    nsIView*        aNewParentView,
-                    nsIView*        aOldParentView)
-{
-
-  // XXX What to do about placeholder views for "position: fixed" elements?
-  // They should be reparented too.
-
-  // Does aFrame have a view?
-  if (aFrame->HasView()) {
-#ifdef MOZ_XUL
-    if (aFrame->GetType() == nsGkAtoms::menuPopupFrame) {
-      // This view must be parented by the root view, don't reparent it.
-      return NS_OK;
-    }
-#endif
-    nsIView* view = aFrame->GetView();
-    // Verify that the current parent view is what we think it is
-    //nsIView*  parentView;
-    //NS_ASSERTION(parentView == aOldParentView, "unexpected parent view");
-
-    aViewManager->RemoveChild(view);
-    
-    // The view will remember the Z-order and other attributes that have been set on it.
-    nsIView* insertBefore = nsLayoutUtils::FindSiblingViewFor(aNewParentView, aFrame);
-    aViewManager->InsertChild(aNewParentView, view, insertBefore, insertBefore != nsnull);
-  } else {
-    PRInt32 listIndex = 0;
-    nsIAtom* listName = nsnull;
-    // This loop iterates through every child list name, and also
-    // executes once with listName == nsnull.
-    do {
-      // Iterate the child frames, and check each child frame to see if it has
-      // a view
-      nsIFrame* childFrame = aFrame->GetFirstChild(listName);
-      for (; childFrame; childFrame = childFrame->GetNextSibling()) {
-        ReparentFrameViewTo(childFrame, aViewManager,
-                            aNewParentView, aOldParentView);
-      }
-      listName = aFrame->GetAdditionalChildListName(listIndex++);
-    } while (listName);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsHTMLContainerFrame::ReparentFrameView(nsPresContext* aPresContext,
-                                        nsIFrame*       aChildFrame,
-                                        nsIFrame*       aOldParentFrame,
-                                        nsIFrame*       aNewParentFrame)
-{
-  NS_PRECONDITION(aChildFrame, "null child frame pointer");
-  NS_PRECONDITION(aOldParentFrame, "null old parent frame pointer");
-  NS_PRECONDITION(aNewParentFrame, "null new parent frame pointer");
-  NS_PRECONDITION(aOldParentFrame != aNewParentFrame, "same old and new parent frame");
-
-  // See if either the old parent frame or the new parent frame have a view
-  while (!aOldParentFrame->HasView() && !aNewParentFrame->HasView()) {
-    // Walk up both the old parent frame and the new parent frame nodes
-    // stopping when we either find a common parent or views for one
-    // or both of the frames.
-    //
-    // This works well in the common case where we push/pull and the old parent
-    // frame and the new parent frame are part of the same flow. They will
-    // typically be the same distance (height wise) from the
-    aOldParentFrame = aOldParentFrame->GetParent();
-    aNewParentFrame = aNewParentFrame->GetParent();
-    
-    // We should never walk all the way to the root frame without finding
-    // a view
-    NS_ASSERTION(aOldParentFrame && aNewParentFrame, "didn't find view");
-
-    // See if we reached a common ancestor
-    if (aOldParentFrame == aNewParentFrame) {
-      break;
-    }
-  }
-
-  // See if we found a common parent frame
-  if (aOldParentFrame == aNewParentFrame) {
-    // We found a common parent and there are no views between the old parent
-    // and the common parent or the new parent frame and the common parent.
-    // Because neither the old parent frame nor the new parent frame have views,
-    // then any child views don't need reparenting
-    return NS_OK;
-  }
-
-  // We found views for one or both of the ancestor frames before we
-  // found a common ancestor.
-  nsIView* oldParentView = aOldParentFrame->GetClosestView();
-  nsIView* newParentView = aNewParentFrame->GetClosestView();
-  
-  // See if the old parent frame and the new parent frame are in the
-  // same view sub-hierarchy. If they are then we don't have to do
-  // anything
-  if (oldParentView != newParentView) {
-    // They're not so we need to reparent any child views
-    return ReparentFrameViewTo(aChildFrame, oldParentView->GetViewManager(), newParentView,
-                               oldParentView);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsHTMLContainerFrame::ReparentFrameViewList(nsPresContext*     aPresContext,
-                                            const nsFrameList& aChildFrameList,
-                                            nsIFrame*          aOldParentFrame,
-                                            nsIFrame*          aNewParentFrame)
-{
-  NS_PRECONDITION(aChildFrameList.NotEmpty(), "empty child frame list");
-  NS_PRECONDITION(aOldParentFrame, "null old parent frame pointer");
-  NS_PRECONDITION(aNewParentFrame, "null new parent frame pointer");
-  NS_PRECONDITION(aOldParentFrame != aNewParentFrame, "same old and new parent frame");
-
-  // See if either the old parent frame or the new parent frame have a view
-  while (!aOldParentFrame->HasView() && !aNewParentFrame->HasView()) {
-    // Walk up both the old parent frame and the new parent frame nodes
-    // stopping when we either find a common parent or views for one
-    // or both of the frames.
-    //
-    // This works well in the common case where we push/pull and the old parent
-    // frame and the new parent frame are part of the same flow. They will
-    // typically be the same distance (height wise) from the
-    aOldParentFrame = aOldParentFrame->GetParent();
-    aNewParentFrame = aNewParentFrame->GetParent();
-    
-    // We should never walk all the way to the root frame without finding
-    // a view
-    NS_ASSERTION(aOldParentFrame && aNewParentFrame, "didn't find view");
-
-    // See if we reached a common ancestor
-    if (aOldParentFrame == aNewParentFrame) {
-      break;
-    }
-  }
-
-
-  // See if we found a common parent frame
-  if (aOldParentFrame == aNewParentFrame) {
-    // We found a common parent and there are no views between the old parent
-    // and the common parent or the new parent frame and the common parent.
-    // Because neither the old parent frame nor the new parent frame have views,
-    // then any child views don't need reparenting
-    return NS_OK;
-  }
-
-  // We found views for one or both of the ancestor frames before we
-  // found a common ancestor.
-  nsIView* oldParentView = aOldParentFrame->GetClosestView();
-  nsIView* newParentView = aNewParentFrame->GetClosestView();
-  
-  // See if the old parent frame and the new parent frame are in the
-  // same view sub-hierarchy. If they are then we don't have to do
-  // anything
-  if (oldParentView != newParentView) {
-    nsIViewManager* viewManager = oldParentView->GetViewManager();
-
-    // They're not so we need to reparent any child views
-    for (nsFrameList::Enumerator e(aChildFrameList); !e.AtEnd(); e.Next()) {
-      ReparentFrameViewTo(e.get(), viewManager, newParentView, oldParentView);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsHTMLContainerFrame::CreateViewForFrame(nsIFrame* aFrame,
-                                         PRBool aForce)
-{
-  if (aFrame->HasView()) {
-    return NS_OK;
-  }
-
-  // If we don't yet have a view, see if we need a view
-  if (!aForce && !aFrame->NeedsView()) {
-    // don't need a view
-    return NS_OK;
-  }
-
-  nsIView* parentView = aFrame->GetParent()->GetClosestView();
-  NS_ASSERTION(parentView, "no parent with view");
-
-  nsIViewManager* viewManager = parentView->GetViewManager();
-  NS_ASSERTION(viewManager, "null view manager");
-    
-  // Create a view
-  nsIView* view = viewManager->CreateView(aFrame->GetRect(), parentView);
-  if (!view)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  SyncFrameViewProperties(aFrame->PresContext(), aFrame, nsnull, view);
-
-  nsIView* insertBefore = nsLayoutUtils::FindSiblingViewFor(parentView, aFrame);
-  // we insert this view 'above' the insertBefore view, unless insertBefore is null,
-  // in which case we want to call with aAbove == PR_FALSE to insert at the beginning
-  // in document order
-  viewManager->InsertChild(parentView, view, insertBefore, insertBefore != nsnull);
-
-  // REVIEW: Don't create a widget for fixed-pos elements anymore.
-  // ComputeRepaintRegionForCopy will calculate the right area to repaint
-  // when we scroll.
-  // Reparent views on any child frames (or their descendants) to this
-  // view. We can just call ReparentFrameViewTo on this frame because
-  // we know this frame has no view, so it will crawl the children. Also,
-  // we know that any descendants with views must have 'parentView' as their
-  // parent view.
-  ReparentFrameViewTo(aFrame, viewManager, view, parentView);
-
-  // Remember our view
-  aFrame->SetView(view);
-
-  NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
-               ("nsHTMLContainerFrame::CreateViewForFrame: frame=%p view=%p",
-                aFrame));
-  return NS_OK;
-}
-
 NS_IMPL_FRAMEARENA_HELPERS(nsHTMLContainerFrame)
diff --git a/layout/generic/nsHTMLContainerFrame.h b/layout/generic/nsHTMLContainerFrame.h
index a3b7f453f286..d8456527df33 100644
--- a/layout/generic/nsHTMLContainerFrame.h
+++ b/layout/generic/nsHTMLContainerFrame.h
@@ -71,23 +71,6 @@ class nsHTMLContainerFrame : public nsContainerFrame {
 public:
   NS_DECL_FRAMEARENA_HELPERS
 
-  /**
-   * Helper method to wrap views around frames. Used by containers
-   * under special circumstances (can be used by leaf frames as well)
-   */
-  static nsresult CreateViewForFrame(nsIFrame* aFrame,
-                                     PRBool aForce);
-
-  static nsresult ReparentFrameView(nsPresContext* aPresContext,
-                                    nsIFrame*       aChildFrame,
-                                    nsIFrame*       aOldParentFrame,
-                                    nsIFrame*       aNewParentFrame);
-
-  static nsresult ReparentFrameViewList(nsPresContext*     aPresContext,
-                                        const nsFrameList& aChildFrameList,
-                                        nsIFrame*          aOldParentFrame,
-                                        nsIFrame*          aNewParentFrame);
-
   /**
    * Helper method to create next-in-flows if necessary. If aFrame
    * already has a next-in-flow then this method does
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 071805f74fa7..5bc94805fbdb 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -328,9 +328,9 @@ nsInlineFrame::Reflow(nsPresContext*          aPresContext,
     if (prevOverflowFrames) {
       // When pushing and pulling frames we need to check for whether any
       // views need to be reparented.
-      nsHTMLContainerFrame::ReparentFrameViewList(aPresContext,
-                                                  *prevOverflowFrames,
-                                                  prevInFlow, this);
+      nsContainerFrame::ReparentFrameViewList(aPresContext,
+                                              *prevOverflowFrames,
+                                              prevInFlow, this);
 
       // Check if we should do the lazilySetParentPointer optimization.
       // Only do it in simple cases where we're being reflowed for the
@@ -436,9 +436,9 @@ nsInlineFrame::PullOverflowsFromPrevInFlow()
     nsAutoPtr<nsFrameList> prevOverflowFrames(prevInFlow->StealOverflowFrames());
     if (prevOverflowFrames) {
       // Assume that our prev-in-flow has the same line container that we do.
-      nsHTMLContainerFrame::ReparentFrameViewList(PresContext(),
-                                                  *prevOverflowFrames,
-                                                  prevInFlow, this);
+      nsContainerFrame::ReparentFrameViewList(PresContext(),
+                                              *prevOverflowFrames,
+                                              prevInFlow, this);
       mFrames.InsertFrames(this, nsnull, *prevOverflowFrames);
     }
   }
@@ -816,7 +816,7 @@ nsInlineFrame::PullOneFrame(nsPresContext* aPresContext,
       if (irs.mLineLayout) {
         irs.mLineLayout->SetDirtyNextLine();
       }
-      nsHTMLContainerFrame::ReparentFrameView(aPresContext, frame, nextInFlow, this);
+      nsContainerFrame::ReparentFrameView(aPresContext, frame, nextInFlow, this);
       break;
     }
     nextInFlow = (nsInlineFrame*) nextInFlow->GetNextInFlow();
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index b4f7c3282288..c53ec6f1ac9e 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -178,7 +178,7 @@ nsSubDocumentFrame::Init(nsIContent*     aContent,
   // really need it or not, and the inner view will get it as the
   // parent.
   if (!HasView()) {
-    rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
+    rv = nsContainerFrame::CreateViewForFrame(this, PR_TRUE);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/base/src/nsDeckFrame.cpp
index 1342da84fe17..e23b41940c3c 100644
--- a/layout/xul/base/src/nsDeckFrame.cpp
+++ b/layout/xul/base/src/nsDeckFrame.cpp
@@ -114,7 +114,7 @@ static void
 CreateViewsForFrames(const nsFrameList& aFrames)
 {
   for (nsFrameList::Enumerator f(aFrames); !f.AtEnd(); f.Next()) {
-    nsHTMLContainerFrame::CreateViewForFrame(f.get(), PR_TRUE);
+    nsContainerFrame::CreateViewForFrame(f.get(), PR_TRUE);
   }
 }
 

From 4776ab932d8b8158bb264489cb743657e24d4924 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 19 Apr 2011 09:00:46 -0400
Subject: [PATCH 051/509] Bug 650582 - browser_preferences_text uses a
 tool-panel-close which is not used on Android [r=vingtetun DONTBUILD]

---
 mobile/chrome/tests/browser_preferences_text.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/chrome/tests/browser_preferences_text.js b/mobile/chrome/tests/browser_preferences_text.js
index 439abc68ddb0..de21f56fd5e0 100644
--- a/mobile/chrome/tests/browser_preferences_text.js
+++ b/mobile/chrome/tests/browser_preferences_text.js
@@ -21,7 +21,6 @@ var expected = {
 function getPreferencesElements() {
    let prefElements = {};
    prefElements.panelOpen = document.getElementById("tool-panel-open");
-   prefElements.panelClose = document.getElementById("tool-panel-close");
    prefElements.panelContainer = document.getElementById("panel-container");
    prefElements.homeButton = document.getElementById("prefs-homepage-options");
    prefElements.doneButton = document.getElementById("select-buttons-done");
@@ -124,7 +123,7 @@ gTests.push({
     var clearDataButton = document.getElementById(clearData.element_id);
     is(clearDataButton.tagName, clearData.tagName, "Check for Clear Private Data button type");
 
-    prefs.panelClose.click()
+    BrowserUI.hidePanel();
     is(document.getElementById("panel-container").hidden, true, "Preferences panel should be closed");
     runNextTest();
   }

From 8648dcc368e0c1f192e2e831929012a2c253b799 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:41 -0700
Subject: [PATCH 052/509] Bug 651017, part 1: minimize inclusion of
 ns*DeviceContext.h; move the printing error codes to nsIDeviceContextSpec.h;
 os2 small widget cleanup.

--HG--
extra : rebase_source : 5b7cebe68f71a760463e3522b159c7cde8a72f5e
---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |   1 -
 content/events/src/nsEventStateManager.cpp    |   1 -
 .../html/content/src/nsHTMLFontElement.cpp    |   1 -
 docshell/base/nsDocShell.h                    |   1 -
 dom/base/nsScreen.cpp                         |   1 -
 embedding/browser/webBrowser/nsWebBrowser.cpp |   1 -
 .../windowwatcher/src/nsWindowWatcher.cpp     |   1 -
 gfx/src/nsIDeviceContext.h                    | 116 +-----------------
 gfx/src/nsRenderingContext.h                  |   1 +
 layout/base/nsCSSFrameConstructor.cpp         |   1 -
 layout/base/nsCSSRendering.cpp                |   1 -
 layout/base/nsCSSRenderingBorders.cpp         |   1 -
 layout/base/nsCaret.cpp                       |   1 -
 layout/base/nsDocumentViewer.cpp              |   1 -
 layout/base/nsPresShell.cpp                   |   2 -
 layout/forms/nsComboboxControlFrame.cpp       |   1 -
 layout/forms/nsImageControlFrame.cpp          |   1 -
 layout/forms/nsListControlFrame.cpp           |   7 +-
 layout/forms/nsTextControlFrame.cpp           |   1 -
 layout/generic/nsCanvasFrame.cpp              |   1 -
 layout/generic/nsFrame.cpp                    |   1 -
 layout/generic/nsHTMLContainerFrame.cpp       |   1 -
 layout/generic/nsHTMLContainerFrame.h         |   6 +-
 layout/generic/nsHTMLReflowState.cpp          |   1 -
 layout/generic/nsImageFrame.cpp               |   1 -
 layout/generic/nsPageContentFrame.cpp         |   1 -
 layout/generic/nsPageFrame.cpp                |   1 -
 layout/generic/nsSelection.cpp                |   1 -
 layout/generic/nsSimplePageSequence.cpp       |   1 -
 layout/generic/nsTextFrameThebes.cpp          |   1 -
 layout/mathml/nsMathMLChar.cpp                |   1 -
 layout/printing/nsPrintEngine.cpp             |   1 -
 layout/style/StyleRule.cpp                    |   1 -
 layout/style/nsMediaFeatures.cpp              |   1 -
 layout/style/nsRuleNode.cpp                   |   1 -
 layout/style/nsStyleStruct.cpp                |   1 -
 layout/xul/base/src/nsBox.cpp                 |   1 -
 layout/xul/base/src/nsDocElementBoxFrame.cpp  |   1 -
 layout/xul/base/src/nsImageBoxFrame.cpp       |   2 -
 layout/xul/base/src/nsLeafBoxFrame.cpp        |   1 -
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |   1 -
 layout/xul/base/src/nsMenuPopupFrame.cpp      |   1 -
 layout/xul/base/src/nsTextBoxFrame.cpp        |   1 -
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   1 -
 view/src/nsView.cpp                           |   1 -
 widget/public/nsIDeviceContextSpec.h          | 106 +++++++++++++++-
 widget/src/android/nsWindow.cpp               |   1 -
 widget/src/cocoa/nsChildView.mm               |   1 -
 widget/src/cocoa/nsNativeThemeCocoa.h         |   4 +-
 widget/src/gtk2/nsNativeThemeGTK.cpp          |   1 -
 widget/src/gtk2/nsPSPrinters.cpp              |   1 -
 widget/src/gtk2/nsWindow.cpp                  |   1 -
 widget/src/os2/nsWindow.cpp                   |  31 +----
 widget/src/qt/nsNativeThemeQt.cpp             |   3 +-
 widget/src/qt/nsNativeThemeQt.h               |   2 +-
 widget/src/qt/nsWindow.cpp                    |   1 -
 widget/src/windows/nsNativeThemeWin.cpp       |   1 -
 widget/src/windows/nsWindow.cpp               |   1 -
 widget/src/windows/nsWindowGfx.cpp            |   1 -
 59 files changed, 116 insertions(+), 212 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 1c69271fc1be..518eba6806e2 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -76,7 +76,6 @@
 #include "nsReadableUtils.h"
 
 #include "nsColor.h"
-#include "nsIDeviceContext.h"
 #include "nsGfxCIID.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIDocShell.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 1e8ea7dc3707..f62c71c4ad3e 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -86,7 +86,6 @@
 #include "nsIViewManager.h"
 #include "nsISelection.h"
 #include "nsFrameSelection.h"
-#include "nsIDeviceContext.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMWindow.h"
diff --git a/content/html/content/src/nsHTMLFontElement.cpp b/content/html/content/src/nsHTMLFontElement.cpp
index c5405fd78d0c..487870cfe8b5 100644
--- a/content/html/content/src/nsHTMLFontElement.cpp
+++ b/content/html/content/src/nsHTMLFontElement.cpp
@@ -39,7 +39,6 @@
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
-#include "nsIDeviceContext.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsMappedAttributes.h"
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 21414d9c4cb1..354fe4738c16 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -57,7 +57,6 @@
 #include "nsITextScroll.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIContentViewerContainer.h"
-#include "nsIDeviceContext.h"
 
 #include "nsDocLoader.h"
 #include "nsIURILoader.h"
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index f73239734e2b..02e0133e0da2 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -39,7 +39,6 @@
 #include "nscore.h"
 #include "nsScreen.h"
 #include "nsIDocShell.h"
-#include "nsIDeviceContext.h"
 #include "nsPresContext.h"
 #include "nsCOMPtr.h"
 #include "nsDOMClassInfo.h"
diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index 629d6c410265..091607a76e2d 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -76,7 +76,6 @@
 #include "gfxContext.h"
 
 // for painting the background window
-#include "nsIDeviceContext.h"
 #include "nsIRegion.h"
 #include "nsILookAndFeel.h"
 
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index f8831ecc1ad0..54d33e8d0d3a 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -84,7 +84,6 @@
 #include "nsIWindowProvider.h"
 #include "nsIMutableArray.h"
 #include "nsISupportsArray.h"
-#include "nsIDeviceContext.h"
 #include "nsIDOMStorageObsolete.h"
 #include "nsIDOMStorage.h"
 #include "nsPIDOMStorage.h"
diff --git a/gfx/src/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
index 44d0a79913b0..e069fdd81c78 100644
--- a/gfx/src/nsIDeviceContext.h
+++ b/gfx/src/nsIDeviceContext.h
@@ -41,7 +41,6 @@
 
 #include "nsISupports.h"
 #include "nsCoord.h"
-#include "nsRect.h"
 #include "gfxTypes.h"
 #include "nsStringFwd.h"
 
@@ -50,124 +49,11 @@ class nsFontMetrics;
 class nsIWidget;
 class nsIDeviceContextSpec;
 class nsIAtom;
+class nsRect;
 class gfxUserFontSet;
 class nsRenderingContext;
-
 struct nsFont;
 
-//a cross platform way of specifying a native device context
-typedef void * nsNativeDeviceContext;
-
-/* error codes for printer device contexts */
-#define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */
-/* Unix: print command (lp/lpr) not found */
-#define NS_ERROR_GFX_PRINTER_CMD_NOT_FOUND          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+1)
-/* Unix: print command returned an error */  
-#define NS_ERROR_GFX_PRINTER_CMD_FAILURE            \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+2)
-/* no printer available (e.g. cannot find _any_ printer) */
-#define NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE  \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+3)
-/* _specified_ (by name) printer not found */
-#define NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND         \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+4)
-/* access to printer denied */
-#define NS_ERROR_GFX_PRINTER_ACCESS_DENIED          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+5)
-/* invalid printer attribute (for example: unsupported paper size etc.) */
-#define NS_ERROR_GFX_PRINTER_INVALID_ATTRIBUTE      \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+6)
-/* printer not "ready" (offline ?) */
-#define NS_ERROR_GFX_PRINTER_PRINTER_NOT_READY     \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+8)
-/* printer out of paper */
-#define NS_ERROR_GFX_PRINTER_OUT_OF_PAPER           \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+9)
-/* generic printer I/O error */
-#define NS_ERROR_GFX_PRINTER_PRINTER_IO_ERROR       \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+10)
-/* print-to-file: could not open output file */
-#define NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE    \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+11)
-/* print-to-file: I/O error while printing to file */
-#define NS_ERROR_GFX_PRINTER_FILE_IO_ERROR          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+12)
-/* print preview: needs at least one printer */
-#define NS_ERROR_GFX_PRINTER_PRINTPREVIEW          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+13)
-/* print: starting document */
-#define NS_ERROR_GFX_PRINTER_STARTDOC          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+14)
-/* print: ending document */
-#define NS_ERROR_GFX_PRINTER_ENDDOC          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+15)
-/* print: starting page */
-#define NS_ERROR_GFX_PRINTER_STARTPAGE          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+16)
-/* print: ending page */
-#define NS_ERROR_GFX_PRINTER_ENDPAGE          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+17)
-/* print: print while in print preview */
-#define NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW          \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+18)
-/* requested page size not supported by printer */
-#define NS_ERROR_GFX_PRINTER_PAPER_SIZE_NOT_SUPPORTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+19)
-/* requested page orientation not supported */
-#define NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+20)
-/* requested colorspace not supported (like printing "color" on a "grayscale"-only printer) */
-#define NS_ERROR_GFX_PRINTER_COLORSPACE_NOT_SUPPORTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+21)
-/* too many copies requested */
-#define NS_ERROR_GFX_PRINTER_TOO_MANY_COPIES \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+22)
-/* driver configuration error */
-#define NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+23)
-/* The document is still being loaded, can't Print Preview */
-#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY_PP \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+24)
-/* The document was asked to be destroyed while we were preparing printing */
-#define NS_ERROR_GFX_PRINTER_DOC_WAS_DESTORYED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+25)
-/* Cannot Print or Print Preview XUL Documents */
-#define NS_ERROR_GFX_PRINTER_NO_XUL \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+26)
-/* The toolkit no longer supports the Print Dialog (for embedders) */
-#define NS_ERROR_GFX_NO_PRINTDIALOG_IN_TOOLKIT \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+27)
-/* The was wasn't any Print Prompt service registered (this shouldn't happen) */
-#define NS_ERROR_GFX_NO_PRINTROMPTSERVICE \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+28)
-/* requested plex mode not supported by printer */
-#define NS_ERROR_GFX_PRINTER_PLEX_NOT_SUPPORTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+29)
-/* The document is still being loaded */
-#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+30)
-/* Printing is not implemented */
-#define NS_ERROR_GFX_PRINTING_NOT_IMPLEMENTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+31)
-/* Cannot load the matching print module */
-#define NS_ERROR_GFX_COULD_NOT_LOAD_PRINT_MODULE \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+32)   
-/* requested resolution/quality mode not supported by printer */
-#define NS_ERROR_GFX_PRINTER_RESOLUTION_NOT_SUPPORTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+33)
-      
-/**
- * Conts need for Print Preview
- */
-#ifdef NS_PRINT_PREVIEW
-const PRUint8 kUseAltDCFor_NONE            = 0x00; // Do not use the AltDC for anything
-const PRUint8 kUseAltDCFor_FONTMETRICS     = 0x01; // Use it for only getting the font metrics
-const PRUint8 kUseAltDCFor_CREATERC_REFLOW = 0x02; // Use when creating RenderingContexts for Reflow
-const PRUint8 kUseAltDCFor_CREATERC_PAINT  = 0x04; // Use when creating RenderingContexts for Painting
-const PRUint8 kUseAltDCFor_SURFACE_DIM     = 0x08; // Use it for getting the Surface Dimensions
-#endif
-
 #define NS_IDEVICE_CONTEXT_IID   \
 { 0x30a9d22f, 0x8e51, 0x40af, \
   { 0xa1, 0xf5, 0x48, 0xe3, 0x00, 0xaa, 0xa9, 0x27 } }
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index ba91ee5a70fe..282d4cf28804 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -47,6 +47,7 @@
 #include "nsCoord.h"
 #include "gfxContext.h"
 
+struct nsPoint;
 class nsIntRegion;
 
 typedef enum {
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 73834f6f8b98..43b63fa319e6 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -84,7 +84,6 @@
 #include "nsStyleChangeList.h"
 #include "nsIFormControl.h"
 #include "nsCSSAnonBoxes.h"
-#include "nsIDeviceContext.h"
 #include "nsTextFragment.h"
 #include "nsIAnonymousContentCreator.h"
 #include "nsFrameManager.h"
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 1329ba78d9bf..a386ea4d8494 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -57,7 +57,6 @@
 #include "nsGkAtoms.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsTransform2D.h"
-#include "nsIDeviceContext.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIScrollableFrame.h"
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index d9581913abf2..f7771e1293ff 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -48,7 +48,6 @@
 #include "nsGkAtoms.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsTransform2D.h"
-#include "nsIDeviceContext.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIScrollableFrame.h"
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 4a10ec7ca885..51a9deb3cb57 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -57,7 +57,6 @@
 #include "nsIContent.h"
 #include "nsIPresShell.h"
 #include "nsRenderingContext.h"
-#include "nsIDeviceContext.h"
 #include "nsPresContext.h"
 #include "nsILookAndFeel.h"
 #include "nsBlockFrame.h"
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 17c3e5d42b0d..28163adc7360 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -80,7 +80,6 @@
 #include "nsLayoutStylesheetCache.h"
 
 #include "nsViewsCID.h"
-#include "nsIDeviceContext.h"
 #include "nsIDeviceContextSpec.h"
 #include "nsIViewManager.h"
 #include "nsIView.h"
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 5d0124873f6c..1487a9ab5628 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -84,7 +84,6 @@
 #include "nsHashtable.h"
 #include "nsIViewObserver.h"
 #include "nsContainerFrame.h"
-#include "nsIDeviceContext.h"
 #include "nsEventStateManager.h"
 #include "nsDOMEvent.h"
 #include "nsGUIEvent.h"
@@ -8081,7 +8080,6 @@ nsIPresShell::RemoveRefreshObserverExternal(nsARefreshObserver* aObserver,
 #ifdef NS_DEBUG
 #include "nsViewsCID.h"
 #include "nsWidgetsCID.h"
-#include "nsIDeviceContext.h"
 #include "nsIURL.h"
 #include "nsILinkHandler.h"
 
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 3367bce8ee24..36907a89fa6c 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -56,7 +56,6 @@
 #include "nsIDOMNSHTMLOptionCollectn.h" 
 #include "nsPIDOMWindow.h"
 #include "nsIPresShell.h"
-#include "nsIDeviceContext.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsEventDispatcher.h"
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 111e237e3139..51b6fc39bd09 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsCSSRendering.h"
 #include "nsISupports.h"
 #include "nsGkAtoms.h"
-#include "nsIDeviceContext.h"
 #include "nsStyleConsts.h"
 #include "nsFormControlFrame.h"
 #include "nsGUIEvent.h"
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 7dcb97fda061..db185a994499 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -45,13 +45,12 @@
 #include "nsFormControlFrame.h" // for COMPARE macro
 #include "nsGkAtoms.h"
 #include "nsIFormControl.h"
-#include "nsIDeviceContext.h" 
 #include "nsIDocument.h"
-#include "nsIDOMHTMLCollection.h" 
-#include "nsIDOMHTMLOptionsCollection.h" 
+#include "nsIDOMHTMLCollection.h"
+#include "nsIDOMHTMLOptionsCollection.h"
 #include "nsIDOMNSHTMLOptionCollectn.h"
 #include "nsIDOMHTMLSelectElement.h"
-#include "nsIDOMHTMLOptionElement.h" 
+#include "nsIDOMHTMLOptionElement.h"
 #include "nsComboboxControlFrame.h"
 #include "nsIViewManager.h"
 #include "nsIDOMHTMLOptGroupElement.h"
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 1697b5783b4a..22c543c7b157 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -63,7 +63,6 @@
 #include "nsINameSpaceManager.h"
 #include "nsINodeInfo.h"
 #include "nsFormControlFrame.h" //for registering accesskeys
-#include "nsIDeviceContext.h" // to measure fonts
 
 #include "nsIContent.h"
 #include "nsIAtom.h"
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index 7f7d413739c1..ffba73cceeb6 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -49,7 +49,6 @@
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
 #include "nsIEventStateManager.h"
-#include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
 #include "nsIScrollPositionListener.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 78b08323cae4..6c35419a67b4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -79,7 +79,6 @@
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIDOMHTMLHRElement.h"
 #include "nsIDOMHTMLInputElement.h"
-#include "nsIDeviceContext.h"
 #include "nsIEditorDocShell.h"
 #include "nsIEventStateManager.h"
 #include "nsISelection.h"
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index ca8eb1380662..b7d3819475ae 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -60,7 +60,6 @@
 #include "nsIDOMEvent.h"
 #include "nsWidgetsCID.h"
 #include "nsCOMPtr.h"
-#include "nsIDeviceContext.h"
 #include "gfxFont.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsHTMLContainerFrame.h b/layout/generic/nsHTMLContainerFrame.h
index d8456527df33..3c4b7e5b99fd 100644
--- a/layout/generic/nsHTMLContainerFrame.h
+++ b/layout/generic/nsHTMLContainerFrame.h
@@ -42,7 +42,6 @@
 
 #include "nsContainerFrame.h"
 #include "gfxPoint.h"
-#include "nsIDeviceContext.h"
 
 class nsString;
 class nsAbsoluteFrame;
@@ -55,8 +54,11 @@ class nsLineBox;
 
 // Some macros for container classes to do sanity checking on
 // width/height/x/y values computed during reflow.
+// NOTE: AppUnitsPerCSSPixel value hardwired here to remove the
+// dependency on nsIDeviceContext.h.  It doesn't matter if it's a
+// little off.
 #ifdef DEBUG
-#define CRAZY_W (1000000*nsIDeviceContext::AppUnitsPerCSSPixel())
+#define CRAZY_W (1000000*60)
 #define CRAZY_H CRAZY_W
 
 #define CRAZY_WIDTH(_x) (((_x) < -CRAZY_W) || ((_x) > CRAZY_W))
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index a21136d47121..2289089f85cf 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -46,7 +46,6 @@
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIDeviceContext.h"
 #include "nsFontMetrics.h"
 #include "nsBlockFrame.h"
 #include "nsLineBox.h"
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index aa35cac48343..55fed2703b39 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -71,7 +71,6 @@
 #include "nsILink.h"
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
-#include "nsIDeviceContext.h"
 #include "nsINameSpaceManager.h"
 #include "nsTextFragment.h"
 #include "nsIDOMHTMLMapElement.h"
diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index c63215c6dc6c..2e85b4d2c715 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsPresContext.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
-#include "nsIDeviceContext.h"
 #include "nsReadableUtils.h"
 #include "nsSimplePageSequence.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 5141bc932775..df738fb9e4c6 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsCSSFrameConstructor.h"
-#include "nsIDeviceContext.h"
 #include "nsReadableUtils.h"
 #include "nsPageContentFrame.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index e40d355f7930..8b79c0fc7f15 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -94,7 +94,6 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 #include "nsCaret.h"
 
 
-#include "nsIDeviceContext.h"
 #include "nsITimer.h"
 #include "nsIServiceManager.h"
 #include "nsFrameManager.h"
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index aa7c3841744a..6b6fb7ce9f2b 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -41,7 +41,6 @@
 #include "gfxContext.h"
 #include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
-#include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
 #include "nsIPrintSettings.h"
 #include "nsPageFrame.h"
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 11a11484205b..e7a69892c8af 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -69,7 +69,6 @@
 #include "nsTArray.h"
 #include "nsIDOMText.h"
 #include "nsIDocument.h"
-#include "nsIDeviceContext.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsCompatibility.h"
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index dc99f55c2769..d0deaa1e909d 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -60,7 +60,6 @@
 #include "nsNetUtil.h"
 
 #include "nsILookAndFeel.h"
-#include "nsIDeviceContext.h"
 #include "nsCSSRendering.h"
 #include "prprf.h"         // For PR_snprintf()
 
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 7b5cdf6fc0b6..07e004213ae2 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -126,7 +126,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 
 #include "nsViewsCID.h"
 #include "nsWidgetsCID.h"
-#include "nsIDeviceContext.h"
 #include "nsIDeviceContextSpec.h"
 #include "nsIViewManager.h"
 #include "nsIView.h"
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 143f2dc3f73b..6c55af738ec1 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -51,7 +51,6 @@
 #include "mozilla/css/Loader.h"
 #include "nsIURL.h"
 #include "nsIDocument.h"
-#include "nsIDeviceContext.h"
 #include "nsIAtom.h"
 #include "nsCRT.h"
 #include "nsString.h"
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index 56f26196a116..e83b9893b421 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -42,7 +42,6 @@
 #include "nsCSSKeywords.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsIDeviceContext.h"
 #include "nsCSSValue.h"
 #include "nsIDocShell.h"
 #include "nsLayoutUtils.h"
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index b74845bfd80f..7737a0fd8bb0 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -52,7 +52,6 @@
 #include "nsRuleNode.h"
 #include "nscore.h"
 #include "nsIServiceManager.h"
-#include "nsIDeviceContext.h"
 #include "nsIWidget.h"
 #include "nsILookAndFeel.h"
 #include "nsIPresShell.h"
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 0b787b5039b8..6bd8e3891033 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -51,7 +51,6 @@
 #include "nsThemeConstants.h"
 #include "nsString.h"
 #include "nsPresContext.h"
-#include "nsIDeviceContext.h"
 #include "nsIWidget.h"
 #include "nsIStyleRule.h"
 #include "nsCRT.h"
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index e7b72cd3048b..1b52e30168c3 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -51,7 +51,6 @@
 #include "nsIDOMNamedNodeMap.h"
 #include "nsIDOMAttr.h"
 #include "nsIDocument.h"
-#include "nsIDeviceContext.h"
 #include "nsITheme.h"
 #include "nsIServiceManager.h"
 #include "nsIBoxLayout.h"
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
index 55f534f798ca..bb05bfed6d41 100644
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
 #include "nsIEventStateManager.h"
-#include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
 #include "nsBoxFrame.h"
 #include "nsStackLayout.h"
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 502f87396183..064e31d05174 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -43,7 +43,6 @@
 //
 
 #include "nsImageBoxFrame.h"
-#include "nsIDeviceContext.h"
 #include "nsGkAtoms.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
@@ -66,7 +65,6 @@
 #include "prprf.h"
 #include "nsCSSRendering.h"
 #include "nsIDOMHTMLImageElement.h"
-#include "nsIDeviceContext.h"
 #include "nsINameSpaceManager.h"
 #include "nsTextFragment.h"
 #include "nsIDOMHTMLMapElement.h"
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 460ace1b86ad..898dbc0031b2 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsLeafBoxFrame.h"
 #include "nsBoxFrame.h"
 #include "nsCOMPtr.h"
-#include "nsIDeviceContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index 30c197c7300a..41033226c7a9 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -58,7 +58,6 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsStyleContext.h"
-#include "nsIDeviceContext.h"
 #include "nsFontMetrics.h"
 #include "nsITimer.h"
 #include "nsAutoPtr.h"
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 8c9712b3b75a..8128d443cbf9 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -60,7 +60,6 @@
 #include "nsIPresShell.h"
 #include "nsFrameManager.h"
 #include "nsIDocument.h"
-#include "nsIDeviceContext.h"
 #include "nsRect.h"
 #include "nsILookAndFeel.h"
 #include "nsIComponentManager.h"
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 2f7dcc03e67b..bbb4d6a25315 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -48,7 +48,6 @@
 #include "nsReadableUtils.h"
 #include "nsTextBoxFrame.h"
 #include "nsCOMPtr.h"
-#include "nsIDeviceContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 95de11be518d..6c6885817f06 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -76,7 +76,6 @@
 #include "nsIContent.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsCSSRendering.h"
-#include "nsIDeviceContext.h"
 #include "nsIXULTemplateBuilder.h"
 #include "nsXPIDLString.h"
 #include "nsHTMLContainerFrame.h"
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 37b2deecf720..7b464794699b 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -40,7 +40,6 @@
 #include "nsWidgetsCID.h"
 #include "nsViewManager.h"
 #include "nsGUIEvent.h"
-#include "nsIDeviceContext.h"
 #include "nsIComponentManager.h"
 #include "nsGfxCIID.h"
 #include "nsIRegion.h"
diff --git a/widget/public/nsIDeviceContextSpec.h b/widget/public/nsIDeviceContextSpec.h
index 8dbca1167c9e..f70d3696651d 100644
--- a/widget/public/nsIDeviceContextSpec.h
+++ b/widget/public/nsIDeviceContextSpec.h
@@ -38,12 +38,10 @@
 #ifndef nsIDeviceContextSpec_h___
 #define nsIDeviceContextSpec_h___
 
-#include "nsIDeviceContext.h"
-#include "prtypes.h"
+#include "nsISupports.h"
 
 class nsIWidget;
 class nsIPrintSettings;
-
 class gfxASurface;
 
 #define NS_IDEVICE_CONTEXT_SPEC_IID   \
@@ -70,7 +68,7 @@ public:
 
    NS_IMETHOD BeginDocument(PRUnichar*  aTitle,
                             PRUnichar*  aPrintToFileName,
-                            PRInt32     aStartPage, 
+                            PRInt32     aStartPage,
                             PRInt32     aEndPage) = 0;
 
    NS_IMETHOD EndDocument() = 0;
@@ -81,4 +79,104 @@ public:
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContextSpec,
                               NS_IDEVICE_CONTEXT_SPEC_IID)
 
+/* error codes for printer device contexts */
+#define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */
+/* Unix: print command (lp/lpr) not found */
+#define NS_ERROR_GFX_PRINTER_CMD_NOT_FOUND          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+1)
+/* Unix: print command returned an error */
+#define NS_ERROR_GFX_PRINTER_CMD_FAILURE            \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+2)
+/* no printer available (e.g. cannot find _any_ printer) */
+#define NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE  \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+3)
+/* _specified_ (by name) printer not found */
+#define NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND         \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+4)
+/* access to printer denied */
+#define NS_ERROR_GFX_PRINTER_ACCESS_DENIED          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+5)
+/* invalid printer attribute (for example: unsupported paper size etc.) */
+#define NS_ERROR_GFX_PRINTER_INVALID_ATTRIBUTE      \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+6)
+/* printer not "ready" (offline ?) */
+#define NS_ERROR_GFX_PRINTER_PRINTER_NOT_READY     \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+8)
+/* printer out of paper */
+#define NS_ERROR_GFX_PRINTER_OUT_OF_PAPER           \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+9)
+/* generic printer I/O error */
+#define NS_ERROR_GFX_PRINTER_PRINTER_IO_ERROR       \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+10)
+/* print-to-file: could not open output file */
+#define NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE    \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+11)
+/* print-to-file: I/O error while printing to file */
+#define NS_ERROR_GFX_PRINTER_FILE_IO_ERROR          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+12)
+/* print preview: needs at least one printer */
+#define NS_ERROR_GFX_PRINTER_PRINTPREVIEW          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+13)
+/* print: starting document */
+#define NS_ERROR_GFX_PRINTER_STARTDOC          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+14)
+/* print: ending document */
+#define NS_ERROR_GFX_PRINTER_ENDDOC          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+15)
+/* print: starting page */
+#define NS_ERROR_GFX_PRINTER_STARTPAGE          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+16)
+/* print: ending page */
+#define NS_ERROR_GFX_PRINTER_ENDPAGE          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+17)
+/* print: print while in print preview */
+#define NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW          \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+18)
+/* requested page size not supported by printer */
+#define NS_ERROR_GFX_PRINTER_PAPER_SIZE_NOT_SUPPORTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+19)
+/* requested page orientation not supported */
+#define NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+20)
+/* requested colorspace not supported (like printing "color" on a
+   "grayscale"-only printer) */
+#define NS_ERROR_GFX_PRINTER_COLORSPACE_NOT_SUPPORTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+21)
+/* too many copies requested */
+#define NS_ERROR_GFX_PRINTER_TOO_MANY_COPIES \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+22)
+/* driver configuration error */
+#define NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+23)
+/* The document is still being loaded, can't Print Preview */
+#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY_PP \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+24)
+/* The document was asked to be destroyed while we were preparing printing */
+#define NS_ERROR_GFX_PRINTER_DOC_WAS_DESTORYED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+25)
+/* Cannot Print or Print Preview XUL Documents */
+#define NS_ERROR_GFX_PRINTER_NO_XUL \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+26)
+/* The toolkit no longer supports the Print Dialog (for embedders) */
+#define NS_ERROR_GFX_NO_PRINTDIALOG_IN_TOOLKIT \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+27)
+/* The was wasn't any Print Prompt service registered (this shouldn't happen) */
+#define NS_ERROR_GFX_NO_PRINTROMPTSERVICE \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+28)
+/* requested plex mode not supported by printer */
+#define NS_ERROR_GFX_PRINTER_PLEX_NOT_SUPPORTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+29)
+/* The document is still being loaded */
+#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+30)
+/* Printing is not implemented */
+#define NS_ERROR_GFX_PRINTING_NOT_IMPLEMENTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+31)
+/* Cannot load the matching print module */
+#define NS_ERROR_GFX_COULD_NOT_LOAD_PRINT_MODULE \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+32)
+/* requested resolution/quality mode not supported by printer */
+#define NS_ERROR_GFX_PRINTER_RESOLUTION_NOT_SUPPORTED \
+  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+33)
+
 #endif
diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index 4b4e451a9ba7..1a8956832155 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -53,7 +53,6 @@ using mozilla::unused;
 #include "nsWindow.h"
 #include "nsIObserverService.h"
 
-#include "nsIDeviceContext.h"
 #include "nsRenderingContext.h"
 #include "nsIDOMSimpleGestureEvent.h"
 
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index b895587dfc1d..a43c8dad2f79 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -59,7 +59,6 @@
 #include "nsIPrefBranch.h"
 
 #include "nsFontMetrics.h"
-#include "nsIDeviceContext.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
 #include "nsIViewManager.h"
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.h b/widget/src/cocoa/nsNativeThemeCocoa.h
index 3f11d6b0bffe..80381d347c77 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.h
+++ b/widget/src/cocoa/nsNativeThemeCocoa.h
@@ -45,12 +45,11 @@
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
 #include "nsILookAndFeel.h"
-#include "nsIDeviceContext.h"
 #include "nsNativeTheme.h"
-
 #include "gfxASurface.h"
 
 @class CellDrawView;
+class nsIDeviceContext;
 
 class nsNativeThemeCocoa : private nsNativeTheme,
                            public nsITheme
@@ -95,7 +94,6 @@ public:
 protected:  
 
   nsresult GetSystemColor(PRUint8 aWidgetType, nsILookAndFeel::nsColorID& aColorID);
-  nsresult GetSystemFont(PRUint8 aWidgetType, nsSystemFontID& aFont);
   nsIntMargin RTLAwareMargin(const nsIntMargin& aMargin, nsIFrame* aFrame);
 
   // HITheme drawing routines
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 3d7b3d4c1418..05529c3ba4ad 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -53,7 +53,6 @@
 #include "nsIViewManager.h"
 #include "nsINameSpaceManager.h"
 #include "nsILookAndFeel.h"
-#include "nsIDeviceContext.h"
 #include "nsGfxCIID.h"
 #include "nsTransform2D.h"
 #include "nsIMenuFrame.h"
diff --git a/widget/src/gtk2/nsPSPrinters.cpp b/widget/src/gtk2/nsPSPrinters.cpp
index 63bea9309049..f8c8582efc42 100644
--- a/widget/src/gtk2/nsPSPrinters.cpp
+++ b/widget/src/gtk2/nsPSPrinters.cpp
@@ -38,7 +38,6 @@
 
 #include "nscore.h"
 #include "nsCUPSShim.h"
-#include "nsIDeviceContext.h"       // GFX error codes
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsIServiceManager.h"
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 5e343f73f7be..d0fe8ad46647 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -46,7 +46,6 @@
 #include "prlink.h"
 #include "nsWindow.h"
 #include "nsGTKToolkit.h"
-#include "nsIDeviceContext.h"
 #include "nsIRollupListener.h"
 #include "nsIMenuRollup.h"
 #include "nsIDOMNode.h"
diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index 23fe7bb98726..51d3e17a8e99 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -74,7 +74,6 @@
 #include "nsDragService.h"
 #include "nsGfxCIID.h"
 #include "nsHashKeys.h"
-#include "nsIDeviceContext.h"
 #include "nsIMenuRollup.h"
 #include "nsIPrefService.h"
 #include "nsIRollupListener.h"
@@ -364,32 +363,9 @@ NS_METHOD nsWindow::Create(nsIWidget* aParent,
     }
   }
 
-  // Save the event callback function.
-  mEventCallback = aHandleEventFunction;
+  BaseCreate(aParent, aRect, aHandleEventFunction,
+             aContext, aAppShell, aToolkit, aInitData);
 
-  // Make sure a device context exists.
-  if (aContext) {
-    mContext = aContext;
-    NS_ADDREF(mContext);
-  } else {
-    static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
-    nsresult rv = CallCreateInstance(kDeviceContextCID, &mContext);
-    NS_ENSURE_SUCCESS(rv, rv);
-    mContext->Init(nsnull);
-  }
-
-  // XXX Toolkit is obsolete & will be removed.
-  if (!mToolkit) {
-    if (aToolkit) {
-      mToolkit = aToolkit;
-    } else if (pParent) {
-      mToolkit = pParent->GetToolkit();
-    } else {
-      mToolkit = new nsToolkit;
-      mToolkit->Init(PR_GetCurrentThread());
-    }
-    NS_ADDREF(mToolkit);
-  }
 
 #ifdef DEBUG_FOCUS
   mWindowIdentifier = currentWindowIdentifier;
@@ -398,9 +374,6 @@ NS_METHOD nsWindow::Create(nsIWidget* aParent,
 
   // Some basic initialization.
   if (aInitData) {
-    mWindowType = aInitData->mWindowType;
-    mBorderStyle = aInitData->mBorderStyle;
-
     // Suppress creation of a Thebes surface for windows that will never
     // be painted because they're always covered by another window.
     if (mWindowType == eWindowType_toplevel ||
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index e9b616bcadcd..95a6e82c5807 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -53,7 +53,6 @@
 
 #include "nsCoord.h"
 #include "nsNativeThemeQt.h"
-#include "nsIDeviceContext.h"
 #include "nsPresContext.h"
 
 #include "nsRect.h"
@@ -347,7 +346,7 @@ nsNativeThemeQt::DrawWidgetBackground(QPainter *qPainter,
 }
 
 NS_IMETHODIMP
-nsNativeThemeQt::GetWidgetBorder(nsIDeviceContext* aContext,
+nsNativeThemeQt::GetWidgetBorder(nsIDeviceContext* ,
                                  nsIFrame* aFrame,
                                  PRUint8 aWidgetType,
                                  nsIntMargin* aResult)
diff --git a/widget/src/qt/nsNativeThemeQt.h b/widget/src/qt/nsNativeThemeQt.h
index 266b32c47b0a..2be3fe9136a5 100644
--- a/widget/src/qt/nsNativeThemeQt.h
+++ b/widget/src/qt/nsNativeThemeQt.h
@@ -46,7 +46,6 @@
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
 #include "nsNativeTheme.h"
-#include "nsIDeviceContext.h"
 
 class QComboBox;
 class QStyleOptionButton;
@@ -54,6 +53,7 @@ class QStyleOptionFrameV2;
 class QStyleOptionComboBox;
 class QRect;
 class nsIFrame;
+class nsIDeviceContext;
 
 class nsNativeThemeQt : private nsNativeTheme,
                         public nsITheme
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index b8d14b618906..c12159f850e5 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -94,7 +94,6 @@ using namespace QtMobility;
 #endif
 
 #include "nsToolkit.h"
-#include "nsIDeviceContext.h"
 #include "nsIdleService.h"
 #include "nsRenderingContext.h"
 #include "nsIRegion.h"
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index a57b7b9192e7..546bef6e5d7f 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -42,7 +42,6 @@
 #include <windows.h>
 #include "nsNativeThemeWin.h"
 #include "nsRenderingContext.h"
-#include "nsIDeviceContext.h"
 #include "nsRect.h"
 #include "nsSize.h"
 #include "nsTransform2D.h"
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 51b0953da20d..bdf7c5a82e9b 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -138,7 +138,6 @@
 #include "nsILocalFile.h"
 #include "nsFontMetrics.h"
 #include "nsIFontEnumerator.h"
-#include "nsIDeviceContext.h"
 #include "nsILookAndFeel.h"
 #include "nsGUIEvent.h"
 #include "nsFont.h"
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index 7dc8c917910d..0fdc4a77bed0 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -65,7 +65,6 @@ using mozilla::plugins::PluginInstanceParent;
 #include "nsGfxCIID.h"
 #include "gfxContext.h"
 #include "nsRenderingContext.h"
-#include "nsIDeviceContext.h"
 #include "prmem.h"
 
 #include "LayerManagerOGL.h"

From cf9f8f98442adbbd4eabf47f22f360f6165f611d Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:41 -0700
Subject: [PATCH 053/509] Bug 651017, part 2: wrap gfxPlatform::Init/Shutdown
 in a service and register it for app-startup.  Also prune some dead CIDs from
 nsGfxCIID.h.

--HG--
extra : rebase_source : d296ac53c4c60d79f7e2d6904dd54ce930099bbd
---
 gfx/src/nsGfxCIID.h                     | 14 +++----------
 gfx/src/nsThebesGfxFactory.cpp          | 26 ++++++++++++++++++++++++-
 gfx/thebes/gfxPlatform.cpp              |  4 ++--
 modules/libpr0n/build/nsImageModule.cpp | 11 +++--------
 widget/src/windows/nsImageClipboard.cpp |  1 +
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/gfx/src/nsGfxCIID.h b/gfx/src/nsGfxCIID.h
index 303d3ead2b9d..5cc4a4b333bc 100644
--- a/gfx/src/nsGfxCIID.h
+++ b/gfx/src/nsGfxCIID.h
@@ -38,14 +38,6 @@
 #ifndef nsGfxCIID_h__
 #define nsGfxCIID_h__
 
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nsIComponentManager.h"
-
-#define NS_IMAGE_CID \
-{ 0x6049b260, 0xc1e6, 0x11d1, \
-{ 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
 #define NS_DEVICE_CONTEXT_CID \
 { 0x6049b262, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
@@ -62,8 +54,8 @@
 { 0xda5b130a, 0x1dd1, 0x11b2, \
 { 0xad, 0x47, 0xf4, 0x55, 0xb1, 0x81, 0x4a, 0x78 } }
 
-#define NS_DRAWING_SURFACE_CID \
-{ 0x199c7040, 0xcab0, 0x11d2, \
-{ 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
+#define NS_GFX_INITIALIZATION_CID \
+{ 0x67c41576, 0x9664, 0x4ed5, \
+{ 0x90, 0xc1, 0xf6, 0x68, 0x3f, 0xd5, 0x2c, 0x8f } }
 
 #endif
diff --git a/gfx/src/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
index 0f514e6e8ac7..8547b3e90bec 100644
--- a/gfx/src/nsThebesGfxFactory.cpp
+++ b/gfx/src/nsThebesGfxFactory.cpp
@@ -47,9 +47,25 @@
 #include "nsThebesFontEnumerator.h"
 #include "gfxPlatform.h"
 
+// This service doesn't do anything; its only purpose is to force the
+// gfx module constructor to be called (and hence gfxPlatform::Init).
+// It's invoked at app-startup time and may also be invoked directly
+// (as do_GetService("@mozilla.org/gfx/init;1")) from code (like the
+// libpr0n module constructor) that wants to make sure gfx is
+// initialized.
+
+namespace {
+class GfxInitialization : public nsISupports {
+    NS_DECL_ISUPPORTS
+};
+
+NS_IMPL_ISUPPORTS0(GfxInitialization)
+}
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesDeviceContext)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRegion)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontEnumerator)
+NS_GENERIC_FACTORY_CONSTRUCTOR(GfxInitialization)
 
 static nsresult
 nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -96,12 +112,14 @@ NS_DEFINE_NAMED_CID(NS_FONT_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_CID);
 NS_DEFINE_NAMED_CID(NS_REGION_CID);
 NS_DEFINE_NAMED_CID(NS_SCRIPTABLE_REGION_CID);
+NS_DEFINE_NAMED_CID(NS_GFX_INITIALIZATION_CID);
 
 static const mozilla::Module::CIDEntry kThebesCIDs[] = {
     { &kNS_FONT_ENUMERATOR_CID, false, NULL, nsThebesFontEnumeratorConstructor },
     { &kNS_DEVICE_CONTEXT_CID, false, NULL, nsThebesDeviceContextConstructor },
     { &kNS_REGION_CID, false, NULL, nsThebesRegionConstructor },
     { &kNS_SCRIPTABLE_REGION_CID, false, NULL, nsScriptableRegionConstructor },
+    { &kNS_GFX_INITIALIZATION_CID, false, NULL, GfxInitializationConstructor },
     { NULL }
 };
 
@@ -110,6 +128,12 @@ static const mozilla::Module::ContractIDEntry kThebesContracts[] = {
     { "@mozilla.org/gfx/devicecontext;1", &kNS_DEVICE_CONTEXT_CID },
     { "@mozilla.org/gfx/region/nsThebes;1", &kNS_REGION_CID },
     { "@mozilla.org/gfx/region;1", &kNS_SCRIPTABLE_REGION_CID },
+    { "@mozilla.org/gfx/init;1", &kNS_GFX_INITIALIZATION_CID },
+    { NULL }
+};
+
+static const mozilla::Module::CategoryEntry kThebesCategories[] = {
+    { "app-startup", "Gfx Initialization", "service,@mozilla.org/gfx/init;1" },
     { NULL }
 };
 
@@ -130,7 +154,7 @@ static const mozilla::Module kThebesModule = {
     mozilla::Module::kVersion,
     kThebesCIDs,
     kThebesContracts,
-    NULL,
+    kThebesCategories,
     NULL,
     nsThebesGfxModuleCtor,
     nsThebesGfxModuleDtor
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index f939dd22b54b..a43b3205db8f 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -272,9 +272,9 @@ gfxPlatform::Init()
     gPlatform = new gfxOS2Platform;
 #elif defined(ANDROID)
     gPlatform = new gfxAndroidPlatform;
+#else
+    #error "No gfxPlatform implementation available"
 #endif
-    if (!gPlatform)
-        return NS_ERROR_OUT_OF_MEMORY;
 
     nsresult rv;
 
diff --git a/modules/libpr0n/build/nsImageModule.cpp b/modules/libpr0n/build/nsImageModule.cpp
index aa35fd3e748d..9e44f1d7b86a 100644
--- a/modules/libpr0n/build/nsImageModule.cpp
+++ b/modules/libpr0n/build/nsImageModule.cpp
@@ -37,10 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDeviceContext.h"
 #include "mozilla/ModuleUtils.h"
-#include "nsXPCOMCID.h"
-#include "nsServiceManagerUtils.h"
 
 #include "RasterImage.h"
 
@@ -121,11 +118,9 @@ static const mozilla::Module::CategoryEntry kImageCategories[] = {
 static nsresult
 imglib_Initialize()
 {
-  // Hack: We need the gfx module to be initialized because we use gfxPlatform
-  // in imgFrame. Request something from the gfx module to ensure that
-  // everything's set up for us.
-  nsCOMPtr<nsIDeviceContext> devctx = 
-    do_CreateInstance("@mozilla.org/gfx/devicecontext;1");
+  // We need the gfx module to be initialized because we use gfxPlatform
+  // in imgFrame. It should have happened by now, but make sure.
+  nsCOMPtr<nsISupports> dummy = do_GetService("@mozilla.org/gfx/init;1");
 
   imgLoader::InitCache();
   return NS_OK;
diff --git a/widget/src/windows/nsImageClipboard.cpp b/widget/src/windows/nsImageClipboard.cpp
index 9c0b5f63f9c2..51881401f5a6 100644
--- a/widget/src/windows/nsImageClipboard.cpp
+++ b/widget/src/windows/nsImageClipboard.cpp
@@ -47,6 +47,7 @@
 #include "prmem.h"
 #include "imgIEncoder.h"
 #include "nsLiteralString.h"
+#include "nsComponentManagerUtils.h"
 
 /* Things To Do 11/8/00
 

From 67295a5d8df607f202c4c11ff3870266af293367 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:41 -0700
Subject: [PATCH 054/509] Bug 651017, part 3: Make nsThebesDeviceContext not an
 nsIObserver.  Also remove some more obsolete junk from nsThebesDeviceContext
 itself.

--HG--
extra : rebase_source : 38fdc667532509e272726bf8098c6f728e94e8ad
---
 gfx/src/nsThebesDeviceContext.cpp | 158 +++++++++++++-----------------
 gfx/src/nsThebesDeviceContext.h   |  14 +--
 2 files changed, 67 insertions(+), 105 deletions(-)

diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index 73cde7c57230..f9d8c829dbc7 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -44,6 +44,8 @@
 
 #include "nsIServiceManager.h"
 #include "nsIPrefService.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
 #include "nsCRT.h"
 #include "mozilla/Services.h"
 
@@ -92,56 +94,70 @@ static nsSystemFontsAndroid *gSystemFonts = nsnull;
 #error Need to declare gSystemFonts!
 #endif
 
-#ifdef PR_LOGGING
-PRLogModuleInfo* gThebesGFXLog = nsnull;
-#endif
+using mozilla::services::GetObserverService;
 
-class nsFontCache
+class nsFontCache : public nsIObserver
 {
 public:
-    nsFontCache();
-    ~nsFontCache();
+    nsFontCache()   { MOZ_COUNT_CTOR(nsFontCache); }
+    ~nsFontCache()  { MOZ_COUNT_DTOR(nsFontCache); }
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIOBSERVER
+
+    void Init(nsIDeviceContext* aContext);
+    void Destroy();
 
-    nsresult Init(nsIDeviceContext* aContext);
     nsresult GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                            gfxUserFontSet* aUserFontSet,
                            nsFontMetrics*& aMetrics);
 
-    nsresult FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
-    nsresult Compact();
-    nsresult Flush();
+    void FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
+    void Compact();
+    void Flush();
 
 protected:
+    nsIDeviceContext*         mContext; // owner
     nsTArray<nsFontMetrics*>  mFontMetrics;
-    nsIDeviceContext         *mContext; // we do not addref this since
-                                        // ownership is implied. MMP.
 };
 
-nsFontCache::nsFontCache()
+NS_IMPL_ISUPPORTS1(nsFontCache, nsIObserver)
+
+// The Init and Destroy methods are necessary because it's not
+// safe to call AddObserver from a constructor or RemoveObserver
+// from a destructor.  That should be fixed.
+void
+nsFontCache::Init(nsIDeviceContext* aContext)
 {
-    MOZ_COUNT_CTOR(nsFontCache);
-    mContext = nsnull;
+    mContext = aContext;
+    // register as a memory-pressure observer to free font resources
+    // in low-memory situations.
+    nsCOMPtr<nsIObserverService> obs = GetObserverService();
+    if (obs)
+        obs->AddObserver(this, "memory-pressure", PR_FALSE);
 }
 
-nsFontCache::~nsFontCache()
+void
+nsFontCache::Destroy()
 {
-    MOZ_COUNT_DTOR(nsFontCache);
+    nsCOMPtr<nsIObserverService> obs = GetObserverService();
+    if (obs)
+        obs->RemoveObserver(this, "memory-pressure");
     Flush();
 }
 
-nsresult
-nsFontCache::Init(nsIDeviceContext* aContext)
+NS_IMETHODIMP
+nsFontCache::Observe(nsISupports*, const char* aTopic, const PRUnichar*)
 {
-    NS_PRECONDITION(nsnull != aContext, "null ptr");
-    // Note: we don't hold a reference to the device context, because it
-    // holds a reference to us and we don't want circular references
-    mContext = aContext;
+    if (!nsCRT::strcmp(aTopic, "memory-pressure"))
+        Compact();
     return NS_OK;
 }
 
 nsresult
 nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
-  gfxUserFontSet* aUserFontSet, nsFontMetrics*& aMetrics)
+                           gfxUserFontSet* aUserFontSet,
+                           nsFontMetrics*& aMetrics)
 {
     // First check our cache
     // start from the end, which is where we put the most-recent-used element
@@ -205,17 +221,19 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
         return NS_OK;
     }
 
-    NS_POSTCONDITION(NS_SUCCEEDED(rv), "font metrics should not be null - bug 136248");
+    NS_POSTCONDITION(NS_SUCCEEDED(rv),
+                     "font metrics should not be null - bug 136248");
     return rv;
 }
 
-nsresult nsFontCache::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
+void
+nsFontCache::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
 {
     mFontMetrics.RemoveElement(aFontMetrics);
-    return NS_OK;
 }
 
-nsresult nsFontCache::Compact()
+void
+nsFontCache::Compact()
 {
     // Need to loop backward because the running element can be removed on
     // the way
@@ -227,15 +245,15 @@ nsresult nsFontCache::Compact()
         NS_RELEASE(fm); // this will reset fm to nsnull
         // if the font is really gone, it would have called back in
         // FontMetricsDeleted() and would have removed itself
-        if (mFontMetrics.IndexOf(oldfm) != mFontMetrics.NoIndex) { 
+        if (mFontMetrics.IndexOf(oldfm) != mFontMetrics.NoIndex) {
             // nope, the font is still there, so let's hold onto it too
             NS_ADDREF(oldfm);
         }
     }
-    return NS_OK;
 }
 
-nsresult nsFontCache::Flush()
+void
+nsFontCache::Flush()
 {
     for (PRInt32 i = mFontMetrics.Length()-1; i >= 0; --i) {
         nsFontMetrics* fm = mFontMetrics[i];
@@ -245,23 +263,13 @@ nsresult nsFontCache::Flush()
         fm->Destroy();
         NS_RELEASE(fm);
     }
-
     mFontMetrics.Clear();
-
-    return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS3(nsThebesDeviceContext, nsIDeviceContext, nsIObserver, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS1(nsThebesDeviceContext, nsIDeviceContext)
 
 nsThebesDeviceContext::nsThebesDeviceContext()
 {
-#ifdef PR_LOGGING
-    if (!gThebesGFXLog)
-        gThebesGFXLog = PR_NewLogModule("thebesGfx");
-#endif
-
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("#### Creating DeviceContext %p\n", this));
-
     mAppUnitsPerDevPixel = nscoord(-1);
     mAppUnitsPerPhysicalInch = nscoord(-1);
     mAppUnitsPerDevNotScaledPixel = nscoord(-1);
@@ -274,41 +282,26 @@ nsThebesDeviceContext::nsThebesDeviceContext()
     mWidth = 0;
     mHeight = 0;
     mPrintingScale = 1.0f;
-
-#if defined(XP_WIN) && !defined(WINCE)
-    SCRIPT_DIGITSUBSTITUTE sds;
-    ScriptRecordDigitSubstitution(LOCALE_USER_DEFAULT, &sds);
-#endif
 }
 
+// Note: we use a bare pointer for mFontCache so that nsFontCache
+// can be an incomplete type in nsThebesDeviceContext.h.
+// Therefore we have to do all the refcounting by hand.
 nsThebesDeviceContext::~nsThebesDeviceContext()
 {
-    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-    if (obs)
-        obs->RemoveObserver(this, "memory-pressure");
-
-    if (nsnull != mFontCache) {
-        delete mFontCache;
-        mFontCache = nsnull;
+    if (mFontCache) {
+        mFontCache->Destroy();
+        NS_RELEASE(mFontCache);
     }
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::Observe(nsISupports* aSubject, const char* aTopic, const PRUnichar* aSomeData)
-{
-    if (mFontCache && !nsCRT::strcmp(aTopic, "memory-pressure")) {
-        mFontCache->Compact();
-    }
-    return NS_OK;
-}
-
 NS_IMETHODIMP nsThebesDeviceContext::CreateFontCache()
 {
     mFontCache = new nsFontCache();
-    if (!mFontCache) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    return mFontCache->Init(this);
+    NS_ADDREF(mFontCache);
+    mFontCache->Init(this);
+    GetLocaleLanguage();
+    return NS_OK;
 }
 
 NS_IMETHODIMP nsThebesDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
@@ -337,15 +330,8 @@ nsThebesDeviceContext::GetLocaleLanguage(void)
 NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
   nsIAtom* aLanguage, gfxUserFontSet* aUserFontSet, nsFontMetrics*& aMetrics)
 {
-    if (nsnull == mFontCache) {
-        nsresult rv = CreateFontCache();
-        if (NS_FAILED(rv)) {
-            aMetrics = nsnull;
-            return rv;
-        }
-        // XXX temporary fix for performance problem -- erik
-        GetLocaleLanguage();
-    }
+    if (!mFontCache)
+        CreateFontCache();
 
     // XXX figure out why aLanguage is NULL sometimes
     //      -> see nsPageFrame.cpp:511
@@ -360,15 +346,9 @@ NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
                                                    gfxUserFontSet* aUserFontSet,
                                                    nsFontMetrics*& aMetrics)
 {
-    if (nsnull == mFontCache) {
-        nsresult rv = CreateFontCache();
-        if (NS_FAILED(rv)) {
-            aMetrics = nsnull;
-            return rv;
-        }
-        // XXX temporary fix for performance problem -- erik
-        GetLocaleLanguage();
-    }
+    if (!mFontCache)
+        CreateFontCache();
+
     return mFontCache->GetMetricsFor(aFont, mLocaleLanguage, aUserFontSet,
                                      aMetrics);
 }
@@ -409,7 +389,7 @@ nsThebesDeviceContext::GetLocalFontName(const nsString& aFaceName,
 
 NS_IMETHODIMP nsThebesDeviceContext::FlushFontCache(void)
 {
-    if (nsnull != mFontCache)
+    if (mFontCache)
         mFontCache->Flush();
     return NS_OK;
 }
@@ -536,12 +516,6 @@ nsThebesDeviceContext::Init(nsIWidget *aWidget)
     if (mScreenManager)
         return NS_OK;
 
-    // register as a memory-pressure observer to free font resources
-    // in low-memory situations.
-    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-    if (obs)
-        obs->AddObserver(this, "memory-pressure", PR_TRUE);
-
     mScreenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
 
     return NS_OK;
diff --git a/gfx/src/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
index a2ed1193df02..1426a1f56005 100644
--- a/gfx/src/nsThebesDeviceContext.h
+++ b/gfx/src/nsThebesDeviceContext.h
@@ -45,17 +45,8 @@
 #include "nsIDeviceContextSpec.h"
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
-#include "nsIObserver.h"
-#include "nsIObserverService.h"
-#include "nsWeakReference.h"
 #include "gfxContext.h"
 
-#include "prlog.h"
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* gThebesGFXLog;
-#endif
-
 #ifdef XP_WIN
 #include "gfxWindowsSurface.h"
 #elif defined(XP_OS2)
@@ -64,9 +55,7 @@ extern PRLogModuleInfo* gThebesGFXLog;
 
 class nsFontCache;
 
-class nsThebesDeviceContext : public nsIDeviceContext,
-                              public nsIObserver,
-                              public nsSupportsWeakReference
+class nsThebesDeviceContext : public nsIDeviceContext
 {
 public:
     nsThebesDeviceContext();
@@ -75,7 +64,6 @@ public:
     static void Shutdown();
 
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIOBSERVER
 
     NS_IMETHOD Init(nsIWidget *aWidget);
     NS_IMETHOD InitForPrinting(nsIDeviceContextSpec *aDevSpec);

From 0d75035ecd1c88f68f09cf9800b809b0bececb7e Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:42 -0700
Subject: [PATCH 055/509] Bug 651017, part 4: deCOM nsIDeviceContext;
 include-minimization on nsDeviceContext.h itself; merge GetPrintDC() into
 Windows/OS/2 specific code; merge Shutdown() with ClearCachedSystemFonts(). 
 Most references outside gfx not fixed up.

--HG--
rename : gfx/src/nsThebesDeviceContext.cpp => gfx/src/nsDeviceContext.cpp
rename : gfx/src/nsThebesDeviceContext.h => gfx/src/nsDeviceContext.h
extra : rebase_source : 9fb366d99d18c9335ba297d21f673178dae62a64
---
 gfx/layers/ThebesLayerBuffer.cpp              |   4 +-
 gfx/src/Makefile.in                           |   4 +-
 ...sDeviceContext.cpp => nsDeviceContext.cpp} | 360 +++++++--------
 gfx/src/nsDeviceContext.h                     | 409 ++++++++++++++++++
 gfx/src/nsFontMetrics.cpp                     |   6 +-
 gfx/src/nsFontMetrics.h                       |   9 +-
 gfx/src/nsGfxCIID.h                           |   4 -
 gfx/src/nsIDeviceContext.h                    | 386 -----------------
 gfx/src/nsITheme.h                            |   8 +-
 gfx/src/nsRect.cpp                            |  10 +-
 gfx/src/nsRenderingContext.cpp                |   4 +-
 gfx/src/nsRenderingContext.h                  |  11 +-
 gfx/src/nsSystemFontsAndroid.h                |   2 +-
 gfx/src/nsSystemFontsGTK2.h                   |   2 +-
 gfx/src/nsSystemFontsMac.h                    |   2 +-
 gfx/src/nsSystemFontsOS2.h                    |   2 +-
 gfx/src/nsSystemFontsQt.h                     |   2 +-
 gfx/src/nsSystemFontsWin.h                    |   2 +-
 gfx/src/nsThebesDeviceContext.h               | 155 -------
 gfx/src/nsThebesGfxFactory.cpp                |  17 +-
 gfx/thebes/gfxTypes.h                         |   2 +-
 layout/base/nsDocumentViewer.cpp              |  22 +-
 layout/base/nsPresContext.cpp                 |   2 +-
 layout/printing/nsPrintEngine.cpp             |   5 +-
 widget/src/gtk2/nsNativeThemeGTK.cpp          |   6 +-
 widget/src/gtk2/nsWindow.cpp                  |   3 -
 widget/src/qt/nsWindow.cpp                    |   3 -
 widget/src/xpwidgets/nsBaseWidget.cpp         |  11 +-
 28 files changed, 614 insertions(+), 839 deletions(-)
 rename gfx/src/{nsThebesDeviceContext.cpp => nsDeviceContext.cpp} (75%)
 create mode 100644 gfx/src/nsDeviceContext.h
 delete mode 100644 gfx/src/nsIDeviceContext.h
 delete mode 100644 gfx/src/nsThebesDeviceContext.h

diff --git a/gfx/layers/ThebesLayerBuffer.cpp b/gfx/layers/ThebesLayerBuffer.cpp
index bac12a9303fe..c4103ff990c4 100644
--- a/gfx/layers/ThebesLayerBuffer.cpp
+++ b/gfx/layers/ThebesLayerBuffer.cpp
@@ -40,7 +40,7 @@
 #include "gfxContext.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 namespace mozilla {
 namespace layers {
@@ -189,7 +189,7 @@ MovePixels(gfxASurface* aBuffer,
   // seaming are likely.  Assume that the precision of these
   // computations is 1 app unit, and toss in a fudge factor of 2.0.
   static const gfxFloat kPrecision =
-    1.0 / gfxFloat(nsIDeviceContext::AppUnitsPerCSSPixel());
+    1.0 / gfxFloat(nsDeviceContext::AppUnitsPerCSSPixel());
   // FIXME/bug 637852: we've decided to live with transient glitches
   // during fast-panning for the time being.
   NS_WARN_IF_FALSE(
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index b7b98e72a074..3510c3712f1c 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -84,7 +84,7 @@ EXPORTS	= \
 	nsTransform2D.h \
 	nsRenderingContext.h \
 	nsFontMetrics.h \
-	nsIDeviceContext.h \
+	nsDeviceContext.h \
 	nsGfxCIID.h \
 	nsIRegion.h \
 	nsITheme.h \
@@ -104,7 +104,7 @@ CPPSRCS = \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         gfxCrashReporterUtils.cpp \
-        nsThebesDeviceContext.cpp \
+        nsDeviceContext.cpp \
         nsThebesRegion.cpp \
         nsThebesGfxFactory.cpp \
         nsRenderingContext.cpp \
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp
similarity index 75%
rename from gfx/src/nsThebesDeviceContext.cpp
rename to gfx/src/nsDeviceContext.cpp
index f9d8c829dbc7..e603a9756d71 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsDeviceContext.cpp
@@ -37,26 +37,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsFont.h"
-#include "nsGfxCIID.h"
-#include "nsILanguageAtomService.h"
-#include "nsUnicharUtils.h"
+#include "nsDeviceContext.h"
+#include "nsCRT.h"
+#include "nsFontMetrics.h"
+#include "nsRenderingContext.h"
+#include "nsIView.h"
+#include "nsIWidget.h"
 
+#include "mozilla/Services.h"
 #include "nsIServiceManager.h"
-#include "nsIPrefService.h"
+#include "nsILanguageAtomService.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
-#include "nsCRT.h"
-#include "mozilla/Services.h"
-
-#include "nsThebesDeviceContext.h"
-#include "nsRenderingContext.h"
-#include "gfxUserFontSet.h"
-#include "gfxPlatform.h"
-
-#include "nsIWidget.h"
-#include "nsIView.h"
-#include "nsILookAndFeel.h"
+#include "nsIPrefService.h"
 
 #include "gfxImageSurface.h"
 
@@ -70,17 +63,14 @@ static nsSystemFontsGTK2 *gSystemFonts = nsnull;
 #include "gfxWindowsSurface.h"
 #include "gfxPDFSurface.h"
 static nsSystemFontsWin *gSystemFonts = nsnull;
-#ifndef WINCE
-#include <usp10.h>
-#endif
 #elif defined(XP_OS2)
 #include "nsSystemFontsOS2.h"
+#include "gfxOS2Surface.h"
 #include "gfxPDFSurface.h"
 static nsSystemFontsOS2 *gSystemFonts = nsnull;
 #elif XP_MACOSX
 #include "nsSystemFontsMac.h"
 #include "gfxQuartzSurface.h"
-#include "gfxImageSurface.h"
 static nsSystemFontsMac *gSystemFonts = nsnull;
 #elif defined(MOZ_WIDGET_QT)
 #include "nsSystemFontsQt.h"
@@ -105,7 +95,7 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
 
-    void Init(nsIDeviceContext* aContext);
+    void Init(nsDeviceContext* aContext);
     void Destroy();
 
     nsresult GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
@@ -117,7 +107,7 @@ public:
     void Flush();
 
 protected:
-    nsIDeviceContext*         mContext; // owner
+    nsDeviceContext*          mContext; // owner
     nsTArray<nsFontMetrics*>  mFontMetrics;
 };
 
@@ -127,7 +117,7 @@ NS_IMPL_ISUPPORTS1(nsFontCache, nsIObserver)
 // safe to call AddObserver from a constructor or RemoveObserver
 // from a destructor.  That should be fixed.
 void
-nsFontCache::Init(nsIDeviceContext* aContext)
+nsFontCache::Init(nsDeviceContext* aContext)
 {
     mContext = aContext;
     // register as a memory-pressure observer to free font resources
@@ -266,28 +256,19 @@ nsFontCache::Flush()
     mFontMetrics.Clear();
 }
 
-NS_IMPL_ISUPPORTS1(nsThebesDeviceContext, nsIDeviceContext)
-
-nsThebesDeviceContext::nsThebesDeviceContext()
+nsDeviceContext::nsDeviceContext()
+    : mWidth(0), mHeight(0), mDepth(0),
+      mAppUnitsPerDevPixel(-1), mAppUnitsPerDevNotScaledPixel(-1),
+      mAppUnitsPerPhysicalInch(-1),
+      mPixelScale(1.0f), mPrintingScale(1.0f),
+      mFontCache(nsnull)
 {
-    mAppUnitsPerDevPixel = nscoord(-1);
-    mAppUnitsPerPhysicalInch = nscoord(-1);
-    mAppUnitsPerDevNotScaledPixel = nscoord(-1);
-    mPixelScale = 1.0f;
-
-    mFontCache = nsnull;
-    mWidget = nsnull;
-
-    mDepth = 0;
-    mWidth = 0;
-    mHeight = 0;
-    mPrintingScale = 1.0f;
 }
 
 // Note: we use a bare pointer for mFontCache so that nsFontCache
-// can be an incomplete type in nsThebesDeviceContext.h.
+// can be an incomplete type in nsDeviceContext.h.
 // Therefore we have to do all the refcounting by hand.
-nsThebesDeviceContext::~nsThebesDeviceContext()
+nsDeviceContext::~nsDeviceContext()
 {
     if (mFontCache) {
         mFontCache->Destroy();
@@ -295,16 +276,17 @@ nsThebesDeviceContext::~nsThebesDeviceContext()
     }
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::CreateFontCache()
+void
+nsDeviceContext::CreateFontCache()
 {
     mFontCache = new nsFontCache();
     NS_ADDREF(mFontCache);
     mFontCache->Init(this);
     GetLocaleLanguage();
-    return NS_OK;
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
+nsresult
+nsDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
 {
     if (mFontCache) {
         mFontCache->FontMetricsDeleted(aFontMetrics);
@@ -313,7 +295,7 @@ NS_IMETHODIMP nsThebesDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFo
 }
 
 void
-nsThebesDeviceContext::GetLocaleLanguage(void)
+nsDeviceContext::GetLocaleLanguage(void)
 {
     if (!mLocaleLanguage) {
         nsCOMPtr<nsILanguageAtomService> langService;
@@ -327,8 +309,11 @@ nsThebesDeviceContext::GetLocaleLanguage(void)
     }
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
-  nsIAtom* aLanguage, gfxUserFontSet* aUserFontSet, nsFontMetrics*& aMetrics)
+nsresult
+nsDeviceContext::GetMetricsFor(const nsFont& aFont,
+                               nsIAtom* aLanguage,
+                               gfxUserFontSet* aUserFontSet,
+                               nsFontMetrics*& aMetrics)
 {
     if (!mFontCache)
         CreateFontCache();
@@ -342,9 +327,10 @@ NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
     return mFontCache->GetMetricsFor(aFont, aLanguage, aUserFontSet, aMetrics);
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
-                                                   gfxUserFontSet* aUserFontSet,
-                                                   nsFontMetrics*& aMetrics)
+nsresult
+nsDeviceContext::GetMetricsFor(const nsFont& aFont,
+                               gfxUserFontSet* aUserFontSet,
+                               nsFontMetrics*& aMetrics)
 {
     if (!mFontCache)
         CreateFontCache();
@@ -366,9 +352,9 @@ FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
     return PR_FALSE; // stop
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::FirstExistingFont(const nsFont& aFont,
-                                         nsString& aFaceName)
+nsresult
+nsDeviceContext::FirstExistingFont(const nsFont& aFont,
+                                   nsString& aFaceName)
 {
     FontEnumData data(aFaceName);
     if (aFont.EnumerateFamilies(FontEnumCallback, &data)) {
@@ -377,38 +363,32 @@ nsThebesDeviceContext::FirstExistingFont(const nsFont& aFont,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetLocalFontName(const nsString& aFaceName,
-                                        nsString& aLocalName,
-                                        PRBool& aAliased)
+nsresult
+nsDeviceContext::GetLocalFontName(const nsString& aFaceName,
+                                  nsString& aLocalName,
+                                  PRBool& aAliased)
 {
     aLocalName = aFaceName;
     aAliased = PR_FALSE;
     return NS_OK;
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::FlushFontCache(void)
+nsresult
+nsDeviceContext::FlushFontCache(void)
 {
     if (mFontCache)
         mFontCache->Flush();
     return NS_OK;
 }
 
-/* static */ void
-nsThebesDeviceContext::Shutdown()
-{
-    delete gSystemFonts;
-    gSystemFonts = nsnull;
-}
-
 PRBool
-nsThebesDeviceContext::IsPrinterSurface()
+nsDeviceContext::IsPrinterSurface()
 {
-  return(mPrintingSurface != NULL);
+    return(mPrintingSurface != NULL);
 }
 
-nsresult
-nsThebesDeviceContext::SetDPI()
+void
+nsDeviceContext::SetDPI()
 {
     float dpi = -1.0f;
 
@@ -416,34 +396,37 @@ nsThebesDeviceContext::SetDPI()
     // Use a printing DC to determine the other dpi values
     if (mPrintingSurface) {
         switch (mPrintingSurface->GetType()) {
-            case gfxASurface::SurfaceTypePDF:
-            case gfxASurface::SurfaceTypePS:
-            case gfxASurface::SurfaceTypeQuartz:
-                dpi = 72.0f;
-                break;
+        case gfxASurface::SurfaceTypePDF:
+        case gfxASurface::SurfaceTypePS:
+        case gfxASurface::SurfaceTypeQuartz:
+            dpi = 72.0f;
+            break;
 #ifdef XP_WIN
-            case gfxASurface::SurfaceTypeWin32:
-            case gfxASurface::SurfaceTypeWin32Printing: {
-                PRInt32 OSVal = GetDeviceCaps(GetPrintHDC(), LOGPIXELSY);
-                dpi = 144.0f;
-                mPrintingScale = float(OSVal) / dpi;
-                break;
-            }
+        case gfxASurface::SurfaceTypeWin32:
+        case gfxASurface::SurfaceTypeWin32Printing: {
+            HDC dc = reinterpret_cast<gfxWindowsSurface*>(mPrintingSurface.get())->GetDC();
+            PRInt32 OSVal = GetDeviceCaps(dc, LOGPIXELSY);
+            dpi = 144.0f;
+            mPrintingScale = float(OSVal) / dpi;
+            break;
+        }
 #endif
 #ifdef XP_OS2
-            case gfxASurface::SurfaceTypeOS2:
-                LONG lDPI;
-                if (DevQueryCaps(GetPrintHDC(), CAPS_VERTICAL_FONT_RES, 1, &lDPI))
-                    dpi = lDPI;
-                break;
+        case gfxASurface::SurfaceTypeOS2: {
+            LONG lDPI;
+            HDC dc = GpiQueryDevice(reinterpret_cast<gfxOS2Surface*>(mPrintingSurface.get())->GetPS());
+            if (DevQueryCaps(dc, CAPS_VERTICAL_FONT_RES, 1, &lDPI))
+                dpi = lDPI;
+            break;
+        }
 #endif
-            default:
-                NS_NOTREACHED("Unexpected printing surface type");
-                break;
+        default:
+            NS_NOTREACHED("Unexpected printing surface type");
+            break;
         }
 
         mAppUnitsPerDevNotScaledPixel =
-          NS_lround((AppUnitsPerCSSPixel() * 96) / dpi);
+            NS_lround((AppUnitsPerCSSPixel() * 96) / dpi);
     } else {
         nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
 
@@ -500,12 +483,10 @@ nsThebesDeviceContext::SetDPI()
 
     mAppUnitsPerPhysicalInch = NS_lround(dpi * mAppUnitsPerDevNotScaledPixel);
     UpdateScaledAppUnits();
-
-    return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::Init(nsIWidget *aWidget)
+nsresult
+nsDeviceContext::Init(nsIWidget *aWidget)
 {
     if (mScreenManager && mWidget == aWidget)
         return NS_OK;
@@ -521,9 +502,9 @@ nsThebesDeviceContext::Init(nsIWidget *aWidget)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContext(nsIView *aView,
-                                              nsRenderingContext *&aContext)
+nsresult
+nsDeviceContext::CreateRenderingContext(nsIView *aView,
+                                        nsRenderingContext *&aContext)
 {
     // This is currently only called by the caret code
     NS_ENSURE_ARG_POINTER(aView);
@@ -535,9 +516,9 @@ nsThebesDeviceContext::CreateRenderingContext(nsIView *aView,
     return CreateRenderingContext(widget, aContext);
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
-                                              nsRenderingContext *&aContext)
+nsresult
+nsDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
+                                        nsRenderingContext *&aContext)
 {
     nsresult rv;
 
@@ -558,8 +539,8 @@ nsThebesDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
     return rv;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
+nsresult
+nsDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
 {
     nsresult rv = NS_OK;
 
@@ -580,8 +561,8 @@ nsThebesDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
     return rv;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContextInstance(nsRenderingContext *&aContext)
+nsresult
+nsDeviceContext::CreateRenderingContextInstance(nsRenderingContext *&aContext)
 {
     nsRefPtr<nsRenderingContext> renderingContext = new nsRenderingContext();
     if (!renderingContext)
@@ -593,19 +574,17 @@ nsThebesDeviceContext::CreateRenderingContextInstance(nsRenderingContext *&aCont
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::ClearCachedSystemFonts()
+/* static */ void
+nsDeviceContext::ClearCachedSystemFonts()
 {
-    //clear our cache of stored system fonts
     if (gSystemFonts) {
         delete gSystemFonts;
         gSystemFonts = nsnull;
     }
-    return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const
+nsresult
+nsDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const
 {
     if (!gSystemFonts) {
 #ifdef MOZ_ENABLE_GTK2
@@ -644,14 +623,14 @@ nsThebesDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const
     return rv;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::CheckFontExistence(const nsString& aFaceName)
+nsresult
+nsDeviceContext::CheckFontExistence(const nsString& aFaceName)
 {
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetDepth(PRUint32& aDepth)
+nsresult
+nsDeviceContext::GetDepth(PRUint32& aDepth)
 {
     if (mDepth == 0) {
         nsCOMPtr<nsIScreen> primaryScreen;
@@ -663,8 +642,8 @@ nsThebesDeviceContext::GetDepth(PRUint32& aDepth)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetDeviceSurfaceDimensions(nscoord &aWidth, nscoord &aHeight)
+nsresult
+nsDeviceContext::GetDeviceSurfaceDimensions(nscoord &aWidth, nscoord &aHeight)
 {
     if (mPrintingSurface) {
         // we have a printer device
@@ -680,8 +659,8 @@ nsThebesDeviceContext::GetDeviceSurfaceDimensions(nscoord &aWidth, nscoord &aHei
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetRect(nsRect &aRect)
+nsresult
+nsDeviceContext::GetRect(nsRect &aRect)
 {
     if (mPrintingSurface) {
         // we have a printer device
@@ -695,8 +674,8 @@ nsThebesDeviceContext::GetRect(nsRect &aRect)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::GetClientRect(nsRect &aRect)
+nsresult
+nsDeviceContext::GetClientRect(nsRect &aRect)
 {
     if (mPrintingSurface) {
         // we have a printer device
@@ -711,8 +690,8 @@ nsThebesDeviceContext::GetClientRect(nsRect &aRect)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::PrepareNativeWidget(nsIWidget* aWidget, void** aOut)
+nsresult
+nsDeviceContext::PrepareNativeWidget(nsIWidget* aWidget, void** aOut)
 {
     *aOut = nsnull;
     return NS_OK;
@@ -722,8 +701,8 @@ nsThebesDeviceContext::PrepareNativeWidget(nsIWidget* aWidget, void** aOut)
 /*
  * below methods are for printing
  */
-NS_IMETHODIMP
-nsThebesDeviceContext::InitForPrinting(nsIDeviceContextSpec *aDevice)
+nsresult
+nsDeviceContext::InitForPrinting(nsIDeviceContextSpec *aDevice)
 {
     NS_ENSURE_ARG_POINTER(aDevice);
 
@@ -741,19 +720,19 @@ nsThebesDeviceContext::InitForPrinting(nsIDeviceContextSpec *aDevice)
 }
 
 
-NS_IMETHODIMP
-nsThebesDeviceContext::PrepareDocument(PRUnichar * aTitle,
-                                       PRUnichar*  aPrintToFileName)
+nsresult
+nsDeviceContext::PrepareDocument(PRUnichar * aTitle,
+                                 PRUnichar*  aPrintToFileName)
 {
     return NS_OK;
 }
 
 
-NS_IMETHODIMP
-nsThebesDeviceContext::BeginDocument(PRUnichar*  aTitle,
-                                     PRUnichar*  aPrintToFileName,
-                                     PRInt32     aStartPage,
-                                     PRInt32     aEndPage)
+nsresult
+nsDeviceContext::BeginDocument(PRUnichar*  aTitle,
+                               PRUnichar*  aPrintToFileName,
+                               PRInt32     aStartPage,
+                               PRInt32     aEndPage)
 {
     static const PRUnichar kEmpty[] = { '\0' };
     nsresult rv;
@@ -768,8 +747,8 @@ nsThebesDeviceContext::BeginDocument(PRUnichar*  aTitle,
 }
 
 
-NS_IMETHODIMP
-nsThebesDeviceContext::EndDocument(void)
+nsresult
+nsDeviceContext::EndDocument(void)
 {
     nsresult rv = NS_OK;
 
@@ -786,8 +765,8 @@ nsThebesDeviceContext::EndDocument(void)
 }
 
 
-NS_IMETHODIMP
-nsThebesDeviceContext::AbortDocument(void)
+nsresult
+nsDeviceContext::AbortDocument(void)
 {
     nsresult rv = mPrintingSurface->AbortPrinting();
 
@@ -798,8 +777,8 @@ nsThebesDeviceContext::AbortDocument(void)
 }
 
 
-NS_IMETHODIMP
-nsThebesDeviceContext::BeginPage(void)
+nsresult
+nsDeviceContext::BeginPage(void)
 {
     nsresult rv = NS_OK;
 
@@ -808,7 +787,7 @@ nsThebesDeviceContext::BeginPage(void)
 
     if (NS_FAILED(rv)) return rv;
 
-   /* We need to get a new surface for each page on the Mac */
+    /* We need to get a new surface for each page on the Mac */
 #ifdef XP_MACOSX
     mDeviceContextSpec->GetSurfaceForPrinter(getter_AddRefs(mPrintingSurface));
 #endif
@@ -817,8 +796,8 @@ nsThebesDeviceContext::BeginPage(void)
     return rv;
 }
 
-NS_IMETHODIMP
-nsThebesDeviceContext::EndPage(void)
+nsresult
+nsDeviceContext::EndPage(void)
 {
     nsresult rv = mPrintingSurface->EndPage();
 
@@ -838,7 +817,7 @@ nsThebesDeviceContext::EndPage(void)
 /** End printing methods **/
 
 void
-nsThebesDeviceContext::ComputeClientRectUsingScreen(nsRect* outRect)
+nsDeviceContext::ComputeClientRectUsingScreen(nsRect* outRect)
 {
     // we always need to recompute the clientRect
     // because the window may have moved onto a different screen. In the single
@@ -859,7 +838,7 @@ nsThebesDeviceContext::ComputeClientRectUsingScreen(nsRect* outRect)
 }
 
 void
-nsThebesDeviceContext::ComputeFullAreaUsingScreen(nsRect* outRect)
+nsDeviceContext::ComputeFullAreaUsingScreen(nsRect* outRect)
 {
     // if we have more than one screen, we always need to recompute the clientRect
     // because the window may have moved onto a different screen. In the single
@@ -888,7 +867,7 @@ nsThebesDeviceContext::ComputeFullAreaUsingScreen(nsRect* outRect)
 // Determines which screen intersects the largest area of the given surface.
 //
 void
-nsThebesDeviceContext::FindScreen(nsIScreen** outScreen)
+nsDeviceContext::FindScreen(nsIScreen** outScreen)
 {
     if (mWidget && mWidget->GetNativeData(NS_NATIVE_WINDOW))
         mScreenManager->ScreenForNativeWidget(mWidget->GetNativeData(NS_NATIVE_WINDOW),
@@ -898,7 +877,7 @@ nsThebesDeviceContext::FindScreen(nsIScreen** outScreen)
 }
 
 void
-nsThebesDeviceContext::CalcPrintingSize()
+nsDeviceContext::CalcPrintingSize()
 {
     if (!mPrintingSurface)
         return;
@@ -936,39 +915,39 @@ nsThebesDeviceContext::CalcPrintingSize()
 #ifdef XP_WIN
     case gfxASurface::SurfaceTypeWin32:
     case gfxASurface::SurfaceTypeWin32Printing:
-    {
-        inPoints = PR_FALSE;
-        HDC dc =  GetPrintHDC();
-        if (!dc)
-            dc = GetDC((HWND)mWidget->GetNativeData(NS_NATIVE_WIDGET));
-        size.width = NSFloatPixelsToAppUnits(::GetDeviceCaps(dc, HORZRES)/mPrintingScale, AppUnitsPerDevPixel());
-        size.height = NSFloatPixelsToAppUnits(::GetDeviceCaps(dc, VERTRES)/mPrintingScale, AppUnitsPerDevPixel());
-        mDepth = (PRUint32)::GetDeviceCaps(dc, BITSPIXEL);
-        if (dc != (HDC)GetPrintHDC())
-            ReleaseDC((HWND)mWidget->GetNativeData(NS_NATIVE_WIDGET), dc);
-        break;
-    }
+        {
+            inPoints = PR_FALSE;
+            HDC dc = reinterpret_cast<gfxWindowsSurface*>(mPrintingSurface.get())->GetDC();
+            if (!dc)
+                dc = GetDC((HWND)mWidget->GetNativeData(NS_NATIVE_WIDGET));
+            size.width = NSFloatPixelsToAppUnits(::GetDeviceCaps(dc, HORZRES)/mPrintingScale, AppUnitsPerDevPixel());
+            size.height = NSFloatPixelsToAppUnits(::GetDeviceCaps(dc, VERTRES)/mPrintingScale, AppUnitsPerDevPixel());
+            mDepth = (PRUint32)::GetDeviceCaps(dc, BITSPIXEL);
+            if (dc != reinterpret_cast<gfxWindowsSurface*>(mPrintingSurface.get())->GetDC())
+                ReleaseDC((HWND)mWidget->GetNativeData(NS_NATIVE_WIDGET), dc);
+            break;
+        }
 #endif
 
 #ifdef XP_OS2
     case gfxASurface::SurfaceTypeOS2:
-    {
-        inPoints = PR_FALSE;
-        // we already set the size in the surface constructor we set for
-        // printing, so just get those values here
-        size = reinterpret_cast<gfxOS2Surface*>(mPrintingSurface.get())->GetSize();
-        // as they are in pixels we need to scale them to app units
-        size.width = NSFloatPixelsToAppUnits(size.width, AppUnitsPerDevPixel());
-        size.height = NSFloatPixelsToAppUnits(size.height, AppUnitsPerDevPixel());
-        // still need to get the depth from the device context
-        HDC dc = GetPrintHDC();
-        LONG value;
-        if (DevQueryCaps(dc, CAPS_COLOR_BITCOUNT, 1, &value))
-            mDepth = value;
-        else
-            mDepth = 8; // default to 8bpp, should be enough for printers
-        break;
-    }
+        {
+            inPoints = PR_FALSE;
+            // we already set the size in the surface constructor we set for
+            // printing, so just get those values here
+            size = reinterpret_cast<gfxOS2Surface*>(mPrintingSurface.get())->GetSize();
+            // as they are in pixels we need to scale them to app units
+            size.width = NSFloatPixelsToAppUnits(size.width, AppUnitsPerDevPixel());
+            size.height = NSFloatPixelsToAppUnits(size.height, AppUnitsPerDevPixel());
+            // still need to get the depth from the device context
+            HDC dc = GpiQueryDevice(reinterpret_cast<gfxOS2Surface*>(mPrintingSurface.get())->GetPS());
+            LONG value;
+            if (DevQueryCaps(dc, CAPS_COLOR_BITCOUNT, 1, &value))
+                mDepth = value;
+            else
+                mDepth = 8; // default to 8bpp, should be enough for printers
+            break;
+        }
 #endif
     default:
         NS_ERROR("trying to print to unknown surface type");
@@ -985,18 +964,18 @@ nsThebesDeviceContext::CalcPrintingSize()
     }
 }
 
-PRBool nsThebesDeviceContext::CheckDPIChange() {
+PRBool nsDeviceContext::CheckDPIChange() {
     PRInt32 oldDevPixels = mAppUnitsPerDevNotScaledPixel;
     PRInt32 oldInches = mAppUnitsPerPhysicalInch;
 
     SetDPI();
 
     return oldDevPixels != mAppUnitsPerDevNotScaledPixel ||
-           oldInches != mAppUnitsPerPhysicalInch;
+        oldInches != mAppUnitsPerPhysicalInch;
 }
 
 PRBool
-nsThebesDeviceContext::SetPixelScale(float aScale)
+nsDeviceContext::SetPixelScale(float aScale)
 {
     if (aScale <= 0) {
         NS_NOTREACHED("Invalid pixel scale value");
@@ -1009,35 +988,8 @@ nsThebesDeviceContext::SetPixelScale(float aScale)
 }
 
 void
-nsThebesDeviceContext::UpdateScaledAppUnits()
+nsDeviceContext::UpdateScaledAppUnits()
 {
     mAppUnitsPerDevPixel =
         PR_MAX(1, NSToIntRound(float(mAppUnitsPerDevNotScaledPixel) / mPixelScale));
 }
-
-#if defined(XP_WIN) || defined(XP_OS2)
-HDC
-nsThebesDeviceContext::GetPrintHDC()
-{
-    if (mPrintingSurface) {
-        switch (mPrintingSurface->GetType()) {
-#ifdef XP_WIN
-            case gfxASurface::SurfaceTypeWin32:
-            case gfxASurface::SurfaceTypeWin32Printing:
-                return reinterpret_cast<gfxWindowsSurface*>(mPrintingSurface.get())->GetDC();
-#endif
-
-#ifdef XP_OS2
-            case gfxASurface::SurfaceTypeOS2:
-                return GpiQueryDevice(reinterpret_cast<gfxOS2Surface*>(mPrintingSurface.get())->GetPS());
-#endif
-
-            default:
-                NS_ERROR("invalid surface type in GetPrintHDC");
-                break;
-        }
-    }
-
-    return nsnull;
-}
-#endif
diff --git a/gfx/src/nsDeviceContext.h b/gfx/src/nsDeviceContext.h
new file mode 100644
index 000000000000..1285a9357d52
--- /dev/null
+++ b/gfx/src/nsDeviceContext.h
@@ -0,0 +1,409 @@
+/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is thebes gfx
+ *
+ * The Initial Developer of the Original Code is
+ * mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vladimir Vukicevic <vladimir@pobox.com>
+ *   Stuart Parmenter <pavlov@pavlov.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _NS_DEVICECONTEXT_H_
+#define _NS_DEVICECONTEXT_H_
+
+#include "nsCOMPtr.h"
+#include "nsIAtom.h"
+#include "nsIDeviceContextSpec.h"
+#include "nsIScreenManager.h"
+#include "nsIWidget.h"
+#include "nsCoord.h"
+#include "gfxContext.h"
+
+class nsIView;
+class nsFontCache;
+class gfxUserFontSet;
+
+typedef enum {
+    eSystemFont_Caption,         // css2
+    eSystemFont_Icon,
+    eSystemFont_Menu,
+    eSystemFont_MessageBox,
+    eSystemFont_SmallCaption,
+    eSystemFont_StatusBar,
+
+    eSystemFont_Window,          // css3
+    eSystemFont_Document,
+    eSystemFont_Workspace,
+    eSystemFont_Desktop,
+    eSystemFont_Info,
+    eSystemFont_Dialog,
+    eSystemFont_Button,
+    eSystemFont_PullDownMenu,
+    eSystemFont_List,
+    eSystemFont_Field,
+
+    eSystemFont_Tooltips,        // moz
+    eSystemFont_Widget
+} nsSystemFontID;
+
+class nsDeviceContext
+{
+public:
+    nsDeviceContext();
+    ~nsDeviceContext();
+
+    NS_INLINE_DECL_REFCOUNTING(nsDeviceContext)
+
+    /**
+     * Initialize the device context from a widget
+     * @param aWidget a widget to initialize the device context from
+     * @return error status
+     */
+    nsresult Init(nsIWidget *aWidget);
+
+    /**
+     * Initialize the device context from a device context spec
+     * @param aDevSpec the specification of the printing device
+     * @return error status
+     */
+    nsresult InitForPrinting(nsIDeviceContextSpec *aDevSpec);
+
+    /**
+     * Create a rendering context and initialize it from an nsIView
+     * @param aView view to initialize context from
+     * @param aContext out parameter for new rendering context
+     * @return error status
+     */
+    nsresult CreateRenderingContext(nsIView *aView,
+                                    nsRenderingContext *&aContext);
+
+    /**
+     * Create a rendering context and initialize it from an nsIWidget
+     * @param aWidget widget to initialize context from
+     * @param aContext out parameter for new rendering context
+     * @return error status
+     */
+    nsresult CreateRenderingContext(nsIWidget *aWidget,
+                                    nsRenderingContext *&aContext);
+
+    /**
+     * Create a rendering context and initialize it.
+     * @param aContext out parameter for new rendering context
+     * @return error status
+     */
+    nsresult CreateRenderingContext(nsRenderingContext *&aContext);
+
+    /**
+     * Create an uninitalised rendering context.
+     * @param aContext out parameter for new rendering context
+     * @return error status
+     */
+    nsresult CreateRenderingContextInstance(nsRenderingContext *&aContext);
+
+    /**
+     * We are in the process of creating the native widget for
+     * aWidget.  Do any device-specific processing required to
+     * initialize the native widget for this device. A pointer to some
+     * platform-specific data is returned in aOut.
+     */
+    nsresult PrepareNativeWidget(nsIWidget *aWidget, void **aOut);
+
+    /**
+     * Gets the number of app units in one CSS pixel; this number is global,
+     * not unique to each device context.
+     */
+    static PRInt32 AppUnitsPerCSSPixel() { return 60; }
+
+    /**
+     * Convert app units to CSS pixels.  This is a global scale factor.
+     */
+    static gfxFloat AppUnitsToGfxCSSPixels(nscoord aAppUnits)
+    { return gfxFloat(aAppUnits) / AppUnitsPerCSSPixel(); }
+
+    /**
+     * Gets the number of app units in one device pixel; this number
+     * is usually a factor of AppUnitsPerCSSPixel(), although that is
+     * not guaranteed.
+     */
+    PRInt32 AppUnitsPerDevPixel() const { return mAppUnitsPerDevPixel; }
+
+    /**
+     * Convert device pixels which is used for gfx/thebes to nearest
+     * (rounded) app units
+     */
+    nscoord GfxUnitsToAppUnits(gfxFloat aGfxUnits) const
+    { return nscoord(NS_round(aGfxUnits * AppUnitsPerDevPixel())); }
+
+    /**
+     * Convert app units to device pixels which is used for gfx/thebes.
+     */
+    gfxFloat AppUnitsToGfxUnits(nscoord aAppUnits) const
+    { return gfxFloat(aAppUnits) / AppUnitsPerDevPixel(); }
+
+    /**
+     * Gets the number of app units in one physical inch; this is the
+     * device's DPI times AppUnitsPerDevPixel().
+     */
+    PRInt32 AppUnitsPerPhysicalInch() const
+    { return mAppUnitsPerPhysicalInch; }
+
+    /**
+     * Gets the number of app units in one CSS inch; this is
+     * 96 times AppUnitsPerCSSPixel.
+     */
+    static PRInt32 AppUnitsPerCSSInch() { return 96 * AppUnitsPerCSSPixel(); }
+
+    /**
+     * Get the unscaled ratio of app units to dev pixels; useful if something
+     * needs to be converted from to unscaled pixels
+     */
+    PRInt32 UnscaledAppUnitsPerDevPixel() const
+    { return mAppUnitsPerDevNotScaledPixel; }
+
+    /**
+     * Fill in an nsFont based on the ID of a system font.  This function
+     * may or may not fill in the size, so the size should be set to a
+     * reasonable default before calling.
+     *
+     * @param aID    The system font ID.
+     * @param aInfo  The font structure to be filled in.
+     * @return error status
+     */
+    nsresult GetSystemFont(nsSystemFontID aID, nsFont *aFont) const;
+
+    /**
+     * Clear cached system fonts (refresh from theme when requested).
+     */
+    static void ClearCachedSystemFonts();
+
+    /**
+     * Get the nsFontMetrics that describe the properties of
+     * an nsFont.
+     * @param aFont font description to obtain metrics for
+     * @param aLanguage the language of the document
+     * @param aMetrics out parameter for font metrics
+     * @param aUserFontSet user font set
+     * @return error status
+     */
+    nsresult GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
+                           gfxUserFontSet* aUserFontSet,
+                           nsFontMetrics*& aMetrics);
+
+    /**
+     * Get the nsFontMetrics that describe the properties of
+     * an nsFont.
+     * @param aFont font description to obtain metrics for
+     * @param aMetrics out parameter for font metrics
+     * @param aUserFontSet user font set
+     * @return error status
+     */
+    nsresult GetMetricsFor(const nsFont& aFont,
+                           gfxUserFontSet* aUserFontSet,
+                           nsFontMetrics*& aMetrics);
+
+    /**
+     * Notification when a font metrics instance created for this device is
+     * about to be deleted
+     */
+    nsresult FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
+
+    /**
+     * Attempt to free up resources by flushing out any fonts no longer
+     * referenced by anything other than the font cache itself.
+     * @return error status
+     */
+    nsresult FlushFontCache();
+
+    /**
+     * Check to see if a particular named font exists.
+     * @param aFontName character string of font face name
+     * @return NS_OK if font is available, else font is unavailable
+     */
+    nsresult CheckFontExistence(const nsString& aFaceName);
+    nsresult FirstExistingFont(const nsFont& aFont, nsString& aFaceName);
+    nsresult GetLocalFontName(const nsString& aFaceName, nsString& aLocalName,
+                              PRBool& aAliased);
+
+
+    /**
+     * Return the bit depth of the device.
+     */
+    nsresult GetDepth(PRUint32& aDepth);
+
+    /**
+     * Get the size of the displayable area of the output device
+     * in app units.
+     * @param aWidth out parameter for width
+     * @param aHeight out parameter for height
+     * @return error status
+     */
+    nsresult GetDeviceSurfaceDimensions(nscoord& aWidth, nscoord& aHeight);
+
+    /**
+     * Get the size of the content area of the output device in app
+     * units.  This corresponds on a screen device, for instance, to
+     * the entire screen.
+     * @param aRect out parameter for full rect. Position (x,y) will
+     *              be (0,0) or relative to the primary monitor if
+     *              this is not the primary.
+     * @return error status
+     */
+    nsresult GetRect(nsRect& aRect);
+
+    /**
+     * Get the size of the content area of the output device in app
+     * units.  This corresponds on a screen device, for instance, to
+     * the area reported by GetDeviceSurfaceDimensions, minus the
+     * taskbar (Windows) or menubar (Macintosh).
+     * @param aRect out parameter for client rect. Position (x,y) will
+     *              be (0,0) adjusted for any upper/left non-client
+     *              space if present or relative to the primary
+     *              monitor if this is not the primary.
+     * @return error status
+     */
+    nsresult GetClientRect(nsRect& aRect);
+
+    /**
+     * Do anything that needs to be done to prepare for printing.
+     * @param aTitle - title of Document
+     * @param aPrintToFileName - name of file to print to, if NULL
+     * then don't print to file
+     *
+     * @return error status
+     */
+    nsresult PrepareDocument(PRUnichar *aTitle,
+                             PRUnichar *aPrintToFileName);
+
+    /**
+     * Inform the output device that output of a document is beginning
+     * Used for print related device contexts. Must be matched 1:1 with
+     * EndDocument() or AbortDocument().
+     *
+     * @param aTitle - title of Document
+     * @param aPrintToFileName - name of file to print to, if NULL
+     * then don't print to file
+     * @param aStartPage - starting page number (must be greater than zero)
+     * @param aEndPage - ending page number (must be less than or
+     * equal to number of pages)
+     *
+     * @return error status
+     */
+    nsresult BeginDocument(PRUnichar  *aTitle,
+                           PRUnichar  *aPrintToFileName,
+                           PRInt32     aStartPage,
+                           PRInt32     aEndPage);
+
+    /**
+     * Inform the output device that output of a document is ending.
+     * Used for print related device contexts. Must be matched 1:1 with
+     * BeginDocument()
+     * @return error status
+     */
+    nsresult EndDocument();
+
+    /**
+     * Inform the output device that output of a document is being aborted.
+     * Must be matched 1:1 with BeginDocument()
+     * @return error status
+     */
+    nsresult AbortDocument();
+
+    /**
+     * Inform the output device that output of a page is beginning
+     * Used for print related device contexts. Must be matched 1:1 with
+     * EndPage() and within a BeginDocument()/EndDocument() pair.
+     * @return error status
+     */
+    nsresult BeginPage();
+
+    /**
+     * Inform the output device that output of a page is ending
+     * Used for print related device contexts. Must be matched 1:1 with
+     * BeginPage() and within a BeginDocument()/EndDocument() pair.
+     * @return error status
+     */
+    nsresult EndPage();
+
+    /**
+     * Check to see if the DPI has changed
+     * @return whether there was actually a change in the DPI (whether
+     *         AppUnitsPerDevPixel() or AppUnitsPerPhysicalInch()
+     *         changed)
+     */
+    PRBool CheckDPIChange();
+
+    /**
+     * Set the pixel scaling factor: all lengths are multiplied by this factor
+     * when we convert them to device pixels. Returns whether the ratio of
+     * app units to dev pixels changed because of the scale factor.
+     */
+    PRBool SetPixelScale(float aScale);
+
+    /**
+     * Get the pixel scaling factor; defaults to 1.0, but can be changed with
+     * SetPixelScale.
+     */
+    float GetPixelScale() const { return mPixelScale; }
+
+    /**
+     * True if this device context was created for printing.
+     */
+    PRBool IsPrinterSurface();
+
+protected:
+    void CreateFontCache();
+    void GetLocaleLanguage();
+    void SetDPI();
+    void ComputeClientRectUsingScreen(nsRect *outRect);
+    void ComputeFullAreaUsingScreen(nsRect *outRect);
+    void FindScreen(nsIScreen **outScreen);
+    void CalcPrintingSize();
+    void UpdateScaledAppUnits();
+
+    nscoord  mWidth;
+    nscoord  mHeight;
+    PRUint32 mDepth;
+    PRInt32  mAppUnitsPerDevPixel;
+    PRInt32  mAppUnitsPerDevNotScaledPixel;
+    PRInt32  mAppUnitsPerPhysicalInch;
+    float    mPixelScale;
+    float    mPrintingScale;
+
+    nsFontCache*                   mFontCache;
+    nsCOMPtr<nsIAtom>              mLocaleLanguage;
+    nsCOMPtr<nsIWidget>            mWidget;
+    nsCOMPtr<nsIScreenManager>     mScreenManager;
+    nsCOMPtr<nsIDeviceContextSpec> mDeviceContextSpec;
+    nsRefPtr<gfxASurface>          mPrintingSurface;
+};
+
+#endif /* _NS_DEVICECONTEXT_H_ */
diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index 5061e90d3b28..268ab89a1d31 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -39,7 +39,7 @@
 #include "nsFontMetrics.h"
 #include "nsBoundingMetrics.h"
 #include "nsRenderingContext.h"
-#include "nsThebesDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "gfxTextRunCache.h"
 
 namespace {
@@ -105,14 +105,14 @@ nsFontMetrics::~nsFontMetrics()
 
 nsresult
 nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
-                    nsIDeviceContext *aContext,
+                    nsDeviceContext *aContext,
                     gfxUserFontSet *aUserFontSet)
 {
     NS_ABORT_IF_FALSE(mP2A == -1, "already initialized");
 
     mFont = aFont;
     mLanguage = aLanguage;
-    mDeviceContext = (nsThebesDeviceContext*)aContext;
+    mDeviceContext = aContext;
     mP2A = mDeviceContext->AppUnitsPerDevPixel();
 
     gfxFontStyle style(aFont.style,
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
index 4b9339a9efb3..bd270074278b 100644
--- a/gfx/src/nsFontMetrics.h
+++ b/gfx/src/nsFontMetrics.h
@@ -45,9 +45,8 @@
 #include "gfxFont.h"
 
 class nsIAtom;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsRenderingContext;
-class nsThebesDeviceContext;
 struct nsBoundingMetrics;
 
 /**
@@ -80,10 +79,10 @@ public:
      * Initialize the font metrics. Call this after creating the font metrics.
      * Font metrics you get from the font cache do NOT need to be initialized
      *
-     * @see nsIDeviceContext#GetMetricsFor()
+     * @see nsDeviceContext#GetMetricsFor()
      */
     nsresult Init(const nsFont& aFont, nsIAtom* aLanguage,
-                  nsIDeviceContext *aContext,
+                  nsDeviceContext *aContext,
                   gfxUserFontSet *aUserFontSet = nsnull);
 
     /**
@@ -238,7 +237,7 @@ protected:
     nsFont mFont;
     nsRefPtr<gfxFontGroup> mFontGroup;
     nsCOMPtr<nsIAtom> mLanguage;
-    nsThebesDeviceContext *mDeviceContext;
+    nsDeviceContext *mDeviceContext;
     PRInt32 mP2A;
     PRPackedBool mTextRunRTL;
 };
diff --git a/gfx/src/nsGfxCIID.h b/gfx/src/nsGfxCIID.h
index 5cc4a4b333bc..8199d3d03851 100644
--- a/gfx/src/nsGfxCIID.h
+++ b/gfx/src/nsGfxCIID.h
@@ -38,10 +38,6 @@
 #ifndef nsGfxCIID_h__
 #define nsGfxCIID_h__
 
-#define NS_DEVICE_CONTEXT_CID \
-{ 0x6049b262, 0xc1e6, 0x11d1, \
-{ 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
 #define NS_FONT_ENUMERATOR_CID \
 { 0xa6cf9115, 0x15b3, 0x11d2, \
 { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
diff --git a/gfx/src/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
deleted file mode 100644
index e069fdd81c78..000000000000
--- a/gfx/src/nsIDeviceContext.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIDeviceContext_h___
-#define nsIDeviceContext_h___
-
-#include "nsISupports.h"
-#include "nsCoord.h"
-#include "gfxTypes.h"
-#include "nsStringFwd.h"
-
-class nsIView;
-class nsFontMetrics;
-class nsIWidget;
-class nsIDeviceContextSpec;
-class nsIAtom;
-class nsRect;
-class gfxUserFontSet;
-class nsRenderingContext;
-struct nsFont;
-
-#define NS_IDEVICE_CONTEXT_IID   \
-{ 0x30a9d22f, 0x8e51, 0x40af, \
-  { 0xa1, 0xf5, 0x48, 0xe3, 0x00, 0xaa, 0xa9, 0x27 } }
-
-  typedef enum {
-    eSystemFont_Caption,         // css2
-    eSystemFont_Icon,
-    eSystemFont_Menu,
-    eSystemFont_MessageBox,
-    eSystemFont_SmallCaption,
-    eSystemFont_StatusBar,
-
-    eSystemFont_Window,          // css3
-    eSystemFont_Document,
-    eSystemFont_Workspace,
-    eSystemFont_Desktop,
-    eSystemFont_Info,
-    eSystemFont_Dialog,
-    eSystemFont_Button,
-    eSystemFont_PullDownMenu,
-    eSystemFont_List,
-    eSystemFont_Field,
-
-    eSystemFont_Tooltips,        // moz
-    eSystemFont_Widget
-  } nsSystemFontID;
-
-class nsIDeviceContext : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_IID)
-
-  /**
-   * Initialize the device context from a widget
-   * @param aWidget a widget to initialize the device context from
-   * @return error status
-   */
-  NS_IMETHOD  Init(nsIWidget* aWidget) = 0;
-
-  /**
-   * Initialize the device context from a device context spec
-   * @param aDevSpec the specification of the printng device (platform-specific)
-   * @return error status
-   */
-  NS_IMETHOD  InitForPrinting(nsIDeviceContextSpec* aDevSpec) = 0;
-
-  /**
-   * Create a rendering context and initialize it from an nsIView
-   * @param aView view to initialize context from
-   * @param aContext out parameter for new rendering context
-   * @return error status
-   */
-  NS_IMETHOD  CreateRenderingContext(nsIView *aView, nsRenderingContext *&aContext) = 0;
-
-  /**
-   * Create a rendering context and initialize it from an nsIWidget
-   * @param aWidget widget to initialize context from
-   * @param aContext out parameter for new rendering context
-   * @return error status
-   */
-  NS_IMETHOD  CreateRenderingContext(nsIWidget *aWidget, nsRenderingContext *&aContext) = 0;
-
-  /**
-   * Create a rendering context and initialize it.
-   * @param aContext out parameter for new rendering context
-   * @return error status
-   */
-  NS_IMETHOD  CreateRenderingContext(nsRenderingContext *&aContext) = 0;
-
-  /**
-   * Create an uninitalised rendering context.
-   * @param aContext out parameter for new rendering context
-   * @return error status
-   */
-  NS_IMETHOD  CreateRenderingContextInstance(nsRenderingContext *&aContext) = 0;
-
-  /**
-   * We are in the process of creating the native widget for aWidget.
-   * Do any device-specific processing required to initialize the
-   * native widget for this device. A pointer to some platform-specific data is
-   * returned in aOut.
-   *
-   * GTK2 calls this to get the required visual for the window.
-   */
-  NS_IMETHOD PrepareNativeWidget(nsIWidget* aWidget, void** aOut) = 0;
-
-  /**
-   * Gets the number of app units in one CSS pixel; this number is global,
-   * not unique to each device context.
-   */
-  static PRInt32 AppUnitsPerCSSPixel() { return 60; }
-
-  /**
-   * Convert app units to CSS pixels which is used in gfx/thebes.
-   */
-  static gfxFloat AppUnitsToGfxCSSPixels(nscoord aAppUnits)
-  { return gfxFloat(aAppUnits) / AppUnitsPerCSSPixel(); }
-
-  /**
-   * Gets the number of app units in one device pixel; this number is usually
-   * a factor of AppUnitsPerCSSPixel(), although that is not guaranteed.
-   */
-  PRInt32 AppUnitsPerDevPixel() const { return mAppUnitsPerDevPixel; }
-
-  /**
-   * Convert device pixels which is used for gfx/thebes to nearest (rounded)
-   * app units
-   */
-  nscoord GfxUnitsToAppUnits(gfxFloat aGfxUnits) const
-  { return nscoord(NS_round(aGfxUnits * AppUnitsPerDevPixel())); }
-
-  /**
-   * Convert app units to device pixels which is used for gfx/thebes.
-   */
-  gfxFloat AppUnitsToGfxUnits(nscoord aAppUnits) const
-  { return gfxFloat(aAppUnits) / AppUnitsPerDevPixel(); }
-
-  /**
-   * Gets the number of app units in one physical inch; this is the
-   * device's DPI times AppUnitsPerDevPixel().
-   */
-  PRInt32 AppUnitsPerPhysicalInch() const { return mAppUnitsPerPhysicalInch; }
-
-  /**
-   * Gets the number of app units in one CSS inch; this is the
-   * 96 times AppUnitsPerCSSPixel.
-   */
-  static PRInt32 AppUnitsPerCSSInch() { return 96 * AppUnitsPerCSSPixel(); }
-
-  /**
-   * Fill in an nsFont based on the ID of a system font.  This function
-   * may or may not fill in the size, so the size should be set to a
-   * reasonable default before calling.
-   *
-   * @param aID    The system font ID.
-   * @param aInfo  The font structure to be filled in.
-   * @return error status
-   */
-  NS_IMETHOD  GetSystemFont(nsSystemFontID aID, nsFont *aFont) const = 0;
-
-  /**
-   * Get the nsFontMetrics that describe the properties of
-   * an nsFont.
-   * @param aFont font description to obtain metrics for
-   * @param aLanguage the language of the document
-   * @param aMetrics out parameter for font metrics
-   * @param aUserFontSet user font set
-   * @return error status
-   */
-  NS_IMETHOD  GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
-                            gfxUserFontSet* aUserFontSet,
-                            nsFontMetrics*& aMetrics) = 0;
-
-  /**
-   * Get the nsFontMetrics that describe the properties of
-   * an nsFont.
-   * @param aFont font description to obtain metrics for
-   * @param aMetrics out parameter for font metrics
-   * @param aUserFontSet user font set
-   * @return error status
-   */
-  NS_IMETHOD  GetMetricsFor(const nsFont& aFont, gfxUserFontSet* aUserFontSet,
-                            nsFontMetrics*& aMetrics) = 0;
-
-  /**
-   * Check to see if a particular named font exists.
-   * @param aFontName character string of font face name
-   * @return NS_OK if font is available, else font is unavailable
-   */
-  NS_IMETHOD CheckFontExistence(const nsString& aFaceName) = 0;
-  NS_IMETHOD FirstExistingFont(const nsFont& aFont, nsString& aFaceName) = 0;
-
-  NS_IMETHOD GetLocalFontName(const nsString& aFaceName, nsString& aLocalName,
-                              PRBool& aAliased) = 0;
-
-  /**
-   * Notification when a font metrics instance created for this device is
-   * about to be deleted
-   */
-  NS_IMETHOD FontMetricsDeleted(const nsFontMetrics* aFontMetrics) = 0;
-
-  /**
-   * Attempt to free up resoruces by flushing out any fonts no longer
-   * referenced by anything other than the font cache itself.
-   * @return error status
-   */
-  NS_IMETHOD FlushFontCache(void) = 0;
-
-  /**
-   * Return the bit depth of the device.
-   */
-  NS_IMETHOD GetDepth(PRUint32& aDepth) = 0;
-
-  /**
-   * Get the size of the displayable area of the output device
-   * in app units.
-   * @param aWidth out parameter for width
-   * @param aHeight out parameter for height
-   * @return error status
-   */
-  NS_IMETHOD GetDeviceSurfaceDimensions(nscoord &aWidth, nscoord &aHeight) = 0;
-
-  /**
-   * Get the size of the content area of the output device in app units.
-   * This corresponds on a screen device, for instance, to the entire screen.
-   * @param aRect out parameter for full rect. Position (x,y) will be (0,0) or
-   *              relative to the primary monitor if this is not the primary.
-   * @return error status
-   */
-  NS_IMETHOD GetRect ( nsRect &aRect ) = 0;
-
-  /**
-   * Get the size of the content area of the output device in app units.
-   * This corresponds on a screen device, for instance, to the area reported
-   * by GetDeviceSurfaceDimensions, minus the taskbar (Windows) or menubar
-   * (Macintosh).
-   * @param aRect out parameter for client rect. Position (x,y) will be (0,0)
-   *              adjusted for any upper/left non-client space if present or
-   *              relative to the primary monitor if this is not the primary.
-   * @return error status
-   */
-  NS_IMETHOD GetClientRect(nsRect &aRect) = 0;
-
-  /**
-   * This is enables the DeviceContext to anything it needs to do for Printing
-   * before Reflow and BeginDocument is where work can be done after reflow.
-   * @param aTitle - itle of Document
-   * @param aPrintToFileName - name of file to print to, if NULL then don't print to file
-   *
-   * @return error status
-   */
-  NS_IMETHOD PrepareDocument(PRUnichar * aTitle, 
-                             PRUnichar*  aPrintToFileName) = 0;
-
-  //XXX need to work out re-entrancy issues for these APIs... MMP
-  /**
-   * Inform the output device that output of a document is beginning
-   * Used for print related device contexts. Must be matched 1:1 with
-   * EndDocument().
-   * XXX needs to take parameters so that feedback can be given to the
-   * app regarding pagination progress and aborting print operations?
-   *
-   * @param aTitle - itle of Document
-   * @param aPrintToFileName - name of file to print to, if NULL then don't print to file
-   * @param aStartPage - starting page number (must be greater than zero)
-   * @param aEndPage - ending page number     (must be less than or equal to number of pages)
-   *
-   * @return error status
-   */
-  NS_IMETHOD BeginDocument(PRUnichar*  aTitle, 
-                           PRUnichar*  aPrintToFileName,
-                           PRInt32     aStartPage, 
-                           PRInt32     aEndPage) = 0;
-
-  /**
-   * Inform the output device that output of a document is ending.
-   * Used for print related device contexts. Must be matched 1:1 with
-   * BeginDocument()
-   * @return error status
-   */
-  NS_IMETHOD EndDocument(void) = 0;
-
-  /**
-   * Inform the output device that output of a document is being aborted.
-   * Must be matched 1:1 with BeginDocument()
-   * @return error status
-   */
-  NS_IMETHOD AbortDocument(void) = 0;
-
-  /**
-   * Inform the output device that output of a page is beginning
-   * Used for print related device contexts. Must be matched 1:1 with
-   * EndPage() and within a BeginDocument()/EndDocument() pair.
-   * @return error status
-   */
-  NS_IMETHOD BeginPage(void) = 0;
-
-  /**
-   * Inform the output device that output of a page is ending
-   * Used for print related device contexts. Must be matched 1:1 with
-   * BeginPage() and within a BeginDocument()/EndDocument() pair.
-   * @return error status
-   */
-  NS_IMETHOD EndPage(void) = 0;
-
-  /**
-   * Clear cached system fonts (refresh from theme when
-   * requested).  This method is effectively static,
-   * and can be called on a new DeviceContext instance
-   * without any initialization.  Only really used by
-   * Gtk native theme stuff.
-   */
-  NS_IMETHOD ClearCachedSystemFonts() = 0;
-
-  /**
-   * Check to see if the DPI has changed
-   * @return whether there was actually a change in the DPI
-   *         (whether AppUnitsPerDevPixel() or AppUnitsPerPhysicalInch() changed)
-  */
-  virtual PRBool CheckDPIChange() = 0;
-
-  /**
-   * Set the pixel scaling factor: all lengths are multiplied by this factor
-   * when we convert them to device pixels. Returns whether the ratio of 
-   * app units to dev pixels changed because of the scale factor.
-   */
-  virtual PRBool SetPixelScale(float aScale) = 0;
-
-  /**
-   * Get the pixel scaling factor; defaults to 1.0, but can be changed with
-   * SetPixelScale.
-   */
-  float GetPixelScale() const { return mPixelScale; }
-
-  /**
-   * Get the unscaled ratio of app units to dev pixels; useful if something
-   * needs to be converted from to unscaled pixels
-   */
-  PRInt32 UnscaledAppUnitsPerDevPixel() const { return mAppUnitsPerDevNotScaledPixel; }
-
-protected:
-  PRInt32 mAppUnitsPerDevPixel;
-  PRInt32 mAppUnitsPerPhysicalInch;
-  PRInt32 mAppUnitsPerDevNotScaledPixel;
-  float  mPixelScale;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContext, NS_IDEVICE_CONTEXT_IID)
-
-#endif /* nsIDeviceContext_h___ */
diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h
index 8cc89528e851..4dbf319bd4cf 100644
--- a/gfx/src/nsITheme.h
+++ b/gfx/src/nsITheme.h
@@ -52,7 +52,7 @@ struct nsFont;
 struct nsIntMargin;
 class nsPresContext;
 class nsRenderingContext;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsIFrame;
 class nsIContent;
 class nsIAtom;
@@ -111,7 +111,7 @@ public:
   /**
    * Get the computed CSS border for the widget, in pixels.
    */
-  NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext, 
+  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, 
                              nsIFrame* aFrame,
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult)=0;
@@ -125,7 +125,7 @@ public:
    * so that we don't let specified padding that has no effect change
    * the computed padding and potentially the size.
    */
-  virtual PRBool GetWidgetPadding(nsIDeviceContext* aContext,
+  virtual PRBool GetWidgetPadding(nsDeviceContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntMargin* aResult) = 0;
@@ -138,7 +138,7 @@ public:
    * fill in aResult with the desired overflow area, in appunits, relative
    * to the frame origin, and return PR_TRUE.
    */
-  virtual PRBool GetWidgetOverflow(nsIDeviceContext* aContext,
+  virtual PRBool GetWidgetOverflow(nsDeviceContext* aContext,
                                    nsIFrame* aFrame,
                                    PRUint8 aWidgetType,
                                    /*INOUT*/ nsRect* aOverflowRect)
diff --git a/gfx/src/nsRect.cpp b/gfx/src/nsRect.cpp
index b200ce945c63..53885b2f4b1a 100644
--- a/gfx/src/nsRect.cpp
+++ b/gfx/src/nsRect.cpp
@@ -37,7 +37,7 @@
 
 #include "nsRect.h"
 #include "nsString.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "prlog.h"
 #include <limits.h>
 
@@ -85,16 +85,16 @@ FILE* operator<<(FILE* out, const nsRect& rect)
   // Output the coordinates in fractional pixels so they're easier to read
   tmp.AppendLiteral("{");
   tmp.AppendFloat(NSAppUnitsToFloatPixels(rect.x,
-                       nsIDeviceContext::AppUnitsPerCSSPixel()));
+                       nsDeviceContext::AppUnitsPerCSSPixel()));
   tmp.AppendLiteral(", ");
   tmp.AppendFloat(NSAppUnitsToFloatPixels(rect.y,
-                       nsIDeviceContext::AppUnitsPerCSSPixel()));
+                       nsDeviceContext::AppUnitsPerCSSPixel()));
   tmp.AppendLiteral(", ");
   tmp.AppendFloat(NSAppUnitsToFloatPixels(rect.width,
-                       nsIDeviceContext::AppUnitsPerCSSPixel()));
+                       nsDeviceContext::AppUnitsPerCSSPixel()));
   tmp.AppendLiteral(", ");
   tmp.AppendFloat(NSAppUnitsToFloatPixels(rect.height,
-                       nsIDeviceContext::AppUnitsPerCSSPixel()));
+                       nsDeviceContext::AppUnitsPerCSSPixel()));
   tmp.AppendLiteral("}");
   fputs(NS_LossyConvertUTF16toASCII(tmp).get(), out);
   return out;
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index a51bb3602169..c6e26ab20935 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -85,14 +85,14 @@ static PRInt32 FindSafeLength(const char *aString, PRUint32 aLength,
 //// nsRenderingContext
 
 void
-nsRenderingContext::Init(nsIDeviceContext* aContext,
+nsRenderingContext::Init(nsDeviceContext* aContext,
                          gfxASurface *aThebesSurface)
 {
     Init(aContext, new gfxContext(aThebesSurface));
 }
 
 void
-nsRenderingContext::Init(nsIDeviceContext* aContext,
+nsRenderingContext::Init(nsDeviceContext* aContext,
                          gfxContext *aThebesContext)
 {
     mDeviceContext = aContext;
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 282d4cf28804..ac700a04bb9d 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -40,8 +40,7 @@
 #define NSRENDERINGCONTEXT__H__
 
 #include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "nsFontMetrics.h"
 #include "nsColor.h"
 #include "nsCoord.h"
@@ -65,12 +64,12 @@ public:
 
     NS_INLINE_DECL_REFCOUNTING(nsRenderingContext)
 
-    void Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
-    void Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
+    void Init(nsDeviceContext* aContext, gfxASurface* aThebesSurface);
+    void Init(nsDeviceContext* aContext, gfxContext* aThebesContext);
 
     // These accessors will never return null.
     gfxContext *ThebesContext() { return mThebes; }
-    nsIDeviceContext *DeviceContext() { return mDeviceContext; }
+    nsDeviceContext *DeviceContext() { return mDeviceContext; }
     PRInt32 AppUnitsPerDevPixel() { return mP2A; }
 
     // Graphics state
@@ -148,7 +147,7 @@ protected:
     PRInt32 GetMaxChunkLength();
 
     nsRefPtr<gfxContext> mThebes;
-    nsCOMPtr<nsIDeviceContext> mDeviceContext;
+    nsRefPtr<nsDeviceContext> mDeviceContext;
     nsRefPtr<nsFontMetrics> mFontMetrics;
 
     double mP2A; // cached app units per device pixel value
diff --git a/gfx/src/nsSystemFontsAndroid.h b/gfx/src/nsSystemFontsAndroid.h
index 0a9005446c3d..98ff50e7e50f 100644
--- a/gfx/src/nsSystemFontsAndroid.h
+++ b/gfx/src/nsSystemFontsAndroid.h
@@ -39,7 +39,7 @@
 #define _NS_SYSTEMFONTSANDROID_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 class nsSystemFontsAndroid
 {
diff --git a/gfx/src/nsSystemFontsGTK2.h b/gfx/src/nsSystemFontsGTK2.h
index 360a2d08c6ba..088aa2506452 100644
--- a/gfx/src/nsSystemFontsGTK2.h
+++ b/gfx/src/nsSystemFontsGTK2.h
@@ -40,7 +40,7 @@
 #define _NS_SYSTEMFONTSGTK2_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 typedef struct _GtkWidget GtkWidget;
 
diff --git a/gfx/src/nsSystemFontsMac.h b/gfx/src/nsSystemFontsMac.h
index e41ca1d95be9..2727fcbdeedd 100644
--- a/gfx/src/nsSystemFontsMac.h
+++ b/gfx/src/nsSystemFontsMac.h
@@ -39,7 +39,7 @@
 #define _NS_SYSTEMFONTSMAC_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 class nsSystemFontsMac
 {
diff --git a/gfx/src/nsSystemFontsOS2.h b/gfx/src/nsSystemFontsOS2.h
index 7b5d88a04b48..0e8765a3f98a 100644
--- a/gfx/src/nsSystemFontsOS2.h
+++ b/gfx/src/nsSystemFontsOS2.h
@@ -42,7 +42,7 @@
 #define _NS_SYSTEMFONTSOS2_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 class nsSystemFontsOS2
 {
diff --git a/gfx/src/nsSystemFontsQt.h b/gfx/src/nsSystemFontsQt.h
index 07bb1d06f0f7..16df15f936e6 100644
--- a/gfx/src/nsSystemFontsQt.h
+++ b/gfx/src/nsSystemFontsQt.h
@@ -40,7 +40,7 @@
 #define _NS_SYSTEMFONTSQT_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 class nsSystemFontsQt
 {
diff --git a/gfx/src/nsSystemFontsWin.h b/gfx/src/nsSystemFontsWin.h
index 9c3031577a0a..2ed8bf287c07 100644
--- a/gfx/src/nsSystemFontsWin.h
+++ b/gfx/src/nsSystemFontsWin.h
@@ -40,7 +40,7 @@
 #define _NS_SYSTEMFONTSWIN_H_
 
 #include "gfxFont.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include <windows.h> // need HDC and LOGFONTW
 
 class nsSystemFontsWin
diff --git a/gfx/src/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
deleted file mode 100644
index 1426a1f56005..000000000000
--- a/gfx/src/nsThebesDeviceContext.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is thebes gfx
- *
- * The Initial Developer of the Original Code is
- * mozilla.org.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vladimir Vukicevic <vladimir@pobox.com>
- *   Stuart Parmenter <pavlov@pavlov.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _NS_THEBESDEVICECONTEXT_H_
-#define _NS_THEBESDEVICECONTEXT_H_
-
-#include "nsIScreenManager.h"
-#include "nsIDeviceContext.h"
-#include "nsIDeviceContextSpec.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-#include "gfxContext.h"
-
-#ifdef XP_WIN
-#include "gfxWindowsSurface.h"
-#elif defined(XP_OS2)
-#include "gfxOS2Surface.h"
-#endif
-
-class nsFontCache;
-
-class nsThebesDeviceContext : public nsIDeviceContext
-{
-public:
-    nsThebesDeviceContext();
-    virtual ~nsThebesDeviceContext();
-
-    static void Shutdown();
-
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD Init(nsIWidget *aWidget);
-    NS_IMETHOD InitForPrinting(nsIDeviceContextSpec *aDevSpec);
-    NS_IMETHOD CreateRenderingContext(nsIView *aView, nsRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContext(nsIWidget *aWidget, nsRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContext(nsRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContextInstance(nsRenderingContext *&aContext);
-
-    NS_IMETHOD GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
-                             gfxUserFontSet* aUserFontSet,
-                             nsFontMetrics*& aMetrics);
-    NS_IMETHOD GetMetricsFor(const nsFont& aFont,
-                             gfxUserFontSet* aUserFontSet,
-                             nsFontMetrics*& aMetrics);
-
-    NS_IMETHOD FirstExistingFont(const nsFont& aFont, nsString& aFaceName);
-
-    NS_IMETHOD GetLocalFontName(const nsString& aFaceName, nsString& aLocalName,
-                                PRBool& aAliased);
-
-    NS_IMETHOD CreateFontCache();
-    NS_IMETHOD FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
-    NS_IMETHOD FlushFontCache(void);
-
-    NS_IMETHOD PrepareNativeWidget(nsIWidget *aWidget, void **aOut);
-
-    NS_IMETHOD GetSystemFont(nsSystemFontID aID, nsFont *aFont) const;
-    NS_IMETHOD ClearCachedSystemFonts();
-
-    NS_IMETHOD CheckFontExistence(const nsString& aFaceName);
-
-    NS_IMETHOD GetDepth(PRUint32& aDepth);
-
-    NS_IMETHOD GetDeviceSurfaceDimensions(nscoord& aWidth, nscoord& aHeight);
-    NS_IMETHOD GetRect(nsRect& aRect);
-    NS_IMETHOD GetClientRect(nsRect& aRect);
-
-    /* printing goop */
-    NS_IMETHOD PrepareDocument(PRUnichar *aTitle, 
-                               PRUnichar *aPrintToFileName);
-
-    NS_IMETHOD BeginDocument(PRUnichar  *aTitle, 
-                             PRUnichar  *aPrintToFileName,
-                             PRInt32     aStartPage, 
-                             PRInt32     aEndPage);
-
-    NS_IMETHOD EndDocument(void);
-    NS_IMETHOD AbortDocument(void);
-    NS_IMETHOD BeginPage(void);
-    NS_IMETHOD EndPage(void);
-    /* end printing goop */
-
-    virtual PRBool CheckDPIChange();
-
-    virtual PRBool SetPixelScale(float aScale);
-
-    PRBool IsPrinterSurface(void);
-
-#if defined(XP_WIN) || defined(XP_OS2)
-    HDC GetPrintHDC();
-#endif
-
-protected:
-    void GetLocaleLanguage(void);
-    nsresult SetDPI();
-    void ComputeClientRectUsingScreen(nsRect *outRect);
-    void ComputeFullAreaUsingScreen(nsRect *outRect);
-    void FindScreen(nsIScreen **outScreen);
-    void CalcPrintingSize();
-    void UpdateScaledAppUnits();
-
-    PRUint32          mDepth;
-    nsFontCache*      mFontCache;
-    nsCOMPtr<nsIAtom> mLocaleLanguage; // XXX temp fix for performance bug
-    nsCOMPtr<nsIWidget> mWidget;
-
-private:
-    nsCOMPtr<nsIScreenManager> mScreenManager;
-
-    nscoord mWidth;
-    nscoord mHeight;
-
-    nsRefPtr<gfxASurface> mPrintingSurface;
-    float mPrintingScale;
-    nsCOMPtr<nsIDeviceContextSpec> mDeviceContextSpec;
-};
-
-#endif /* _NS_CAIRODEVICECONTEXT_H_ */
-
diff --git a/gfx/src/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
index 8547b3e90bec..db7c13f89ce5 100644
--- a/gfx/src/nsThebesGfxFactory.cpp
+++ b/gfx/src/nsThebesGfxFactory.cpp
@@ -40,11 +40,11 @@
 #include "nsCOMPtr.h"
 #include "nsGfxCIID.h"
 
+#include "nsThebesFontEnumerator.h"
+#include "nsThebesRegion.h"
 #include "nsScriptableRegion.h"
 
-#include "nsThebesDeviceContext.h"
-#include "nsThebesRegion.h"
-#include "nsThebesFontEnumerator.h"
+#include "nsDeviceContext.h"
 #include "gfxPlatform.h"
 
 // This service doesn't do anything; its only purpose is to force the
@@ -62,10 +62,8 @@ class GfxInitialization : public nsISupports {
 NS_IMPL_ISUPPORTS0(GfxInitialization)
 }
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesDeviceContext)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRegion)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontEnumerator)
-NS_GENERIC_FACTORY_CONSTRUCTOR(GfxInitialization)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRegion)
 
 static nsresult
 nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -108,15 +106,15 @@ nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult
   return rv;
 }
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(GfxInitialization)
+
 NS_DEFINE_NAMED_CID(NS_FONT_ENUMERATOR_CID);
-NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_CID);
 NS_DEFINE_NAMED_CID(NS_REGION_CID);
 NS_DEFINE_NAMED_CID(NS_SCRIPTABLE_REGION_CID);
 NS_DEFINE_NAMED_CID(NS_GFX_INITIALIZATION_CID);
 
 static const mozilla::Module::CIDEntry kThebesCIDs[] = {
     { &kNS_FONT_ENUMERATOR_CID, false, NULL, nsThebesFontEnumeratorConstructor },
-    { &kNS_DEVICE_CONTEXT_CID, false, NULL, nsThebesDeviceContextConstructor },
     { &kNS_REGION_CID, false, NULL, nsThebesRegionConstructor },
     { &kNS_SCRIPTABLE_REGION_CID, false, NULL, nsScriptableRegionConstructor },
     { &kNS_GFX_INITIALIZATION_CID, false, NULL, GfxInitializationConstructor },
@@ -125,7 +123,6 @@ static const mozilla::Module::CIDEntry kThebesCIDs[] = {
 
 static const mozilla::Module::ContractIDEntry kThebesContracts[] = {
     { "@mozilla.org/gfx/fontenumerator;1", &kNS_FONT_ENUMERATOR_CID },
-    { "@mozilla.org/gfx/devicecontext;1", &kNS_DEVICE_CONTEXT_CID },
     { "@mozilla.org/gfx/region/nsThebes;1", &kNS_REGION_CID },
     { "@mozilla.org/gfx/region;1", &kNS_SCRIPTABLE_REGION_CID },
     { "@mozilla.org/gfx/init;1", &kNS_GFX_INITIALIZATION_CID },
@@ -146,7 +143,7 @@ nsThebesGfxModuleCtor()
 static void
 nsThebesGfxModuleDtor()
 {
-    nsThebesDeviceContext::Shutdown();
+    nsDeviceContext::ClearCachedSystemFonts();
     gfxPlatform::Shutdown();
 }
 
diff --git a/gfx/thebes/gfxTypes.h b/gfx/thebes/gfxTypes.h
index 1993f4298b3b..8894bcfc9e2b 100644
--- a/gfx/thebes/gfxTypes.h
+++ b/gfx/thebes/gfxTypes.h
@@ -59,7 +59,7 @@ typedef double gfxFloat;
  * gfx errors
  */
 
-/* nsIDeviceContext.h defines a set of printer errors  */
+/* nsIDeviceContextSpec.h defines a set of printer errors  */
 #define NS_ERROR_GFX_GENERAL_BASE (50) 
 
 /* Font cmap is strangely structured - avoid this font! */
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 28163adc7360..9a525c3095f6 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -517,7 +517,6 @@ protected:
 //------------------------------------------------------------------
 // Class IDs
 static NS_DEFINE_CID(kViewManagerCID,       NS_VIEW_MANAGER_CID);
-static NS_DEFINE_CID(kDeviceContextCID,     NS_DEVICE_CONTEXT_CID);
 
 //------------------------------------------------------------------
 nsresult
@@ -926,23 +925,6 @@ DocumentViewerImpl::InitInternal(nsIWidget* aParentWidget,
         // be measuring/scaling with the print device context, not the
         // screen device context, but this is good enough to allow
         // printing reftests to work.
-#if 0
-        nsCOMPtr<nsIDeviceContextSpec> devspec =
-          do_CreateInstance("@mozilla.org/gfx/devicecontextspec;1", &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-        // mWindow has been initialized by preceding call to MakeWindow
-        rv = devspec->Init(mWindow, mPresContext->GetPrintSettings(), PR_FALSE);
-        NS_ENSURE_SUCCESS(rv, rv);
-        nsCOMPtr<nsIDeviceContext> devctx =
-          do_CreateInstance("@mozilla.org/gfx/devicecontext;1", &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-        rv = devctx->InitForPrinting(devspec);
-        NS_ENSURE_SUCCESS(rv, rv);
-        // XXX I'm breaking this code; I'm not sure I really want to mess with
-        // the document viewer at the moment to get the right device context
-        // (this won't break anyone, since page layout mode was never really
-        // usable)
-#endif
         double pageWidth = 0, pageHeight = 0;
         mPresContext->GetPrintSettings()->GetEffectivePageSize(&pageWidth,
                                                                &pageHeight);
@@ -2446,13 +2428,10 @@ DocumentViewerImpl::CreateDeviceContext(nsIView* aContainerView)
   
   // Create a device context even if we already have one, since our widget
   // might have changed.
-  mDeviceContext = do_CreateInstance(kDeviceContextCID);
-  NS_ENSURE_TRUE(mDeviceContext, NS_ERROR_FAILURE);
   nsIWidget* widget = nsnull;
   if (aContainerView) {
     widget = aContainerView->GetNearestWidget(nsnull);
   }
-  // The device context needs a widget to be able to determine the screen it is on.
   if (!widget) {
     widget = mParentWidget;
   }
@@ -2460,6 +2439,7 @@ DocumentViewerImpl::CreateDeviceContext(nsIView* aContainerView)
     widget = widget->GetTopLevelWidget();
   }
 
+  mDeviceContext = new nsDeviceContext();
   mDeviceContext->Init(widget);
   return NS_OK;
 }
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 5b010d176c77..c996482bf2ee 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -348,7 +348,7 @@ TraverseImageLoader(const void * aKey, nsRefPtr<nsImageLoader>& aData,
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsPresContext)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocument);
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mDeviceContext); // worth bothering?
+  // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mDeviceContext); // not xpcom
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mEventManager);
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mLookAndFeel); // a service
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mLanguage); // an atom
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 07e004213ae2..fe58736a8e17 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -655,11 +655,10 @@ nsPrintEngine::DoCommonPrint(PRBool                  aIsPrintPreview,
   rv = devspec->Init(nsnull, mPrt->mPrintSettings, aIsPrintPreview);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mPrt->mPrintDC = do_CreateInstance("@mozilla.org/gfx/devicecontext;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
+  mPrt->mPrintDC = new nsDeviceContext();
   rv = mPrt->mPrintDC->InitForPrinting(devspec);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   if (aIsPrintPreview) {
     mPrt->mPrintSettings->SetPrintFrameType(nsIPrintSettings::kFramesAsIs);
 
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 05529c3ba4ad..8e5d9a111522 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -1245,11 +1245,7 @@ nsNativeThemeGTK::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
 NS_IMETHODIMP
 nsNativeThemeGTK::ThemeChanged()
 {
-  // this totally sucks.  this method is really supposed to be
-  // static, which is why we can call it without any initialization.
-  static NS_DEFINE_CID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
-  nsCOMPtr<nsIDeviceContext> dctx = do_CreateInstance(kDeviceContextCID);
-  dctx->ClearCachedSystemFonts();
+  nsDeviceContext::ClearCachedSystemFonts();
 
   memset(mDisabledWidgetTypes, 0, sizeof(mDisabledWidgetTypes));
   return NS_OK;
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index d0fe8ad46647..cdf34ddeabda 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -158,9 +158,6 @@ using mozilla::layers::LayerManagerOGL;
 // out to the bounding-box if there are more
 #define MAX_RECTS_IN_REGION 100
 
-/* For PrepareNativeWidget */
-static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
-
 /* utility functions */
 static PRBool     check_for_rollup(GdkWindow *aWindow,
                                    gdouble aMouseX, gdouble aMouseY,
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index c12159f850e5..0791bb37e115 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -156,9 +156,6 @@ nsRefPtr<nsShmImage> gShmImage;
 static int gBufferPixmapUsageCount = 0;
 static gfxIntSize gBufferMaxSize(0, 0);
 
-/* For PrepareNativeWidget */
-static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
-
 // initialization static functions 
 static nsresult    initialize_prefs        (void);
 
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index 82761cf6f2e4..bf4b1eb3d026 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -210,14 +210,9 @@ void nsBaseWidget::BaseCreate(nsIWidget *aParent,
     NS_ADDREF(mContext);
   }
   else {
-    nsresult  res;
-    
-    static NS_DEFINE_CID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
-    
-    res = CallCreateInstance(kDeviceContextCID, &mContext);
-
-    if (NS_SUCCEEDED(res))
-      mContext->Init(nsnull);
+    mContext = new nsDeviceContext();
+    NS_ADDREF(mContext);
+    mContext->Init(nsnull);
   }
 
   if (nsnull != aInitData) {

From 3929b6bfddff036abb8caf6548b2f33329d94760 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:44 -0700
Subject: [PATCH 056/509] Bug 651017, part 5: mechanical changes.

--HG--
extra : rebase_source : 8bbdf48488736b51d05e734e2e9316c1460cfed5
---
 accessible/src/base/nsTextAttrs.cpp           |  2 +-
 accessible/src/base/nsTextAttrs.h             |  2 +-
 content/base/public/nsIDocument.h             |  2 +-
 dom/base/nsScreen.cpp                         |  8 +++----
 dom/base/nsScreen.h                           |  4 ++--
 dom/ipc/TabChild.cpp                          |  2 +-
 layout/base/nsCSSRendering.cpp                |  2 +-
 layout/base/nsDisplayList.h                   |  2 +-
 layout/base/nsDocumentViewer.cpp              |  4 ++--
 layout/base/nsLayoutUtils.cpp                 | 10 ++++----
 layout/base/nsLayoutUtils.h                   |  2 +-
 layout/base/nsPresContext.cpp                 |  2 +-
 layout/base/nsPresContext.h                   | 24 +++++++++----------
 layout/base/nsPresShell.cpp                   |  8 +++----
 layout/forms/nsFormControlFrame.cpp           |  2 +-
 layout/generic/nsHTMLContainerFrame.h         |  2 +-
 layout/generic/nsObjectFrame.cpp              |  2 +-
 layout/generic/nsSimplePageSequence.cpp       |  2 +-
 layout/generic/nsSubDocumentFrame.cpp         |  4 ++--
 layout/printing/nsPrintData.h                 |  4 ++--
 layout/printing/nsPrintEngine.cpp             |  8 +++----
 layout/printing/nsPrintEngine.h               |  2 +-
 layout/style/nsMediaFeatures.cpp              |  8 +++----
 layout/style/nsRuleNode.cpp                   |  2 +-
 layout/svg/base/src/nsSVGGlyphFrame.h         |  2 +-
 layout/svg/base/src/nsSVGUtils.cpp            |  2 +-
 layout/xul/base/src/nsMenuPopupFrame.cpp      |  2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  2 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |  8 +++----
 view/public/nsIViewManager.h                  |  6 ++---
 view/src/nsView.cpp                           |  8 +++----
 view/src/nsViewManager.cpp                    |  4 ++--
 view/src/nsViewManager.h                      |  8 +++----
 widget/public/nsIWidget.h                     | 10 ++++----
 widget/src/android/nsWindow.cpp               |  2 +-
 widget/src/android/nsWindow.h                 |  2 +-
 widget/src/cocoa/nsChildView.h                |  2 +-
 widget/src/cocoa/nsChildView.mm               |  2 +-
 widget/src/cocoa/nsCocoaWindow.h              |  4 ++--
 widget/src/cocoa/nsCocoaWindow.mm             |  4 ++--
 widget/src/cocoa/nsNativeThemeCocoa.h         |  8 +++----
 widget/src/cocoa/nsNativeThemeCocoa.mm        |  6 ++---
 widget/src/gtk2/nsNativeThemeGTK.cpp          |  6 ++---
 widget/src/gtk2/nsNativeThemeGTK.h            |  6 ++---
 widget/src/gtk2/nsWindow.cpp                  |  2 +-
 widget/src/gtk2/nsWindow.h                    |  2 +-
 widget/src/os2/nsGfxDefs.h                    |  2 +-
 widget/src/os2/nsWindow.cpp                   |  2 +-
 widget/src/os2/nsWindow.h                     |  2 +-
 widget/src/qt/nsNativeThemeQt.cpp             |  4 ++--
 widget/src/qt/nsNativeThemeQt.h               |  6 ++---
 widget/src/qt/nsWindow.cpp                    |  4 ++--
 widget/src/qt/nsWindow.h                      |  4 ++--
 widget/src/windows/nsNativeThemeWin.cpp       |  8 +++----
 widget/src/windows/nsNativeThemeWin.h         |  8 +++----
 widget/src/windows/nsWindow.cpp               |  2 +-
 widget/src/windows/nsWindow.h                 |  2 +-
 widget/src/xpwidgets/PuppetWidget.cpp         |  4 ++--
 widget/src/xpwidgets/PuppetWidget.h           |  6 ++---
 widget/src/xpwidgets/nsBaseDragService.cpp    |  2 +-
 widget/src/xpwidgets/nsBaseWidget.cpp         | 10 ++++----
 widget/src/xpwidgets/nsBaseWidget.h           | 10 ++++----
 62 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/accessible/src/base/nsTextAttrs.cpp b/accessible/src/base/nsTextAttrs.cpp
index 0225e137e6f3..e4fefd9c5743 100644
--- a/accessible/src/base/nsTextAttrs.cpp
+++ b/accessible/src/base/nsTextAttrs.cpp
@@ -466,7 +466,7 @@ nsFontSizeTextAttr::Format(const nscoord& aValue, nsAString& aFormattedValue)
   //
   // XXX todo: consider sharing this code with layout module? (bug 474621)
   float px =
-    NSAppUnitsToFloatPixels(aValue, nsIDeviceContext::AppUnitsPerCSSPixel());
+    NSAppUnitsToFloatPixels(aValue, nsDeviceContext::AppUnitsPerCSSPixel());
   // Each pt is 4/3 of a CSS pixel.
   int pts = NS_lround(px*3/4);
 
diff --git a/accessible/src/base/nsTextAttrs.h b/accessible/src/base/nsTextAttrs.h
index 40d5f79e0adb..1c042b5ad731 100644
--- a/accessible/src/base/nsTextAttrs.h
+++ b/accessible/src/base/nsTextAttrs.h
@@ -337,7 +337,7 @@ private:
    */
    nscoord GetFontSize(nsIFrame *aFrame);
 
-  nsIDeviceContext *mDC;
+  nsDeviceContext *mDC;
 };
 
 
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index e2e39a262cad..cc0b5236e220 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -79,7 +79,7 @@ class nsCSSStyleSheet;
 class nsIViewManager;
 class nsIDOMEvent;
 class nsIDOMEventTarget;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsIParser;
 class nsIDOMNode;
 class nsIDOMElement;
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index 02e0133e0da2..0613b0eb0531 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -128,7 +128,7 @@ nsScreen::GetHeight(PRInt32* aHeight)
 NS_IMETHODIMP
 nsScreen::GetPixelDepth(PRInt32* aPixelDepth)
 {
-  nsIDeviceContext* context = GetDeviceContext();
+  nsDeviceContext* context = GetDeviceContext();
 
   if (!context) {
     *aPixelDepth = -1;
@@ -194,7 +194,7 @@ nsScreen::GetAvailTop(PRInt32* aAvailTop)
   return rv;
 }
 
-nsIDeviceContext*
+nsDeviceContext*
 nsScreen::GetDeviceContext()
 {
   return nsLayoutUtils::GetDeviceContextForScreenInfo(mDocShell);
@@ -203,7 +203,7 @@ nsScreen::GetDeviceContext()
 nsresult
 nsScreen::GetRect(nsRect& aRect)
 {
-  nsIDeviceContext *context = GetDeviceContext();
+  nsDeviceContext *context = GetDeviceContext();
 
   if (!context) {
     return NS_ERROR_FAILURE;
@@ -222,7 +222,7 @@ nsScreen::GetRect(nsRect& aRect)
 nsresult
 nsScreen::GetAvailRect(nsRect& aRect)
 {
-  nsIDeviceContext *context = GetDeviceContext();
+  nsDeviceContext *context = GetDeviceContext();
 
   if (!context) {
     return NS_ERROR_FAILURE;
diff --git a/dom/base/nsScreen.h b/dom/base/nsScreen.h
index 953cecfe9faa..52eab297ac89 100644
--- a/dom/base/nsScreen.h
+++ b/dom/base/nsScreen.h
@@ -43,7 +43,7 @@
 #include "nsCOMPtr.h"
 
 class nsIDocShell;
-class nsIDeviceContext;
+class nsDeviceContext;
 struct nsRect;
 
 // Script "screen" object
@@ -59,7 +59,7 @@ public:
   NS_DECL_NSIDOMSCREEN
 
 protected:
-  nsIDeviceContext* GetDeviceContext();
+  nsDeviceContext* GetDeviceContext();
   nsresult GetRect(nsRect& aRect);
   nsresult GetAvailRect(nsRect& aRect);
 
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index a5c32897a98a..c2fb5304b9f3 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -900,7 +900,7 @@ TabChild::InitWidget(const nsIntSize& size)
         nsnull, 0,              // no parents
         nsIntRect(nsIntPoint(0, 0), size),
         nsnull,                 // HandleWidgetEvent
-        nsnull                  // nsIDeviceContext
+        nsnull                  // nsDeviceContext
         );
 
     RenderFrameChild* remoteFrame =
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index a386ea4d8494..f560f1e65a9b 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1197,7 +1197,7 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
 
       // Draw the widget shape
       gfxContextMatrixAutoSaveRestore save(shadowContext);
-      nsIDeviceContext* devCtx = aPresContext->DeviceContext();
+      nsDeviceContext* devCtx = aPresContext->DeviceContext();
       nsRefPtr<nsRenderingContext> wrapperCtx;
       devCtx->CreateRenderingContextInstance(*getter_AddRefs(wrapperCtx));
       wrapperCtx->Init(devCtx, shadowContext);
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index c6ed1dceabb2..4409cf86f133 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -62,7 +62,7 @@
 class nsIPresShell;
 class nsIContent;
 class nsRenderingContext;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsDisplayTableItem;
 class nsDisplayItem;
 
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 9a525c3095f6..8815f856a68a 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -438,7 +438,7 @@ protected:
 
   nsWeakPtr mContainer; // it owns me!
   nsWeakPtr mTopContainerWhilePrinting;
-  nsCOMPtr<nsIDeviceContext> mDeviceContext;  // We create and own this baby
+  nsRefPtr<nsDeviceContext> mDeviceContext;  // We create and own this baby
 
   // the following six items are explicitly in this order
   // so they will be destroyed in the reverse order (pinkerton, scc)
@@ -2277,7 +2277,7 @@ DocumentViewerImpl::MakeWindow(const nsSize& aSize, nsIView* aContainerView)
   if (NS_FAILED(rv))
     return rv;
 
-  nsIDeviceContext *dx = mPresContext->DeviceContext();
+  nsDeviceContext *dx = mPresContext->DeviceContext();
 
   rv = mViewManager->Init(dx);
   if (NS_FAILED(rv))
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 8f939f85a6c0..b88ce4845967 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -3334,7 +3334,7 @@ nsLayoutUtils::DrawSingleUnscaledImage(nsRenderingContext* aRenderingContext,
   aImage->GetHeight(&imageSize.height);
   NS_ENSURE_TRUE(imageSize.width > 0 && imageSize.height > 0, NS_ERROR_FAILURE);
 
-  nscoord appUnitsPerCSSPixel = nsIDeviceContext::AppUnitsPerCSSPixel();
+  nscoord appUnitsPerCSSPixel = nsDeviceContext::AppUnitsPerCSSPixel();
   nsSize size(imageSize.width*appUnitsPerCSSPixel,
               imageSize.height*appUnitsPerCSSPixel);
 
@@ -3379,7 +3379,7 @@ nsLayoutUtils::DrawSingleImage(nsRenderingContext* aRenderingContext,
   if (aSourceArea) {
     source = *aSourceArea;
   } else {
-    nscoord appUnitsPerCSSPixel = nsIDeviceContext::AppUnitsPerCSSPixel();
+    nscoord appUnitsPerCSSPixel = nsDeviceContext::AppUnitsPerCSSPixel();
     source.SizeTo(imageSize.width*appUnitsPerCSSPixel,
                   imageSize.height*appUnitsPerCSSPixel);
   }
@@ -3474,7 +3474,7 @@ nsLayoutUtils::GetWholeImageDestination(const nsIntSize& aWholeImageSize,
   double scaleY = double(aDestArea.height)/aImageSourceArea.height;
   nscoord destOffsetX = NSToCoordRound(aImageSourceArea.x*scaleX);
   nscoord destOffsetY = NSToCoordRound(aImageSourceArea.y*scaleY);
-  nscoord appUnitsPerCSSPixel = nsIDeviceContext::AppUnitsPerCSSPixel();
+  nscoord appUnitsPerCSSPixel = nsDeviceContext::AppUnitsPerCSSPixel();
   nscoord wholeSizeX = NSToCoordRound(aWholeImageSize.width*appUnitsPerCSSPixel*scaleX);
   nscoord wholeSizeY = NSToCoordRound(aWholeImageSize.height*appUnitsPerCSSPixel*scaleY);
   return nsRect(aDestArea.TopLeft() - nsPoint(destOffsetX, destOffsetY),
@@ -3676,7 +3676,7 @@ nsLayoutUtils::GetRectDifferenceStrips(const nsRect& aR1, const nsRect& aR2,
   aHStrip->height -= HStripStart;
 }
 
-nsIDeviceContext*
+nsDeviceContext*
 nsLayoutUtils::GetDeviceContextForScreenInfo(nsIDocShell* aDocShell)
 {
   nsCOMPtr<nsIDocShell> docShell = aDocShell;
@@ -3696,7 +3696,7 @@ nsLayoutUtils::GetDeviceContextForScreenInfo(nsIDocShell* aDocShell)
     nsRefPtr<nsPresContext> presContext;
     docShell->GetPresContext(getter_AddRefs(presContext));
     if (presContext) {
-      nsIDeviceContext* context = presContext->DeviceContext();
+      nsDeviceContext* context = presContext->DeviceContext();
       if (context) {
         return context;
       }
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 0a00149967e4..1d553fed4eb4 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1212,7 +1212,7 @@ public:
    * dimensions for the given docshell.  For some reason, this is more
    * complicated than it ought to be in multi-monitor situations.
    */
-  static nsIDeviceContext*
+  static nsDeviceContext*
   GetDeviceContextForScreenInfo(nsIDocShell* aDocShell);
 
   /**
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index c996482bf2ee..38871ee87833 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -878,7 +878,7 @@ nsPresContext::UpdateAfterPreferencesChanged()
 }
 
 nsresult
-nsPresContext::Init(nsIDeviceContext* aDeviceContext)
+nsPresContext::Init(nsDeviceContext* aDeviceContext)
 {
   NS_ASSERTION(!mInitialized, "attempt to reinit pres context");
   NS_ENSURE_ARG(aDeviceContext);
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index a13a3baf5091..09f399357933 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -48,7 +48,7 @@
 #include "nsCOMPtr.h"
 #include "nsIPresShell.h"
 #include "nsRect.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "nsFont.h"
 #include "nsIWeakReference.h"
 #include "nsITheme.h"
@@ -196,7 +196,7 @@ public:
   /**
    * Initialize the presentation context from a particular device.
    */
-  NS_HIDDEN_(nsresult) Init(nsIDeviceContext* aDeviceContext);
+  NS_HIDDEN_(nsresult) Init(nsDeviceContext* aDeviceContext);
 
   /**
    * Set the presentation shell that this context is bound to.
@@ -544,7 +544,7 @@ public:
   float GetPrintPreviewScale() { return mPPScale; }
   void SetPrintPreviewScale(float aScale) { mPPScale = aScale; }
 
-  nsIDeviceContext* DeviceContext() { return mDeviceContext; }
+  nsDeviceContext* DeviceContext() { return mDeviceContext; }
   nsIEventStateManager* EventStateManager() { return mEventManager; }
   nsIAtom* GetLanguageFromCharset() { return mLanguage; }
 
@@ -586,25 +586,25 @@ public:
     return DevPixelsToAppUnits(mAutoQualityMinFontSizePixelsPref);
   }
   
-  static PRInt32 AppUnitsPerCSSPixel() { return nsIDeviceContext::AppUnitsPerCSSPixel(); }
+  static PRInt32 AppUnitsPerCSSPixel() { return nsDeviceContext::AppUnitsPerCSSPixel(); }
   PRInt32 AppUnitsPerDevPixel() const  { return mDeviceContext->AppUnitsPerDevPixel(); }
-  static PRInt32 AppUnitsPerCSSInch() { return nsIDeviceContext::AppUnitsPerCSSInch(); }
+  static PRInt32 AppUnitsPerCSSInch() { return nsDeviceContext::AppUnitsPerCSSInch(); }
 
   static nscoord CSSPixelsToAppUnits(PRInt32 aPixels)
   { return NSIntPixelsToAppUnits(aPixels,
-                                 nsIDeviceContext::AppUnitsPerCSSPixel()); }
+                                 nsDeviceContext::AppUnitsPerCSSPixel()); }
 
   static nscoord CSSPixelsToAppUnits(float aPixels)
   { return NSFloatPixelsToAppUnits(aPixels,
-             float(nsIDeviceContext::AppUnitsPerCSSPixel())); }
+             float(nsDeviceContext::AppUnitsPerCSSPixel())); }
 
   static PRInt32 AppUnitsToIntCSSPixels(nscoord aAppUnits)
   { return NSAppUnitsToIntPixels(aAppUnits,
-             float(nsIDeviceContext::AppUnitsPerCSSPixel())); }
+             float(nsDeviceContext::AppUnitsPerCSSPixel())); }
 
   static float AppUnitsToFloatCSSPixels(nscoord aAppUnits)
   { return NSAppUnitsToFloatPixels(aAppUnits,
-             float(nsIDeviceContext::AppUnitsPerCSSPixel())); }
+             float(nsDeviceContext::AppUnitsPerCSSPixel())); }
 
   nscoord DevPixelsToAppUnits(PRInt32 aPixels) const
   { return NSIntPixelsToAppUnits(aPixels,
@@ -644,7 +644,7 @@ public:
 
   static nscoord CSSTwipsToAppUnits(float aTwips)
   { return NSToCoordRoundWithClamp(
-      nsIDeviceContext::AppUnitsPerCSSInch() * NS_TWIPS_TO_INCHES(aTwips)); }
+      nsDeviceContext::AppUnitsPerCSSInch() * NS_TWIPS_TO_INCHES(aTwips)); }
 
   // Margin-specific version, since they often need TwipsToAppUnits
   static nsMargin CSSTwipsToAppUnits(const nsIntMargin &marginInTwips)
@@ -654,7 +654,7 @@ public:
                     CSSTwipsToAppUnits(float(marginInTwips.bottom))); }
 
   static nscoord CSSPointsToAppUnits(float aPoints)
-  { return NSToCoordRound(aPoints * nsIDeviceContext::AppUnitsPerCSSInch() /
+  { return NSToCoordRound(aPoints * nsDeviceContext::AppUnitsPerCSSInch() /
                           POINTS_PER_INCH_FLOAT); }
 
   nscoord RoundAppUnitsToNearestDevPixels(nscoord aAppUnits) const
@@ -1048,7 +1048,7 @@ protected:
   nsPresContextType     mType;
   nsIPresShell*         mShell;         // [WEAK]
   nsCOMPtr<nsIDocument> mDocument;
-  nsIDeviceContext*     mDeviceContext; // [STRONG] could be weak, but
+  nsDeviceContext*     mDeviceContext; // [STRONG] could be weak, but
                                         // better safe than sorry.
                                         // Cannot reintroduce cycles
                                         // since there is no dependency
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 1487a9ab5628..71b53e3fc0ad 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -3758,7 +3758,7 @@ PresShell::GetReferenceRenderingContext()
 {
   NS_TIME_FUNCTION_MIN(1.0);
 
-  nsIDeviceContext* devCtx = mPresContext->DeviceContext();
+  nsDeviceContext* devCtx = mPresContext->DeviceContext();
   nsRefPtr<nsRenderingContext> rc;
   if (mPresContext->IsScreen()) {
     devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
@@ -5272,7 +5272,7 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags,
   aThebesContext->Translate(gfxPoint(-nsPresContext::AppUnitsToFloatCSSPixels(aRect.x),
                                      -nsPresContext::AppUnitsToFloatCSSPixels(aRect.y)));
 
-  nsIDeviceContext* devCtx = mPresContext->DeviceContext();
+  nsDeviceContext* devCtx = mPresContext->DeviceContext();
   gfxFloat scale = gfxFloat(devCtx->AppUnitsPerDevPixel())/nsPresContext::AppUnitsPerCSSPixel();
   aThebesContext->Scale(scale, scale);
 
@@ -5550,7 +5550,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
   if (!pc || aArea.width == 0 || aArea.height == 0)
     return nsnull;
 
-  nsIDeviceContext* deviceContext = pc->DeviceContext();
+  nsDeviceContext* deviceContext = pc->DeviceContext();
 
   // use the rectangle to create the surface
   nsIntRect pixelArea = aArea.ToOutsidePixels(pc->AppUnitsPerDevPixel());
@@ -8430,7 +8430,7 @@ PresShell::VerifyIncrementalReflow()
                                         nsPresContext::eContext_Galley);
   NS_ENSURE_TRUE(cx, PR_FALSE);
 
-  nsIDeviceContext *dc = mPresContext->DeviceContext();
+  nsDeviceContext *dc = mPresContext->DeviceContext();
   nsresult rv = cx->Init(dc);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 1f5d18447e2f..45378ebb9eb3 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -185,7 +185,7 @@ nsFormControlFrame::GetUsableScreenRect(nsPresContext* aPresContext)
 {
   nsRect screen;
 
-  nsIDeviceContext *context = aPresContext->DeviceContext();
+  nsDeviceContext *context = aPresContext->DeviceContext();
   PRBool dropdownCanOverlapOSBar = PR_FALSE;
   nsILookAndFeel *lookAndFeel = aPresContext->LookAndFeel();
   lookAndFeel->GetMetric(nsILookAndFeel::eMetric_MenusCanOverlapOSBar,
diff --git a/layout/generic/nsHTMLContainerFrame.h b/layout/generic/nsHTMLContainerFrame.h
index 3c4b7e5b99fd..1a653d923668 100644
--- a/layout/generic/nsHTMLContainerFrame.h
+++ b/layout/generic/nsHTMLContainerFrame.h
@@ -55,7 +55,7 @@ class nsLineBox;
 // Some macros for container classes to do sanity checking on
 // width/height/x/y values computed during reflow.
 // NOTE: AppUnitsPerCSSPixel value hardwired here to remove the
-// dependency on nsIDeviceContext.h.  It doesn't matter if it's a
+// dependency on nsDeviceContext.h.  It doesn't matter if it's a
 // little off.
 #ifdef DEBUG
 #define CRAZY_W (1000000*60)
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 8a0f0811683a..3b2b9090ef54 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -813,7 +813,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth,
   // XXX is the above comment correct?
   viewMan->SetViewVisibility(view, nsViewVisibility_kHide);
 
-  nsCOMPtr<nsIDeviceContext> dx;
+  nsRefPtr<nsDeviceContext> dx;
   viewMan->GetDeviceContext(*getter_AddRefs(dx));
 
   //this is ugly. it was ripped off from didreflow(). MMP
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 6b6fb7ce9f2b..c0c6757d0b05 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -532,7 +532,7 @@ nsSimplePageSequenceFrame::PrintNextPage()
   mPageData->mPrintSettings->GetPrintOptions(nsIPrintSettings::kPrintOddPages, &printOddPages);
 
   // Begin printing of the document
-  nsIDeviceContext *dc = PresContext()->DeviceContext();
+  nsDeviceContext *dc = PresContext()->DeviceContext();
 
   nsresult rv = NS_OK;
 
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index c53ec6f1ac9e..40ae74cefa4a 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -939,7 +939,7 @@ EndSwapDocShellsForDocument(nsIDocument* aDocument, void*)
   NS_PRECONDITION(aDocument, "");
 
   // Our docshell and view trees have been updated for the new hierarchy.
-  // Now also update all nsThebesDeviceContext::mWidget to that of the
+  // Now also update all nsDeviceContext::mWidget to that of the
   // container view in the new hierarchy.
   nsCOMPtr<nsISupports> container = aDocument->GetContainer();
   nsCOMPtr<nsIDocShell> ds = do_QueryInterface(container);
@@ -951,7 +951,7 @@ EndSwapDocShellsForDocument(nsIDocument* aDocument, void*)
       if (dv) {
         nsCOMPtr<nsPresContext> pc;
         dv->GetPresContext(getter_AddRefs(pc));
-        nsIDeviceContext* dc = pc ? pc->DeviceContext() : nsnull;
+        nsDeviceContext* dc = pc ? pc->DeviceContext() : nsnull;
         if (dc) {
           nsIView* v = dv->FindContainerView();
           dc->Init(v ? v->GetNearestWidget(nsnull) : nsnull);
diff --git a/layout/printing/nsPrintData.h b/layout/printing/nsPrintData.h
index 97dfb4f468d8..38dd0b362641 100644
--- a/layout/printing/nsPrintData.h
+++ b/layout/printing/nsPrintData.h
@@ -39,7 +39,7 @@
 
 // Interfaces
 #include "nsIDOMWindow.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "nsIPrintProgressParams.h"
 #include "nsIPrintOptions.h"
 #include "nsTArray.h"
@@ -92,7 +92,7 @@ public:
 
 
   ePrintDataType               mType;            // the type of data this is (Printing or Print Preview)
-  nsCOMPtr<nsIDeviceContext>   mPrintDC;
+  nsRefPtr<nsDeviceContext>   mPrintDC;
   FILE                        *mDebugFilePtr;    // a file where information can go to when printing
 
   nsPrintObject *                mPrintObject;
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index fe58736a8e17..f76ef471e493 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -207,7 +207,7 @@ static const char * gPrintRangeStr[]       = {"kRangeAllPages", "kRangeSpecified
 // Forward Declarations
 static void DumpPrintObjectsListStart(const char * aStr, nsTArray<nsPrintObject*> * aDocList);
 static void DumpPrintObjectsTree(nsPrintObject * aPO, int aLevel= 0, FILE* aFD = nsnull);
-static void DumpPrintObjectsTreeLayout(nsPrintObject * aPO,nsIDeviceContext * aDC, int aLevel= 0, FILE * aFD = nsnull);
+static void DumpPrintObjectsTreeLayout(nsPrintObject * aPO,nsDeviceContext * aDC, int aLevel= 0, FILE * aFD = nsnull);
 
 #define DUMP_DOC_LIST(_title) DumpPrintObjectsListStart((_title), mPrt->mPrintDocList);
 #define DUMP_DOC_TREE DumpPrintObjectsTree(mPrt->mPrintObject);
@@ -430,7 +430,7 @@ static void RootFrameList(nsPresContext* aPresContext, FILE* out, PRInt32 aInden
 static void DumpViews(nsIDocShell* aDocShell, FILE* out);
 static void DumpLayoutData(char* aTitleStr, char* aURLStr,
                            nsPresContext* aPresContext,
-                           nsIDeviceContext * aDC, nsIFrame * aRootFrame,
+                           nsDeviceContext * aDC, nsIFrame * aRootFrame,
                            nsIDocShell * aDocShell, FILE* aFD);
 #endif
 
@@ -3567,7 +3567,7 @@ DumpViews(nsIDocShell* aDocShell, FILE* out)
 void DumpLayoutData(char*              aTitleStr,
                     char*              aURLStr,
                     nsPresContext*    aPresContext,
-                    nsIDeviceContext * aDC,
+                    nsDeviceContext * aDC,
                     nsIFrame *         aRootFrame,
                     nsIDocShekk *      aDocShell,
                     FILE*              aFD = nsnull)
@@ -3701,7 +3701,7 @@ static void GetDocTitleAndURL(nsPrintObject* aPO, char *& aDocStr, char *& aURLS
 
 //-------------------------------------------------------------
 static void DumpPrintObjectsTreeLayout(nsPrintObject * aPO,
-                                       nsIDeviceContext * aDC,
+                                       nsDeviceContext * aDC,
                                        int aLevel, FILE * aFD)
 {
   if (!kPrintingLogMod || kPrintingLogMod->level != DUMP_LAYOUT_LEVEL) return;
diff --git a/layout/printing/nsPrintEngine.h b/layout/printing/nsPrintEngine.h
index b54ec12493eb..0e2f92e78e77 100644
--- a/layout/printing/nsPrintEngine.h
+++ b/layout/printing/nsPrintEngine.h
@@ -50,7 +50,7 @@
 // Classes
 class nsPagePrintTimer;
 class nsIDocShellTreeNode;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsIDocumentViewerPrint;
 class nsPrintObject;
 class nsIDocShell;
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index e83b9893b421..1d2dc7d95f5e 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -111,7 +111,7 @@ GetHeight(nsPresContext* aPresContext, const nsMediaFeature*,
     return NS_OK;
 }
 
-inline static nsIDeviceContext*
+inline static nsDeviceContext*
 GetDeviceContextFor(nsPresContext* aPresContext)
 {
   // It would be nice to call
@@ -223,11 +223,11 @@ static nsresult
 GetColor(nsPresContext* aPresContext, const nsMediaFeature*,
          nsCSSValue& aResult)
 {
-    // FIXME:  This implementation is bogus.  nsThebesDeviceContext
+    // FIXME:  This implementation is bogus.  nsDeviceContext
     // doesn't provide reliable information (should be fixed in bug
     // 424386).
     // FIXME: On a monochrome device, return 0!
-    nsIDeviceContext *dx = GetDeviceContextFor(aPresContext);
+    nsDeviceContext *dx = GetDeviceContextFor(aPresContext);
     PRUint32 depth;
     dx->GetDepth(depth);
     // The spec says to use bits *per color component*, so divide by 3,
@@ -268,7 +268,7 @@ GetResolution(nsPresContext* aPresContext, const nsMediaFeature*,
               nsCSSValue& aResult)
 {
     // Resolution values are in device pixels, not CSS pixels.
-    nsIDeviceContext *dx = GetDeviceContextFor(aPresContext);
+    nsDeviceContext *dx = GetDeviceContextFor(aPresContext);
     float dpi = float(dx->AppUnitsPerPhysicalInch()) / float(dx->AppUnitsPerDevPixel());
     aResult.SetFloatValue(dpi, eCSSUnit_Inch);
     return NS_OK;
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 7737a0fd8bb0..540a8ef73c89 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -2654,7 +2654,7 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext,
     }
 
     // XXXldb All of this platform-specific stuff should be in the
-    // nsIDeviceContext implementations, not here.
+    // nsDeviceContext implementations, not here.
 
 #ifdef XP_WIN
     //
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index 281d15630f21..5bd4fee6a56d 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -177,7 +177,7 @@ protected:
   friend class CharacterIterator;
 
   // Use a power of 2 here. It's not so important to match
-  // nsIDeviceContext::AppUnitsPerDevPixel, but since we do a lot of
+  // nsDeviceContext::AppUnitsPerDevPixel, but since we do a lot of
   // multiplying by 1/GetTextRunUnitsFactor, it's good for it to be a
   // power of 2 to avoid accuracy loss.
   static PRUint32 GetTextRunUnitsFactor() { return 64; }
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index c0344788219b..36a56b468df6 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1465,7 +1465,7 @@ nsRenderingContext*
 nsSVGRenderState::GetRenderingContext(nsIFrame *aFrame)
 {
   if (!mRenderingContext) {
-    nsIDeviceContext* devCtx = aFrame->PresContext()->DeviceContext();
+    nsDeviceContext* devCtx = aFrame->PresContext()->DeviceContext();
     devCtx->CreateRenderingContextInstance(*getter_AddRefs(mRenderingContext));
     if (!mRenderingContext)
       return nsnull;
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 8128d443cbf9..e003fea79f2c 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1158,7 +1158,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, PRBool aIsMove)
   // the screen rectangle of the root frame, in dev pixels.
   nsRect rootScreenRect = rootFrame->GetScreenRectInAppUnits();
 
-  nsIDeviceContext* devContext = presContext->DeviceContext();
+  nsDeviceContext* devContext = presContext->DeviceContext();
   nscoord offsetForContextMenu = 0;
   // if mScreenXPos and mScreenYPos are -1, then we are anchored. If they
   // have other values, then the popup appears unanchored at that screen
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index bbb4d6a25315..965033c91fe6 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -622,7 +622,7 @@ void nsTextBoxFrame::PaintOneShadow(gfxContext*      aCtx,
 
   // Conjure an nsRenderingContext from a gfxContext for DrawText
   nsRefPtr<nsRenderingContext> renderingContext = nsnull;
-  nsIDeviceContext* devCtx = PresContext()->DeviceContext();
+  nsDeviceContext* devCtx = PresContext()->DeviceContext();
   devCtx->CreateRenderingContextInstance(*getter_AddRefs(renderingContext));
   if (!renderingContext)
     return;
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 6c6885817f06..423b655be145 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -3751,8 +3751,8 @@ nsTreeBodyFrame::PaintProgressMeter(PRInt32              aRowIndex,
       PRInt32 width, height;
       image->GetWidth(&width);
       image->GetHeight(&height);
-      nsSize size(width*nsIDeviceContext::AppUnitsPerCSSPixel(),
-                  height*nsIDeviceContext::AppUnitsPerCSSPixel());
+      nsSize size(width*nsDeviceContext::AppUnitsPerCSSPixel(),
+                  height*nsDeviceContext::AppUnitsPerCSSPixel());
       nsLayoutUtils::DrawImage(&aRenderingContext, image,
           nsLayoutUtils::GetGraphicsFilterForFrame(this),
           nsRect(meterRect.TopLeft(), size), meterRect, meterRect.TopLeft(),
@@ -3772,8 +3772,8 @@ nsTreeBodyFrame::PaintProgressMeter(PRInt32              aRowIndex,
       PRInt32 width, height;
       image->GetWidth(&width);
       image->GetHeight(&height);
-      nsSize size(width*nsIDeviceContext::AppUnitsPerCSSPixel(),
-                  height*nsIDeviceContext::AppUnitsPerCSSPixel());
+      nsSize size(width*nsDeviceContext::AppUnitsPerCSSPixel(),
+                  height*nsDeviceContext::AppUnitsPerCSSPixel());
       nsLayoutUtils::DrawImage(&aRenderingContext, image,
           nsLayoutUtils::GetGraphicsFilterForFrame(this),
           nsRect(meterRect.TopLeft(), size), meterRect, meterRect.TopLeft(),
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 934fc00c5e01..c052712fd15e 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -45,7 +45,7 @@
 class nsIWidget;
 struct nsRect;
 class nsRegion;
-class nsIDeviceContext;
+class nsDeviceContext;
 class nsIViewObserver;
 
 #define NS_IVIEWMANAGER_IID \
@@ -63,7 +63,7 @@ public:
    * because it holds a reference to this instance.
    * @result The result of the initialization, NS_OK if no errors
    */
-  NS_IMETHOD  Init(nsIDeviceContext* aContext) = 0;
+  NS_IMETHOD  Init(nsDeviceContext* aContext) = 0;
 
   /**
    * Create an ordinary view
@@ -275,7 +275,7 @@ public:
    * Get the device context associated with this manager
    * @result device context
    */
-  NS_IMETHOD  GetDeviceContext(nsIDeviceContext *&aContext) = 0;
+  NS_IMETHOD  GetDeviceContext(nsDeviceContext *&aContext) = 0;
 
   class UpdateViewBatch {
   public:
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 7b464794699b..acab84334fab 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -735,7 +735,7 @@ nsresult nsView::CreateWidget(nsWidgetInitData *aWidgetInitData,
 
   nsIntRect trect = CalcWidgetBounds(aWidgetInitData->mWindowType);
 
-  nsCOMPtr<nsIDeviceContext> dx;
+  nsRefPtr<nsDeviceContext> dx;
   mViewManager->GetDeviceContext(*getter_AddRefs(dx));
 
   nsIWidget* parentWidget =
@@ -775,7 +775,7 @@ nsresult nsView::CreateWidgetForParent(nsIWidget* aParentWidget,
 
   nsIntRect trect = CalcWidgetBounds(aWidgetInitData->mWindowType);
 
-  nsCOMPtr<nsIDeviceContext> dx;
+  nsRefPtr<nsDeviceContext> dx;
   mViewManager->GetDeviceContext(*getter_AddRefs(dx));
 
   mWindow =
@@ -802,7 +802,7 @@ nsresult nsView::CreateWidgetForPopup(nsWidgetInitData *aWidgetInitData,
 
   nsIntRect trect = CalcWidgetBounds(aWidgetInitData->mWindowType);
 
-  nsCOMPtr<nsIDeviceContext> dx;
+  nsRefPtr<nsDeviceContext> dx;
   mViewManager->GetDeviceContext(*getter_AddRefs(dx));
 
   // XXX/cjones: having these two separate creation cases seems ... um
@@ -872,7 +872,7 @@ nsresult nsIView::AttachToTopLevelWidget(nsIWidget* aWidget)
     oldView->DetachFromTopLevelWidget();
   }
 
-  nsCOMPtr<nsIDeviceContext> dx;
+  nsRefPtr<nsDeviceContext> dx;
   mViewManager->GetDeviceContext(*getter_AddRefs(dx));
 
   // Note, the previous device context will be released. Detaching
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 74288c1cb71b..837264d48c22 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -211,7 +211,7 @@ nsViewManager::CreateRegion(nsIRegion* *result)
 
 // We don't hold a reference to the presentation context because it
 // holds a reference to us.
-NS_IMETHODIMP nsViewManager::Init(nsIDeviceContext* aContext)
+NS_IMETHODIMP nsViewManager::Init(nsDeviceContext* aContext)
 {
   NS_PRECONDITION(nsnull != aContext, "null ptr");
 
@@ -1521,7 +1521,7 @@ NS_IMETHODIMP nsViewManager::GetViewObserver(nsIViewObserver *&aObserver)
     return NS_ERROR_NO_INTERFACE;
 }
 
-NS_IMETHODIMP nsViewManager::GetDeviceContext(nsIDeviceContext *&aContext)
+NS_IMETHODIMP nsViewManager::GetDeviceContext(nsDeviceContext *&aContext)
 {
   NS_IF_ADDREF(mContext);
   aContext = mContext;
diff --git a/view/src/nsViewManager.h b/view/src/nsViewManager.h
index e0681fd24577..bf1d586288ba 100644
--- a/view/src/nsViewManager.h
+++ b/view/src/nsViewManager.h
@@ -48,7 +48,7 @@
 #include "nsIRegion.h"
 #include "nsView.h"
 #include "nsIViewObserver.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 
 
 /**
@@ -100,7 +100,7 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD  Init(nsIDeviceContext* aContext);
+  NS_IMETHOD  Init(nsDeviceContext* aContext);
 
   NS_IMETHOD_(nsIView*) CreateView(const nsRect& aBounds,
                                    const nsIView* aParent,
@@ -144,7 +144,7 @@ public:
   NS_IMETHOD  SetViewObserver(nsIViewObserver *aObserver);
   NS_IMETHOD  GetViewObserver(nsIViewObserver *&aObserver);
 
-  NS_IMETHOD  GetDeviceContext(nsIDeviceContext *&aContext);
+  NS_IMETHOD  GetDeviceContext(nsDeviceContext *&aContext);
 
   virtual nsIViewManager* BeginUpdateViewBatch(void);
   NS_IMETHOD  EndUpdateViewBatch(PRUint32 aUpdateFlags);
@@ -275,7 +275,7 @@ public: // NOT in nsIViewManager, so private to the view module
   }
 
 private:
-  nsCOMPtr<nsIDeviceContext> mContext;
+  nsRefPtr<nsDeviceContext> mContext;
   nsIViewObserver   *mObserver;
   // relative to mRootView and set only on the root view manager
   nsPoint           mMouseLocation;
diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h
index d1ba2af10974..f1d38b881993 100644
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -60,7 +60,7 @@ class   nsIAppShell;
 class   nsIToolkit;
 class   nsFontMetrics;
 class   nsRenderingContext;
-class   nsIDeviceContext;
+class   nsDeviceContext;
 struct  nsFont;
 class   nsIRollupListener;
 class   nsIMenuRollup;
@@ -307,7 +307,7 @@ class nsIWidget : public nsISupports {
                       nsNativeWidget   aNativeParent,
                       const nsIntRect  &aRect,
                       EVENT_CALLBACK   aHandleEventFunction,
-                      nsIDeviceContext *aContext,
+                      nsDeviceContext *aContext,
                       nsIAppShell      *aAppShell = nsnull,
                       nsIToolkit       *aToolkit = nsnull,
                       nsWidgetInitData *aInitData = nsnull) = 0;
@@ -331,7 +331,7 @@ class nsIWidget : public nsISupports {
     virtual already_AddRefed<nsIWidget>
     CreateChild(const nsIntRect  &aRect,
                 EVENT_CALLBACK   aHandleEventFunction,
-                nsIDeviceContext *aContext,
+                nsDeviceContext *aContext,
                 nsIAppShell      *aAppShell = nsnull,
                 nsIToolkit       *aToolkit = nsnull,
                 nsWidgetInitData *aInitData = nsnull,
@@ -350,7 +350,7 @@ class nsIWidget : public nsISupports {
      * aContext The new device context for the view
      */
     NS_IMETHOD AttachViewToTopLevel(EVENT_CALLBACK aViewEventFunction,
-                                    nsIDeviceContext *aContext) = 0;
+                                    nsDeviceContext *aContext) = 0;
 
     /**
      * Accessor functions to get and set secondary client data. Used by
@@ -936,7 +936,7 @@ class nsIWidget : public nsISupports {
     virtual void FreeNativeData(void * data, PRUint32 aDataType) = 0;//~~~
 
     // GetDeviceContext returns a weak pointer to this widget's device context
-    virtual nsIDeviceContext* GetDeviceContext() = 0;
+    virtual nsDeviceContext* GetDeviceContext() = 0;
 
     //@}
 
diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index 1a8956832155..331f641dca56 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -197,7 +197,7 @@ nsWindow::Create(nsIWidget *aParent,
                  nsNativeWidget aNativeParent,
                  const nsIntRect &aRect,
                  EVENT_CALLBACK aHandleEventFunction,
-                 nsIDeviceContext *aContext,
+                 nsDeviceContext *aContext,
                  nsIAppShell *aAppShell,
                  nsIToolkit *aToolkit,
                  nsWidgetInitData *aInitData)
diff --git a/widget/src/android/nsWindow.h b/widget/src/android/nsWindow.h
index 5ed517cbcbe0..d392e8d54339 100644
--- a/widget/src/android/nsWindow.h
+++ b/widget/src/android/nsWindow.h
@@ -86,7 +86,7 @@ public:
                       nsNativeWidget aNativeParent,
                       const nsIntRect &aRect,
                       EVENT_CALLBACK aHandleEventFunction,
-                      nsIDeviceContext *aContext,
+                      nsDeviceContext *aContext,
                       nsIAppShell *aAppShell,
                       nsIToolkit *aToolkit,
                       nsWidgetInitData *aInitData);
diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 4e457b196161..08a338cabe83 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -308,7 +308,7 @@ public:
                                  nsNativeWidget aNativeParent,
                                  const nsIntRect &aRect,
                                  EVENT_CALLBACK aHandleEventFunction,
-                                 nsIDeviceContext *aContext,
+                                 nsDeviceContext *aContext,
                                  nsIAppShell *aAppShell = nsnull,
                                  nsIToolkit *aToolkit = nsnull,
                                  nsWidgetInitData *aInitData = nsnull);
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index a43c8dad2f79..a22ed144bf16 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -534,7 +534,7 @@ nsresult nsChildView::Create(nsIWidget *aParent,
                              nsNativeWidget aNativeParent,
                              const nsIntRect &aRect,
                              EVENT_CALLBACK aHandleEventFunction,
-                             nsIDeviceContext *aContext,
+                             nsDeviceContext *aContext,
                              nsIAppShell *aAppShell,
                              nsIToolkit *aToolkit,
                              nsWidgetInitData *aInitData)
diff --git a/widget/src/cocoa/nsCocoaWindow.h b/widget/src/cocoa/nsCocoaWindow.h
index bca5f1a91b6f..1b50c1fa2cbd 100644
--- a/widget/src/cocoa/nsCocoaWindow.h
+++ b/widget/src/cocoa/nsCocoaWindow.h
@@ -214,7 +214,7 @@ public:
                                    nsNativeWidget aNativeParent,
                                    const nsIntRect &aRect,
                                    EVENT_CALLBACK aHandleEventFunction,
-                                   nsIDeviceContext *aContext,
+                                   nsDeviceContext *aContext,
                                    nsIAppShell *aAppShell = nsnull,
                                    nsIToolkit *aToolkit = nsnull,
                                    nsWidgetInitData *aInitData = nsnull);
@@ -308,7 +308,7 @@ protected:
                                           PRBool aRectIsFrameRect);
   nsresult             CreatePopupContentView(const nsIntRect &aRect,
                                               EVENT_CALLBACK aHandleEventFunction,
-                                              nsIDeviceContext *aContext,
+                                              nsDeviceContext *aContext,
                                               nsIAppShell *aAppShell,
                                               nsIToolkit *aToolkit);
   void                 DestroyNativeWindow();
diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm
index 8537c8c69de3..4cdf91821d63 100644
--- a/widget/src/cocoa/nsCocoaWindow.mm
+++ b/widget/src/cocoa/nsCocoaWindow.mm
@@ -240,7 +240,7 @@ nsresult nsCocoaWindow::Create(nsIWidget *aParent,
                                nsNativeWidget aNativeParent,
                                const nsIntRect &aRect,
                                EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext *aContext,
+                               nsDeviceContext *aContext,
                                nsIAppShell *aAppShell,
                                nsIToolkit *aToolkit,
                                nsWidgetInitData *aInitData)
@@ -448,7 +448,7 @@ nsresult nsCocoaWindow::CreateNativeWindow(const NSRect &aRect,
 
 NS_IMETHODIMP nsCocoaWindow::CreatePopupContentView(const nsIntRect &aRect,
                              EVENT_CALLBACK aHandleEventFunction,
-                             nsIDeviceContext *aContext,
+                             nsDeviceContext *aContext,
                              nsIAppShell *aAppShell,
                              nsIToolkit *aToolkit)
 {
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.h b/widget/src/cocoa/nsNativeThemeCocoa.h
index 80381d347c77..79403605151c 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.h
+++ b/widget/src/cocoa/nsNativeThemeCocoa.h
@@ -49,7 +49,7 @@
 #include "gfxASurface.h"
 
 @class CellDrawView;
-class nsIDeviceContext;
+class nsDeviceContext;
 
 class nsNativeThemeCocoa : private nsNativeTheme,
                            public nsITheme
@@ -66,17 +66,17 @@ public:
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
                                   const nsRect& aDirtyRect);
-  NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext, 
+  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, 
                              nsIFrame* aFrame,
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
 
-  virtual PRBool GetWidgetPadding(nsIDeviceContext* aContext,
+  virtual PRBool GetWidgetPadding(nsDeviceContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntMargin* aResult);
 
-  virtual PRBool GetWidgetOverflow(nsIDeviceContext* aContext, nsIFrame* aFrame,
+  virtual PRBool GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
                                    PRUint8 aWidgetType, nsRect* aOverflowRect);
 
   NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index 3a52ff8392f1..c4fd03d2ff58 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -1952,7 +1952,7 @@ static const nsIntMargin kAquaComboboxBorder(4, 3, 20, 3);
 static const nsIntMargin kAquaSearchfieldBorder(19, 3, 5, 2);
 
 NS_IMETHODIMP
-nsNativeThemeCocoa::GetWidgetBorder(nsIDeviceContext* aContext, 
+nsNativeThemeCocoa::GetWidgetBorder(nsDeviceContext* aContext, 
                                     nsIFrame* aFrame,
                                     PRUint8 aWidgetType,
                                     nsIntMargin* aResult)
@@ -2059,7 +2059,7 @@ nsNativeThemeCocoa::GetWidgetBorder(nsIDeviceContext* aContext,
 // whatever values you want in GetWidgetBorder and only use this to return PR_TRUE
 // if you want to override CSS padding values.
 PRBool
-nsNativeThemeCocoa::GetWidgetPadding(nsIDeviceContext* aContext, 
+nsNativeThemeCocoa::GetWidgetPadding(nsDeviceContext* aContext, 
                                      nsIFrame* aFrame,
                                      PRUint8 aWidgetType,
                                      nsIntMargin* aResult)
@@ -2080,7 +2080,7 @@ nsNativeThemeCocoa::GetWidgetPadding(nsIDeviceContext* aContext,
 }
 
 PRBool
-nsNativeThemeCocoa::GetWidgetOverflow(nsIDeviceContext* aContext, nsIFrame* aFrame,
+nsNativeThemeCocoa::GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
                                       PRUint8 aWidgetType, nsRect* aOverflowRect)
 {
   switch (aWidgetType) {
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 8e5d9a111522..456f401bc92b 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -878,7 +878,7 @@ nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
 }
 
 NS_IMETHODIMP
-nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
+nsNativeThemeGTK::GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame,
                                   PRUint8 aWidgetType, nsIntMargin* aResult)
 {
   GtkTextDirection direction = GetTextDirection(aFrame);
@@ -929,7 +929,7 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
 }
 
 PRBool
-nsNativeThemeGTK::GetWidgetPadding(nsIDeviceContext* aContext,
+nsNativeThemeGTK::GetWidgetPadding(nsDeviceContext* aContext,
                                    nsIFrame* aFrame, PRUint8 aWidgetType,
                                    nsIntMargin* aResult)
 {
@@ -958,7 +958,7 @@ nsNativeThemeGTK::GetWidgetPadding(nsIDeviceContext* aContext,
 }
 
 PRBool
-nsNativeThemeGTK::GetWidgetOverflow(nsIDeviceContext* aContext,
+nsNativeThemeGTK::GetWidgetOverflow(nsDeviceContext* aContext,
                                     nsIFrame* aFrame, PRUint8 aWidgetType,
                                     nsRect* aOverflowRect)
 {
diff --git a/widget/src/gtk2/nsNativeThemeGTK.h b/widget/src/gtk2/nsNativeThemeGTK.h
index 3ecd5208ec80..2a3f2b5aca3a 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.h
+++ b/widget/src/gtk2/nsNativeThemeGTK.h
@@ -59,15 +59,15 @@ public:
                                   const nsRect& aRect,
                                   const nsRect& aDirtyRect);
 
-  NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
+  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame,
                              PRUint8 aWidgetType, nsIntMargin* aResult);
 
-  virtual NS_HIDDEN_(PRBool) GetWidgetPadding(nsIDeviceContext* aContext,
+  virtual NS_HIDDEN_(PRBool) GetWidgetPadding(nsDeviceContext* aContext,
                                               nsIFrame* aFrame,
                                               PRUint8 aWidgetType,
                                               nsIntMargin* aResult);
 
-  virtual NS_HIDDEN_(PRBool) GetWidgetOverflow(nsIDeviceContext* aContext,
+  virtual NS_HIDDEN_(PRBool) GetWidgetOverflow(nsDeviceContext* aContext,
                                                nsIFrame* aFrame,
                                                PRUint8 aWidgetType,
                                                nsRect* aOverflowRect);
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index cdf34ddeabda..fa41cc28bbdb 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -3822,7 +3822,7 @@ nsWindow::Create(nsIWidget        *aParent,
                  nsNativeWidget    aNativeParent,
                  const nsIntRect  &aRect,
                  EVENT_CALLBACK    aHandleEventFunction,
-                 nsIDeviceContext *aContext,
+                 nsDeviceContext *aContext,
                  nsIAppShell      *aAppShell,
                  nsIToolkit       *aToolkit,
                  nsWidgetInitData *aInitData)
diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h
index 88973025a3ce..3d8f1cbefc05 100644
--- a/widget/src/gtk2/nsWindow.h
+++ b/widget/src/gtk2/nsWindow.h
@@ -137,7 +137,7 @@ public:
                               nsNativeWidget   aNativeParent,
                               const nsIntRect  &aRect,
                               EVENT_CALLBACK   aHandleEventFunction,
-                              nsIDeviceContext *aContext,
+                              nsDeviceContext *aContext,
                               nsIAppShell      *aAppShell,
                               nsIToolkit       *aToolkit,
                               nsWidgetInitData *aInitData);
diff --git a/widget/src/os2/nsGfxDefs.h b/widget/src/os2/nsGfxDefs.h
index 592963238483..0291a9832b0f 100644
--- a/widget/src/os2/nsGfxDefs.h
+++ b/widget/src/os2/nsGfxDefs.h
@@ -52,7 +52,7 @@
 #include <uconv.h> // XXX hack XXX
 
 class nsString;
-class nsIDeviceContext;
+class nsDeviceContext;
 
 #ifndef min
 #define min(a,b) (((a) < (b)) ? (a) : (b))
diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index 51d3e17a8e99..f78ff92b496c 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -338,7 +338,7 @@ NS_METHOD nsWindow::Create(nsIWidget* aParent,
                            nsNativeWidget aNativeParent,
                            const nsIntRect& aRect,
                            EVENT_CALLBACK aHandleEventFunction,
-                           nsIDeviceContext* aContext,
+                           nsDeviceContext* aContext,
                            nsIAppShell* aAppShell,
                            nsIToolkit* aToolkit,
                            nsWidgetInitData* aInitData)
diff --git a/widget/src/os2/nsWindow.h b/widget/src/os2/nsWindow.h
index de50aac8dd44..eafdc529c6d7 100644
--- a/widget/src/os2/nsWindow.h
+++ b/widget/src/os2/nsWindow.h
@@ -165,7 +165,7 @@ public:
                                nsNativeWidget aNativeParent,
                                const nsIntRect& aRect,
                                EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext* aContext,
+                               nsDeviceContext* aContext,
                                nsIAppShell* aAppShell = nsnull,
                                nsIToolkit* aToolkit = nsnull,
                                nsWidgetInitData* aInitData = nsnull);
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 95a6e82c5807..894232fcde87 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -346,7 +346,7 @@ nsNativeThemeQt::DrawWidgetBackground(QPainter *qPainter,
 }
 
 NS_IMETHODIMP
-nsNativeThemeQt::GetWidgetBorder(nsIDeviceContext* ,
+nsNativeThemeQt::GetWidgetBorder(nsDeviceContext* ,
                                  nsIFrame* aFrame,
                                  PRUint8 aWidgetType,
                                  nsIntMargin* aResult)
@@ -369,7 +369,7 @@ nsNativeThemeQt::GetWidgetBorder(nsIDeviceContext* ,
 }
 
 PRBool
-nsNativeThemeQt::GetWidgetPadding(nsIDeviceContext* ,
+nsNativeThemeQt::GetWidgetPadding(nsDeviceContext* ,
                                   nsIFrame*, PRUint8 aWidgetType,
                                   nsIntMargin* aResult)
 {
diff --git a/widget/src/qt/nsNativeThemeQt.h b/widget/src/qt/nsNativeThemeQt.h
index 2be3fe9136a5..ebe12be5302f 100644
--- a/widget/src/qt/nsNativeThemeQt.h
+++ b/widget/src/qt/nsNativeThemeQt.h
@@ -53,7 +53,7 @@ class QStyleOptionFrameV2;
 class QStyleOptionComboBox;
 class QRect;
 class nsIFrame;
-class nsIDeviceContext;
+class nsDeviceContext;
 
 class nsNativeThemeQt : private nsNativeTheme,
                         public nsITheme
@@ -68,7 +68,7 @@ public:
                                   const nsRect& aRect,
                                   const nsRect& aClipRect);
 
-  NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext,
+  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext,
                              nsIFrame* aFrame,
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
@@ -89,7 +89,7 @@ public:
 
   PRBool WidgetIsContainer(PRUint8 aWidgetType);
 
-  virtual NS_HIDDEN_(PRBool) GetWidgetPadding(nsIDeviceContext* aContext,
+  virtual NS_HIDDEN_(PRBool) GetWidgetPadding(nsDeviceContext* aContext,
                                               nsIFrame* aFrame,
                                               PRUint8 aWidgetType,
                                               nsIntMargin* aResult);
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index 0791bb37e115..4d3261957f86 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -2182,7 +2182,7 @@ nsWindow::Create(nsIWidget        *aParent,
                  nsNativeWidget    aNativeParent,
                  const nsIntRect  &aRect,
                  EVENT_CALLBACK    aHandleEventFunction,
-                 nsIDeviceContext *aContext,
+                 nsDeviceContext *aContext,
                  nsIAppShell      *aAppShell,
                  nsIToolkit       *aToolkit,
                  nsWidgetInitData *aInitData)
@@ -2240,7 +2240,7 @@ nsWindow::Create(nsIWidget        *aParent,
 already_AddRefed<nsIWidget>
 nsWindow::CreateChild(const nsIntRect&  aRect,
                       EVENT_CALLBACK    aHandleEventFunction,
-                      nsIDeviceContext* aContext,
+                      nsDeviceContext* aContext,
                       nsIAppShell*      aAppShell,
                       nsIToolkit*       aToolkit,
                       nsWidgetInitData* aInitData,
diff --git a/widget/src/qt/nsWindow.h b/widget/src/qt/nsWindow.h
index 2f94164503ed..0ac5f2aef375 100644
--- a/widget/src/qt/nsWindow.h
+++ b/widget/src/qt/nsWindow.h
@@ -127,7 +127,7 @@ public:
                               nsNativeWidget   aNativeParent,
                               const nsIntRect  &aRect,
                               EVENT_CALLBACK   aHandleEventFunction,
-                              nsIDeviceContext *aContext,
+                              nsDeviceContext *aContext,
                               nsIAppShell      *aAppShell,
                               nsIToolkit       *aToolkit,
                               nsWidgetInitData *aInitData);
@@ -135,7 +135,7 @@ public:
     virtual already_AddRefed<nsIWidget>
     CreateChild(const nsIntRect&  aRect,
                 EVENT_CALLBACK    aHandleEventFunction,
-                nsIDeviceContext* aContext,
+                nsDeviceContext* aContext,
                 nsIAppShell*      aAppShell = nsnull,
                 nsIToolkit*       aToolkit = nsnull,
                 nsWidgetInitData* aInitData = nsnull,
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 546bef6e5d7f..936a4f9d54d0 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1584,7 +1584,7 @@ RENDER_AGAIN:
 }
 
 NS_IMETHODIMP
-nsNativeThemeWin::GetWidgetBorder(nsIDeviceContext* aContext, 
+nsNativeThemeWin::GetWidgetBorder(nsDeviceContext* aContext, 
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntMargin* aResult)
@@ -1671,7 +1671,7 @@ nsNativeThemeWin::GetWidgetBorder(nsIDeviceContext* aContext,
 }
 
 PRBool
-nsNativeThemeWin::GetWidgetPadding(nsIDeviceContext* aContext, 
+nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext, 
                                    nsIFrame* aFrame,
                                    PRUint8 aWidgetType,
                                    nsIntMargin* aResult)
@@ -1808,7 +1808,7 @@ nsNativeThemeWin::GetWidgetPadding(nsIDeviceContext* aContext,
 }
 
 PRBool
-nsNativeThemeWin::GetWidgetOverflow(nsIDeviceContext* aContext, 
+nsNativeThemeWin::GetWidgetOverflow(nsDeviceContext* aContext, 
                                     nsIFrame* aFrame,
                                     PRUint8 aOverflowRect,
                                     nsRect* aResult)
@@ -2346,7 +2346,7 @@ nsNativeThemeWin::ClassicThemeSupportsWidget(nsPresContext* aPresContext,
 }
 
 nsresult
-nsNativeThemeWin::ClassicGetWidgetBorder(nsIDeviceContext* aContext, 
+nsNativeThemeWin::ClassicGetWidgetBorder(nsDeviceContext* aContext, 
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntMargin* aResult)
diff --git a/widget/src/windows/nsNativeThemeWin.h b/widget/src/windows/nsNativeThemeWin.h
index 916f06484e71..2c26cb4bc047 100644
--- a/widget/src/windows/nsNativeThemeWin.h
+++ b/widget/src/windows/nsNativeThemeWin.h
@@ -58,17 +58,17 @@ public:
                                   const nsRect& aRect,
                                   const nsRect& aDirtyRect);
 
-  NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext, 
+  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, 
                              nsIFrame* aFrame,
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
 
-  virtual PRBool GetWidgetPadding(nsIDeviceContext* aContext,
+  virtual PRBool GetWidgetPadding(nsDeviceContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntMargin* aResult);
 
-  virtual PRBool GetWidgetOverflow(nsIDeviceContext* aContext,
+  virtual PRBool GetWidgetOverflow(nsDeviceContext* aContext,
                                    nsIFrame* aFrame,
                                    PRUint8 aWidgetType,
                                    nsRect* aOverflowRect);
@@ -109,7 +109,7 @@ protected:
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
                                   const nsRect& aClipRect);
-  nsresult ClassicGetWidgetBorder(nsIDeviceContext* aContext, 
+  nsresult ClassicGetWidgetBorder(nsDeviceContext* aContext, 
                              nsIFrame* aFrame,
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index bdf7c5a82e9b..8953adb17be7 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -549,7 +549,7 @@ nsWindow::Create(nsIWidget *aParent,
                  nsNativeWidget aNativeParent,
                  const nsIntRect &aRect,
                  EVENT_CALLBACK aHandleEventFunction,
-                 nsIDeviceContext *aContext,
+                 nsDeviceContext *aContext,
                  nsIAppShell *aAppShell,
                  nsIToolkit *aToolkit,
                  nsWidgetInitData *aInitData)
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index cb583112e4e1..d145343d0cc9 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -118,7 +118,7 @@ public:
                                  nsNativeWidget aNativeParent,
                                  const nsIntRect &aRect,
                                  EVENT_CALLBACK aHandleEventFunction,
-                                 nsIDeviceContext *aContext,
+                                 nsDeviceContext *aContext,
                                  nsIAppShell *aAppShell = nsnull,
                                  nsIToolkit *aToolkit = nsnull,
                                  nsWidgetInitData *aInitData = nsnull);
diff --git a/widget/src/xpwidgets/PuppetWidget.cpp b/widget/src/xpwidgets/PuppetWidget.cpp
index 89f8cdfbbbe1..e1d6acadefae 100644
--- a/widget/src/xpwidgets/PuppetWidget.cpp
+++ b/widget/src/xpwidgets/PuppetWidget.cpp
@@ -108,7 +108,7 @@ PuppetWidget::Create(nsIWidget        *aParent,
                      nsNativeWidget   aNativeParent,
                      const nsIntRect  &aRect,
                      EVENT_CALLBACK   aHandleEventFunction,
-                     nsIDeviceContext *aContext,
+                     nsDeviceContext *aContext,
                      nsIAppShell      *aAppShell,
                      nsIToolkit       *aToolkit,
                      nsWidgetInitData *aInitData)
@@ -148,7 +148,7 @@ PuppetWidget::Create(nsIWidget        *aParent,
 already_AddRefed<nsIWidget>
 PuppetWidget::CreateChild(const nsIntRect  &aRect,
                           EVENT_CALLBACK   aHandleEventFunction,
-                          nsIDeviceContext *aContext,
+                          nsDeviceContext *aContext,
                           nsIAppShell      *aAppShell,
                           nsIToolkit       *aToolkit,
                           nsWidgetInitData *aInitData,
diff --git a/widget/src/xpwidgets/PuppetWidget.h b/widget/src/xpwidgets/PuppetWidget.h
index 307e3709e316..eb2b24308a6f 100644
--- a/widget/src/xpwidgets/PuppetWidget.h
+++ b/widget/src/xpwidgets/PuppetWidget.h
@@ -74,7 +74,7 @@ public:
                     nsNativeWidget    aNativeParent,
                     const nsIntRect&  aRect,
                     EVENT_CALLBACK    aHandleEventFunction,
-                    nsIDeviceContext* aContext,
+                    nsDeviceContext* aContext,
                     nsIAppShell*      aAppShell = nsnull,
                     nsIToolkit*       aToolkit = nsnull,
                     nsWidgetInitData* aInitData = nsnull);
@@ -82,7 +82,7 @@ public:
   virtual already_AddRefed<nsIWidget>
   CreateChild(const nsIntRect  &aRect,
               EVENT_CALLBACK   aHandleEventFunction,
-              nsIDeviceContext *aContext,
+              nsDeviceContext *aContext,
               nsIAppShell      *aAppShell = nsnull,
               nsIToolkit       *aToolkit = nsnull,
               nsWidgetInitData *aInitData = nsnull,
@@ -166,7 +166,7 @@ public:
 //NS_IMETHOD              CaptureMouse(PRBool aCapture);
   virtual LayerManager*     GetLayerManager(LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                             bool* aAllowRetaining = nsnull);
-//  virtual nsIDeviceContext* GetDeviceContext();
+//  virtual nsDeviceContext* GetDeviceContext();
   virtual gfxASurface*      GetThebesSurface();
 
   NS_IMETHOD ResetInputState();
diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp
index 3d0fcaf60f6c..f3e413686922 100644
--- a/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -588,7 +588,7 @@ nsBaseDragService::DrawDragForImage(nsPresContext* aPresContext,
 
   // if the image is larger than half the screen size, scale it down. This
   // scaling algorithm is the same as is used in nsPresShell::PaintRangePaintInfo
-  nsIDeviceContext* deviceContext = aPresContext->DeviceContext();
+  nsDeviceContext* deviceContext = aPresContext->DeviceContext();
   nsRect maxSize;
   deviceContext->GetClientRect(maxSize);
   nscoord maxWidth = aPresContext->AppUnitsToDevPixels(maxSize.width >> 1);
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index bf4b1eb3d026..e66c7b037080 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsBaseWidget.h"
-#include "nsIDeviceContext.h"
+#include "nsDeviceContext.h"
 #include "nsCOMPtr.h"
 #include "nsGfxCIID.h"
 #include "nsWidgetsCID.h"
@@ -163,7 +163,7 @@ nsBaseWidget::~nsBaseWidget()
 void nsBaseWidget::BaseCreate(nsIWidget *aParent,
                               const nsIntRect &aRect,
                               EVENT_CALLBACK aHandleEventFunction,
-                              nsIDeviceContext *aContext,
+                              nsDeviceContext *aContext,
                               nsIAppShell *aAppShell,
                               nsIToolkit *aToolkit,
                               nsWidgetInitData *aInitData)
@@ -252,7 +252,7 @@ NS_IMETHODIMP nsBaseWidget::SetClientData(void* aClientData)
 already_AddRefed<nsIWidget>
 nsBaseWidget::CreateChild(const nsIntRect  &aRect,
                           EVENT_CALLBACK   aHandleEventFunction,
-                          nsIDeviceContext *aContext,
+                          nsDeviceContext *aContext,
                           nsIAppShell      *aAppShell,
                           nsIToolkit       *aToolkit,
                           nsWidgetInitData *aInitData,
@@ -292,7 +292,7 @@ nsBaseWidget::CreateChild(const nsIntRect  &aRect,
 // Attach a view to our widget which we'll send events to. 
 NS_IMETHODIMP
 nsBaseWidget::AttachViewToTopLevel(EVENT_CALLBACK aViewEventFunction,
-                                   nsIDeviceContext *aContext)
+                                   nsDeviceContext *aContext)
 {
   NS_ASSERTION((mWindowType == eWindowType_toplevel ||
                 mWindowType == eWindowType_dialog ||
@@ -915,7 +915,7 @@ nsIToolkit* nsBaseWidget::GetToolkit()
 // Return the used device context
 //
 //-------------------------------------------------------------------------
-nsIDeviceContext* nsBaseWidget::GetDeviceContext() 
+nsDeviceContext* nsBaseWidget::GetDeviceContext() 
 {
   return mContext; 
 }
diff --git a/widget/src/xpwidgets/nsBaseWidget.h b/widget/src/xpwidgets/nsBaseWidget.h
index b07492b6a828..65b1a2839c5a 100644
--- a/widget/src/xpwidgets/nsBaseWidget.h
+++ b/widget/src/xpwidgets/nsBaseWidget.h
@@ -113,7 +113,7 @@ public:
   virtual void            SetShowsToolbarButton(PRBool aShow) {}
   NS_IMETHOD              HideWindowChrome(PRBool aShouldHide);
   NS_IMETHOD              MakeFullScreen(PRBool aFullScreen);
-  virtual nsIDeviceContext* GetDeviceContext();
+  virtual nsDeviceContext* GetDeviceContext();
   virtual nsIToolkit*     GetToolkit();
   virtual LayerManager*   GetLayerManager(LayerManagerPersistence aPersistence,
                                           bool* aAllowRetaining = nsnull);
@@ -164,12 +164,12 @@ public:
   virtual already_AddRefed<nsIWidget>
   CreateChild(const nsIntRect  &aRect,
               EVENT_CALLBACK   aHandleEventFunction,
-              nsIDeviceContext *aContext,
+              nsDeviceContext *aContext,
               nsIAppShell      *aAppShell = nsnull,
               nsIToolkit       *aToolkit = nsnull,
               nsWidgetInitData *aInitData = nsnull,
               PRBool           aForceUseIWidgetParent = PR_FALSE);
-  NS_IMETHOD              AttachViewToTopLevel(EVENT_CALLBACK aViewEventFunction, nsIDeviceContext *aContext);
+  NS_IMETHOD              AttachViewToTopLevel(EVENT_CALLBACK aViewEventFunction, nsDeviceContext *aContext);
   virtual ViewWrapper*    GetAttachedViewPtr();
   NS_IMETHOD              SetAttachedViewPtr(ViewWrapper* aViewWrapper);
   NS_IMETHOD              ResizeClient(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
@@ -227,7 +227,7 @@ protected:
   virtual void            BaseCreate(nsIWidget *aParent,
                                      const nsIntRect &aRect,
                                      EVENT_CALLBACK aHandleEventFunction,
-                                     nsIDeviceContext *aContext,
+                                     nsDeviceContext *aContext,
                                      nsIAppShell *aAppShell,
                                      nsIToolkit *aToolkit,
                                      nsWidgetInitData *aInitData);
@@ -268,7 +268,7 @@ protected:
   ViewWrapper*      mViewWrapperPtr;
   EVENT_CALLBACK    mEventCallback;
   EVENT_CALLBACK    mViewCallback;
-  nsIDeviceContext* mContext;
+  nsDeviceContext* mContext;
   nsIToolkit*       mToolkit;
   nsRefPtr<LayerManager> mLayerManager;
   nsRefPtr<LayerManager> mBasicLayerManager;

From 5f5acf8da6d256ce401d1f90363f912dc0631aa0 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 18:22:44 -0700
Subject: [PATCH 057/509] Bug 651017, part 6: prune unused and unimplemented
 nsDeviceContext methods.  Push some code down into nsFontCache.

--HG--
rename : gfx/src/nsThebesDeviceContext.cpp => gfx/src/nsDeviceContext.cpp
rename : gfx/src/nsThebesDeviceContext.h => gfx/src/nsDeviceContext.h
extra : rebase_source : 82489fb47226260871993f37d337439005250c29
---
 gfx/src/nsDeviceContext.cpp         | 168 ++++++----------------------
 gfx/src/nsDeviceContext.h           |  69 +-----------
 layout/generic/nsGfxScrollFrame.cpp |   2 -
 layout/generic/nsPageFrame.cpp      |   2 +-
 layout/printing/nsPrintEngine.cpp   |  15 +--
 5 files changed, 36 insertions(+), 220 deletions(-)

diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp
index e603a9756d71..7496b59e4a63 100644
--- a/gfx/src/nsDeviceContext.cpp
+++ b/gfx/src/nsDeviceContext.cpp
@@ -108,6 +108,7 @@ public:
 
 protected:
     nsDeviceContext*          mContext; // owner
+    nsCOMPtr<nsIAtom>         mLocaleLanguage;
     nsTArray<nsFontMetrics*>  mFontMetrics;
 };
 
@@ -125,6 +126,15 @@ nsFontCache::Init(nsDeviceContext* aContext)
     nsCOMPtr<nsIObserverService> obs = GetObserverService();
     if (obs)
         obs->AddObserver(this, "memory-pressure", PR_FALSE);
+
+    nsCOMPtr<nsILanguageAtomService> langService;
+    langService = do_GetService(NS_LANGUAGEATOMSERVICE_CONTRACTID);
+    if (langService) {
+        mLocaleLanguage = langService->GetLocaleLanguage();
+    }
+    if (!mLocaleLanguage) {
+        mLocaleLanguage = do_GetAtom("x-western");
+    }
 }
 
 void
@@ -149,6 +159,9 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                            gfxUserFontSet* aUserFontSet,
                            nsFontMetrics*& aMetrics)
 {
+    if (!aLanguage)
+        aLanguage = mLocaleLanguage;
+
     // First check our cache
     // start from the end, which is where we put the most-recent-used element
 
@@ -276,13 +289,27 @@ nsDeviceContext::~nsDeviceContext()
     }
 }
 
-void
-nsDeviceContext::CreateFontCache()
+nsresult
+nsDeviceContext::GetMetricsFor(const nsFont& aFont,
+                               nsIAtom* aLanguage,
+                               gfxUserFontSet* aUserFontSet,
+                               nsFontMetrics*& aMetrics)
 {
-    mFontCache = new nsFontCache();
-    NS_ADDREF(mFontCache);
-    mFontCache->Init(this);
-    GetLocaleLanguage();
+    if (!mFontCache) {
+        mFontCache = new nsFontCache();
+        NS_ADDREF(mFontCache);
+        mFontCache->Init(this);
+    }
+
+    return mFontCache->GetMetricsFor(aFont, aLanguage, aUserFontSet, aMetrics);
+}
+
+nsresult
+nsDeviceContext::FlushFontCache(void)
+{
+    if (mFontCache)
+        mFontCache->Flush();
+    return NS_OK;
 }
 
 nsresult
@@ -294,93 +321,6 @@ nsDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
     return NS_OK;
 }
 
-void
-nsDeviceContext::GetLocaleLanguage(void)
-{
-    if (!mLocaleLanguage) {
-        nsCOMPtr<nsILanguageAtomService> langService;
-        langService = do_GetService(NS_LANGUAGEATOMSERVICE_CONTRACTID);
-        if (langService) {
-            mLocaleLanguage = langService->GetLocaleLanguage();
-        }
-        if (!mLocaleLanguage) {
-            mLocaleLanguage = do_GetAtom("x-western");
-        }
-    }
-}
-
-nsresult
-nsDeviceContext::GetMetricsFor(const nsFont& aFont,
-                               nsIAtom* aLanguage,
-                               gfxUserFontSet* aUserFontSet,
-                               nsFontMetrics*& aMetrics)
-{
-    if (!mFontCache)
-        CreateFontCache();
-
-    // XXX figure out why aLanguage is NULL sometimes
-    //      -> see nsPageFrame.cpp:511
-    if (!aLanguage) {
-        aLanguage = mLocaleLanguage;
-    }
-
-    return mFontCache->GetMetricsFor(aFont, aLanguage, aUserFontSet, aMetrics);
-}
-
-nsresult
-nsDeviceContext::GetMetricsFor(const nsFont& aFont,
-                               gfxUserFontSet* aUserFontSet,
-                               nsFontMetrics*& aMetrics)
-{
-    if (!mFontCache)
-        CreateFontCache();
-
-    return mFontCache->GetMetricsFor(aFont, mLocaleLanguage, aUserFontSet,
-                                     aMetrics);
-}
-
-struct FontEnumData {
-    FontEnumData(nsString& aFaceName) : mFaceName(aFaceName) {}
-    nsString& mFaceName;
-};
-
-static PRBool
-FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
-{
-    FontEnumData* data = (FontEnumData*)aData;
-    data->mFaceName = aFamily;
-    return PR_FALSE; // stop
-}
-
-nsresult
-nsDeviceContext::FirstExistingFont(const nsFont& aFont,
-                                   nsString& aFaceName)
-{
-    FontEnumData data(aFaceName);
-    if (aFont.EnumerateFamilies(FontEnumCallback, &data)) {
-        return NS_ERROR_FAILURE; // can only happen for an empty font
-    }
-    return NS_OK;
-}
-
-nsresult
-nsDeviceContext::GetLocalFontName(const nsString& aFaceName,
-                                  nsString& aLocalName,
-                                  PRBool& aAliased)
-{
-    aLocalName = aFaceName;
-    aAliased = PR_FALSE;
-    return NS_OK;
-}
-
-nsresult
-nsDeviceContext::FlushFontCache(void)
-{
-    if (mFontCache)
-        mFontCache->Flush();
-    return NS_OK;
-}
-
 PRBool
 nsDeviceContext::IsPrinterSurface()
 {
@@ -502,20 +442,6 @@ nsDeviceContext::Init(nsIWidget *aWidget)
     return NS_OK;
 }
 
-nsresult
-nsDeviceContext::CreateRenderingContext(nsIView *aView,
-                                        nsRenderingContext *&aContext)
-{
-    // This is currently only called by the caret code
-    NS_ENSURE_ARG_POINTER(aView);
-    NS_PRECONDITION(aView->HasWidget(), "View has no widget!");
-
-    nsCOMPtr<nsIWidget> widget;
-    widget = aView->GetWidget();
-
-    return CreateRenderingContext(widget, aContext);
-}
-
 nsresult
 nsDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
                                         nsRenderingContext *&aContext)
@@ -623,12 +549,6 @@ nsDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const
     return rv;
 }
 
-nsresult
-nsDeviceContext::CheckFontExistence(const nsString& aFaceName)
-{
-    return NS_OK;
-}
-
 nsresult
 nsDeviceContext::GetDepth(PRUint32& aDepth)
 {
@@ -690,17 +610,6 @@ nsDeviceContext::GetClientRect(nsRect &aRect)
     return NS_OK;
 }
 
-nsresult
-nsDeviceContext::PrepareNativeWidget(nsIWidget* aWidget, void** aOut)
-{
-    *aOut = nsnull;
-    return NS_OK;
-}
-
-
-/*
- * below methods are for printing
- */
 nsresult
 nsDeviceContext::InitForPrinting(nsIDeviceContextSpec *aDevice)
 {
@@ -719,15 +628,6 @@ nsDeviceContext::InitForPrinting(nsIDeviceContextSpec *aDevice)
     return NS_OK;
 }
 
-
-nsresult
-nsDeviceContext::PrepareDocument(PRUnichar * aTitle,
-                                 PRUnichar*  aPrintToFileName)
-{
-    return NS_OK;
-}
-
-
 nsresult
 nsDeviceContext::BeginDocument(PRUnichar*  aTitle,
                                PRUnichar*  aPrintToFileName,
@@ -814,8 +714,6 @@ nsDeviceContext::EndPage(void)
     return rv;
 }
 
-/** End printing methods **/
-
 void
 nsDeviceContext::ComputeClientRectUsingScreen(nsRect* outRect)
 {
diff --git a/gfx/src/nsDeviceContext.h b/gfx/src/nsDeviceContext.h
index 1285a9357d52..2fd68e92bf46 100644
--- a/gfx/src/nsDeviceContext.h
+++ b/gfx/src/nsDeviceContext.h
@@ -41,14 +41,13 @@
 #define _NS_DEVICECONTEXT_H_
 
 #include "nsCOMPtr.h"
-#include "nsIAtom.h"
 #include "nsIDeviceContextSpec.h"
 #include "nsIScreenManager.h"
 #include "nsIWidget.h"
 #include "nsCoord.h"
 #include "gfxContext.h"
 
-class nsIView;
+class nsIAtom;
 class nsFontCache;
 class gfxUserFontSet;
 
@@ -97,15 +96,6 @@ public:
      */
     nsresult InitForPrinting(nsIDeviceContextSpec *aDevSpec);
 
-    /**
-     * Create a rendering context and initialize it from an nsIView
-     * @param aView view to initialize context from
-     * @param aContext out parameter for new rendering context
-     * @return error status
-     */
-    nsresult CreateRenderingContext(nsIView *aView,
-                                    nsRenderingContext *&aContext);
-
     /**
      * Create a rendering context and initialize it from an nsIWidget
      * @param aWidget widget to initialize context from
@@ -129,26 +119,12 @@ public:
      */
     nsresult CreateRenderingContextInstance(nsRenderingContext *&aContext);
 
-    /**
-     * We are in the process of creating the native widget for
-     * aWidget.  Do any device-specific processing required to
-     * initialize the native widget for this device. A pointer to some
-     * platform-specific data is returned in aOut.
-     */
-    nsresult PrepareNativeWidget(nsIWidget *aWidget, void **aOut);
-
     /**
      * Gets the number of app units in one CSS pixel; this number is global,
      * not unique to each device context.
      */
     static PRInt32 AppUnitsPerCSSPixel() { return 60; }
 
-    /**
-     * Convert app units to CSS pixels.  This is a global scale factor.
-     */
-    static gfxFloat AppUnitsToGfxCSSPixels(nscoord aAppUnits)
-    { return gfxFloat(aAppUnits) / AppUnitsPerCSSPixel(); }
-
     /**
      * Gets the number of app units in one device pixel; this number
      * is usually a factor of AppUnitsPerCSSPixel(), although that is
@@ -218,18 +194,6 @@ public:
                            gfxUserFontSet* aUserFontSet,
                            nsFontMetrics*& aMetrics);
 
-    /**
-     * Get the nsFontMetrics that describe the properties of
-     * an nsFont.
-     * @param aFont font description to obtain metrics for
-     * @param aMetrics out parameter for font metrics
-     * @param aUserFontSet user font set
-     * @return error status
-     */
-    nsresult GetMetricsFor(const nsFont& aFont,
-                           gfxUserFontSet* aUserFontSet,
-                           nsFontMetrics*& aMetrics);
-
     /**
      * Notification when a font metrics instance created for this device is
      * about to be deleted
@@ -243,17 +207,6 @@ public:
      */
     nsresult FlushFontCache();
 
-    /**
-     * Check to see if a particular named font exists.
-     * @param aFontName character string of font face name
-     * @return NS_OK if font is available, else font is unavailable
-     */
-    nsresult CheckFontExistence(const nsString& aFaceName);
-    nsresult FirstExistingFont(const nsFont& aFont, nsString& aFaceName);
-    nsresult GetLocalFontName(const nsString& aFaceName, nsString& aLocalName,
-                              PRBool& aAliased);
-
-
     /**
      * Return the bit depth of the device.
      */
@@ -292,17 +245,6 @@ public:
      */
     nsresult GetClientRect(nsRect& aRect);
 
-    /**
-     * Do anything that needs to be done to prepare for printing.
-     * @param aTitle - title of Document
-     * @param aPrintToFileName - name of file to print to, if NULL
-     * then don't print to file
-     *
-     * @return error status
-     */
-    nsresult PrepareDocument(PRUnichar *aTitle,
-                             PRUnichar *aPrintToFileName);
-
     /**
      * Inform the output device that output of a document is beginning
      * Used for print related device contexts. Must be matched 1:1 with
@@ -368,20 +310,12 @@ public:
      */
     PRBool SetPixelScale(float aScale);
 
-    /**
-     * Get the pixel scaling factor; defaults to 1.0, but can be changed with
-     * SetPixelScale.
-     */
-    float GetPixelScale() const { return mPixelScale; }
-
     /**
      * True if this device context was created for printing.
      */
     PRBool IsPrinterSurface();
 
 protected:
-    void CreateFontCache();
-    void GetLocaleLanguage();
     void SetDPI();
     void ComputeClientRectUsingScreen(nsRect *outRect);
     void ComputeFullAreaUsingScreen(nsRect *outRect);
@@ -399,7 +333,6 @@ protected:
     float    mPrintingScale;
 
     nsFontCache*                   mFontCache;
-    nsCOMPtr<nsIAtom>              mLocaleLanguage;
     nsCOMPtr<nsIWidget>            mWidget;
     nsCOMPtr<nsIScreenManager>     mScreenManager;
     nsCOMPtr<nsIDeviceContextSpec> mDeviceContextSpec;
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 158e35f02a1e..e5ebd7877ea8 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1966,8 +1966,6 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
   nsDisplayListCollection set;
 
-  nsPresContext* presContext = mOuter->PresContext();
-
   // Since making new layers is expensive, only use nsDisplayScrollLayer
   // if the area is scrollable.
   //
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index df738fb9e4c6..a3897c115e89 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -510,7 +510,7 @@ nsPageFrame::PaintHeaderFooter(nsRenderingContext& aRenderingContext,
 
   // Get the FontMetrics to determine width.height of strings
   nsRefPtr<nsFontMetrics> fontMet;
-  pc->DeviceContext()->GetMetricsFor(*mPD->mHeadFootFont,
+  pc->DeviceContext()->GetMetricsFor(*mPD->mHeadFootFont, nsnull,
                                      pc->GetUserFontSet(),
                                      *getter_AddRefs(fontMet));
 
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index f76ef471e493..3dcb18b8a63b 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -729,24 +729,11 @@ nsPrintEngine::DoCommonPrint(PRBool                  aIsPrintPreview,
     }
     NS_ENSURE_SUCCESS(rv, rv);
   } else {
-    PRUnichar * docTitleStr;
-    PRUnichar * docURLStr;
-
-    GetDisplayTitleAndURL(mPrt->mPrintObject, &docTitleStr, &docURLStr, eDocTitleDefURLDoc); 
-
-    // Nobody ever cared about the file name passed in, as far as I can tell
-    rv = mPrt->mPrintDC->PrepareDocument(docTitleStr, nsnull);
-
-    if (docTitleStr) nsMemory::Free(docTitleStr);
-    if (docURLStr) nsMemory::Free(docURLStr);
-
-    NS_ENSURE_SUCCESS(rv, rv);
-
     PRBool doNotify;
     ShowPrintProgress(PR_TRUE, doNotify);
     if (!doNotify) {
       // Print listener setup...
-      mPrt->OnStartPrinting();    
+      mPrt->OnStartPrinting();
       rv = DocumentReadyForPrinting();
       NS_ENSURE_SUCCESS(rv, rv);
     }

From a8dd50e303863704bc0c4416a81f6351a1ef49e1 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 16 Apr 2011 21:08:22 -0700
Subject: [PATCH 058/509] Bug 651017, part 7: remove
 nsDeviceContext::CreateRenderingContextInstance and the
 CreateRenderingContext overload that takes a widget.

--HG--
rename : gfx/src/nsThebesDeviceContext.cpp => gfx/src/nsDeviceContext.cpp
rename : gfx/src/nsThebesDeviceContext.h => gfx/src/nsDeviceContext.h
extra : rebase_source : 6be7fe432488dcf2fb5b2faa0e178dccab480285
---
 gfx/src/nsDeviceContext.cpp            | 53 +++-----------------------
 gfx/src/nsDeviceContext.h              | 19 +--------
 layout/base/FrameLayerBuilder.cpp      |  6 +--
 layout/base/nsCSSRendering.cpp         | 10 ++---
 layout/base/nsPresShell.cpp            | 12 ++----
 layout/inspector/src/inFlasher.cpp     | 25 ++++++------
 layout/svg/base/src/nsSVGUtils.cpp     |  8 ++--
 layout/xul/base/src/nsTextBoxFrame.cpp | 15 +++-----
 8 files changed, 37 insertions(+), 111 deletions(-)

diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp
index 7496b59e4a63..e5f23be17713 100644
--- a/gfx/src/nsDeviceContext.cpp
+++ b/gfx/src/nsDeviceContext.cpp
@@ -442,59 +442,16 @@ nsDeviceContext::Init(nsIWidget *aWidget)
     return NS_OK;
 }
 
-nsresult
-nsDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
-                                        nsRenderingContext *&aContext)
-{
-    nsresult rv;
-
-    aContext = nsnull;
-    nsRefPtr<nsRenderingContext> pContext;
-    rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
-    if (NS_SUCCEEDED(rv)) {
-        nsRefPtr<gfxASurface> surface(aWidget->GetThebesSurface());
-        if (surface) {
-            pContext->Init(this, surface);
-            aContext = pContext;
-            NS_ADDREF(aContext);
-        } else {
-            rv = NS_ERROR_FAILURE;
-        }
-    }
-
-    return rv;
-}
-
 nsresult
 nsDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
 {
-    nsresult rv = NS_OK;
+    NS_ABORT_IF_FALSE(mPrintingSurface, "only call for printing dcs");
 
-    aContext = nsnull;
-    nsRefPtr<nsRenderingContext> pContext;
-    rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
-    if (NS_SUCCEEDED(rv)) {
-        if (mPrintingSurface) {
-            pContext->Init(this, mPrintingSurface);
-            pContext->Scale(mPrintingScale, mPrintingScale);
-            aContext = pContext;
-            NS_ADDREF(aContext);
-        } else {
-            rv = NS_ERROR_FAILURE;
-        }
-    }
+    nsRefPtr<nsRenderingContext> pContext = new nsRenderingContext();
 
-    return rv;
-}
-
-nsresult
-nsDeviceContext::CreateRenderingContextInstance(nsRenderingContext *&aContext)
-{
-    nsRefPtr<nsRenderingContext> renderingContext = new nsRenderingContext();
-    if (!renderingContext)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    aContext = renderingContext;
+    pContext->Init(this, mPrintingSurface);
+    pContext->Scale(mPrintingScale, mPrintingScale);
+    aContext = pContext;
     NS_ADDREF(aContext);
 
     return NS_OK;
diff --git a/gfx/src/nsDeviceContext.h b/gfx/src/nsDeviceContext.h
index 2fd68e92bf46..eab44bbeee15 100644
--- a/gfx/src/nsDeviceContext.h
+++ b/gfx/src/nsDeviceContext.h
@@ -97,28 +97,13 @@ public:
     nsresult InitForPrinting(nsIDeviceContextSpec *aDevSpec);
 
     /**
-     * Create a rendering context and initialize it from an nsIWidget
-     * @param aWidget widget to initialize context from
-     * @param aContext out parameter for new rendering context
-     * @return error status
-     */
-    nsresult CreateRenderingContext(nsIWidget *aWidget,
-                                    nsRenderingContext *&aContext);
-
-    /**
-     * Create a rendering context and initialize it.
+     * Create a rendering context and initialize it.  Only call this
+     * method on device contexts that were initialized for printing.
      * @param aContext out parameter for new rendering context
      * @return error status
      */
     nsresult CreateRenderingContext(nsRenderingContext *&aContext);
 
-    /**
-     * Create an uninitalised rendering context.
-     * @param aContext out parameter for new rendering context
-     * @return error status
-     */
-    nsresult CreateRenderingContextInstance(nsRenderingContext *&aContext);
-
     /**
      * Gets the number of app units in one CSS pixel; this number is global,
      * not unique to each device context.
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 288fbaa290d5..2d6d80caa21c 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1892,11 +1892,7 @@ FrameLayerBuilder::DrawThebesLayer(ThebesLayer* aLayer,
     }
   }
 
-  nsRefPtr<nsRenderingContext> rc;
-  nsresult rv =
-    presContext->DeviceContext()->CreateRenderingContextInstance(*getter_AddRefs(rc));
-  if (NS_FAILED(rv))
-    return;
+  nsRefPtr<nsRenderingContext> rc = new nsRenderingContext();
   rc->Init(presContext->DeviceContext(), aContext);
 
   Clip currentClip;
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index f560f1e65a9b..3e13675abb78 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1197,15 +1197,13 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
 
       // Draw the widget shape
       gfxContextMatrixAutoSaveRestore save(shadowContext);
-      nsDeviceContext* devCtx = aPresContext->DeviceContext();
-      nsRefPtr<nsRenderingContext> wrapperCtx;
-      devCtx->CreateRenderingContextInstance(*getter_AddRefs(wrapperCtx));
-      wrapperCtx->Init(devCtx, shadowContext);
-      wrapperCtx->Translate(nsPoint(shadowItem->mXOffset, shadowItem->mYOffset));
+      nsRefPtr<nsRenderingContext> wrapperCtx = new nsRenderingContext();
+      wrapperCtx->Init(aPresContext->DeviceContext(), shadowContext);
+      wrapperCtx->Translate(nsPoint(shadowItem->mXOffset,
+                                    shadowItem->mYOffset));
 
       nsRect nativeRect;
       nativeRect.IntersectRect(frameRect, aDirtyRect);
-
       aPresContext->GetTheme()->DrawWidgetBackground(wrapperCtx, aForFrame,
           styleDisplay->mAppearance, aFrameArea, nativeRect);
     } else {
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 71b53e3fc0ad..465ff7879c67 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -3761,10 +3761,8 @@ PresShell::GetReferenceRenderingContext()
   nsDeviceContext* devCtx = mPresContext->DeviceContext();
   nsRefPtr<nsRenderingContext> rc;
   if (mPresContext->IsScreen()) {
-    devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
-    if (rc) {
-      rc->Init(devCtx, gfxPlatform::GetPlatform()->ScreenReferenceSurface());
-    }
+    rc = new nsRenderingContext();
+    rc->Init(devCtx, gfxPlatform::GetPlatform()->ScreenReferenceSurface());
   } else {
     devCtx->CreateRenderingContext(*getter_AddRefs(rc));
   }
@@ -5283,8 +5281,7 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags,
 
   AutoSaveRestoreRenderingState _(this);
 
-  nsRefPtr<nsRenderingContext> rc;
-  devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
+  nsRefPtr<nsRenderingContext> rc = new nsRenderingContext();
   rc->Init(devCtx, aThebesContext);
 
   PRBool wouldFlushRetainedLayers = PR_FALSE;
@@ -5608,8 +5605,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
   context.Rectangle(gfxRect(0, 0, pixelArea.width, pixelArea.height));
   context.Fill();
 
-  nsRefPtr<nsRenderingContext> rc;
-  deviceContext->CreateRenderingContextInstance(*getter_AddRefs(rc));
+  nsRefPtr<nsRenderingContext> rc = new nsRenderingContext();
   rc->Init(deviceContext, surface);
 
   if (aRegion) {
diff --git a/layout/inspector/src/inFlasher.cpp b/layout/inspector/src/inFlasher.cpp
index ca1b3f4209a1..9305e6948349 100644
--- a/layout/inspector/src/inFlasher.cpp
+++ b/layout/inspector/src/inFlasher.cpp
@@ -142,7 +142,7 @@ inFlasher::RepaintElement(nsIDOMElement* aElement)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 inFlasher::DrawElementOutline(nsIDOMElement* aElement)
 {
   NS_ENSURE_ARG_POINTER(aElement);
@@ -159,20 +159,19 @@ inFlasher::DrawElementOutline(nsIDOMElement* aElement)
     nsPoint offset;
     nsIWidget* widget = frame->GetNearestWidget(offset);
     if (widget) {
-      nsRefPtr<nsRenderingContext> rcontext;
-      frame->PresContext()->DeviceContext()->
-        CreateRenderingContext(widget, *getter_AddRefs(rcontext));
-      if (rcontext) {
-        nsRect rect(offset, frame->GetSize());
-        if (mInvert) {
-          rcontext->InvertRect(rect);
-        }
+      nsRefPtr<nsRenderingContext> rcontext = new nsRenderingContext();
+      rcontext->Init(frame->PresContext()->DeviceContext(),
+                     widget->GetThebesSurface());
 
-        PRBool isLastFrame = frame->GetNextContinuation() == nsnull;
-        DrawOutline(rect.x, rect.y, rect.width, rect.height, rcontext,
-                    isFirstFrame, isLastFrame);
-        isFirstFrame = PR_FALSE;
+      nsRect rect(offset, frame->GetSize());
+      if (mInvert) {
+        rcontext->InvertRect(rect);
       }
+
+      PRBool isLastFrame = frame->GetNextContinuation() == nsnull;
+      DrawOutline(rect.x, rect.y, rect.width, rect.height, rcontext,
+                  isFirstFrame, isLastFrame);
+      isFirstFrame = PR_FALSE;
     }
     frame = frame->GetNextContinuation();
   }
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 36a56b468df6..d0e221ae506a 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1465,11 +1465,9 @@ nsRenderingContext*
 nsSVGRenderState::GetRenderingContext(nsIFrame *aFrame)
 {
   if (!mRenderingContext) {
-    nsDeviceContext* devCtx = aFrame->PresContext()->DeviceContext();
-    devCtx->CreateRenderingContextInstance(*getter_AddRefs(mRenderingContext));
-    if (!mRenderingContext)
-      return nsnull;
-    mRenderingContext->Init(devCtx, mGfxContext);
+    mRenderingContext = new nsRenderingContext();
+    mRenderingContext->Init(aFrame->PresContext()->DeviceContext(),
+                            mGfxContext);
   }
   return mRenderingContext;
 }
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 965033c91fe6..4b62be4d3c52 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -621,20 +621,17 @@ void nsTextBoxFrame::PaintOneShadow(gfxContext*      aCtx,
     shadowColor = aForegroundColor;
 
   // Conjure an nsRenderingContext from a gfxContext for DrawText
-  nsRefPtr<nsRenderingContext> renderingContext = nsnull;
-  nsDeviceContext* devCtx = PresContext()->DeviceContext();
-  devCtx->CreateRenderingContextInstance(*getter_AddRefs(renderingContext));
-  if (!renderingContext)
-    return;
-  renderingContext->Init(devCtx, shadowContext);
+  nsRefPtr<nsRenderingContext> renderingContext = new nsRenderingContext();
+  renderingContext->Init(PresContext()->DeviceContext(), shadowContext);
 
   aCtx->Save();
   aCtx->NewPath();
   aCtx->SetColor(gfxRGBA(shadowColor));
 
-  // Draw the text onto our alpha-only surface to capture the alpha values.
-  // Remember that the box blur context has a device offset on it, so we don't need to
-  // translate any coordinates to fit on the surface.
+  // Draw the text onto our alpha-only surface to capture the alpha
+  // values.  Remember that the box blur context has a device offset
+  // on it, so we don't need to translate any coordinates to fit on
+  // the surface.
   DrawText(*renderingContext, shadowRect, &shadowColor);
   contextBoxBlur.DoPaint();
   aCtx->Restore();

From 4cb99328b136b9bc37749915213baf0756e5e084 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 19 Apr 2011 11:21:21 -0400
Subject: [PATCH 059/509] Bug 650676 - browser_autocompletesearch.js throws
 getting ProfD (debugging code) [r=vingtetun]

---
 mobile/chrome/tests/browser_autocompletesearch.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/tests/browser_autocompletesearch.js b/mobile/chrome/tests/browser_autocompletesearch.js
index 0c1e31d37ef5..95d0475a49d3 100644
--- a/mobile/chrome/tests/browser_autocompletesearch.js
+++ b/mobile/chrome/tests/browser_autocompletesearch.js
@@ -45,7 +45,11 @@ function saveMockCache() {
     oldCacheFile.remove(true);
 
   let mockCachePath = gTestPath;
-  let mockCacheFile = getChromeDir(getResolvedURI(mockCachePath));
+  info("mock path: " + mockCachePath);
+  let mockCacheURI = getResolvedURI(mockCachePath);
+  info("mock URI: " + mockCacheURI.spec);
+  let mockCacheFile = getChromeDir(mockCacheURI);
+  info("mock file: " + mockCacheFile.path);
   mockCacheFile.append("mock_autocomplete.json");
   mockCacheFile.copyToFollowingLinks(gProfileDir, "autocomplete.json");
 

From bc3ae4dcd39c2b759027eb866fc34bf97a31ac1b Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 19 Apr 2011 08:14:00 -0400
Subject: [PATCH 060/509] Bug 650684 - "browser_awesomescreen.js times out
 after "urlbar text should be selected on a double click"" [r=mark.finkle]

---
 mobile/chrome/tests/browser_awesomescreen.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mobile/chrome/tests/browser_awesomescreen.js b/mobile/chrome/tests/browser_awesomescreen.js
index 46d1b8da2157..315848752a6c 100644
--- a/mobile/chrome/tests/browser_awesomescreen.js
+++ b/mobile/chrome/tests/browser_awesomescreen.js
@@ -199,12 +199,12 @@ gTests.push({
 
   run: function() {
     BrowserUI.closeAutoComplete(true);
-    this._currentTab = BrowserUI.newTab(testURL_01);
+    this.currentTab = BrowserUI.newTab(testURL_01);
 
     // Need to wait until the page is loaded
     messageManager.addMessageListener("pageshow",
     function(aMessage) {
-      if (gCurrentTest._currentTab.browser.currentURI.spec != "about:blank") {
+      if (gCurrentTest.currentTab.browser.currentURI.spec != "about:blank") {
         messageManager.removeMessageListener(aMessage.name, arguments.callee);
         setTimeout(gCurrentTest.onPageReady, 0);
       }
@@ -281,9 +281,8 @@ gTests.push({
 
     edit.clickSelectsAll = oldClickSelectsAll;
 
-    BrowserUI.closeTab(this._currentTab);
-
     BrowserUI.activePanel = null;
+    Browser.closeTab(gCurrentTest.currentTab, { forceClose: true });
 
     // Ensure the tab is well closed before doing the rest of the code, otherwise
     // this cause some bugs with the composition events

From 514cdc5ca540843a34d9a1b6ad36a9ac5fdf9269 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 19 Apr 2011 09:21:39 -0700
Subject: [PATCH 061/509] Bug 617359 - Scroll notification bar into view when
 shown. r=mfinkle

---
 mobile/chrome/content/browser.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 6fed04e51017..2777724ed655 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -291,6 +291,7 @@ var Browser = {
       }
     }
     window.addEventListener("resize", resizeHandler, false);
+    window.addEventListener("AlertActive", this._alertShown.bind(this), false);
 
     function fullscreenHandler() {
       if (!window.fullScreen)
@@ -357,6 +358,12 @@ var Browser = {
     window.dispatchEvent(event);
   },
 
+  _alertShown: function _alertShown() {
+    // ensure that the full notification still visible, even if the urlbar is floating
+    if (BrowserUI.isToolbarLocked())
+      Browser.pageScrollboxScroller.scrollTo(0, 0);
+  },
+
   _waitingToClose: false,
   closing: function closing() {
     // If we are already waiting for the close prompt, don't show another

From 2f796b42176d0052c7f2f41fbec891d258cd2f4a Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 19 Apr 2011 09:21:42 -0700
Subject: [PATCH 062/509] Bug 650830 - Support changing the charset of local
 tabs. r=mfinkle

---
 mobile/chrome/content/common-ui.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index a1331a56b9db..5e5b5fc66180 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -1508,6 +1508,7 @@ var CharsetMenu = {
     if (pref == "true") {
       let charset = getBrowser().documentCharsetInfo.forcedCharset;
       if (charset) {
+        charset = charset.toString();
         charset = charset.trim().toLowerCase();
         aNode.setAttribute("description", this.strings.GetStringFromName(charset + ".title"));
       } else if (aNode.hasAttribute("description")) {
@@ -1551,6 +1552,7 @@ var CharsetMenu = {
     let currentCharset = getBrowser().documentCharsetInfo.forcedCharset;
     
     if (currentCharset) {
+      currentCharset = currentCharset.toString();
       currentCharset = currentCharset.trim().toLowerCase();
       if (charsets.indexOf(currentCharset) == -1)
         charsets.splice(0, 0, currentCharset);

From 7c7176487db4f035f554349b880fbbb963c47ca5 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Tue, 19 Apr 2011 10:13:34 -0700
Subject: [PATCH 063/509] Bug 641614 - Try to fix jar logs in l10n repacks,
 r=ted

---
 toolkit/locales/l10n.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index 3acd247370c4..ceab1928705d 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -139,7 +139,7 @@ endif
 repackage-zip: UNPACKAGE="$(ZIP_IN)"
 repackage-zip:  libs-$(AB_CD)
 # Adjust jar logs with the new locale (can't use sed -i because of bug 373784)
-	-$(PERL) -pi -e "s/en-US/$(AB_CD)/g" $(_ABS_DIST)/jarlog/*.jar.log
+	-$(PERL) -pi.old -e "s/en-US/$(AB_CD)/g" $(_ABS_DIST)/jarlog/*.jar.log
 # call a hook for apps to put their uninstall helper.exe into the package
 	$(UNINSTALLER_PACKAGE_HOOK)
 # copy xpi-stage over, but not install.rdf and chrome.manifest,

From 58f7d61abb5a5d952647855b41c083dd130e317f Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Tue, 19 Apr 2011 18:21:24 +0100
Subject: [PATCH 064/509] Bug 335375 - changing accesskey on a <broadcaster>
 via an overlay doesn't propagate to its <toolbarbutton> - mochitest
 r=neil/smaug

---
 content/xul/document/test/Makefile.in         |  3 ++
 .../xul/document/test/overlay1_bug335375.xul  |  9 ++++
 .../xul/document/test/overlay2_bug335375.xul  |  5 ++
 content/xul/document/test/test_bug335375.xul  | 53 +++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 content/xul/document/test/overlay1_bug335375.xul
 create mode 100644 content/xul/document/test/overlay2_bug335375.xul
 create mode 100644 content/xul/document/test/test_bug335375.xul

diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in
index d1751b3c3aab..1dcd6a3d1744 100644
--- a/content/xul/document/test/Makefile.in
+++ b/content/xul/document/test/Makefile.in
@@ -61,6 +61,9 @@ _CHROME_FILES = \
 		window_bug583948.xul \
 		test_bug497875.xul \
 		     bug497875-iframe.xul \
+		test_bug335375.xul \
+		overlay1_bug335375.xul \
+		overlay2_bug335375.xul \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/xul/document/test/overlay1_bug335375.xul b/content/xul/document/test/overlay1_bug335375.xul
new file mode 100644
index 000000000000..a3448b7f87ca
--- /dev/null
+++ b/content/xul/document/test/overlay1_bug335375.xul
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<overlay id="overlay1"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <commandset id="test_commandset">
+    <command id="cmd_test"/>
+  </commandset>
+  <toolbarbutton id="button_test"
+                 command="cmd_test"/>
+</overlay>
diff --git a/content/xul/document/test/overlay2_bug335375.xul b/content/xul/document/test/overlay2_bug335375.xul
new file mode 100644
index 000000000000..cb37db64202a
--- /dev/null
+++ b/content/xul/document/test/overlay2_bug335375.xul
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<overlay id="overlay2"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <command id="cmd_test" accesskey="C"/>
+</overlay>
diff --git a/content/xul/document/test/test_bug335375.xul b/content/xul/document/test/test_bug335375.xul
new file mode 100644
index 000000000000..a46ad0f7f87e
--- /dev/null
+++ b/content/xul/document/test/test_bug335375.xul
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xul-overlay href="overlay1_bug335375.xul"?>
+<?xul-overlay href="overlay2_bug335375.xul"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=335375
+-->
+<window title="Mozilla Bug 335375"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="RunTest();">
+  <title>Mozilla Bug 335375</title>
+
+  <script type="application/javascript"
+          src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>      
+
+  <script type="application/javascript">
+    <![CDATA[
+      SimpleTest.waitForExplicitFinish();
+
+      function RunTest()
+      {
+        var cmd = document.getElementById("cmd_test");
+        var button = document.getElementById("button_test");
+
+        is(cmd.getAttribute("accesskey"), "C",
+           "checking command has an accesskey");
+        is(button.getAttribute("accesskey"), cmd.getAttribute("accesskey"),
+           "checking command and button have the same accesskey");
+
+        cmd.setAttribute("accesskey", "D");
+        is(button.getAttribute("accesskey"), "D",
+           "checking button has inherited new accesskey from command");
+
+        SimpleTest.finish();
+      }
+    ]]>
+  </script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=335375"
+       target="_blank">Mozilla Bug 335375</a>
+    <p id="display"></p>
+    <div id="content" style="display: none"></div>
+    <pre id="test"></pre>
+  </body>
+
+  <commandset id="test_commandset"/>
+  <toolbarbutton id="button_test"/>
+
+</window>

From cfaae0f22541a96db47c6e2ba1f2002e82e070ef Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Tue, 19 Apr 2011 18:21:26 +0100
Subject: [PATCH 065/509] Bug 335375 - changing accesskey on a <broadcaster>
 via an overlay doesn't propagate to its <toolbarbutton> r=neil/smaug

---
 content/xul/document/src/nsXULDocument.cpp | 46 ++++++++++++++++++++++
 content/xul/document/src/nsXULDocument.h   |  7 ++++
 2 files changed, 53 insertions(+)

diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index 95b96f44e20c..bb5994741a24 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -4053,6 +4053,11 @@ nsXULDocument::OverlayForwardReference::Merge(nsIContent* aTargetNode,
         }
 
         rv = aTargetNode->SetAttr(nameSpaceID, attr, prefix, value, aNotify);
+        if (!NS_FAILED(rv) && !aNotify)
+            rv = mDocument->BroadcastAttributeChangeFromOverlay(aTargetNode,
+                                                                nameSpaceID,
+                                                                attr, prefix,
+                                                                value);
         if (NS_FAILED(rv)) return rv;
     }
 
@@ -4219,6 +4224,47 @@ nsXULDocument::TemplateBuilderHookup::Resolve()
 
 //----------------------------------------------------------------------
 
+nsresult
+nsXULDocument::BroadcastAttributeChangeFromOverlay(nsIContent* aNode,
+                                                   PRInt32 aNameSpaceID,
+                                                   nsIAtom* aAttribute,
+                                                   nsIAtom* aPrefix,
+                                                   const nsAString& aValue)
+{
+    nsresult rv = NS_OK;
+
+    if (!mBroadcasterMap || !CanBroadcast(aNameSpaceID, aAttribute))
+        return rv;
+
+    nsCOMPtr<nsIDOMElement> domele = do_QueryInterface(aNode);
+    if (!domele)
+        return rv;
+
+    BroadcasterMapEntry* entry = static_cast<BroadcasterMapEntry*>
+        (PL_DHashTableOperate(mBroadcasterMap, domele.get(), PL_DHASH_LOOKUP));
+    if (!PL_DHASH_ENTRY_IS_BUSY(entry))
+        return rv;
+
+    // We've got listeners: push the value.
+    PRInt32 i;
+    for (i = entry->mListeners.Count() - 1; i >= 0; --i) {
+        BroadcastListener* bl = static_cast<BroadcastListener*>
+            (entry->mListeners[i]);
+
+        if ((bl->mAttribute != aAttribute) &&
+            (bl->mAttribute != nsGkAtoms::_asterix))
+            continue;
+
+        nsCOMPtr<nsIContent> l = do_QueryReferent(bl->mListener);
+        if (l) {
+            rv = l->SetAttr(aNameSpaceID, aAttribute,
+                            aPrefix, aValue, PR_FALSE);
+            if (NS_FAILED(rv)) return rv;
+        }
+    }
+    return rv;
+}
+
 nsresult
 nsXULDocument::FindBroadcaster(Element* aElement,
                                nsIDOMElement** aListener,
diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h
index c56d4dc2d291..99e1501d8973 100644
--- a/content/xul/document/src/nsXULDocument.h
+++ b/content/xul/document/src/nsXULDocument.h
@@ -253,6 +253,13 @@ protected:
                                  nsIDOMElement* aListener,
                                  nsIAtom* aAttr);
 
+    nsresult
+    BroadcastAttributeChangeFromOverlay(nsIContent* aNode,
+                                        PRInt32 aNameSpaceID,
+                                        nsIAtom* aAttribute,
+                                        nsIAtom* aPrefix,
+                                        const nsAString& aValue);
+
     already_AddRefed<nsPIWindowRoot> GetWindowRoot();
 
     PRInt32 GetDefaultNamespaceID() const

From 30255aeb193fff0068ec506687944e753d201689 Mon Sep 17 00:00:00 2001
From: "L. David Baron ext:(%2C%20Ehsan%20Akhgari%20%3Cehsan%40mozilla.com%3E)"
 <dbaron@dbaron.org>
Date: Sun, 10 Apr 2011 17:12:52 -0400
Subject: [PATCH 066/509] Protect the xptiWorkingSet's tables with a lock. 
 (Bug 627985, bug 614480); r=dbaron,bsmedberg

---
 .../reflect/xptinfo/src/xptiInterfaceInfo.cpp | 26 ++++++++++++++---
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  | 14 ++++++---
 xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp | 13 ++++++---
 xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp  |  3 +-
 xpcom/reflect/xptinfo/src/xptiprivate.h       | 29 ++++---------------
 5 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
index 82665f7e759c..393ad3f77712 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
@@ -619,7 +619,10 @@ xptiInterfaceEntry::HasAncestor(const nsIID * iid, PRBool *_retval)
 nsresult 
 xptiInterfaceEntry::GetInterfaceInfo(xptiInterfaceInfo** info)
 {
-    MonitorAutoEnter lock(xptiInterfaceInfoManager::GetInfoMonitor());
+#ifdef DEBUG
+    xptiInterfaceInfoManager::GetSingleton()->GetWorkingSet()->mTableMonitor.
+        AssertCurrentThreadIn();
+#endif
     LOG_INFO_MONITOR_ENTRY;
 
     if(!mInfo)
@@ -646,6 +649,19 @@ xptiInterfaceEntry::LockedInvalidateInterfaceInfo()
     }
 }
 
+PRBool
+xptiInterfaceInfo::BuildParent()
+{
+    mozilla::MonitorAutoEnter monitor(xptiInterfaceInfoManager::GetSingleton()->
+                                    GetWorkingSet()->mTableMonitor);
+    NS_ASSERTION(mEntry && 
+                 mEntry->IsFullyResolved() && 
+                 !mParent &&
+                 mEntry->Parent(),
+                "bad BuildParent call");
+    return NS_SUCCEEDED(mEntry->Parent()->GetInterfaceInfo(&mParent));
+}
+
 /***************************************************************************/
 
 NS_IMPL_QUERY_INTERFACE1(xptiInterfaceInfo, nsIInterfaceInfo)
@@ -679,9 +695,11 @@ xptiInterfaceInfo::Release(void)
     NS_LOG_RELEASE(this, cnt, "xptiInterfaceInfo");
     if(!cnt)
     {
-        MonitorAutoEnter lock(xptiInterfaceInfoManager::GetInfoMonitor());
+        mozilla::MonitorAutoEnter monitor(xptiInterfaceInfoManager::
+                                          GetSingleton()->GetWorkingSet()->
+                                          mTableMonitor);
         LOG_INFO_MONITOR_ENTRY;
-        
+
         // If GetInterfaceInfo added and *released* a reference before we 
         // acquired the monitor then 'this' might already be dead. In that
         // case we would not want to try to access any instance data. We
@@ -695,7 +713,7 @@ xptiInterfaceInfo::Release(void)
         // then we want to bail out of here without destorying the object.
         if(mRefCnt)
             return 1;
-        
+
         if(mEntry)
         {
             mEntry->LockedInterfaceInfoDeathNotification();
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index b99ef214dd19..1db918049852 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -80,8 +80,6 @@ xptiInterfaceInfoManager::FreeInterfaceInfoManager()
 xptiInterfaceInfoManager::xptiInterfaceInfoManager()
     :   mWorkingSet(),
         mResolveLock("xptiInterfaceInfoManager.mResolveLock"),
-        mAutoRegLock("xptiInterfaceInfoManager.mAutoRegLock"), // FIXME: unused!
-        mInfoMonitor("xptiInterfaceInfoManager.mInfoMonitor"),
         mAdditionalManagersLock(
             "xptiInterfaceInfoManager.mAdditionalManagersLock")
 {
@@ -235,6 +233,7 @@ xptiInterfaceInfoManager::RegisterXPTHeader(XPTHeader* aHeader)
 
     xptiTypelibGuts* typelib = xptiTypelibGuts::Create(aHeader);
 
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     for(PRUint16 k = 0; k < aHeader->num_interfaces; k++)
         VerifyAndAddEntryIfNew(aHeader->interface_directory + k, k, typelib);
 }
@@ -255,6 +254,7 @@ xptiInterfaceInfoManager::VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* ifa
     if (!iface->interface_descriptor)
         return;
     
+    mWorkingSet.mTableMonitor.AssertCurrentThreadIn();
     xptiInterfaceEntry* entry = mWorkingSet.mIIDTable.Get(iface->iid);
     if (entry) {
         // XXX validate this info to find possible inconsistencies
@@ -306,6 +306,7 @@ EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval)
 xptiInterfaceEntry*
 xptiInterfaceInfoManager::GetInterfaceEntryForIID(const nsIID *iid)
 {
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     return mWorkingSet.mIIDTable.Get(*iid);
 }
 
@@ -315,7 +316,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInte
     NS_ASSERTION(iid, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
-    xptiInterfaceEntry* entry = GetInterfaceEntryForIID(iid);
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
+    xptiInterfaceEntry* entry = mWorkingSet.mIIDTable.Get(*iid);
     return EntryToInfo(entry, _retval);
 }
 
@@ -325,6 +327,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForName(const char *name, nsIInte
     NS_ASSERTION(name, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     xptiInterfaceEntry* entry = mWorkingSet.mNameTable.Get(name);
     return EntryToInfo(entry, _retval);
 }
@@ -335,7 +338,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetIIDForName(const char *name, nsIID *
     NS_ASSERTION(name, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
-
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     xptiInterfaceEntry* entry = mWorkingSet.mNameTable.Get(name);
     if (!entry) {
         *_retval = nsnull;
@@ -351,6 +354,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **
     NS_ASSERTION(iid, "bad param");
     NS_ASSERTION(_retval, "bad param");
 
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     xptiInterfaceEntry* entry = mWorkingSet.mIIDTable.Get(*iid);
     if (!entry) {
         *_retval = nsnull;
@@ -384,6 +388,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_ret
     if (!array)
         return NS_ERROR_UNEXPECTED;
 
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     mWorkingSet.mNameTable.EnumerateRead(xpti_ArrayAppender, array);
 
     return array->Enumerate(_retval);
@@ -419,6 +424,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(c
     if (!array)
         return NS_ERROR_UNEXPECTED;
 
+    MonitorAutoEnter monitor(mWorkingSet.mTableMonitor);
     ArrayAndPrefix args = {array, prefix, PL_strlen(prefix)};
     mWorkingSet.mNameTable.EnumerateRead(xpti_ArrayPrefixAppender, &args);
 
diff --git a/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp b/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
index 5f2c41e36201..cddfb2a44a4f 100644
--- a/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
@@ -41,6 +41,8 @@
 
 #include "xptiprivate.h"
 
+using namespace mozilla;
+
 // static 
 xptiTypelibGuts* 
 xptiTypelibGuts::Create(XPTHeader* aHeader)
@@ -73,10 +75,13 @@ xptiTypelibGuts::GetEntryAt(PRUint16 i)
     xptiWorkingSet* set =
         xptiInterfaceInfoManager::GetSingleton()->GetWorkingSet();
 
-    if (iface->iid.Equals(zeroIID))
-        r = set->mNameTable.Get(iface->name);
-    else
-        r = set->mIIDTable.Get(iface->iid);
+    {
+        MonitorAutoEnter monitor(set->mTableMonitor);
+        if (iface->iid.Equals(zeroIID))
+            r = set->mNameTable.Get(iface->name);
+        else
+            r = set->mIIDTable.Get(iface->iid);
+    }
 
     if (r)
         SetEntryAt(i, r);
diff --git a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
index f2eece16df08..be92a1ebd9ed 100644
--- a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
@@ -48,6 +48,7 @@ using namespace mozilla;
 #define XPTI_HASHTABLE_SIZE             2048
 
 xptiWorkingSet::xptiWorkingSet()
+    : mTableMonitor("xptiWorkingSet::mTableMonitor")
 {
     MOZ_COUNT_CTOR(xptiWorkingSet);
 
@@ -68,7 +69,7 @@ xpti_Invalidator(const char* keyname, xptiInterfaceEntry* entry, void* arg)
 void 
 xptiWorkingSet::InvalidateInterfaceInfos()
 {
-    MonitorAutoEnter lock(xptiInterfaceInfoManager::GetInfoMonitor());
+    MonitorAutoEnter monitor(mTableMonitor);
     mNameTable.EnumerateRead(xpti_Invalidator, NULL);
 }        
 
diff --git a/xpcom/reflect/xptinfo/src/xptiprivate.h b/xpcom/reflect/xptinfo/src/xptiprivate.h
index 7fabaf955f94..eb0f712e7099 100644
--- a/xpcom/reflect/xptinfo/src/xptiprivate.h
+++ b/xpcom/reflect/xptinfo/src/xptiprivate.h
@@ -180,6 +180,11 @@ private:
 
 public:
     // XXX make these private with accessors
+    // mTableMonitor must be held across:
+    //  * any read from or write to mIIDTable or mNameTable
+    //  * any writing to the links between an xptiInterfaceEntry
+    //    and its xptiInterfaceInfo (mEntry/mInfo)
+    mozilla::Monitor mTableMonitor;
     nsDataHashtable<nsIDHashKey, xptiInterfaceEntry*> mIIDTable;
     nsDataHashtable<nsDepCharHashKey, xptiInterfaceEntry*> mNameTable;
 };
@@ -406,15 +411,7 @@ private:
         return mEntry && mEntry->EnsureResolved();
     }
 
-    PRBool BuildParent()
-    {
-        NS_ASSERTION(mEntry && 
-                     mEntry->IsFullyResolved() && 
-                     !mParent &&
-                     mEntry->Parent(),
-                    "bad BuildParent call");
-        return NS_SUCCEEDED(mEntry->Parent()->GetInterfaceInfo(&mParent));
-    }
+    PRBool BuildParent();
 
     xptiInterfaceInfo();  // not implemented
 
@@ -451,18 +448,6 @@ public:
         return self->mResolveLock;
     }
 
-    static Mutex& GetAutoRegLock(xptiInterfaceInfoManager* self = nsnull) 
-    {
-        self = self ? self : GetSingleton();
-        return self->mAutoRegLock;
-    }
-
-    static Monitor& GetInfoMonitor(xptiInterfaceInfoManager* self = nsnull) 
-    {
-        self = self ? self : GetSingleton();
-        return self->mInfoMonitor;
-    }
-
     xptiInterfaceEntry* GetInterfaceEntryForIID(const nsIID *iid);
 
 private:
@@ -482,8 +467,6 @@ private:
 private:
     xptiWorkingSet               mWorkingSet;
     Mutex                        mResolveLock;
-    Mutex                        mAutoRegLock;
-    Monitor                      mInfoMonitor;
     Mutex                        mAdditionalManagersLock;
     nsCOMArray<nsISupports>      mAdditionalManagers;
 };

From 4d99b1c73f58119a4bc2527d8c2b119cf7f62ba2 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Tue, 19 Apr 2011 13:48:08 -0400
Subject: [PATCH 067/509] Bug 588990 - Part 1: Add a SpecialPowers.gc() API;
 r=ehsan

---
 testing/mochitest/specialpowers/content/specialpowers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testing/mochitest/specialpowers/content/specialpowers.js b/testing/mochitest/specialpowers/content/specialpowers.js
index 926055139401..8bfb460f4fc2 100644
--- a/testing/mochitest/specialpowers/content/specialpowers.js
+++ b/testing/mochitest/specialpowers/content/specialpowers.js
@@ -200,6 +200,10 @@ SpecialPowers.prototype = {
   createSystemXHR: function() {
     return Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
              .createInstance(Ci.nsIXMLHttpRequest);
+  },
+
+  gc: function() {
+    this.DOMWindowUtils.garbageCollect();
   }
 };
 

From 47322a8c6bec1e917683628728d00f7d05f1cc57 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 19:39:42 -0400
Subject: [PATCH 068/509] Bug 650543 - Rewrite the test for bug 419132 to make
 it sane, and re-enable it; r=sicking

---
 content/base/test/Makefile.in         |  4 ++--
 content/base/test/bug419132.html      |  8 -------
 content/base/test/test_bug419132.html | 30 ++++++++++++++++++---------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 2690cb6859e5..2f1f6deb707a 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -133,8 +133,8 @@ _TEST_FILES1 = 	test_bug5141.html \
 		test_bug395915.html \
 		test_bug397234.html \
 		test_bug398243.html \
-		$(warning test_bug419132.html disabled because it takes 60 seconds) \
-		$(warning bug419132.html disabled because it takes 60 seconds) \
+		test_bug419132.html \
+		bug419132.html \
 		formReset.html \
 		bug382113_object.html \
 		test_bug326337.html \
diff --git a/content/base/test/bug419132.html b/content/base/test/bug419132.html
index ebf460837bc5..ab2934c2d402 100644
--- a/content/base/test/bug419132.html
+++ b/content/base/test/bug419132.html
@@ -1,12 +1,4 @@
 <html><head>
-<script>
-function doe() {
-window.location.reload();
-}
-setTimeout(doe, 400);
-
-</script>
-
 </head><body>
 <span>
 <span id="a" tabindex="1">
diff --git a/content/base/test/test_bug419132.html b/content/base/test/test_bug419132.html
index 3ccbdf35b8ee..f38c5e08fff6 100644
--- a/content/base/test/test_bug419132.html
+++ b/content/base/test/test_bug419132.html
@@ -15,22 +15,32 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=419132
 <div id="content" style="display: none">
   
 </div>
-<iframe src="bug419132.html"></iframe>
+<iframe id="i"></iframe>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 419132 **/
 
 SimpleTest.waitForExplicitFinish();
-
-setTimeout(finish, 60000)
-
-function finish()
-{
-  ok(true, "This is a mochikit version of a crash test. To complete is to pass.");
-  SimpleTest.finish();
-}
-
+addLoadEvent(function() {
+  var iframe = document.getElementById("i");
+  var loadCounts = 4;
+  iframe.addEventListener("load", function() {
+    if (--loadCounts == 0) {
+      ok(true, "This is a mochikit version of a crash test. To complete is to pass.");
+      SimpleTest.finish();
+    } else {
+      // Garbage collect after every other load
+      if ((loadCounts % 2) == 1) {
+        SpecialPowers.gc();
+      }
+      setTimeout(function() {
+        iframe.contentWindow.location.reload();
+      }, 0);
+    }
+  }, false);
+  iframe.src = "bug419132.html";
+});
 
 </script>
 </pre>

From b46a005045f3153b7f0e2d9467a9a7de2f092e8a Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Tue, 19 Apr 2011 11:03:57 -0700
Subject: [PATCH 069/509] Bug 650254 - Permanent fail on update xpcshell tests
 for Thunderbird | TEST-UNEXPECTED-FAIL | test_0110_general.js and co failing
 in head_update.js. r=mossop

---
 .../test/unit/data/complete_cc_log_success    | 34 ++++++++-----------
 .../test/unit/data/complete_log_success       | 34 ++++++++-----------
 .../update/test/unit/data/partial_log_failure |  6 ----
 .../update/test/unit/data/partial_log_success | 14 +++-----
 .../update/test/unit/head_update.js.in        |  8 +++--
 5 files changed, 38 insertions(+), 58 deletions(-)

diff --git a/toolkit/mozapps/update/test/unit/data/complete_cc_log_success b/toolkit/mozapps/update/test/unit/data/complete_cc_log_success
index 30ddf209dd3c..5345b914b917 100644
--- a/toolkit/mozapps/update/test/unit/data/complete_cc_log_success
+++ b/toolkit/mozapps/update/test/unit/data/complete_cc_log_success
@@ -94,8 +94,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
 PREPARE REMOVEFILE a/b/7/71/7xtext0
 PREPARE REMOVEFILE a/b/7/71/7xtext1
 PREPARE REMOVEDIR a/b/7/71/
-PREPARE REMOVEFILE a/b/7/7text0
-PREPARE REMOVEFILE a/b/7/7text1
 PREPARE REMOVEDIR a/b/7/
 PREPARE REMOVEDIR a/b/6/
 PREPARE REMOVEFILE a/b/5/5text1
@@ -203,8 +201,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
 EXECUTE REMOVEFILE a/b/7/71/7xtext0
 EXECUTE REMOVEFILE a/b/7/71/7xtext1
 EXECUTE REMOVEDIR a/b/7/71/
-EXECUTE REMOVEFILE a/b/7/7text0
-EXECUTE REMOVEFILE a/b/7/7text1
 EXECUTE REMOVEDIR a/b/7/
 EXECUTE REMOVEDIR a/b/6/
 EXECUTE REMOVEFILE a/b/5/5text1
@@ -233,27 +229,27 @@ FINISH REMOVEFILE a/b/2/20/20png0.png
 FINISH REMOVEFILE a/b/0/0exe0.exe
 FINISH REMOVEFILE a/b/0/00/00text0
 FINISH REMOVEDIR a/b/searchplugins/
-a/b/searchplugins/, rv: 0
+removing directory: a/b/searchplugins/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions1/
-a/b/extensions/extensions1/, rv: 0
+removing directory: a/b/extensions/extensions1/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions0/
-a/b/extensions/extensions0/, rv: 0
+removing directory: a/b/extensions/extensions0/, rv: 0
 FINISH REMOVEDIR a/b/extensions/
-a/b/extensions/, rv: 0
+removing directory: a/b/extensions/, rv: 0
 FINISH REMOVEDIR a/b/defaults/pref/
-a/b/defaults/pref/, rv: 0
+removing directory: a/b/defaults/pref/, rv: 0
 FINISH REMOVEDIR a/b/defaults/
-a/b/defaults/, rv: 0
+removing directory: a/b/defaults/, rv: 0
 FINISH REMOVEDIR a/b/2/20/
 FINISH REMOVEDIR a/b/2/
 FINISH REMOVEDIR a/b/0/00/
-a/b/0/00/, rv: 0
+removing directory: a/b/0/00/, rv: 0
 FINISH REMOVEDIR a/b/0/
-a/b/0/, rv: 0
+removing directory: a/b/0/, rv: 0
 FINISH REMOVEDIR a/b/
-a/b/, rv: 0
+removing directory: a/b/, rv: 0
 FINISH REMOVEDIR a/
-a/, rv: 0
+removing directory: a/, rv: 0
 FINISH ADD a/b/defaults/pref/channel-prefs.js
 FINISH ADD precomplete
 FINISH ADD a/b/searchplugins/searchpluginstext0
@@ -294,9 +290,9 @@ FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-a/b/9/92/, rv: 0
+removing directory: a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-a/b/9/91/, rv: 0
+removing directory: a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
@@ -322,9 +318,9 @@ FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-a/b/8/82/, rv: 0
+removing directory: a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-a/b/8/81/, rv: 0
+removing directory: a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
@@ -336,8 +332,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
 FINISH REMOVEFILE a/b/7/71/7xtext0
 FINISH REMOVEFILE a/b/7/71/7xtext1
 FINISH REMOVEDIR a/b/7/71/
-FINISH REMOVEFILE a/b/7/7text0
-FINISH REMOVEFILE a/b/7/7text1
 FINISH REMOVEDIR a/b/7/
 FINISH REMOVEDIR a/b/6/
 FINISH REMOVEFILE a/b/5/5text1
diff --git a/toolkit/mozapps/update/test/unit/data/complete_log_success b/toolkit/mozapps/update/test/unit/data/complete_log_success
index c5baa2f7bcea..d70e704eebfd 100644
--- a/toolkit/mozapps/update/test/unit/data/complete_log_success
+++ b/toolkit/mozapps/update/test/unit/data/complete_log_success
@@ -91,8 +91,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
 PREPARE REMOVEFILE a/b/7/71/7xtext0
 PREPARE REMOVEFILE a/b/7/71/7xtext1
 PREPARE REMOVEDIR a/b/7/71/
-PREPARE REMOVEFILE a/b/7/7text0
-PREPARE REMOVEFILE a/b/7/7text1
 PREPARE REMOVEDIR a/b/7/
 PREPARE REMOVEDIR a/b/6/
 PREPARE REMOVEFILE a/b/5/5text1
@@ -198,8 +196,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
 EXECUTE REMOVEFILE a/b/7/71/7xtext0
 EXECUTE REMOVEFILE a/b/7/71/7xtext1
 EXECUTE REMOVEDIR a/b/7/71/
-EXECUTE REMOVEFILE a/b/7/7text0
-EXECUTE REMOVEFILE a/b/7/7text1
 EXECUTE REMOVEDIR a/b/7/
 EXECUTE REMOVEDIR a/b/6/
 EXECUTE REMOVEFILE a/b/5/5text1
@@ -227,27 +223,27 @@ FINISH REMOVEFILE a/b/2/20/20png0.png
 FINISH REMOVEFILE a/b/0/0exe0.exe
 FINISH REMOVEFILE a/b/0/00/00text0
 FINISH REMOVEDIR a/b/searchplugins/
-a/b/searchplugins/, rv: 0
+removing directory: a/b/searchplugins/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions1/
-a/b/extensions/extensions1/, rv: 0
+removing directory: a/b/extensions/extensions1/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions0/
-a/b/extensions/extensions0/, rv: 0
+removing directory: a/b/extensions/extensions0/, rv: 0
 FINISH REMOVEDIR a/b/extensions/
-a/b/extensions/, rv: 0
+removing directory: a/b/extensions/, rv: 0
 FINISH REMOVEDIR a/b/defaults/pref/
-a/b/defaults/pref/, rv: 0
+removing directory: a/b/defaults/pref/, rv: 0
 FINISH REMOVEDIR a/b/defaults/
-a/b/defaults/, rv: 0
+removing directory: a/b/defaults/, rv: 0
 FINISH REMOVEDIR a/b/2/20/
 FINISH REMOVEDIR a/b/2/
 FINISH REMOVEDIR a/b/0/00/
-a/b/0/00/, rv: 0
+removing directory: a/b/0/00/, rv: 0
 FINISH REMOVEDIR a/b/0/
-a/b/0/, rv: 0
+removing directory: a/b/0/, rv: 0
 FINISH REMOVEDIR a/b/
-a/b/, rv: 0
+removing directory: a/b/, rv: 0
 FINISH REMOVEDIR a/
-a/, rv: 0
+removing directory: a/, rv: 0
 FINISH ADD precomplete
 FINISH ADD a/b/searchplugins/searchpluginstext0
 FINISH ADD a/b/searchplugins/searchpluginspng1.png
@@ -287,9 +283,9 @@ FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-a/b/9/92/, rv: 0
+removing directory: a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-a/b/9/91/, rv: 0
+removing directory: a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
@@ -315,9 +311,9 @@ FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-a/b/8/82/, rv: 0
+removing directory: a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-a/b/8/81/, rv: 0
+removing directory: a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
@@ -329,8 +325,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
 FINISH REMOVEFILE a/b/7/71/7xtext0
 FINISH REMOVEFILE a/b/7/71/7xtext1
 FINISH REMOVEDIR a/b/7/71/
-FINISH REMOVEFILE a/b/7/7text0
-FINISH REMOVEFILE a/b/7/7text1
 FINISH REMOVEDIR a/b/7/
 FINISH REMOVEDIR a/b/6/
 FINISH REMOVEFILE a/b/5/5text1
diff --git a/toolkit/mozapps/update/test/unit/data/partial_log_failure b/toolkit/mozapps/update/test/unit/data/partial_log_failure
index 42e60ef422af..b63504c73b80 100644
--- a/toolkit/mozapps/update/test/unit/data/partial_log_failure
+++ b/toolkit/mozapps/update/test/unit/data/partial_log_failure
@@ -72,8 +72,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
 PREPARE REMOVEFILE a/b/7/71/7xtext0
 PREPARE REMOVEFILE a/b/7/71/7xtext1
 PREPARE REMOVEDIR a/b/7/71/
-PREPARE REMOVEFILE a/b/7/7text0
-PREPARE REMOVEFILE a/b/7/7text1
 PREPARE REMOVEDIR a/b/7/
 PREPARE REMOVEDIR a/b/6/
 PREPARE REMOVEFILE a/b/5/5text1
@@ -168,10 +166,6 @@ FINISH REMOVEFILE a/b/7/71/7xtext0
 backup_restore: backup file doesn't exist: a/b/7/71/7xtext0.moz-backup
 FINISH REMOVEFILE a/b/7/71/7xtext1
 backup_restore: backup file doesn't exist: a/b/7/71/7xtext1.moz-backup
-FINISH REMOVEFILE a/b/7/7text0
-backup_restore: backup file doesn't exist: a/b/7/7text0.moz-backup
-FINISH REMOVEFILE a/b/7/7text1
-backup_restore: backup file doesn't exist: a/b/7/7text1.moz-backup
 FINISH REMOVEFILE a/b/5/5text1
 backup_restore: backup file doesn't exist: a/b/5/5text1.moz-backup
 FINISH REMOVEFILE a/b/5/5text0
diff --git a/toolkit/mozapps/update/test/unit/data/partial_log_success b/toolkit/mozapps/update/test/unit/data/partial_log_success
index fd7aed808127..8dbf02413882 100644
--- a/toolkit/mozapps/update/test/unit/data/partial_log_success
+++ b/toolkit/mozapps/update/test/unit/data/partial_log_success
@@ -72,8 +72,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
 PREPARE REMOVEFILE a/b/7/71/7xtext0
 PREPARE REMOVEFILE a/b/7/71/7xtext1
 PREPARE REMOVEDIR a/b/7/71/
-PREPARE REMOVEFILE a/b/7/7text0
-PREPARE REMOVEFILE a/b/7/7text1
 PREPARE REMOVEDIR a/b/7/
 PREPARE REMOVEDIR a/b/6/
 PREPARE REMOVEFILE a/b/5/5text1
@@ -160,8 +158,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
 EXECUTE REMOVEFILE a/b/7/71/7xtext0
 EXECUTE REMOVEFILE a/b/7/71/7xtext1
 EXECUTE REMOVEDIR a/b/7/71/
-EXECUTE REMOVEFILE a/b/7/7text0
-EXECUTE REMOVEFILE a/b/7/7text1
 EXECUTE REMOVEDIR a/b/7/
 EXECUTE REMOVEDIR a/b/6/
 EXECUTE REMOVEFILE a/b/5/5text1
@@ -220,9 +216,9 @@ FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-a/b/9/92/, rv: 0
+removing directory: a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-a/b/9/91/, rv: 0
+removing directory: a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
@@ -248,9 +244,9 @@ FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-a/b/8/82/, rv: 0
+removing directory: a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-a/b/8/81/, rv: 0
+removing directory: a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
@@ -262,8 +258,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
 FINISH REMOVEFILE a/b/7/71/7xtext0
 FINISH REMOVEFILE a/b/7/71/7xtext1
 FINISH REMOVEDIR a/b/7/71/
-FINISH REMOVEFILE a/b/7/7text0
-FINISH REMOVEFILE a/b/7/7text1
 FINISH REMOVEDIR a/b/7/
 FINISH REMOVEDIR a/b/6/
 FINISH REMOVEFILE a/b/5/5text1
diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in
index 725ed20cceab..e440b2495d1f 100644
--- a/toolkit/mozapps/update/test/unit/head_update.js.in
+++ b/toolkit/mozapps/update/test/unit/head_update.js.in
@@ -673,12 +673,16 @@ function checkUpdateLogContents(aCompareLogFile) {
   // Replace error codes since they are different on each platform.
   updateLogContents = updateLogContents.replace(/, err:.*\n/g, "\n");
   // Replace to make the log parsing happy.
-  updateLogContents = updateLogContents.replace(/non-fatal error removing directory: /g, "");
+  updateLogContents = updateLogContents.replace(/non-fatal error /g, "");
+  // The FindFile results when enumerating the filesystem on Windows is not
+  // determistic so the results matching the following need to be ignored.
+  updateLogContents = updateLogContents.replace(/.* a\/b\/7\/7text.*\n/g, "");
+
 
   let compareLog = do_get_file(aCompareLogFile);
   let compareLogContents = readFileBytes(compareLog);
 
-  do_check_eq(updateLogContents, compareLogContents);
+  do_check_eq(compareLogContents, updateLogContents);
 }
 
 function checkUpdateLogContains(aCheckString) {

From 87a7835525d7e6085df3b53fded9aedc4a4ec2c8 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Tue, 19 Apr 2011 11:04:12 -0700
Subject: [PATCH 070/509] Increase app update test timeout - Bug 645607 -
 Intermittent failure in
 toolkit/mozapps/update/test/chrome/test_0072_notify_verifyFailComplete_noPartial.xul
 | Test timed out. Maximum time allowed is 20 seconds. r=mossop

---
 toolkit/mozapps/update/test/chrome/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/mozapps/update/test/chrome/utils.js b/toolkit/mozapps/update/test/chrome/utils.js
index d3e34b2a1170..c782f64029a8 100644
--- a/toolkit/mozapps/update/test/chrome/utils.js
+++ b/toolkit/mozapps/update/test/chrome/utils.js
@@ -154,7 +154,7 @@ const TEST_ADDONS = [ "appdisabled_1", "appdisabled_2",
                       "userdisabled_1", "userdisabled_2" ];
 
 
-const TEST_TIMEOUT = 20000; // 20 seconds
+const TEST_TIMEOUT = 25000; // 25 seconds
 var gTimeoutTimer;
 
 // The number of SimpleTest.executeSoon calls to perform when waiting on an

From 3b552acc343adb10813648ab89a33c247b94253f Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Tue, 19 Apr 2011 14:13:58 -0500
Subject: [PATCH 071/509] Bug 651177 - [Mac] Crashes [@
 nsObjectFrame::GetLayerState ]. r=bsmedberg

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

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 3b2b9090ef54..0be218f4bed8 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -4290,7 +4290,7 @@ NPDrawingModel nsPluginInstanceOwner::GetDrawingModel()
 
 PRBool nsPluginInstanceOwner::IsRemoteDrawingCoreAnimation()
 {
-  if (mInstance)
+  if (!mInstance)
     return PR_FALSE;
 
   PRBool coreAnimation;

From a9bc761c9666cd3cbbc5396acfbf7fc0c5b73b7e Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 13 Apr 2011 03:03:43 -0400
Subject: [PATCH 072/509] Add a comment to point out that branding changes
 often requires clobbers

---
 browser/confvars.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index d3f315b0b594..33bf281934d8 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -50,5 +50,7 @@ MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
+# Changing either of these values requires a clobber to ensure correct results,
+# because branding dependencies are broken.
 MOZ_BRANDING_DIRECTORY=browser/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official

From 7fbf2421e229ca128e6ff458ee4beb6b09bd4a7a Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Sat, 16 Apr 2011 21:17:17 -0400
Subject: [PATCH 073/509] Bug 513648: Fix mistake in the original patch that
 implemented middlemouse-paste whitespace stripping

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

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 55aeaec3f8b8..acecd2afa892 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5559,7 +5559,7 @@ function middleMousePaste(event) {
 
   // Strip embedded newlines and surrounding whitespace, to match the URL
   // bar's behavior (stripsurroundingwhitespace)
-  clipboard.replace(/\s*\n\s*/g, "");
+  clipboard = clipboard.replace(/\s*\n\s*/g, "");
 
   let url = getShortcutOrURI(clipboard);
   try {

From 74317b2092d32e3508ad2e8390f2d0397826990b Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 18 Mar 2011 14:21:02 -0700
Subject: [PATCH 074/509] Bug 634065 - Implement design for identity block and
 persistent indicators, r=dao

---
 browser/base/content/browser.js               |   2 +-
 .../themes/gnomestripe/browser/browser.css    |  81 +++++++++++---
 browser/themes/gnomestripe/browser/jar.mn     |   2 +-
 .../gnomestripe/browser/urlbar-arrow.png      | Bin 0 -> 305 bytes
 .../browser/urlbar-favicon-glow.png           | Bin 619 -> 0 bytes
 browser/themes/pinstripe/browser/browser.css  | 100 +++++++++++-------
 browser/themes/pinstripe/browser/jar.mn       |   2 +-
 .../themes/pinstripe/browser/urlbar-arrow.png | Bin 0 -> 305 bytes
 .../pinstripe/browser/urlbar-favicon-glow.png | Bin 504 -> 0 bytes
 browser/themes/winstripe/browser/browser.css  |  94 +++++++++++-----
 browser/themes/winstripe/browser/jar.mn       |   4 +-
 .../themes/winstripe/browser/urlbar-arrow.png | Bin 0 -> 305 bytes
 .../winstripe/browser/urlbar-favicon-glow.png | Bin 619 -> 0 bytes
 13 files changed, 201 insertions(+), 84 deletions(-)
 create mode 100644 browser/themes/gnomestripe/browser/urlbar-arrow.png
 delete mode 100644 browser/themes/gnomestripe/browser/urlbar-favicon-glow.png
 create mode 100644 browser/themes/pinstripe/browser/urlbar-arrow.png
 delete mode 100644 browser/themes/pinstripe/browser/urlbar-favicon-glow.png
 create mode 100644 browser/themes/winstripe/browser/urlbar-arrow.png
 delete mode 100644 browser/themes/winstripe/browser/urlbar-favicon-glow.png

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index acecd2afa892..7d1cd26fcd6f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7794,7 +7794,7 @@ var gIdentityHandler = {
     dt.setData("text/uri-list", value);
     dt.setData("text/plain", value);
     dt.setData("text/html", htmlString);
-    dt.addElement(event.currentTarget);
+    dt.setDragImage(gProxyFavIcon, 16, 16);
   }
 };
 
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 7454417b0d3d..5e5c40a02fb2 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -970,7 +970,6 @@ toolbar[iconsize="small"] #feed-button {
   width: 24px;
   height: 20px;
   padding: 2px 4px;
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
 }
 
 #page-proxy-favicon:not([src]) {
@@ -987,37 +986,67 @@ toolbar[iconsize="small"] #feed-button {
 
 /* Identity indicator */
 #identity-box {
-  background-color: rgb(95%,95%,95%);
-  background-image: -moz-linear-gradient(rgba(170,170,170,.25), rgba(0,0,0,.3));
-  color: #444;
-  box-shadow: 0 0 0 1px rgba(0,0,0,.1) inset;
-  border-radius: 1.5px;
+  background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
+  -moz-border-end: 1px solid rgba(0,0,0,.1);
+  padding: 1px;
+  margin: -1px;
+  -moz-margin-end: 0;
+}
+
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2.5px;
+  border-bottom-left-radius: 2.5px;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2.5px;
+  border-bottom-right-radius: 2.5px;
 }
 
 #identity-box:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
+  outline: 1px dotted #000;
+  outline-offset: -3px;
 }
 
 #identity-box:hover:active,
 #identity-box[open="true"] {
-  background-image: -moz-linear-gradient(rgba(0,0,0,.4), rgba(0,0,0,.1));
+  background-image: -moz-linear-gradient(hsl(0,0%,92%), hsl(0,0%,82%));
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
+              0 1px 3px hsla(0,0%,0%,.3) inset;
 }
 
 #identity-icon-labels {
   -moz-padding-start: 2px;
-  -moz-padding-end: 3px;
+  -moz-padding-end: 5px;
 }
 
 #identity-box.verifiedDomain {
-  background-color: rgba(30, 80, 170, 0.7);
-  color: white;
-  text-shadow: 0 1px 0 rgba(0,0,0,.25);
+  background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
+  box-shadow: 0 1px 0 hsla(215,54%,33%,.05) inset;
+  -moz-border-end-color: hsla(215,54%,33%,.2);
+  color: hsl(215,54%,33%);
+}
+
+#identity-box.verifiedDomain:hover:active,
+#identity-box.verifiedDomain[open="true"] {
+  background-image: -moz-linear-gradient(hsl(215,80%,80%), hsl(215,67%,65%));
+  box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
+              0 1px 3px 1px hsla(215,54%,33%,.5) inset;
 }
 
 #identity-box.verifiedIdentity {
-  background-color: rgba(50, 150, 50, 0.8);
-  color: white;
-  text-shadow: 0 1px 0 rgba(0,0,0,.25);
+  background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
+  box-shadow: 0 1px 0 hsla(92,81%,16%,.05) inset;
+  -moz-border-end-color: hsla(92,81%,16%,.2);
+  color: hsl(92,81%,16%);
+}
+
+#identity-box.verifiedIdentity:hover:active,
+#identity-box.verifiedIdentity[open="true"] {
+  background-image: -moz-linear-gradient(hsl(92,65%,70%), hsl(92,40%,48%));
+  box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
+              0 1px 3px 1px hsla(92,81%,16%,.5) inset;
 }
 
 /* Identity popup icons */
@@ -1146,7 +1175,25 @@ toolbar[iconsize="small"] #feed-button {
 
 /* Notification icon box */
 #notification-popup-box {
-  margin: 0 3px;
+  position: relative;
+  background-color: #fff;
+  background-clip: padding-box;
+  padding-left: 4px;
+  border-radius: 2.5px 0 0 2.5px;
+  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  -moz-margin-end: -8px;
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
@@ -1256,7 +1303,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 #urlbar > toolbarbutton {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  margin: -2px;
+  margin: -1px;
   -moz-margin-start: 0;
   padding: 0 3px;
   background-origin: border-box;
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 432e8e06d6e9..0fe27e649eb1 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -37,7 +37,7 @@ browser.jar:
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-small.png
-  skin/classic/browser/urlbar-favicon-glow.png
+  skin/classic/browser/urlbar-arrow.png
   skin/classic/browser/feeds/feedIcon.png             (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png           (feeds/feedIcon16.png)
   skin/classic/browser/feeds/videoFeedIcon.png        (feeds/videoFeedIcon.png)
diff --git a/browser/themes/gnomestripe/browser/urlbar-arrow.png b/browser/themes/gnomestripe/browser/urlbar-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcab253bb301ddfb14e5cabfaa441a6fffff81ee
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000O8000&U1^@s6{nOoG0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy(@8`@RCwBAU|?X-0b&sbT;SWcZ)bs&
z84xpLRq!7OZrr%B2FO&yso>wgfB*OF*|QzU<;SW31U`QJcn-)l0b(Ys3ZPb90tzYM
zRPguj-~SyQ9YsK4F02Yb;Khp<D}cg=I2C}vqD6}`fKpO875w`33luh{K+KL+0SG*M
z_Ur;El$jU^0c^T||NadNes<Cw3H7D{5Hm8M2P-g67=XG@0-3i#dNEA6aN)vwoI(Bh
z^XGF=zhjTAzP`SEoY9Rp!9bH7$Y>T^VTCu*0t6TU2HhI)hrNZJ00000NkvXXu0mjf
DzTkRv

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/browser/urlbar-favicon-glow.png b/browser/themes/gnomestripe/browser/urlbar-favicon-glow.png
deleted file mode 100644
index 19de6ff972550759b8eedb5b2caf6146d599973f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00007bV*G`2iOGx
z2?s1NtsPtd000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006JZHwB960005{Nkl<Z
zc-pmAi*AE35DO^-+PxqD|A*7MwOv;VVL4_O>qNDOG$e~OyR&mna;zAJA%+kZf->U*
z;|SQ?+><hTz{YJxCv$x%L`GU=)B-P5IPwI-Bgj884j2ysD~lj*fJ?x}E5wv%1Ug`!
z@t&~*B4S!rU;@jG>x?_RZ!p(DVBrL4!vUn5j90{+D&*=atk%dM02^P;SQSuyf;DE#
zR;s1=XdO3{*4$=10T15@a5E`Tqe52I(jr!HB^Etq++(hRKp|iS9Rw<fAF&r(SXQb)
z1HxPQe}k%OS-s!n9^w(d_p%o?1r`We!biRv1XXT>2dRRV^)COE7o`H8{UrqT<aqLc
zca#NIlFxk`EAWB5(NV|~FOHBGZX6|__a^EEif%k-Nx~ds^_k--qANQ%;-5Zeb9gb*
z41BUbMTHQux<T@7Jd`qFC&A8f=Y!5z7Ub{D@8msl#4vTk17H_N+pbnKN8US*J@QA6
z5&><PIwHXfMhoK^axRMbd;B)R@q5sPsh8Uoe+yq{c@d_DrmZ4~XeW8Ezy?AGRzLyv
zk2MGf1hE(SX2(5ik@tdJ8}HO2w%lEq`gsERZ`!rxK0{<nn{*HKOLT;nD+v7NgR_Q3
zrwV8h$rIE!;qRYJp2VK_pp_)9s>X)@^`mb{#ee_X@(F0w1Dmy^e9!;@002ovPDHLk
FV1f$<0{Z{}

diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 2553bc279a1c..377eb94d45fd 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -779,7 +779,7 @@ toolbar[mode="icons"] #zoom-in-button {
   width: 7em;
   min-width: 7em;
   -moz-appearance: none;
-  box-shadow: 0 1px rgba(255, 255, 255, 0.2), inset 0 1px #d6d6d6;
+  box-shadow: 0 1px rgba(255, 255, 255, 0.2), inset 0 1px hsla(0,0%,0%,.05);
   margin: 0 4px;
   padding: 0;
   border: 1px solid;
@@ -807,45 +807,65 @@ toolbar[mode="icons"] #zoom-in-button {
 }
 
 #identity-box {
-  margin: 1px;
-  border-radius: 2px;
-  padding: 1px;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.2);
-}
-
-
-#identity-box:-moz-focusring {
-  box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
-              0 0 2px 2px -moz-mac-focusring;
-}
-
-#identity-box {
-  color: white;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7);
+  background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
+  -moz-border-end: 1px solid hsla(0,0%,0%,.1);
   -moz-margin-end: 3px;
+  padding: 1px 4px;
 }
 
-#identity-box {
-  background-image: -moz-linear-gradient(#FFF, #DDD);
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
 }
 
 #identity-box:active:hover,
 #identity-box[open="true"] {
-  box-shadow: inset 0 2px 5px rgba(0, 0, 0, 0.35),
-              inset 0 0 0 20px rgba(0, 0, 0, 0.06);
+  background-image: -moz-linear-gradient(hsl(0,0%,93%), hsl(0,0%,80%));
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
+              0 1px 3px hsla(0,0%,0%,.3) inset;
 }
 
 #identity-box.verifiedDomain {
-  background-image: -moz-linear-gradient(#588EC6, #3C68AE);
+  background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
+  -moz-border-end-color: hsla(215,54%,33%,.2);
+  color: hsl(215,54%,33%);
+}
+
+#identity-box.verifiedDomain:active:hover,
+#identity-box.verifiedDomain[open="true"] {
+  background-image: -moz-linear-gradient(hsl(215,85%,85%), hsl(215,70%,68%));
+  box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
+              0 1px 3px 1px hsla(215,54%,33%,.5) inset;
 }
 
 #identity-box.verifiedIdentity {
-  background-image: -moz-linear-gradient(#84BB40, #5BA020);
+  background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
+  -moz-border-end-color: hsla(92,81%,16%,.2);
+  color: hsl(92,100%,20%);
+}
+
+#identity-box.verifiedIdentity:active:hover,
+#identity-box.verifiedIdentity[open="true"] {
+  background-image: -moz-linear-gradient(hsl(92,69%,77%), hsl(92,44%,51%));
+  box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
+              0 1px 3px 1px hsla(92,81%,16%,.5) inset;
+}
+
+#identity-box:-moz-focusring {
+  box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
+              0 0 2px 2px -moz-mac-focusring;
+  -moz-border-end-style: none;
+  -moz-padding-end: 5px;
 }
 
 #identity-icon-labels {
-  margin: 0 4px 1px;
+  -moz-margin-start: 6px;
 }
 
 .urlbar-input-box {
@@ -875,20 +895,8 @@ toolbar[mode="icons"] #zoom-in-button {
 }
 
 #page-proxy-stack {
-  width: 18px;
+  width: 16px;
   height: 16px;
-  padding: 0 1px;
-}
-
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  width: 24px;
-  padding: 0 4px;
-}
-
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
 }
 
 #page-proxy-favicon:not([src]) {
@@ -2082,7 +2090,23 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #notification-popup-box {
-  margin: 0 3px;
+  position: relative;
+  background-color: #fff;
+  background-clip: padding-box;
+  padding-left: 3px;
+  border-radius: 2px 0 0 2px;
+  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  -moz-margin-end: -8px;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 99f52b5c603a..7f371640dc50 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -45,7 +45,7 @@ browser.jar:
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar.png
   skin/classic/browser/toolbarbutton-dropmarker.png
-  skin/classic/browser/urlbar-favicon-glow.png
+  skin/classic/browser/urlbar-arrow.png
   skin/classic/browser/urlbar-popup-blocked.png
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/subscribe-ui.css               (feeds/subscribe-ui.css)
diff --git a/browser/themes/pinstripe/browser/urlbar-arrow.png b/browser/themes/pinstripe/browser/urlbar-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcab253bb301ddfb14e5cabfaa441a6fffff81ee
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000O8000&U1^@s6{nOoG0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy(@8`@RCwBAU|?X-0b&sbT;SWcZ)bs&
z84xpLRq!7OZrr%B2FO&yso>wgfB*OF*|QzU<;SW31U`QJcn-)l0b(Ys3ZPb90tzYM
zRPguj-~SyQ9YsK4F02Yb;Khp<D}cg=I2C}vqD6}`fKpO875w`33luh{K+KL+0SG*M
z_Ur;El$jU^0c^T||NadNes<Cw3H7D{5Hm8M2P-g67=XG@0-3i#dNEA6aN)vwoI(Bh
z^XGF=zhjTAzP`SEoY9Rp!9bH7$Y>T^VTCu*0t6TU2HhI)hrNZJ00000NkvXXu0mjf
DzTkRv

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/browser/urlbar-favicon-glow.png b/browser/themes/pinstripe/browser/urlbar-favicon-glow.png
deleted file mode 100644
index 68803e5d07861fc2fe1bec2fc0ef3ba2e05fed24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq000;O000yS1^@s6m$m(a00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzib+I4RCwC7
zRcmX*FbuREw^^1!1ABeh|Nn7gg%%ppM-orYPT?lHkqv4%oY>Z#CCjo;DS7wRa$f*z
zLKFnd>)Hg2f?jYY3_zZrjG25TxD(WZ2cW`SFajfpI>7;G1xKuzL?Vm=NHY0G@FaK?
zG!R>14Yw?C0qIV#6@1X#v<dYfARINw-vqA^t0+uXpoa$y);Wyzm>=1LHA0ei{vvqB
ze+loL36X}Of^DL3bvO?nDgG+Z0Qvi#!sCqxdJZa{3HJ!q9^*ZG5V4yYeF^e{NNgL>
zm&SI^JQfI)Nd;w&4G()zP|vo31soBCA4vTb0Tt2lZ^VwWhY7q9T-vPN%oW^?TQFBY
z8TXeqYnN=P;ItblJJK&=>B^lL=@!o(SmFy6EGuR`<uz<O3q?~EJJgnrik!_B>v1MM
z8Qb0p47iC06s`?!wp&mtPGq;k_nE7y?nDK)*uBTtl46%j!#iwMVD`X~KuaaJ`)9ds
uNx(((cpRzZvNwNyaP**)zx9*(DZl_xp1-<|EHsn=0000<MNUMnLSTZADbOAO

diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 1831d8c9e420..9ecb2b730051 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1176,50 +1176,79 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 /* identity box */
 
 #identity-box {
-  background-color: -moz-dialog;
-  background-image: -moz-linear-gradient(rgba(255,255,255,.25), rgba(0,0,0,.15));
-  color: -moz-dialogText;
-  border-radius: 2px;
+  background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
+  -moz-border-end: 1px solid hsla(0,0%,0%,.1);
+  padding: 2px;
+  margin: -2px;
+  -moz-margin-end: 0;
+}
+
+#identity-box:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2.5px;
+  border-bottom-left-radius: 2.5px;
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2.5px;
+  border-bottom-right-radius: 2.5px;
 }
 
 #identity-box:hover {
-  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(50%,50%,50%,.2), rgba(0,0,0,.15));
+  background-image: -moz-linear-gradient(hsl(0,0%,95%), hsl(0,0%,87%));
 }
 
 #identity-box[open="true"],
 #identity-box:hover:active {
-  background-image: -moz-linear-gradient(rgba(0,0,0,.4), rgba(0,0,0,.1));
-}
-
-#identity-box.verifiedDomain,
-#identity-box.verifiedIdentity {
-  color: white;
-  text-shadow: 0 1px 0 rgba(0,0,0,.25);
-  box-shadow: 0 0 0 1px rgba(0,0,0,.2) inset;
+  background-image: -moz-linear-gradient(hsl(0,0%,92%), hsl(0,0%,82%));
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
+              0 1px 3px hsla(0,0%,0%,.3) inset;
 }
 
 #identity-box.verifiedDomain {
-  background-color: hsl(219,45%,60%);
+  background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
+  box-shadow: 0 1px 0 hsla(215,54%,33%,.05) inset;
+  -moz-border-end-color: hsla(215,54%,33%,.2);
+  color: hsl(215,54%,33%);
+}
+
+#identity-box.verifiedDomain:hover {
+  background-image: -moz-linear-gradient(hsl(215,85%,85%), hsl(215,70%,68%));
+}
+
+#identity-box.verifiedDomain[open="true"],
+#identity-box.verifiedDomain:hover:active {
+  background-image: -moz-linear-gradient(hsl(215,80%,80%), hsl(215,67%,65%));
+  box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
+              0 1px 3px 1px hsla(215,54%,33%,.5) inset;
 }
 
 #identity-box.verifiedIdentity {
-  background-color: hsl(92,45%,52%);
+  background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
+  box-shadow: 0 1px 0 hsla(92,81%,16%,.05) inset;
+  -moz-border-end-color: hsla(92,81%,16%,.2);
+  color: hsl(92,100%,20%);
+}
+
+#identity-box.verifiedIdentity:hover {
+  background-image: -moz-linear-gradient(hsl(92,69%,77%), hsl(92,44%,51%));
+}
+
+#identity-box.verifiedIdentity[open="true"],
+#identity-box.verifiedIdentity:hover:active {
+  background-image: -moz-linear-gradient(hsl(92,65%,70%), hsl(92,40%,48%));
+  box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
+              0 1px 3px 1px hsla(92,81%,16%,.5) inset;
 }
 
 #identity-box:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
+  outline: 1px dotted #000;
   outline-offset: -3px;
 }
 
-#identity-box.verifiedDomain:-moz-focusring,
-#identity-box.verifiedIdentity:-moz-focusring {
-  outline-color: white;
-}
-
 #identity-icon-labels {
   -moz-margin-start: 1px;
   -moz-margin-end: 3px;
-  -moz-transform: translate(0, -1px);
 }
 
 /* Location bar dropmarker */
@@ -1255,7 +1284,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   width: 24px;
   height: 18px;
   padding: 1px 4px;
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
 }
 
 #page-proxy-favicon:not([src]) {
@@ -2029,7 +2057,25 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Notification icon box */
 #notification-popup-box {
-  margin: 0 3px;
+  position: relative;
+  background-color: #fff;
+  background-clip: padding-box;
+  padding-left: 3px;
+  border-radius: 2.5px 0 0 2.5px;
+  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  -moz-margin-end: -8px;
+  margin-top: -2px;
+  margin-bottom: -2px;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index 45b27d4849e6..926c5af2f90c 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -45,7 +45,7 @@ browser.jar:
         skin/classic/browser/menu-forward.png                        (menu-forward.png)
         skin/classic/browser/monitor.png
         skin/classic/browser/monitor_16-10.png
-        skin/classic/browser/urlbar-favicon-glow.png
+        skin/classic/browser/urlbar-arrow.png
         skin/classic/browser/urlbar-popup-blocked.png
         skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
@@ -158,7 +158,7 @@ browser.jar:
         skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
         skin/classic/aero/browser/monitor.png
         skin/classic/aero/browser/monitor_16-10.png
-        skin/classic/aero/browser/urlbar-favicon-glow.png
+        skin/classic/aero/browser/urlbar-arrow.png
         skin/classic/aero/browser/urlbar-popup-blocked.png
         skin/classic/aero/browser/feeds/feedIcon.png                 (feeds/feedIcon-aero.png)
         skin/classic/aero/browser/feeds/feedIcon16.png               (feeds/feedIcon16-aero.png)
diff --git a/browser/themes/winstripe/browser/urlbar-arrow.png b/browser/themes/winstripe/browser/urlbar-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcab253bb301ddfb14e5cabfaa441a6fffff81ee
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000O8000&U1^@s6{nOoG0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy(@8`@RCwBAU|?X-0b&sbT;SWcZ)bs&
z84xpLRq!7OZrr%B2FO&yso>wgfB*OF*|QzU<;SW31U`QJcn-)l0b(Ys3ZPb90tzYM
zRPguj-~SyQ9YsK4F02Yb;Khp<D}cg=I2C}vqD6}`fKpO875w`33luh{K+KL+0SG*M
z_Ur;El$jU^0c^T||NadNes<Cw3H7D{5Hm8M2P-g67=XG@0-3i#dNEA6aN)vwoI(Bh
z^XGF=zhjTAzP`SEoY9Rp!9bH7$Y>T^VTCu*0t6TU2HhI)hrNZJ00000NkvXXu0mjf
DzTkRv

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/browser/urlbar-favicon-glow.png b/browser/themes/winstripe/browser/urlbar-favicon-glow.png
deleted file mode 100644
index 19de6ff972550759b8eedb5b2caf6146d599973f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00007bV*G`2iOGx
z2?s1NtsPtd000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006JZHwB960005{Nkl<Z
zc-pmAi*AE35DO^-+PxqD|A*7MwOv;VVL4_O>qNDOG$e~OyR&mna;zAJA%+kZf->U*
z;|SQ?+><hTz{YJxCv$x%L`GU=)B-P5IPwI-Bgj884j2ysD~lj*fJ?x}E5wv%1Ug`!
z@t&~*B4S!rU;@jG>x?_RZ!p(DVBrL4!vUn5j90{+D&*=atk%dM02^P;SQSuyf;DE#
zR;s1=XdO3{*4$=10T15@a5E`Tqe52I(jr!HB^Etq++(hRKp|iS9Rw<fAF&r(SXQb)
z1HxPQe}k%OS-s!n9^w(d_p%o?1r`We!biRv1XXT>2dRRV^)COE7o`H8{UrqT<aqLc
zca#NIlFxk`EAWB5(NV|~FOHBGZX6|__a^EEif%k-Nx~ds^_k--qANQ%;-5Zeb9gb*
z41BUbMTHQux<T@7Jd`qFC&A8f=Y!5z7Ub{D@8msl#4vTk17H_N+pbnKN8US*J@QA6
z5&><PIwHXfMhoK^axRMbd;B)R@q5sPsh8Uoe+yq{c@d_DrmZ4~XeW8Ezy?AGRzLyv
zk2MGf1hE(SX2(5ik@tdJ8}HO2w%lEq`gsERZ`!rxK0{<nn{*HKOLT;nD+v7NgR_Q3
zrwV8h$rIE!;qRYJp2VK_pp_)9s>X)@^`mb{#ee_X@(F0w1Dmy^e9!;@002ovPDHLk
FV1f$<0{Z{}


From d10669b202028a13e2f7236f6fc03125f4c2cbec Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 11:45:19 +0200
Subject: [PATCH 075/509] Bug 651078 - Make
 content/html/content/test/test_bug613113.html non flaky. r=ehsan

---
 content/html/content/test/test_bug613113.html | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/content/html/content/test/test_bug613113.html b/content/html/content/test/test_bug613113.html
index 73163e9ba5aa..6fbceacbd50b 100644
--- a/content/html/content/test/test_bug613113.html
+++ b/content/html/content/test/test_bug613113.html
@@ -27,7 +27,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=613113
 SimpleTest.waitForExplicitFinish();
 
 var invalidEvent = false;
-var submit = false;
 
 var form = document.forms[0];
 var button = document.getElementsByTagName('button')[0];
@@ -39,25 +38,20 @@ output.addEventListener("invalid", function() {
   } else {
     invalidEvent = true;
     ok(true, "invalid event has been caught");
+    setTimeout(function() {
+      SimpleTest.finish();
+    }, 0);
   }
 }, false);
 
 form.addEventListener("submit", function() {
-  submit = true;
+  ok(false, "submit event should not have been send");
 }, false);
 
 output.setCustomValidity("foo");
 
 button.click();
 
-setTimeout(function() {
-  if (!invalidEvent) {
-    ok(false, "invalid event should have been caught");
-  }
-  ok(!submit, "submit event should not have been send");
-  SimpleTest.finish();
-}, 1000);
-
 </script>
 </pre>
 </body>

From 43e179f390c3866d8148267b5a392b8d9c820ed1 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 11:45:54 +0200
Subject: [PATCH 076/509] Bug 651077 - Make
 content/html/content/test/test_bug209275.xhtml and
 content/html/content/test/test_bug481335.xhtml non flaky. r=ehsan

---
 content/html/content/test/test_bug209275.xhtml | 4 ++--
 content/html/content/test/test_bug481335.xhtml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/html/content/test/test_bug209275.xhtml b/content/html/content/test/test_bug209275.xhtml
index ef53e897bf68..19e43cbbef03 100644
--- a/content/html/content/test/test_bug209275.xhtml
+++ b/content/html/content/test/test_bug209275.xhtml
@@ -153,13 +153,13 @@ function run() {
   // Because link coloring is asynchronous, we wait until it is updated (or we
   // timeout and fail anyway).
   while (getColor($('colorlink')) != visitedColor) {
-    setTimeout(continueTest, 10);
+    setTimeout(continueTest, 0);
     yield;
   }
   is(getColor($('colorlink')), visitedColor,
      "Wrong link color after base change.");
   while (getFill($('ellipselink')) != visitedFill) {
-    setTimeout(continueTest, 10);
+    setTimeout(continueTest, 0);
     yield;
   }
   is(getFill($('ellipselink')), visitedFill,
diff --git a/content/html/content/test/test_bug481335.xhtml b/content/html/content/test/test_bug481335.xhtml
index 525ff0e11e5a..f121f6981250 100644
--- a/content/html/content/test/test_bug481335.xhtml
+++ b/content/html/content/test/test_bug481335.xhtml
@@ -59,7 +59,7 @@ function checkLinkColor(aElmId, aExpectedColor, aMessage) {
     return utils.getVisitedDependentComputedStyle($(aElmId), "", "color");
   }
   while (getColor() != aExpectedColor) {
-    setTimeout(continueTest, 10);
+    setTimeout(continueTest, 0);
     return false;
   }
   is(getColor(), aExpectedColor, aMessage);

From b0831fbe4551801a49e1a1bc3121374d186aed31 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 11:46:16 +0200
Subject: [PATCH 077/509] Bug 651089 - Make
 content/events/test/test_bug534833.html non flaky. r=ehsan

---
 content/events/test/test_bug534833.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/content/events/test/test_bug534833.html b/content/events/test/test_bug534833.html
index fd995b4d5c48..0b5bbeec22bc 100644
--- a/content/events/test/test_bug534833.html
+++ b/content/events/test/test_bug534833.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=534833
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests()">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=534833">Mozilla Bug 534833</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -21,6 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=534833
 
 /** Test for Bug 534833 **/
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 var input1GotClick = 0;
 var input2GotClick = 0;
@@ -59,8 +60,13 @@ function nextTest_() {
 }
 
 function nextTest() {
-  document.getElementById("initialfocus").focus();
-  setTimeout(nextTest_, 100);
+  var el = document.getElementById("initialfocus");
+
+  el.addEventListener("focus", function() {
+    el.removeEventListener("focus", arguments.callee, false);
+    setTimeout(nextTest_, 0);
+  }, false);
+  el.focus();
 }
 
 function runTests() {

From 34bb38d9d18e8b4ea8171daedc4ffe75ee340084 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 11:46:32 +0200
Subject: [PATCH 078/509] Bug 651136 - Make
 content/events/test/test_bug238987.html non flaky. r=ehsan

---
 content/events/test/test_bug238987.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/events/test/test_bug238987.html b/content/events/test/test_bug238987.html
index 4ee9e8441e1f..4d0deff83133 100644
--- a/content/events/test/test_bug238987.html
+++ b/content/events/test/test_bug238987.html
@@ -136,7 +136,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
       setOrRestoreTabFocus(0);
       SimpleTest.finish();
     } else {
-      setTimeout(tab, 50);
+      setTimeout(tab, 0);
     }
   }
 
@@ -161,7 +161,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
 
   function doTest() {
     setOrRestoreTabFocus(7);
-    setTimeout(start, 100);
+    setTimeout(start, 0);
   }
 
   SimpleTest.waitForExplicitFinish();

From 9d29efb784161b7860e7d138f0c61368b013b1ae Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Wed, 20 Apr 2011 14:47:40 +0200
Subject: [PATCH 079/509] Bug 532738 - Do not open the virtual keyboard on
 untrusted focus (caused by content page scripts) [r=masayuki]

---
 content/events/src/nsIMEStateManager.cpp | 25 ++++++++++++++++------
 content/events/src/nsIMEStateManager.h   |  5 +++--
 dom/base/nsFocusManager.cpp              | 27 +++++++++++++++++++-----
 dom/base/nsFocusManager.h                |  7 ++++++
 dom/ipc/PBrowser.ipdl                    |  2 +-
 dom/ipc/TabParent.cpp                    |  3 ++-
 dom/ipc/TabParent.h                      |  2 +-
 embedding/android/GeckoAppShell.java     |  5 +++--
 embedding/android/GeckoSurfaceView.java  |  1 +
 widget/public/nsIWidget.h                | 23 ++++++++++++++++++++
 widget/src/android/nsWindow.cpp          | 19 ++++++++++++++++-
 widget/src/gtk2/nsGtkIMModule.cpp        | 17 +++++++++++++++
 widget/src/xpwidgets/PuppetWidget.cpp    |  3 ++-
 13 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
index 7246d4779d31..301b60b9f2af 100644
--- a/content/events/src/nsIMEStateManager.cpp
+++ b/content/events/src/nsIMEStateManager.cpp
@@ -89,7 +89,7 @@ nsIMEStateManager::OnDestroyPresContext(nsPresContext* aPresContext)
   nsCOMPtr<nsIWidget> widget = GetWidget(sPresContext);
   if (widget) {
     PRUint32 newState = GetNewIMEState(sPresContext, nsnull);
-    SetIMEState(newState, nsnull, widget);
+    SetIMEState(newState, nsnull, widget, IMEContext::FOCUS_REMOVED);
   }
   sContent = nsnull;
   sPresContext = nsnull;
@@ -114,7 +114,7 @@ nsIMEStateManager::OnRemoveContent(nsPresContext* aPresContext,
     if (NS_FAILED(rv))
       widget->ResetInputState();
     PRUint32 newState = GetNewIMEState(sPresContext, nsnull);
-    SetIMEState(newState, nsnull, widget);
+    SetIMEState(newState, nsnull, widget, IMEContext::FOCUS_REMOVED);
   }
 
   sContent = nsnull;
@@ -125,7 +125,8 @@ nsIMEStateManager::OnRemoveContent(nsPresContext* aPresContext,
 
 nsresult
 nsIMEStateManager::OnChangeFocus(nsPresContext* aPresContext,
-                                 nsIContent* aContent)
+                                 nsIContent* aContent,
+                                 PRUint32 aReason)
 {
   NS_ENSURE_ARG_POINTER(aPresContext);
 
@@ -191,7 +192,7 @@ nsIMEStateManager::OnChangeFocus(nsPresContext* aPresContext,
 
   if (newState != nsIContent::IME_STATUS_NONE) {
     // Update IME state for new focus widget
-    SetIMEState(newState, aContent, widget);
+    SetIMEState(newState, aContent, widget, aReason);
   }
 
   sPresContext = aPresContext;
@@ -204,7 +205,10 @@ void
 nsIMEStateManager::OnInstalledMenuKeyboardListener(PRBool aInstalling)
 {
   sInstalledMenuKeyboardListener = aInstalling;
-  OnChangeFocus(sPresContext, sContent);
+
+  PRUint32 reason = aInstalling ? IMEContext::FOCUS_MOVED_TO_MENU
+                                : IMEContext::FOCUS_MOVED_FROM_MENU;
+  OnChangeFocus(sPresContext, sContent, reason);
 }
 
 void
@@ -236,7 +240,7 @@ nsIMEStateManager::UpdateIMEState(PRUint32 aNewIMEState, nsIContent* aContent)
   // commit current composition
   widget->ResetInputState();
 
-  SetIMEState(aNewIMEState, aContent, widget);
+  SetIMEState(aNewIMEState, aContent, widget, IMEContext::EDITOR_STATE_MODIFIED);
 }
 
 PRUint32
@@ -289,7 +293,8 @@ private:
 void
 nsIMEStateManager::SetIMEState(PRUint32 aState,
                                nsIContent* aContent,
-                               nsIWidget* aWidget)
+                               nsIWidget* aWidget,
+                               PRUint32 aReason)
 {
   if (aState & nsIContent::IME_STATUS_MASK_ENABLED) {
     if (!aWidget)
@@ -327,6 +332,12 @@ nsIMEStateManager::SetIMEState(PRUint32 aState,
       }
     }
 
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      context.mReason = aReason | IMEContext::FOCUS_FROM_CONTENT_PROCESS;
+    } else {
+      context.mReason = aReason;
+    }
+
     aWidget->SetInputMode(context);
 
     nsContentUtils::AddScriptRunner(new IMEEnabledStateChangedEvent(state));
diff --git a/content/events/src/nsIMEStateManager.h b/content/events/src/nsIMEStateManager.h
index 6564bc116d4c..b0bb72efe3e3 100644
--- a/content/events/src/nsIMEStateManager.h
+++ b/content/events/src/nsIMEStateManager.h
@@ -59,7 +59,8 @@ public:
   static nsresult OnRemoveContent(nsPresContext* aPresContext,
                                   nsIContent* aContent);
   static nsresult OnChangeFocus(nsPresContext* aPresContext,
-                                nsIContent* aContent);
+                                nsIContent* aContent,
+                                PRUint32 aReason);
   static void OnInstalledMenuKeyboardListener(PRBool aInstalling);
 
   // These two methods manage focus and selection/text observers.
@@ -90,7 +91,7 @@ public:
 
 protected:
   static void SetIMEState(PRUint32 aState, nsIContent* aContent,
-                          nsIWidget* aWidget);
+                          nsIWidget* aWidget, PRUint32 aReason);
   static PRUint32 GetNewIMEState(nsPresContext* aPresContext,
                                  nsIContent* aContent);
 
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index bf20c8ff794b..668482fa546c 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -337,6 +337,22 @@ nsFocusManager::GetRedirectedFocus(nsIContent* aContent)
   return nsnull;
 }
 
+// static
+PRUint32
+nsFocusManager::GetFocusMoveReason(PRUint32 aFlags)
+{
+  PRUint32 reason = IMEContext::FOCUS_MOVED_UNKNOWN;
+  if (aFlags & nsIFocusManager::FLAG_BYMOUSE) {
+    reason = IMEContext::FOCUS_MOVED_BY_MOUSE;
+  } else if (aFlags & nsIFocusManager::FLAG_BYKEY) {
+    reason = IMEContext::FOCUS_MOVED_BY_KEY;
+  } else if (aFlags & nsIFocusManager::FLAG_BYMOVEFOCUS) {
+    reason = IMEContext::FOCUS_MOVED_BY_MOVEFOCUS;
+  }
+
+  return reason;
+}
+
 NS_IMETHODIMP
 nsFocusManager::GetActiveWindow(nsIDOMWindow** aWindow)
 {
@@ -943,7 +959,7 @@ nsFocusManager::WindowHidden(nsIDOMWindow* aWindow)
 
   nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
   if (presShell) {
-    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull);
+    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull, IMEContext::FOCUS_REMOVED);
     SetCaretVisible(presShell, PR_FALSE, nsnull);
   }
 
@@ -1484,7 +1500,7 @@ nsFocusManager::Blur(nsPIDOMWindow* aWindowToClear,
   // compositionend event won't get fired at the element being blurred.
   nsIMEStateManager::OnTextStateBlur(nsnull, nsnull);
   if (mActiveWindow)
-    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull);
+    nsIMEStateManager::OnChangeFocus(presShell->GetPresContext(), nsnull, IMEContext::FOCUS_REMOVED);
 
   // now adjust the actual focus, by clearing the fields in the focus manager
   // and in the window.
@@ -1727,7 +1743,8 @@ nsFocusManager::Focus(nsPIDOMWindow* aWindow,
           objectFrameWidget->SetFocus(PR_FALSE);
       }
 
-      nsIMEStateManager::OnChangeFocus(presContext, aContent);
+      PRUint32 reason = GetFocusMoveReason(aFlags);
+      nsIMEStateManager::OnChangeFocus(presContext, aContent, reason);
 
       // as long as this focus wasn't because a window was raised, update the
       // commands
@@ -1743,7 +1760,7 @@ nsFocusManager::Focus(nsPIDOMWindow* aWindow,
       nsIMEStateManager::OnTextStateFocus(presContext, aContent);
     } else {
       nsIMEStateManager::OnTextStateBlur(presContext, nsnull);
-      nsIMEStateManager::OnChangeFocus(presContext, nsnull);
+      nsIMEStateManager::OnChangeFocus(presContext, nsnull, IMEContext::FOCUS_REMOVED);
       if (!aWindowRaised) {
         aWindow->UpdateCommands(NS_LITERAL_STRING("focus"));
       }
@@ -1766,7 +1783,7 @@ nsFocusManager::Focus(nsPIDOMWindow* aWindow,
 
     nsPresContext* presContext = presShell->GetPresContext();
     nsIMEStateManager::OnTextStateBlur(presContext, nsnull);
-    nsIMEStateManager::OnChangeFocus(presContext, nsnull);
+    nsIMEStateManager::OnChangeFocus(presContext, nsnull, IMEContext::FOCUS_REMOVED);
 
     if (!aWindowRaised)
       aWindow->UpdateCommands(NS_LITERAL_STRING("focus"));
diff --git a/dom/base/nsFocusManager.h b/dom/base/nsFocusManager.h
index 17bec430f9d9..2d6521f0ebf3 100644
--- a/dom/base/nsFocusManager.h
+++ b/dom/base/nsFocusManager.h
@@ -123,6 +123,13 @@ public:
    */
   static nsIContent* GetRedirectedFocus(nsIContent* aContent);
 
+  /**
+   * Returns a flag indicating the source and/or reason of the focus change.
+   * This is used to indicate to the IME code if the focus come from a user 
+   * input or a script for example.
+   */
+  static PRUint32 GetFocusMoveReason(PRUint32 aFlags);
+
   static PRBool sMouseFocusesFormControl;
 
 protected:
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index a64823e644b0..0be8db40034f 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -169,7 +169,7 @@ parent:
 
     sync GetIMEEnabled() returns (PRUint32 value);
 
-    SetInputMode(PRUint32 value, nsString type, nsString actionHint);
+    SetInputMode(PRUint32 value, nsString type, nsString actionHint, PRUint32 reason);
 
     sync GetIMEOpenState() returns (PRBool value);
 
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index f5d5de2859ec..5f8123a9f96b 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -525,7 +525,7 @@ TabParent::RecvGetIMEEnabled(PRUint32* aValue)
 }
 
 bool
-TabParent::RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const nsString& aAction)
+TabParent::RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const nsString& aAction, const PRUint32& aReason)
 {
   nsCOMPtr<nsIWidget> widget = GetWidget();
   if (!widget || !AllowContentIME())
@@ -535,6 +535,7 @@ TabParent::RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const
   context.mStatus = aValue;
   context.mHTMLInputType.Assign(aType);
   context.mActionHint.Assign(aAction);
+  context.mReason = aReason;
   widget->SetInputMode(context);
 
   nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 70743ab034dd..4d130d070487 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -104,7 +104,7 @@ public:
     virtual bool RecvEndIMEComposition(const PRBool& aCancel,
                                        nsString* aComposition);
     virtual bool RecvGetIMEEnabled(PRUint32* aValue);
-    virtual bool RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const nsString& aAction);
+    virtual bool RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const nsString& aAction, const PRUint32& aReason);
     virtual bool RecvGetIMEOpenState(PRBool* aValue);
     virtual bool RecvSetIMEOpenState(const PRBool& aValue);
     virtual bool RecvGetDPI(float* aValue);
diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java
index 228116a75eaf..9eb972b0adbf 100644
--- a/embedding/android/GeckoAppShell.java
+++ b/embedding/android/GeckoAppShell.java
@@ -474,8 +474,9 @@ public class GeckoAppShell
             if (!mEnable)
                 return;
 
-            if (GeckoApp.surfaceView.mIMEState !=
-                GeckoSurfaceView.IME_STATE_DISABLED)
+            int state = GeckoApp.surfaceView.mIMEState;
+            if (state != GeckoSurfaceView.IME_STATE_DISABLED &&
+                state != GeckoSurfaceView.IME_STATE_PLUGIN)
                 imm.showSoftInput(GeckoApp.surfaceView, 0);
             else
                 imm.hideSoftInputFromWindow(
diff --git a/embedding/android/GeckoSurfaceView.java b/embedding/android/GeckoSurfaceView.java
index 2f8eca13fe34..794fd23e68f3 100644
--- a/embedding/android/GeckoSurfaceView.java
+++ b/embedding/android/GeckoSurfaceView.java
@@ -619,6 +619,7 @@ class GeckoSurfaceView
     public static final int IME_STATE_DISABLED = 0;
     public static final int IME_STATE_ENABLED = 1;
     public static final int IME_STATE_PASSWORD = 2;
+    public static final int IME_STATE_PLUGIN = 3;
 
     GeckoInputConnection inputConnection;
     KeyListener mKeyListener;
diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h
index f1d38b881993..3c0c494ba76d 100644
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -233,6 +233,29 @@ struct nsIMEUpdatePreference {
 struct IMEContext {
   PRUint32 mStatus;
 
+  /* Does the change come from a trusted source */
+  enum {
+    FOCUS_REMOVED       = 0x0001,
+    FOCUS_MOVED_UNKNOWN = 0x0002,
+    FOCUS_MOVED_BY_MOVEFOCUS = 0x0004,
+    FOCUS_MOVED_BY_MOUSE = 0x0008,
+    FOCUS_MOVED_BY_KEY = 0x0010,
+    FOCUS_MOVED_TO_MENU = 0x0020,
+    FOCUS_MOVED_FROM_MENU = 0x0040,
+    EDITOR_STATE_MODIFIED = 0x0080,
+    FOCUS_FROM_CONTENT_PROCESS = 0x0100
+  };
+
+  PRBool FocusMovedByUser() const {
+    return (mReason & FOCUS_MOVED_BY_MOUSE) || (mReason & FOCUS_MOVED_BY_KEY);
+  };
+
+  PRBool FocusMovedInContentProcess() const {
+    return (mReason & FOCUS_FROM_CONTENT_PROCESS);
+  };
+
+  PRUint32 mReason;
+
   /* The type of the input if the input is a html input field */
   nsString mHTMLInputType;
 
diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index 331f641dca56..4495152e4f1f 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -52,6 +52,7 @@ using mozilla::unused;
 #include "nsIdleService.h"
 #include "nsWindow.h"
 #include "nsIObserverService.h"
+#include "nsIPrefService.h"
 
 #include "nsRenderingContext.h"
 #include "nsIDOMSimpleGestureEvent.h"
@@ -1740,9 +1741,25 @@ nsWindow::ResetInputState()
 NS_IMETHODIMP
 nsWindow::SetInputMode(const IMEContext& aContext)
 {
-    ALOGIME("IME: SetInputMode: s=%d", aContext.mStatus);
+    ALOGIME("IME: SetInputMode: s=%d trusted=%d", aContext.mStatus, aContext.mReason);
 
     mIMEContext = aContext;
+
+    // Ensure that opening the virtual keyboard is allowed for this specific
+    // IMEContext depending on the content.ime.strict.policy pref
+    if (aContext.mStatus != nsIWidget::IME_STATUS_DISABLED && 
+        aContext.mStatus != nsIWidget::IME_STATUS_PLUGIN) {
+      nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+
+      PRBool useStrictPolicy = PR_FALSE;
+      if (NS_SUCCEEDED(prefs->GetBoolPref("content.ime.strict_policy", &useStrictPolicy))) {
+        if (useStrictPolicy && !aContext.FocusMovedByUser() && 
+            aContext.FocusMovedInContentProcess()) {
+          return NS_OK;
+        }
+      }
+    }
+
     AndroidBridge::NotifyIMEEnabled(int(aContext.mStatus), aContext.mHTMLInputType, aContext.mActionHint);
     return NS_OK;
 }
diff --git a/widget/src/gtk2/nsGtkIMModule.cpp b/widget/src/gtk2/nsGtkIMModule.cpp
index dc649aa01aa4..590261c70b31 100644
--- a/widget/src/gtk2/nsGtkIMModule.cpp
+++ b/widget/src/gtk2/nsGtkIMModule.cpp
@@ -53,6 +53,7 @@
 #ifdef MOZ_PLATFORM_MAEMO
 #include "nsServiceManagerUtils.h"
 #include "nsIObserverService.h"
+#include "nsIPrefService.h"
 #include "mozilla/Services.h"
 #endif
 
@@ -588,6 +589,22 @@ nsGtkIMModule::SetInputMode(nsWindow* aCaller, const IMEContext* aContext)
     GtkIMContext *im = GetContext();
     if (im) {
         if (IsEnabled()) {
+            // Ensure that opening the virtual keyboard is allowed for this specific
+            // IMEContext depending on the content.ime.strict.policy pref
+            if (mIMEContext.mStatus != nsIWidget::IME_STATUS_DISABLED && 
+                mIMEContext.mStatus != nsIWidget::IME_STATUS_PLUGIN) {
+
+                nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+
+                PRBool useStrictPolicy = PR_FALSE;
+                if (NS_SUCCEEDED(prefs->GetBoolPref("content.ime.strict_policy", &useStrictPolicy))) {
+                    if (useStrictPolicy && !mIMEContext.FocusMovedByUser() && 
+                        mIMEContext.FocusMovedInContentProcess()) {
+                        return NS_OK;
+                    }
+                }
+            }
+
             // It is not desired that the hildon's autocomplete mechanism displays
             // user previous entered passwds, so lets make completions invisible
             // in these cases.
diff --git a/widget/src/xpwidgets/PuppetWidget.cpp b/widget/src/xpwidgets/PuppetWidget.cpp
index e1d6acadefae..81ccdbcf0f3d 100644
--- a/widget/src/xpwidgets/PuppetWidget.cpp
+++ b/widget/src/xpwidgets/PuppetWidget.cpp
@@ -398,7 +398,8 @@ NS_IMETHODIMP
 PuppetWidget::SetInputMode(const IMEContext& aContext)
 {
   if (mTabChild &&
-      mTabChild->SendSetInputMode(aContext.mStatus, aContext.mHTMLInputType, aContext.mActionHint))
+      mTabChild->SendSetInputMode(aContext.mStatus, aContext.mHTMLInputType,
+                                  aContext.mActionHint, aContext.mReason))
     return NS_OK;
   return NS_ERROR_FAILURE;
 }

From 645c11b0f439dfa26b9dcb0f52d6d8d3b7a36a15 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Wed, 20 Apr 2011 08:52:13 -0400
Subject: [PATCH 080/509] Bug 649681 - update devicemanager to be what we are
 using in production. r=ctalbert, a=test-only

---
 build/mobile/devicemanager.py | 71 +++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 build/mobile/devicemanager.py

diff --git a/build/mobile/devicemanager.py b/build/mobile/devicemanager.py
old mode 100644
new mode 100755
index 40c144f7a101..a51b6b9b49d8
--- a/build/mobile/devicemanager.py
+++ b/build/mobile/devicemanager.py
@@ -572,11 +572,15 @@ class DeviceManager:
   def processExist(self, appname):
     pid = None
 
-    #remove the environment variables in the cli if they exist
+    #filter out extra spaces
     parts = filter(lambda x: x != '', appname.split(' '))
+    appname = ' '.join(parts)
 
-    if len(parts[0].strip('"').split('=')) > 1:
-      appname = ' '.join(parts[1:])
+    #filter out the quoted env string if it exists
+    #ex: '"name=value;name2=value2;etc=..." process args' -> 'process args'
+    parts = appname.split('"')
+    if (len(parts) > 2):
+      appname = ' '.join(parts[2:]).strip()
   
     pieces = appname.split(' ')
     parts = pieces[0].split('/')
@@ -996,31 +1000,35 @@ class DeviceManager:
   # returns:
   #  success: status from test agent
   #  failure: None
-  def reboot(self, wait = False):
-    cmd = 'rebt'
-    if (self.debug >= 3): print "INFO: sending rebt command"
-    
-    try:
-      status = self.sendCMD([cmd])
-    except DMError:
-      return None
+  def reboot(self, ipAddr=None, port=30000):
+    cmd = 'rebt'   
 
-    if (wait == True):
-      #this sleeps up to 5 minutes in 30 second intervals
-      count = 0
-      while (count < 10):
-        if (self.debug >= 4): print "DEBUG: sleeping 30 seconds while waiting for reboot"
-        time.sleep(30)
-        waitstatus = self.getDeviceRoot()
-        if (waitstatus is not None):
-          break
-        self.retries = 0
-        count += 1
+    if (self.debug > 3): print "INFO: sending rebt command"
+    callbacksvrstatus = None    
 
-      if (count >= 10):
+    if (ipAddr is not None):
+    #create update.info file:
+      try:
+        destname = '/data/data/com.mozilla.SUTAgentAndroid/files/update.info'
+        data = "%s,%s\rrebooting\r" % (ipAddr, port)
+        self.verifySendCMD(['push ' + destname + ' ' + str(len(data)) + '\r\n', data], newline = False)
+      except(DMError):
         return None
 
-    if (self.debug >= 3): print "INFO: rebt- got status back: " + str(status)
+      ip, port = self.getCallbackIpAndPort(ipAddr, port)
+      cmd += " %s %s" % (ip, port)
+      # Set up our callback server
+      callbacksvr = callbackServer(ip, port, self.debug)
+
+    try:
+      status = self.verifySendCMD([cmd])
+    except(DMError):
+      return None
+
+    if (ipAddr is not None):
+      status = callbacksvr.disconnect()
+
+    if (self.debug > 3): print "INFO: rebt- got status back: " + str(status)
     return status
 
   # validate localDir from host to remoteDir on the device
@@ -1277,9 +1285,6 @@ class DeviceManager:
     except(DMError):
       return False
 
-    if (self.reboot(True) == None):
-      return False
-
     return True
 
 gCallbackData = ''
@@ -1289,11 +1294,14 @@ class myServer(SocketServer.TCPServer):
 
 class callbackServer():
   def __init__(self, ip, port, debuglevel):
+    global gCallbackData
+    if (debuglevel >= 1): print "DEBUG: gCallbackData is: %s on port: %s" % (gCallbackData, port)
+    gCallbackData = ''
     self.ip = ip
     self.port = port
     self.connected = False
     self.debug = debuglevel
-    if (self.debug >= 3) : print "Creating server with " + str(ip) + ":" + str(port)
+    if (self.debug >= 3): print "Creating server with " + str(ip) + ":" + str(port)
     self.server = myServer((ip, port), self.myhandler)
     self.server_thread = Thread(target=self.server.serve_forever) 
     self.server_thread.setDaemon(True)
@@ -1307,6 +1315,8 @@ class callbackServer():
         # Got the data back
         if (self.debug >= 3): print "Got data back from agent: " + str(gCallbackData)
         break
+      else:
+        if (self.debug >= 0): print '.',
       time.sleep(step)
       t += step
 
@@ -1314,7 +1324,10 @@ class callbackServer():
       if (self.debug >= 3): print "Shutting down server now"
       self.server.shutdown()
     except:
-      print "Unable to shutdown callback server - check for a connection on port: " + str(self.port)
+      if (self.debug >= 1): print "Unable to shutdown callback server - check for a connection on port: " + str(self.port)
+
+    #sleep 1 additional step to ensure not only we are online, but all our services are online
+    time.sleep(step)
     return gCallbackData
 
   class myhandler(SocketServer.BaseRequestHandler):

From c6895fbe40504bea062594e2cf08140e02d2eece Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Wed, 20 Apr 2011 08:52:15 -0400
Subject: [PATCH 081/509] Bug 651013 - a couple of layout/base mochitests
 should be moved to mochitest-chrome tests. r=roc, a=test-only

--HG--
rename : layout/base/tests/test_bug370436.html => layout/base/tests/chrome/test_bug370436.html
rename : layout/base/tests/test_bug420499.xul => layout/base/tests/chrome/test_bug420499.xul
---
 layout/base/tests/Makefile.in                      | 2 --
 layout/base/tests/chrome/Makefile.in               | 2 ++
 layout/base/tests/{ => chrome}/test_bug370436.html | 8 ++++----
 layout/base/tests/{ => chrome}/test_bug420499.xul  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename layout/base/tests/{ => chrome}/test_bug370436.html (83%)
 rename layout/base/tests/{ => chrome}/test_bug420499.xul (92%)

diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 7edd933fb70c..f57e99810941 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -71,7 +71,6 @@ _TEST_FILES =	\
 		test_bug66619.html \
 		test_bug114649.html \
 		$(warning test_bug369950.html disabled due to random orange; see bug 492575) \
-		test_bug370436.html \
 		test_bug386575.xhtml \
 		test_bug388019.html \
 		test_bug394057.html \
@@ -79,7 +78,6 @@ _TEST_FILES =	\
 		test_bug399951.html \
 		test_bug404209.xhtml \
 		test_bug416896.html \
-		test_bug420499.xul \
 		test_bug423523.html \
 		test_bug445810.html \
 		test_bug449781.html \
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index 1b5a475415b1..9e131e96ed14 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -44,8 +44,10 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES = \
+	test_bug370436.html \
 	test_bug396367-1.html \
 	test_bug396367-2.html \
+	test_bug420499.xul \
 	test_bug504311.xul \
 	test_bug514660.xul \
 	test_bug533845.xul \
diff --git a/layout/base/tests/test_bug370436.html b/layout/base/tests/chrome/test_bug370436.html
similarity index 83%
rename from layout/base/tests/test_bug370436.html
rename to layout/base/tests/chrome/test_bug370436.html
index 43790677845c..8c1bffeaeb7f 100644
--- a/layout/base/tests/test_bug370436.html
+++ b/layout/base/tests/chrome/test_bug370436.html
@@ -5,10 +5,10 @@
 -->
 <head>
 	<title>Test for Bug 370436</title>
-	<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-	<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-	<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>        
-	<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+	<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+	<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+	<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>        
+	<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body>
 
diff --git a/layout/base/tests/test_bug420499.xul b/layout/base/tests/chrome/test_bug420499.xul
similarity index 92%
rename from layout/base/tests/test_bug420499.xul
rename to layout/base/tests/chrome/test_bug420499.xul
index 61d3c96ace27..b110b77f2dd6 100644
--- a/layout/base/tests/test_bug420499.xul
+++ b/layout/base/tests/chrome/test_bug420499.xul
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=420499
 -->
 <window title="Mozilla Bug 420499" onload="setTimeout(focusInput, 500);"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="/MochiKit/packed.js" />
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
 
   
 

From d286f5395f3018fd90948554f9618ecbdef16393 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@mozilla.com>
Date: Wed, 20 Apr 2011 08:52:18 -0400
Subject: [PATCH 082/509] Bug 649089 - test_after_paint_pref.html should use
 SpecialPowers. r=jmaher, a=test-only

---
 layout/base/tests/test_after_paint_pref.html | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/layout/base/tests/test_after_paint_pref.html b/layout/base/tests/test_after_paint_pref.html
index 0ff22d3d8613..d77934b75796 100644
--- a/layout/base/tests/test_after_paint_pref.html
+++ b/layout/base/tests/test_after_paint_pref.html
@@ -17,21 +17,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=608030
 
 /** Test for Bug 608030 **/
 
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-var prefService = Components.classes["@mozilla.org/preferences-service;1"].
-                    getService(Components.interfaces.nsIPrefService);
-var domBranch = prefService.getBranch("dom.");
-
 function get_pref()
 {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    return domBranch.getBoolPref("send_after_paint_to_content");
+  return SpecialPowers.getBoolPref("dom.send_after_paint_to_content");
 }
 
 function set_pref(val)
 {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    domBranch.setBoolPref("send_after_paint_to_content", val);
+  SpecialPowers.setBoolPref("dom.send_after_paint_to_content", val);
 }
 
 SimpleTest.waitForExplicitFinish();

From fbbca3c5509df8a8ac53d75abd9ea5facecb1873 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Wed, 20 Apr 2011 16:10:00 +0200
Subject: [PATCH 083/509] Backed out changeset 028fc2dcb854

---
 browser/base/content/tabview/tabitems.js      |  8 +-
 browser/base/content/test/tabview/Makefile.in |  1 -
 .../test/tabview/browser_tabview_bug648882.js | 84 -------------------
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 browser/base/content/test/tabview/browser_tabview_bug648882.js

diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 439c4d85dc24..ed53f449444e 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -1143,15 +1143,9 @@ let TabItems = {
   _checkHeartbeat: function TabItems__checkHeartbeat() {
     this._heartbeat = null;
 
-    if (this.isPaintingPaused())
+    if (this.isPaintingPaused() || !UI.isIdle)
       return;
 
-    // restart the heartbeat to update all waiting tabs once the UI becomes idle
-    if (!UI.isIdle()) {
-      this.startHeartbeat();
-      return;
-    }
-
     let accumTime = 0;
     let items = this._tabsWaitingForUpdate.getItems();
     // Do as many updates as we can fit into a "perceived" amount
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 1318f50646d7..8b447d14f761 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -130,7 +130,6 @@ _BROWSER_FILES = \
                  browser_tabview_bug641802.js \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
-                 browser_tabview_bug648882.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug648882.js b/browser/base/content/test/tabview/browser_tabview_bug648882.js
deleted file mode 100644
index 887abf932245..000000000000
--- a/browser/base/content/test/tabview/browser_tabview_bug648882.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-  waitForExplicitFinish();
-
-  testHeartbeatAfterBusyUI(function () {
-    testTabUpdatesWithBusyUI(finish);
-  });
-}
-
-function testHeartbeatAfterBusyUI(callback) {
-  newWindowWithTabView(function (win) {
-    registerCleanupFunction(function () win.close());
-
-    let cw = win.TabView.getContentWindow();
-    let tab = win.gBrowser.tabs[0];
-    let tabItem = tab._tabViewTabItem;
-
-    cw.TabItems.pausePainting();
-
-    tabItem.addSubscriber(tabItem, "updated", function () {
-      tabItem.removeSubscriber(tabItem, "updated");
-      callback();
-    });
-
-    cw.TabItems.update(tab);
-
-    cw.UI.isIdle = function () {
-      cw.UI.isIdle = function () true;
-      return false;
-    }
-
-    cw.TabItems.resumePainting();
-  });
-}
-
-function testTabUpdatesWithBusyUI(callback) {
-  newWindowWithTabView(function (win) {
-    registerCleanupFunction(function () win.close());
-
-    let cw = win.TabView.getContentWindow();
-    let tab = win.gBrowser.tabs[0];
-    let tabItem = tab._tabViewTabItem;
-    let groupItem = cw.GroupItems.groupItems[0];
-    let container = groupItem.container;
-    let resizer = groupItem.$resizer[0];
-
-    let intervalID;
-    let isIdle = false;
-    let numLoops = 10;
-    let interval = cw.UI._maxInteractiveWait / 2;
-
-    let simulateBusyUI = function () {
-      let target = 5 < numLoops-- ? container : resizer;
-
-      EventUtils.synthesizeMouse(target, 5, 5, {type: "mousedown"}, cw);
-      EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
-      EventUtils.synthesizeMouse(target, 20, 20, {type: "mouseup"}, cw);
-
-      win.setTimeout(function () {
-        if (numLoops)
-          simulateBusyUI();
-        else
-          isIdle = true;
-      }, interval);
-    };
-
-    SimpleTest.waitForFocus(function () {
-      cw.TabItems.pausePainting();
-      cw.TabItems.update(tab);
-
-      tabItem.addSubscriber(tabItem, "updated", function () {
-        tabItem.removeSubscriber(tabItem, "updated");
-        ok(isIdle, "tabItem is updated only when UI is idle");
-        callback();
-      });
-
-      simulateBusyUI();
-      win.setTimeout(simulateBusyUI, interval);
-      cw.TabItems.resumePainting();
-    }, cw);
-  });
-}

From 5b752721f45a21c19c5ef421a16f798c1b1f5558 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:16:01 +0100
Subject: [PATCH 084/509] Bug 488314 part 2 - Kill vestiges of
 SetMatrixPropagation. r=longsonr.

--HG--
extra : rebase_source : ab532ae0ee733e6c759856640d755869bc231f73
---
 layout/svg/base/src/nsISVGChildFrame.h        |  5 ----
 layout/svg/base/src/nsSVGContainerFrame.cpp   | 20 +---------------
 layout/svg/base/src/nsSVGContainerFrame.h     |  2 --
 .../svg/base/src/nsSVGForeignObjectFrame.cpp  | 22 ++----------------
 layout/svg/base/src/nsSVGForeignObjectFrame.h |  2 --
 layout/svg/base/src/nsSVGGeometryFrame.cpp    |  5 ++--
 layout/svg/base/src/nsSVGGlyphFrame.cpp       | 23 +++----------------
 layout/svg/base/src/nsSVGGlyphFrame.h         |  6 ++---
 .../svg/base/src/nsSVGPathGeometryFrame.cpp   | 17 --------------
 layout/svg/base/src/nsSVGPathGeometryFrame.h  |  2 --
 layout/svg/base/src/nsSVGUtils.h              |  4 +---
 11 files changed, 12 insertions(+), 96 deletions(-)

diff --git a/layout/svg/base/src/nsISVGChildFrame.h b/layout/svg/base/src/nsISVGChildFrame.h
index 5e390b743f07..c4c316caeb28 100644
--- a/layout/svg/base/src/nsISVGChildFrame.h
+++ b/layout/svg/base/src/nsISVGChildFrame.h
@@ -105,11 +105,6 @@ public:
   NS_IMETHOD NotifyRedrawSuspended()=0;
   NS_IMETHOD NotifyRedrawUnsuspended()=0;
 
-  // Set whether we should stop multiplying matrices when building up
-  // the current transformation matrix at this frame.
-  NS_IMETHOD SetMatrixPropagation(PRBool aPropagate)=0;
-  virtual PRBool GetMatrixPropagation()=0;
-
   /**
    * Get this frame's contribution to the rect returned by a GetBBox() call
    * that occurred either on this element, or on one of its ancestors.
diff --git a/layout/svg/base/src/nsSVGContainerFrame.cpp b/layout/svg/base/src/nsSVGContainerFrame.cpp
index 93d373694449..65b0f16095e5 100644
--- a/layout/svg/base/src/nsSVGContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGContainerFrame.cpp
@@ -93,7 +93,7 @@ nsSVGContainerFrame::Init(nsIContent* aContent,
                           nsIFrame* aParent,
                           nsIFrame* aPrevInFlow)
 {
-  AddStateBits(NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_PROPAGATE_TRANSFORM);
+  AddStateBits(NS_STATE_SVG_NONDISPLAY_CHILD);
   nsresult rv = nsSVGContainerFrameBase::Init(aContent, aParent, aPrevInFlow);
   return rv;
 }
@@ -103,7 +103,6 @@ nsSVGDisplayContainerFrame::Init(nsIContent* aContent,
                                  nsIFrame* aParent,
                                  nsIFrame* aPrevInFlow)
 {
-  AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
   if (!(GetStateBits() & NS_STATE_IS_OUTER_SVG)) {
     AddStateBits(aParent->GetStateBits() &
       (NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_CLIPPATH_CHILD));
@@ -283,20 +282,3 @@ nsSVGDisplayContainerFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspac
 
   return bboxUnion;
 }
-
-NS_IMETHODIMP
-nsSVGDisplayContainerFrame::SetMatrixPropagation(PRBool aPropagate)
-{
-  if (aPropagate) {
-    AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  } else {
-    RemoveStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  }
-  return NS_OK;
-}
-
-PRBool
-nsSVGDisplayContainerFrame::GetMatrixPropagation()
-{
-  return (GetStateBits() & NS_STATE_SVG_PROPAGATE_TRANSFORM) != 0;
-}
diff --git a/layout/svg/base/src/nsSVGContainerFrame.h b/layout/svg/base/src/nsSVGContainerFrame.h
index 18dc1a56b8cf..53b8a37423df 100644
--- a/layout/svg/base/src/nsSVGContainerFrame.h
+++ b/layout/svg/base/src/nsSVGContainerFrame.h
@@ -112,8 +112,6 @@ public:
   virtual void NotifySVGChanged(PRUint32 aFlags);
   NS_IMETHOD NotifyRedrawSuspended();
   NS_IMETHOD NotifyRedrawUnsuspended();
-  NS_IMETHOD SetMatrixPropagation(PRBool aPropagate);
-  virtual PRBool GetMatrixPropagation();
   virtual gfxRect GetBBoxContribution(const gfxMatrix &aToBBoxUserspace);
   NS_IMETHOD_(PRBool) IsDisplayContainer() { return PR_TRUE; }
   NS_IMETHOD_(PRBool) HasValidCoveredRect() { return PR_FALSE; }
diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
index a0bc072a2c91..7fea106b35be 100644
--- a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
@@ -91,9 +91,8 @@ nsSVGForeignObjectFrame::Init(nsIContent* aContent,
 #endif
 
   nsresult rv = nsSVGForeignObjectFrameBase::Init(aContent, aParent, aPrevInFlow);
-  AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM | 
-               (aParent->GetStateBits() &
-                (NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_CLIPPATH_CHILD)));
+  AddStateBits(aParent->GetStateBits() &
+               (NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_CLIPPATH_CHILD));
   if (NS_SUCCEEDED(rv)) {
     nsSVGUtils::GetOuterSVGFrame(this)->RegisterForeignObject(this);
   }
@@ -432,23 +431,6 @@ nsSVGForeignObjectFrame::NotifyRedrawUnsuspended()
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSVGForeignObjectFrame::SetMatrixPropagation(PRBool aPropagate)
-{
-  if (aPropagate) {
-    AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  } else {
-    RemoveStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  }
-  return NS_OK;
-}
-
-PRBool
-nsSVGForeignObjectFrame::GetMatrixPropagation()
-{
-  return (GetStateBits() & NS_STATE_SVG_PROPAGATE_TRANSFORM) != 0;
-}
-
 gfxRect
 nsSVGForeignObjectFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspace)
 {
diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.h b/layout/svg/base/src/nsSVGForeignObjectFrame.h
index dbbafb9b3afc..e03c60d44b7c 100644
--- a/layout/svg/base/src/nsSVGForeignObjectFrame.h
+++ b/layout/svg/base/src/nsSVGForeignObjectFrame.h
@@ -128,8 +128,6 @@ public:
   virtual void NotifySVGChanged(PRUint32 aFlags);
   NS_IMETHOD NotifyRedrawSuspended();
   NS_IMETHOD NotifyRedrawUnsuspended();
-  NS_IMETHOD SetMatrixPropagation(PRBool aPropagate);
-  virtual PRBool GetMatrixPropagation();
   virtual gfxRect GetBBoxContribution(const gfxMatrix &aToBBoxUserspace);
   NS_IMETHOD_(PRBool) IsDisplayContainer() { return PR_TRUE; }
   NS_IMETHOD_(PRBool) HasValidCoveredRect() { return PR_TRUE; }
diff --git a/layout/svg/base/src/nsSVGGeometryFrame.cpp b/layout/svg/base/src/nsSVGGeometryFrame.cpp
index e88691729f76..eba8a3fb3667 100644
--- a/layout/svg/base/src/nsSVGGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGGeometryFrame.cpp
@@ -52,9 +52,8 @@ nsSVGGeometryFrame::Init(nsIContent* aContent,
                          nsIFrame* aParent,
                          nsIFrame* aPrevInFlow)
 {
-  AddStateBits((aParent->GetStateBits() &
-                (NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_CLIPPATH_CHILD)) |
-               NS_STATE_SVG_PROPAGATE_TRANSFORM);
+  AddStateBits(aParent->GetStateBits() &
+               (NS_STATE_SVG_NONDISPLAY_CHILD | NS_STATE_SVG_CLIPPATH_CHILD));
   nsresult rv = nsSVGGeometryFrameBase::Init(aContent, aParent, aPrevInFlow);
   return rv;
 }
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index 808b8601db69..ae4af986c86a 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -491,11 +491,11 @@ nsSVGGlyphFrame::UpdateCoveredRegion()
     return NS_OK;
   }
 
-  SetMatrixPropagation(PR_FALSE);
+  mPropagateTransform = PR_FALSE;
   CharacterIterator iter(this, PR_TRUE);
   iter.SetInitialMatrix(tmpCtx);
   AddBoundingBoxesToPath(&iter, tmpCtx);
-  SetMatrixPropagation(PR_TRUE);
+  mPropagateTransform = PR_TRUE;
   tmpCtx->IdentityMatrix();
 
   // Be careful when replacing the following logic to get the fill and stroke
@@ -1479,7 +1479,7 @@ nsSVGGlyphFrame::NotifyGlyphMetricsChange()
 PRBool
 nsSVGGlyphFrame::GetGlobalTransform(gfxMatrix *aMatrix)
 {
-  if (!GetMatrixPropagation()) {
+  if (!mPropagateTransform) {
     aMatrix->Reset();
     return PR_TRUE;
   }
@@ -1635,23 +1635,6 @@ nsSVGGlyphFrame::EnsureTextRun(float *aDrawScale, float *aMetricsScale,
   return PR_TRUE;
 }
 
-NS_IMETHODIMP
-nsSVGGlyphFrame::SetMatrixPropagation(PRBool aPropagate)
-{
-  if (aPropagate) {
-    AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  } else {
-    RemoveStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  }
-  return NS_OK;
-}
-
-PRBool
-nsSVGGlyphFrame::GetMatrixPropagation()
-{
-  return (GetStateBits() & NS_STATE_SVG_PROPAGATE_TRANSFORM) != 0;
-}
-
 //----------------------------------------------------------------------
 // helper class
 
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index 5bd4fee6a56d..3e5b0b5dd9cf 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -66,7 +66,8 @@ protected:
     : nsSVGGlyphFrameBase(aContext),
       mTextRun(nsnull),
       mStartIndex(0),
-      mWhitespaceHandling(COMPRESS_WHITESPACE)
+      mWhitespaceHandling(COMPRESS_WHITESPACE),
+      mPropagateTransform(PR_TRUE)
       {}
   ~nsSVGGlyphFrame()
   {
@@ -126,8 +127,6 @@ public:
   virtual void NotifySVGChanged(PRUint32 aFlags);
   NS_IMETHOD NotifyRedrawSuspended();
   NS_IMETHOD NotifyRedrawUnsuspended();
-  NS_IMETHOD SetMatrixPropagation(PRBool aPropagate);
-  virtual PRBool GetMatrixPropagation();
   NS_IMETHOD_(PRBool) IsDisplayContainer() { return PR_FALSE; }
   NS_IMETHOD_(PRBool) HasValidCoveredRect() { return PR_TRUE; }
 
@@ -229,6 +228,7 @@ protected:
   // The start index into the position and rotation data
   PRUint32 mStartIndex;
   PRUint8 mWhitespaceHandling;
+  PRPackedBool mPropagateTransform;
 };
 
 #endif
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index d1b5f3b0d743..565a686b3033 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -335,23 +335,6 @@ nsSVGPathGeometryFrame::NotifyRedrawUnsuspended()
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsSVGPathGeometryFrame::SetMatrixPropagation(PRBool aPropagate)
-{
-  if (aPropagate) {
-    AddStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  } else {
-    RemoveStateBits(NS_STATE_SVG_PROPAGATE_TRANSFORM);
-  }
-  return NS_OK;
-}
-
-PRBool
-nsSVGPathGeometryFrame::GetMatrixPropagation()
-{
-  return (GetStateBits() & NS_STATE_SVG_PROPAGATE_TRANSFORM) != 0;
-}
-
 gfxRect
 nsSVGPathGeometryFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspace)
 {
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.h b/layout/svg/base/src/nsSVGPathGeometryFrame.h
index 10141de54ff7..ef84caa41257 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.h
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.h
@@ -100,8 +100,6 @@ protected:
   virtual void NotifySVGChanged(PRUint32 aFlags);
   NS_IMETHOD NotifyRedrawSuspended();
   NS_IMETHOD NotifyRedrawUnsuspended();
-  NS_IMETHOD SetMatrixPropagation(PRBool aPropagate);
-  virtual PRBool GetMatrixPropagation();
   virtual gfxRect GetBBoxContribution(const gfxMatrix &aToBBoxUserspace);
   NS_IMETHOD_(PRBool) IsDisplayContainer() { return PR_FALSE; }
   NS_IMETHOD_(PRBool) HasValidCoveredRect() { return PR_TRUE; }
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index ec0385e7113c..ba9def9d6564 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -98,10 +98,8 @@ class Element;
 /* are we the child of a non-display container? */
 #define NS_STATE_SVG_NONDISPLAY_CHILD            NS_FRAME_STATE_BIT(22)
 
-#define NS_STATE_SVG_PROPAGATE_TRANSFORM         NS_FRAME_STATE_BIT(23)
-
 // If this bit is set, we are a <clipPath> element or descendant.
-#define NS_STATE_SVG_CLIPPATH_CHILD              NS_FRAME_STATE_BIT(24)
+#define NS_STATE_SVG_CLIPPATH_CHILD              NS_FRAME_STATE_BIT(23)
 
 /**
  * Byte offsets of channels in a native packed gfxColor or cairo image surface.

From db75620084e0ee54dc605b7831b63a854b4b0d4c Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:16:01 +0100
Subject: [PATCH 085/509] Bug 474401 - Firefox on Mac does not register itself
 as being capable of opening SVG files. r=josh.

--HG--
extra : rebase_source : 07f6b793c74e961a8afef3a5db0f87d028727e8e
---
 browser/app/macbuild/Contents/Info.plist.in | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
index 7fe3823f89af..f71f16301f2a 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -26,6 +26,28 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>svg</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>image/svg+xml</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>SVG document</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>TEXT</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>NSDocumentClass</key>
+			<string>BrowserDocument</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>

From ec546a2c1e9fadec6d018e88291de64c2dbed32a Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:16:02 +0100
Subject: [PATCH 086/509] Bug 589648 part 1. Explicitly maintain a 'segStart'
 variable in SVGPathData::ConstructPath instead of being clever with 'segEnd'.
 r=longsonr.

--HG--
extra : rebase_source : 7e18e457b3589d103173ffdb97ee7791cf5bf3d2
---
 content/svg/content/src/SVGPathData.cpp | 75 ++++++++++++-------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/content/svg/content/src/SVGPathData.cpp b/content/svg/content/src/SVGPathData.cpp
index ccfef3133870..da91354e6374 100644
--- a/content/svg/content/src/SVGPathData.cpp
+++ b/content/svg/content/src/SVGPathData.cpp
@@ -246,7 +246,8 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
 
   PRUint32 segType, prevSegType = nsIDOMSVGPathSeg::PATHSEG_UNKNOWN;
   gfxPoint pathStart(0.0, 0.0); // start point of [sub]path
-  gfxPoint segEnd(0.0, 0.0);    // end point of previous/current segment
+  gfxPoint segStart(0.0, 0.0);
+  gfxPoint segEnd;
   gfxPoint cp1, cp2;            // previous bezier's control points
   gfxPoint tcp1, tcp2;          // temporaries
 
@@ -272,7 +273,7 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_MOVETO_REL:
-      pathStart = segEnd += gfxPoint(mData[i], mData[i+1]);
+      pathStart = segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->MoveTo(segEnd);
       i += 2;
       break;
@@ -284,7 +285,7 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_REL:
-      segEnd += gfxPoint(mData[i], mData[i+1]);
+      segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->LineTo(segEnd);
       i += 2;
       break;
@@ -298,9 +299,9 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_REL:
-      cp1 = segEnd + gfxPoint(mData[i], mData[i+1]);
-      cp2 = segEnd + gfxPoint(mData[i+2], mData[i+3]);
-      segEnd += gfxPoint(mData[i+4], mData[i+5]);
+      cp1 = segStart + gfxPoint(mData[i], mData[i+1]);
+      cp2 = segStart + gfxPoint(mData[i+2], mData[i+3]);
+      segEnd = segStart + gfxPoint(mData[i+4], mData[i+5]);
       aCtx->CurveTo(cp1, cp2, segEnd);
       i += 6;
       break;
@@ -308,18 +309,18 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_ABS:
       cp1 = gfxPoint(mData[i], mData[i+1]);
       // Convert quadratic curve to cubic curve:
-      tcp1 = segEnd + (cp1 - segEnd) * 2 / 3;
-      segEnd = gfxPoint(mData[i+2], mData[i+3]); // changed before setting tcp2!
+      tcp1 = segStart + (cp1 - segStart) * 2 / 3;
+      segEnd = gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
       i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_REL:
-      cp1 = segEnd + gfxPoint(mData[i], mData[i+1]);
+      cp1 = segStart + gfxPoint(mData[i], mData[i+1]);
       // Convert quadratic curve to cubic curve:
-      tcp1 = segEnd + (cp1 - segEnd) * 2 / 3;
-      segEnd += gfxPoint(mData[i+2], mData[i+3]); // changed before setting tcp2!
+      tcp1 = segStart + (cp1 - segStart) * 2 / 3;
+      segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
       i += 4;
@@ -329,22 +330,19 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     case nsIDOMSVGPathSeg::PATHSEG_ARC_REL:
     {
       gfxPoint radii(mData[i], mData[i+1]);
-      gfxPoint start = segEnd;
-      gfxPoint end = gfxPoint(mData[i+5], mData[i+6]);
+      gfxPoint segEnd = gfxPoint(mData[i+5], mData[i+6]);
       if (segType == nsIDOMSVGPathSeg::PATHSEG_ARC_REL) {
-        end += start;
+        segEnd += segStart;
       }
-      segEnd = end;
-      if (start != end) {
+      if (segEnd != segStart) {
         if (radii.x == 0.0f || radii.y == 0.0f) {
-          aCtx->LineTo(end);
-          i += 7;
-          break;
-        }
-        nsSVGArcConverter converter(start, end, radii, mData[i+2],
-                                    mData[i+3] != 0, mData[i+4] != 0);
-        while (converter.GetNextSegment(&cp1, &cp2, &end)) {
-          aCtx->CurveTo(cp1, cp2, end);
+          aCtx->LineTo(segEnd);
+        } else {
+          nsSVGArcConverter converter(segStart, segEnd, radii, mData[i+2],
+                                      mData[i+3] != 0, mData[i+4] != 0);
+          while (converter.GetNextSegment(&cp1, &cp2, &segEnd)) {
+            aCtx->CurveTo(cp1, cp2, segEnd);
+          }
         }
       }
       i += 7;
@@ -352,27 +350,27 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     }
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_ABS:
-      segEnd = gfxPoint(mData[i++], segEnd.y);
+      segEnd = gfxPoint(mData[i++], segStart.y);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_REL:
-      segEnd += gfxPoint(mData[i++], 0.0f);
+      segEnd = segStart + gfxPoint(mData[i++], 0.0f);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_ABS:
-      segEnd = gfxPoint(segEnd.x, mData[i++]);
+      segEnd = gfxPoint(segStart.x, mData[i++]);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_REL:
-      segEnd += gfxPoint(0.0f, mData[i++]);
+      segEnd = segStart + gfxPoint(0.0f, mData[i++]);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
-      cp1 = SVGPathSegUtils::IsCubicType(prevSegType) ? segEnd * 2 - cp2 : segEnd;
+      cp1 = SVGPathSegUtils::IsCubicType(prevSegType) ? segStart * 2 - cp2 : segStart;
       cp2 = gfxPoint(mData[i],   mData[i+1]);
       segEnd = gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
@@ -380,28 +378,28 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
-      cp1 = SVGPathSegUtils::IsCubicType(prevSegType) ? segEnd * 2 - cp2 : segEnd;
-      cp2 = segEnd + gfxPoint(mData[i], mData[i+1]);
-      segEnd += gfxPoint(mData[i+2], mData[i+3]);
+      cp1 = SVGPathSegUtils::IsCubicType(prevSegType) ? segStart * 2 - cp2 : segStart;
+      cp2 = segStart + gfxPoint(mData[i], mData[i+1]);
+      segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
       i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
-      cp1 = SVGPathSegUtils::IsQuadraticType(prevSegType) ? segEnd * 2 - cp1 : segEnd;
+      cp1 = SVGPathSegUtils::IsQuadraticType(prevSegType) ? segStart * 2 - cp1 : segStart;
       // Convert quadratic curve to cubic curve:
-      tcp1 = segEnd + (cp1 - segEnd) * 2 / 3;
-      segEnd = gfxPoint(mData[i], mData[i+1]); // changed before setting tcp2!
+      tcp1 = segStart + (cp1 - segStart) * 2 / 3;
+      segEnd = gfxPoint(mData[i], mData[i+1]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
       i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
-      cp1 = SVGPathSegUtils::IsQuadraticType(prevSegType) ? segEnd * 2 - cp1 : segEnd;
+      cp1 = SVGPathSegUtils::IsQuadraticType(prevSegType) ? segStart * 2 - cp1 : segStart;
       // Convert quadratic curve to cubic curve:
-      tcp1 = segEnd + (cp1 - segEnd) * 2 / 3;
-      segEnd = segEnd + gfxPoint(mData[i], mData[i+1]); // changed before setting tcp2!
+      tcp1 = segStart + (cp1 - segStart) * 2 / 3;
+      segEnd = segStart + gfxPoint(mData[i], mData[i+1]); // changed before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
       i += 2;
@@ -412,6 +410,7 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       return; // according to spec we'd use everything up to the bad seg anyway
     }
     prevSegType = segType;
+    segStart = segEnd;
   }
   NS_ABORT_IF_FALSE(i == mData.Length(), "Very, very bad - mData corrupt");
 }

From 45ffe4244b943885ca1192321025d147931882ae Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:16:02 +0100
Subject: [PATCH 087/509] Bug 589648 part 2. Stop hardcoding the segment
 argument count in SVGPathData::ConstructPath. r=longsonr.

--HG--
extra : rebase_source : 8e670189c28a66c682c6097b3c42f41fa3126aa5
---
 content/svg/content/src/SVGPathData.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/content/svg/content/src/SVGPathData.cpp b/content/svg/content/src/SVGPathData.cpp
index da91354e6374..3c5dc0371530 100644
--- a/content/svg/content/src/SVGPathData.cpp
+++ b/content/svg/content/src/SVGPathData.cpp
@@ -258,6 +258,7 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
   PRUint32 i = 0;
   while (i < mData.Length()) {
     segType = SVGPathSegUtils::DecodeType(mData[i++]);
+    PRUint32 argCount = SVGPathSegUtils::ArgCountForType(segType);
 
     switch (segType)
     {
@@ -269,25 +270,21 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     case nsIDOMSVGPathSeg::PATHSEG_MOVETO_ABS:
       pathStart = segEnd = gfxPoint(mData[i], mData[i+1]);
       aCtx->MoveTo(segEnd);
-      i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_MOVETO_REL:
       pathStart = segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->MoveTo(segEnd);
-      i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_ABS:
       segEnd = gfxPoint(mData[i], mData[i+1]);
       aCtx->LineTo(segEnd);
-      i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_REL:
       segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->LineTo(segEnd);
-      i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_ABS:
@@ -295,7 +292,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = gfxPoint(mData[i+2], mData[i+3]);
       segEnd = gfxPoint(mData[i+4], mData[i+5]);
       aCtx->CurveTo(cp1, cp2, segEnd);
-      i += 6;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_REL:
@@ -303,7 +299,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = segStart + gfxPoint(mData[i+2], mData[i+3]);
       segEnd = segStart + gfxPoint(mData[i+4], mData[i+5]);
       aCtx->CurveTo(cp1, cp2, segEnd);
-      i += 6;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_ABS:
@@ -313,7 +308,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
-      i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_REL:
@@ -323,7 +317,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
-      i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_ARC_ABS:
@@ -345,27 +338,26 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
           }
         }
       }
-      i += 7;
       break;
     }
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_ABS:
-      segEnd = gfxPoint(mData[i++], segStart.y);
+      segEnd = gfxPoint(mData[i], segStart.y);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_REL:
-      segEnd = segStart + gfxPoint(mData[i++], 0.0f);
+      segEnd = segStart + gfxPoint(mData[i], 0.0f);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_ABS:
-      segEnd = gfxPoint(segStart.x, mData[i++]);
+      segEnd = gfxPoint(segStart.x, mData[i]);
       aCtx->LineTo(segEnd);
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_REL:
-      segEnd = segStart + gfxPoint(0.0f, mData[i++]);
+      segEnd = segStart + gfxPoint(0.0f, mData[i]);
       aCtx->LineTo(segEnd);
       break;
 
@@ -374,7 +366,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = gfxPoint(mData[i],   mData[i+1]);
       segEnd = gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
-      i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
@@ -382,7 +373,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = segStart + gfxPoint(mData[i], mData[i+1]);
       segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
-      i += 4;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
@@ -392,7 +382,6 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = gfxPoint(mData[i], mData[i+1]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
-      i += 2;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
@@ -402,13 +391,13 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = segStart + gfxPoint(mData[i], mData[i+1]); // changed before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
-      i += 2;
       break;
 
     default:
       NS_NOTREACHED("Bad path segment type");
       return; // according to spec we'd use everything up to the bad seg anyway
     }
+    i += argCount;
     prevSegType = segType;
     segStart = segEnd;
   }

From 3045bb10aa863e44a72a0a545cb4020a19bc78e5 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:16:02 +0100
Subject: [PATCH 088/509] Bug 589648 part 3. Work around lack of cairo support
 to display square stroke-linecaps for zero length paths. r=longsonr.

--HG--
extra : rebase_source : 5aaa65a2bc888b4a64884f5f2a87beb7803f646e
---
 content/svg/content/src/SVGPathData.cpp       | 119 +++++++++++++++
 content/svg/content/test/Makefile.in          |   1 +
 .../test_stroke-linecap-hit-testing.xhtml     |  48 ++++++
 layout/reftests/svg/reftest.list              |   2 +
 ...e-linecap-square-w-zero-length-segs-01.svg | 143 ++++++++++++++++++
 ...e-linecap-square-w-zero-length-segs-02.svg |  28 ++++
 .../svg/base/src/nsSVGPathGeometryFrame.cpp   |   6 +
 7 files changed, 347 insertions(+)
 create mode 100644 content/svg/content/test/test_stroke-linecap-hit-testing.xhtml
 create mode 100644 layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-01.svg
 create mode 100644 layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-02.svg

diff --git a/content/svg/content/src/SVGPathData.cpp b/content/svg/content/src/SVGPathData.cpp
index 3c5dc0371530..121af2810c86 100644
--- a/content/svg/content/src/SVGPathData.cpp
+++ b/content/svg/content/src/SVGPathData.cpp
@@ -237,6 +237,50 @@ SVGPathData::GetPathSegAtLength(float aDistance) const
   return NS_MAX(0U, segIndex - 1); // -1 because while loop takes us 1 too far
 }
 
+/**
+ * The SVG spec says we have to paint stroke caps for zero length subpaths:
+ *
+ *   http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes
+ *
+ * Cairo only does this for |stroke-linecap: round| and not for
+ * |stroke-linecap: square| (since that's what Adobe Acrobat has always done).
+ *
+ * To help us conform to the SVG spec we have this helper function to draw an
+ * approximation of square caps for zero length subpaths. It does this by
+ * inserting a subpath containing a single axis aligned straight line that is
+ * as small as it can be without cairo throwing it away for being too small to
+ * affect rendering. Cairo will then draw stroke caps for this axis aligned
+ * line, creating an axis aligned rectangle (approximating the square that
+ * would ideally be drawn).
+ *
+ * Note that this function inserts a subpath into the current gfx path that
+ * will be present during both fill and stroke operations.
+ */
+static void
+ApproximateZeroLengthSubpathSquareCaps(const gfxPoint &aPoint, gfxContext *aCtx)
+{
+  // Cairo's fixed point fractional part is 8 bits wide, so its device space
+  // coordinate granularity is 1/256 pixels. However, to prevent user space
+  // |aPoint| and |aPoint + tinyAdvance| being rounded to the same device
+  // coordinates, we double this for |tinyAdvance|:
+
+  const gfxSize tinyAdvance = aCtx->DeviceToUser(gfxSize(2.0/256.0, 0.0));
+
+  aCtx->MoveTo(aPoint);
+  aCtx->LineTo(aPoint + gfxPoint(tinyAdvance.width, tinyAdvance.height));
+  aCtx->MoveTo(aPoint);
+}
+
+#define MAYBE_APPROXIMATE_ZERO_LENGTH_SUBPATH_SQUARE_CAPS                     \
+  do {                                                                        \
+    if (capsAreSquare && !subpathHasLength && subpathContainsNonArc &&        \
+        SVGPathSegUtils::IsValidType(prevSegType) &&                          \
+        (!IsMoveto(prevSegType) ||                                            \
+         segType == nsIDOMSVGPathSeg::PATHSEG_CLOSEPATH)) {                   \
+      ApproximateZeroLengthSubpathSquareCaps(segStart, aCtx);                 \
+    }                                                                         \
+  } while(0)
+
 void
 SVGPathData::ConstructPath(gfxContext *aCtx) const
 {
@@ -244,6 +288,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     return; // paths without an initial moveto are invalid
   }
 
+  PRBool capsAreSquare = aCtx->CurrentLineCap() == gfxContext::LINE_CAP_SQUARE;
+  PRBool subpathHasLength = PR_FALSE;  // visual length
+  PRBool subpathContainsNonArc = PR_FALSE;
+
   PRUint32 segType, prevSegType = nsIDOMSVGPathSeg::PATHSEG_UNKNOWN;
   gfxPoint pathStart(0.0, 0.0); // start point of [sub]path
   gfxPoint segStart(0.0, 0.0);
@@ -263,28 +311,45 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     switch (segType)
     {
     case nsIDOMSVGPathSeg::PATHSEG_CLOSEPATH:
+      // set this early to allow drawing of square caps for "M{x},{y} Z":
+      subpathContainsNonArc = PR_TRUE;
+      MAYBE_APPROXIMATE_ZERO_LENGTH_SUBPATH_SQUARE_CAPS;
       segEnd = pathStart;
       aCtx->ClosePath();
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_MOVETO_ABS:
+      MAYBE_APPROXIMATE_ZERO_LENGTH_SUBPATH_SQUARE_CAPS;
       pathStart = segEnd = gfxPoint(mData[i], mData[i+1]);
       aCtx->MoveTo(segEnd);
+      subpathHasLength = PR_FALSE;
+      subpathContainsNonArc = PR_FALSE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_MOVETO_REL:
+      MAYBE_APPROXIMATE_ZERO_LENGTH_SUBPATH_SQUARE_CAPS;
       pathStart = segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->MoveTo(segEnd);
+      subpathHasLength = PR_FALSE;
+      subpathContainsNonArc = PR_FALSE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_ABS:
       segEnd = gfxPoint(mData[i], mData[i+1]);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_REL:
       segEnd = segStart + gfxPoint(mData[i], mData[i+1]);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_ABS:
@@ -292,6 +357,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = gfxPoint(mData[i+2], mData[i+3]);
       segEnd = gfxPoint(mData[i+4], mData[i+5]);
       aCtx->CurveTo(cp1, cp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1 || segEnd != cp2);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_REL:
@@ -299,6 +368,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = segStart + gfxPoint(mData[i+2], mData[i+3]);
       segEnd = segStart + gfxPoint(mData[i+4], mData[i+5]);
       aCtx->CurveTo(cp1, cp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1 || segEnd != cp2);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_ABS:
@@ -308,6 +381,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_REL:
@@ -317,6 +394,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_ARC_ABS:
@@ -338,27 +419,46 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
           }
         }
       }
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
       break;
     }
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_ABS:
       segEnd = gfxPoint(mData[i], segStart.y);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_HORIZONTAL_REL:
       segEnd = segStart + gfxPoint(mData[i], 0.0f);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_ABS:
       segEnd = gfxPoint(segStart.x, mData[i]);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_LINETO_VERTICAL_REL:
       segEnd = segStart + gfxPoint(0.0f, mData[i]);
       aCtx->LineTo(segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
@@ -366,6 +466,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = gfxPoint(mData[i],   mData[i+1]);
       segEnd = gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1 || segEnd != cp2);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
@@ -373,6 +477,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       cp2 = segStart + gfxPoint(mData[i], mData[i+1]);
       segEnd = segStart + gfxPoint(mData[i+2], mData[i+3]);
       aCtx->CurveTo(cp1, cp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1 || segEnd != cp2);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
@@ -382,6 +490,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = gfxPoint(mData[i], mData[i+1]); // set before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     case nsIDOMSVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
@@ -391,6 +503,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
       segEnd = segStart + gfxPoint(mData[i], mData[i+1]); // changed before setting tcp2!
       tcp2 = cp1 + (segEnd - cp1) / 3;
       aCtx->CurveTo(tcp1, tcp2, segEnd);
+      if (!subpathHasLength) {
+        subpathHasLength = (segEnd != segStart || segEnd != cp1);
+      }
+      subpathContainsNonArc = PR_TRUE;
       break;
 
     default:
@@ -401,7 +517,10 @@ SVGPathData::ConstructPath(gfxContext *aCtx) const
     prevSegType = segType;
     segStart = segEnd;
   }
+
   NS_ABORT_IF_FALSE(i == mData.Length(), "Very, very bad - mData corrupt");
+
+  MAYBE_APPROXIMATE_ZERO_LENGTH_SUBPATH_SQUARE_CAPS;
 }
 
 already_AddRefed<gfxFlattenedPath>
diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in
index 0dc4a0a2e556..8d2d129619ac 100644
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -79,6 +79,7 @@ _TEST_FILES = \
 		test_SVGAnimatedImageSMILDisabled.html \
 		animated-svg-image-helper.html \
 		animated-svg-image-helper.svg \
+		test_stroke-linecap-hit-testing.xhtml \
 		test_SVGLengthList.xhtml \
 		test_SVGLengthList-2.xhtml \
 		test_SVGPathSegList.xhtml \
diff --git a/content/svg/content/test/test_stroke-linecap-hit-testing.xhtml b/content/svg/content/test/test_stroke-linecap-hit-testing.xhtml
new file mode 100644
index 000000000000..dcf497ce656e
--- /dev/null
+++ b/content/svg/content/test/test_stroke-linecap-hit-testing.xhtml
@@ -0,0 +1,48 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=589648
+-->
+<head>
+  <title>Test hit-testing of line caps</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body onload="run()">
+<script class="testbody" type="text/javascript">
+<![CDATA[
+
+SimpleTest.waitForExplicitFinish();
+
+function run()
+{
+  var svg = document.getElementById('svg');
+  var div = document.getElementById("div");
+  var x = div.offsetLeft;
+  var y = div.offsetTop;
+  var got, expected;
+
+  got = document.elementFromPoint(5 + x, 5 + y);
+  expected = document.getElementById('zero-length-square-caps');
+  is(got, expected, 'Check hit on zero length subpath\'s square caps');
+
+  SimpleTest.finish();
+}
+
+]]>
+</script>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=500174">Mozilla Bug 500174</a>
+<p id="display"></p>
+<div id="content">
+
+  <div width="100%" height="1" id="div"></div>
+  <svg xmlns="http://www.w3.org/2000/svg" id="svg" width="400" height="300">
+    <path id="zero-length-square-caps" stroke="blue" stroke-width="50"
+          stroke-linecap="square" d="M25,25 L25,25"/>
+  </svg>
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index aecbd314e415..9e0b77fde0a8 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -196,6 +196,8 @@ fails-if(Android) random-if(gtk2Widget) != text-language-01.xhtml text-language-
 == text-layout-03.svg text-layout-03-ref.svg
 == text-scale-01.svg text-scale-01-ref.svg
 == text-stroke-scaling-01.svg text-stroke-scaling-01-ref.svg
+== stroke-linecap-square-w-zero-length-segs-01.svg pass.svg
+== stroke-linecap-square-w-zero-length-segs-02.svg pass.svg
 == text-style-01a.svg text-style-01-ref.svg
 == text-style-01b.svg text-style-01-ref.svg
 == text-style-01c.svg text-style-01-ref.svg
diff --git a/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-01.svg b/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-01.svg
new file mode 100644
index 000000000000..f7d93efc1b10
--- /dev/null
+++ b/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-01.svg
@@ -0,0 +1,143 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  
+  <title>Test 'stroke-linecap: square' with zero length path segments</title>
+
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=589648 -->
+
+  <style>
+
+path {
+  stroke-width: 20px;
+  stroke-linecap: square;
+}
+
+rect {
+  fill: red;
+}
+
+/* expect lime squares to cover red rects */
+path.squares-expected {
+  stroke: lime;
+}
+
+path.squares-not-expected {
+  stroke: red;
+}
+
+/* thicker stroke to cover squares-not-expected paths */
+path.coverer {
+  stroke: lime;
+  stroke-width: 24px;
+}
+
+/* to show edges of shapes to help in debugging:
+g > rect {
+  stroke: red;
+  stroke-width: 5px;
+}
+path.coverer {
+  stroke: lime;
+  stroke-width: 18px;
+}
+*/
+
+  </style>
+
+  <rect width="100%" height="100%" style="fill:lime"/>
+
+  <!-- Column 1: test single segment zero-length subpaths: -->
+
+  <g transform="translate(25,25)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 L0,0  M20,20 L30,30  M50,50 L50,50  M70,70 L80,80  M100,100 L100,100"/>
+  </g>
+
+  <g transform="translate(25,75)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 C0,0 0,0 0,0  M20,20 L30,30  M50,50 C50,50 50,50 50,50  M70,70 L80,80  M100,100 C100,100 100,100 100,100"/>
+  </g>
+
+  <g transform="translate(25,125)">
+    <path class="squares-not-expected" d="M0,0 A0,10 0 0 0 0,0  M20,20 L30,30  M50,50 A0,10 0 0 0 50,50  M70,70 L80,80  M100,100 A0,10 0 0 0 100,100"/>
+    <path class="coverer" d="M20,20 L30,30 M70,70 L80,80"/>
+  </g>
+
+  <g transform="translate(25,175)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 Z  M20,20 L30,30  M50,50 Z  M70,70 L80,80  M100,100 Z"/>
+  </g>
+
+
+  <!-- Column 2: test multi-segment zero-length subpaths: -->
+
+  <g transform="translate(175,25)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 L0,0 M0,0 L0,0  M20,20 L30,30  M50,50 L50,50 L50,50  M70,70 L80,80  M100,100 L100,100 L100,100"/>
+  </g>
+
+  <g transform="translate(177,75)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 C0,0 0,0 0,0 C0,0 0,0 0,0  M20,20 L30,30  M50,50 C50,50 50,50 50,50 C50,50 50,50 50,50  M70,70 L80,80  M100,100 C100,100 100,100 100,100 C100,100 100,100 100,100"/>
+  </g>
+
+  <g transform="translate(175,125)">
+    <path class="squares-not-expected" d="M0,0 A0,10 0 0 0 0,0 A0,10 0 0 0 0,0  M20,20 L30,30  M50,50 A0,10 0 0 0 50,50 A0,10 0 0 0 50,50  M70,70 L80,80  M100,100 A0,10 0 0 0 100,100 A0,10 0 0 0 100,100"/>
+    <path class="coverer" d="M20,20 L30,30 M70,70 L80,80"/>
+  </g>
+
+  <g transform="translate(175,175)">
+    <rect x="-9" y="-9" width="18" height="18"/>
+    <rect x="41" y="41" width="18" height="18"/>
+    <rect x="91" y="91" width="18" height="18"/>
+    <path class="squares-expected" d="M0,0 Z Z  M20,20 L30,30  M50,50 Z Z  M70,70 L80,80  M100,100 Z Z"/>
+  </g>
+
+
+  <!-- Column 3: test non-zero-length subpaths that begin, end and contain
+       zero length segments: -->
+
+  <g transform="translate(325,25)">
+    <path class="squares-not-expected" d="M20,20 L20,20 L30,30 L30,30 L40,40 L40,40"/>
+    <path class="coverer" d="M20,20 L40,40"/>
+  </g>
+
+  <g transform="translate(325,75)">
+    <path class="squares-not-expected" d="M20,20 C20,20 20,20 20,20 C20,20 30,30 30,30 C30,30 30,30 30,30 C30,30 40,40 40,40 C40,40 40,40 40,40"/>
+    <path class="coverer" d="M20,20 L40,40"/>
+  </g>
+
+  <g transform="translate(325,125)">
+    <path class="squares-not-expected" d="M20,20 A0,10 0 0 0 20,20 A0,10 0 0 0 30,30 A0,10 0 0 0 30,30 A0,10 0 0 0 40,40 A0,10 0 0 0 40,40"/>
+    <path class="coverer" d="M20,20 L40,40"/>
+  </g>
+
+  <!-- this one is shorter because the Z's mean we only have path end points
+       at 20,20 -->
+  <g transform="translate(325,175)">
+    <rect x="11" y="11" width="18" height="18"/>
+    <path class="squares-expected" d="M20,20 Z L30,30 Z L40,40 Z"/>
+  </g>
+
+
+  <!-- Column 4: test loan movetos -->
+
+  <g transform="translate(425,25)">
+    <path class="squares-not-expected" d="M0,0 M0,0  M20,20 L30,30  M50,50 M50,50  M70,70 L80,80  M100,100 M100,100"/>
+    <path class="coverer" d="M20,20 L30,30 M70,70 L80,80"/>
+  </g>
+
+</svg>
diff --git a/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-02.svg b/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-02.svg
new file mode 100644
index 000000000000..1579dea5955c
--- /dev/null
+++ b/layout/reftests/svg/stroke-linecap-square-w-zero-length-segs-02.svg
@@ -0,0 +1,28 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait">
+  
+  <title>Test 'stroke-linecap: square' with zero length path segments</title>
+
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=589648 -->
+
+  <script>
+
+function run()
+{
+  document.getElementById('path').setAttribute('stroke-linecap', 'butt');
+  document.documentElement.removeAttribute('class');
+}
+
+window.addEventListener("MozReftestInvalidate", run, false);
+
+  </script>
+
+  <rect width="100%" height="100%" style="fill:lime"/>
+
+  <path id="path" stroke="red" stroke-width="200" stroke-linecap="square"
+        d="M100,100 L100,100"/>
+
+</svg>
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index 565a686b3033..30dade7050ec 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -483,6 +483,12 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext,
 
   aContext->Multiply(matrix);
 
+  // Hack to let SVGPathData::ConstructPath know if we have square caps:
+  const nsStyleSVG* style = GetStyleSVG();
+  if (style->mStrokeLinecap == NS_STYLE_STROKE_LINECAP_SQUARE) {
+    aContext->SetLineCap(gfxContext::LINE_CAP_SQUARE);
+  }
+
   aContext->NewPath();
   static_cast<nsSVGPathGeometryElement*>(mContent)->ConstructPath(aContext);
 }

From 2bc553bf081959c3ed102b35e91a69ccb8b0430a Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 20 Apr 2011 10:43:08 +0100
Subject: [PATCH 089/509] Bug 648053 - Always use absolute paths when
 specifying the source file to the compiler. r=ted.

--HG--
extra : rebase_source : c2cb4eba8efad66bb2f718c8397deee701801cf6
---
 config/rules.mk        | 4 ----
 js/src/config/rules.mk | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 9bf282722560..53ccf286fe8f 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -82,11 +82,7 @@ else
   ELOG :=
 endif
 
-ifeq ($(OS_ARCH),WINNT)
 _VPATH_SRCS = $(abspath $<)
-else
-_VPATH_SRCS = $<
-endif
 
 # Add $(DIST)/lib to VPATH so that -lfoo dependencies are followed
 VPATH += $(DIST)/lib
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 9bf282722560..53ccf286fe8f 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -82,11 +82,7 @@ else
   ELOG :=
 endif
 
-ifeq ($(OS_ARCH),WINNT)
 _VPATH_SRCS = $(abspath $<)
-else
-_VPATH_SRCS = $<
-endif
 
 # Add $(DIST)/lib to VPATH so that -lfoo dependencies are followed
 VPATH += $(DIST)/lib

From f26170f7e3c35671a58367154835d9853dbd8ed7 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Tue, 19 Apr 2011 12:03:34 -0700
Subject: [PATCH 090/509] Bug 646910: attempt to fix random orange in
 test_clients_engine. r=philiKON

--HG--
extra : transplant_source : %DC%16%D0%0F%E3%82%8F%18%CC%1B4%D4%A4%BF%1Aw%E0%EAH%5C
---
 .../sync/tests/unit/test_clients_engine.js    | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/services/sync/tests/unit/test_clients_engine.js b/services/sync/tests/unit/test_clients_engine.js
index a3e539eeebfe..e3bedc03e8b8 100644
--- a/services/sync/tests/unit/test_clients_engine.js
+++ b/services/sync/tests/unit/test_clients_engine.js
@@ -7,9 +7,9 @@ Cu.import("resource://services-sync/engines/clients.js");
 Cu.import("resource://services-sync/service.js");
 
 const MORE_THAN_CLIENTS_TTL_REFRESH = 691200; // 8 days
-const LESS_THAN_CLIENTS_TTL_REFRESH = 86400; // 1 day
+const LESS_THAN_CLIENTS_TTL_REFRESH = 86400;  // 1 day
 
-function test_bad_hmac() {
+add_test(function test_bad_hmac() {
   _("Ensure that Clients engine deletes corrupt records.");
   let global = new ServerWBO('global',
                              {engines: {clients: {version: Clients.version,
@@ -41,7 +41,6 @@ function test_bad_hmac() {
   };
 
   let server = httpd_setup(handlers);
-  do_test_pending();
 
   try {
     let passphrase = "abcdeabcdeabcdeabcdeabcdea";
@@ -133,15 +132,15 @@ function test_bad_hmac() {
     do_check_false(oldKey.equals(newKey));
 
   } finally {
-    server.stop(do_test_finished);
     Svc.Prefs.resetBranch("");
     Records.clearCache();
+    server.stop(run_next_test);
   }
-}
+});
 
-function test_properties() {
+add_test(function test_properties() {
+  _("Test lastRecordUpload property");
   try {
-    _("Test lastRecordUpload property");
     do_check_eq(Svc.Prefs.get("clients.lastRecordUpload"), undefined);
     do_check_eq(Clients.lastRecordUpload, 0);
 
@@ -150,10 +149,11 @@ function test_properties() {
     do_check_eq(Clients.lastRecordUpload, Math.floor(now / 1000));
   } finally {
     Svc.Prefs.resetBranch("");
+    run_next_test();
   }
-}
+});
 
-function test_sync() {
+add_test(function test_sync() {
   _("Ensure that Clients engine uploads a new client record once a week.");
   Svc.Prefs.set("clusterURL", "http://localhost:8080/");
   Svc.Prefs.set("username", "foo");
@@ -172,8 +172,6 @@ function test_sync() {
   server.registerPathHandler(
     "/1.1/foo/storage/clients/" + Clients.localID, clientwbo.handler());
 
-  do_test_pending();
-
   try {
 
     _("First sync, client record is uploaded");
@@ -203,17 +201,14 @@ function test_sync() {
     do_check_eq(Clients.lastRecordUpload, yesterday);
 
   } finally {
-    server.stop(do_test_finished);
     Svc.Prefs.resetBranch("");
     Records.clearCache();
+    server.stop(run_next_test);
   }
-}
-
+});
 
 function run_test() {
   initTestLogging("Trace");
   Log4Moz.repository.getLogger("Engine.Clients").level = Log4Moz.Level.Trace;
-  test_bad_hmac();
-  test_properties();
-  test_sync();
+  run_next_test();
 }

From 072eafe2d52f6f9a90588497b450fa500e3a8535 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Tue, 19 Apr 2011 12:30:39 -0700
Subject: [PATCH 091/509] Bug 645918: attempt to fix random orange in
 test_bookmarks_engine. r=philiKON

--HG--
extra : transplant_source : %06%A4%93%D01%27%97%15h%D4h%C4CY%A0%09%AB%CF%CE%7D
---
 .../sync/tests/unit/test_bookmark_engine.js   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/services/sync/tests/unit/test_bookmark_engine.js b/services/sync/tests/unit/test_bookmark_engine.js
index 10fa599c78e0..e1a78e4fd818 100644
--- a/services/sync/tests/unit/test_bookmark_engine.js
+++ b/services/sync/tests/unit/test_bookmark_engine.js
@@ -14,7 +14,7 @@ function makeEngine() {
 }
 var syncTesting = new SyncTestingInfrastructure(makeEngine);
 
-function test_ID_caching() {
+add_test(function test_ID_caching() {
 
   _("Ensure that Places IDs are not cached.");
   let engine = new BookmarksEngine();
@@ -50,12 +50,12 @@ function test_ID_caching() {
   do_check_eq(newMobileID, store.idForGUID("mobile", false));
 
   do_check_eq(store.GUIDForId(mobileID), "abcdefghijkl");
-}
+  run_next_test();
+});
 
-function test_processIncoming_error_orderChildren() {
+add_test(function test_processIncoming_error_orderChildren() {
   _("Ensure that _orderChildren() is called even when _processIncoming() throws an error.");
 
-  do_test_pending();
   Svc.Prefs.set("clusterURL", "http://localhost:8080/");
   Svc.Prefs.set("username", "foo");
 
@@ -126,16 +126,15 @@ function test_processIncoming_error_orderChildren() {
 
   } finally {
     store.wipe();
-    server.stop(do_test_finished);
     Svc.Prefs.resetBranch("");
     Records.clearCache();
     syncTesting = new SyncTestingInfrastructure(makeEngine);
+    server.stop(run_next_test);
   }
-}
+});
 
-function test_restorePromptsReupload() {
+add_test(function test_restorePromptsReupload() {
   _("Ensure that restoring from a backup will reupload all records.");
-  do_test_pending();
   Svc.Prefs.set("username", "foo");
   Service.serverURL = "http://localhost:8080/";
   Service.clusterURL = "http://localhost:8080/";
@@ -266,15 +265,15 @@ function test_restorePromptsReupload() {
 
   } finally {
     store.wipe();
-    server.stop(do_test_finished);
     Svc.Prefs.resetBranch("");
     Records.clearCache();
     syncTesting = new SyncTestingInfrastructure(makeEngine);
+    server.stop(run_next_test);
   }
-}
+});
 
 // Bug 632287.
-function test_mismatched_types() {
+add_test(function test_mismatched_types() {
   _("Ensure that handling a record that changes type causes deletion " +
     "then re-adding.");
 
@@ -309,7 +308,6 @@ function test_mismatched_types() {
     "parentid": "toolbar"
   };
 
-  do_test_pending();
   Svc.Prefs.set("username", "foo");
   Service.serverURL = "http://localhost:8080/";
   Service.clusterURL = "http://localhost:8080/";
@@ -351,12 +349,12 @@ function test_mismatched_types() {
 
   } finally {
     store.wipe();
-    server.stop(do_test_finished);
     Svc.Prefs.resetBranch("");
     Records.clearCache();
     syncTesting = new SyncTestingInfrastructure(makeEngine);
+    server.stop(run_next_test);
   }
-}
+});
 
 function run_test() {
   initTestLogging("Trace");
@@ -364,8 +362,5 @@ function run_test() {
 
   CollectionKeys.generateNewKeys();
 
-  test_processIncoming_error_orderChildren();
-  test_ID_caching();
-  test_mismatched_types();
-  test_restorePromptsReupload();
+  run_next_test();
 }

From e84cf4d71d22753565890fdc7ac498379e196996 Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Wed, 20 Apr 2011 13:59:06 -0500
Subject: [PATCH 092/509] Bug 619217 - Don't send NPCocoaEventTextInput to
 plugin when Command or Control key down in 32-bit mode. r=josh

---
 widget/src/cocoa/nsChildView.mm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index a22ed144bf16..f863dff91f22 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -5649,6 +5649,15 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
           return;
         }
       }
+
+      // Don't send complex text input to a plugin in Cocoa event mode if
+      // either the Control key or the Command key is pressed -- even if the
+      // plugin has requested it, or we are already in IME composition.  This
+      // conforms to our behavior in 64-bit mode and fixes bug 619217.
+      NSUInteger modifierFlags = [theEvent modifierFlags];
+      if ((modifierFlags & NSControlKeyMask) || (modifierFlags & NSCommandKeyMask)) {
+        return;
+      }
     }
 
     // This will take care of all Carbon plugin events and also send Cocoa plugin

From 0f2279964204c299aa941951ab6d5c9d95bd4980 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 31 Mar 2011 12:35:04 -0400
Subject: [PATCH 093/509] Bug 640387 - onhashchange should be fired when
 navigating between history entries created via history.pushState if the
 entries' URIs differ only in their hashes. r=smaug

--HG--
extra : rebase_source : de3b3389e1ed402362f46b4b17f7cd386aca8361
---
 content/base/public/nsContentUtils.h    |   8 +
 content/base/src/nsContentUtils.cpp     |  26 +++
 docshell/base/nsDocShell.cpp            | 256 ++++++++----------------
 docshell/base/nsDocShell.h              |   4 +-
 docshell/shistory/public/nsISHEntry.idl |  16 +-
 docshell/shistory/src/nsSHEntry.cpp     |  14 --
 docshell/shistory/src/nsSHEntry.h       |   1 -
 docshell/test/Makefile.in               |   3 +
 docshell/test/file_bug640387.html       |  26 +++
 docshell/test/test_bug385434.html       |   4 -
 docshell/test/test_bug640387_1.html     | 110 ++++++++++
 docshell/test/test_bug640387_2.html     |  91 +++++++++
 12 files changed, 348 insertions(+), 211 deletions(-)
 create mode 100644 docshell/test/file_bug640387.html
 create mode 100644 docshell/test/test_bug640387_1.html
 create mode 100644 docshell/test/test_bug640387_2.html

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 8e00d0f9fd28..5f74d6fcdabd 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1414,6 +1414,14 @@ public:
    */
   static PRBool URIIsLocalFile(nsIURI *aURI);
 
+  /**
+   * Given a URI, return set beforeHash to the part before the '#', and
+   * afterHash to the remainder of the URI, including the '#'.
+   */
+  static nsresult SplitURIAtHash(nsIURI *aURI,
+                                 nsACString &aBeforeHash,
+                                 nsACString &aAfterHash);
+
   /**
    * Get the application manifest URI for this document.  The manifest URI
    * is specified in the manifest= attribute of the root element of the
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 1957128f0276..bd81861ac6c2 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -5012,6 +5012,32 @@ nsContentUtils::URIIsLocalFile(nsIURI *aURI)
          isFile;
 }
 
+nsresult
+nsContentUtils::SplitURIAtHash(nsIURI *aURI,
+                               nsACString &aBeforeHash,
+                               nsACString &aAfterHash)
+{
+  // See bug 225910 for why we can't do this using nsIURL.
+
+  aBeforeHash.Truncate();
+  aAfterHash.Truncate();
+
+  NS_ENSURE_ARG_POINTER(aURI);
+
+  nsCAutoString spec;
+  nsresult rv = aURI->GetSpec(spec);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRInt32 index = spec.FindChar('#');
+  if (index == -1) {
+    index = spec.Length();
+  }
+
+  aBeforeHash.Assign(Substring(spec, 0, index));
+  aAfterHash.Assign(Substring(spec, index));
+  return NS_OK;
+}
+
 /* static */
 nsIScriptContext*
 nsContentUtils::GetContextForEventHandlers(nsINode* aNode,
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7bf77e198af9..507d48ceedb6 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -215,6 +215,7 @@
 #endif
 
 #include "nsPluginError.h"
+#include "nsContentUtils.h"
 
 static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
                      NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -8215,33 +8216,6 @@ nsDocShell::InternalLoad(nsIURI * aURI,
     mAllowKeywordFixup =
       (aFlags & INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) != 0;
     mURIResultedInDocument = PR_FALSE;  // reset the clock...
-   
-    //
-    // First:
-    // Check to see if the new URI is an anchor in the existing document.
-    // Skip this check if we're doing some sort of abnormal load, if the
-    // new load is a non-history load and has postdata, or if we're doing
-    // a history load and the page identifiers of mOSHE and aSHEntry
-    // don't match.
-    //
-    PRBool allowScroll = PR_TRUE;
-    if (!aSHEntry) {
-        allowScroll = (aPostData == nsnull);
-    } else if (mOSHE) {
-        PRUint32 ourPageIdent;
-        mOSHE->GetPageIdentifier(&ourPageIdent);
-        PRUint32 otherPageIdent;
-        aSHEntry->GetPageIdentifier(&otherPageIdent);
-        allowScroll = (ourPageIdent == otherPageIdent);
-#ifdef DEBUG
-        if (allowScroll) {
-            nsCOMPtr<nsIInputStream> currentPostData;
-            mOSHE->GetPostData(getter_AddRefs(currentPostData));
-            NS_ASSERTION(currentPostData == aPostData,
-                         "Different POST data for entries for the same page?");
-        }
-#endif
-    }
 
     if (aLoadType == LOAD_NORMAL ||
         aLoadType == LOAD_STOP_CONTENT ||
@@ -8249,40 +8223,78 @@ nsDocShell::InternalLoad(nsIURI * aURI,
         aLoadType == LOAD_HISTORY ||
         aLoadType == LOAD_LINK) {
 
-        PRBool wasAnchor = PR_FALSE;
-        PRBool doHashchange = PR_FALSE;
+        // Split mCurrentURI and aURI on the '#' character.  Make sure we read
+        // the return values of SplitURIAtHash; it might fail because
+        // mCurrentURI is null, for instance, and we don't want to allow a
+        // short-circuited navigation in that case.
+        nsCAutoString curBeforeHash, curHash, newBeforeHash, newHash;
+        nsresult splitRv1, splitRv2;
+        splitRv1 = nsContentUtils::SplitURIAtHash(mCurrentURI, curBeforeHash, curHash);
+        splitRv2 = nsContentUtils::SplitURIAtHash(aURI, newBeforeHash, newHash);
 
-        // Get the position of the scrollers.
-        nscoord cx = 0, cy = 0;
-        GetCurScrollPos(ScrollOrientation_X, &cx);
-        GetCurScrollPos(ScrollOrientation_Y, &cy);
+        PRBool sameExceptHashes = NS_SUCCEEDED(splitRv1) &&
+                                  NS_SUCCEEDED(splitRv2) &&
+                                  curBeforeHash.Equals(newBeforeHash);
 
-        if (allowScroll) {
-            NS_ENSURE_SUCCESS(ScrollIfAnchor(aURI, &wasAnchor, aLoadType,
-                                             &doHashchange),
-                              NS_ERROR_FAILURE);
-        }
-
-        // If this is a history load, aSHEntry will have document identifier X
-        // if it was created as a result of a History.pushState() from a
-        // SHEntry with doc ident X, or if it was created by changing the hash
-        // of the URI corresponding to a SHEntry with doc ident X.
         PRBool sameDocIdent = PR_FALSE;
         if (mOSHE && aSHEntry) {
-          PRUint64 ourDocIdent, otherDocIdent;
-          mOSHE->GetDocIdentifier(&ourDocIdent);
-          aSHEntry->GetDocIdentifier(&otherDocIdent);
-          sameDocIdent = (ourDocIdent == otherDocIdent);
+            // We're doing a history load.
+
+            PRUint64 ourDocIdent, otherDocIdent;
+            mOSHE->GetDocIdentifier(&ourDocIdent);
+            aSHEntry->GetDocIdentifier(&otherDocIdent);
+            sameDocIdent = (ourDocIdent == otherDocIdent);
+
+#ifdef DEBUG
+            if (sameDocIdent) {
+                nsCOMPtr<nsIInputStream> currentPostData;
+                mOSHE->GetPostData(getter_AddRefs(currentPostData));
+                NS_ASSERTION(currentPostData == aPostData,
+                             "Different POST data for entries for the same page?");
+            }
+#endif
         }
 
-        // Do a short-circuited load if the new URI differs from the current
-        // URI only in the hash, or if the two entries belong to the same
-        // document and don't point to the same object.
+        // A short-circuited load happens when we navigate between two SHEntries
+        // for the same document.  We do a short-circuited load under two
+        // circumstances.  Either
         //
-        // (If we didn't check that the SHEntries are different objects,
-        // history.go(0) would short-circuit instead of triggering a true
-        // load, and we wouldn't dispatch an onload event to the page.)
-        if (wasAnchor || (sameDocIdent && (mOSHE != aSHEntry))) {
+        //  a) we're navigating between two different SHEntries which have the
+        //     same document identifiers, or
+        //
+        //  b) we're navigating to a new shentry whose URI differs from the
+        //     current URI only in its hash, the new hash is non-empty, and
+        //     we're not doing a POST.
+        //
+        // The restriction tha the SHEntries in (a) must be different ensures
+        // that history.go(0) and the like trigger full refreshes, rather than
+        // short-circuited loads.
+        PRBool doShortCircuitedLoad = (sameDocIdent && mOSHE != aSHEntry) ||
+                                      (!aSHEntry && aPostData == nsnull &&
+                                       sameExceptHashes && !newHash.IsEmpty());
+
+        // Fire a hashchange event if we're doing a short-circuited load and the
+        // URIs differ only in their hashes.
+        PRBool doHashchange = doShortCircuitedLoad &&
+                              sameExceptHashes &&
+                              !curHash.Equals(newHash);
+
+        if (doShortCircuitedLoad) {
+            // Save the position of the scrollers.
+            nscoord cx = 0, cy = 0;
+            GetCurScrollPos(ScrollOrientation_X, &cx);
+            GetCurScrollPos(ScrollOrientation_Y, &cy);
+
+            // We scroll the window precisely when we fire a hashchange event.
+            if (doHashchange) {
+                // Take the '#' off the hashes before passing them to
+                // ScrollToAnchor.
+                nsDependentCSubstring curHashName(curHash, 1);
+                nsDependentCSubstring newHashName(newHash, 1);
+                rv = ScrollToAnchor(curHashName, newHashName, aLoadType);
+                NS_ENSURE_SUCCESS(rv, rv);
+            }
+
             mLoadType = aLoadType;
             mURIResultedInDocument = PR_TRUE;
 
@@ -8307,7 +8319,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
             OnNewURI(aURI, nsnull, owner, mLoadType, PR_TRUE, PR_TRUE, PR_TRUE);
 
             nsCOMPtr<nsIInputStream> postData;
-            PRUint32 pageIdent = PR_UINT32_MAX;
+            PRUint64 docIdent = PRUint64(-1);
             nsCOMPtr<nsISupports> cacheKey;
 
             if (mOSHE) {
@@ -8321,20 +8333,9 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                 // wouldn't want here.
                 if (aLoadType & LOAD_CMD_NORMAL) {
                     mOSHE->GetPostData(getter_AddRefs(postData));
-                    mOSHE->GetPageIdentifier(&pageIdent);
+                    mOSHE->GetDocIdentifier(&docIdent);
                     mOSHE->GetCacheKey(getter_AddRefs(cacheKey));
                 }
-
-                if (mLSHE && wasAnchor) {
-                    // If it's an anchor load, set mLSHE's doc identifier to
-                    // mOSHE's doc identifier -- These are the same documents,
-                    // as far as HTML5 is concerned.
-                    PRUint64 docIdent;
-                    rv = mOSHE->GetDocIdentifier(&docIdent);
-                    if (NS_SUCCEEDED(rv)) {
-                        mLSHE->SetDocIdentifier(docIdent);
-                    }
-                }
             }
 
             /* Assign mOSHE to mLSHE. This will either be a new entry created
@@ -8354,10 +8355,10 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                 if (cacheKey)
                     mOSHE->SetCacheKey(cacheKey);
 
-                // Propagate our page ident to the new mOSHE so that
-                // we'll know it just differed by a scroll on the page.
-                if (pageIdent != PR_UINT32_MAX)
-                    mOSHE->SetPageIdentifier(pageIdent);
+                // Propagate our document identifier to the new mOSHE so that
+                // we'll know it's related by an anchor navigation or pushState.
+                if (docIdent != PRUint64(-1))
+                    mOSHE->SetDocIdentifier(docIdent);
             }
 
             /* restore previous position of scroller(s), if we're moving
@@ -9052,20 +9053,9 @@ nsresult nsDocShell::DoChannelLoad(nsIChannel * aChannel,
 }
 
 nsresult
-nsDocShell::ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
-                           PRUint32 aLoadType, PRBool * aDoHashchange)
+nsDocShell::ScrollToAnchor(nsACString & aCurHash, nsACString & aNewHash,
+                           PRUint32 aLoadType)
 {
-    NS_ASSERTION(aURI, "null uri arg");
-    NS_ASSERTION(aWasAnchor, "null anchor arg");
-    NS_PRECONDITION(aDoHashchange, "null hashchange arg");
-
-    if (!aURI || !aWasAnchor) {
-        return NS_ERROR_FAILURE;
-    }
-
-    *aWasAnchor = PR_FALSE;
-    *aDoHashchange = PR_FALSE;
-
     if (!mCurrentURI) {
         return NS_OK;
     }
@@ -9075,116 +9065,28 @@ nsDocShell::ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
     if (NS_FAILED(rv) || !shell) {
         // If we failed to get the shell, or if there is no shell,
         // nothing left to do here.
-        
         return rv;
     }
 
-    // NOTE: we assume URIs are absolute for comparison purposes
-
-    nsCAutoString currentSpec;
-    NS_ENSURE_SUCCESS(mCurrentURI->GetSpec(currentSpec),
-                      NS_ERROR_FAILURE);
-
-    nsCAutoString newSpec;
-    NS_ENSURE_SUCCESS(aURI->GetSpec(newSpec), NS_ERROR_FAILURE);
-
-    // Search for hash marks in the current URI and the new URI and
-    // take a copy of everything to the left of the hash for
-    // comparison.
-
-    const char kHash = '#';
-
-    // Split the new URI into a left and right part
-    // (assume we're parsing it out right)
-    nsACString::const_iterator urlStart, urlEnd, refStart, refEnd;
-    newSpec.BeginReading(urlStart);
-    newSpec.EndReading(refEnd);
-    
-    PRInt32 hashNew = newSpec.FindChar(kHash);
-    if (hashNew == 0) {
-        return NS_OK;           // Strange URI
-    }
-
-    if (hashNew > 0) {
-        // found it
-        urlEnd = urlStart;
-        urlEnd.advance(hashNew);
-        
-        refStart = urlEnd;
-        ++refStart;             // advanced past '#'
-        
-    }
-    else {
-        // no hash at all
-        urlEnd = refStart = refEnd;
-    }
-    const nsACString& sNewLeft = Substring(urlStart, urlEnd);
-    const nsACString& sNewRef =  Substring(refStart, refEnd);
-                                          
-    // Split the current URI in a left and right part
-    nsACString::const_iterator currentLeftStart, currentLeftEnd,
-                               currentRefStart, currentRefEnd;
-    currentSpec.BeginReading(currentLeftStart);
-    currentSpec.EndReading(currentRefEnd);
-
-    PRInt32 hashCurrent = currentSpec.FindChar(kHash);
-    if (hashCurrent == 0) {
-        return NS_OK;           // Strange URI 
-    }
-
-    if (hashCurrent > 0) {
-        currentLeftEnd = currentLeftStart;
-        currentLeftEnd.advance(hashCurrent);
-
-        currentRefStart = currentLeftEnd;
-        ++currentRefStart; // advance past '#'
-    }
-    else {
-        // no hash at all in currentSpec
-        currentLeftEnd = currentRefStart = currentRefEnd;
-    }
-
     // If we have no new anchor, we do not want to scroll, unless there is a
     // current anchor and we are doing a history load.  So return if we have no
     // new anchor, and there is no current anchor or the load is not a history
     // load.
-    NS_ASSERTION(hashNew != 0 && hashCurrent != 0,
-                 "What happened to the early returns above?");
-    if (hashNew == kNotFound &&
-        (hashCurrent == kNotFound || aLoadType != LOAD_HISTORY)) {
+    if ((aCurHash.IsEmpty() || aLoadType != LOAD_HISTORY) &&
+        aNewHash.IsEmpty()) {
         return NS_OK;
     }
 
-    // Compare the URIs.
-    //
-    // NOTE: this is a case sensitive comparison because some parts of the
-    // URI are case sensitive, and some are not. i.e. the domain name
-    // is case insensitive but the the paths are not.
-    //
-    // This means that comparing "http://www.ABC.com/" to "http://www.abc.com/"
-    // will fail this test.
-
-    if (!Substring(currentLeftStart, currentLeftEnd).Equals(sNewLeft)) {
-        return NS_OK;           // URIs not the same
-    }
-
-    // Now we know we are dealing with an anchor
-    *aWasAnchor = PR_TRUE;
-
-    // We should fire a hashchange event once we're done here if the two hashes
-    // are different.
-    *aDoHashchange = !Substring(currentRefStart, currentRefEnd).Equals(sNewRef);
-
     // Both the new and current URIs refer to the same page. We can now
     // browse to the hash stored in the new URI.
 
-    if (!sNewRef.IsEmpty()) {
+    if (!aNewHash.IsEmpty()) {
         // anchor is there, but if it's a load from history,
         // we don't have any anchor jumping to do
         PRBool scroll = aLoadType != LOAD_HISTORY &&
                         aLoadType != LOAD_RELOAD_NORMAL;
 
-        char *str = ToNewCString(sNewRef);
+        char *str = ToNewCString(aNewHash);
         if (!str) {
             return NS_ERROR_OUT_OF_MEMORY;
         }
@@ -9226,7 +9128,7 @@ nsDocShell::ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
             nsXPIDLString uStr;
 
             rv = textToSubURI->UnEscapeAndConvert(PromiseFlatCString(aCharset).get(),
-                                                  PromiseFlatCString(sNewRef).get(),
+                                                  PromiseFlatCString(aNewHash).get(),
                                                   getter_Copies(uStr));
             NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 354fe4738c16..1a6ab579efa9 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -332,8 +332,8 @@ protected:
                                    nsIURILoader * aURILoader,
                                    PRBool aBypassClassifier);
 
-    nsresult ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
-                            PRUint32 aLoadType, PRBool * aDoHashchange);
+    nsresult ScrollToAnchor(nsACString & curHash, nsACString & newHash,
+                            PRUint32 aLoadType);
 
     // Tries to stringify a given variant by converting it to JSON.  This only
     // works if the variant is backed by a JSVal.
diff --git a/docshell/shistory/public/nsISHEntry.idl b/docshell/shistory/public/nsISHEntry.idl
index e9f1e8851a0d..5f4effe19152 100644
--- a/docshell/shistory/public/nsISHEntry.idl
+++ b/docshell/shistory/public/nsISHEntry.idl
@@ -58,7 +58,7 @@ class nsDocShellEditorData;
 [ptr] native nsDocShellEditorDataPtr(nsDocShellEditorData);
 
 
-[scriptable, uuid(39b73c3a-48eb-4189-8069-247279c3c42d)]
+[scriptable, uuid(5f3ebf43-6944-45fb-b1b1-78a05bf9370b)]
 interface nsISHEntry : nsIHistoryEntry
 {
     /** URI for the document */
@@ -139,22 +139,12 @@ interface nsISHEntry : nsIHistoryEntry
      */
     attribute unsigned long ID;
 
-    /**
-     * pageIdentifier is an integer that should be the same for two entries
-     * attached to the same docshell only if the two entries are entries for
-     * the same page in the sense that one could go from the state represented
-     * by one to the state represented by the other simply by scrolling (so the
-     * entries are separated by an anchor traversal or a subframe navigation in
-     * some other frame).
-     */
-    attribute unsigned long pageIdentifier;
-
     /**
      * docIdentifier is an integer that should be the same for two entries
      * attached to the same docshell if and only if the two entries are entries
      * for the same document.  In practice, two entries A and B will have the
-     * same docIdentifier if they have the same pageIdentifier or if B was
-     * created by A calling history.pushState().
+     * same docIdentifier if we arrived at B by clicking an anchor link in A or
+     * if B was created by A's calling history.pushState().
      */
     attribute unsigned long long docIdentifier;
 
diff --git a/docshell/shistory/src/nsSHEntry.cpp b/docshell/shistory/src/nsSHEntry.cpp
index 697a62c662d8..c69a98aaf62d 100644
--- a/docshell/shistory/src/nsSHEntry.cpp
+++ b/docshell/shistory/src/nsSHEntry.cpp
@@ -105,7 +105,6 @@ static void StopTrackingEntry(nsSHEntry *aEntry)
 nsSHEntry::nsSHEntry() 
   : mLoadType(0)
   , mID(gEntryID++)
-  , mPageIdentifier(mID)
   , mDocIdentifier(gEntryDocIdentifier++)
   , mScrollPositionX(0)
   , mScrollPositionY(0)
@@ -130,7 +129,6 @@ nsSHEntry::nsSHEntry(const nsSHEntry &other)
   , mLayoutHistoryState(other.mLayoutHistoryState)
   , mLoadType(0)         // XXX why not copy?
   , mID(other.mID)
-  , mPageIdentifier(other.mPageIdentifier)
   , mDocIdentifier(other.mDocIdentifier)
   , mScrollPositionX(0)  // XXX why not copy?
   , mScrollPositionY(0)  // XXX why not copy?
@@ -391,18 +389,6 @@ NS_IMETHODIMP nsSHEntry::SetID(PRUint32  aID)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsSHEntry::GetPageIdentifier(PRUint32 * aResult)
-{
-  *aResult = mPageIdentifier;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSHEntry::SetPageIdentifier(PRUint32 aPageIdentifier)
-{
-  mPageIdentifier = aPageIdentifier;
-  return NS_OK;
-}
-
 NS_IMETHODIMP nsSHEntry::GetDocIdentifier(PRUint64 * aResult)
 {
   *aResult = mDocIdentifier;
diff --git a/docshell/shistory/src/nsSHEntry.h b/docshell/shistory/src/nsSHEntry.h
index befc9e01666f..a90fe4811c7c 100644
--- a/docshell/shistory/src/nsSHEntry.h
+++ b/docshell/shistory/src/nsSHEntry.h
@@ -99,7 +99,6 @@ private:
   nsCOMArray<nsISHEntry>          mChildren;
   PRUint32                        mLoadType;
   PRUint32                        mID;
-  PRUint32                        mPageIdentifier;
   PRInt64                         mDocIdentifier;
   PRInt32                         mScrollPositionX;
   PRInt32                         mScrollPositionY;
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 859651449f32..61e642046dac 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -97,6 +97,9 @@ _TEST_FILES = \
 		test_bug634834.html \
 		file_bug634834.html \
 		test_bug637644.html \
+		test_bug640387_1.html \
+		test_bug640387_2.html \
+		file_bug640387.html \
 		test_framedhistoryframes.html \
 		test_windowedhistoryframes.html \
 		historyframes.html \
diff --git a/docshell/test/file_bug640387.html b/docshell/test/file_bug640387.html
new file mode 100644
index 000000000000..3a939fb41e0b
--- /dev/null
+++ b/docshell/test/file_bug640387.html
@@ -0,0 +1,26 @@
+<html>
+<body onhashchange='hashchange()' onload='load()' onpopstate='popstate()'>
+
+<script>
+function hashchange() {
+  var f = (opener || parent).childHashchange;
+  if (f)
+    f();
+}
+
+function load() {
+  var f = (opener || parent).childLoad;
+  if (f)
+    f();
+}
+
+function popstate() {
+  var f = (opener || parent).childPopstate;
+  if (f)
+    f();
+}
+</script>
+
+Not much to see here...
+</body>
+</html>
diff --git a/docshell/test/test_bug385434.html b/docshell/test/test_bug385434.html
index 108680a5b9b4..16f6423b8e25 100644
--- a/docshell/test/test_bug385434.html
+++ b/docshell/test/test_bug385434.html
@@ -135,10 +135,6 @@ function run_test() {
   yield;
   eventExpected("Going forward should trigger a hashchange.");
 
-  frameCw.window.location.hash = "";
-  yield;
-  eventExpected("Changing window.location.hash should trigger a hashchange.");
-
   // window.location has a trailing '#' right now, so we append "link1", not
   // "#link1".
   frameCw.window.location = frameCw.window.location + "link1";
diff --git a/docshell/test/test_bug640387_1.html b/docshell/test/test_bug640387_1.html
new file mode 100644
index 000000000000..66713c725960
--- /dev/null
+++ b/docshell/test/test_bug640387_1.html
@@ -0,0 +1,110 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=640387
+-->
+<head>
+  <title>Test for Bug 640387</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=640387">Mozilla Bug 640387</a>
+
+<script type='application/javascript;version=1.7'>
+SimpleTest.waitForExplicitFinish();
+
+function test() {
+  /* Spin the event loop so we get out of the onload handler. */
+  SimpleTest.executeSoon(function() { gGen.next() });
+  yield;
+
+  popup.history.pushState('', '', '#hash1');
+  popup.history.pushState('', '', '#hash2');
+
+  // Now the history looks like:
+  //   file_bug640387.html
+  //   file_bug640387.html#hash1
+  //   file_bug640387.html#hash2  <-- current
+
+  // Going back should trigger a hashchange, which will wake us up from the
+  // yield.
+  popup.history.back();
+  yield;
+  ok(true, 'Got first hashchange.');
+
+  // Going back should wake us up again.
+  popup.history.back();
+  yield;
+  ok(true, 'Got second hashchange.');
+
+  // Now the history looks like:
+  //   file_bug640387.html        <-- current
+  //   file_bug640387.html#hash1
+  //   file_bug640387.html#hash2
+
+  // Going forward should trigger a hashchange.
+  popup.history.forward();
+  yield;
+  ok(true, 'Got third hashchange.');
+
+  // Now modify the history so it looks like:
+  //   file_bug640387.html
+  //   file_bug640387.html#hash1
+  //   file_bug640387.html#hash1  <-- current
+  popup.history.pushState('', '', '#hash1');
+
+  // Now when we go back, we should not get a hashchange.  Instead, wait for a
+  // popstate.  We need to asynchronously go back because popstate is fired
+  // sync.
+  gHashchangeExpected = false;
+  gCallbackOnPopstate = true;
+  SimpleTest.executeSoon(function() { popup.history.back() });
+  yield;
+  ok(true, 'Got popstate.');
+  gCallbackOnPopstate = false;
+
+  // Spin the event loop so hashchange has a chance to fire, if it's going to.
+  SimpleTest.executeSoon(function() { gGen.next() });
+  yield;
+
+  popup.close();
+  SimpleTest.finish();
+  yield;
+}
+
+gGen = null;
+function childLoad() {
+  gGen = test();
+  gGen.next();
+}
+
+gHashchangeExpected = true;
+function childHashchange() {
+  if (gHashchangeExpected) {
+    gGen.next();
+  }
+  else {
+    ok(false, "Got hashchange when we weren't expecting one.");
+  }
+}
+
+gCallbackOnPopstate = false;
+function childPopstate() {
+  if (gCallbackOnPopstate) {
+    gGen.next();
+  }
+}
+
+/* We need to run this test in a popup, because navigating an iframe
+ * back/forwards tends to cause intermittent orange. */
+popup = window.open('file_bug640387.html');
+
+/* Control now flows up to childLoad(), called once the popup loads. */
+
+</script>
+
+</body>
+</html>
diff --git a/docshell/test/test_bug640387_2.html b/docshell/test/test_bug640387_2.html
new file mode 100644
index 000000000000..586af32eaed9
--- /dev/null
+++ b/docshell/test/test_bug640387_2.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=640387
+-->
+<head>
+  <title>Test for Bug 640387</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=640387">Mozilla Bug 640387</a>
+
+<!-- Test that, when going from
+
+  http://example.com/#foo
+
+to
+
+  http://example.com/
+
+via a non-history load, we do a true load, rather than a scroll. -->
+
+<script type='application/javascript;version=1.7'>
+SimpleTest.waitForExplicitFinish();
+
+callbackOnLoad = false;
+function childLoad() {
+  if (callbackOnLoad) {
+    callbackOnLoad = false;
+    gGen.next();
+  }
+}
+
+errorOnHashchange = false;
+callbackOnHashchange = false;
+function childHashchange() {
+  if (errorOnHashchange) {
+    ok(false, 'Got unexpected hashchange.');
+  }
+  if (callbackOnHashchange) {
+    callbackOnHashchange = false;
+    gGen.next();
+  }
+}
+
+function run_test() {
+  var iframe = $('iframe').contentWindow;
+
+  ok(true, 'Got first load');
+
+  // Spin the event loop so we exit the onload handler.
+  SimpleTest.executeSoon(function() { gGen.next() });
+  yield;
+
+  let origLocation = iframe.location + '';
+  callbackOnHashchange = true;
+  iframe.location.hash = '#1';
+  // Wait for a hashchange event.
+  yield;
+
+  ok(true, 'Got hashchange.');
+
+  iframe.location = origLocation;
+  // This should produce a load event and *not* a hashchange, because the
+  // result of the load is a different document than we had previously.
+  callbackOnLoad = true;
+  errorOnHashchange = true;
+  yield;
+
+  ok(true, 'Got final load.');
+
+  // Spin the event loop to give hashchange a chance to fire, if it's going to.
+  SimpleTest.executeSoon(function() { gGen.next() });
+  yield;
+
+  SimpleTest.finish();
+  yield;
+}
+
+callbackOnLoad = true;
+gGen = run_test();
+
+</script>
+
+<iframe id='iframe' src='file_bug640387.html'></iframe>
+
+</body>
+</html>

From 932b228cd48a2cdacfe75b4fcc9af3d53ffc0b73 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 31 Mar 2011 16:30:32 -0400
Subject: [PATCH 094/509] Bug 628069 - Add newURL, oldURL properties to
 hashchange event. r=smaug

--HG--
extra : rebase_source : 865194e9c50612599ad029815314c0819de60124
---
 content/events/src/Makefile.in                |  1 +
 content/events/src/nsDOMHashChangeEvent.cpp   | 89 ++++++++++++++++++
 content/events/src/nsDOMHashChangeEvent.h     | 70 ++++++++++++++
 content/events/src/nsEventDispatcher.cpp      |  3 +
 docshell/base/nsDocShell.cpp                  | 10 +-
 docshell/test/test_bug385434.html             |  4 +-
 dom/base/nsDOMClassInfo.cpp                   |  8 ++
 dom/base/nsDOMClassInfoClasses.h              |  1 +
 dom/base/nsGlobalWindow.cpp                   | 91 ++++++++++++++++---
 dom/base/nsGlobalWindow.h                     |  6 +-
 dom/base/nsPIDOMWindow.h                      |  4 +-
 dom/interfaces/events/Makefile.in             |  1 +
 .../events/nsIDOMHashChangeEvent.idl          | 48 ++++++++++
 dom/tests/mochitest/general/Makefile.in       |  3 +
 .../mochitest/general/file_bug628069.html     | 16 ++++
 .../mochitest/general/test_bug628069_1.html   | 50 ++++++++++
 .../mochitest/general/test_bug628069_2.html   | 39 ++++++++
 17 files changed, 426 insertions(+), 18 deletions(-)
 create mode 100644 content/events/src/nsDOMHashChangeEvent.cpp
 create mode 100644 content/events/src/nsDOMHashChangeEvent.h
 create mode 100644 dom/interfaces/events/nsIDOMHashChangeEvent.idl
 create mode 100644 dom/tests/mochitest/general/file_bug628069.html
 create mode 100644 dom/tests/mochitest/general/test_bug628069_1.html
 create mode 100644 dom/tests/mochitest/general/test_bug628069_2.html

diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index de878f4749ee..0fe7d18b3afc 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -85,6 +85,7 @@ CPPSRCS		= \
 		nsDOMScrollAreaEvent.cpp \
 		nsDOMTransitionEvent.cpp \
 		nsDOMPopStateEvent.cpp \
+		nsDOMHashChangeEvent.cpp \
 		nsDOMCloseEvent.cpp \
 		$(NULL)
 
diff --git a/content/events/src/nsDOMHashChangeEvent.cpp b/content/events/src/nsDOMHashChangeEvent.cpp
new file mode 100644
index 000000000000..768ff3435ae1
--- /dev/null
+++ b/content/events/src/nsDOMHashChangeEvent.cpp
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsDOMHashChangeEvent.h"
+#include "nsContentUtils.h"
+
+NS_IMPL_ADDREF_INHERITED(nsDOMHashChangeEvent, nsDOMEvent)
+NS_IMPL_RELEASE_INHERITED(nsDOMHashChangeEvent, nsDOMEvent)
+
+DOMCI_DATA(HashChangeEvent, nsDOMHashChangeEvent)
+
+NS_INTERFACE_MAP_BEGIN(nsDOMHashChangeEvent)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMHashChangeEvent)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HashChangeEvent)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
+
+nsDOMHashChangeEvent::~nsDOMHashChangeEvent()
+{
+}
+
+NS_IMETHODIMP
+nsDOMHashChangeEvent::GetOldURL(nsAString &aURL)
+{
+  aURL.Assign(mOldURL);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMHashChangeEvent::GetNewURL(nsAString &aURL)
+{
+  aURL.Assign(mNewURL);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMHashChangeEvent::InitHashChangeEvent(const nsAString &aTypeArg,
+                                          PRBool aCanBubbleArg,
+                                          PRBool aCancelableArg,
+                                          const nsAString &aOldURL,
+                                          const nsAString &aNewURL)
+{
+  nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mOldURL.Assign(aOldURL);
+  mNewURL.Assign(aNewURL);
+  return NS_OK;
+}
+
+nsresult NS_NewDOMHashChangeEvent(nsIDOMEvent** aInstancePtrResult,
+                                nsPresContext* aPresContext,
+                                nsEvent* aEvent)
+{
+  nsDOMHashChangeEvent* event =
+    new nsDOMHashChangeEvent(aPresContext, aEvent);
+
+  return CallQueryInterface(event, aInstancePtrResult);
+}
diff --git a/content/events/src/nsDOMHashChangeEvent.h b/content/events/src/nsDOMHashChangeEvent.h
new file mode 100644
index 000000000000..9c3e83f1365c
--- /dev/null
+++ b/content/events/src/nsDOMHashChangeEvent.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsDOMHashChangeEvent_h__
+#define nsDOMHashChangeEvent_h__
+
+class nsEvent;
+
+#include "nsIDOMHashChangeEvent.h"
+#include "nsDOMEvent.h"
+#include "nsIVariant.h"
+#include "nsCycleCollectionParticipant.h"
+
+class nsDOMHashChangeEvent : public nsDOMEvent,
+                             public nsIDOMHashChangeEvent
+{
+public:
+  nsDOMHashChangeEvent(nsPresContext* aPresContext, nsEvent* aEvent)
+    : nsDOMEvent(aPresContext, aEvent)
+  {
+  }
+
+  virtual ~nsDOMHashChangeEvent();
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIDOMHASHCHANGEEVENT
+
+  NS_FORWARD_TO_NSDOMEVENT
+
+protected:
+  nsString mOldURL;
+  nsString mNewURL;
+};
+
+nsresult NS_NewDOMHashChangeEvent(nsIDOMEvent** aInstancePtrResult,
+                                  nsPresContext* aPresContext,
+                                  nsEvent* aEvent);
+
+#endif // nsDOMHashChangeEvent_h__
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index 9f6bf95ca3c0..cb18cf87ca66 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -50,6 +50,7 @@
 #include "nsINode.h"
 #include "nsPIDOMWindow.h"
 #include "nsDOMPopStateEvent.h"
+#include "nsDOMHashChangeEvent.h"
 #include "nsFrameLoader.h"
 
 #define NS_TARGET_CHAIN_FORCE_CONTENT_DISPATCH  (1 << 0)
@@ -871,6 +872,8 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
     return NS_NewDOMAudioAvailableEvent(aDOMEvent, aPresContext, nsnull);
   if (aEventType.LowerCaseEqualsLiteral("closeevent"))
     return NS_NewDOMCloseEvent(aDOMEvent, aPresContext, nsnull);
+  if (aEventType.LowerCaseEqualsLiteral("hashchangeevent"))
+    return NS_NewDOMHashChangeEvent(aDOMEvent, aPresContext, nsnull);
 
   return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
 }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 507d48ceedb6..f811192356d3 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -8280,6 +8280,9 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                               !curHash.Equals(newHash);
 
         if (doShortCircuitedLoad) {
+            // Save the current URI; we need it if we fire a hashchange later.
+            nsCOMPtr<nsIURI> oldURI = mCurrentURI;
+
             // Save the position of the scrollers.
             nscoord cx = 0, cy = 0;
             GetCurScrollPos(ScrollOrientation_X, &cx);
@@ -8426,8 +8429,11 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                   window->DispatchSyncPopState();
                 }
 
-                if (doHashchange)
-                  window->DispatchAsyncHashchange();
+                if (doHashchange) {
+                  // Make sure to use oldURI here, not mCurrentURI, because by
+                  // now, mCurrentURI has changed!
+                  window->DispatchAsyncHashchange(oldURI, aURI);
+                }
             }
 
             return NS_OK;
diff --git a/docshell/test/test_bug385434.html b/docshell/test/test_bug385434.html
index 16f6423b8e25..83ae1e8c4a03 100644
--- a/docshell/test/test_bug385434.html
+++ b/docshell/test/test_bug385434.html
@@ -183,8 +183,8 @@ function run_test() {
      "Event type should be 'hashchange'.");
   is(gSampleEvent.cancelable, false,
      "The hashchange event shouldn't be cancelable.");
-  is(gSampleEvent.bubbles, false,
-     "The hashchange event shouldn't bubble.");
+  is(gSampleEvent.bubbles, true,
+     "The hashchange event should bubble.");
 
   /*
    * TEST 3 tests that:
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index e8fee69e165a..38b0fd0e5280 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -87,6 +87,7 @@
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsIDOMPopStateEvent.h"
+#include "nsIDOMHashChangeEvent.h"
 #include "nsContentUtils.h"
 #include "nsDOMWindowUtils.h"
 #include "nsIDOMGlobalPropertyInitializer.h"
@@ -1440,6 +1441,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(PopStateEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(HashChangeEvent, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(EventListenerInfo, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(TransitionEvent, nsDOMGenericSH,
@@ -2580,6 +2583,11 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(HashChangeEvent, nsIDOMHashChangeEvent)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHashChangeEvent)
+    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 128769d18196..a98a48a1ee93 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -478,6 +478,7 @@ DOMCI_CLASS(PaintRequestList)
 
 DOMCI_CLASS(ScrollAreaEvent)
 DOMCI_CLASS(PopStateEvent)
+DOMCI_CLASS(HashChangeEvent)
 
 DOMCI_CLASS(EventListenerInfo)
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 6f167ea9ac66..84d8e5eba9cd 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -119,6 +119,7 @@
 #include "nsIDOMMessageEvent.h"
 #include "nsIDOMPopupBlockedEvent.h"
 #include "nsIDOMPopStateEvent.h"
+#include "nsIDOMHashChangeEvent.h"
 #include "nsIDOMOfflineResourceList.h"
 #include "nsIDOMGeoGeolocation.h"
 #include "nsIDOMDesktopNotification.h"
@@ -7681,19 +7682,58 @@ nsGlobalWindow::PageHidden()
   mNeedsFocus = PR_TRUE;
 }
 
+class HashchangeCallback : public nsRunnable {
+public:
+  HashchangeCallback(const nsAString &aOldURL,
+                     const nsAString &aNewURL,
+                     nsGlobalWindow* aWindow)
+    : mWindow(aWindow)
+  {
+    mOldURL.Assign(aOldURL);
+    mNewURL.Assign(aNewURL);
+  }
+
+  NS_IMETHOD Run()
+  {
+    NS_PRECONDITION(NS_IsMainThread(), "Should be called on the main thread.");
+    return mWindow->FireHashchange(mOldURL, mNewURL);
+  }
+
+private:
+  nsString mOldURL;
+  nsString mNewURL;
+  nsRefPtr<nsGlobalWindow> mWindow;
+};
+
 nsresult
-nsGlobalWindow::DispatchAsyncHashchange()
+nsGlobalWindow::DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI)
 {
-  FORWARD_TO_INNER(DispatchAsyncHashchange, (), NS_OK);
+  FORWARD_TO_INNER(DispatchAsyncHashchange, (aOldURI, aNewURI), NS_OK);
 
-  nsCOMPtr<nsIRunnable> event =
-    NS_NewRunnableMethod(this, &nsGlobalWindow::FireHashchange);
+  // Make sure that aOldURI and aNewURI are identical up to the '#', and that
+  // their hashes are different.
+  nsCAutoString oldBeforeHash, oldHash, newBeforeHash, newHash;
+  nsContentUtils::SplitURIAtHash(aOldURI, oldBeforeHash, oldHash);
+  nsContentUtils::SplitURIAtHash(aNewURI, newBeforeHash, newHash);
 
-  return NS_DispatchToCurrentThread(event);
+  NS_ENSURE_STATE(oldBeforeHash.Equals(newBeforeHash));
+  NS_ENSURE_STATE(!oldHash.Equals(newHash));
+
+  nsCAutoString oldSpec, newSpec;
+  aOldURI->GetSpec(oldSpec);
+  aNewURI->GetSpec(newSpec);
+
+  NS_ConvertUTF8toUTF16 oldWideSpec(oldSpec);
+  NS_ConvertUTF8toUTF16 newWideSpec(newSpec);
+
+  nsCOMPtr<nsIRunnable> callback =
+    new HashchangeCallback(oldWideSpec, newWideSpec, this);
+  return NS_DispatchToMainThread(callback);
 }
 
 nsresult
-nsGlobalWindow::FireHashchange()
+nsGlobalWindow::FireHashchange(const nsAString &aOldURL,
+                               const nsAString &aNewURL)
 {
   NS_ENSURE_TRUE(IsInnerWindow(), NS_ERROR_FAILURE);
 
@@ -7701,11 +7741,40 @@ nsGlobalWindow::FireHashchange()
   if (IsFrozen())
     return NS_OK;
 
-  // Dispatch the hashchange event, which doesn't bubble and isn't cancelable,
-  // to the outer window.
-  return nsContentUtils::DispatchTrustedEvent(mDoc, GetOuterWindow(),
-                                              NS_LITERAL_STRING("hashchange"),
-                                              PR_FALSE, PR_FALSE);
+  // Get a presentation shell for use in creating the hashchange event.
+  NS_ENSURE_STATE(mDoc);
+
+  nsIPresShell *shell = mDoc->GetShell();
+  nsRefPtr<nsPresContext> presContext;
+  if (shell) {
+    presContext = shell->GetPresContext();
+  }
+
+  // Create a new hashchange event.
+  nsCOMPtr<nsIDOMEvent> domEvent;
+  nsresult rv =
+    nsEventDispatcher::CreateEvent(presContext, nsnull,
+                                   NS_LITERAL_STRING("hashchangeevent"),
+                                   getter_AddRefs(domEvent));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIPrivateDOMEvent> privateEvent = do_QueryInterface(domEvent);
+  NS_ENSURE_TRUE(privateEvent, NS_ERROR_UNEXPECTED);
+
+  nsCOMPtr<nsIDOMHashChangeEvent> hashchangeEvent = do_QueryInterface(domEvent);
+  NS_ENSURE_TRUE(hashchangeEvent, NS_ERROR_UNEXPECTED);
+
+  // The hashchange event bubbles and isn't cancellable.
+  rv = hashchangeEvent->InitHashChangeEvent(NS_LITERAL_STRING("hashchange"),
+                                            PR_TRUE, PR_FALSE,
+                                            aOldURL, aNewURL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = privateEvent->SetTrusted(PR_TRUE);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRBool dummy;
+  return DispatchEvent(hashchangeEvent, &dummy);
 }
 
 nsresult
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 44233ca144ed..dac3c390d91a 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -548,7 +548,7 @@ public:
   virtual PRBool TakeFocus(PRBool aFocus, PRUint32 aFocusMethod);
   virtual void SetReadyForFocus();
   virtual void PageHidden();
-  virtual nsresult DispatchAsyncHashchange();
+  virtual nsresult DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI);
   virtual nsresult DispatchSyncPopState();
 
   virtual nsresult SetArguments(nsIArray *aArguments, nsIPrincipal *aOrigin);
@@ -588,6 +588,8 @@ private:
   void DisableAccelerationUpdates();
 
 protected:
+  friend class HashchangeCallback;
+
   // Object Management
   virtual ~nsGlobalWindow();
   void CleanUp(PRBool aIgnoreModalDialog);
@@ -716,7 +718,7 @@ protected:
                            const nsAString &aPopupWindowName,
                            const nsAString &aPopupWindowFeatures);
   void FireOfflineStatusEvent();
-  nsresult FireHashchange();
+  nsresult FireHashchange(const nsAString &aOldURL, const nsAString &aNewURL);
 
   void FlushPendingNotifications(mozFlushType aType);
   void EnsureReflowFlushAndPaint();
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index f0dbaef45a4e..9289e03908ce 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -49,6 +49,7 @@
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
 #include "nsEvent.h"
+#include "nsIURI.h"
 
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
 
@@ -537,7 +538,8 @@ public:
    * Instructs this window to asynchronously dispatch a hashchange event.  This
    * method must be called on an inner window.
    */
-  virtual nsresult DispatchAsyncHashchange() = 0;
+  virtual nsresult DispatchAsyncHashchange(nsIURI *aOldURI,
+                                           nsIURI *aNewURI) = 0;
 
   /**
    * Instructs this window to synchronously dispatch a popState event.
diff --git a/dom/interfaces/events/Makefile.in b/dom/interfaces/events/Makefile.in
index 0af57968176e..24b38cc66e35 100644
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@@ -88,6 +88,7 @@ XPIDLSRCS =					\
 	nsIDOMPopStateEvent.idl			\
 	nsIDOMCloseEvent.idl			\
 	nsIDOMEventException.idl		\
+	nsIDOMHashChangeEvent.idl		\
 	$(NULL)
 
 ifdef MOZ_CSS_ANIMATIONS
diff --git a/dom/interfaces/events/nsIDOMHashChangeEvent.idl b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
new file mode 100644
index 000000000000..c13405bfc365
--- /dev/null
+++ b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIDOMEvent.idl"
+
+[scriptable, uuid(34850f11-8b88-43ce-8d55-9aa8b18753bd)]
+interface nsIDOMHashChangeEvent : nsIDOMEvent
+{
+  readonly attribute DOMString oldURL;
+  readonly attribute DOMString newURL;
+
+  void initHashChangeEvent(in DOMString typeArg,
+                           in boolean canBubbleArg,
+                           in boolean cancelableArg,
+                           in DOMString oldURLArg,
+                           in DOMString newURLArg);
+};
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 296b1cbc463f..5fec6fa98313 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -50,6 +50,9 @@ _TEST_FILES = \
 		historyframes.html \
 		test_497898.html \
 		test_bug504220.html \
+		test_bug628069_1.html \
+		test_bug628069_2.html \
+		file_bug628069.html \
 		test_bug631440.html \
 		test_consoleAPI.html \
 		test_domWindowUtils.html \
diff --git a/dom/tests/mochitest/general/file_bug628069.html b/dom/tests/mochitest/general/file_bug628069.html
new file mode 100644
index 000000000000..9fd28888c913
--- /dev/null
+++ b/dom/tests/mochitest/general/file_bug628069.html
@@ -0,0 +1,16 @@
+<html>
+<body onhashchange='hashchange(event)' onload='load()'>
+
+<script>
+function hashchange(e) {
+  (opener || parent).childHashchange(e);
+}
+
+function load() {
+  (opener || parent).childLoad();
+}
+</script>
+
+Just a shell of a page.
+</body>
+</html>
diff --git a/dom/tests/mochitest/general/test_bug628069_1.html b/dom/tests/mochitest/general/test_bug628069_1.html
new file mode 100644
index 000000000000..9f1b04b9838d
--- /dev/null
+++ b/dom/tests/mochitest/general/test_bug628069_1.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=628069
+-->
+<head>
+  <title>Test for Bug 628069</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=628069">Mozilla Bug 628069</a>
+<p id="display"></p>
+<div id="content">
+  <iframe id="frame" style="height:100px; width:100px; border:0"></iframe>
+  <div id="status" style="display: none"></div>
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.7">
+
+/** Test for Bug 628069 **/
+
+SimpleTest.waitForExplicitFinish();
+
+popup = window.open('file_bug628069.html');
+
+// Control flows into childLoad, once the popup loads.
+
+gOrigURL = null;
+function childLoad() {
+  gOrigURL = popup.location + '';
+
+  popup.location.hash = '#hash';
+
+  // This should trigger a hashchange, so control should flow down to
+  // childHashchange.
+}
+
+function childHashchange(e) {
+  is(e.oldURL, gOrigURL, 'event.oldURL');
+  is(e.newURL, gOrigURL + '#hash', 'event.newURL');
+  popup.close();
+  SimpleTest.finish();
+}
+
+</script>
+</body>
+</html>
diff --git a/dom/tests/mochitest/general/test_bug628069_2.html b/dom/tests/mochitest/general/test_bug628069_2.html
new file mode 100644
index 000000000000..9e6c82743b8f
--- /dev/null
+++ b/dom/tests/mochitest/general/test_bug628069_2.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=628069
+-->
+<head>
+  <title>Test for Bug 628069</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=628069">Mozilla Bug 628069</a>
+<p id="display"></p>
+<div id="content">
+  <iframe id="frame" style="height:100px; width:100px; border:0"></iframe>
+  <div id="status" style="display: none"></div>
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.7">
+
+/** Test for Bug 628069 **/
+
+gotHashChange = 0;
+document.addEventListener("hashChange", function(e) {
+  gotHashChange = 1;
+  is(e.oldURL, "oldURL");
+  is(e.newURL, "newURL");
+}, true);
+
+let hc = document.createEvent("HashChangeEvent");
+hc.initHashChangeEvent("hashChange", true, false, "oldURL", "newURL");
+document.documentElement.dispatchEvent(hc);
+is(gotHashChange, 1, 'Document received hashchange event.');
+
+</script>
+</body>
+</html>

From 3bcb2e5dad1a6dfcfd4517aead58b94675c09e3d Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 21 Apr 2011 08:43:44 +1200
Subject: [PATCH 095/509] Bug 541707: Ensure iframes in plugin crash tests
 don't load before the containing document is ready. r=bent

---
 modules/plugin/test/mochitest/test_crash_nested_loop.html | 6 ++----
 modules/plugin/test/mochitest/test_crashing.html          | 6 ++----
 modules/plugin/test/mochitest/test_hanging.html           | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/plugin/test/mochitest/test_crash_nested_loop.html b/modules/plugin/test/mochitest/test_crash_nested_loop.html
index 99459d993e8d..4d38f9fabf9b 100644
--- a/modules/plugin/test/mochitest/test_crash_nested_loop.html
+++ b/modules/plugin/test/mochitest/test_crash_nested_loop.html
@@ -4,13 +4,9 @@
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 
 <body>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  var iframe = document.getElementById('iframe1');
-
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
       ok(true, "Skipping this test when test plugin is not OOP.");
@@ -18,6 +14,7 @@
       return;
     }
 
+    var iframe = document.getElementById('iframe1');
     var p = iframe.contentDocument.getElementById('plugin1');
 
     // This test is for bug 550026, which is inherently nondeterministic.
@@ -50,3 +47,4 @@
   }
 
   </script>
+  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff --git a/modules/plugin/test/mochitest/test_crashing.html b/modules/plugin/test/mochitest/test_crashing.html
index dcbfb66c6154..9956ca0f4747 100644
--- a/modules/plugin/test/mochitest/test_crashing.html
+++ b/modules/plugin/test/mochitest/test_crashing.html
@@ -4,13 +4,9 @@
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 
 <body>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  var iframe = document.getElementById('iframe1');
-
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
       ok(true, "Skipping this test when test plugin is not OOP.");
@@ -18,6 +14,7 @@
       return;
     }
 
+    var iframe = document.getElementById('iframe1');
     var p = iframe.contentDocument.getElementById('plugin1');
 
     p.setColor("FFFF00FF");
@@ -65,3 +62,4 @@
   }
 
   </script>
+  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff --git a/modules/plugin/test/mochitest/test_hanging.html b/modules/plugin/test/mochitest/test_hanging.html
index 593403a11cc3..c0d60b8a6fba 100644
--- a/modules/plugin/test/mochitest/test_hanging.html
+++ b/modules/plugin/test/mochitest/test_hanging.html
@@ -4,13 +4,9 @@
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 
 <body>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  var iframe = document.getElementById('iframe1');
-
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
       ok(true, "Skipping this test when test plugin is not OOP.");
@@ -26,6 +22,7 @@
     var timeoutPref = "dom.ipc.plugins.timeoutSecs";
     prefs.setIntPref(timeoutPref, 5);
 
+    var iframe = document.getElementById('iframe1');
     var p = iframe.contentDocument.getElementById('plugin1');
 
     p.setColor("FFFF00FF");
@@ -74,3 +71,4 @@
   }
 
   </script>
+  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>

From 2106ee8b7bd28c27302751c7c8da248b227b383a Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Wed, 20 Apr 2011 17:09:57 -0400
Subject: [PATCH 096/509] Bug 647028 - Fix pushstate's interaction with session
 restore. r=sicking,zpao

---
 .../sessionstore/src/nsSessionStore.js        | 14 ++++++-
 .../test/browser/browser_500328.js            | 39 ++++++++++++-------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index 9ac5e47a8f71..393070b303cc 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -2860,17 +2860,22 @@ SessionStoreService.prototype = {
 
     // Attach data that will be restored on "load" event, after tab is restored.
     if (activeIndex > -1) {
+      let curSHEntry = browser.webNavigation.sessionHistory.
+                       getEntryAtIndex(activeIndex, false).
+                       QueryInterface(Ci.nsISHEntry);
+
       // restore those aspects of the currently active documents which are not
       // preserved in the plain history entries (mainly scroll state and text data)
       browser.__SS_restore_data = tabData.entries[activeIndex] || {};
       browser.__SS_restore_pageStyle = tabData.pageStyle || "";
       browser.__SS_restore_tab = aTab;
+      browser.__SS_restore_docIdentifier = curSHEntry.docIdentifier;
 
       didStartLoad = true;
       try {
         // In order to work around certain issues in session history, we need to
         // force session history to update its internal index and call reload
-        // instead of gotoIndex. c.f. bug 597315
+        // instead of gotoIndex. See bug 597315.
         browser.webNavigation.sessionHistory.getEntryAtIndex(activeIndex, true);
         browser.webNavigation.sessionHistory.
           QueryInterface(Ci.nsISHistory_2_0_BRANCH).reloadCurrentEntry();
@@ -3163,12 +3168,19 @@ SessionStoreService.prototype = {
       aBrowser.markupDocumentViewer.authorStyleDisabled = selectedPageStyle == "_nostyle";
     }
 
+    if (aBrowser.__SS_restore_docIdentifier) {
+      let sh = aBrowser.webNavigation.sessionHistory;
+      sh.getEntryAtIndex(sh.index, false).QueryInterface(Ci.nsISHEntry).
+         docIdentifier = aBrowser.__SS_restore_docIdentifier;
+    }
+
     // notify the tabbrowser that this document has been completely restored
     this._sendTabRestoredNotification(aBrowser.__SS_restore_tab);
 
     delete aBrowser.__SS_restore_data;
     delete aBrowser.__SS_restore_pageStyle;
     delete aBrowser.__SS_restore_tab;
+    delete aBrowser.__SS_restore_docIdentifier;
   },
 
   /**
diff --git a/browser/components/sessionstore/test/browser/browser_500328.js b/browser/components/sessionstore/test/browser/browser_500328.js
index 4a5116073e8a..1aa5418c4b9d 100644
--- a/browser/components/sessionstore/test/browser/browser_500328.js
+++ b/browser/components/sessionstore/test/browser/browser_500328.js
@@ -44,11 +44,15 @@ function checkState(tab) {
 
   let popStateCount = 0;
 
-  let handler = function(aEvent) {
+  tab.linkedBrowser.addEventListener('popstate', function(aEvent) {
     let contentWindow = tab.linkedBrowser.contentWindow;
     if (popStateCount == 0) {
       popStateCount++;
-      //ok(aEvent.state, "Event should have a state property.");
+
+      is(tab.linkedBrowser.contentWindow.testState, 'foo',
+         'testState after going back');
+
+      ok(aEvent.state, "Event should have a state property.");
       is(JSON.stringify(tab.linkedBrowser.contentWindow.history.state), JSON.stringify({obj1:1}),
          "first popstate object.");
 
@@ -78,15 +82,16 @@ function checkState(tab) {
 
       // Clean up after ourselves and finish the test.
       tab.linkedBrowser.removeEventListener("popstate", arguments.callee, true);
-      tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
       gBrowser.removeTab(tab);
       finish();
     }
-  };
+  }, true);
 
-  tab.linkedBrowser.addEventListener("load", handler, true);
-  tab.linkedBrowser.addEventListener("popstate", handler, true);
+  // Set some state in the page's window.  When we go back(), the page should
+  // be retrieved from bfcache, and this state should still be there.
+  tab.linkedBrowser.contentWindow.testState = 'foo';
 
+  // Now go back.  This should trigger the popstate event handler above.
   tab.linkedBrowser.contentWindow.history.back();
 }
 
@@ -119,20 +124,24 @@ function test() {
       let contentWindow = tab.linkedBrowser.contentWindow;
       let history = contentWindow.history;
       history.pushState({obj1:1}, "title-obj1");
-      history.pushState({obj2:2}, "title-obj2", "?foo");
+      history.pushState({obj2:2}, "title-obj2", "page2");
       history.replaceState({obj3:3}, "title-obj3");
 
       let state = ss.getTabState(tab);
+      gBrowser.removeTab(tab);
 
-      // In order to make sure that setWindowState actually modifies the
-      // window's state, we modify the state here.  checkState will fail if
-      // this change isn't overwritten by setWindowState.
-      history.replaceState({should_be_overwritten:true}, "title-overwritten");
+      // Restore the state into a new tab.  Things don't work well when we
+      // restore into the old tab, but that's not a real use case anyway.
+      let tab2 = gBrowser.addTab("about:blank");
+      ss.setTabState(tab2, state, true);
 
-      // Restore the state and make sure it looks right, after giving the event
-      // loop a chance to flush.
-      ss.setTabState(tab, state, true);
-      executeSoon(function() { checkState(tab); });
+      // Run checkState() once the tab finishes loading its restored state.
+      tab2.linkedBrowser.addEventListener("load", function() {
+        tab2.linkedBrowser.removeEventListener("load", arguments.callee, true);
+        SimpleTest.executeSoon(function() {
+          checkState(tab2);
+        });
+      }, true);
 
     }, true);
   }, true);

From a64eb88ab7d116ffbd4d6189255307e3faf99cb9 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Wed, 20 Apr 2011 17:10:06 -0400
Subject: [PATCH 097/509] Bug 628069 - Followup; fix formatting.
 r=whitespace-only

---
 dom/base/nsGlobalWindow.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 84d8e5eba9cd..b53adb5dcead 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7682,7 +7682,8 @@ nsGlobalWindow::PageHidden()
   mNeedsFocus = PR_TRUE;
 }
 
-class HashchangeCallback : public nsRunnable {
+class HashchangeCallback : public nsRunnable
+{
 public:
   HashchangeCallback(const nsAString &aOldURL,
                      const nsAString &aNewURL,

From 73a9b73b1242a01384701bcced1fdbc69dbc24bd Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 20 Apr 2011 14:29:45 -0700
Subject: [PATCH 098/509] Move AddRef to before the unlock.  (Bug 650674, patch
 2)  r=bsmedberg

---
 xpcom/proxy/src/nsProxyEvent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xpcom/proxy/src/nsProxyEvent.cpp b/xpcom/proxy/src/nsProxyEvent.cpp
index acb58a9f5b05..b0142ccbfb9a 100644
--- a/xpcom/proxy/src/nsProxyEvent.cpp
+++ b/xpcom/proxy/src/nsProxyEvent.cpp
@@ -475,6 +475,9 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
     // linked-list check.
     for (peo = mFirst; peo; peo = peo->mNext) {
         if (peo->GetClass()->GetProxiedIID().Equals(aIID)) {
+            // Best to AddRef for our caller before unlocking.
+            peo->LockedAddRef();
+
             {
                 // Deleting an nsProxyEventObject can call Release on an
                 // nsProxyObject, which can only happen when not holding
@@ -483,7 +486,6 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
                 delete newpeo;
             }
             *aResult = static_cast<nsISupports*>(peo->mXPTCStub);
-            peo->LockedAddRef();
             return NS_OK;
         }
     }

From b8cac7f2873ebcb6188a28ff557697998a27353d Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 30 Mar 2011 15:55:00 -0400
Subject: [PATCH 099/509] Fix comment typo per bug 550611 comment 34

---
 xpcom/glue/nsTArray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpcom/glue/nsTArray.h b/xpcom/glue/nsTArray.h
index 84977465cebf..45cbd3ae837f 100644
--- a/xpcom/glue/nsTArray.h
+++ b/xpcom/glue/nsTArray.h
@@ -342,7 +342,7 @@ public:
 // The Alloc template parameter can be used to choose between
 // "fallible" and "infallible" nsTArray (if available), defaulting to
 // fallible.  If the *fallible* allocator is used, the return value of
-// methods that might allocate doesn't need to be checked; Append() is
+// methods that might allocate needs to be checked; Append() is
 // one such method.  These return values don't need to be checked if
 // the *in*fallible allocator is chosen.  When in doubt, choose the
 // infallible allocator.

From 642f35826e28a7dcfa002db0590a0ffb35ae3f82 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 14:47:04 -0700
Subject: [PATCH 100/509] Bug 648197 (1/2): remove the #ifdef
 ALERT_MISSING_FONTS blocks in nsMathMLChar.cpp.

---
 layout/mathml/mathfont.properties | 11 +---
 layout/mathml/nsMathMLChar.cpp    | 86 +------------------------------
 2 files changed, 3 insertions(+), 94 deletions(-)

diff --git a/layout/mathml/mathfont.properties b/layout/mathml/mathfont.properties
index f90948cb23d4..cc308ea89804 100644
--- a/layout/mathml/mathfont.properties
+++ b/layout/mathml/mathfont.properties
@@ -37,15 +37,8 @@
 #
 # ***** END LICENSE BLOCK *****
 
-##LOCALIZATION NOTE:
-# These are used to display an alert box to warn users when MathML fonts
-# are not installed on their system. The list of missing fonts will be
-# substituted in argument %1$S (see a screenshot in bug 128139).
-mathfont_missing_dialog_title = Missing MathML Fonts
-mathfont_missing_dialog_message = To properly display the MathML on this page you need to install the following fonts:\n%1$S.\n\n\nFor further information see:\nhttp://www.mozilla.org/projects/mathml/fonts
-
-##LOCALIZATION NOTE:
-# Do not translate anything else in this file
+#  LOCALIZATION NOTE: FILE
+#  Do not translate anything in this file
 
 # List of fonts that have corresponding properties files containing special
 # glyph tables for stretching MathML characters.  See the documentation at the
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index d0e82902a4c9..05600f7a9838 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -65,9 +65,6 @@
 #include "nsCSSRendering.h"
 #include "prprf.h"         // For PR_snprintf()
 
-#if ALERT_MISSING_FONTS
-#include "nsIStringBundle.h"
-#endif
 #include "nsDisplayList.h"
 
 #include "nsMathMLOperators.h"
@@ -132,47 +129,6 @@ typedef enum {eExtension_base, eExtension_variants, eExtension_parts}
 #define NS_TABLE_STATE_EMPTY        0
 #define NS_TABLE_STATE_READY        1
 
-// helper to check if a font is installed
-static PRBool
-CheckFontExistence(nsPresContext* aPresContext, const nsString& aFontName)
-{
-  PRBool aliased;
-  nsAutoString localName;
-  nsIDeviceContext *deviceContext = aPresContext->DeviceContext();
-  deviceContext->GetLocalFontName(aFontName, localName, aliased);
-  // XXXkt CheckFontExistence always returns NS_OK.
-  PRBool rv = (aliased || (NS_OK == deviceContext->CheckFontExistence(localName)));
-  // (see bug 35824 for comments about the aliased localName)
-  return rv;
-}
-
-#if ALERT_MISSING_FONTS
-// alert the user if some of the needed MathML fonts are not installed.
-// it is non-modal (i.e., it doesn't wait for input from the user)
-static void
-AlertMissingFonts(nsString& aMissingFonts)
-{
-  nsCOMPtr<nsIStringBundleService> sbs =
-    mozilla::services::GetStringBundleService();
-  if (!sbs)
-    return;
-
-  nsCOMPtr<nsIStringBundle> sb;
-  sbs->CreateBundle("resource://gre/res/fonts/mathfont.properties", getter_AddRefs(sb));
-  if (!sb)
-    return;
-
-  nsXPIDLString title, message;
-  const PRUnichar* strings[] = { aMissingFonts.get() };
-  sb->GetStringFromName(NS_LITERAL_STRING("mathfont_missing_dialog_title").get(), getter_Copies(title));
-  sb->FormatStringFromName(NS_LITERAL_STRING("mathfont_missing_dialog_message").get(),
-                           strings, 1, getter_Copies(message));
-
-  // XXX Bug 309090 - could show a notification bar here. Bug 563114 removed
-  // the nsINonBlockingAlertService interface that was previously used here.
-}
-#endif
-
 // helper to trim off comments from data in a MathFont Property File
 static void
 Clean(nsString& aValue)
@@ -403,7 +359,7 @@ nsGlyphTable::ElementAt(nsPresContext* aPresContext, nsMathMLChar* aChar, PRUint
           return kNullGlyph;
         }
         // The char cannot be handled if this font is not installed
-        if (!mFontName[font].Length() || !CheckFontExistence(aPresContext, mFontName[font])) {
+        if (!mFontName[font].Length()) {
           return kNullGlyph;
         }
       }
@@ -716,36 +672,10 @@ GetFontExtensionPref(nsIPrefBranch* aPrefBranch, PRUnichar aChar,
     GetPrefValue(aPrefBranch, alternateKey.get(), aValue);
 }
 
-#if ALERT_MISSING_FONTS
-struct MathFontEnumContext {
-  nsPresContext* mPresContext;
-  nsString*       mMissingFamilyList;
-};
-#endif
 
 static PRBool
 MathFontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
 {
-#if ALERT_MISSING_FONTS
-  // check if the font is missing
-  MathFontEnumContext* context = (MathFontEnumContext*)aData;
-  nsPresContext* presContext = context->mPresContext;
-  nsString* missingFamilyList = context->mMissingFamilyList;
-  if (!CheckFontExistence(presContext, aFamily)) {
-//#ifndef _WIN32
-   // XXX In principle, the mathfont-family list in the mathfont.properties file
-   // is customizable depending on the platform. For now, this is here since there
-   // is no need to alert Linux users about TrueType fonts specific to Windows.
-   if (aFamily.LowerCaseEqualsLiteral("mt extra"))
-     return PR_TRUE; // continue to try other fonts
-//#endif
-    if (!missingFamilyList->IsEmpty()) {
-      missingFamilyList->AppendLiteral(", ");
-    }
-    missingFamilyList->Append(aFamily);
-  }
-#endif
-
   if (!gGlyphTableList->AddGlyphTable(aFamily))
     return PR_FALSE; // stop in low-memory situations
   return PR_TRUE; // don't stop
@@ -800,21 +730,7 @@ InitGlobals(nsPresContext* aPresContext)
   // Parse the font list and append an entry for each family to gGlyphTableList
   nsAutoString missingFamilyList;
 
-#if ALERT_MISSING_FONTS
-  // We don't really need all these fonts, so alerting on some missing is not
-  // right.  The best place to alert would be Stretch when we notice that we
-  // can't get the char we want.  In this way the user would not be alerted
-  // unnecessarily when the document contains only simple math.  The alert
-  // also needs a "don't tell me again box".
-  MathFontEnumContext context = {aPresContext, &missingFamilyList};
-  font.EnumerateFamilies(MathFontEnumCallback, &context);
-  // alert the user if some of the expected fonts are missing
-  if (!missingFamilyList.IsEmpty()) {
-    AlertMissingFonts(missingFamilyList);
-  }
-#else
   font.EnumerateFamilies(MathFontEnumCallback, nsnull);
-#endif
   return rv;
 }
 

From 9828e9ed192200890314af38ecae30a14ab37a66 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 14:47:04 -0700
Subject: [PATCH 101/509] Bug 648197 (2/2): make
 nsIDeviceContext::FirstExistingFont and ::GetLocalFontName into complete
 stubs; remove the alias table.

---
 gfx/src/nsThebesDeviceContext.cpp | 183 +++---------------------------
 gfx/src/nsThebesDeviceContext.h   |   9 --
 2 files changed, 18 insertions(+), 174 deletions(-)

diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index c39cedd9f542..123562caf248 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -40,7 +40,6 @@
 #include "nsFont.h"
 #include "nsGfxCIID.h"
 #include "nsIThebesFontMetrics.h"
-#include "nsHashtable.h"
 #include "nsILanguageAtomService.h"
 #include "nsUnicharUtils.h"
 
@@ -285,7 +284,6 @@ nsThebesDeviceContext::nsThebesDeviceContext()
 
     mFontCache = nsnull;
     mWidget = nsnull;
-    mFontAliasTable = nsnull;
 
     mDepth = 0;
     mWidth = 0;
@@ -298,12 +296,6 @@ nsThebesDeviceContext::nsThebesDeviceContext()
 #endif
 }
 
-static PRBool DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
-{
-    delete ((nsString*)aValue);
-    return PR_TRUE;
-}
-
 nsThebesDeviceContext::~nsThebesDeviceContext()
 {
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
@@ -314,11 +306,6 @@ nsThebesDeviceContext::~nsThebesDeviceContext()
         delete mFontCache;
         mFontCache = nsnull;
     }
-
-    if (nsnull != mFontAliasTable) {
-        mFontAliasTable->Enumerate(DeleteValue);
-        delete mFontAliasTable;
-    }
 }
 
 NS_IMETHODIMP
@@ -402,171 +389,37 @@ NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
 }
 
 struct FontEnumData {
-    FontEnumData(nsIDeviceContext* aDC, nsString& aFaceName)
-        : mDC(aDC), mFaceName(aFaceName)
-    {}
-    nsIDeviceContext* mDC;
-    nsString&         mFaceName;
+    FontEnumData(nsString& aFaceName) : mFaceName(aFaceName) {}
+    nsString& mFaceName;
 };
 
-static PRBool FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
+static PRBool
+FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
 {
     FontEnumData* data = (FontEnumData*)aData;
-    // XXX for now, all generic fonts are presumed to exist
-    //     we may want to actually check if there's an installed conversion
-    if (aGeneric) {
-        data->mFaceName = aFamily;
-        return PR_FALSE; // found one, stop.
-    }
-    else {
-        nsAutoString local;
-        PRBool       aliased;
-        data->mDC->GetLocalFontName(aFamily, local, aliased);
-        if (aliased || (NS_SUCCEEDED(data->mDC->CheckFontExistence(local)))) {
-            data->mFaceName = local;
-            return PR_FALSE; // found one, stop.
-        }
-    }
-    return PR_TRUE; // didn't exist, continue looking
+    data->mFaceName = aFamily;
+    return PR_FALSE; // stop
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::FirstExistingFont(const nsFont& aFont, nsString& aFaceName)
+NS_IMETHODIMP
+nsThebesDeviceContext::FirstExistingFont(const nsFont& aFont,
+                                         nsString& aFaceName)
 {
-    FontEnumData data(this, aFaceName);
+    FontEnumData data(aFaceName);
     if (aFont.EnumerateFamilies(FontEnumCallback, &data)) {
-        return NS_ERROR_FAILURE; // ran out
+        return NS_ERROR_FAILURE; // can only happen for an empty font
     }
     return NS_OK;
 }
 
-class FontAliasKey: public nsHashKey
+NS_IMETHODIMP
+nsThebesDeviceContext::GetLocalFontName(const nsString& aFaceName,
+                                        nsString& aLocalName,
+                                        PRBool& aAliased)
 {
-public:
-    FontAliasKey(const nsString& aString)
-    { mString.Assign(aString); }
-
-    virtual PRUint32 HashCode(void) const;
-    virtual PRBool Equals(const nsHashKey *aKey) const;
-    virtual nsHashKey *Clone(void) const;
-
-    nsString mString;
-};
-
-PRUint32 FontAliasKey::HashCode(void) const
-{
-    PRUint32 hash = 0;
-    const PRUnichar* string = mString.get();
-    PRUnichar ch;
-    while ((ch = *string++) != 0) {
-        // FYI: hash = hash*37 + ch
-        ch = ToUpperCase(ch);
-        hash = ((hash << 5) + (hash << 2) + hash) + ch;
-    }
-    return hash;
-}
-
-PRBool FontAliasKey::Equals(const nsHashKey *aKey) const
-{
-    return mString.Equals(((FontAliasKey*)aKey)->mString, nsCaseInsensitiveStringComparator());
-}
-
-nsHashKey* FontAliasKey::Clone(void) const
-{
-    return new FontAliasKey(mString);
-}
-
-nsresult nsThebesDeviceContext::CreateFontAliasTable()
-{
-    nsresult result = NS_OK;
-
-    if (nsnull == mFontAliasTable) {
-        mFontAliasTable = new nsHashtable();
-        if (nsnull != mFontAliasTable) {
-
-            nsAutoString times;         times.AssignLiteral("Times");
-            nsAutoString timesNewRoman; timesNewRoman.AssignLiteral("Times New Roman");
-            nsAutoString timesRoman;    timesRoman.AssignLiteral("Times Roman");
-            nsAutoString arial;         arial.AssignLiteral("Arial");
-            nsAutoString helvetica;     helvetica.AssignLiteral("Helvetica");
-            nsAutoString courier;       courier.AssignLiteral("Courier");
-            nsAutoString courierNew;    courierNew.AssignLiteral("Courier New");
-            nsAutoString nullStr;
-
-            AliasFont(times, timesNewRoman, timesRoman, PR_FALSE);
-            AliasFont(timesRoman, timesNewRoman, times, PR_FALSE);
-            AliasFont(timesNewRoman, timesRoman, times, PR_FALSE);
-            AliasFont(arial, helvetica, nullStr, PR_FALSE);
-            AliasFont(helvetica, arial, nullStr, PR_FALSE);
-            AliasFont(courier, courierNew, nullStr, PR_TRUE);
-            AliasFont(courierNew, courier, nullStr, PR_FALSE);
-        }
-        else {
-            result = NS_ERROR_OUT_OF_MEMORY;
-        }
-    }
-    return result;
-}
-
-nsresult nsThebesDeviceContext::AliasFont(const nsString& aFont,
-                                          const nsString& aAlias,
-                                          const nsString& aAltAlias,
-                                          PRBool aForceAlias)
-{
-    nsresult result = NS_OK;
-
-    if (nsnull != mFontAliasTable) {
-        if (aForceAlias || NS_FAILED(CheckFontExistence(aFont))) {
-            if (NS_SUCCEEDED(CheckFontExistence(aAlias))) {
-                nsString* entry = new nsString(aAlias);
-                if (nsnull != entry) {
-                    FontAliasKey key(aFont);
-                    mFontAliasTable->Put(&key, entry);
-                }
-                else {
-                    result = NS_ERROR_OUT_OF_MEMORY;
-                }
-            }
-            else if (!aAltAlias.IsEmpty() && NS_SUCCEEDED(CheckFontExistence(aAltAlias))) {
-                nsString* entry = new nsString(aAltAlias);
-                if (nsnull != entry) {
-                    FontAliasKey key(aFont);
-                    mFontAliasTable->Put(&key, entry);
-                }
-                else {
-                    result = NS_ERROR_OUT_OF_MEMORY;
-                }
-            }
-        }
-    }
-    else {
-        result = NS_ERROR_FAILURE;
-    }
-    return result;
-}
-
-NS_IMETHODIMP nsThebesDeviceContext::GetLocalFontName(const nsString& aFaceName,
-                                                      nsString& aLocalName,
-                                                      PRBool& aAliased)
-{
-    nsresult result = NS_OK;
-
-    if (nsnull == mFontAliasTable) {
-        result = CreateFontAliasTable();
-    }
-
-    if (nsnull != mFontAliasTable) {
-        FontAliasKey key(aFaceName);
-        const nsString* alias = (const nsString*)mFontAliasTable->Get(&key);
-        if (nsnull != alias) {
-            aLocalName = *alias;
-            aAliased = PR_TRUE;
-        }
-        else {
-            aLocalName = aFaceName;
-            aAliased = PR_FALSE;
-        }
-    }
-    return result;
+    aLocalName = aFaceName;
+    aAliased = PR_FALSE;
+    return NS_OK;
 }
 
 NS_IMETHODIMP nsThebesDeviceContext::FlushFontCache(void)
diff --git a/gfx/src/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
index 230502f3407c..5cb66230c777 100644
--- a/gfx/src/nsThebesDeviceContext.h
+++ b/gfx/src/nsThebesDeviceContext.h
@@ -50,9 +50,6 @@
 #include "nsWeakReference.h"
 #include "gfxContext.h"
 
-#include "nsRefPtrHashtable.h"
-#include "nsHashKeys.h"
-
 #include "prlog.h"
 
 #ifdef PR_LOGGING
@@ -65,7 +62,6 @@ extern PRLogModuleInfo* gThebesGFXLog;
 #include "gfxOS2Surface.h"
 #endif
 
-class nsHashtable;
 class nsFontCache;
 
 class nsThebesDeviceContext : public nsIDeviceContext,
@@ -143,10 +139,6 @@ public:
 #endif
 
 protected:
-    virtual nsresult CreateFontAliasTable();
-    nsresult AliasFont(const nsString& aFont, 
-                       const nsString& aAlias, const nsString& aAltAlias,
-                       PRBool aForceAlias);
     void GetLocaleLanguage(void);
     nsresult SetDPI();
     void ComputeClientRectUsingScreen(nsRect *outRect);
@@ -158,7 +150,6 @@ protected:
     PRUint32          mDepth;
     nsFontCache*      mFontCache;
     nsCOMPtr<nsIAtom> mLocaleLanguage; // XXX temp fix for performance bug
-    nsHashtable*      mFontAliasTable;
     nsCOMPtr<nsIWidget> mWidget;
 
 private:

From da55dc6c2746c33e7c2d21f61933528fcb710d10 Mon Sep 17 00:00:00 2001
From: Klaus Ernst <klausernst2@gmx.de>
Date: Wed, 13 Apr 2011 12:57:46 -0700
Subject: [PATCH 102/509] Bug 640601: Allow Flash 10.2+ to load OOP on more Mac
 OS X machines. r=josh

---
 modules/plugin/base/src/nsNPAPIPlugin.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp
index 3ddb0e21bb3f..7ee47d0d5ee1 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -329,6 +329,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
   // Blacklist Flash 10.0 or lower since it may try to negotiate Carbon/Quickdraw
   // which are not supported out of process. Also blacklist Flash 10.1 if this
   // machine has an Intel GMA9XX GPU because Flash will negotiate Quickdraw graphics.
+  // Never blacklist Flash >= 10.2.
   if (aPluginTag->mFileName.EqualsIgnoreCase("flash player.plugin")) {
     // If the first '.' is before position 2 or the version 
     // starts with 10.0 then we are dealing with Flash 10 or less.
@@ -341,12 +342,9 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
       if (versionPrefix.EqualsASCII("10.0")) {
         return PR_FALSE;
       }
-    }
-
-    // At this point we have Flash 10.1+ but now we also need to blacklist
-    // if the machine has a Intel GMA9XX GPU.
-    if (GMA9XXGraphics()) {
-      return PR_FALSE;
+      if (versionPrefix.EqualsASCII("10.1") && GMA9XXGraphics()) {
+        return PR_FALSE;
+      }
     }
   }
 #endif

From 64b169ed5f6edbd132d99be3f6e587302be8e642 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 13 Apr 2011 21:25:58 +0100
Subject: [PATCH 103/509] bug 649678 - include the build date in About window
 for a# versions. r=dao

---
 browser/base/content/aboutDialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
index 4d00acca6be1..8ceb09ecfdd5 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -65,9 +65,9 @@ function init(aEvent)
     // Pref is unset
   }
 
-  // Include the build ID if this is a "pre" (i.e. non-release) build
+  // Include the build ID if this is an "a#" (nightly or aurora) build
   let version = Services.appinfo.version;
-  if (version.indexOf("pre") != -1) {
+  if (/a\d+$/.test(version)) {
     let buildID = Services.appinfo.appBuildID;
     let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
     document.getElementById("version").value += " (" + buildDate + ")";

From be80ac146994c602e824a81fa70ca56ca6cd4e66 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 13 Apr 2011 13:52:55 -0700
Subject: [PATCH 104/509] Bug 649754 - update dialog no longer centered.
 r=mossop

---
 toolkit/mozapps/update/updater/progressui_win.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolkit/mozapps/update/updater/progressui_win.cpp b/toolkit/mozapps/update/updater/progressui_win.cpp
index 84af536258de..d8a73a03930f 100644
--- a/toolkit/mozapps/update/updater/progressui_win.cpp
+++ b/toolkit/mozapps/update/updater/progressui_win.cpp
@@ -204,6 +204,8 @@ InitDialog(HWND hDlg)
 
   ReleaseDC(hWndInfo, hDCInfo);
 
+  CenterDialog(hDlg);  // make dialog appear in the center of the screen
+
   SetTimer(hDlg, TIMER_ID, TIMER_INTERVAL, NULL);
 }
 

From 5dbc4242ca4b1be36695a8f4bc038d40999d091c Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 13 Apr 2011 14:12:22 -0700
Subject: [PATCH 105/509] Bug 649583 Panning regression on google reader in
 2011-04-12 nightly r=roc

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

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 006ebfdb7a8e..3c46e9755cd2 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1314,15 +1314,23 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
 
     // Assign the item to a layer
     if (layerState == LAYER_ACTIVE_FORCE ||
+        layerState == LAYER_ACTIVE_EMPTY ||
         layerState == LAYER_ACTIVE && (aClip.mRoundedClipRects.IsEmpty() ||
         // We can use the visible rect here only because the item has its own
         // layer, like the comment below.
         !aClip.IsRectClippedByRoundedCorner(item->GetVisibleRect()))) {
+
+      // LAYER_ACTIVE_EMPTY means the layer is created just for its metadata.
+      // We should never see an empty layer with any visible content!
+      NS_ASSERTION(layerState != LAYER_ACTIVE_EMPTY ||
+                   itemVisibleRect.IsEmpty(),
+                   "State is LAYER_ACTIVE_EMPTY but visible rect is not.");
+
       // If the item would have its own layer but is invisible, just hide it.
       // Note that items without their own layers can't be skipped this
       // way, since their ThebesLayer may decide it wants to draw them
       // into its buffer even if they're currently covered.
-      if (itemVisibleRect.IsEmpty()) {
+      if (itemVisibleRect.IsEmpty() && layerState != LAYER_ACTIVE_EMPTY) {
         InvalidateForLayerChange(item, nsnull);
         continue;
       }

From 6e8a05de6b59ea7af87cd7ab495597f36b75f232 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 13 Apr 2011 12:43:34 -0700
Subject: [PATCH 106/509] Bug 635749 - Don't assume we can press ENTER on an
 <input type='file'> to submit a form. r=bz,smaug

--HG--
extra : rebase_source : 85b73e61002ebc3c68cfff3363afb29b448c6121
---
 .../html/content/src/nsHTMLInputElement.cpp   | 44 +++++--------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index ae34a8572f89..09214bebe747 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -2310,8 +2310,7 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           }
 
           /*
-           * If this is input type=text, and the user hit enter, fire onChange
-           * and submit the form (if we are in one)
+           * For some input types, if the user hits enter, the form is submitted.
            *
            * Bug 99920, bug 109463 and bug 147850:
            * (a) if there is a submit control in the form, click the first
@@ -2325,42 +2324,19 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           if (aVisitor.mEvent->message == NS_KEY_PRESS &&
               (keyEvent->keyCode == NS_VK_RETURN ||
                keyEvent->keyCode == NS_VK_ENTER) &&
-              (mType == NS_FORM_INPUT_TEXT ||
-               mType == NS_FORM_INPUT_EMAIL ||
-               mType == NS_FORM_INPUT_SEARCH ||
-               mType == NS_FORM_INPUT_PASSWORD ||
-               mType == NS_FORM_INPUT_TEL ||
-               mType == NS_FORM_INPUT_URL ||
-               mType == NS_FORM_INPUT_FILE)) {
+               IsSingleLineTextControl(PR_FALSE, mType)) {
+            nsIFrame* primaryFrame = GetPrimaryFrame();
+            if (primaryFrame) {
+              nsITextControlFrame* textFrame = do_QueryFrame(primaryFrame);
 
-            PRBool isButton = PR_FALSE;
-            // If this is an enter on the button of a file input, don't submit
-            // -- that's supposed to put up the filepicker
-            if (mType == NS_FORM_INPUT_FILE) {
-              nsCOMPtr<nsIContent> maybeButton =
-                do_QueryInterface(aVisitor.mEvent->originalTarget);
-              if (maybeButton) {
-                isButton = maybeButton->AttrValueIs(kNameSpaceID_None,
-                                                    nsGkAtoms::type,
-                                                    nsGkAtoms::button,
-                                                    eCaseMatters);
+              // Fire onChange (if necessary)
+              if (textFrame) {
+                textFrame->CheckFireOnChange();
               }
             }
 
-            if (!isButton) {
-              nsIFrame* primaryFrame = GetPrimaryFrame();
-              if (primaryFrame) {
-                nsITextControlFrame* textFrame = do_QueryFrame(primaryFrame);
-              
-                // Fire onChange (if necessary)
-                if (textFrame) {
-                  textFrame->CheckFireOnChange();
-                }
-              }
-
-              rv = MaybeSubmitForm(aVisitor.mPresContext);
-              NS_ENSURE_SUCCESS(rv, rv);
-            }
+            rv = MaybeSubmitForm(aVisitor.mPresContext);
+            NS_ENSURE_SUCCESS(rv, rv);
           }
 
         } break; // NS_KEY_PRESS || NS_KEY_UP

From 3815106388cf692d7cad21958183764b97b71f2d Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Wed, 13 Apr 2011 14:34:36 -0700
Subject: [PATCH 107/509] Bug 649672: Make File.slice arguments match
 Array.slice and prefix File.slice. r=khuey

---
 content/base/public/nsDOMFile.h           |   7 +-
 content/base/public/nsIDOMFile.idl        |  14 +-
 content/base/src/nsDOMFile.cpp            |  71 +++++++--
 content/base/test/test_fileapi_slice.html | 169 ++++++++++------------
 dom/base/nsDOMClassInfo.cpp               |   2 +
 5 files changed, 150 insertions(+), 113 deletions(-)

diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
index 3cc4c57621a6..c75915925dba 100644
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -57,6 +57,7 @@ class nsIInputStream;
 class nsIClassInfo;
 
 class nsDOMFile : public nsIDOMFile,
+                  public nsIDOMBlob_MOZILLA_2_0_BRANCH,
                   public nsIXHRSendable,
                   public nsICharsetDetectionObserver
 {
@@ -64,6 +65,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMBLOB
   NS_DECL_NSIDOMFILE
+  NS_DECL_NSIDOMBLOB_MOZILLA_2_0_BRANCH
   NS_DECL_NSIXHRSENDABLE
 
   nsDOMFile(nsIFile *aFile, const nsAString& aContentType)
@@ -149,8 +151,9 @@ public:
   NS_IMETHOD GetSize(PRUint64*);
   NS_IMETHOD GetInternalStream(nsIInputStream**);
   NS_IMETHOD GetMozFullPathInternal(nsAString&);
-  NS_IMETHOD Slice(PRUint64 aStart, PRUint64 aLength,
-                   const nsAString& aContentType, nsIDOMBlob **aBlob);
+  NS_IMETHOD MozSlice(PRInt64 aStart, PRInt64 aEnd,
+                      const nsAString& aContentType, PRUint8 optional_argc,
+                      nsIDOMBlob **aBlob);
 
 protected:
   friend class DataOwnerAdapter; // Needs to see DataOwner
diff --git a/content/base/public/nsIDOMFile.idl b/content/base/public/nsIDOMFile.idl
index 9cb5bdca0418..57506b6acf5a 100644
--- a/content/base/public/nsIDOMFile.idl
+++ b/content/base/public/nsIDOMFile.idl
@@ -49,9 +49,9 @@ interface nsIDOMBlob : nsISupports
   readonly attribute unsigned long long size;
   readonly attribute DOMString type;
 
-  nsIDOMBlob slice(in unsigned long long start,
-                   in unsigned long long length,
-                   [optional] in DOMString contentType);
+  [noscript] nsIDOMBlob slice(in unsigned long long start,
+                              in unsigned long long length,
+                              [optional] in DOMString contentType);
 
   [noscript] readonly attribute nsIInputStream internalStream;
   // The caller is responsible for releasing the internalUrl from the
@@ -59,6 +59,14 @@ interface nsIDOMBlob : nsISupports
   [noscript] DOMString getInternalUrl(in nsIPrincipal principal);
 };
 
+[scriptable, uuid(cb5b4191-a555-4e57-b8d2-88091184b59f)]
+interface nsIDOMBlob_MOZILLA_2_0_BRANCH : nsISupports
+{
+  [optional_argc] nsIDOMBlob mozSlice(in long long start,
+                                      [optional] in long long end,
+                                      [optional] in DOMString contentType);
+};
+
 [scriptable, uuid(ae1405b0-e411-481e-9606-b29ec7982687)]
 interface nsIDOMFile : nsIDOMBlob
 {
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index d22f004826d3..62d5003f918a 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -139,6 +139,7 @@ DOMCI_DATA(Blob, nsDOMFile)
 NS_INTERFACE_MAP_BEGIN(nsDOMFile)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFile)
   NS_INTERFACE_MAP_ENTRY(nsIDOMBlob)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMBlob_MOZILLA_2_0_BRANCH)
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIDOMFile, mIsFullFile)
   NS_INTERFACE_MAP_ENTRY(nsIXHRSendable)
   NS_INTERFACE_MAP_ENTRY(nsICharsetDetectionObserver)
@@ -245,23 +246,54 @@ nsDOMFile::GetType(nsAString &aType)
   return NS_OK;
 }
 
-// Makes sure that aStart and aStart + aLength is less then or equal to aSize
+// Makes sure that aStart and aEnd is less then or equal to aSize and greater
+// than 0
 void
-ClampToSize(PRUint64 aSize, PRUint64& aStart, PRUint64& aLength)
+ParseSize(PRInt64 aSize, PRInt64& aStart, PRInt64& aEnd)
 {
-  if (aStart > aSize) {
-    aStart = aLength = 0;
+  CheckedInt64 newStartOffset = aStart;
+  if (aStart < -aSize) {
+    newStartOffset = 0;
   }
-  CheckedUint64 endOffset = aStart;
-  endOffset += aLength;
-  if (!endOffset.valid() || endOffset.value() > aSize) {
-    aLength = aSize - aStart;
+  else if (aStart < 0) {
+    newStartOffset += aSize;
+  }
+  else if (aStart > aSize) {
+    newStartOffset = aSize;
+  }
+
+  CheckedInt64 newEndOffset = aEnd;
+  if (aEnd < -aSize) {
+    newEndOffset = 0;
+  }
+  else if (aEnd < 0) {
+    newEndOffset += aSize;
+  }
+  else if (aEnd > aSize) {
+    newEndOffset = aSize;
+  }
+
+  if (!newStartOffset.valid() || !newEndOffset.valid() ||
+      newStartOffset.value() >= newEndOffset.value()) {
+    aStart = aEnd = 0;
+  }
+  else {
+    aStart = newStartOffset.value();
+    aEnd = newEndOffset.value();
   }
 }
 
 NS_IMETHODIMP
 nsDOMFile::Slice(PRUint64 aStart, PRUint64 aLength,
                  const nsAString& aContentType, nsIDOMBlob **aBlob)
+{
+  return MozSlice(aStart, aStart + aLength, aContentType, 2, aBlob);
+}
+
+NS_IMETHODIMP
+nsDOMFile::MozSlice(PRInt64 aStart, PRInt64 aEnd,
+                    const nsAString& aContentType, PRUint8 optional_argc,
+                    nsIDOMBlob **aBlob)
 {
   *aBlob = nsnull;
 
@@ -269,10 +301,15 @@ nsDOMFile::Slice(PRUint64 aStart, PRUint64 aLength,
   PRUint64 thisLength;
   nsresult rv = GetSize(&thisLength);
   NS_ENSURE_SUCCESS(rv, rv);
-  ClampToSize(thisLength, aStart, aLength);
+
+  if (!optional_argc) {
+    aEnd = (PRInt64)thisLength;
+  }
+
+  ParseSize((PRInt64)thisLength, aStart, aEnd);
   
   // Create the new file
-  NS_ADDREF(*aBlob = new nsDOMFile(this, aStart, aLength, aContentType));
+  NS_ADDREF(*aBlob = new nsDOMFile(this, aStart, aEnd - aStart, aContentType));
   
   return NS_OK;
 }
@@ -627,16 +664,22 @@ nsDOMMemoryFile::GetSize(PRUint64 *aFileSize)
 }
 
 NS_IMETHODIMP
-nsDOMMemoryFile::Slice(PRUint64 aStart, PRUint64 aLength,
-                       const nsAString& aContentType, nsIDOMBlob **aBlob)
+nsDOMMemoryFile::MozSlice(PRInt64 aStart, PRInt64 aEnd,
+                          const nsAString& aContentType, PRUint8 optional_argc,
+                          nsIDOMBlob **aBlob)
 {
   *aBlob = nsnull;
 
+  if (!optional_argc) {
+    aEnd = (PRInt64)mLength;
+  }
+
   // Truncate aLength and aStart so that we stay within this file.
-  ClampToSize(mLength, aStart, aLength);
+  ParseSize((PRInt64)mLength, aStart, aEnd);
 
   // Create the new file
-  NS_ADDREF(*aBlob = new nsDOMMemoryFile(this, aStart, aLength, aContentType));
+  NS_ADDREF(*aBlob = new nsDOMMemoryFile(this, aStart, aEnd - aStart,
+                                         aContentType));
   
   return NS_OK;
 }
diff --git a/content/base/test/test_fileapi_slice.html b/content/base/test/test_fileapi_slice.html
index eedbec790d1f..e971927acfb0 100644
--- a/content/base/test/test_fileapi_slice.html
+++ b/content/base/test/test_fileapi_slice.html
@@ -69,104 +69,83 @@ ok(size > 65536, "test data sufficiently large");
 
 
 // Test that basic properties work
-function testBasics(file, size, type) {
-  is(file.type, type, "[B0] mozGetAsFile type");
-  is(file.size, size, "[B0] file is correct size");
-  ok(file instanceof File, "[B0] file is a File");
-  ok(file instanceof Blob, "[B0] file is also a Blob");
+function testFile(file, size, type, contents, fileType) {
+  is(file.type, type, fileType + " file is correct type");
+  is(file.size, size, fileType + " file is correct size");
+  ok(file instanceof File, fileType + " file is a File");
+  ok(file instanceof Blob, fileType + " file is also a Blob");
   
-  var slice = file.slice(0, size);
-  is(slice.type, "", "[B1] full-size type");
-  is(slice.size, size, "[B1] full-size size");
-  ok(slice instanceof Blob, "[B1] slice is a Blob");
-  ok(!(slice instanceof File), "[B1] slice is not a File");
+  var slice = file.mozSlice(0, size);
+  ok(slice instanceof Blob, fileType + " fullsize slice is a Blob");
+  ok(!(slice instanceof File), fileType + " fullsize slice is not a File");
   
-  slice = file.slice(0, 1234);
-  is(slice.type, "", "[B2] sized type");
-  is(slice.size, 1234, "[B2] sized size");
-  ok(slice instanceof Blob, "[B2] slice is a Blob");
-  ok(!(slice instanceof File), "[B2] slice is not a File");
+  slice = file.mozSlice(0, 1234);
+  ok(slice instanceof Blob, fileType + " sized slice is a Blob");
+  ok(!(slice instanceof File), fileType + " sized slice is not a File");
   
-  slice = file.slice(size-500, 1000);
-  is(slice.type, "", "[B3] end-sized type");
-  is(slice.size, 500, "[B3] end-sized size");
-  
-  slice = file.slice(size+500, 1000);
-  is(slice.type, "", "[B4] sized type");
-  is(slice.size, 0, "[B4] sized size");
+  slice = file.mozSlice(0, size, "foo/bar");
+  is(slice.type, "foo/bar", fileType + " fullsize slice foo/bar type");
 
-  slice = file.slice(0, 0);
-  is(slice.type, "", "[B5] sized type");
-  is(slice.size, 0, "[B5] sized size");
-
-  slice = file.slice(1000, 0);
-  is(slice.type, "", "[B6] sized type");
-  is(slice.size, 0, "[B6] sized size");
+  slice = file.mozSlice(0, 5432, "foo/bar");
+  is(slice.type, "foo/bar", fileType + " sized slice foo/bar type");
   
-  slice = file.slice(0, size, "foo/bar");
-  is(slice.type, "foo/bar", "[B7] full-size foo/bar type");
-  is(slice.size, size, "[B7] full-size foo/bar size");
+  is(slice.mozSlice(0, 10).type, "", fileType + " slice-slice type");
+  is(slice.mozSlice(0, 10).size, 10, fileType + " slice-slice size");
+  is(slice.mozSlice(0, 10, "hello/world").type, "hello/world", fileType + " slice-slice hello/world type");
+  is(slice.mozSlice(0, 10, "hello/world").size, 10, fileType + " slice-slice hello/world size");
 
-  slice = file.slice(0, 5432, "foo/bar");
-  is(slice.type, "foo/bar", "[B8] sized foo/bar type");
-  is(slice.size, 5432, "[B8] sized foo/bar size");
+  var indexes = [[0, size, size],
+                 [0, 1234, 1234],
+                 [size-500, size, 500],
+                 [size-500, size+500, 500],
+                 [size+500, size+1500, 0],
+                 [0, 0, 0],
+                 [1000, 1000, 0],
+                 [size, size, 0],
+                 [0, undefined, size],
+                 [100, undefined, size-100],
+                 [-100, undefined, 100],
+                 [100, -100, size-200],
+                 [-size-100, undefined, size],
+                 [-2*size-100, 500, 500],
+                 [0, -size-100, 0],
+                 [100, -size-100, 0],
+                 [50, -size+100, 50],
+                 [0, 33000, 33000],
+                 [1000, 34000, 33000],
+                ];
   
-  is(slice.slice(0, 10).type, "", "[B9] slice-slice type");
-  is(slice.slice(0, 10).size, 10, "[B9] slice-slice size");
-  is(slice.slice(0, 10, "hello/world").type, "hello/world", "[B9] slice-slice hello/world type");
-  is(slice.slice(0, 10, "hello/world").size, 10, "[B9] slice-slice hello/world type");
+  for (var i = 0; i < indexes.length; ++i) {
+    var sliceContents;
+    var testName;
+    if (indexes[i][1] == undefined) {
+      slice = file.mozSlice(indexes[i][0]);
+      sliceContents = contents.slice(indexes[i][0]);
+      testName = fileType + " slice(" + indexes[i][0] + ")";
+    }
+    else {
+      slice = file.mozSlice(indexes[i][0], indexes[i][1]);
+      sliceContents = contents.slice(indexes[i][0], indexes[i][1]);
+      testName = fileType + " slice(" + indexes[i][0] + ", " + indexes[i][1] + ")";
+    }
+    is(slice.type, "", testName + " type");
+    is(slice.size, indexes[i][2], testName + " size");
+    is(sliceContents.length, indexes[i][2], testName + " data size");
+    checkFileContents(slice, sliceContents, testName);
+  }
+
+  // Slice of slice
+  var slice = file.mozSlice(0, 40000);
+  checkFileContents(slice.mozSlice(5000, 42000), contents.slice(5000, 40000), "file slice slice");
+  
+  // ...of slice of slice
+  slice = slice.mozSlice(5000, 42000).mozSlice(400, 700);
+  gc();
+  checkFileContents(slice, contents.slice(5400, 5700), "file slice slice slice");
 }
 
-testBasics(memFile, size, "image/png");
-testBasics(fileFile, size, "");
-
-
-// Test reading various slices
-
-// Full file
-testFile(memFile, fileData, "mem file");
-testFile(fileFile, fileData, "file file");
-
-// Simple slice
-testFile(memFile.slice(0, 33000), fileData.substr(0, 33000), "mem file slice");
-testFile(fileFile.slice(0, 33000), fileData.substr(0, 33000), "file file slice");
-
-// Simple slice not starting at beginning
-testFile(memFile.slice(1000, 33000), fileData.substr(1000, 33000), "mem file slice starting at non-zero");
-testFile(fileFile.slice(1000, 33000), fileData.substr(1000, 33000), "file file slice starting at non-zero");
-
-// Slice of slice
-var memSlice = memFile.slice(0, 40000);
-var fileSlice = fileFile.slice(0, 40000);
-testFile(memSlice.slice(5000, 37000), fileData.substr(5000, 35000), "mem file slice slice");
-testFile(fileSlice.slice(5000, 37000), fileData.substr(5000, 35000), "file file slice slice");
-
-// ...of slice of slice
-memSlice = memSlice.slice(5000, 37000).slice(400, 300);
-fileSlice = fileSlice.slice(5000, 37000).slice(400, 300);
-gc();
-testFile(memSlice, fileData.substr(5400, 300), "mem file slice slice slice");
-testFile(fileSlice, fileData.substr(5400, 300), "file file slice slice slice");
-
-// empty slice
-testFile(memFile.slice(4711, 0), "", "mem file empty slice (1)");
-testFile(fileFile.slice(4711, 0), "", "file file empty slice (1)");
-testFile(memFile.slice(0, 0), "", "mem file empty slice (2)");
-testFile(fileFile.slice(0, 0), "", "file file empty slice (2)");
-
-// slice at end
-testFile(memFile.slice(size-1000, 1000), fileData.substr(size-1000, 1000), "mem file slice at end");
-testFile(fileFile.slice(size-1000, 1000), fileData.substr(size-1000, 1000), "file file slice at end");
-
-// slice across end
-testFile(memFile.slice(size-500, 1000), fileData.substr(size-500, 500), "mem file slice across end");
-testFile(fileFile.slice(size-500, 1000), fileData.substr(size-500, 500), "file file slice across end");
-
-// slice past end
-testFile(memFile.slice(size, 1000), "", "mem file slice past end (1)");
-testFile(fileFile.slice(size, 1000), "", "file file slice past end (1)");
-testFile(memFile.slice(size + 1000, 1000), "", "mem file slice past end (2)");
-testFile(fileFile.slice(size + 1000, 1000), "", "file file slice past end (2)");
+testFile(memFile, size, "image/png", fileData, "memFile");
+testFile(fileFile, size, "", fileData, "fileFile");
 
 
 // Try loading directly from slice into an image
@@ -202,7 +181,7 @@ function imageLoadHandler(event) {
 var imgfile = createFileWithData(testBinaryData + fileData + testBinaryData);
 is(imgfile.size, size + testBinaryData.length * 2, "correct file size (middle)");
 var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, size));
+img.src = URL.createObjectURL(imgfile.mozSlice(testBinaryData.length, testBinaryData.length + size));
 img.onload = imageLoadHandler;
 expectedTestCount++;
 
@@ -210,7 +189,7 @@ expectedTestCount++;
 var imgfile = createFileWithData(fileData + testBinaryData);
 is(imgfile.size, size + testBinaryData.length, "correct file size (start)");
 var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(0, size));
+img.src = URL.createObjectURL(imgfile.mozSlice(0, size));
 img.onload = imageLoadHandler;
 expectedTestCount++;
 
@@ -218,7 +197,7 @@ expectedTestCount++;
 var imgfile = createFileWithData(testBinaryData + fileData);
 is(imgfile.size, size + testBinaryData.length, "correct file size (end)");
 var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, size));
+img.src = URL.createObjectURL(imgfile.mozSlice(testBinaryData.length, testBinaryData.length + size));
 img.onload = imageLoadHandler;
 expectedTestCount++;
 
@@ -226,13 +205,15 @@ expectedTestCount++;
 var imgfile = createFileWithData(testBinaryData + fileData);
 is(imgfile.size, size + testBinaryData.length, "correct file size (past end)");
 var img = new Image;
-img.src = URL.createObjectURL(imgfile.slice(testBinaryData.length, size + 1000));
+img.src = URL.createObjectURL(imgfile.mozSlice(testBinaryData.length, testBinaryData.length + size + 1000));
 img.onload = imageLoadHandler;
 expectedTestCount++;
 
 
 // Utility functions
-function testFile(file, contents, test) {
+function checkFileContents(file, contents, test) {
+  SimpleTest.requestLongerTimeout(2);
+
   // Load file using FileReader
   var r = new FileReader();
   r.onload = getFileReaderLoadHandler(contents, contents.length, "FileReader.readAsBinaryString of " + test);
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 15a5a8c0073d..ed094d25b4ee 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -3911,10 +3911,12 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(Blob, nsIDOMBlob)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob_MOZILLA_2_0_BRANCH)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(File, nsIDOMFile)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlob_MOZILLA_2_0_BRANCH)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMFile)
   DOM_CLASSINFO_MAP_END
 

From 5fe5cc8fd06c5fed5d91962e9df20718b2cdd326 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 14 Apr 2011 09:47:30 +1200
Subject: [PATCH 108/509] Bug 637207 - Make name & message on Error prototypes
 and message on Error instances not enumerable r=gal

---
 js/src/jsexn.cpp                              | 39 +++++--------------
 js/src/tests/ecma_5/Exceptions/browser.js     |  0
 .../error-property-enumerability.js           | 30 ++++++++++++++
 js/src/tests/ecma_5/Exceptions/jstests.list   |  2 +
 js/src/tests/ecma_5/Exceptions/shell.js       |  0
 js/src/tests/ecma_5/jstests.list              |  1 +
 6 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 js/src/tests/ecma_5/Exceptions/browser.js
 create mode 100644 js/src/tests/ecma_5/Exceptions/error-property-enumerability.js
 create mode 100644 js/src/tests/ecma_5/Exceptions/jstests.list
 create mode 100644 js/src/tests/ecma_5/Exceptions/shell.js

diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index efca6b2b6f32..8524800ceb40 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -94,7 +94,7 @@ Class js_ErrorClass = {
     PropertyStub,         /* delProperty */
     PropertyStub,         /* getProperty */
     StrictPropertyStub,   /* setProperty */
-    exn_enumerate,
+    EnumerateStub,
     (JSResolveOp)exn_resolve,
     ConvertStub,
     exn_finalize,
@@ -432,32 +432,6 @@ exn_finalize(JSContext *cx, JSObject *obj)
     }
 }
 
-static JSBool
-exn_enumerate(JSContext *cx, JSObject *obj)
-{
-    JSAtomState *atomState;
-    uintN i;
-    JSAtom *atom;
-    JSObject *pobj;
-    JSProperty *prop;
-
-    JS_STATIC_ASSERT(sizeof(JSAtomState) <= (size_t)(uint16)-1);
-    static const uint16 offsets[] = {
-        (uint16)offsetof(JSAtomState, messageAtom),
-        (uint16)offsetof(JSAtomState, fileNameAtom),
-        (uint16)offsetof(JSAtomState, lineNumberAtom),
-        (uint16)offsetof(JSAtomState, stackAtom),
-    };
-
-    atomState = &cx->runtime->atomState;
-    for (i = 0; i != JS_ARRAY_LENGTH(offsets); ++i) {
-        atom = *(JSAtom **)((uint8 *)atomState + offsets[i]);
-        if (!js_LookupProperty(cx, obj, ATOM_TO_JSID(atom), &pobj, &prop))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
 static JSBool
 exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
             JSObject **objp)
@@ -468,6 +442,7 @@ exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
     JSString *stack;
     const char *prop;
     jsval v;
+    uintN attrs;
 
     *objp = NULL;
     priv = GetExnPrivate(cx, obj);
@@ -487,6 +462,7 @@ exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
                 return true;
 
             v = STRING_TO_JSVAL(priv->message);
+            attrs = 0;
             goto define;
         }
 
@@ -494,6 +470,7 @@ exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
         if (str == atom) {
             prop = js_fileName_str;
             v = STRING_TO_JSVAL(priv->filename);
+            attrs = JSPROP_ENUMERATE;
             goto define;
         }
 
@@ -501,6 +478,7 @@ exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
         if (str == atom) {
             prop = js_lineNumber_str;
             v = INT_TO_JSVAL(priv->lineno);
+            attrs = JSPROP_ENUMERATE;
             goto define;
         }
 
@@ -514,13 +492,14 @@ exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
             priv->stackDepth = 0;
             prop = js_stack_str;
             v = STRING_TO_JSVAL(stack);
+            attrs = JSPROP_ENUMERATE;
             goto define;
         }
     }
     return true;
 
   define:
-    if (!JS_DefineProperty(cx, obj, prop, v, NULL, NULL, JSPROP_ENUMERATE))
+    if (!JS_DefineProperty(cx, obj, prop, v, NULL, NULL, attrs))
         return false;
     *objp = obj;
     return true;
@@ -1067,10 +1046,10 @@ js_InitExceptionClasses(JSContext *cx, JSObject *obj)
         JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED | JSRESOLVE_DECLARING);
         if (!js_DefineNativeProperty(cx, proto, nameId, StringValue(atom),
                                      PropertyStub, StrictPropertyStub,
-                                     JSPROP_ENUMERATE, 0, 0, NULL) ||
+                                     0, 0, 0, NULL) ||
             !js_DefineNativeProperty(cx, proto, messageId, empty,
                                      PropertyStub, StrictPropertyStub,
-                                     JSPROP_ENUMERATE, 0, 0, NULL) ||
+                                     0, 0, 0, NULL) ||
             !js_DefineNativeProperty(cx, proto, fileNameId, empty,
                                      PropertyStub, StrictPropertyStub,
                                      JSPROP_ENUMERATE, 0, 0, NULL) ||
diff --git a/js/src/tests/ecma_5/Exceptions/browser.js b/js/src/tests/ecma_5/Exceptions/browser.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/ecma_5/Exceptions/error-property-enumerability.js b/js/src/tests/ecma_5/Exceptions/error-property-enumerability.js
new file mode 100644
index 000000000000..c6674cfc572b
--- /dev/null
+++ b/js/src/tests/ecma_5/Exceptions/error-property-enumerability.js
@@ -0,0 +1,30 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var errors = ["Error", "EvalError", "RangeError", "ReferenceError",
+              "SyntaxError", "TypeError", "URIError"];
+
+for (var i = 0; i < errors.length; i++) {
+  var error = this[errors[i]];
+
+  var desc = Object.getOwnPropertyDescriptor(error.prototype, "name");
+  assertEq(!!desc, true, errors[i] + ".prototype.name should exist");
+  assertEq((desc || {}).enumerable, false, errors[i] + ".prototype.name should not be enumerable");
+
+  desc = Object.getOwnPropertyDescriptor(error.prototype, "message");
+  assertEq(!!desc, true, errors[i] + ".prototype.message should exist");
+  assertEq((desc || {}).enumerable, false, errors[i] + ".prototype.message should not be enumerable");
+
+  var instance = new error;
+  desc = Object.getOwnPropertyDescriptor(instance, "message");
+  assertEq(!!desc, false, "new " + errors[i] + ".message should not exist");
+
+  instance = new error("a message");
+  desc = Object.getOwnPropertyDescriptor(instance, "message");
+  assertEq(!!desc, true, "new " + errors[i] + "(...).message should exist");
+  assertEq((desc || {}).enumerable, false, "new " + errors[i] + "(...).message should not be enumerable");
+}
+
+reportCompare(true, true);
diff --git a/js/src/tests/ecma_5/Exceptions/jstests.list b/js/src/tests/ecma_5/Exceptions/jstests.list
new file mode 100644
index 000000000000..016a46689cbe
--- /dev/null
+++ b/js/src/tests/ecma_5/Exceptions/jstests.list
@@ -0,0 +1,2 @@
+url-prefix ../../jsreftest.html?test=ecma_5/Exceptions/
+script error-property-enumerability.js
diff --git a/js/src/tests/ecma_5/Exceptions/shell.js b/js/src/tests/ecma_5/Exceptions/shell.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/js/src/tests/ecma_5/jstests.list b/js/src/tests/ecma_5/jstests.list
index d1c8254ee125..db5e1425a96c 100644
--- a/js/src/tests/ecma_5/jstests.list
+++ b/js/src/tests/ecma_5/jstests.list
@@ -2,6 +2,7 @@ include Array/jstests.list
 include Boolean/jstests.list
 include Date/jstests.list
 include eval/jstests.list
+include Exceptions/jstests.list
 include Expressions/jstests.list
 include Function/jstests.list
 include Global/jstests.list

From 0a228e18f5ff71d948c70d4c317a1ac5387db712 Mon Sep 17 00:00:00 2001
From: Jonathan Protzenko <jonathan.protzenko@gmail.com>
Date: Thu, 14 Apr 2011 00:10:13 +0200
Subject: [PATCH 109/509] Bug 628669: Provide support for relative URLs in
 Components utils import (JSM, JS modules) r=bsmedberg r=mrbkap

This patch allows a JS module to import another one with a relative path. For
instance, if you have a set of modules you want to drop-in in any extension, and
these modules depend on each other, you can import XPCOMUtils and then do
XPCOMUtils.importRelative(this, "otherfile.jsm").
---
 js/src/xpconnect/loader/XPCOMUtils.jsm        | 15 ++++++++++++-
 .../xpconnect/loader/mozJSComponentLoader.cpp |  8 +++++++
 .../xpcshell/example/unit/import_module.jsm   | 21 ++++++++++++++++++-
 .../example/unit/import_sub_module.jsm        |  6 ++++++
 .../example/unit/test_import_module.js        |  8 ++++++-
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 testing/xpcshell/example/unit/import_sub_module.jsm

diff --git a/js/src/xpconnect/loader/XPCOMUtils.jsm b/js/src/xpconnect/loader/XPCOMUtils.jsm
index d70342b94d61..42787ef847b7 100644
--- a/js/src/xpconnect/loader/XPCOMUtils.jsm
+++ b/js/src/xpconnect/loader/XPCOMUtils.jsm
@@ -258,7 +258,20 @@ var XPCOMUtils = {
       }
     }
     return factory;
-  }
+  },
+
+  /**
+   * Allows you to fake a relative import. Expects the global object from the
+   * module that's calling us, and the relative filename that we wish to import.
+   */
+  importRelative: function XPCOMUtils__importRelative(that, path) {
+    if (!("__URI__" in that))
+      throw Error("importRelative may only be used from a JSM, and its first argument "+
+                  "must be that JSM's global object (hint: use this)");
+    let uri = that.__URI__;
+    let i = uri.lastIndexOf("/");
+    Components.utils.import(uri.substring(0, i+1) + path, that);
+  },
 };
 
 /**
diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
index 934b99da0b91..28ab59f5c0f7 100644
--- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@@ -1030,6 +1030,14 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile,
     NS_ENSURE_SUCCESS(rv, rv);
 #endif
 
+    // Expose the URI from which the script was imported through a special
+    // variable that we insert into the JSM.
+    JSString *exposedUri = JS_NewStringCopyN(cx, nativePath.get(), nativePath.Length());
+    if (!JS_DefineProperty(cx, global, "__URI__",
+                           STRING_TO_JSVAL(exposedUri), nsnull, nsnull, 0))
+        return NS_ERROR_FAILURE;
+
+
     JSObject *scriptObj = nsnull;
 
 #ifdef MOZ_ENABLE_LIBXUL  
diff --git a/testing/xpcshell/example/unit/import_module.jsm b/testing/xpcshell/example/unit/import_module.jsm
index b534a5f4aefb..48a71cccd4a2 100644
--- a/testing/xpcshell/example/unit/import_module.jsm
+++ b/testing/xpcshell/example/unit/import_module.jsm
@@ -1,5 +1,24 @@
 // Module used by test_import_module.js
 
-const EXPORTED_SYMBOLS = [ "MODULE_IMPORTED" ];
+const EXPORTED_SYMBOLS = [ "MODULE_IMPORTED", "MODULE_URI", "SUBMODULE_IMPORTED", "same_scope" ];
 
 const MODULE_IMPORTED = true;
+const MODULE_URI = __URI__;
+
+// Will import SUBMODULE_IMPORTED into scope.
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.importRelative(this, "import_sub_module.jsm");
+
+// Prepare two scopes that we can import the submodule into.
+var scope1 = { __URI__: __URI__ };
+var scope2 = { __URI__: __URI__ };
+// First one is the regular path.
+XPCOMUtils.importRelative(scope1, "import_sub_module.jsm");
+scope1.test_obj.i++;
+// Second one is with a different path (leads to the same file).
+XPCOMUtils.importRelative(scope2, "duh/../import_sub_module.jsm");
+// test_obj belongs to import_sub_module.jsm and has a mutable field name i, if
+// the two modules are actually the same, then they'll share the same value.
+// We'll leave it up to test_import_module.js to check that this variable is
+// true.
+var same_scope = (scope1.test_obj.i == scope2.test_obj.i);
diff --git a/testing/xpcshell/example/unit/import_sub_module.jsm b/testing/xpcshell/example/unit/import_sub_module.jsm
new file mode 100644
index 000000000000..8ea346c8ba05
--- /dev/null
+++ b/testing/xpcshell/example/unit/import_sub_module.jsm
@@ -0,0 +1,6 @@
+// Module used by import_module.jsm
+
+var EXPORTED_SYMBOLS = [ "SUBMODULE_IMPORTED", "test_obj" ];
+
+const SUBMODULE_IMPORTED = true;
+var test_obj = { i: 0 };
diff --git a/testing/xpcshell/example/unit/test_import_module.js b/testing/xpcshell/example/unit/test_import_module.js
index eb1fa4500191..aebad8016397 100644
--- a/testing/xpcshell/example/unit/test_import_module.js
+++ b/testing/xpcshell/example/unit/test_import_module.js
@@ -22,6 +22,7 @@
  *
  * Contributor(s):
  *  Marco Bonardo <mak77@bonardo.net>
+ *  Jonathan Protzenko <jonathan.protzenko@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -44,6 +45,11 @@
 
 function run_test() {
   do_check_true(typeof(this['MODULE_IMPORTED']) == "undefined");
-  Components.utils.import("resource://test/import_module.jsm");
+  do_check_true(typeof(this['MODULE_URI']) == "undefined");
+  let uri = "resource://test/import_module.jsm";
+  Components.utils.import(uri);
+  do_check_true(MODULE_URI == uri);
   do_check_true(MODULE_IMPORTED);
+  do_check_true(SUBMODULE_IMPORTED);
+  do_check_true(same_scope);
 }

From 73310e4cd68a617ba382ca577fa8d3565e5ccae1 Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Thu, 14 Apr 2011 10:12:23 +1200
Subject: [PATCH 110/509] Bug 641718 - Convert to using microseconds for
 internal video timestamps. r=kinetik

---
 .../html/content/src/nsHTMLMediaElement.cpp   |   2 +-
 content/media/VideoUtils.cpp                  |  16 +-
 content/media/VideoUtils.h                    |  16 +-
 .../media/nsAudioAvailableEventManager.cpp    |   6 +-
 content/media/nsAudioStream.cpp               |   8 +-
 content/media/nsAudioStream.h                 |   2 +-
 content/media/nsBuiltinDecoder.cpp            |  10 +-
 content/media/nsBuiltinDecoder.h              |   7 +-
 content/media/nsBuiltinDecoderReader.h        |  18 +--
 .../media/nsBuiltinDecoderStateMachine.cpp    | 152 +++++++++---------
 content/media/nsBuiltinDecoderStateMachine.h  |  60 +++----
 content/media/nsMediaCache.cpp                |   6 +-
 content/media/nsMediaDecoder.h                |   4 +-
 content/media/nsMediaStream.cpp               |   2 +-
 content/media/nsMediaStream.h                 |   4 +-
 content/media/ogg/nsOggCodecState.cpp         |  53 +++---
 content/media/ogg/nsOggCodecState.h           |  11 +-
 content/media/ogg/nsOggReader.cpp             |  29 ++--
 content/media/ogg/nsOggReader.h               |  18 +--
 content/media/raw/nsRawReader.cpp             |  12 +-
 content/media/test/test_seekLies.html         |   2 +-
 content/media/wave/nsWaveReader.cpp           |  41 ++---
 content/media/wave/nsWaveReader.h             |   6 +-
 content/media/webm/nsWebMBufferedParser.cpp   |   1 -
 content/media/webm/nsWebMReader.cpp           |  53 +++---
 content/media/webm/nsWebMReader.h             |   8 +-
 26 files changed, 265 insertions(+), 282 deletions(-)

diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 98b66ee16cd9..8e9bd2c17a37 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -1820,7 +1820,7 @@ nsresult nsHTMLMediaElement::InitializeDecoderAsClone(nsMediaDecoder* aOriginal)
 
   double duration = aOriginal->GetDuration();
   if (duration >= 0) {
-    decoder->SetDuration(PRInt64(NS_round(duration * 1000)));
+    decoder->SetDuration(duration);
     decoder->SetSeekable(aOriginal->GetSeekable());
   }
 
diff --git a/content/media/VideoUtils.cpp b/content/media/VideoUtils.cpp
index 88bbe0a9696f..76b8166eceb8 100644
--- a/content/media/VideoUtils.cpp
+++ b/content/media/VideoUtils.cpp
@@ -175,24 +175,24 @@ PRBool MulOverflow(PRInt64 a, PRInt64 b, PRInt64& aResult) {
   return PR_TRUE;
 }
 
-// Converts from number of audio samples to milliseconds, given the specified
+// Converts from number of audio samples to microseconds, given the specified
 // audio rate.
-PRBool SamplesToMs(PRInt64 aSamples, PRUint32 aRate, PRInt64& aOutMs)
+PRBool SamplesToUsecs(PRInt64 aSamples, PRUint32 aRate, PRInt64& aOutUsecs)
 {
   PRInt64 x;
-  if (!MulOverflow(aSamples, 1000, x))
+  if (!MulOverflow(aSamples, USECS_PER_S, x))
     return PR_FALSE;
-  aOutMs = x / aRate;
+  aOutUsecs = x / aRate;
   return PR_TRUE;
 }
 
-// Converts from milliseconds to number of audio samples, given the specified
+// Converts from microseconds to number of audio samples, given the specified
 // audio rate.
-PRBool MsToSamples(PRInt64 aMs, PRUint32 aRate, PRInt64& aOutSamples)
+PRBool UsecsToSamples(PRInt64 aUsecs, PRUint32 aRate, PRInt64& aOutSamples)
 {
   PRInt64 x;
-  if (!MulOverflow(aMs, aRate, x))
+  if (!MulOverflow(aUsecs, aRate, x))
     return PR_FALSE;
-  aOutSamples = x / 1000;
+  aOutSamples = x / USECS_PER_S;
   return PR_TRUE;
 }
diff --git a/content/media/VideoUtils.h b/content/media/VideoUtils.h
index 5dc0237fce77..497db6a6db16 100644
--- a/content/media/VideoUtils.h
+++ b/content/media/VideoUtils.h
@@ -126,16 +126,22 @@ PRBool AddOverflow(PRInt64 a, PRInt64 b, PRInt64& aResult);
 // in an integer overflow.
 PRBool MulOverflow(PRInt64 a, PRInt64 b, PRInt64& aResult);
 
-// Converts from number of audio samples (aSamples) to milliseconds, given
-// the specified audio rate (aRate). Stores result in aOutMs. Returns PR_TRUE
+// Converts from number of audio samples (aSamples) to microseconds, given
+// the specified audio rate (aRate). Stores result in aOutUsecs. Returns PR_TRUE
 // if the operation succeeded, or PR_FALSE if there was an integer overflow
 // while calulating the conversion.
-PRBool SamplesToMs(PRInt64 aSamples, PRUint32 aRate, PRInt64& aOutMs);
+PRBool SamplesToUsecs(PRInt64 aSamples, PRUint32 aRate, PRInt64& aOutUsecs);
 
-// Converts from milliseconds (aMs) to number of audio samples, given the
+// Converts from microseconds (aUsecs) to number of audio samples, given the
 // specified audio rate (aRate). Stores the result in aOutSamples. Returns
 // PR_TRUE if the operation succeeded, or PR_FALSE if there was an integer
 // overflow while calulating the conversion.
-PRBool MsToSamples(PRInt64 aMs, PRUint32 aRate, PRInt64& aOutSamples);
+PRBool UsecsToSamples(PRInt64 aUsecs, PRUint32 aRate, PRInt64& aOutSamples);
+
+// Number of microseconds per second. 1e6.
+#define USECS_PER_S 1000000
+
+// Number of microseconds per millisecond.
+#define USECS_PER_MS 1000
 
 #endif
diff --git a/content/media/nsAudioAvailableEventManager.cpp b/content/media/nsAudioAvailableEventManager.cpp
index e3f75820d800..e6f4d2ebf715 100644
--- a/content/media/nsAudioAvailableEventManager.cpp
+++ b/content/media/nsAudioAvailableEventManager.cpp
@@ -39,8 +39,8 @@
 
 #include "nsTArray.h"
 #include "nsAudioAvailableEventManager.h"
+#include "VideoUtils.h"
 
-#define MILLISECONDS_PER_SECOND 1000.0f
 #define MAX_PENDING_EVENTS 100
 
 using namespace mozilla;
@@ -107,7 +107,7 @@ void nsAudioAvailableEventManager::DispatchPendingEvents(PRUint64 aCurrentTime)
   while (mPendingEvents.Length() > 0) {
     nsAudioAvailableEventRunner* e =
       (nsAudioAvailableEventRunner*)mPendingEvents[0].get();
-    if (e->mTime * MILLISECONDS_PER_SECOND > aCurrentTime) {
+    if (e->mTime * USECS_PER_S > aCurrentTime) {
       break;
     }
     nsCOMPtr<nsIRunnable> event = mPendingEvents[0];
@@ -228,7 +228,7 @@ void nsAudioAvailableEventManager::Drain(PRUint64 aEndTime)
          (mSignalBufferLength - mSignalBufferPosition) * sizeof(float));
 
   // Force this last event to go now.
-  float time = (aEndTime / MILLISECONDS_PER_SECOND) - 
+  float time = (aEndTime / static_cast<float>(USECS_PER_S)) - 
                (mSignalBufferPosition / mSamplesPerSecond);
   nsCOMPtr<nsIRunnable> lastEvent =
     new nsAudioAvailableEventRunner(mDecoder, mSignalBuffer.forget(),
diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 8eb6602084d6..624223c06d10 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -51,6 +51,7 @@ using namespace mozilla::dom;
 #include "nsAutoPtr.h"
 #include "nsAudioStream.h"
 #include "nsAlgorithm.h"
+#include "VideoUtils.h"
 extern "C" {
 #include "sydneyaudio/sydney_audio.h"
 }
@@ -74,7 +75,6 @@ PRLogModuleInfo* gAudioStreamLog = nsnull;
 #endif
 
 #define FAKE_BUFFER_SIZE 176400
-#define MILLISECONDS_PER_SECOND 1000
 
 class nsAudioStreamLocal : public nsAudioStream
 {
@@ -551,7 +551,7 @@ PRInt64 nsAudioStreamLocal::GetPosition()
 {
   PRInt64 sampleOffset = GetSampleOffset();
   if (sampleOffset >= 0) {
-    return ((MILLISECONDS_PER_SECOND * sampleOffset) / mRate / mChannels);
+    return ((USECS_PER_S * sampleOffset) / mRate / mChannels);
   }
   return -1;
 }
@@ -718,7 +718,7 @@ PRInt64 nsAudioStreamRemote::GetPosition()
 {
   PRInt64 sampleOffset = GetSampleOffset();
   if (sampleOffset >= 0) {
-    return ((MILLISECONDS_PER_SECOND * sampleOffset) / mRate / mChannels);
+    return ((USECS_PER_S * sampleOffset) / mRate / mChannels);
   }
   return 0;
 }
@@ -734,7 +734,7 @@ nsAudioStreamRemote::GetSampleOffset()
     return 0;
 
   PRInt64 time   = mAudioChild->GetLastKnownSampleOffsetTime();
-  PRInt64 result = offset + (mRate * mChannels * (PR_IntervalNow() - time) / MILLISECONDS_PER_SECOND);
+  PRInt64 result = offset + (mRate * mChannels * (PR_IntervalNow() - time) / USECS_PER_S);
 
   return result;
 }
diff --git a/content/media/nsAudioStream.h b/content/media/nsAudioStream.h
index de560a147be0..192dcc0f06eb 100644
--- a/content/media/nsAudioStream.h
+++ b/content/media/nsAudioStream.h
@@ -106,7 +106,7 @@ public:
   // Resume audio playback
   virtual void Resume() = 0;
 
-  // Return the position in milliseconds of the sample being played by the
+  // Return the position in microseconds of the sample being played by the
   // audio hardware.
   virtual PRInt64 GetPosition() = 0;
 
diff --git a/content/media/nsBuiltinDecoder.cpp b/content/media/nsBuiltinDecoder.cpp
index 353fe144b76e..f305f7a854c6 100644
--- a/content/media/nsBuiltinDecoder.cpp
+++ b/content/media/nsBuiltinDecoder.cpp
@@ -83,7 +83,7 @@ double nsBuiltinDecoder::GetDuration()
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
   if (mDuration >= 0) {
-     return static_cast<double>(mDuration) / 1000.0;
+     return static_cast<double>(mDuration) / static_cast<double>(USECS_PER_S);
   }
   return std::numeric_limits<double>::quiet_NaN();
 }
@@ -538,7 +538,7 @@ double nsBuiltinDecoder::ComputePlaybackRate(PRPackedBool* aReliable)
   PRInt64 length = mStream ? mStream->GetLength() : -1;
   if (mDuration >= 0 && length >= 0) {
     *aReliable = PR_TRUE;
-    return double(length)*1000.0/mDuration;
+    return length * static_cast<double>(USECS_PER_S) / mDuration;
   }
   return mPlaybackStatistics.GetRateAtLastStop(aReliable);
 }
@@ -814,15 +814,15 @@ void nsBuiltinDecoder::DurationChanged()
   UpdatePlaybackRate();
 
   if (mElement && oldDuration != mDuration) {
-    LOG(PR_LOG_DEBUG, ("%p duration changed to %lldms", this, mDuration));
+    LOG(PR_LOG_DEBUG, ("%p duration changed to %lld", this, mDuration));
     mElement->DispatchEvent(NS_LITERAL_STRING("durationchange"));
   }
 }
 
-void nsBuiltinDecoder::SetDuration(PRInt64 aDuration)
+void nsBuiltinDecoder::SetDuration(double aDuration)
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
-  mDuration = aDuration;
+  mDuration = static_cast<PRInt64>(NS_round(aDuration * static_cast<double>(USECS_PER_S)));
 
   MonitorAutoEnter mon(mMonitor);
   if (mDecoderStateMachine) {
diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index 7946eec9b956..bf15636cee31 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -250,13 +250,14 @@ public:
   virtual void Shutdown() = 0;
 
   // Called from the main thread to get the duration. The decoder monitor
-  // must be obtained before calling this. It is in units of milliseconds.
+  // must be obtained before calling this. It is in units of microseconds.
   virtual PRInt64 GetDuration() = 0;
 
   // Called from the main thread to set the duration of the media resource
   // if it is able to be obtained via HTTP headers. Called from the 
   // state machine thread to set the duration if it is obtained from the
   // media metadata. The decoder monitor must be obtained before calling this.
+  // aDuration is in microseconds.
   virtual void SetDuration(PRInt64 aDuration) = 0;
 
   // Functions used by assertions to ensure we're calling things
@@ -387,10 +388,10 @@ class nsBuiltinDecoder : public nsMediaDecoder
   // Call on the main thread only.
   virtual PRBool IsEnded() const;
 
-  // Set the duration of the media resource in units of milliseconds.
+  // Set the duration of the media resource in units of seconds.
   // This is called via a channel listener if it can pick up the duration
   // from a content header. Must be called from the main thread only.
-  virtual void SetDuration(PRInt64 aDuration);
+  virtual void SetDuration(double aDuration);
 
   // Set a flag indicating whether seeking is supported
   virtual void SetSeekable(PRBool aSeekable);
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index a9673d8abb8c..e7ce6732fcba 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -179,8 +179,8 @@ public:
   // chunk ends.
   const PRInt64 mOffset;
 
-  PRInt64 mTime; // Start time of samples in ms.
-  const PRInt64 mDuration; // In ms.
+  PRInt64 mTime; // Start time of samples in usecs.
+  const PRInt64 mDuration; // In usecs.
   const PRUint32 mSamples;
   const PRUint32 mChannels;
   nsAutoArrayPtr<SoundDataValue> mAudioData;
@@ -241,10 +241,10 @@ public:
   // Approximate byte offset of the end of the frame in the media.
   PRInt64 mOffset;
 
-  // Start time of frame in milliseconds.
+  // Start time of frame in microseconds.
   PRInt64 mTime;
 
-  // End time of frame in milliseconds;
+  // End time of frame in microseconds;
   PRInt64 mEndTime;
 
   // Codec specific internal time code. For Ogg based codecs this is the
@@ -387,7 +387,7 @@ template <class T> class MediaQueue : private nsDeque {
     mEndOfStream = PR_TRUE;    
   }
 
-  // Returns the approximate number of milliseconds of samples in the queue.
+  // Returns the approximate number of microseconds of samples in the queue.
   PRInt64 Duration() {
     MonitorAutoEnter mon(mMonitor);
     if (GetSize() < 2) {
@@ -457,9 +457,9 @@ public:
   // This will not read past aEndOffset. Returns -1 on failure. 
   virtual PRInt64 FindEndTime(PRInt64 aEndOffset);
 
-  // Moves the decode head to aTime milliseconds. aStartTime and aEndTime
-  // denote the start and end times of the media in ms, and aCurrentTime
-  // is the current playback position in ms.
+  // Moves the decode head to aTime microseconds. aStartTime and aEndTime
+  // denote the start and end times of the media in usecs, and aCurrentTime
+  // is the current playback position in microseconds.
   virtual nsresult Seek(PRInt64 aTime,
                         PRInt64 aStartTime,
                         PRInt64 aEndTime,
@@ -485,7 +485,7 @@ public:
 protected:
 
   // Pumps the decode until we reach frames/samples required to play at
-  // time aTarget (ms).
+  // time aTarget (usecs).
   nsresult DecodeToTarget(PRInt64 aTarget);
 
   // Reader decode function. Matches DecodeVideoFrame() and
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 5c7e4d673989..07767a549bb1 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -68,17 +68,17 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 #define BUFFERING_MIN_RATE 50000
 #define BUFFERING_RATE(x) ((x)< BUFFERING_MIN_RATE ? BUFFERING_MIN_RATE : (x))
 
-// If audio queue has less than this many ms of decoded audio, we won't risk
+// If audio queue has less than this many usecs of decoded audio, we won't risk
 // trying to decode the video, we'll skip decoding video up to the next
 // keyframe. We may increase this value for an individual decoder if we
 // encounter video frames which take a long time to decode.
-static const PRUint32 LOW_AUDIO_MS = 300;
+static const PRUint32 LOW_AUDIO_USECS = 300000;
 
-// If more than this many ms of decoded audio is queued, we'll hold off
+// If more than this many usecs of decoded audio is queued, we'll hold off
 // decoding more audio. If we increase the low audio threshold (see
-// LOW_AUDIO_MS above) we'll also increase this value to ensure it's not
+// LOW_AUDIO_USECS above) we'll also increase this value to ensure it's not
 // less than the low audio threshold.
-const PRInt64 AMPLE_AUDIO_MS = 1000;
+const PRInt64 AMPLE_AUDIO_USECS = 1000000;
 
 // Maximum number of bytes we'll allocate and write at once to the audio
 // hardware when the audio stream contains missing samples and we're
@@ -98,9 +98,9 @@ static const PRUint32 LOW_VIDEO_FRAMES = 1;
 static const PRUint32 AMPLE_VIDEO_FRAMES = 10;
 
 // Arbitrary "frame duration" when playing only audio.
-static const int AUDIO_DURATION_MS = 40;
+static const int AUDIO_DURATION_USECS = 40000;
 
-// If we increase our "low audio threshold" (see LOW_AUDIO_MS above), we
+// If we increase our "low audio threshold" (see LOW_AUDIO_USECS above), we
 // use this as a factor in all our calculations. Increasing this will cause
 // us to be more likely to increase our low audio threshold, and to
 // increase it by more.
@@ -110,16 +110,16 @@ static const int THRESHOLD_FACTOR = 2;
 // ourselves to be running low on undecoded data. We determine how much
 // undecoded data we have remaining using the reader's GetBuffered()
 // implementation.
-static const PRInt64 LOW_DATA_THRESHOLD_MS = 5000;
+static const PRInt64 LOW_DATA_THRESHOLD_USECS = 5000000;
 
-// LOW_DATA_THRESHOLD_MS needs to be greater than AMPLE_AUDIO_MS, otherwise
+// LOW_DATA_THRESHOLD_USECS needs to be greater than AMPLE_AUDIO_USECS, otherwise
 // the skip-to-keyframe logic can activate when we're running low on data.
-PR_STATIC_ASSERT(LOW_DATA_THRESHOLD_MS > AMPLE_AUDIO_MS);
+PR_STATIC_ASSERT(LOW_DATA_THRESHOLD_USECS > AMPLE_AUDIO_USECS);
 
-// Amount of excess ms of data to add in to the "should we buffer" calculation.
-static const PRUint32 EXHAUSTED_DATA_MARGIN_MS = 60;
+// Amount of excess usecs of data to add in to the "should we buffer" calculation.
+static const PRUint32 EXHAUSTED_DATA_MARGIN_USECS = 60000;
 
-// If we enter buffering within QUICK_BUFFER_THRESHOLD_MS seconds of starting
+// If we enter buffering within QUICK_BUFFER_THRESHOLD_USECS seconds of starting
 // decoding, we'll enter "quick buffering" mode, which exits a lot sooner than
 // normal buffering mode. This exists so that if the decode-ahead exhausts the
 // downloaded data while decode/playback is just starting up (for example
@@ -128,24 +128,24 @@ static const PRUint32 EXHAUSTED_DATA_MARGIN_MS = 60;
 // for buffering. We may actually be able to playback in this case, so exit
 // buffering early and try to play. If it turns out we can't play, we'll fall
 // back to buffering normally.
-static const PRUint32 QUICK_BUFFER_THRESHOLD_MS = 2000;
+static const PRUint32 QUICK_BUFFER_THRESHOLD_USECS = 2000000;
 
 // If we're quick buffering, we'll remain in buffering mode while we have less than
-// QUICK_BUFFERING_LOW_DATA_MS of decoded data available.
-static const PRUint32 QUICK_BUFFERING_LOW_DATA_MS = 1000;
+// QUICK_BUFFERING_LOW_DATA_USECS of decoded data available.
+static const PRUint32 QUICK_BUFFERING_LOW_DATA_USECS = 1000000;
 
-// If QUICK_BUFFERING_LOW_DATA_MS is > AMPLE_AUDIO_MS, we won't exit
+// If QUICK_BUFFERING_LOW_DATA_USECS is > AMPLE_AUDIO_USECS, we won't exit
 // quick buffering in a timely fashion, as the decode pauses when it
-// reaches AMPLE_AUDIO_MS decoded data, and thus we'll never reach
-// QUICK_BUFFERING_LOW_DATA_MS.
-PR_STATIC_ASSERT(QUICK_BUFFERING_LOW_DATA_MS <= AMPLE_AUDIO_MS);
+// reaches AMPLE_AUDIO_USECS decoded data, and thus we'll never reach
+// QUICK_BUFFERING_LOW_DATA_USECS.
+PR_STATIC_ASSERT(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS);
 
-static TimeDuration MsToDuration(PRInt64 aMs) {
-  return TimeDuration::FromMilliseconds(static_cast<double>(aMs));
+static TimeDuration UsecsToDuration(PRInt64 aUsecs) {
+  return TimeDuration::FromMilliseconds(static_cast<double>(aUsecs) / USECS_PER_MS);
 }
 
-static PRInt64 DurationToMs(TimeDuration aDuration) {
-  return static_cast<PRInt64>(aDuration.ToSeconds() * 1000);
+static PRInt64 DurationToUsecs(TimeDuration aDuration) {
+  return static_cast<PRInt64>(aDuration.ToSeconds() * USECS_PER_S);
 }
 
 class nsAudioMetadataEventRunner : public nsRunnable
@@ -212,7 +212,7 @@ PRBool nsBuiltinDecoderStateMachine::HasFutureAudio() const {
   //    we've completely decoded all audio (but not finished playing it yet
   //    as per 1).
   return !mAudioCompleted &&
-         (AudioDecodedMs() > LOW_AUDIO_MS || mReader->mAudioQueue.IsFinished());
+         (AudioDecodedUsecs() > LOW_AUDIO_USECS || mReader->mAudioQueue.IsFinished());
 }
 
 PRBool nsBuiltinDecoderStateMachine::HaveNextFrameData() const {
@@ -250,19 +250,19 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
   // no longer be considered to be "pumping video".
   const unsigned videoPumpThreshold = AMPLE_VIDEO_FRAMES / 2;
 
-  // After the audio decode fills with more than audioPumpThresholdMs ms
+  // After the audio decode fills with more than audioPumpThreshold usecs
   // of decoded audio, we'll start to check whether the audio or video decode
   // is falling behind.
-  const unsigned audioPumpThresholdMs = LOW_AUDIO_MS * 2;
+  const unsigned audioPumpThreshold = LOW_AUDIO_USECS * 2;
 
   // Our local low audio threshold. We may increase this if we're slow to
   // decode video frames, in order to reduce the chance of audio underruns.
-  PRInt64 lowAudioThreshold = LOW_AUDIO_MS;
+  PRInt64 lowAudioThreshold = LOW_AUDIO_USECS;
 
   // Our local ample audio threshold. If we increase lowAudioThreshold, we'll
   // also increase this too appropriately (we don't want lowAudioThreshold to
   // be greater than ampleAudioThreshold, else we'd stop decoding!).
-  PRInt64 ampleAudioThreshold = AMPLE_AUDIO_MS;
+  PRInt64 ampleAudioThreshold = AMPLE_AUDIO_USECS;
 
   MediaQueue<VideoData>& videoQueue = mReader->mVideoQueue;
   MediaQueue<SoundData>& audioQueue = mReader->mAudioQueue;
@@ -289,7 +289,7 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     // We don't want to consider skipping to the next keyframe if we've
     // only just started up the decode loop, so wait until we've decoded
     // some audio data before enabling the keyframe skip logic on audio.
-    if (audioPump && GetDecodedAudioDuration() >= audioPumpThresholdMs) {
+    if (audioPump && GetDecodedAudioDuration() >= audioPumpThreshold) {
       audioPump = PR_FALSE;
     }
 
@@ -328,11 +328,11 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
         videoPlaying = mReader->DecodeVideoFrame(skipToNextKeyframe, currentTime);
         decodeTime = TimeStamp::Now() - start;
       }
-      if (THRESHOLD_FACTOR * DurationToMs(decodeTime) > lowAudioThreshold &&
+      if (THRESHOLD_FACTOR * DurationToUsecs(decodeTime) > lowAudioThreshold &&
           !HasLowUndecodedData())
       {
         lowAudioThreshold =
-          NS_MIN(THRESHOLD_FACTOR * DurationToMs(decodeTime), AMPLE_AUDIO_MS);
+          NS_MIN(THRESHOLD_FACTOR * DurationToUsecs(decodeTime), AMPLE_AUDIO_USECS);
         ampleAudioThreshold = NS_MAX(THRESHOLD_FACTOR * lowAudioThreshold,
                                      ampleAudioThreshold);
         LOG(PR_LOG_DEBUG,
@@ -474,7 +474,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
     // Calculate the number of samples that have been pushed onto the audio
     // hardware.
     PRInt64 playedSamples = 0;
-    if (!MsToSamples(audioStartTime, rate, playedSamples)) {
+    if (!UsecsToSamples(audioStartTime, rate, playedSamples)) {
       NS_WARNING("Int overflow converting playedSamples");
       break;
     }
@@ -486,7 +486,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
     // Calculate the timestamp of the next chunk of audio in numbers of
     // samples.
     PRInt64 sampleTime = 0;
-    if (!MsToSamples(s->mTime, rate, sampleTime)) {
+    if (!UsecsToSamples(s->mTime, rate, sampleTime)) {
       NS_WARNING("Int overflow converting sampleTime");
       break;
     }
@@ -509,18 +509,18 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
     }
     {
       MonitorAutoEnter mon(mDecoder->GetMonitor());
-      PRInt64 playedMs;
-      if (!SamplesToMs(audioDuration, rate, playedMs)) {
-        NS_WARNING("Int overflow calculating playedMs");
+      PRInt64 playedUsecs;
+      if (!SamplesToUsecs(audioDuration, rate, playedUsecs)) {
+        NS_WARNING("Int overflow calculating playedUsecs");
         break;
       }
-      if (!AddOverflow(audioStartTime, playedMs, mAudioEndTime)) {
+      if (!AddOverflow(audioStartTime, playedUsecs, mAudioEndTime)) {
         NS_WARNING("Int overflow calculating audio end time");
         break;
       }
 
       PRInt64 audioAhead = mAudioEndTime - GetMediaTime();
-      if (audioAhead > AMPLE_AUDIO_MS &&
+      if (audioAhead > AMPLE_AUDIO_USECS &&
           audioDuration - samplesAtLastSleep > minWriteSamples)
       {
         samplesAtLastSleep = audioDuration;
@@ -528,7 +528,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
         // significant amount ahead of the playback position. The decode
         // thread will be going to sleep, so we won't get any new samples
         // anyway, so sleep until we need to push to the hardware again.
-        Wait(AMPLE_AUDIO_MS / 2);
+        Wait(AMPLE_AUDIO_USECS / 2);
         // Kick the decode thread; since above we only do a NotifyAll when
         // we pop an audio chunk of the queue, the decoder won't wake up if
         // we've got no more decoded chunks to push to the hardware. We can
@@ -559,8 +559,8 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
                mState != DECODER_STATE_SEEKING &&
                mState != DECODER_STATE_SHUTDOWN)
         {
-          const PRInt64 DRAIN_BLOCK_MS = 100;
-          Wait(NS_MIN(mAudioEndTime - position, DRAIN_BLOCK_MS));
+          const PRInt64 DRAIN_BLOCK_USECS = 100000;
+          Wait(NS_MIN(mAudioEndTime - position, DRAIN_BLOCK_USECS));
           oldPosition = position;
           position = GetMediaTime();
         }
@@ -683,7 +683,7 @@ void nsBuiltinDecoderStateMachine::StopPlayback(eStopMode aMode)
   // audio thread can block in the write, and we deadlock trying to acquire
   // the audio monitor upon resume playback.
   if (IsPlaying()) {
-    mPlayDuration += TimeStamp::Now() - mPlayStartTime;
+    mPlayDuration += DurationToUsecs(TimeStamp::Now() - mPlayStartTime);
     mPlayStartTime = TimeStamp();
   }
   if (HasAudio()) {
@@ -799,7 +799,7 @@ double nsBuiltinDecoderStateMachine::GetCurrentTime() const
                OnDecodeThread(),
                "Should be on main, decode, or state machine thread.");
 
-  return static_cast<double>(mCurrentFrameTime) / 1000.0;
+  return static_cast<double>(mCurrentFrameTime) / static_cast<double>(USECS_PER_S);
 }
 
 PRInt64 nsBuiltinDecoderStateMachine::GetDuration()
@@ -893,7 +893,7 @@ void nsBuiltinDecoderStateMachine::Seek(double aTime)
                "We shouldn't already be seeking");
   NS_ASSERTION(mState >= DECODER_STATE_DECODING,
                "We should have loaded metadata");
-  double t = aTime * 1000.0;
+  double t = aTime * static_cast<double>(USECS_PER_S);
   if (t > PR_INT64_MAX) {
     // Prevent integer overflow.
     return;
@@ -965,10 +965,10 @@ nsBuiltinDecoderStateMachine::StartDecodeThreads()
   return NS_OK;
 }
 
-PRInt64 nsBuiltinDecoderStateMachine::AudioDecodedMs() const
+PRInt64 nsBuiltinDecoderStateMachine::AudioDecodedUsecs() const
 {
   NS_ASSERTION(HasAudio(),
-               "Should only call AudioDecodedMs() when we have audio");
+               "Should only call AudioDecodedUsecs() when we have audio");
   // The amount of audio we have decoded is the amount of audio data we've
   // already decoded and pushed to the hardware, plus the amount of audio
   // data waiting to be pushed to the hardware.
@@ -976,7 +976,7 @@ PRInt64 nsBuiltinDecoderStateMachine::AudioDecodedMs() const
   return pushed + mReader->mAudioQueue.Duration();
 }
 
-PRBool nsBuiltinDecoderStateMachine::HasLowDecodedData(PRInt64 aAudioMs) const
+PRBool nsBuiltinDecoderStateMachine::HasLowDecodedData(PRInt64 aAudioUsecs) const
 {
   mDecoder->GetMonitor().AssertCurrentThreadIn();
   // We consider ourselves low on decoded data if we're low on audio,
@@ -985,7 +985,7 @@ PRBool nsBuiltinDecoderStateMachine::HasLowDecodedData(PRInt64 aAudioMs) const
   // we've not decoded to the end of the video stream.
   return ((HasAudio() &&
            !mReader->mAudioQueue.IsFinished() &&
-           AudioDecodedMs() < aAudioMs)
+           AudioDecodedUsecs() < aAudioUsecs)
           ||
          (!HasAudio() &&
           HasVideo() &&
@@ -995,7 +995,7 @@ PRBool nsBuiltinDecoderStateMachine::HasLowDecodedData(PRInt64 aAudioMs) const
 
 PRBool nsBuiltinDecoderStateMachine::HasLowUndecodedData() const
 {
-  return GetUndecodedData() < LOW_DATA_THRESHOLD_MS;
+  return GetUndecodedData() < LOW_DATA_THRESHOLD_USECS;
 }
 
 PRInt64 nsBuiltinDecoderStateMachine::GetUndecodedData() const
@@ -1084,7 +1084,7 @@ nsresult nsBuiltinDecoderStateMachine::Run()
                      !mSeekable || mEndTime != -1,
                      "Active seekable media should have end time");
         NS_ASSERTION(!mSeekable || GetDuration() != -1, "Seekable media should have duration");
-        LOG(PR_LOG_DEBUG, ("%p Media goes from %lldms to %lldms (duration %lldms) seekable=%d",
+        LOG(PR_LOG_DEBUG, ("%p Media goes from %lld to %lld (duration %lld) seekable=%d",
                            mDecoder, mStartTime, mEndTime, GetDuration(), mSeekable));
 
         if (mState == DECODER_STATE_SHUTDOWN)
@@ -1187,7 +1187,7 @@ nsresult nsBuiltinDecoderStateMachine::Run()
                          "Seek target should lie inside the first audio block after seek");
             PRInt64 startTime = (audio && audio->mTime < seekTime) ? audio->mTime : seekTime;
             mAudioStartTime = startTime;
-            mPlayDuration = MsToDuration(startTime - mStartTime);
+            mPlayDuration = startTime - mStartTime;
             if (HasVideo()) {
               nsAutoPtr<VideoData> video(mReader->mVideoQueue.PeekFront());
               if (video) {
@@ -1220,12 +1220,12 @@ nsresult nsBuiltinDecoderStateMachine::Run()
         
         nsCOMPtr<nsIRunnable> stopEvent;
         if (GetMediaTime() == mEndTime) {
-          LOG(PR_LOG_DEBUG, ("%p Changed state from SEEKING (to %lldms) to COMPLETED",
+          LOG(PR_LOG_DEBUG, ("%p Changed state from SEEKING (to %lld) to COMPLETED",
                              mDecoder, seekTime));
           stopEvent = NS_NewRunnableMethod(mDecoder, &nsBuiltinDecoder::SeekingStoppedAtEnd);
           mState = DECODER_STATE_COMPLETED;
         } else {
-          LOG(PR_LOG_DEBUG, ("%p Changed state from SEEKING (to %lldms) to DECODING",
+          LOG(PR_LOG_DEBUG, ("%p Changed state from SEEKING (to %lld) to DECODING",
                              mDecoder, seekTime));
           stopEvent = NS_NewRunnableMethod(mDecoder, &nsBuiltinDecoder::SeekingStopped);
           StartDecoding();
@@ -1261,18 +1261,18 @@ nsresult nsBuiltinDecoderStateMachine::Run()
         PRBool isLiveStream = mDecoder->GetCurrentStream()->GetLength() == -1;
         if ((isLiveStream || !mDecoder->CanPlayThrough()) &&
              elapsed < TimeDuration::FromSeconds(BUFFERING_WAIT) &&
-             (mQuickBuffering ? HasLowDecodedData(QUICK_BUFFERING_LOW_DATA_MS)
-                              : (GetUndecodedData() < BUFFERING_WAIT * 1000)) &&
+             (mQuickBuffering ? HasLowDecodedData(QUICK_BUFFERING_LOW_DATA_USECS)
+                              : (GetUndecodedData() < BUFFERING_WAIT * USECS_PER_S)) &&
              !stream->IsDataCachedToEndOfStream(mDecoder->mDecoderPosition) &&
              !stream->IsSuspended())
         {
           LOG(PR_LOG_DEBUG,
               ("Buffering: %.3lfs/%ds, timeout in %.3lfs %s",
-               GetUndecodedData() / 1000.0,
+               GetUndecodedData() / static_cast<double>(USECS_PER_S),
                BUFFERING_WAIT,
                BUFFERING_WAIT - elapsed.ToSeconds(),
                (mQuickBuffering ? "(quick exit)" : "")));
-          Wait(1000);
+          Wait(USECS_PER_S);
           if (mState == DECODER_STATE_SHUTDOWN)
             continue;
         } else {
@@ -1395,7 +1395,7 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
       // audio clock. Just wait and then return, to give the audio clock time
       // to tick.  This should really wait for a specific signal from the audio
       // thread rather than polling after a sleep.  See bug 568431 comment 4.
-      Wait(AUDIO_DURATION_MS);
+      Wait(AUDIO_DURATION_USECS);
       return;
     }
 
@@ -1404,18 +1404,18 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
     // audio, or don't have audio, use the system clock.
     PRInt64 clock_time = -1;
     if (!IsPlaying()) {
-      clock_time = DurationToMs(mPlayDuration) + mStartTime;
+      clock_time = mPlayDuration + mStartTime;
     } else {
       PRInt64 audio_time = GetAudioClock();
       if (HasAudio() && !mAudioCompleted && audio_time != -1) {
         clock_time = audio_time;
         // Resync against the audio clock, while we're trusting the
         // audio clock. This ensures no "drift", particularly on Linux.
-        mPlayDuration = MsToDuration(clock_time - mStartTime);
+        mPlayDuration = clock_time - mStartTime;
         mPlayStartTime = TimeStamp::Now();
       } else {
         // Sound is disabled on this system. Sync to the system clock.
-        clock_time = DurationToMs(TimeStamp::Now() - mPlayStartTime + mPlayDuration);
+        clock_time = DurationToUsecs(TimeStamp::Now() - mPlayStartTime) + mPlayDuration;
         // Ensure the clock can never go backwards.
         NS_ASSERTION(mCurrentFrameTime <= clock_time, "Clock should go forwards");
         clock_time = NS_MAX(mCurrentFrameTime, clock_time) + mStartTime;
@@ -1424,7 +1424,7 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
 
     // Skip frames up to the frame at the playback position, and figure out
     // the time remaining until it's time to display the next frame.
-    PRInt64 remainingTime = AUDIO_DURATION_MS;
+    PRInt64 remainingTime = AUDIO_DURATION_USECS;
     NS_ASSERTION(clock_time >= mStartTime, "Should have positive clock time.");
     nsAutoPtr<VideoData> currentFrame;
     if (mReader->mVideoQueue.GetSize() > 0) {
@@ -1442,8 +1442,8 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
       // present the next frame.
       if (frame && !currentFrame) {
         PRInt64 now = IsPlaying()
-          ? DurationToMs(TimeStamp::Now() - mPlayStartTime + mPlayDuration)
-          : DurationToMs(mPlayDuration);
+          ? (DurationToUsecs(TimeStamp::Now() - mPlayStartTime) + mPlayDuration)
+          : mPlayDuration;
         remainingTime = frame->mTime - mStartTime - now;
       }
     }
@@ -1453,7 +1453,7 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
     nsMediaStream* stream = mDecoder->GetCurrentStream();
     if (mState == DECODER_STATE_DECODING &&
         mDecoder->GetState() == nsBuiltinDecoder::PLAY_STATE_PLAYING &&
-        HasLowDecodedData(remainingTime + EXHAUSTED_DATA_MARGIN_MS) &&
+        HasLowDecodedData(remainingTime + EXHAUSTED_DATA_MARGIN_USECS) &&
         !stream->IsDataCachedToEndOfStream(mDecoder->mDecoderPosition) &&
         !stream->IsSuspended() &&
         (JustExitedQuickBuffering() || HasLowUndecodedData()))
@@ -1474,8 +1474,8 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
 
     if (currentFrame) {
       // Decode one frame and display it.
-      TimeStamp presTime = mPlayStartTime - mPlayDuration +
-                           MsToDuration(currentFrame->mTime - mStartTime);
+      TimeStamp presTime = mPlayStartTime - UsecsToDuration(mPlayDuration) +
+                           UsecsToDuration(currentFrame->mTime - mStartTime);
       NS_ASSERTION(currentFrame->mTime >= mStartTime, "Should have positive frame time");
       {
         nsIntSize display = mInfo.mDisplay;
@@ -1488,7 +1488,7 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
         }
       }
       mDecoder->GetFrameStatistics().NotifyPresentedFrame();
-      PRInt64 now = DurationToMs(TimeStamp::Now() - mPlayStartTime + mPlayDuration);
+      PRInt64 now = DurationToUsecs(TimeStamp::Now() - mPlayStartTime) + mPlayDuration;
       remainingTime = currentFrame->mEndTime - mStartTime - now;
       currentFrame = nsnull;
     }
@@ -1534,9 +1534,9 @@ void nsBuiltinDecoderStateMachine::AdvanceFrame()
   }
 }
 
-void nsBuiltinDecoderStateMachine::Wait(PRInt64 aMs) {
+void nsBuiltinDecoderStateMachine::Wait(PRInt64 aUsecs) {
   mDecoder->GetMonitor().AssertCurrentThreadIn();
-  TimeStamp end = TimeStamp::Now() + MsToDuration(aMs);
+  TimeStamp end = TimeStamp::Now() + UsecsToDuration(aUsecs);
   TimeStamp now;
   while ((now = TimeStamp::Now()) < end &&
          mState != DECODER_STATE_SHUTDOWN &&
@@ -1546,8 +1546,6 @@ void nsBuiltinDecoderStateMachine::Wait(PRInt64 aMs) {
     if (ms == 0 || ms > PR_UINT32_MAX) {
       break;
     }
-    NS_ASSERTION(ms <= aMs && ms > 0,
-                 "nsBuiltinDecoderStateMachine::Wait interval very wrong!");
     mDecoder->GetMonitor().Wait(PR_MillisecondsToInterval(static_cast<PRUint32>(ms)));
   }
 }
@@ -1579,7 +1577,7 @@ VideoData* nsBuiltinDecoderStateMachine::FindStartTime()
   // first acutal audio sample we have, we'll inject silence during playback
   // to ensure the audio starts at the correct time.
   mAudioStartTime = mStartTime;
-  LOG(PR_LOG_DEBUG, ("%p Media start time is %lldms", mDecoder, mStartTime));
+  LOG(PR_LOG_DEBUG, ("%p Media start time is %lld", mDecoder, mStartTime));
   return v;
 }
 
@@ -1604,7 +1602,7 @@ void nsBuiltinDecoderStateMachine::FindEndTime()
     mEndTime = endTime;
   }
 
-  LOG(PR_LOG_DEBUG, ("%p Media end time is %lldms", mDecoder, mEndTime));   
+  LOG(PR_LOG_DEBUG, ("%p Media end time is %lld", mDecoder, mEndTime));   
 }
 
 void nsBuiltinDecoderStateMachine::UpdateReadyState() {
@@ -1658,7 +1656,7 @@ PRBool nsBuiltinDecoderStateMachine::JustExitedQuickBuffering()
 {
   return !mDecodeStartTime.IsNull() &&
     mQuickBuffering &&
-    (TimeStamp::Now() - mDecodeStartTime) < TimeDuration::FromSeconds(QUICK_BUFFER_THRESHOLD_MS);
+    (TimeStamp::Now() - mDecodeStartTime) < TimeDuration::FromSeconds(QUICK_BUFFER_THRESHOLD_USECS);
 }
 
 void nsBuiltinDecoderStateMachine::StartBuffering()
@@ -1671,7 +1669,7 @@ void nsBuiltinDecoderStateMachine::StartBuffering()
   // when the download speed is similar to the decode speed.
   mQuickBuffering =
     !JustExitedQuickBuffering() &&
-    decodeDuration < TimeDuration::FromMilliseconds(QUICK_BUFFER_THRESHOLD_MS);
+    decodeDuration < UsecsToDuration(QUICK_BUFFER_THRESHOLD_USECS);
   mBufferingStart = TimeStamp::Now();
 
   // We need to tell the element that buffering has started.
diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
index c168e8f57192..6421c58b4498 100644
--- a/content/media/nsBuiltinDecoderStateMachine.h
+++ b/content/media/nsBuiltinDecoderStateMachine.h
@@ -253,23 +253,23 @@ public:
 
 protected:
 
-  // Returns PR_TRUE if we'v got less than aAudioMs ms of decoded and playable
-  // data. The decoder monitor must be held.
-  PRBool HasLowDecodedData(PRInt64 aAudioMs) const;
+  // Returns PR_TRUE if we've got less than aAudioUsecs microseconds of decoded
+  // and playable data. The decoder monitor must be held.
+  PRBool HasLowDecodedData(PRInt64 aAudioUsecs) const;
 
   // Returns PR_TRUE if we're running low on data which is not yet decoded.
   // The decoder monitor must be held.
   PRBool HasLowUndecodedData() const;
 
-  // Returns the number of milliseconds of undecoded data available for
+  // Returns the number of microseconds of undecoded data available for
   // decoding. The decoder monitor must be held.
   PRInt64 GetUndecodedData() const;
 
-  // Returns the number of unplayed ms of audio we've got decoded and/or
+  // Returns the number of unplayed usecs of audio we've got decoded and/or
   // pushed to the hardware waiting to play. This is how much audio we can
   // play without having to run the audio decoder. The decoder monitor
   // must be held.
-  PRInt64 AudioDecodedMs() const;
+  PRInt64 AudioDecodedUsecs() const;
 
   // Returns PR_TRUE when there's decoded audio waiting to play.
   // The decoder monitor must be held.
@@ -278,13 +278,13 @@ protected:
   // Returns PR_TRUE if we recently exited "quick buffering" mode.
   PRBool JustExitedQuickBuffering();
 
-  // Waits on the decoder Monitor for aMs. If the decoder monitor is awoken
-  // by a Notify() call, we'll continue waiting, unless we've moved into
-  // shutdown state. This enables us to ensure that we wait for a specified
-  // time, and that the myriad of Notify()s we do an the decoder monitor
-  // don't cause the audio thread to be starved. The decoder monitor must
-  // be locked.
-  void Wait(PRInt64 aMs);
+  // Waits on the decoder Monitor for aUsecs microseconds. If the decoder
+  // monitor is awoken by a Notify() call, we'll continue waiting, unless
+  // we've moved into shutdown state. This enables us to ensure that we
+  // wait for a specified time, and that the myriad of Notify()s we do an
+  // the decoder monitor don't cause the audio thread to be starved. The
+  // decoder monitor must be locked.
+  void Wait(PRInt64 aUsecs);
 
   // Dispatches an asynchronous event to update the media element's ready state.
   void UpdateReadyState();
@@ -334,7 +334,8 @@ protected:
   // hardware. This ensures that the playback position advances smoothly, and
   // guarantees that we don't try to allocate an impossibly large chunk of
   // memory in order to play back silence. Called on the audio thread.
-  PRUint32 PlaySilence(PRUint32 aSamples, PRUint32 aChannels,
+  PRUint32 PlaySilence(PRUint32 aSamples,
+                       PRUint32 aChannels,
                        PRUint64 aSampleOffset);
 
   // Pops an audio chunk from the front of the audio queue, and pushes its
@@ -392,9 +393,9 @@ protected:
     return mStartTime + mCurrentFrameTime;
   }
 
-  // Returns an upper bound on the number of milliseconds of audio that is
-  // decoded and playable. This is the sum of the number of ms of audio which
-  // is decoded and in the reader's audio queue, and the ms of unplayed audio
+  // Returns an upper bound on the number of microseconds of audio that is
+  // decoded and playable. This is the sum of the number of usecs of audio which
+  // is decoded and in the reader's audio queue, and the usecs of unplayed audio
   // which has been pushed to the audio hardware for playback. Note that after
   // calling this, the audio hardware may play some of the audio pushed to
   // hardware, so this can only be used as a upper bound. The decoder monitor
@@ -430,25 +431,25 @@ protected:
   // playback position is therefore |Now() - mPlayStartTime +
   // mPlayDuration|, which must be adjusted by mStartTime if used with media
   // timestamps.  Accessed only via the state machine thread.
-  TimeDuration mPlayDuration;
+  PRInt64 mPlayDuration;
 
   // Time that buffering started. Used for buffering timeout and only
   // accessed on the state machine thread. This is null while we're not
   // buffering.
   TimeStamp mBufferingStart;
 
-  // Start time of the media, in milliseconds. This is the presentation
+  // Start time of the media, in microseconds. This is the presentation
   // time of the first sample decoded from the media, and is used to calculate
   // duration and as a bounds for seeking. Accessed on state machine and
   // main thread. Access controlled by decoder monitor.
   PRInt64 mStartTime;
 
-  // Time of the last page in the media, in milliseconds. This is the
+  // Time of the last page in the media, in microseconds. This is the
   // end time of the last sample in the media. Accessed on state
   // machine and main thread. Access controlled by decoder monitor.
   PRInt64 mEndTime;
 
-  // Position to seek to in milliseconds when the seek state transition occurs.
+  // Position to seek to in microseconds when the seek state transition occurs.
   // The decoder monitor lock must be obtained before reading or writing
   // this value. Accessed on main and state machine thread.
   PRInt64 mSeekTime;
@@ -463,24 +464,25 @@ protected:
   // in the play state machine's destructor.
   nsAutoPtr<nsBuiltinDecoderReader> mReader;
 
-  // The time of the current frame in milliseconds. This is referenced from
+  // The time of the current frame in microseconds. This is referenced from
   // 0 which is the initial playback position. Set by the state machine
   // thread, and read-only from the main thread to get the current
   // time value. Synchronised via decoder monitor.
   PRInt64 mCurrentFrameTime;
 
-  // The presentation time of the first audio sample that was played. We can
-  // add this to the audio stream position to determine the current audio time.
-  // Accessed on audio and state machine thread. Synchronized by decoder monitor.
+  // The presentation time of the first audio sample that was played in
+  // microseconds. We can add this to the audio stream position to determine
+  // the current audio time. Accessed on audio and state machine thread.
+  // Synchronized by decoder monitor.
   PRInt64 mAudioStartTime;
 
   // The end time of the last audio sample that's been pushed onto the audio
-  // hardware. This will approximately be the end time of the audio stream,
-  // unless another sample is pushed to the hardware.
+  // hardware in microseconds. This will approximately be the end time of the
+  // audio stream, unless another sample is pushed to the hardware.
   PRInt64 mAudioEndTime;
 
-  // The presentation end time of the last video frame which has been displayed.
-  // Accessed from the state machine thread.
+  // The presentation end time of the last video frame which has been displayed
+  // in microseconds. Accessed from the state machine thread.
   PRInt64 mVideoFrameEndTime;
   
   // Volume of playback. 0.0 = muted. 1.0 = full volume. Read/Written
diff --git a/content/media/nsMediaCache.cpp b/content/media/nsMediaCache.cpp
index 19c53790df1b..0d04abb0077d 100644
--- a/content/media/nsMediaCache.cpp
+++ b/content/media/nsMediaCache.cpp
@@ -740,7 +740,7 @@ static PRInt32 GetMaxBlocks()
   // to the pref are applied.
   // Cache size is in KB
   PRInt32 cacheSize = nsContentUtils::GetIntPref("media.cache_size", 500*1024);
-  PRInt64 maxBlocks = PRInt64(cacheSize)*1024/nsMediaCache::BLOCK_SIZE;
+  PRInt64 maxBlocks = static_cast<PRInt64>(cacheSize)*1024/nsMediaCache::BLOCK_SIZE;
   maxBlocks = PR_MAX(maxBlocks, 1);
   return PRInt32(PR_MIN(maxBlocks, PR_INT32_MAX));
 }
@@ -1032,7 +1032,7 @@ nsMediaCache::PredictNextUse(TimeStamp aNow, PRInt32 aBlock)
     case PLAYED_BLOCK:
       // This block should be managed in LRU mode, and we should impose
       // a "replay delay" to reflect the likelihood of replay happening
-      NS_ASSERTION(PRInt64(bo->mStreamBlock)*BLOCK_SIZE <
+      NS_ASSERTION(static_cast<PRInt64>(bo->mStreamBlock)*BLOCK_SIZE <
                    bo->mStream->mStreamOffset,
                    "Played block after the current stream position?");
       prediction = aNow - bo->mLastUseTime +
@@ -1040,7 +1040,7 @@ nsMediaCache::PredictNextUse(TimeStamp aNow, PRInt32 aBlock)
       break;
     case READAHEAD_BLOCK: {
       PRInt64 bytesAhead =
-        PRInt64(bo->mStreamBlock)*BLOCK_SIZE - bo->mStream->mStreamOffset;
+        static_cast<PRInt64>(bo->mStreamBlock)*BLOCK_SIZE - bo->mStream->mStreamOffset;
       NS_ASSERTION(bytesAhead >= 0,
                    "Readahead block before the current stream position?");
       PRInt64 millisecondsAhead =
diff --git a/content/media/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
index 6e2d7cefdb9c..7187c35a1e69 100644
--- a/content/media/nsMediaDecoder.h
+++ b/content/media/nsMediaDecoder.h
@@ -282,10 +282,10 @@ public:
   // Return the frame decode/paint related statistics.
   FrameStatistics& GetFrameStatistics() { return mFrameStats; }
 
-  // Set the duration of the media resource in units of milliseconds.
+  // Set the duration of the media resource in units of seconds.
   // This is called via a channel listener if it can pick up the duration
   // from a content header. Must be called from the main thread only.
-  virtual void SetDuration(PRInt64 aDuration) = 0;
+  virtual void SetDuration(double aDuration) = 0;
 
   // Set a flag indicating whether seeking is supported
   virtual void SetSeekable(PRBool aSeekable) = 0;
diff --git a/content/media/nsMediaStream.cpp b/content/media/nsMediaStream.cpp
index ba434354fb60..04f7da0ad55d 100644
--- a/content/media/nsMediaStream.cpp
+++ b/content/media/nsMediaStream.cpp
@@ -222,7 +222,7 @@ nsMediaChannelStream::OnStartRequest(nsIRequest* aRequest)
       if (NS_SUCCEEDED(rv)) {
         double duration = durationText.ToDouble(&ec);
         if (ec == NS_OK && duration >= 0) {
-          mDecoder->SetDuration(PRInt64(NS_round(duration*1000)));
+          mDecoder->SetDuration(duration);
         }
       }
     }
diff --git a/content/media/nsMediaStream.h b/content/media/nsMediaStream.h
index 0f0b7be893e9..544461ed0cbd 100644
--- a/content/media/nsMediaStream.h
+++ b/content/media/nsMediaStream.h
@@ -107,7 +107,7 @@ public:
     *aReliable = seconds >= 1.0;
     if (seconds <= 0.0)
       return 0.0;
-    return double(mAccumulatedBytes)/seconds;
+    return static_cast<double>(mAccumulatedBytes)/seconds;
   }
   double GetRate(TimeStamp aNow, PRPackedBool* aReliable) {
     TimeDuration time = mAccumulatedTime;
@@ -118,7 +118,7 @@ public:
     *aReliable = seconds >= 3.0;
     if (seconds <= 0.0)
       return 0.0;
-    return double(mAccumulatedBytes)/seconds;
+    return static_cast<double>(mAccumulatedBytes)/seconds;
   }
 private:
   PRInt64      mAccumulatedBytes;
diff --git a/content/media/ogg/nsOggCodecState.cpp b/content/media/ogg/nsOggCodecState.cpp
index 02c27ab0a409..ef62b915ab0d 100644
--- a/content/media/ogg/nsOggCodecState.cpp
+++ b/content/media/ogg/nsOggCodecState.cpp
@@ -126,7 +126,6 @@ nsTheoraState::nsTheoraState(ogg_page* aBosPage) :
   nsOggCodecState(aBosPage),
   mSetup(0),
   mCtx(0),
-  mFrameDuration(0),
   mPixelAspectRatio(0)
 {
   MOZ_COUNT_CTOR(nsTheoraState);
@@ -146,22 +145,9 @@ PRBool nsTheoraState::Init() {
   if (!mActive)
     return PR_FALSE;
 
-  PRInt64 n = mInfo.fps_numerator;
-  PRInt64 d = mInfo.fps_denominator;
+  PRInt64 n = mInfo.aspect_numerator;
+  PRInt64 d = mInfo.aspect_denominator;
 
-  PRInt64 f;
-  if (!MulOverflow(1000, d, f)) {
-    return mActive = PR_FALSE;
-  }
-  f /= n;
-  if (f > PR_UINT32_MAX) {
-    return mActive = PR_FALSE;
-  }
-  mFrameDuration = static_cast<PRUint32>(f);
-
-  n = mInfo.aspect_numerator;
-
-  d = mInfo.aspect_denominator;
   mPixelAspectRatio = (n == 0 || d == 0) ?
     1.0f : static_cast<float>(n) / static_cast<float>(d);
 
@@ -244,7 +230,7 @@ PRInt64 nsTheoraState::Time(th_info* aInfo, PRInt64 aGranulepos)
   PRInt64 frameno = iframe + pframe - TH_VERSION_CHECK(aInfo, 3, 2, 1);
   if (!AddOverflow(frameno, 1, t))
     return -1;
-  if (!MulOverflow(t, 1000, t))
+  if (!MulOverflow(t, USECS_PER_S, t))
     return -1;
   if (!MulOverflow(t, aInfo->fps_denominator, t))
     return -1;
@@ -257,7 +243,7 @@ PRInt64 nsTheoraState::StartTime(PRInt64 granulepos) {
   }
   PRInt64 t = 0;
   PRInt64 frameno = th_granule_frame(mCtx, granulepos);
-  if (!MulOverflow(frameno, 1000, t))
+  if (!MulOverflow(frameno, USECS_PER_S, t))
     return -1;
   if (!MulOverflow(t, mInfo.fps_denominator, t))
     return -1;
@@ -267,25 +253,22 @@ PRInt64 nsTheoraState::StartTime(PRInt64 granulepos) {
 PRInt64
 nsTheoraState::MaxKeyframeOffset()
 {
-  // Determine the maximum time in milliseconds by which a key frame could
+  // Determine the maximum time in microseconds by which a key frame could
   // offset for the theora bitstream. Theora granulepos encode time as:
   // ((key_frame_number << granule_shift) + frame_offset).
   // Therefore the maximum possible time by which any frame could be offset
   // from a keyframe is the duration of (1 << granule_shift) - 1) frames.
   PRInt64 frameDuration;
-  PRInt64 keyframeDiff;
-
-  PRInt64 shift = mInfo.keyframe_granule_shift;
-
+  
   // Max number of frames keyframe could possibly be offset.
-  keyframeDiff = (1 << shift) - 1;
+  PRInt64 keyframeDiff = (1 << mInfo.keyframe_granule_shift) - 1;
 
-  // Length of frame in ms.
+  // Length of frame in usecs.
   PRInt64 d = 0; // d will be 0 if multiplication overflows.
-  MulOverflow(1000, mInfo.fps_denominator, d);
+  MulOverflow(USECS_PER_S, mInfo.fps_denominator, d);
   frameDuration = d / mInfo.fps_numerator;
 
-  // Total time in ms keyframe can be offset from any given frame.
+  // Total time in usecs keyframe can be offset from any given frame.
   return frameDuration * keyframeDiff;
 }
 
@@ -390,7 +373,7 @@ PRInt64 nsVorbisState::Time(vorbis_info* aInfo, PRInt64 aGranulepos)
     return -1;
   }
   PRInt64 t = 0;
-  MulOverflow(1000, aGranulepos, t);
+  MulOverflow(USECS_PER_S, aGranulepos, t);
   return t / aInfo->rate;
 }
 
@@ -522,7 +505,7 @@ PRBool nsSkeletonState::DecodeIndex(ogg_packet* aPacket)
   // Extract the start time.
   n = LEInt64(p + INDEX_FIRST_NUMER_OFFSET);
   PRInt64 t;
-  if (!MulOverflow(n, 1000, t)) {
+  if (!MulOverflow(n, USECS_PER_S, t)) {
     return (mActive = PR_FALSE);
   } else {
     startTime = t / timeDenom;
@@ -530,7 +513,7 @@ PRBool nsSkeletonState::DecodeIndex(ogg_packet* aPacket)
 
   // Extract the end time.
   n = LEInt64(p + INDEX_LAST_NUMER_OFFSET);
-  if (!MulOverflow(n, 1000, t)) {
+  if (!MulOverflow(n, USECS_PER_S, t)) {
     return (mActive = PR_FALSE);
   } else {
     endTime = t / timeDenom;
@@ -590,11 +573,11 @@ PRBool nsSkeletonState::DecodeIndex(ogg_packet* aPacket)
     {
       return (mActive = PR_FALSE);
     }
-    PRInt64 timeMs = 0;
-    if (!MulOverflow(time, 1000, timeMs))
+    PRInt64 timeUsecs = 0;
+    if (!MulOverflow(time, USECS_PER_S, timeUsecs))
       return mActive = PR_FALSE;
-    timeMs /= timeDenom;
-    keyPoints->Add(offset, timeMs);
+    timeUsecs /= timeDenom;
+    keyPoints->Add(offset, timeUsecs);
     numKeyPointsRead++;
   }
 
@@ -713,7 +696,7 @@ PRBool nsSkeletonState::DecodeHeader(ogg_packet* aPacket)
     // presentation time exists in all versions.
     PRInt64 n = LEInt64(aPacket->packet + SKELETON_PRESENTATION_TIME_NUMERATOR_OFFSET);
     PRInt64 d = LEInt64(aPacket->packet + SKELETON_PRESENTATION_TIME_DENOMINATOR_OFFSET);
-    mPresentationTime = d == 0 ? 0 : (static_cast<float>(n) / static_cast<float>(d)) * 1000;
+    mPresentationTime = d == 0 ? 0 : (static_cast<float>(n) / static_cast<float>(d)) * USECS_PER_S;
 
     mVersion = SKELETON_VERSION(verMajor, verMinor);
     if (mVersion < SKELETON_VERSION(4,0) ||
diff --git a/content/media/ogg/nsOggCodecState.h b/content/media/ogg/nsOggCodecState.h
index e45ff33eb559..20121cec57da 100644
--- a/content/media/ogg/nsOggCodecState.h
+++ b/content/media/ogg/nsOggCodecState.h
@@ -183,7 +183,7 @@ public:
   virtual PRInt64 StartTime(PRInt64 granulepos);
   virtual PRBool Init();
 
-  // Returns the maximum number of milliseconds which a keyframe can be offset
+  // Returns the maximum number of microseconds which a keyframe can be offset
   // from any given interframe.
   PRInt64 MaxKeyframeOffset();
 
@@ -195,9 +195,6 @@ public:
   th_setup_info *mSetup;
   th_dec_ctx* mCtx;
 
-  // Frame duration in ms.
-  PRUint32 mFrameDuration;
-
   float mPixelAspectRatio;
 };
 
@@ -233,7 +230,7 @@ public:
     // Offset from start of segment/link-in-the-chain in bytes.
     PRInt64 mOffset;
 
-    // Presentation time in ms.
+    // Presentation time in usecs.
     PRInt64 mTime;
 
     PRBool IsNull() {
@@ -320,10 +317,10 @@ private:
       return mKeyPoints.Length();
     }
 
-    // Presentation time of the first sample in this stream in ms.
+    // Presentation time of the first sample in this stream in usecs.
     const PRInt64 mStartTime;
 
-    // End time of the last sample in this stream in ms.
+    // End time of the last sample in this stream in usecs.
     const PRInt64 mEndTime;
 
   private:
diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index e7eddc23b0a4..34cb78b15dfe 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -68,15 +68,15 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 // position, we'll just decode forwards rather than performing a bisection
 // search. If we have Theora video we use the maximum keyframe interval as
 // this value, rather than SEEK_DECODE_MARGIN. This makes small seeks faster.
-#define SEEK_DECODE_MARGIN 2000
+#define SEEK_DECODE_MARGIN 2000000
 
-// The number of milliseconds of "fuzz" we use in a bisection search over
+// The number of microseconds of "fuzz" we use in a bisection search over
 // HTTP. When we're seeking with fuzz, we'll stop the search if a bisection
-// lands between the seek target and SEEK_FUZZ_MS milliseconds before the
+// lands between the seek target and SEEK_FUZZ_USECS microseconds before the
 // seek target.  This is becaue it's usually quicker to just keep downloading
 // from an exisiting connection than to do another bisection inside that
 // small range, which would open a new HTTP connetion.
-#define SEEK_FUZZ_MS 500
+#define SEEK_FUZZ_USECS 500000
 
 enum PageSyncResult {
   PAGE_SYNC_ERROR = 1,
@@ -390,8 +390,7 @@ nsresult nsOggReader::DecodeVorbis(nsTArray<nsAutoPtr<SoundData> >& aChunks,
     }
 
     PRInt64 duration = mVorbisState->Time((PRInt64)samples);
-    PRInt64 startTime = (mVorbisGranulepos != -1) ?
-      mVorbisState->Time(mVorbisGranulepos) : -1;
+    PRInt64 startTime = mVorbisState->Time(mVorbisGranulepos);
     SoundData* s = new SoundData(mPageOffset,
                                  startTime,
                                  duration,
@@ -544,9 +543,8 @@ nsresult nsOggReader::DecodeTheora(nsTArray<nsAutoPtr<VideoData> >& aFrames,
   if (ret != 0 && ret != TH_DUPFRAME) {
     return NS_ERROR_FAILURE;
   }
-  PRInt64 time = (aPacket->granulepos != -1)
-    ? mTheoraState->StartTime(aPacket->granulepos) : -1;
-  PRInt64 endTime = time != -1 ? time + mTheoraState->mFrameDuration : -1;
+  PRInt64 time = mTheoraState->StartTime(aPacket->granulepos);
+  PRInt64 endTime = mTheoraState->Time(aPacket->granulepos);
   if (ret == TH_DUPFRAME) {
     VideoData* v = VideoData::CreateDuplicate(mPageOffset,
                                               time,
@@ -704,7 +702,7 @@ PRBool nsOggReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
                      "Granulepos calculation is incorrect!");
 
         frames[i]->mTime = mTheoraState->StartTime(granulepos);
-        frames[i]->mEndTime = frames[i]->mTime + mTheoraState->mFrameDuration;
+        frames[i]->mEndTime = mTheoraState->Time(granulepos);
         NS_ASSERTION(frames[i]->mEndTime >= frames[i]->mTime, "Frame must start before it ends.");
         frames[i]->mTimecode = granulepos;
       }
@@ -1257,7 +1255,7 @@ nsresult nsOggReader::SeekInBufferedRange(PRInt64 aTarget,
                                   aStartTime,
                                   aEndTime,
                                   PR_FALSE);
-    res = SeekBisection(keyframeTime, k, SEEK_FUZZ_MS);
+    res = SeekBisection(keyframeTime, k, SEEK_FUZZ_USECS);
     NS_ASSERTION(mTheoraGranulepos == -1, "SeekBisection must reset Theora decode");
     NS_ASSERTION(mVorbisGranulepos == -1, "SeekBisection must reset Vorbis decode");
   }
@@ -1283,7 +1281,7 @@ nsresult nsOggReader::SeekInUnbuffered(PRInt64 aTarget,
   LOG(PR_LOG_DEBUG, ("%p Seeking in unbuffered data to %lldms using bisection search", mDecoder, aTarget));
   
   // If we've got an active Theora bitstream, determine the maximum possible
-  // time in ms which a keyframe could be before a given interframe. We
+  // time in usecs which a keyframe could be before a given interframe. We
   // subtract this from our seek target, seek to the new target, and then
   // will decode forward to the original seek target. We should encounter a
   // keyframe in that interval. This prevents us from needing to run two
@@ -1302,7 +1300,7 @@ nsresult nsOggReader::SeekInUnbuffered(PRInt64 aTarget,
   // Minimize the bisection search space using the known timestamps from the
   // buffered ranges.
   SeekRange k = SelectSeekRange(aRanges, seekTarget, aStartTime, aEndTime, PR_FALSE);
-  nsresult res = SeekBisection(seekTarget, k, SEEK_FUZZ_MS);
+  nsresult res = SeekBisection(seekTarget, k, SEEK_FUZZ_USECS);
   NS_ASSERTION(mTheoraGranulepos == -1, "SeekBisection must reset Theora decode");
   NS_ASSERTION(mVorbisGranulepos == -1, "SeekBisection must reset Vorbis decode");
   return res;
@@ -1786,9 +1784,8 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
       // find an end time.
       PRInt64 endTime = FindEndTime(startOffset, endOffset, PR_TRUE, &state);
       if (endTime != -1) {
-        endTime -= aStartTime;
-        aBuffered->Add(static_cast<double>(startTime) / 1000.0,
-                       static_cast<double>(endTime) / 1000.0);
+        aBuffered->Add(startTime / static_cast<double>(USECS_PER_S),
+                       (endTime - aStartTime) / static_cast<double>(USECS_PER_S));
       }
     }
   }
diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h
index ae412c0085d5..725f02db2633 100644
--- a/content/media/ogg/nsOggReader.h
+++ b/content/media/ogg/nsOggReader.h
@@ -104,8 +104,8 @@ private:
 
   // Returns PR_TRUE if we should decode up to the seek target rather than
   // seeking to the target using a bisection search or index-assisted seek.
-  // We should do this if the seek target (aTarget, in ms), lies not too far
-  // ahead of the current playback position (aCurrentTime, in ms).
+  // We should do this if the seek target (aTarget, in usecs), lies not too far
+  // ahead of the current playback position (aCurrentTime, in usecs).
   PRBool CanDecodeToTarget(PRInt64 aTarget,
                            PRInt64 aCurrentTime);
 
@@ -152,10 +152,10 @@ private:
     }
 
     PRInt64 mOffsetStart, mOffsetEnd; // in bytes.
-    PRInt64 mTimeStart, mTimeEnd; // in ms.
+    PRInt64 mTimeStart, mTimeEnd; // in usecs.
   };
 
-  // Seeks to aTarget ms in the buffered range aRange using bisection search,
+  // Seeks to aTarget usecs in the buffered range aRange using bisection search,
   // or to the keyframe prior to aTarget if we have video. aStartTime must be
   // the presentation time at the start of media, and aEndTime the time at
   // end of media. aRanges must be the time/byte ranges buffered in the media
@@ -166,7 +166,7 @@ private:
                                const nsTArray<SeekRange>& aRanges,
                                const SeekRange& aRange);
 
-  // Seeks to before aTarget ms in media using bisection search. If the media
+  // Seeks to before aTarget usecs in media using bisection search. If the media
   // has video, this will seek to before the keyframe required to render the
   // media at aTarget. Will use aRanges in order to narrow the bisection
   // search space. aStartTime must be the presentation time at the start of
@@ -208,11 +208,11 @@ private:
   PRBool ReadOggPacket(nsOggCodecState* aCodecState, ogg_packet* aPacket);
 
   // Performs a seek bisection to move the media stream's read cursor to the
-  // last ogg page boundary which has end time before aTarget ms on both the
+  // last ogg page boundary which has end time before aTarget usecs on both the
   // Theora and Vorbis bitstreams. Limits its search to data inside aRange;
   // i.e. it will only read inside of the aRange's start and end offsets.
-  // aFuzz is the number of ms of leniency we'll allow; we'll terminate the
-  // seek when we land in the range (aTime - aFuzz, aTime) ms.
+  // aFuzz is the number of usecs of leniency we'll allow; we'll terminate the
+  // seek when we land in the range (aTime - aFuzz, aTime) usecs.
   nsresult SeekBisection(PRInt64 aTarget,
                          const SeekRange& aRange,
                          PRUint32 aFuzz);
@@ -228,7 +228,7 @@ private:
   nsresult GetSeekRanges(nsTArray<SeekRange>& aRanges);
 
   // Returns the range in which you should perform a seek bisection if
-  // you wish to seek to aTarget ms, given the known (buffered) byte ranges
+  // you wish to seek to aTarget usecs, given the known (buffered) byte ranges
   // in aRanges. If aExact is PR_TRUE, we only return an exact copy of a
   // range in which aTarget lies, or a null range if aTarget isn't contained
   // in any of the (buffered) ranges. Otherwise, when aExact is PR_FALSE,
diff --git a/content/media/raw/nsRawReader.cpp b/content/media/raw/nsRawReader.cpp
index 02db528b0b6d..a662dad6bb94 100644
--- a/content/media/raw/nsRawReader.cpp
+++ b/content/media/raw/nsRawReader.cpp
@@ -129,7 +129,7 @@ nsresult nsRawReader::ReadMetadata(nsVideoInfo* aInfo)
   if (length != -1) {
     mozilla::MonitorAutoExit autoExitMonitor(mMonitor);
     mozilla::MonitorAutoEnter autoMonitor(mDecoder->GetMonitor());
-    mDecoder->GetStateMachine()->SetDuration(1000 *
+    mDecoder->GetStateMachine()->SetDuration(USECS_PER_S *
                                            (length - sizeof(nsRawVideoHeader)) /
                                            (mFrameSize * mFrameRate));
   }
@@ -184,7 +184,7 @@ PRBool nsRawReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
   if (!mFrameSize)
     return PR_FALSE; // Metadata read failed.  We should refuse to play.
 
-  PRInt64 currentFrameTime = 1000 * mCurrentFrame / mFrameRate;
+  PRInt64 currentFrameTime = USECS_PER_S * mCurrentFrame / mFrameRate;
   PRUint32 length = mFrameSize - sizeof(nsRawPacketHeader);
 
   nsAutoArrayPtr<PRUint8> buffer(new PRUint8[length]);
@@ -212,7 +212,7 @@ PRBool nsRawReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
       break;
 
     mCurrentFrame++;
-    currentFrameTime += 1000.0 / mFrameRate;
+    currentFrameTime += static_cast<double>(USECS_PER_S) / mFrameRate;
   }
 
   VideoData::YCbCrBuffer b;
@@ -237,7 +237,7 @@ PRBool nsRawReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
                                    mDecoder->GetImageContainer(),
                                    -1,
                                    currentFrameTime,
-                                   currentFrameTime + (1000 / mFrameRate),
+                                   currentFrameTime + (USECS_PER_S / mFrameRate),
                                    b,
                                    1, // In raw video every frame is a keyframe
                                    -1);
@@ -247,7 +247,7 @@ PRBool nsRawReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
   mVideoQueue.Push(v);
   mCurrentFrame++;
   decoded++;
-  currentFrameTime += 1000 / mFrameRate;
+  currentFrameTime += USECS_PER_S / mFrameRate;
 
   return PR_TRUE;
 }
@@ -264,7 +264,7 @@ nsresult nsRawReader::Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime,
   PRUint32 frame = mCurrentFrame;
   if (aTime >= UINT_MAX)
     return NS_ERROR_FAILURE;
-  mCurrentFrame = aTime * mFrameRate / 1000;
+  mCurrentFrame = aTime * mFrameRate / USECS_PER_S;
 
   PRUint32 offset;
   if (!MulOverflow32(mCurrentFrame, mFrameSize, offset))
diff --git a/content/media/test/test_seekLies.html b/content/media/test/test_seekLies.html
index 8c30ddd1feaa..13447cb499d9 100644
--- a/content/media/test/test_seekLies.html
+++ b/content/media/test/test_seekLies.html
@@ -13,7 +13,7 @@
 function on_metadataloaded() {
   var v = document.getElementById('v');
   var d = Math.round(v.duration*1000);
-  ok(d == 3999, "Checking duration: " + d);
+  ok(d == 4000, "Checking duration: " + d);
   SimpleTest.finish();
 }
 
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index d7b384fe79b8..d4fceec68e91 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -171,9 +171,8 @@ nsresult nsWaveReader::ReadMetadata(nsVideoInfo* aInfo)
   MonitorAutoExit exitReaderMon(mMonitor);
   MonitorAutoEnter decoderMon(mDecoder->GetMonitor());
 
-  float d = floorf(BytesToTime(GetDataLength() * 1000));
-  NS_ASSERTION(d <= PR_INT64_MAX, "Duration overflow");
-  mDecoder->GetStateMachine()->SetDuration(static_cast<PRInt64>(d));
+  mDecoder->GetStateMachine()->SetDuration(
+    static_cast<PRInt64>(BytesToTime(GetDataLength()) * USECS_PER_S));
 
   return NS_OK;
 }
@@ -229,16 +228,18 @@ PRBool nsWaveReader::DecodeAudioData()
     }
   }
 
-  float posTime = BytesToTime(pos);
-  float readSizeTime = BytesToTime(readSize);
-  NS_ASSERTION(posTime <= PR_INT64_MAX / 1000, "posTime overflow");
-  NS_ASSERTION(readSizeTime <= PR_INT64_MAX / 1000, "readSizeTime overflow");
+  double posTime = BytesToTime(pos);
+  double readSizeTime = BytesToTime(readSize);
+  NS_ASSERTION(posTime <= PR_INT64_MAX / USECS_PER_S, "posTime overflow");
+  NS_ASSERTION(readSizeTime <= PR_INT64_MAX / USECS_PER_S, "readSizeTime overflow");
   NS_ASSERTION(samples < PR_INT32_MAX, "samples overflow");
 
-  mAudioQueue.Push(new SoundData(pos, static_cast<PRInt64>(posTime * 1000),
-                                 static_cast<PRInt64>(readSizeTime * 1000),
+  mAudioQueue.Push(new SoundData(pos,
+                                 static_cast<PRInt64>(posTime * USECS_PER_S),
+                                 static_cast<PRInt64>(readSizeTime * USECS_PER_S),
                                  static_cast<PRInt32>(samples),
-                                 sampleBuffer.forget(), mChannels));
+                                 sampleBuffer.forget(),
+                                 mChannels));
 
   return PR_TRUE;
 }
@@ -258,15 +259,15 @@ nsresult nsWaveReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
   MonitorAutoEnter mon(mMonitor);
   NS_ASSERTION(mDecoder->OnStateMachineThread(),
                "Should be on state machine thread.");
-  LOG(PR_LOG_DEBUG, ("%p About to seek to %lldms", mDecoder, aTarget));
+  LOG(PR_LOG_DEBUG, ("%p About to seek to %lld", mDecoder, aTarget));
   if (NS_FAILED(ResetDecode())) {
     return NS_ERROR_FAILURE;
   }
-  float d = BytesToTime(GetDataLength());
-  NS_ASSERTION(d < PR_INT64_MAX / 1000, "Duration overflow"); 
-  PRInt64 duration = static_cast<PRInt64>(d) * 1000;
-  PRInt64 seekTime = NS_MIN(aTarget, duration);
-  PRInt64 position = RoundDownToSample(static_cast<PRInt64>(TimeToBytes(seekTime) / 1000.f));
+  double d = BytesToTime(GetDataLength());
+  NS_ASSERTION(d < PR_INT64_MAX / USECS_PER_S, "Duration overflow"); 
+  PRInt64 duration = static_cast<PRInt64>(d * USECS_PER_S);
+  double seekTime = NS_MIN(aTarget, duration) / static_cast<double>(USECS_PER_S);
+  PRInt64 position = RoundDownToSample(static_cast<PRInt64>(TimeToBytes(seekTime)));
   NS_ASSERTION(PR_INT64_MAX - mWavePCMOffset > position, "Integer overflow during wave seek");
   position += mWavePCMOffset;
   return mDecoder->GetCurrentStream()->Seek(nsISeekableStream::NS_SEEK_SET, position);
@@ -281,8 +282,8 @@ nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     NS_ASSERTION(startOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
     NS_ASSERTION(endOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
 
-    aBuffered->Add(floorf(BytesToTime(startOffset - mWavePCMOffset) * 1000.f) / 1000.0,
-                   floorf(BytesToTime(endOffset - mWavePCMOffset) * 1000.f) / 1000.0);
+    aBuffered->Add(BytesToTime(startOffset - mWavePCMOffset),
+                   BytesToTime(endOffset - mWavePCMOffset));
     startOffset = mDecoder->GetCurrentStream()->GetNextCachedData(endOffset);
   }
   return NS_OK;
@@ -508,7 +509,7 @@ nsWaveReader::FindDataOffset()
   return PR_TRUE;
 }
 
-float
+double
 nsWaveReader::BytesToTime(PRInt64 aBytes) const
 {
   NS_ABORT_IF_FALSE(aBytes >= 0, "Must be >= 0");
@@ -516,7 +517,7 @@ nsWaveReader::BytesToTime(PRInt64 aBytes) const
 }
 
 PRInt64
-nsWaveReader::TimeToBytes(float aTime) const
+nsWaveReader::TimeToBytes(double aTime) const
 {
   NS_ABORT_IF_FALSE(aTime >= 0.0f, "Must be >= 0");
   return RoundDownToSample(PRInt64(aTime * mSampleRate * mSampleSize));
diff --git a/content/media/wave/nsWaveReader.h b/content/media/wave/nsWaveReader.h
index a5a9a6e07651..fbf615b7506a 100644
--- a/content/media/wave/nsWaveReader.h
+++ b/content/media/wave/nsWaveReader.h
@@ -76,13 +76,13 @@ private:
 
   // Returns the number of seconds that aBytes represents based on the
   // current audio parameters.  e.g.  176400 bytes is 1 second at 16-bit
-  // stereo 44.1kHz. The time is rounded to the nearest millisecond.
-  float BytesToTime(PRInt64 aBytes) const;
+  // stereo 44.1kHz. The time is rounded to the nearest microsecond.
+  double BytesToTime(PRInt64 aBytes) const;
 
   // Returns the number of bytes that aTime represents based on the current
   // audio parameters.  e.g.  1 second is 176400 bytes at 16-bit stereo
   // 44.1kHz.
-  PRInt64 TimeToBytes(float aTime) const;
+  PRInt64 TimeToBytes(double aTime) const;
 
   // Rounds aBytes down to the nearest complete sample.  Assumes beginning
   // of byte range is already sample aligned by caller.
diff --git a/content/media/webm/nsWebMBufferedParser.cpp b/content/media/webm/nsWebMBufferedParser.cpp
index 02349080d75d..0f724e37ecb6 100644
--- a/content/media/webm/nsWebMBufferedParser.cpp
+++ b/content/media/webm/nsWebMBufferedParser.cpp
@@ -44,7 +44,6 @@
 using mozilla::MonitorAutoEnter;
 
 static const double NS_PER_S = 1e9;
-static const double MS_PER_S = 1e3;
 
 static PRUint32
 VIntLength(unsigned char aFirstByte, PRUint32* aMask)
diff --git a/content/media/webm/nsWebMReader.cpp b/content/media/webm/nsWebMReader.cpp
index 9a62ac531d21..06742f702306 100644
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -65,14 +65,13 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 #define SEEK_LOG(type, msg)
 #endif
 
-static const unsigned NS_PER_MS = 1000000;
+static const unsigned NS_PER_USEC = 1000;
 static const double NS_PER_S = 1e9;
-static const double MS_PER_S = 1e3;
 
-// If a seek request is within SEEK_DECODE_MARGIN milliseconds of the
+// If a seek request is within SEEK_DECODE_MARGIN microseconds of the
 // current time, decode ahead from the current frame rather than performing
 // a full seek.
-static const int SEEK_DECODE_MARGIN = 250;
+static const int SEEK_DECODE_MARGIN = 250000;
 
 NS_SPECIALIZE_TEMPLATE
 class nsAutoRefTraits<NesteggPacketHolder> : public nsPointerRefTraits<NesteggPacketHolder>
@@ -136,7 +135,7 @@ nsWebMReader::nsWebMReader(nsBuiltinDecoder* aDecoder)
   mChannels(0),
   mVideoTrack(0),
   mAudioTrack(0),
-  mAudioStartMs(-1),
+  mAudioStartUsec(-1),
   mAudioSamples(0),
   mHasVideo(PR_FALSE),
   mHasAudio(PR_FALSE)
@@ -184,7 +183,7 @@ nsresult nsWebMReader::Init(nsBuiltinDecoderReader* aCloneDonor)
 nsresult nsWebMReader::ResetDecode()
 {
   mAudioSamples = 0;
-  mAudioStartMs = -1;
+  mAudioStartUsec = -1;
   nsresult res = NS_OK;
   if (NS_FAILED(nsBuiltinDecoderReader::ResetDecode())) {
     res = NS_ERROR_FAILURE;
@@ -229,7 +228,7 @@ nsresult nsWebMReader::ReadMetadata(nsVideoInfo* aInfo)
   if (r == 0) {
     MonitorAutoExit exitReaderMon(mMonitor);
     MonitorAutoEnter decoderMon(mDecoder->GetMonitor());
-    mDecoder->GetStateMachine()->SetDuration(duration / NS_PER_MS);
+    mDecoder->GetStateMachine()->SetDuration(duration / NS_PER_USEC);
   }
 
   unsigned int ntracks = 0;
@@ -435,23 +434,23 @@ PRBool nsWebMReader::DecodeAudioPacket(nestegg_packet* aPacket, PRInt64 aOffset)
   }
 
   const PRUint32 rate = mVorbisDsp.vi->rate;
-  PRUint64 tstamp_ms = tstamp / NS_PER_MS;
-  if (mAudioStartMs == -1) {
+  PRUint64 tstamp_usecs = tstamp / NS_PER_USEC;
+  if (mAudioStartUsec == -1) {
     // This is the first audio chunk. Assume the start time of our decode
     // is the start of this chunk.
-    mAudioStartMs = tstamp_ms;
+    mAudioStartUsec = tstamp_usecs;
   }
   // If there's a gap between the start of this sound chunk and the end of
   // the previous sound chunk, we need to increment the packet count so that
   // the vorbis decode doesn't use data from before the gap to help decode
   // from after the gap.
   PRInt64 tstamp_samples = 0;
-  if (!MsToSamples(tstamp_ms, rate, tstamp_samples)) {
+  if (!UsecsToSamples(tstamp_usecs, rate, tstamp_samples)) {
     NS_WARNING("Int overflow converting WebM timestamp to samples");
     return PR_FALSE;
   }
   PRInt64 decoded_samples = 0;
-  if (!MsToSamples(mAudioStartMs, rate, decoded_samples)) {
+  if (!UsecsToSamples(mAudioStartUsec, rate, decoded_samples)) {
     NS_WARNING("Int overflow converting WebM start time to samples");
     return PR_FALSE;
   }
@@ -461,13 +460,13 @@ PRBool nsWebMReader::DecodeAudioPacket(nestegg_packet* aPacket, PRInt64 aOffset)
   }
   if (tstamp_samples > decoded_samples) {
 #ifdef DEBUG
-    PRInt64 ms = 0;
-    LOG(PR_LOG_DEBUG, ("WebMReader detected gap of %lldms, %lld samples, in audio stream\n",
-      SamplesToMs(tstamp_samples - decoded_samples, rate, ms) ? ms: -1,
+    PRInt64 usecs = 0;
+    LOG(PR_LOG_DEBUG, ("WebMReader detected gap of %lld, %lld samples, in audio stream\n",
+      SamplesToUsecs(tstamp_samples - decoded_samples, rate, usecs) ? usecs: -1,
       tstamp_samples - decoded_samples));
 #endif
     mPacketCount++;
-    mAudioStartMs = tstamp_ms;
+    mAudioStartUsec = tstamp_usecs;
     mAudioSamples = 0;
   }
 
@@ -503,17 +502,17 @@ PRBool nsWebMReader::DecodeAudioPacket(nestegg_packet* aPacket, PRInt64 aOffset)
       }
 
       PRInt64 duration = 0;
-      if (!SamplesToMs(samples, rate, duration)) {
+      if (!SamplesToUsecs(samples, rate, duration)) {
         NS_WARNING("Int overflow converting WebM audio duration");
         return PR_FALSE;
       }
       PRInt64 total_duration = 0;
-      if (!SamplesToMs(total_samples, rate, total_duration)) {
+      if (!SamplesToUsecs(total_samples, rate, total_duration)) {
         NS_WARNING("Int overflow converting WebM audio total_duration");
         return PR_FALSE;
       }
       
-      PRInt64 time = tstamp_ms + total_duration;
+      PRInt64 time = tstamp_usecs + total_duration;
       total_samples += samples;
       SoundData* s = new SoundData(aOffset,
                                    time,
@@ -668,11 +667,11 @@ PRBool nsWebMReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
       if (endTime == -1) {
         return PR_FALSE;
       }
-      next_tstamp = endTime * NS_PER_MS;
+      next_tstamp = endTime * NS_PER_USEC;
     }
   }
 
-  PRInt64 tstamp_ms = tstamp / NS_PER_MS;
+  PRInt64 tstamp_usecs = tstamp / NS_PER_USEC;
   for (PRUint32 i = 0; i < count; ++i) {
     unsigned char* data;
     size_t length;
@@ -685,7 +684,7 @@ PRBool nsWebMReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
     memset(&si, 0, sizeof(si));
     si.sz = sizeof(si);
     vpx_codec_peek_stream_info(&vpx_codec_vp8_dx_algo, data, length, &si);
-    if (aKeyframeSkip && (!si.is_kf || tstamp_ms < aTimeThreshold)) {
+    if (aKeyframeSkip && (!si.is_kf || tstamp_usecs < aTimeThreshold)) {
       // Skipping to next keyframe...
       parsed++; // Assume 1 frame per chunk.
       continue;
@@ -702,7 +701,7 @@ PRBool nsWebMReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
     // If the timestamp of the video frame is less than
     // the time threshold required then it is not added
     // to the video queue and won't be displayed.
-    if (tstamp_ms < aTimeThreshold) {
+    if (tstamp_usecs < aTimeThreshold) {
       parsed++; // Assume 1 frame per chunk.
       continue;
     }
@@ -733,8 +732,8 @@ PRBool nsWebMReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
       VideoData *v = VideoData::Create(mInfo,
                                        mDecoder->GetImageContainer(),
                                        holder->mOffset,
-                                       tstamp_ms,
-                                       next_tstamp / NS_PER_MS,
+                                       tstamp_usecs,
+                                       next_tstamp / NS_PER_USEC,
                                        b,
                                        si.is_kf,
                                        -1);
@@ -774,7 +773,7 @@ nsresult nsWebMReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
       return NS_ERROR_FAILURE;
     }
     PRUint32 trackToSeek = mHasVideo ? mVideoTrack : mAudioTrack;
-    int r = nestegg_track_seek(mContext, trackToSeek, aTarget * NS_PER_MS);
+    int r = nestegg_track_seek(mContext, trackToSeek, aTarget * NS_PER_USEC);
     if (r != 0) {
       return NS_ERROR_FAILURE;
     }
@@ -803,7 +802,7 @@ nsresult nsWebMReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     nsresult res = stream->GetCachedRanges(ranges);
     NS_ENSURE_SUCCESS(res, res);
 
-    PRInt64 startTimeOffsetNS = aStartTime * NS_PER_MS;
+    PRInt64 startTimeOffsetNS = aStartTime * NS_PER_USEC;
     for (PRUint32 index = 0; index < ranges.Length(); index++) {
       mBufferedState->CalculateBufferedForRange(aBuffered,
                                                 ranges[index].mStart,
diff --git a/content/media/webm/nsWebMReader.h b/content/media/webm/nsWebMReader.h
index 37a99dd06f9c..e08ab1a81e57 100644
--- a/content/media/webm/nsWebMReader.h
+++ b/content/media/webm/nsWebMReader.h
@@ -192,8 +192,8 @@ private:
 
   // Returns PR_TRUE if we should decode up to the seek target rather than
   // seeking to the target using an index-assisted seek.  We should do this
-  // if the seek target (aTarget, in ms), lies not too far ahead of the
-  // current playback position (aCurrentTime, in ms).
+  // if the seek target (aTarget, in usecs), lies not too far ahead of the
+  // current playback position (aCurrentTime, in usecs).
   PRBool CanDecodeToTarget(PRInt64 aTarget, PRInt64 aCurrentTime);
 
 private:
@@ -221,8 +221,8 @@ private:
   PRUint32 mVideoTrack;
   PRUint32 mAudioTrack;
 
-  // Time in ms of the start of the first audio sample we've decoded.
-  PRInt64 mAudioStartMs;
+  // Time in microseconds of the start of the first audio sample we've decoded.
+  PRInt64 mAudioStartUsec;
 
   // Number of samples we've decoded since decoding began at mAudioStartMs.
   PRUint64 mAudioSamples;

From db70e38a67cd715ca910b1075c1152ffa30ba9cc Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Thu, 14 Apr 2011 10:12:23 +1200
Subject: [PATCH 111/509] Bug 641718 - Round nsWaveReader's buffered ranges
 times to usecs. r=kinetik

---
 content/media/test/Makefile.in      |   1 +
 content/media/test/audio.wav        | Bin 0 -> 1422 bytes
 content/media/test/manifest.js      |   1 +
 content/media/wave/nsWaveReader.cpp |  11 +++++++++--
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 content/media/test/audio.wav

diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index e9f317bd4ac8..a538b7550a00 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -231,6 +231,7 @@ _TEST_FILES += \
 		r16000_u8_c1_list.wav \
 		wavedata_u8.wav \
 		wavedata_s16.wav \
+		audio.wav \
 		$(NULL)
 
 # Other files
diff --git a/content/media/test/audio.wav b/content/media/test/audio.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c6fd5cb869351be1b0fd2ccbdac51eb77066f464
GIT binary patch
literal 1422
zcmYk6drVVj7{==#%h=rFoVu|v)QK<wVaUdCOruVvFi=>LmI4)8YALjoQrbfAH+rKj
zEwly7r3C@Yog#O%(0VCa&~7o&Y%ZEPqw%^Jr~bS5v|Hxy<U9Fta`L^;d7tM!n9THa
z)jKE@?hy7UrHZ}%BNPg?4z44ksNh<M3PX{JY$6HXQ8qLv6mq#tCY4IWVv$HF6bSe{
zUVVKXm&0b)vTACW%xVTu6@tO2W-@DPShZ|!U41=IAQXwjQkh(?Xi%!uYPBYaR;vwd
z-nzpxZKF=7*BgK)z!(DA8Vq_}qgJC<tCS52x$G?^e9#hv|35)>h`d^m2jZ$|l@%3K
zYB>UxT2V=>VlY{?oI0LBB$YR)G&+OHY-w$`b#!*y?G6OHy}P@!!`9wvH8-1@^g4}7
zsgOy<LO!n!P7NN)sG`$p037}A;S|a#GP$gbL?RJGkjl!)rzqu6k^WyrzECVvC{<dW
z!PsoJw%Izn?2g{k{R3y5gG0l^BV!XTmunK1%QZ1EF+M&vIx;*o=p5)j-RrP-b+lP6
z%|=6`Mk$wy`1KqXvx-KgkV&N{i;D^ia9C`9{t1Nqd@L4MfG;d6DkhYa5<@aTMJ0_6
z9)<h?hgh`;Y&M(2;c~fkh+6=kFAxZXLa<FF7E2@&sZ=JDE5JR(J`FgeH#8ZWTg+By
z81$<L#5)n;lV_)A=H?d`7tfss&Mhv?&&^Ctj*kwX>Feogx0v*5xtPbUrcsE5f)hDe
z=)(v1r=@<gCn+%@J}xd6AucXHAu%cW>y*^AeFqL5L1!Mz&BNl0OUo!!dNqs76G|1T
zMuXAZYU^_J_B)56=G4sG!s2=N(z3_n^?E&?<z+WihQhA#(V;W_r+e(3wzgJFOS8!c
z843ciGMSp;1I!kS)oQg^%wVyxN#Cf3t_pda8akC+QiR1E%Q$=>?b|&GvC%uWMuczK
zv~j}+>)#6tdlw<>{q-Mi*tj`7Vq4UgyOUDV4yI>g@Fl0{ES^+luyphej!!Rod~3hl
z{O!)Y2aliq_2T8L*KgjudHw3|moJ__ee~eZySH!M2>5+o_x$w4h_lbp*#^ey!B_}4
zGH5Vq0CYbHj2$Gep37!28T5*BGO?r>k2`_MJ)WJFnSo9}8YDd(jn2r-{4p#0cuww5
zm^_F97KbY+z~c)c2t~yJfpGF<NiYz>SXR<u4A@+rKn#ry4uQ43v)j?zH{cu^869^a
zj?T`_gQ0HslE-`D;$@$2<*I*m?b`J~;AbEZxPEQTf5msn>t38aJ2u#7Z*S47B)nQW
zr39aM41H){YI0&+Ow{(si11IhY~J)Suxay_Pr^Toh}<3(6T3SxIpw?k2ajZA<zTRd
z1R|MAW3V_pp+uq58cde94tvmM*VOF7xh2nqOP5!!K>5|RwY62h-+%S$m6a8r@A9RK
z7d*>LZiw9c-0bw!Sr<%AaA^8M_FK)SCY@F(mk4=WRyD1hTuLa!=H+B(9z`O!H#H?W
zDRFn~u9)bZJHFVqb!%kg=LnIJ+jd0ljE>nApYT<3%HHn}{D96nj=>Q~<@B05kwVjC
zu{j1tCTGukeg43WTet80asT0?Cr_U}2cA8B^7!HXdv|~T_2!Mh>dHlrdtqjBY}nb?
W(`{?BwwMe$ty<X-`i;qz@_zs+LbqQ4

literal 0
HcmV?d00001

diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index 03f2ff05a37e..b3238af5eb95 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -214,6 +214,7 @@ var gErrorTests = [
 // These are files that have nontrivial duration and are useful for seeking within.
 var gSeekTests = [
   { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
+  { name:"audio.wav", type:"audio/x-wav", duration:0.031247 },
   { name:"seek.ogv", type:"video/ogg", duration:3.966 },
   { name:"320x240.ogv", type:"video/ogg", duration:0.233 },
   { name:"seek.webm", type:"video/webm", duration:3.966 },
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index d4fceec68e91..d5e1ce664e64 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -273,6 +273,10 @@ nsresult nsWaveReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
   return mDecoder->GetCurrentStream()->Seek(nsISeekableStream::NS_SEEK_SET, position);
 }
 
+static double RoundToUsecs(double aSeconds) {
+  return floor(aSeconds * USECS_PER_S) / USECS_PER_S;
+}
+
 nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
   PRInt64 startOffset = mDecoder->GetCurrentStream()->GetNextCachedData(mWavePCMOffset);
@@ -282,8 +286,11 @@ nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     NS_ASSERTION(startOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
     NS_ASSERTION(endOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
 
-    aBuffered->Add(BytesToTime(startOffset - mWavePCMOffset),
-                   BytesToTime(endOffset - mWavePCMOffset));
+    // We need to round the buffered ranges' times to microseconds so that they
+    // have the same precision as the currentTime and duration attribute on 
+    // the media element.
+    aBuffered->Add(RoundToUsecs(BytesToTime(startOffset - mWavePCMOffset)),
+                   RoundToUsecs(BytesToTime(endOffset - mWavePCMOffset)));
     startOffset = mDecoder->GetCurrentStream()->GetNextCachedData(endOffset);
   }
   return NS_OK;

From b7751008fa2d986cd5677302721e4306097d33de Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 13 Apr 2011 19:41:33 -0700
Subject: [PATCH 112/509] Bug 593629: Only check for ARM SIMD and NEON when the
 CPU_ARCH is ARM. r=ted

---
 configure.in        | 61 ++++++++++++++++++++++++---------------------
 js/src/configure.in | 53 ++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/configure.in b/configure.in
index 8f667097278f..e0da9a9f62c8 100644
--- a/configure.in
+++ b/configure.in
@@ -3589,36 +3589,39 @@ AC_SUBST(XEXT_LIBS)
 AC_SUBST(XT_LIBS)
 AC_SUBST(XSS_LIBS)
 
-AC_MSG_CHECKING(for ARM SIMD support in compiler)
-# We try to link so that this also fails when
-# building with LTO.
-AC_TRY_LINK([],
-               [asm("uqadd8 r1, r1, r2");],
-               result="yes", result="no")
-AC_MSG_RESULT("$result")
-if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_ARM_SIMD)
-    HAVE_ARM_SIMD=1
-fi
-AC_SUBST(HAVE_ARM_SIMD)
+if test "$CPU_ARCH" = "arm"; then
+  AC_MSG_CHECKING(for ARM SIMD support in compiler)
+  # We try to link so that this also fails when
+  # building with LTO.
+  AC_TRY_LINK([],
+                 [asm("uqadd8 r1, r1, r2");],
+                 result="yes", result="no")
+  AC_MSG_RESULT("$result")
+  if test "$result" = "yes"; then
+      AC_DEFINE(HAVE_ARM_SIMD)
+      HAVE_ARM_SIMD=1
+  fi
 
-AC_MSG_CHECKING(for ARM NEON support in compiler)
-_SAVE_CFLAGS="$CFLAGS"
-if test "$GNU_CC"; then
-  # gcc needs -mfpu=neon to recognize NEON instructions
-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-fi
-# We try to link so that this also fails when
-# building with LTO.
-AC_TRY_LINK([],
-               [asm("vadd.i8 d0, d0, d0");],
-               result="yes", result="no")
-AC_MSG_RESULT("$result")
-if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_ARM_NEON)
-    HAVE_ARM_NEON=1
-fi
-CFLAGS="$_SAVE_CFLAGS"
+  AC_MSG_CHECKING(for ARM NEON support in compiler)
+  _SAVE_CFLAGS="$CFLAGS"
+  if test "$GNU_CC"; then
+    # gcc needs -mfpu=neon to recognize NEON instructions
+    CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
+  fi
+  # We try to link so that this also fails when
+  # building with LTO.
+  AC_TRY_LINK([],
+                 [asm("vadd.i8 d0, d0, d0");],
+                 result="yes", result="no")
+  AC_MSG_RESULT("$result")
+  if test "$result" = "yes"; then
+      AC_DEFINE(HAVE_ARM_NEON)
+      HAVE_ARM_NEON=1
+  fi
+  CFLAGS="$_SAVE_CFLAGS"
+fi # CPU_ARCH = arm
+
+AC_SUBST(HAVE_ARM_SIMD)
 AC_SUBST(HAVE_ARM_NEON)
 
 dnl ========================================================
diff --git a/js/src/configure.in b/js/src/configure.in
index 346009182530..cb955826e2e4 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1,5 +1,5 @@
 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
-dnl vi: set tabstop=4 shiftwidth=4 expandtab:
+dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
 dnl ***** BEGIN LICENSE BLOCK *****
 dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
 dnl
@@ -3455,32 +3455,35 @@ case $target in
     AC_CHECK_LIB(socket, socket)
 esac
 
-AC_MSG_CHECKING(for ARM SIMD support in compiler)
-AC_TRY_COMPILE([],
-               [asm("uqadd8 r1, r1, r2");],
-               result="yes", result="no")
-AC_MSG_RESULT("$result")
-if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_ARM_SIMD)
-    HAVE_ARM_SIMD=1
-fi
-AC_SUBST(HAVE_ARM_SIMD)
+if test "$CPU_ARCH" = "arm"; then
+  AC_MSG_CHECKING(for ARM SIMD support in compiler)
+  AC_TRY_COMPILE([],
+                 [asm("uqadd8 r1, r1, r2");],
+                 result="yes", result="no")
+  AC_MSG_RESULT("$result")
+  if test "$result" = "yes"; then
+      AC_DEFINE(HAVE_ARM_SIMD)
+      HAVE_ARM_SIMD=1
+  fi
 
-AC_MSG_CHECKING(for ARM NEON support in compiler)
-_SAVE_CFLAGS="$CFLAGS"
-if test "$GNU_CC"; then
-  # gcc needs -mfpu=neon to recognize NEON instructions
-  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
+  AC_MSG_CHECKING(for ARM NEON support in compiler)
+  _SAVE_CFLAGS="$CFLAGS"
+  if test "$GNU_CC"; then
+    # gcc needs -mfpu=neon to recognize NEON instructions
+    CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
+  fi
+  AC_TRY_COMPILE([],
+                 [asm("vadd.i8 d0, d0, d0");],
+                 result="yes", result="no")
+  AC_MSG_RESULT("$result")
+  if test "$result" = "yes"; then
+      AC_DEFINE(HAVE_ARM_NEON)
+      HAVE_ARM_NEON=1
+  fi
+  CFLAGS="$_SAVE_CFLAGS"
 fi
-AC_TRY_COMPILE([],
-               [asm("vadd.i8 d0, d0, d0");],
-               result="yes", result="no")
-AC_MSG_RESULT("$result")
-if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_ARM_NEON)
-    HAVE_ARM_NEON=1
-fi
-CFLAGS="$_SAVE_CFLAGS"
+
+AC_SUBST(HAVE_ARM_SIMD)
 AC_SUBST(HAVE_ARM_NEON)
 
 dnl ========================================================

From b8748273e731e05d06e546ac66962c8bab95536e Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 13 Apr 2011 19:41:34 -0700
Subject: [PATCH 113/509] Bug 607114: Expose a File constructor to chrome
 script. r=sicking

--HG--
rename : content/canvas/test/image_yellow.png => content/base/test/chrome/fileconstructor_file.png
---
 content/base/public/nsDOMFile.h               |  15 +++-
 content/base/src/nsDOMFile.cpp                |  52 +++++++++++++
 content/base/test/chrome/Makefile.in          |   2 +
 .../base/test/chrome/fileconstructor_file.png | Bin 0 -> 95 bytes
 .../base/test/chrome/test_fileconstructor.xul |  70 ++++++++++++++++++
 content/base/test/test_fileapi.html           |   9 +++
 dom/base/nsDOMClassInfo.cpp                   |   1 +
 7 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 content/base/test/chrome/fileconstructor_file.png
 create mode 100644 content/base/test/chrome/test_fileconstructor.xul

diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
index c75915925dba..f0fd79c7cad8 100644
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -44,6 +44,7 @@
 #include "nsIDOMFileList.h"
 #include "nsIDOMFileError.h"
 #include "nsIInputStream.h"
+#include "nsIJSNativeInitializer.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 #include "mozilla/AutoRestore.h"
@@ -59,7 +60,8 @@ class nsIClassInfo;
 class nsDOMFile : public nsIDOMFile,
                   public nsIDOMBlob_MOZILLA_2_0_BRANCH,
                   public nsIXHRSendable,
-                  public nsICharsetDetectionObserver
+                  public nsICharsetDetectionObserver,
+                  public nsIJSNativeInitializer
 {
 public:
   NS_DECL_ISUPPORTS
@@ -98,6 +100,17 @@ public:
   // from nsICharsetDetectionObserver
   NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf);
 
+  // nsIJSNativeInitializer
+  NS_IMETHOD Initialize(nsISupports* aOwner,
+                        JSContext* aCx,
+                        JSObject* aObj,
+                        PRUint32 aArgc,
+                        jsval* aArgv);
+
+  // DOMClassInfo constructor (for File("foo"))
+  static nsresult
+  NewFile(nsISupports* *aNewObject);
+
 protected:
   nsCOMPtr<nsIFile> mFile;
 
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 62d5003f918a..ee0103fc1085 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -64,6 +64,7 @@
 #include "nsFileDataProtocolHandler.h"
 #include "nsStringStream.h"
 #include "CheckedInt.h"
+#include "nsJSUtils.h"
 
 #include "plbase64.h"
 #include "prmem.h"
@@ -143,6 +144,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMFile)
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIDOMFile, mIsFullFile)
   NS_INTERFACE_MAP_ENTRY(nsIXHRSendable)
   NS_INTERFACE_MAP_ENTRY(nsICharsetDetectionObserver)
+  NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_CONDITIONAL(File, mIsFullFile)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_CONDITIONAL(Blob, !mIsFullFile)
 NS_INTERFACE_MAP_END
@@ -164,6 +166,14 @@ DOMFileResult(nsresult rv)
   return rv;
 }
 
+/* static */ nsresult
+nsDOMFile::NewFile(nsISupports* *aNewObject)
+{
+  nsCOMPtr<nsISupports> file = do_QueryObject(new nsDOMFile(nsnull));
+  file.forget(aNewObject);
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMFile::GetFileName(nsAString &aFileName)
 {
@@ -611,6 +621,48 @@ nsDOMFile::Notify(const char* aCharset, nsDetectionConfident aConf)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDOMFile::Initialize(nsISupports* aOwner,
+                      JSContext* aCx,
+                      JSObject* aObj,
+                      PRUint32 aArgc,
+                      jsval* aArgv)
+{
+  if (!nsContentUtils::IsCallerChrome()) {
+    return NS_ERROR_DOM_SECURITY_ERR; // Real short trip
+  }
+
+  NS_ENSURE_TRUE(aArgc > 0, NS_ERROR_UNEXPECTED);
+
+  // We expect to get a path to represent as a File object
+  if (!JSVAL_IS_STRING(aArgv[0]))
+    return NS_ERROR_UNEXPECTED;
+
+  JSString* str = JS_ValueToString(aCx, aArgv[0]);
+  NS_ENSURE_TRUE(str, NS_ERROR_XPC_BAD_CONVERT_JS);
+
+  nsDependentJSString xpcomStr;
+  if (!xpcomStr.init(aCx, str)) {
+    return NS_ERROR_XPC_BAD_CONVERT_JS;
+  }
+
+  nsCOMPtr<nsILocalFile> localFile;
+  nsresult rv = NS_NewLocalFile(xpcomStr,
+                                PR_FALSE, getter_AddRefs(localFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIFile> file = do_QueryInterface(localFile, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRBool exists;
+  rv = file->Exists(&exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(exists, NS_ERROR_FILE_NOT_FOUND);
+
+  mFile = file;
+  return NS_OK;
+}
+
 nsresult
 nsDOMFile::ConvertStream(nsIInputStream *aStream,
                          const char *aCharset,
diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in
index 89365034dac1..7e48f254ecb2 100644
--- a/content/base/test/chrome/Makefile.in
+++ b/content/base/test/chrome/Makefile.in
@@ -60,6 +60,8 @@ _CHROME_FILES = \
     test_bug616841.xul \
     file_bug616841.xul \
     test_bug635835.xul \
+    test_fileconstructor.xul \
+    fileconstructor_file.png \
     $(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/base/test/chrome/fileconstructor_file.png b/content/base/test/chrome/fileconstructor_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e8aaf38c1b3a105fc6038c93b5648a4bf9efd4
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt-3y&(L-3iz|>T?&;zf
qQW5v|03$Du=V0(R_;h0NA~Qy&Jq(P_g*_*Mf()LnelF{r5}E*PXBuY!

literal 0
HcmV?d00001

diff --git a/content/base/test/chrome/test_fileconstructor.xul b/content/base/test/chrome/test_fileconstructor.xul
new file mode 100644
index 000000000000..9fe58716241f
--- /dev/null
+++ b/content/base/test/chrome/test_fileconstructor.xul
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet
+  href="chrome://mochikit/content/tests/SimpleTest/test.css"
+  type="text/css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=607114.xul
+-->
+<window title="Mozilla Bug 607114"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <title>Test for Bug 607114</title>
+  <script type="application/javascript"
+    src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript"
+    src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<body  xmlns="http://www.w3.org/1999/xhtml">
+<a target="_blank"
+   href="https://bugzilla.mozilla.org/show_bug.cgi?id=607114">
+   Mozilla Bug 607114</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+
+<script class="testbody" type="application/javascript">
+<![CDATA[
+
+/** Test for Bug 607114 **/
+
+var file = Components.classes["@mozilla.org/file/directory_service;1"]
+           .getService(Components.interfaces.nsIProperties)
+           .get("CurWorkD", Components.interfaces.nsIFile);
+
+// man I wish this were simpler ...
+file.append("chrome");
+file.append("content");
+file.append("base");
+file.append("test");
+file.append("chrome");
+file.append("fileconstructor_file.png");
+
+var domfile = new File(file.path);
+ok(domfile instanceof File, "File() should return a File");
+is(domfile.type, "image/png", "File should be a PNG");
+is(domfile.size, 95, "File has size 95 (and more importantly we can read it)");
+
+try {
+  var boomfile = new File();
+  ok(false, "This should never be reached!");
+} catch (e) {
+  ok(true, "Botched file constructor attempts throw and do not crash.");
+}
+
+try {
+  var nonexistentfile = new File("i/sure/hope/this/does/not/exist/anywhere.txt");
+  ok(false, "This should never be reached!");
+} catch (e) {
+  ok(true, "Attempt to construct a non-existent file should fail.")
+}
+
+]]>
+</script>
+
+</window>
diff --git a/content/base/test/test_fileapi.html b/content/base/test/test_fileapi.html
index 8cfbb0df5002..29d48333fc67 100644
--- a/content/base/test/test_fileapi.html
+++ b/content/base/test/test_fileapi.html
@@ -20,6 +20,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=414796
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
+
+// File constructors should not work from non-chrome code
+try {
+  var file = File("/etc/passwd");
+  ok(false, "Did not throw on unprivileged attempt to construct a File");
+} catch (e) {
+  ok(true, "Threw on an unprivileged attempt to construct a File");
+}
+
 const minFileSize = 20000;
 var fileNum = 1;
 var testRanCounter = 0;
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index ed094d25b4ee..f1c124fb5631 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -1538,6 +1538,7 @@ static const nsConstructorFuncMapData kConstructorFuncMap[] =
 {
   NS_DEFINE_CONSTRUCTOR_FUNC_DATA(Worker, nsDOMWorker::NewWorker)
   NS_DEFINE_CONSTRUCTOR_FUNC_DATA(ChromeWorker, nsDOMWorker::NewChromeWorker)
+  NS_DEFINE_CONSTRUCTOR_FUNC_DATA(File, nsDOMFile::NewFile)
 };
 
 nsIXPConnect *nsDOMClassInfo::sXPConnect = nsnull;

From 3ef7df06b9d35c7327dbffd386eb7c6b69918a20 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 13 Apr 2011 19:41:34 -0700
Subject: [PATCH 114/509] Bug 630444: Followup to remove dead code. r=me

---
 widget/src/windows/LSPAnnotator.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/widget/src/windows/LSPAnnotator.cpp b/widget/src/windows/LSPAnnotator.cpp
index ba55088cee17..a4f1bdf9a347 100644
--- a/widget/src/windows/LSPAnnotator.cpp
+++ b/widget/src/windows/LSPAnnotator.cpp
@@ -74,8 +74,6 @@ LSPAnnotationGatherer::Annotate()
   PRBool enabled;
   if (cr && NS_SUCCEEDED(cr->GetEnabled(&enabled)) && enabled) {
     cr->AnnotateCrashReport(NS_LITERAL_CSTRING("Winsock_LSP"), mString);
-    nsCString note = NS_LITERAL_CSTRING("Winsock LSPs: ");
-    note.Append(mString);
   }
   mThread->Shutdown();
 }

From c2ed6a11c4a05b8f9d59287975109c4476fb5c11 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 13 Apr 2011 19:41:34 -0700
Subject: [PATCH 115/509] Bug 624870: Free nsFactoryEntrys on XPCOM shutdown
 and factory unregistration. r=bsmedberg

---
 xpcom/components/nsComponentManager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index 7fd67b7a438a..32cc73a234ae 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -1324,6 +1324,7 @@ FreeFactoryEntries(const nsID& aCID,
 {
     aEntry->mFactory = NULL;
     aEntry->mServiceObject = NULL;
+    delete aEntry;
     return PL_DHASH_NEXT;
 }
 
@@ -1797,6 +1798,7 @@ nsComponentManagerImpl::UnregisterFactory(const nsCID& aClass,
         // nsFactoryEntry::GetFactory)
         f->mFactory.swap(dyingFactory);
         f->mServiceObject.swap(dyingServiceObject);
+        delete f;
     }
 
     return NS_OK;
@@ -1941,6 +1943,7 @@ nsFactoryEntry::nsFactoryEntry(const mozilla::Module::CIDEntry* entry,
     : mCIDEntry(entry)
     , mModule(module)
 {
+    MOZ_COUNT_CTOR(nsFactoryEntry);
 }
 
 nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
@@ -1948,6 +1951,7 @@ nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
     , mModule(NULL)
     , mFactory(factory)
 {
+    MOZ_COUNT_CTOR(nsFactoryEntry);
     mozilla::Module::CIDEntry* e = new mozilla::Module::CIDEntry();
     nsCID* cid = new nsCID;
     *cid = aCID;
@@ -1962,6 +1966,7 @@ nsFactoryEntry::~nsFactoryEntry()
         delete mCIDEntry->cid;
         delete mCIDEntry;
     }
+    MOZ_COUNT_DTOR(nsFactoryEntry);
 }
 
 already_AddRefed<nsIFactory>

From 746351dc18afe4eb623d0d51d02840a62ecd2393 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 13 Apr 2011 23:17:02 -0700
Subject: [PATCH 116/509] Backed out changeset aa200a803e07

---
 xpcom/components/nsComponentManager.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index 32cc73a234ae..7fd67b7a438a 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -1324,7 +1324,6 @@ FreeFactoryEntries(const nsID& aCID,
 {
     aEntry->mFactory = NULL;
     aEntry->mServiceObject = NULL;
-    delete aEntry;
     return PL_DHASH_NEXT;
 }
 
@@ -1798,7 +1797,6 @@ nsComponentManagerImpl::UnregisterFactory(const nsCID& aClass,
         // nsFactoryEntry::GetFactory)
         f->mFactory.swap(dyingFactory);
         f->mServiceObject.swap(dyingServiceObject);
-        delete f;
     }
 
     return NS_OK;
@@ -1943,7 +1941,6 @@ nsFactoryEntry::nsFactoryEntry(const mozilla::Module::CIDEntry* entry,
     : mCIDEntry(entry)
     , mModule(module)
 {
-    MOZ_COUNT_CTOR(nsFactoryEntry);
 }
 
 nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
@@ -1951,7 +1948,6 @@ nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
     , mModule(NULL)
     , mFactory(factory)
 {
-    MOZ_COUNT_CTOR(nsFactoryEntry);
     mozilla::Module::CIDEntry* e = new mozilla::Module::CIDEntry();
     nsCID* cid = new nsCID;
     *cid = aCID;
@@ -1966,7 +1962,6 @@ nsFactoryEntry::~nsFactoryEntry()
         delete mCIDEntry->cid;
         delete mCIDEntry;
     }
-    MOZ_COUNT_DTOR(nsFactoryEntry);
 }
 
 already_AddRefed<nsIFactory>

From 5f1ab70d7ce6296b3a53c43922d1f2959da58991 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 14 Apr 2011 17:48:27 +0900
Subject: [PATCH 117/509] Bug 633857 - missing #includes for OpenBSD (gfx part)
 r=ludovic

---
 gfx/thebes/GLContext.h             | 3 +++
 gfx/thebes/gfxTextRunWordCache.cpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/gfx/thebes/GLContext.h b/gfx/thebes/GLContext.h
index 87600b5fe97b..02db8fb0668e 100644
--- a/gfx/thebes/GLContext.h
+++ b/gfx/thebes/GLContext.h
@@ -42,6 +42,9 @@
 #define GLCONTEXT_H_
 
 #include <stdio.h>
+#if defined(XP_UNIX)
+#include <stdint.h>
+#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/gfx/thebes/gfxTextRunWordCache.cpp b/gfx/thebes/gfxTextRunWordCache.cpp
index ce4f15d7d668..ba163aa726c9 100644
--- a/gfx/thebes/gfxTextRunWordCache.cpp
+++ b/gfx/thebes/gfxTextRunWordCache.cpp
@@ -49,6 +49,10 @@
 
 #include "nsBidiUtils.h"
 
+#if defined(XP_UNIX)
+#include <stdint.h>
+#endif
+
 #ifdef DEBUG
 #include <stdio.h>
 #endif

From d658ec0096408c02fa787543a7e9247e1cafebbb Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 14 Apr 2011 17:49:29 +0900
Subject: [PATCH 118/509] Bug 633857 - missing #includes for OpenBSD (media
 part). r=roc

---
 content/media/webm/nsWebMReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/media/webm/nsWebMReader.cpp b/content/media/webm/nsWebMReader.cpp
index 06742f702306..95b690c71c44 100644
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -785,7 +785,7 @@ nsresult nsWebMReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
   nsMediaStream* stream = mDecoder->GetCurrentStream();
 
-  PRUint64 timecodeScale;
+  uint64_t timecodeScale;
   if (!mContext || nestegg_tstamp_scale(mContext, &timecodeScale) == -1) {
     return NS_OK;
   }

From e37388df6779e3d53545a3ca7722e6d63676c6d0 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 14 Apr 2011 17:49:38 +0900
Subject: [PATCH 119/509] Bug 633857 - missing #includes for OpenBSD (mozalloc
 part). r=cjones

---
 memory/mozalloc/mozalloc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp
index 5cd2a00c1d24..ec172dab2e5f 100644
--- a/memory/mozalloc/mozalloc.cpp
+++ b/memory/mozalloc/mozalloc.cpp
@@ -42,6 +42,8 @@
 #include <new>                  // for std::bad_alloc
 #include <string.h>
 
+#include <sys/types.h>
+
 #if defined(MALLOC_H)
 #  include MALLOC_H             // for memalign, valloc where available
 #endif // if defined(MALLOC_H)

From 1134591309e166bc0ee513ffc302a61715820048 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 14 Apr 2011 11:22:09 +0200
Subject: [PATCH 120/509] Bug 643817 - Replace xpt_link/dump with pyxpt.
 r=ted,r=bsmedberg

---
 config/config.mk                    |    3 +-
 config/rules.mk                     |    2 +-
 js/src/config/config.mk             |    3 +-
 js/src/config/rules.mk              |    2 +-
 xpcom/typelib/xpt/tools/Makefile.in |   61 +-
 xpcom/typelib/xpt/tools/runtests.py |  750 +++++++++++++++
 xpcom/typelib/xpt/tools/xpt.py      | 1318 +++++++++++++++++++++++++++
 xpcom/typelib/xpt/tools/xpt_dump.c  |  971 --------------------
 xpcom/typelib/xpt/tools/xpt_link.c  |  929 -------------------
 9 files changed, 2078 insertions(+), 1961 deletions(-)
 create mode 100755 xpcom/typelib/xpt/tools/runtests.py
 create mode 100644 xpcom/typelib/xpt/tools/xpt.py
 delete mode 100644 xpcom/typelib/xpt/tools/xpt_dump.c
 delete mode 100644 xpcom/typelib/xpt/tools/xpt_link.c

diff --git a/config/config.mk b/config/config.mk
index 27257382c15e..df93f8fc4cf4 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -442,11 +442,10 @@ PURIFY = purify $(PURIFYOPTIONS)
 QUANTIFY = quantify $(QUANTIFYOPTIONS)
 ifdef CROSS_COMPILE
 XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
-XPIDL_LINK = $(LIBXUL_DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
-XPIDL_LINK = $(LIBXUL_DIST)/bin/xpt_link$(BIN_SUFFIX)
 endif
+XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
diff --git a/config/rules.mk b/config/rules.mk
index c869a11f3bd1..34f56d213b41 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1570,7 +1570,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS)
 	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
 endif # XPIDL_MODULE.xpt != XPIDLSRCS
 
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 27257382c15e..df93f8fc4cf4 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -442,11 +442,10 @@ PURIFY = purify $(PURIFYOPTIONS)
 QUANTIFY = quantify $(QUANTIFYOPTIONS)
 ifdef CROSS_COMPILE
 XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
-XPIDL_LINK = $(LIBXUL_DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
-XPIDL_LINK = $(LIBXUL_DIST)/bin/xpt_link$(BIN_SUFFIX)
 endif
+XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index c869a11f3bd1..34f56d213b41 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1570,7 +1570,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS)
 	$(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
 endif # XPIDL_MODULE.xpt != XPIDLSRCS
 
diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in
index 21daa5c05d70..138197a5b7eb 100644
--- a/xpcom/typelib/xpt/tools/Makefile.in
+++ b/xpcom/typelib/xpt/tools/Makefile.in
@@ -45,64 +45,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 INTERNAL_TOOLS	= 1
 
-SIMPLE_PROGRAMS	= xpt_dump$(BIN_SUFFIX) xpt_link$(BIN_SUFFIX)
-
-CSRCS		= xpt_dump.c xpt_link.c
-
-SDK_BINARY     =                   \
-		$(SIMPLE_PROGRAMS) \
-		$(NULL)
-
-ifdef CROSS_COMPILE
-HOST_SIMPLE_PROGRAMS	= $(addprefix host_, $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=$(HOST_BIN_SUFFIX)))
-HOST_CSRCS		= $(CSRCS)
-endif
-
-LIBS		= $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX)
-
-ifdef WRAP_MALLOC_CFLAGS
-LIBS		+= -lmozalloc
-endif
-
-USE_STATIC_LIBS = 1
+SDK_BINARY = \
+  xpt.py \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-# Do not link to jemalloc
-ifeq ($(OS_ARCH),SunOS)
-SOLARIS_JEMALLOC_LDFLAGS =
-endif
-
-# Compile directly against the static lib, so we can use the tools
-# during the build without the shared library path being set.
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
-DEFINES		+= -DEXPORT_XPT_API
-endif
-
-ifdef CROSS_COMPILE
-HOST_LIBS		= $(DIST)/host/lib/$(LIB_PREFIX)hostxpt.$(LIB_SUFFIX)
-HOST_EXTRA_DEPS		= $(wildcard $(DIST)/host/lib/$(LIB_PREFIX)hostxpt.*)
-
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS	+= -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-
-ifdef WINCE
-# Compile directly against the static lib, so we can use the tools
-# during the build without the shared library path being set.
-HOST_CFLAGS +=  -DEXPORT_XPT_API
-LDFLAGS += -NODEFAULTLIB:MSVCRT
-endif
-
-endif
-
-
-# Build xpt_link and xpt_dump early.  (libs creates .deps used by libs.)
+# Install xpt.py in SDK early
 export::
 	@$(MAKE) libs
 
-# XXX, bug 417045, make -jN combines badly with -save-temps in   
-# CFLAGS/CXXFLAGS (for stabs symbols with XCode3)
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-.NOTPARALLEL:
-endif
+check::
+	$(PYTHON) $(srcdir)/runtests.py
diff --git a/xpcom/typelib/xpt/tools/runtests.py b/xpcom/typelib/xpt/tools/runtests.py
new file mode 100755
index 000000000000..b4ac9b1742cc
--- /dev/null
+++ b/xpcom/typelib/xpt/tools/runtests.py
@@ -0,0 +1,750 @@
+#!/usr/bin/env python
+# Copyright 2010,2011 Mozilla Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#   1. Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in
+#      the documentation and/or other materials provided with the
+#      distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE MOZILLA FOUNDATION ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MOZILLA FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation
+# are those of the authors and should not be interpreted as representing
+# official policies, either expressed or implied, of the Mozilla
+# Foundation.
+
+import difflib
+import os
+from StringIO import StringIO
+import subprocess
+import sys
+import tempfile
+import unittest
+import xpt
+
+def get_output(bin, file):
+    p = subprocess.Popen([bin, file], stdout=subprocess.PIPE)
+    stdout, _ = p.communicate()
+    return stdout
+
+if "MOZILLA_OBJDIR" in os.environ:
+    class CheckXPTDump(unittest.TestCase):
+        def test_xpt_dump_diffs(self):
+            MOZILLA_OBJDIR = os.environ["MOZILLA_OBJDIR"]
+            xptdump = os.path.abspath(os.path.join(MOZILLA_OBJDIR,
+                                                   "dist", "bin", "xpt_dump"))
+            components = os.path.abspath(os.path.join(MOZILLA_OBJDIR,
+                                                   "dist", "bin", "components"))
+            for f in os.listdir(components):
+                if not f.endswith(".xpt"):
+                    continue
+                fullpath = os.path.join(components, f)
+                # read a Typelib and dump it to a string
+                t = xpt.Typelib.read(fullpath)
+                self.assert_(t is not None)
+                outf = StringIO()
+                t.dump(outf)
+                out = outf.getvalue()
+                # now run xpt_dump on it
+                out2 = get_output(xptdump, fullpath)
+                if out != out2:
+                    print "diff %s" % f
+                    for line in difflib.unified_diff(out2.split("\n"), out.split("\n"), lineterm=""):
+                        print line
+                self.assert_(out == out2, "xpt_dump output should be identical for %s" % f)
+
+class TestIIDString(unittest.TestCase):
+    def test_iid_str_roundtrip(self):
+        iid_str = "11223344-5566-7788-9900-aabbccddeeff"
+        iid = xpt.Typelib.string_to_iid(iid_str)
+        self.assertEqual(iid_str, xpt.Typelib.iid_to_string(iid))
+
+    def test_iid_roundtrip(self):
+        iid = "\x11\x22\x33\x44\x55\x66\x77\x88\x99\x00\xaa\xbb\xcc\xdd\xee\xff"
+        iid_str = xpt.Typelib.iid_to_string(iid)
+        self.assertEqual(iid, xpt.Typelib.string_to_iid(iid_str))
+
+class TypelibCompareMixin:
+    def assertEqualTypelibs(self, t1, t2):
+        self.assert_(t1 is not None, "Should not be None")
+        self.assert_(t2 is not None, "Should not be None")
+        self.assertEqual(t1.version, t2.version, "Versions should be equal")
+        self.assertEqual(len(t1.interfaces), len(t2.interfaces),
+                         "Number of interfaces should be equal")
+        for i, j in zip(t1.interfaces, t2.interfaces):
+            self.assertEqualInterfaces(i, j)
+
+    def assertEqualInterfaces(self, i1, i2):
+        self.assert_(i1 is not None, "Should not be None")
+        self.assert_(i2 is not None, "Should not be None")
+        self.assertEqual(i1.name, i2.name, "Names should be equal")
+        self.assertEqual(i1.iid, i2.iid, "IIDs should be equal")
+        self.assertEqual(i1.namespace, i2.namespace,
+                         "Namespaces should be equal")
+        self.assertEqual(i1.resolved, i2.resolved,
+                         "Resolved status should be equal")
+        if i1.resolved:
+            if i1.parent or i2.parent:
+                # Can't test exact equality, probably different objects
+                self.assertEqualInterfaces(i1.parent, i2.parent)
+            self.assertEqual(len(i1.methods), len(i2.methods))
+            for m, n in zip(i1.methods, i2.methods):
+                self.assertEqualMethods(m, n)
+            self.assertEqual(len(i1.constants), len(i2.constants))
+            for c, d in zip(i1.constants, i2.constants):
+                self.assertEqualConstants(c, d)
+            self.assertEqual(i1.scriptable, i2.scriptable,
+                             "Scriptable status should be equal")
+            self.assertEqual(i1.function, i2.function,
+                             "Function status should be equal")
+
+    def assertEqualMethods(self, m1, m2):
+        self.assert_(m1 is not None, "Should not be None")
+        self.assert_(m2 is not None, "Should not be None")
+        self.assertEqual(m1.name, m2.name, "Names should be equal")
+        self.assertEqual(m1.getter, m2.getter, "Getter flag should be equal")
+        self.assertEqual(m1.setter, m2.setter, "Setter flag should be equal")
+        self.assertEqual(m1.notxpcom, m2.notxpcom,
+                         "notxpcom flag should be equal")
+        self.assertEqual(m1.constructor, m2.constructor,
+                         "constructor flag should be equal")
+        self.assertEqual(m1.hidden, m2.hidden, "hidden flag should be equal")
+        self.assertEqual(m1.optargc, m2.optargc, "optargc flag should be equal")
+        self.assertEqual(m1.implicit_jscontext, m2.implicit_jscontext,
+                         "implicit_jscontext flag should be equal")
+        for p1, p2 in zip(m1.params, m2.params):
+            self.assertEqualParams(p1, p2)
+        self.assertEqualParams(m1.result, m2.result)
+        
+    def assertEqualConstants(self, c1, c2):
+        self.assert_(c1 is not None, "Should not be None")
+        self.assert_(c2 is not None, "Should not be None")
+        self.assertEqual(c1.name, c2.name)
+        self.assertEqual(c1.value, c2.value)
+        self.assertEqualTypes(c1.type, c2.type)
+
+    def assertEqualParams(self, p1, p2):
+        self.assert_(p1 is not None, "Should not be None")
+        self.assert_(p2 is not None, "Should not be None")
+        self.assertEqualTypes(p1.type, p2.type)
+        self.assertEqual(p1.in_, p2.in_)
+        self.assertEqual(p1.out, p2.out)
+        self.assertEqual(p1.retval, p2.retval)
+        self.assertEqual(p1.shared, p2.shared)
+        self.assertEqual(p1.dipper, p2.dipper)
+        self.assertEqual(p1.optional, p2.optional)
+        
+    def assertEqualTypes(self, t1, t2):
+        self.assert_(t1 is not None, "Should not be None")
+        self.assert_(t2 is not None, "Should not be None")
+        self.assertEqual(type(t1), type(t2), "type types should be equal")
+        self.assertEqual(t1.pointer, t2.pointer,
+                         "pointer flag should be equal for %s and %s" % (t1, t2))
+        self.assertEqual(t1.unique_pointer, t2.unique_pointer)
+        self.assertEqual(t1.reference, t2.reference)
+        if isinstance(t1, xpt.SimpleType):
+            self.assertEqual(t1.tag, t2.tag)
+        elif isinstance(t1, xpt.InterfaceType):
+            self.assertEqualInterfaces(t1.iface, t2.iface)
+        elif isinstance(t1, xpt.InterfaceIsType):
+            self.assertEqual(t1.param_index, t2.param_index)
+        elif isinstance(t1, xpt.ArrayType):
+            self.assertEqualTypes(t1.element_type, t2.element_type)
+            self.assertEqual(t1.size_is_arg_num, t2.size_is_arg_num)
+            self.assertEqual(t1.length_is_arg_num, t2.length_is_arg_num)
+        elif isinstance(t1, xpt.StringWithSizeType) or isinstance(t1, xpt.WideStringWithSizeType):
+            self.assertEqual(t1.size_is_arg_num, t2.size_is_arg_num)
+            self.assertEqual(t1.length_is_arg_num, t2.length_is_arg_num)
+
+#TODO: test flags in various combinations
+class TestTypelibRoundtrip(unittest.TestCase, TypelibCompareMixin):
+    def checkRoundtrip(self, t):
+        fd, f = tempfile.mkstemp()
+        os.close(fd)
+        t.write(f)
+        t2 = xpt.Typelib.read(f)
+        os.remove(f)
+        self.assert_(t2 is not None)
+        self.assertEqualTypelibs(t, t2)
+        
+    def test_simple(self):
+        t = xpt.Typelib()
+        # add an unresolved interface
+        t.interfaces.append(xpt.Interface("IFoo"))
+        self.checkRoundtrip(t)
+        
+        t = xpt.Typelib()
+        # add an unresolved interface with an IID
+        t.interfaces.append(xpt.Interface("IBar", "11223344-5566-7788-9900-aabbccddeeff"))
+        self.checkRoundtrip(t)
+
+    def test_parent(self):
+        """
+        Test that an interface's parent property is correctly serialized
+        and deserialized.
+
+        """
+        t = xpt.Typelib()
+        pi = xpt.Interface("IParent")
+        t.interfaces.append(pi)
+        t.interfaces.append(xpt.Interface("IChild", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                          parent=pi, resolved=True))
+        self.checkRoundtrip(t)
+
+    def test_ifaceFlags(self):
+        """
+        Test that an interface's flags are correctly serialized
+        and deserialized.
+
+        """
+        t = xpt.Typelib()
+        t.interfaces.append(xpt.Interface("IFlags", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                          resolved=True,
+                                          scriptable=True,
+                                          function=True))
+        self.checkRoundtrip(t)
+
+    def test_constants(self):
+        c = xpt.Constant("X", xpt.SimpleType(xpt.Type.Tags.uint32),
+                         0xF000F000)
+        i = xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                          constants=[c])
+        t = xpt.Typelib(interfaces=[i])
+        self.checkRoundtrip(t)
+        # tack on some more constants
+        i.constants.append(xpt.Constant("Y",
+                                        xpt.SimpleType(xpt.Type.Tags.int16),
+                                        -30000))
+        i.constants.append(xpt.Constant("Z",
+                                        xpt.SimpleType(xpt.Type.Tags.uint16),
+                                        0xB0B0))
+        i.constants.append(xpt.Constant("A",
+                                        xpt.SimpleType(xpt.Type.Tags.int32),
+                                        -1000000))
+        self.checkRoundtrip(t)
+
+    def test_methods(self):
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        i = xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                          methods=[m])
+        t = xpt.Typelib(interfaces=[i])
+        self.checkRoundtrip(t)
+        # add some more methods
+        i.methods.append(xpt.Method("One", xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                    params=[
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int64)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.float, pointer=True))
+                                        ]))
+        self.checkRoundtrip(t)
+        # test some other types (should really be more thorough)
+        i.methods.append(xpt.Method("Two", xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                    params=[
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.UTF8String, pointer=True)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.wchar_t_ptr, pointer=True))
+                                        ]))
+        self.checkRoundtrip(t)
+        # add a method with an InterfaceType argument
+        bar = xpt.Interface("IBar")
+        t.interfaces.append(bar)
+        i.methods.append(xpt.Method("IFaceMethod", xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                    params=[
+                                        xpt.Param(xpt.InterfaceType(bar))
+                                        ]))
+        self.checkRoundtrip(t)
+
+        # add a method with an InterfaceIsType argument
+        i.methods.append(xpt.Method("IFaceIsMethod", xpt.Param(xpt.SimpleType(xpt.Type.Tags.void)),
+                                    params=[
+                                        xpt.Param(xpt.InterfaceIsType(1)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.nsIID))
+                                        ]))
+        self.checkRoundtrip(t)
+
+        # add a method with an ArrayType argument
+        i.methods.append(xpt.Method("ArrayMethod", xpt.Param(xpt.SimpleType(xpt.Type.Tags.void)),
+                                    params=[
+                                        xpt.Param(xpt.ArrayType(
+                                            xpt.SimpleType(xpt.Type.Tags.int32),
+                                            1, 2)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        ]))
+        self.checkRoundtrip(t)
+        
+        # add a method with a StringWithSize and WideStringWithSize arguments
+        i.methods.append(xpt.Method("StringWithSizeMethod", xpt.Param(xpt.SimpleType(xpt.Type.Tags.void)),
+                                    params=[
+                                        xpt.Param(xpt.StringWithSizeType(
+                                            1, 2)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        xpt.Param(xpt.WideStringWithSizeType(
+                                            4, 5)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32)),
+                                        ]))
+        self.checkRoundtrip(t)
+
+class TestInterfaceCmp(unittest.TestCase):
+    def test_unresolvedName(self):
+        """
+        Test comparison function on xpt.Interface by name.
+        
+        """
+        i1 = xpt.Interface("ABC")
+        i2 = xpt.Interface("DEF")
+        self.assert_(i1 < i2)
+        self.assert_(i1 != i2)
+
+    def test_unresolvedEqual(self):
+        """
+        Test comparison function on xpt.Interface with equal names and IIDs.
+        
+        """
+        i1 = xpt.Interface("ABC")
+        i2 = xpt.Interface("ABC")
+        self.assert_(i1 == i2)
+
+    def test_unresolvedIID(self):
+        """
+        Test comparison function on xpt.Interface with different IIDs.
+        
+        """
+        # IIDs sort before names
+        i1 = xpt.Interface("ABC", iid="22334411-5566-7788-9900-aabbccddeeff")
+        i2 = xpt.Interface("DEF", iid="11223344-5566-7788-9900-aabbccddeeff")
+        self.assert_(i2 < i1)
+        self.assert_(i2 != i1)
+
+    def test_unresolvedResolved(self):
+        """
+        Test comparison function on xpt.Interface with interfaces with
+        identical names and IIDs but different resolved status.
+        
+        """
+        i1 = xpt.Interface("ABC", iid="11223344-5566-7788-9900-aabbccddeeff")
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        i2 = xpt.Interface("ABC", iid="11223344-5566-7788-9900-aabbccddeeff",
+                           methods=[m])
+        self.assert_(i2 < i1)
+        self.assert_(i2 != i1)
+
+    def test_resolvedIdentical(self):
+        """
+        Test comparison function on xpt.Interface with interfaces with
+        identical names and IIDs, both of which are resolved.
+        
+        """
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        i1 = xpt.Interface("ABC", iid="11223344-5566-7788-9900-aabbccddeeff",
+                           methods=[m])
+        i2 = xpt.Interface("ABC", iid="11223344-5566-7788-9900-aabbccddeeff",
+                           methods=[m])
+        self.assert_(i2 == i1)
+
+class TestTypelibMerge(unittest.TestCase):
+    def test_mergeDifferent(self):
+        """
+        Test that merging two typelibs with completely different interfaces
+        produces the correctly merged typelib.
+        
+        """
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        t1.interfaces.append(xpt.Interface("IFoo"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        t2.interfaces.append(xpt.Interface("IBar"))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        # Interfaces should wind up sorted
+        self.assertEqual("IBar", t1.interfaces[0].name)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+
+        # Add some IID values
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        t2.interfaces.append(xpt.Interface("IBar", iid="44332211-6655-8877-0099-aabbccddeeff"))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        # Interfaces should wind up sorted
+        self.assertEqual("IFoo", t1.interfaces[0].name)
+        self.assertEqual("IBar", t1.interfaces[1].name)
+
+    def test_mergeConflict(self):
+        """
+        Test that merging two typelibs with conflicting interface definitions
+        raises an error.
+        
+        """
+        # Same names, different IIDs
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface, same name different IID
+        t2.interfaces.append(xpt.Interface("IFoo", iid="44332211-6655-8877-0099-aabbccddeeff"))
+        self.assertRaises(xpt.DataError, t1.merge, t2)
+
+        # Same IIDs, different names
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface, same IID different name
+        t2.interfaces.append(xpt.Interface("IBar", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        self.assertRaises(xpt.DataError, t1.merge, t2)
+
+    def test_mergeUnresolvedIID(self):
+        """
+        Test that merging a typelib with an unresolved definition of
+        an interface that's also unresolved in this typelib, but one
+        has a valid IID copies the IID value to the resulting typelib.
+
+        """
+        # Unresolved in both, but t1 has an IID value
+        t1 = xpt.Typelib()
+        # add an unresolved interface with a valid IID
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface, no IID
+        t2.interfaces.append(xpt.Interface("IFoo"))
+        t1.merge(t2)
+        
+        self.assertEqual(1, len(t1.interfaces))
+        self.assertEqual("IFoo", t1.interfaces[0].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[0].iid)
+        # Unresolved in both, but t2 has an IID value
+        t1 = xpt.Typelib()
+        # add an unresolved interface, no IID
+        t1.interfaces.append(xpt.Interface("IFoo"))
+        t2 = xpt.Typelib()
+        # add an unresolved interface with a valid IID
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff"))
+        t1.merge(t2)
+        
+        self.assertEqual(1, len(t1.interfaces))
+        self.assertEqual("IFoo", t1.interfaces[0].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[0].iid)
+
+    def test_mergeResolvedUnresolved(self):
+        """
+        Test that merging two typelibs, one of which contains an unresolved
+        reference to an interface, and the other of which contains a
+        resolved reference to the same interface results in keeping the
+        resolved reference.
+
+        """
+        # t1 has an unresolved interface, t2 has a resolved version
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        t1.interfaces.append(xpt.Interface("IFoo"))
+        t2 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(1, len(t1.interfaces))
+        self.assertEqual("IFoo", t1.interfaces[0].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[0].iid)
+        self.assert_(t1.interfaces[0].resolved)
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assertEqual("Bar", t1.interfaces[0].methods[0].name)
+
+        # t1 has a resolved interface, t2 has an unresolved version
+        t1 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        t2.interfaces.append(xpt.Interface("IFoo"))
+        t1.merge(t2)
+        
+        self.assertEqual(1, len(t1.interfaces))
+        self.assertEqual("IFoo", t1.interfaces[0].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[0].iid)
+        self.assert_(t1.interfaces[0].resolved)
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assertEqual("Bar", t1.interfaces[0].methods[0].name)
+
+    def test_mergeReplaceParents(self):
+        """
+        Test that merging an interface results in other interfaces' parent
+        member being updated properly.
+
+        """
+        # t1 has an unresolved interface, t2 has a resolved version,
+        # but t1 also has another interface whose parent is the unresolved
+        # interface.
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        pi = xpt.Interface("IFoo")
+        t1.interfaces.append(pi)
+        # add a child of the unresolved interface
+        t1.interfaces.append(xpt.Interface("IChild", iid="11111111-1111-1111-1111-111111111111",
+                                           resolved=True, parent=pi))
+        t2 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IChild", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[0].resolved)
+        # Ensure that IChild's parent has been updated
+        self.assertEqual(t1.interfaces[1], t1.interfaces[0].parent)
+        self.assert_(t1.interfaces[0].parent.resolved)
+
+        # t1 has a resolved interface, t2 has an unresolved version,
+        # but t2 also has another interface whose parent is the unresolved
+        # interface.
+        t1 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        pi = xpt.Interface("IFoo")
+        t2.interfaces.append(pi)
+        # add a child of the unresolved interface
+        t2.interfaces.append(xpt.Interface("IChild", iid="11111111-1111-1111-1111-111111111111",
+                                           resolved=True, parent=pi))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IChild", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[0].resolved)
+        # Ensure that IChild's parent has been updated
+        self.assertEqual(t1.interfaces[1], t1.interfaces[0].parent)
+        self.assert_(t1.interfaces[0].parent.resolved)
+
+    def test_mergeReplaceRetval(self):
+        """
+        Test that merging an interface correctly updates InterfaceType
+        return values on methods of other interfaces.
+
+        """
+        # t1 has an unresolved interface and an interface that uses the
+        # unresolved interface as a return value from a method. t2
+        # has a resolved version of the unresolved interface.
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        i = xpt.Interface("IFoo")
+        t1.interfaces.append(i)
+        # add an interface that uses the unresolved interface
+        # as a return value in a method.
+        p = xpt.Param(xpt.InterfaceType(i))
+        m = xpt.Method("ReturnIface", p)
+        t1.interfaces.append(xpt.Interface("IRetval", iid="11111111-1111-1111-1111-111111111111",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IRetval", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[1].resolved)
+        # Ensure that IRetval's method's return value type has been updated.
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assert_(t1.interfaces[0].methods[0].result.type.iface.resolved)
+        self.assertEqual(t1.interfaces[1],
+                         t1.interfaces[0].methods[0].result.type.iface)
+
+        # t1 has a resolved interface. t2 has an unresolved version and
+        # an interface that uses the unresolved interface as a return value
+        # from a method.
+        t1 = xpt.Typelib()
+        # add a resolved interface
+        p = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        m = xpt.Method("Bar", p)
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        i = xpt.Interface("IFoo")
+        t2.interfaces.append(i)
+        # add an interface that uses the unresolved interface
+        # as a return value in a method.
+        p = xpt.Param(xpt.InterfaceType(i))
+        m = xpt.Method("ReturnIface", p)
+        t2.interfaces.append(xpt.Interface("IRetval", iid="11111111-1111-1111-1111-111111111111",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IRetval", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[1].resolved)
+        # Ensure that IRetval's method's return value type has been updated.
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assert_(t1.interfaces[0].methods[0].result.type.iface.resolved)
+        self.assertEqual(t1.interfaces[1],
+                         t1.interfaces[0].methods[0].result.type.iface)
+
+    def test_mergeReplaceParams(self):
+        """
+        Test that merging an interface correctly updates InterfaceType
+        params on methods of other interfaces.
+
+        """
+        # t1 has an unresolved interface and an interface that uses the
+        # unresolved interface as a param value in a method. t2
+        # has a resolved version of the unresolved interface.
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        i = xpt.Interface("IFoo")
+        t1.interfaces.append(i)
+        # add an interface that uses the unresolved interface
+        # as a param value in a method.
+        vp = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        p = xpt.Param(xpt.InterfaceType(i))
+        m = xpt.Method("IfaceParam", vp, params=[p])
+        t1.interfaces.append(xpt.Interface("IParam", iid="11111111-1111-1111-1111-111111111111",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add a resolved interface
+        m = xpt.Method("Bar", vp)
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IParam", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[1].resolved)
+        # Ensure that IRetval's method's param type has been updated.
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assert_(t1.interfaces[0].methods[0].params[0].type.iface.resolved)
+        self.assertEqual(t1.interfaces[1],
+                         t1.interfaces[0].methods[0].params[0].type.iface)
+
+        # t1 has a resolved interface. t2 has an unresolved version
+        # and an interface that uses the unresolved interface as a
+        # param value in a method.
+        t1 = xpt.Typelib()
+        # add a resolved interface
+        m = xpt.Method("Bar", vp)
+        t1.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add an unresolved interface
+        i = xpt.Interface("IFoo")
+        t2.interfaces.append(i)
+        # add an interface that uses the unresolved interface
+        # as a param value in a method.
+        vp = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        p = xpt.Param(xpt.InterfaceType(i))
+        m = xpt.Method("IfaceParam", vp, params=[p])
+        t2.interfaces.append(xpt.Interface("IParam", iid="11111111-1111-1111-1111-111111111111",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IParam", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[1].resolved)
+        # Ensure that IRetval's method's param type has been updated.
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assert_(t1.interfaces[0].methods[0].params[0].type.iface.resolved)
+        self.assertEqual(t1.interfaces[1],
+                         t1.interfaces[0].methods[0].params[0].type.iface)
+
+
+    def test_mergeReplaceArrayTypeParams(self):
+        """
+        Test that merging an interface correctly updates ArrayType
+        params whose element_type is an InterfaceType on methods
+        of other interfaces.
+
+        """
+        # t1 has an unresolved interface and an interface that uses the
+        # unresolved interface as a type in an ArrayType in a parameter
+        # of a method. t2 has a resolved version of the unresolved interface.
+        t1 = xpt.Typelib()
+        # add an unresolved interface
+        i = xpt.Interface("IFoo")
+        t1.interfaces.append(i)
+        # add an interface that uses the unresolved interface
+        # as a type in an ArrayType in a param value in a method.
+        vp = xpt.Param(xpt.SimpleType(xpt.Type.Tags.void))
+        intp = xpt.Param(xpt.SimpleType(xpt.Type.Tags.int32))
+        p = xpt.Param(xpt.ArrayType(xpt.InterfaceType(i), 1, 2))
+        m = xpt.Method("ArrayIfaceParam", vp, params=[p, intp, intp])
+        t1.interfaces.append(xpt.Interface("IParam", iid="11111111-1111-1111-1111-111111111111",
+                                           methods=[m]))
+        t2 = xpt.Typelib()
+        # add a resolved interface
+        m = xpt.Method("Bar", vp)
+        t2.interfaces.append(xpt.Interface("IFoo", iid="11223344-5566-7788-9900-aabbccddeeff",
+                                           methods=[m]))
+        t1.merge(t2)
+        
+        self.assertEqual(2, len(t1.interfaces))
+        self.assertEqual("IParam", t1.interfaces[0].name)
+        self.assertEqual("11111111-1111-1111-1111-111111111111", t1.interfaces[0].iid)
+        self.assertEqual("IFoo", t1.interfaces[1].name)
+        self.assertEqual("11223344-5566-7788-9900-aabbccddeeff", t1.interfaces[1].iid)
+        self.assert_(t1.interfaces[1].resolved)
+        # Ensure that IRetval's method's param type has been updated.
+        self.assertEqual(1, len(t1.interfaces[0].methods))
+        self.assert_(t1.interfaces[0].methods[0].params[0].type.element_type.iface.resolved)
+        self.assertEqual(t1.interfaces[1],
+                         t1.interfaces[0].methods[0].params[0].type.element_type.iface)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/xpcom/typelib/xpt/tools/xpt.py b/xpcom/typelib/xpt/tools/xpt.py
new file mode 100644
index 000000000000..0de9451a0623
--- /dev/null
+++ b/xpcom/typelib/xpt/tools/xpt.py
@@ -0,0 +1,1318 @@
+#!/usr/bin/env python
+# Copyright 2010,2011 Mozilla Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#   1. Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in
+#      the documentation and/or other materials provided with the
+#      distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE MOZILLA FOUNDATION ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MOZILLA FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation
+# are those of the authors and should not be interpreted as representing
+# official policies, either expressed or implied, of the Mozilla
+# Foundation.
+
+"""
+A module for working with XPCOM Type Libraries.
+
+The XPCOM Type Library File Format is described at:
+http://www.mozilla.org/scriptable/typelib_file.html . It is used
+to provide type information for calling methods on XPCOM objects
+from scripting languages such as JavaScript.
+
+This module provides a set of classes representing the parts of
+a typelib in a high-level manner, as well as methods for reading
+and writing them from files.
+
+The usable public interfaces are currently:
+Typelib.read(filename) - read a typelib from a file on disk, return
+                         a Typelib object.
+
+xpt_dump(filename)     - read a typelib from a file on disk, dump
+                         the contents to stdout in a human-readable
+                         format.
+
+Typelib()              - construct a new Typelib object
+Interface()            - construct a new Interface object
+Method()               - construct a new object representing a method
+                         defined on an Interface
+Constant()             - construct a new object representing a constant
+                         defined on an Interface
+Param()                - construct a new object representing a parameter
+                         to a method
+SimpleType()           - construct a new object representing a simple
+                         data type
+InterfaceType()        - construct a new object representing a type that
+                         is an IDL-defined interface
+
+"""
+
+from __future__ import with_statement
+import mmap
+import os, sys
+import struct
+
+# header magic
+XPT_MAGIC = "XPCOM\nTypeLib\r\n\x1a"
+TYPELIB_VERSION = (1, 2)
+
+class FileFormatError(Exception):
+    pass
+
+class DataError(Exception):
+    pass
+
+# Magic for creating enums
+def M_add_class_attribs(attribs):
+    def foo(name, bases, dict_):
+        for v, k in attribs:
+            dict_[k] = v
+        return type(name, bases, dict_)
+    return foo
+
+def enum(*names):
+    class Foo(object):
+        __metaclass__ = M_add_class_attribs(enumerate(names))
+        def __setattr__(self, name, value):  # this makes it read-only
+            raise NotImplementedError
+    return Foo()
+
+# Descriptor types as described in the spec
+class Type(object):
+    """
+    Data type of a method parameter or return value. Do not instantiate
+    this class directly. Rather, use one of its subclasses.
+    
+    """
+    _prefixdescriptor = struct.Struct(">B")
+    Tags = enum(
+        # The first 18 entries are SimpleTypeDescriptor
+        'int8',
+        'int16',
+        'int32',
+        'int64',
+        'uint8',
+        'uint16',
+        'uint32',
+        'uint64',
+        'float',
+        'double',
+        'boolean',
+        'char',
+        'wchar_t',
+        'void',
+        # the following four values are only valid as pointers
+        'nsIID',
+        'DOMString',
+        'char_ptr',
+        'wchar_t_ptr',
+        # InterfaceTypeDescriptor
+        'Interface',
+        # InterfaceIsTypeDescriptor
+        'InterfaceIs',
+        # ArrayTypeDescriptor
+        'Array',
+        # StringWithSizeTypeDescriptor
+        'StringWithSize',
+        # WideStringWithSizeTypeDescriptor
+        'WideStringWithSize',
+        #XXX: These are also SimpleTypes (but not in the spec)
+        # http://hg.mozilla.org/mozilla-central/annotate/0e0e2516f04e/xpcom/typelib/xpt/tools/xpt_dump.c#l69
+        'UTF8String',
+        'CString',
+        'AString',
+        'jsval',
+        )
+
+    def __init__(self, pointer=False, unique_pointer=False, reference=False):
+        self.pointer = pointer
+        self.unique_pointer = unique_pointer
+        self.reference = reference
+
+    @staticmethod
+    def decodeflags(byte):
+        """
+        Given |byte|, an unsigned uint8 containing flag bits,
+        decode the flag bits as described in
+        http://www.mozilla.org/scriptable/typelib_file.html#TypeDescriptor
+        and return a dict of flagname: (True|False) suitable
+        for passing to Type.__init__ as **kwargs.
+        
+        """
+        return {'pointer': bool(byte & 0x80),
+                'unique_pointer': bool(byte & 0x40),
+                'reference': bool(byte & 0x20),
+                }
+
+    def encodeflags(self):
+        """
+        Encode the flag bits of this Type object. Returns a byte.
+
+        """
+        flags = 0
+        if self.pointer:
+            flags |= 0x80
+        if self.unique_pointer:
+            flags |= 0x40
+        if self.reference:
+            flags |= 0x20
+        return flags
+    
+    @staticmethod
+    def read(typelib, map, data_pool, offset):
+        """
+        Read a TypeDescriptor at |offset| from the mmaped file |map| with
+        data pool offset |data_pool|. Returns (Type, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this TypeDescriptor.
+        
+        """
+        start = data_pool + offset - 1
+        (data,) = Type._prefixdescriptor.unpack(map[start:start + Type._prefixdescriptor.size])
+        # first three bits are the flags
+        flags = data & 0xE0
+        flags = Type.decodeflags(flags)
+        # last five bits is the tag
+        tag = data & 0x1F
+        offset += Type._prefixdescriptor.size
+        t = None
+        if tag <= Type.Tags.wchar_t_ptr or tag >= Type.Tags.UTF8String:
+            t = SimpleType.get(data, tag, flags)
+        elif tag == Type.Tags.Interface:
+            t, offset = InterfaceType.read(typelib, map, data_pool, offset, flags)
+        elif tag == Type.Tags.InterfaceIs:
+            t, offset = InterfaceIsType.read(typelib, map, data_pool, offset, flags)
+        elif tag == Type.Tags.Array:
+            t, offset = ArrayType.read(typelib, map, data_pool, offset, flags)
+        elif tag == Type.Tags.StringWithSize:
+            t, offset = StringWithSizeType.read(typelib, map, data_pool, offset, flags)
+        elif tag == Type.Tags.WideStringWithSize:
+            t, offset = WideStringWithSizeType.read(typelib, map, data_pool, offset, flags)
+        return t, offset
+
+    def write(self, typelib, file):
+        """
+        Write a TypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position. For types other than
+        SimpleType, this is not sufficient for writing the TypeDescriptor,
+        and the subclass method must be called.
+
+        """
+        file.write(Type._prefixdescriptor.pack(self.encodeflags() | self.tag))
+
+class SimpleType(Type):
+    """
+    A simple data type. (SimpleTypeDescriptor from the typelib specification.)
+
+    """
+    _cache = {}
+
+    def __init__(self, tag, **kwargs):
+        Type.__init__(self, **kwargs)
+        self.tag = tag
+
+    @staticmethod
+    def get(data, tag, flags):
+        """
+        Get a SimpleType object representing |data| (a TypeDescriptorPrefix).
+        May return an already-created object. If no cached object is found,
+        construct one with |tag| and |flags|.
+        
+        """
+        if data not in SimpleType._cache:
+            SimpleType._cache[data] = SimpleType(tag, **flags)
+        return SimpleType._cache[data]
+
+    def __str__(self):
+        s = "unknown"
+        if self.tag == Type.Tags.char_ptr and self.pointer:
+            return "string"
+        if self.tag == Type.Tags.wchar_t_ptr and self.pointer:
+            return "wstring"
+        for t in dir(Type.Tags):
+            if self.tag == getattr(Type.Tags, t):
+                s = t
+                break
+
+        if self.pointer:
+            if self.reference:
+                s += " &"
+            else:
+                s += " *"
+        return s
+
+class InterfaceType(Type):
+    """
+    A type representing a pointer to an IDL-defined interface.
+    (InterfaceTypeDescriptor from the typelib specification.)
+
+    """
+    _descriptor = struct.Struct(">H")
+
+    def __init__(self, iface, pointer=True, **kwargs):
+        if not pointer:
+            raise DataError, "InterfaceType is not valid with pointer=False"
+        Type.__init__(self, pointer=pointer, **kwargs)
+        self.iface = iface
+        self.tag = Type.Tags.Interface
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset, flags):
+        """
+        Read an InterfaceTypeDescriptor at |offset| from the mmaped
+        file |map| with data pool offset |data_pool|.
+        Returns (InterfaceType, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this InterfaceTypeDescriptor.
+        
+        """
+        if not flags['pointer']:
+            return None, offset
+        start = data_pool + offset - 1
+        (iface_index,) = InterfaceType._descriptor.unpack(map[start:start + InterfaceType._descriptor.size])
+        offset += InterfaceType._descriptor.size
+        iface = None
+        # interface indices are 1-based
+        if iface_index > 0 and iface_index <= len(typelib.interfaces):
+            iface = typelib.interfaces[iface_index - 1]
+        return InterfaceType(iface, **flags), offset
+
+    def write(self, typelib, file):
+        """
+        Write an InterfaceTypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        Type.write(self, typelib, file)
+        # write out the interface index (1-based)
+        file.write(InterfaceType._descriptor.pack(typelib.interfaces.index(self.iface) + 1))
+
+    def __str__(self):
+        if self.iface:
+            return self.iface.name
+        return "unknown interface"
+
+class InterfaceIsType(Type):
+    """
+    A type representing an interface described by one of the other
+    arguments to the method. (InterfaceIsTypeDescriptor from the
+    typelib specification.)
+    
+    """
+    _descriptor = struct.Struct(">B")
+    _cache = {}
+
+    def __init__(self, param_index, pointer=True, **kwargs):
+        if not pointer:
+            raise DataError, "InterfaceIsType is not valid with pointer=False"
+        Type.__init__(self, pointer=pointer, **kwargs)
+        self.param_index = param_index
+        self.tag = Type.Tags.InterfaceIs
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset, flags):
+        """
+        Read an InterfaceIsTypeDescriptor at |offset| from the mmaped
+        file |map| with data pool offset |data_pool|.
+        Returns (InterfaceIsType, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this InterfaceIsTypeDescriptor.
+        May return a cached value.
+        
+        """
+        if not flags['pointer']:
+            return None, offset
+        start = data_pool + offset - 1
+        (param_index,) = InterfaceIsType._descriptor.unpack(map[start:start + InterfaceIsType._descriptor.size])
+        offset += InterfaceIsType._descriptor.size
+        if param_index not in InterfaceIsType._cache:
+            InterfaceIsType._cache[param_index] = InterfaceIsType(param_index, **flags)
+        return InterfaceIsType._cache[param_index], offset
+
+    def write(self, typelib, file):
+        """
+        Write an InterfaceIsTypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        Type.write(self, typelib, file)
+        file.write(InterfaceIsType._descriptor.pack(self.param_index))
+
+    def __str__(self):
+        return "InterfaceIs *"
+
+class ArrayType(Type):
+    """
+    A type representing an Array of elements of another type, whose
+    size and length are passed as separate parameters to a method.
+    (ArrayTypeDescriptor from the typelib specification.)
+    
+    """
+    _descriptor = struct.Struct(">BB")
+
+    def __init__(self, element_type, size_is_arg_num, length_is_arg_num,
+                 pointer=True, **kwargs):
+        if not pointer:
+            raise DataError, "ArrayType is not valid with pointer=False"
+        Type.__init__(self, pointer=pointer, **kwargs)
+        self.element_type = element_type
+        self.size_is_arg_num = size_is_arg_num
+        self.length_is_arg_num = length_is_arg_num
+        self.tag = Type.Tags.Array
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset, flags):
+        """
+        Read an ArrayTypeDescriptor at |offset| from the mmaped
+        file |map| with data pool offset |data_pool|.
+        Returns (ArrayType, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this ArrayTypeDescriptor.
+        """
+        if not flags['pointer']:
+            return None, offset
+        start = data_pool + offset - 1
+        (size_is_arg_num, length_is_arg_num) = ArrayType._descriptor.unpack(map[start:start + ArrayType._descriptor.size])
+        offset += ArrayType._descriptor.size
+        t, offset = Type.read(typelib, map, data_pool, offset)
+        return ArrayType(t, size_is_arg_num, length_is_arg_num, **flags), offset
+
+    def write(self, typelib, file):
+        """
+        Write an ArrayTypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        Type.write(self, typelib, file)
+        file.write(ArrayType._descriptor.pack(self.size_is_arg_num,
+                                              self.length_is_arg_num))
+        self.element_type.write(typelib, file)
+
+    def __str__(self):
+        return "%s []" % str(self.element_type)
+
+class StringWithSizeType(Type):
+    """
+    A type representing a UTF-8 encoded string whose size and length
+    are passed as separate arguments to a method. (StringWithSizeTypeDescriptor
+    from the typelib specification.)
+
+    """
+    _descriptor = struct.Struct(">BB")
+
+    def __init__(self, size_is_arg_num, length_is_arg_num,
+                 pointer=True, **kwargs):
+        if not pointer:
+            raise DataError, "StringWithSizeType is not valid with pointer=False"
+        Type.__init__(self, pointer=pointer, **kwargs)
+        self.size_is_arg_num = size_is_arg_num
+        self.length_is_arg_num = length_is_arg_num
+        self.tag = Type.Tags.StringWithSize
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset, flags):
+        """
+        Read an StringWithSizeTypeDescriptor at |offset| from the mmaped
+        file |map| with data pool offset |data_pool|.
+        Returns (StringWithSizeType, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this StringWithSizeTypeDescriptor.
+        """
+        if not flags['pointer']:
+            return None, offset
+        start = data_pool + offset - 1
+        (size_is_arg_num, length_is_arg_num) = StringWithSizeType._descriptor.unpack(map[start:start + StringWithSizeType._descriptor.size])
+        offset += StringWithSizeType._descriptor.size
+        return StringWithSizeType(size_is_arg_num, length_is_arg_num, **flags), offset
+    
+    def write(self, typelib, file):
+        """
+        Write a StringWithSizeTypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        Type.write(self, typelib, file)
+        file.write(StringWithSizeType._descriptor.pack(self.size_is_arg_num,
+                                                       self.length_is_arg_num))
+        
+    def __str__(self):
+        return "string_s"
+
+class WideStringWithSizeType(Type):
+    """
+    A type representing a UTF-16 encoded string whose size and length
+    are passed as separate arguments to a method.
+    (WideStringWithSizeTypeDescriptor from the typelib specification.)
+
+    """    
+    _descriptor = struct.Struct(">BB")
+
+    def __init__(self, size_is_arg_num, length_is_arg_num,
+                 pointer=True, **kwargs):
+        if not pointer:
+            raise DataError, "WideStringWithSizeType is not valid with pointer=False"
+        Type.__init__(self, pointer=pointer, **kwargs)
+        self.size_is_arg_num = size_is_arg_num
+        self.length_is_arg_num = length_is_arg_num
+        self.tag = Type.Tags.WideStringWithSize
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset, flags):
+        """
+        Read an WideStringWithSizeTypeDescriptor at |offset| from the mmaped
+        file |map| with data pool offset |data_pool|.
+        Returns (WideStringWithSizeType, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this WideStringWithSizeTypeDescriptor.
+        """
+        if not flags['pointer']:
+            return None, offset
+        start = data_pool + offset - 1
+        (size_is_arg_num, length_is_arg_num) = WideStringWithSizeType._descriptor.unpack(map[start:start + WideStringWithSizeType._descriptor.size])
+        offset += WideStringWithSizeType._descriptor.size
+        return WideStringWithSizeType(size_is_arg_num, length_is_arg_num, **flags), offset
+
+    def write(self, typelib, file):
+        """
+        Write a WideStringWithSizeTypeDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        Type.write(self, typelib, file)
+        file.write(WideStringWithSizeType._descriptor.pack(self.size_is_arg_num,
+                                                           self.length_is_arg_num))
+
+    def __str__(self):
+        return "wstring_s"
+
+class Param(object):
+    """
+    A parameter to a method, or the return value of a method.
+    (ParamDescriptor from the typelib specification.)
+
+    """
+    _descriptorstart = struct.Struct(">B")
+
+    def __init__(self, type, in_=True, out=False, retval=False,
+                 shared=False, dipper=False, optional=False):
+        """
+        Construct a Param object with the specified |type| and
+        flags. Params default to "in".
+
+        """
+        self.type = type
+        self.in_ = in_
+        self.out = out
+        self.retval = retval
+        self.shared = shared
+        self.dipper = dipper
+        self.optional = optional
+
+    @staticmethod
+    def decodeflags(byte):
+        """
+        Given |byte|, an unsigned uint8 containing flag bits,
+        decode the flag bits as described in
+        http://www.mozilla.org/scriptable/typelib_file.html#ParamDescriptor
+        and return a dict of flagname: (True|False) suitable
+        for passing to Param.__init__ as **kwargs
+        """
+        return {'in_': bool(byte & 0x80),
+                'out': bool(byte & 0x40),
+                'retval': bool(byte & 0x20),
+                'shared': bool(byte & 0x10),
+                'dipper': bool(byte & 0x08),
+                #XXX: Not in the spec, see:
+                # http://hg.mozilla.org/mozilla-central/annotate/0e0e2516f04e/xpcom/typelib/xpt/public/xpt_struct.h#l456
+                'optional': bool(byte & 0x04),
+                }
+
+    def encodeflags(self):
+        """
+        Encode the flags of this Param. Return a byte suitable for
+        writing to a typelib file.
+
+        """
+        flags = 0
+        if self.in_:
+            flags |= 0x80
+        if self.out:
+            flags |= 0x40
+        if self.retval:
+            flags |= 0x20
+        if self.shared:
+            flags |= 0x10
+        if self.dipper:
+            flags |= 0x08
+        if self.optional:
+            flags |= 0x04
+        return flags
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset):
+        """
+        Read a ParamDescriptor at |offset| from the mmaped file |map| with
+        data pool offset |data_pool|. Returns (Param, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this ParamDescriptor.
+        """
+        start = data_pool + offset - 1
+        (flags,) = Param._descriptorstart.unpack(map[start:start + Param._descriptorstart.size])
+        # only the first five bits are flags
+        flags &= 0xFC
+        flags = Param.decodeflags(flags)
+        offset += Param._descriptorstart.size
+        t, offset = Type.read(typelib, map, data_pool, offset)
+        p = Param(t, **flags)
+        return p, offset
+
+    def write(self, typelib, file):
+        """
+        Write a ParamDescriptor to |file|, which is assumed to be seeked
+        to the correct position.
+
+        """
+        file.write(Param._descriptorstart.pack(self.encodeflags()))
+        self.type.write(typelib, file)
+
+    def prefix(self):
+        """
+        Return a human-readable string representing the flags set
+        on this Param.
+
+        """
+        s = ""
+        if self.out:
+            if self.in_:
+                s = "inout "
+            else:
+                s = "out "
+        else:
+            s = "in "
+        if self.dipper:
+            s += "dipper "
+        if self.retval:
+            s += "retval "
+        if self.shared:
+            s += "shared "
+        if self.optional:
+            s += "optional "
+        return s
+            
+    def __str__(self):
+        return self.prefix() + str(self.type)
+
+class Method(object):
+    """
+    A method of an interface, defining its associated parameters
+    and return value.
+    (MethodDescriptor from the typelib specification.)
+    
+    """
+    _descriptorstart = struct.Struct(">BIB")
+    
+    def __init__(self, name, result,
+                 params=[], getter=False, setter=False, notxpcom=False,
+                 constructor=False, hidden=False, optargc=False,
+                 implicit_jscontext=False):
+        self.name = name
+        self._name_offset = 0
+        self.getter = getter
+        self.setter = setter
+        self.notxpcom = notxpcom
+        self.constructor = constructor
+        self.hidden = hidden
+        self.optargc = optargc
+        self.implicit_jscontext = implicit_jscontext
+        self.params = list(params)
+        self.result = result
+
+    def read_params(self, typelib, map, data_pool, offset, num_args):
+        """
+        Read |num_args| ParamDescriptors representing this Method's arguments
+        from the mmaped file |map| with data pool at the offset |data_pool|,
+        starting at |offset| into self.params. Returns the offset
+        suitable for reading the data following the ParamDescriptor array.
+        
+        """
+        for i in range(num_args):
+            p, offset = Param.read(typelib, map, data_pool, offset)
+            self.params.append(p)
+        return offset
+
+    def read_result(self, typelib, map, data_pool, offset):
+        """
+        Read a ParamDescriptor representing this Method's return type
+        from the mmaped file |map| with data pool at the offset |data_pool|,
+        starting at |offset| into self.result. Returns the offset
+        suitable for reading the data following the ParamDescriptor.
+        
+        """
+        self.result, offset = Param.read(typelib, map, data_pool, offset)
+        return offset
+
+    @staticmethod
+    def decodeflags(byte):
+        """
+        Given |byte|, an unsigned uint8 containing flag bits,
+        decode the flag bits as described in
+        http://www.mozilla.org/scriptable/typelib_file.html#MethodDescriptor
+        and return a dict of flagname: (True|False) suitable
+        for passing to Method.__init__ as **kwargs
+        
+        """
+        return {'getter': bool(byte & 0x80),
+                'setter': bool(byte & 0x40),
+                'notxpcom': bool(byte & 0x20),
+                'constructor': bool(byte & 0x10),
+                'hidden': bool(byte & 0x08),
+                # Not in the spec, see
+                # http://hg.mozilla.org/mozilla-central/annotate/0e0e2516f04e/xpcom/typelib/xpt/public/xpt_struct.h#l489
+                'optargc': bool(byte & 0x04),
+                'implicit_jscontext': bool(byte & 0x02),
+                }
+
+    def encodeflags(self):
+        """
+        Encode the flags of this Method object, return a byte suitable
+        for writing to a typelib file.
+
+        """
+        flags = 0
+        if self.getter:
+            flags |= 0x80
+        if self.setter:
+            flags |= 0x40
+        if self.notxpcom:
+            flags |= 0x20
+        if self.constructor:
+            flags |= 0x10
+        if self.hidden:
+            flags |= 0x08
+        if self.optargc:
+            flags |= 0x04
+        if self.implicit_jscontext:
+            flags |= 0x02
+        return flags
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset):
+        """
+        Read a MethodDescriptor at |offset| from the mmaped file |map| with
+        data pool offset |data_pool|. Returns (Method, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this MethodDescriptor.
+        
+        """
+        start = data_pool + offset - 1
+        flags, name_offset, num_args = Method._descriptorstart.unpack(map[start:start + Method._descriptorstart.size])
+        # only the first seven bits are flags
+        flags &= 0xFE
+        flags = Method.decodeflags(flags)
+        name = Typelib.read_string(map, data_pool, name_offset)
+        m = Method(name, None, **flags)
+        offset += Method._descriptorstart.size
+        offset = m.read_params(typelib, map, data_pool, offset, num_args)
+        offset = m.read_result(typelib, map, data_pool, offset)
+        return m, offset
+
+    def write(self, typelib, file):
+        """
+        Write a MethodDescriptor to |file|, which is assumed to be
+        seeked to the right position.
+
+        """
+        file.write(Method._descriptorstart.pack(self.encodeflags(),
+                                                self._name_offset,
+                                                len(self.params)))
+        for p in self.params:
+            p.write(typelib, file)
+        self.result.write(typelib, file)
+
+    def write_name(self, file, data_pool_offset):
+        """
+        Write this method's name to |file|.
+        Assumes that |file| is currently seeked to an unused portion
+        of the data pool.
+
+        """
+        if self.name:
+            self._name_offset = file.tell() - data_pool_offset + 1
+            file.write(self.name + "\x00")
+        else:
+            self._name_offset = 0
+
+class Constant(object):
+    """
+    A constant value of a specific type defined on an interface.
+    (ConstantDesciptor from the typelib specification.)
+
+    """
+    _descriptorstart = struct.Struct(">I")
+    # Actual value is restricted to this set of types
+    #XXX: the spec lies, the source allows a bunch more
+    # http://hg.mozilla.org/mozilla-central/annotate/9c85f9aaec8c/xpcom/typelib/xpt/src/xpt_struct.c#l689
+    typemap = {Type.Tags.int16: '>h',
+               Type.Tags.uint16: '>H',
+               Type.Tags.int32: '>i',
+               Type.Tags.uint32: '>I'}
+
+    def __init__(self, name, type, value):
+        self.name = name
+        self._name_offset = 0        
+        self.type = type
+        self.value = value
+
+    @staticmethod
+    def read(typelib, map, data_pool, offset):
+        """
+        Read a ConstDescriptor at |offset| from the mmaped file |map| with
+        data pool offset |data_pool|. Returns (Constant, next offset),
+        where |next offset| is an offset suitable for reading the data
+        following this ConstDescriptor.
+        
+        """
+        start = data_pool + offset - 1
+        (name_offset,) = Constant._descriptorstart.unpack(map[start:start + Constant._descriptorstart.size])
+        name = Typelib.read_string(map, data_pool, name_offset)
+        offset += Constant._descriptorstart.size
+        # Read TypeDescriptor
+        t, offset = Type.read(typelib, map, data_pool, offset)
+        c = None
+        if isinstance(t, SimpleType) and t.tag in Constant.typemap:
+            tt = Constant.typemap[t.tag]
+            start = data_pool + offset - 1
+            (val,) = struct.unpack(tt, map[start:start + struct.calcsize(tt)])
+            offset += struct.calcsize(tt)
+            c = Constant(name, t, val)
+        return c, offset
+
+    def write(self, typelib, file):
+        """
+        Write a ConstDescriptor to |file|, which is assumed
+        to be seeked to the proper position.
+
+        """
+        file.write(Constant._descriptorstart.pack(self._name_offset))
+        self.type.write(typelib, file)
+        tt = Constant.typemap[self.type.tag]
+        file.write(struct.pack(tt, self.value))
+
+    def write_name(self, file, data_pool_offset):
+        """
+        Write this constants's name to |file|.
+        Assumes that |file| is currently seeked to an unused portion
+        of the data pool.
+
+        """
+        if self.name:
+            self._name_offset = file.tell() - data_pool_offset + 1
+            file.write(self.name + "\x00")
+        else:
+            self._name_offset = 0
+
+    def __repr__(self):
+        return "Constant(%s, %s, %d)" % (self.name, str(self.type), self.value)
+
+class Interface(object):
+    """
+    An Interface represents an object, with its associated methods
+    and constant values.
+    (InterfaceDescriptor from the typelib specification.)
+    
+    """
+    _direntry = struct.Struct(">16sIII")    
+    _descriptorstart = struct.Struct(">HH")
+
+    UNRESOLVED_IID = "00000000-0000-0000-0000-000000000000"
+    
+    def __init__(self, name, iid=UNRESOLVED_IID, namespace="",
+                 resolved=False, parent=None, methods=[], constants=[],
+                 scriptable=False, function=False):
+        self.resolved = resolved
+        #TODO: should validate IIDs!
+        self.iid = iid
+        self.name = name
+        self.namespace = namespace
+        # if unresolved, all the members following this are unusable
+        self.parent = parent
+        self.methods = list(methods)
+        self.constants = list(constants)
+        self.scriptable = scriptable
+        self.function = function
+        # For sanity, if someone constructs an Interface and passes
+        # in methods or constants, then it's resolved.
+        if self.methods or self.constants:
+            # make sure it has a valid IID
+            if self.iid == Interface.UNRESOLVED_IID:
+                raise DataError, "Cannot instantiate Interface %s containing methods or constants with an unresolved IID" % self.name
+            self.resolved = True
+        # These are only used for writing out the interface
+        self._descriptor_offset = 0
+        self._name_offset = 0
+        self._namespace_offset = 0
+
+    def __repr__(self):
+        return "Interface('%s', '%s', '%s', methods=%s)" % (self.name, self.iid, self.namespace, self.methods)
+
+    def __str__(self):
+        return "Interface(name='%s', iid='%s')" % (self.name, self.iid)
+
+    def __cmp__(self, other):
+        c = cmp(self.iid, other.iid)
+        if c != 0:
+            return c
+        c = cmp(self.name, other.name)
+        if c != 0:
+            return c
+        c = cmp(self.namespace, other.namespace)
+        if c != 0:
+            return c
+        # names and IIDs are the same, check resolved
+        if self.resolved != other.resolved:
+            if self.resolved:
+                return -1
+            else:
+                return 1
+        else:
+            # both unresolved, but names and IIDs are the same, so equal
+            return 0
+        #TODO: actually compare methods etc
+        return 0
+
+    def read_descriptor(self, typelib, map, data_pool):
+        offset = self._descriptor_offset
+        if offset == 0:
+            return
+        start = data_pool + offset - 1
+        parent, num_methods = Interface._descriptorstart.unpack(map[start:start + Interface._descriptorstart.size])
+        if parent > 0 and parent <= len(typelib.interfaces):
+            self.parent = typelib.interfaces[parent - 1]
+        # Read methods
+        offset += Interface._descriptorstart.size
+        for i in range(num_methods):
+            m, offset = Method.read(typelib, map, data_pool, offset)
+            self.methods.append(m)
+        # Read constants
+        start = data_pool + offset - 1
+        (num_constants, ) = struct.unpack(">H", map[start:start + struct.calcsize(">H")])
+        offset = offset + struct.calcsize(">H")
+        for i in range(num_constants):
+            c, offset = Constant.read(typelib, map, data_pool, offset)
+            self.constants.append(c)
+        # Read flags
+        start = data_pool + offset - 1
+        (flags, ) = struct.unpack(">B", map[start:start + struct.calcsize(">B")])
+        offset = offset + struct.calcsize(">B")
+        # only the first two bits are flags
+        flags &= 0xC0
+        if flags & 0x80:
+            self.scriptable = True
+        if flags & 0x40:
+            self.function = True
+        self.resolved = True
+
+    def write_directory_entry(self, file):
+        """
+        Write an InterfaceDirectoryEntry for this interface
+        to |file|, which is assumed to be seeked to the correct offset.
+
+        """
+        file.write(Interface._direntry.pack(Typelib.string_to_iid(self.iid),
+                                            self._name_offset,
+                                            self._namespace_offset,
+                                            self._descriptor_offset))
+
+    def write(self, typelib, file, data_pool_offset):
+        """
+        Write an InterfaceDescriptor to |file|, which is assumed
+        to be seeked to the proper position. If this interface
+        is not resolved, do not write any data.
+
+        """
+        if not self.resolved:
+            self._descriptor_offset = 0
+            return
+        self._descriptor_offset = file.tell() - data_pool_offset + 1
+        parent_idx = 0
+        if self.parent:
+            parent_idx = typelib.interfaces.index(self.parent) + 1
+        file.write(Interface._descriptorstart.pack(parent_idx, len(self.methods)))
+        for m in self.methods:
+            m.write(typelib, file)
+        file.write(struct.pack(">H", len(self.constants)))
+        for c in self.constants:
+            c.write(typelib, file)
+        flags = 0
+        if self.scriptable:
+            flags |= 0x80
+        if self.function:
+            flags |= 0x40
+        file.write(struct.pack(">B", flags))
+        
+    def write_names(self, file, data_pool_offset):
+        """
+        Write this interface's name and namespace to |file|,
+        as well as the names of all of its methods and constants.
+        Assumes that |file| is currently seeked to an unused portion
+        of the data pool.
+
+        """
+        if self.name:
+            self._name_offset = file.tell() - data_pool_offset + 1
+            file.write(self.name + "\x00")
+        else:
+            self._name_offset = 0
+        if self.namespace:
+            self._namespace_offset = file.tell() - data_pool_offset + 1
+            file.write(self.namespace + "\x00")
+        else:
+            self._namespace_offset = 0
+        for m in self.methods:
+            m.write_name(file, data_pool_offset)
+        for c in self.constants:
+            c.write_name(file, data_pool_offset)
+
+class Typelib(object):
+    """
+    A typelib represents one entire typelib file and all the interfaces
+    referenced within, whether defined entirely within the typelib or
+    merely referenced by name or IID.
+
+    Typelib objects may be instantiated directly and populated with data,
+    or the static Typelib.read method may be called to read one from a file.
+
+    """
+    _header = struct.Struct(">16sBBHIII")
+
+    def __init__(self, version=TYPELIB_VERSION, interfaces=[], annotations=[]):
+        """
+        Instantiate a new Typelib.
+
+        """
+        self.version = version
+        self.interfaces = list(interfaces)
+        self.annotations = list(annotations)
+
+    @staticmethod
+    def iid_to_string(iid):
+        """
+        Convert a 16-byte IID into a UUID string.
+
+        """
+        def hexify(s):
+            return ''.join(["%02x" % ord(x) for x in s])
+        return "%s-%s-%s-%s-%s" % (hexify(iid[:4]), hexify(iid[4:6]),
+                                   hexify(iid[6:8]), hexify(iid[8:10]),
+                                   hexify(iid[10:]))
+
+    @staticmethod
+    def string_to_iid(iid_str):
+        """
+        Convert a UUID string into a 16-byte IID.
+
+        """
+        s = iid_str.replace('-','')
+        return ''.join([chr(int(s[i:i+2], 16)) for i in range(0, len(s), 2)])
+    
+    @staticmethod
+    def read_string(map, data_pool, offset):
+        if offset == 0:
+            return ""
+        sz = map.find('\x00', data_pool + offset - 1)
+        if sz == -1:
+            return ""
+        return map[data_pool + offset - 1:sz]
+    
+    @staticmethod
+    def read(filename):
+        """
+        Read a typelib from the file named |filename| and return
+        the constructed Typelib object.
+
+        """
+        with open(filename, "r+b") as f:
+            st = os.fstat(f.fileno())
+            map = mmap.mmap(f.fileno(), st.st_size)
+            data = Typelib._header.unpack(map[:Typelib._header.size])
+            if data[0] != XPT_MAGIC:
+                raise FileFormatError, "Bad magic: %s" % data[0]
+            xpt = Typelib((data[1], data[2]))
+            num_interfaces = data[3]
+            file_length = data[4]
+            if file_length != st.st_size:
+                raise FileFormatError, "File is of wrong length, got %d bytes, expected %d" % (st.st_size, file_length)
+            #XXX: by spec this is a zero-based file offset. however,
+            # the xpt_xdr code always subtracts 1 from data offsets
+            # (because that's what you do in the data pool) so it
+            # winds up accidentally treating this as 1-based.
+            # Filed as: https://bugzilla.mozilla.org/show_bug.cgi?id=575343
+            interface_directory_offset = data[5] - 1
+            data_pool_offset = data[6]
+            # make a half-hearted attempt to read Annotations,
+            # since XPIDL doesn't produce any anyway.
+            start = Typelib._header.size
+            (anno, ) = struct.unpack(">B", map[start:start + struct.calcsize(">B")])
+            islast = anno & 0x80
+            tag = anno & 0x7F
+            if tag == 0: # EmptyAnnotation
+                xpt.annotations.append(None)
+            # We don't bother handling PrivateAnnotations or anything
+            
+            for i in range(num_interfaces):
+                # iid, name, namespace, interface_descriptor
+                start = interface_directory_offset + i * Interface._direntry.size
+                end = interface_directory_offset + (i+1) * Interface._direntry.size
+                ide = Interface._direntry.unpack(map[start:end])
+                iid = Typelib.iid_to_string(ide[0])
+                name = Typelib.read_string(map, data_pool_offset, ide[1])
+                namespace = Typelib.read_string(map, data_pool_offset, ide[2])
+                iface = Interface(name, iid, namespace)
+                iface._descriptor_offset = ide[3]
+                xpt.interfaces.append(iface)
+            for iface in xpt.interfaces:
+                iface.read_descriptor(xpt, map, data_pool_offset)
+            map.close()
+        return xpt
+    
+    def __repr__(self):
+        return "<Typelib with %d interfaces>" % len(self.interfaces)
+
+    def _sanityCheck(self):
+        """
+        Check certain assumptions about data contained in this typelib.
+        Sort the interfaces array by IID, check that all interfaces
+        referenced by methods exist in the array.
+
+        """
+        self.interfaces.sort()
+        for i in self.interfaces:
+            if i.parent and i.parent not in self.interfaces:
+                raise DataError, "Interface %s has parent %s not present in typelib!" % (i.name, i.parent.name)
+            for m in i.methods:
+                for n, p in enumerate(m.params):
+                    if isinstance(p, InterfaceType) and \
+                        p.iface not in self.interfaces:
+                        raise DataError, "Interface method %s::%s, parameter %d references interface %s not present in typelib!" % (i.name, m.name, n, p.iface.name)
+                if isinstance(m.result, InterfaceType) and m.result.iface not in self.interfaces:
+                    raise DataError, "Interface method %s::%s, result references interface %s not present in typelib!" % (i.name, m.name, m.result.iface.name)
+
+    def write(self, filename):
+        """
+        Write the contents of this typelib to the file named |filename|.
+
+        """
+        self._sanityCheck()
+        with open(filename, "wb") as f:
+            # write out space for a header + one empty annotation,
+            # padded to 4-byte alignment.
+            headersize = (Typelib._header.size + 1)
+            if headersize % 4:
+                headersize += 4 - headersize % 4
+            f.write("\x00" * headersize)
+            # save this offset, it's the interface directory offset.
+            interface_directory_offset = f.tell()
+            # write out space for an interface directory
+            f.write("\x00" * Interface._direntry.size * len(self.interfaces))
+            # save this offset, it's the data pool offset.
+            data_pool_offset = f.tell()
+            # write out all the interface descriptors to the data pool
+            for i in self.interfaces:
+                i.write_names(f, data_pool_offset)
+                i.write(self, f, data_pool_offset)
+            # now, seek back and write the header
+            file_len = f.tell()
+            f.seek(0)
+            f.write(Typelib._header.pack(XPT_MAGIC,
+                                         TYPELIB_VERSION[0],
+                                         TYPELIB_VERSION[1],
+                                         len(self.interfaces),
+                                         file_len,
+                                         interface_directory_offset,
+                                         data_pool_offset))
+            # write an empty annotation
+            f.write(struct.pack(">B", 0x80))
+            # now write the interface directory
+            #XXX: bug-compatible with existing xpt lib, put it one byte
+            # ahead of where it's supposed to be.
+            f.seek(interface_directory_offset - 1)
+            for i in self.interfaces:
+                i.write_directory_entry(f)
+
+    def merge(self, other):
+        """
+        Merge the contents of Typelib |other| into this typelib.
+
+        """
+        # This will be a list of (replaced interface, replaced with)
+        # containing interfaces that were replaced with interfaces from
+        # another typelib, and the interface that replaced them.
+        merged_interfaces = []
+        for i in other.interfaces:
+            if i in self.interfaces:
+                continue
+            # See if there's a copy of this interface with different
+            # resolved status or IID value.
+            merged = False
+            for j in self.interfaces:
+                if i.name == j.name:
+                    if i.resolved != j.resolved:
+                        # prefer resolved interfaces over unresolved
+                        if j.resolved:
+                            # keep j
+                            merged_interfaces.append((i, j))
+                            merged = True
+                            # Fixup will happen after processing all interfaces.
+                        else:
+                            # replace j with i
+                            merged_interfaces.append((j, i))
+                            merged = True
+                            self.interfaces[self.interfaces.index(j)] = i
+                    elif i.iid != j.iid:
+                        # Prefer unresolved interfaces with valid IIDs
+                        if j.iid == Interface.UNRESOLVED_IID:
+                            # replace j with i
+                            merged_interfaces.append((j, i))
+                            merged = True
+                            self.interfaces[self.interfaces.index(j)] = i
+                        elif i.iid == Interface.UNRESOLVED_IID:
+                            # keep j
+                            merged_interfaces.append((i, j))
+                            merged = True
+                            # Fixup will happen after processing all interfaces.
+                        else:
+                            # Same name, different IIDs, raise an exception
+                            raise DataError, \
+                                  "Typelibs contain definitions of interface %s"\
+                                  " with different IIDs!" % i.name
+                elif i.iid == j.iid and i.iid != Interface.UNRESOLVED_IID:
+                    # Same IID, different names, raise an exception
+                    raise DataError, \
+                          "Typelibs contain definitions of interface %s"\
+                          " with different names (%s vs. %s)!" %  \
+                          (i.iid, i.name, j.name)
+            if not merged:
+                # No partially matching interfaces, so just take this interface
+                self.interfaces.append(i)
+        # Now fixup any merged interfaces
+        def checkType(t, replaced_from, replaced_to):
+            if isinstance(t, InterfaceType) and t.iface == replaced_from:
+                t.iface = replaced_to
+            elif isinstance(t, ArrayType) and \
+                 isinstance(t.element_type, InterfaceType) and \
+                 t.element_type.iface == replaced_from:
+                t.element_type.iface = replaced_to
+        
+        for replaced_from, replaced_to in merged_interfaces:
+            for i in self.interfaces:
+                # Replace parent references
+                if i.parent is not None and i.parent == replaced_from:
+                    i.parent = replaced_to
+                for m in i.methods:
+                    # Replace InterfaceType params and return values
+                    checkType(m.result.type, replaced_from, replaced_to)
+                    for p in m.params:
+                        checkType(p.type, replaced_from, replaced_to)
+        self._sanityCheck()
+        #TODO: do we care about annotations? probably not
+
+    def dump(self, out):
+        """
+        Print a human-readable listing of the contents of this typelib
+        to |out|, in the format of xpt_dump.
+        
+        """
+        out.write("""Header:
+   Major version:         %d
+   Minor version:         %d
+   Number of interfaces:  %d
+   Annotations:\n""" % (self.version[0], self.version[1], len(self.interfaces)))
+        for i, a in enumerate(self.annotations):
+            if a is None:
+                out.write("      Annotation #%d is empty.\n" % i)
+        out.write("\nInterface Directory:\n")
+        for i in self.interfaces:
+            out.write("   - %s::%s (%s):\n" % (i.namespace, i.name, i.iid))
+            if not i.resolved:
+                out.write("      [Unresolved]\n")
+            else:
+                if i.parent:
+                    out.write("      Parent: %s::%s\n" % (i.parent.namespace,
+                                                    i.parent.name))
+                out.write("""      Flags:
+         Scriptable: %s
+         Function: %s\n""" % (i.scriptable and "TRUE" or "FALSE",
+                              i.function and "TRUE" or "FALSE"))
+                out.write("      Methods:\n")
+                if len(i.methods) == 0:
+                    out.write("         No Methods\n")
+                else:
+                    for m in i.methods:
+                        out.write("   %s%s%s%s%s%s%s %s %s(%s);\n" % (
+                            m.getter and "G" or " ",
+                            m.setter and "S" or " ",
+                            m.hidden and "H" or " ",
+                            m.notxpcom and "N" or " ",
+                            m.constructor and "C" or " ",
+                            m.optargc and "O" or " ",
+                            m.implicit_jscontext and "J" or " ",
+                            str(m.result.type),
+                            m.name,
+                            m.params and ", ".join(str(p) for p in m.params) or ""
+                            ))
+                out.write("      Constants:\n")
+                if len(i.constants) == 0:
+                    out.write("         No Constants\n")
+                else:
+                    for c in i.constants:
+                        out.write("         %s %s = %d;\n" % (c.type, c.name, c.value))
+
+def xpt_dump(file):
+    """
+    Dump the contents of |file| to stdout in the format of xpt_dump.
+
+    """
+    t = Typelib.read(file)
+    t.dump(sys.stdout)
+
+def xpt_link(dest, inputs):
+    """
+    Link all of the xpt files in |inputs| together and write the
+    result ot |dest|.
+
+    """
+    if not inputs:
+        print >>sys.stderr, "Usage: xpt_link <destination file> <input files>"
+        return
+    t1 = Typelib.read(inputs[0])
+    for f in inputs[1:]:
+        t2 = Typelib.read(f)
+        t1.merge(t2)
+    t1.write(dest)
+
+if __name__ == '__main__':
+    if len(sys.argv) < 3:
+        print >>sys.stderr, "xpt <dump|link> <files>"
+        sys.exit(1)
+    if sys.argv[1] == 'dump':
+        xpt_dump(sys.argv[2])
+    elif sys.argv[1] == 'link':
+        xpt_link(sys.argv[2], sys.argv[3:])
diff --git a/xpcom/typelib/xpt/tools/xpt_dump.c b/xpcom/typelib/xpt/tools/xpt_dump.c
deleted file mode 100644
index 5b6a0ac57c59..000000000000
--- a/xpcom/typelib/xpt/tools/xpt_dump.c
+++ /dev/null
@@ -1,971 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A utility for dumping the contents of a typelib file (.xpt) to screen 
- */ 
-
-#include "xpt_xdr.h"
-#include <stdio.h>
-#ifdef XP_OS2
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include "prprf.h"
-
-#ifdef WINCE
-#include <windows.h>
-static void perror(const char* a) {}
-#endif
-
-#define BASE_INDENT 3
-
-static char *type_array[32] = 
-            {"int8",        "int16",       "int32",       "int64",
-             "uint8",       "uint16",      "uint32",      "uint64",
-             "float",       "double",      "boolean",     "char",
-             "wchar_t",     "void",        "nsIID",       "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved",
-             "reserved",    "reserved",    "jsval",       "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved"};
-
-static char *ptype_array[32] = 
-            {"int8 *",      "int16 *",     "int32 *",     "int64 *",
-             "uint8 *",     "uint16 *",    "uint32 *",    "uint64 *",
-             "float *",     "double *",    "boolean *",   "char *",
-             "wchar_t *",   "void *",      "nsIID *",     "DOMString *",
-             "string",      "wstring",     "Interface *", "InterfaceIs *",
-             "array",       "string_s",    "wstring_s",   "UTF8String *",
-             "CString *",   "AString *",   "jsval *",     "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved"};
-
-static char *rtype_array[32] = 
-            {"int8 &",      "int16 &",     "int32 &",     "int64 &",
-             "uint8 &",     "uint16 &",    "uint32 &",    "uint64 &",
-             "float &",     "double &",    "boolean &",   "char &",
-             "wchar_t &",   "void &",      "nsIID &",     "DOMString &",
-             "string &",    "wstring &",   "Interface &", "InterfaceIs &",
-             "array &",     "string_s &",  "wstring_s &", "UTF8String &",
-             "CString &",   "AString &",   "jsval &",     "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved"};
-
-PRBool param_problems = PR_FALSE;
-
-PRBool
-XPT_DumpHeader(XPTCursor *cursor, XPTHeader *header, 
-               const int indent, PRBool verbose_mode);
-
-PRBool
-XPT_DumpAnnotations(XPTAnnotation *ann, const int indent, PRBool verbose_mode);
-
-PRBool
-XPT_DumpInterfaceDirectoryEntry(XPTCursor *cursor,
-                                XPTInterfaceDirectoryEntry *ide, 
-                                XPTHeader *header, const int indent,
-                                PRBool verbose_mode);
-
-PRBool
-XPT_DumpInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor *id, 
-                            XPTHeader *header, const int indent,
-                            PRBool verbose_mode);
-
-PRBool
-XPT_DumpMethodDescriptor(XPTHeader *header, XPTMethodDescriptor *md,
-                         XPTInterfaceDescriptor *id,
-                         const int indent, PRBool verbose_mode);
-PRBool
-XPT_GetStringForType(XPTHeader *header, XPTTypeDescriptor *td,
-                     XPTInterfaceDescriptor *id,
-                     char **type_string);
-
-PRBool
-XPT_DumpXPTString(XPTString *str);
-
-PRBool
-XPT_DumpParamDescriptor(XPTHeader *header, XPTParamDescriptor *pd,
-                        XPTInterfaceDescriptor *id,
-                        const int indent, PRBool verbose_mode,
-                        PRBool is_result);
-
-PRBool
-XPT_DumpTypeDescriptor(XPTTypeDescriptor *td, 
-                       XPTInterfaceDescriptor *id,
-                       int indent, PRBool verbose_mode);
-
-PRBool
-XPT_DumpConstDescriptor(XPTHeader *header, XPTConstDescriptor *cd,
-                        XPTInterfaceDescriptor *id,
-                        const int indent, PRBool verbose_mode);
-
-static void
-xpt_dump_usage(char *argv[]) {
-    fprintf(stdout, "Usage: %s [-v] <filename.xpt>\n"
-            "       -v verbose mode\n", argv[0]);
-}
-
-static size_t get_file_length(const char* filename)
-{
-#ifndef WINCE
-    struct stat file_stat;
-    if (stat(filename, &file_stat) != 0) {
-        perror("FAILED: get_file_length");
-        exit(1);
-    }
-    return file_stat.st_size;
-#else
-    DWORD fileSize;
-    HANDLE hFile = CreateFile(filename, 
-                              GENERIC_READ,
-                              0, 
-                              NULL,
-                              OPEN_EXISTING, 
-                              FILE_ATTRIBUTE_NORMAL, 
-                              NULL);
-    if (hFile == INVALID_HANDLE_VALUE)
-        return -1;
-    fileSize = GetFileSize(hFile,  NULL);
-    CloseHandle(hFile);
-    return fileSize;
-#endif
-}
-
-int 
-main(int argc, char **argv)
-{
-    PRBool verbose_mode = PR_FALSE;
-    XPTArena *arena;
-    XPTState *state;
-    XPTCursor curs, *cursor = &curs;
-    XPTHeader *header;
-    size_t flen;
-    char *name;
-    char *whole;
-    FILE *in;
-    int result = 1;
-
-    switch (argc) {
-    case 2:
-        if (argv[1][0] == '-') {
-            xpt_dump_usage(argv);
-            return 1;
-        }
-        name = argv[1];
-        flen = get_file_length(name);
-        in = fopen(name, "rb");
-        break;
-    case 3:
-        verbose_mode = PR_TRUE;
-        if (argv[1][0] != '-' || argv[1][1] != 'v') {
-            xpt_dump_usage(argv);
-            return 1;
-        }
-        name = argv[2];
-        flen = get_file_length(name);
-        in = fopen(name, "rb");
-        break;
-    default:
-        xpt_dump_usage(argv);
-        return 1;
-    }
-
-    if (!in) {
-        perror("FAILED: fopen");
-        return 1;
-    }
-
-    arena = XPT_NewArena(1024, sizeof(double), "main xpt_dump arena");
-    if (!arena) {
-        perror("XPT_NewArena failed");
-        return 1;
-    }
-
-    /* after arena creation all exits via 'goto out' */
-
-    whole = XPT_MALLOC(arena, flen);
-    if (!whole) {
-        perror("FAILED: XPT_MALLOC for whole");
-        goto out;
-    }
-
-    if (flen > 0) {
-        size_t rv = fread(whole, 1, flen, in);
-        if (rv < flen) {
-            fprintf(stderr, "short read (%u vs %u)! ouch!\n",
-                    (unsigned int)rv, (unsigned int)flen);
-            goto out;
-        }
-        if (ferror(in) != 0 || fclose(in) != 0)
-            perror("FAILED: Unable to read typelib file.\n");
-
-        state = XPT_NewXDRState(XPT_DECODE, whole, flen);
-        if (!XPT_MakeCursor(state, XPT_HEADER, 0, cursor)) {
-            fprintf(stdout, "XPT_MakeCursor failed for %s\n", name);
-            goto out;
-        }
-        if (!XPT_DoHeader(arena, cursor, &header)) {
-            fprintf(stdout,
-                    "DoHeader failed for %s.  Is %s a valid .xpt file?\n",
-                    name, name);
-            goto out;
-        }
-
-        if (!XPT_DumpHeader(cursor, header, BASE_INDENT, verbose_mode)) {
-            perror("FAILED: XPT_DumpHeader");
-            goto out;
-        }
-   
-        if (param_problems) {
-            fprintf(stdout, "\nWARNING: ParamDescriptors are present with "
-                    "bad in/out/retval flag information.\n"
-                    "These have been marked with 'XXX'.\n"
-                    "Remember, retval params should always be marked as out!\n");
-        }
-
-        XPT_DestroyXDRState(state);
-        XPT_FREE(arena, whole);
-
-    } else {
-        fclose(in);
-        perror("FAILED: file length <= 0");
-        goto out;
-    }
-
-    result = 0;
-
-out:
-    XPT_DestroyArena(arena);
-    return result;
-}
-
-PRBool
-XPT_DumpHeader(XPTCursor *cursor, XPTHeader *header, 
-               const int indent, PRBool verbose_mode) 
-{
-    int i;
-    
-    fprintf(stdout, "Header:\n");
-
-    if (verbose_mode) {
-        fprintf(stdout, "%*sMagic beans:           ", indent, " ");
-        for (i=0; i<16; i++) {
-            fprintf(stdout, "%02x", header->magic[i]);
-        }
-        fprintf(stdout, "\n");
-        if (strncmp((const char*)header->magic, XPT_MAGIC, 16) == 0)
-            fprintf(stdout, "%*s                       PASSED\n", indent, " ");
-        else
-            fprintf(stdout, "%*s                       FAILED\n", indent, " ");
-    }
-    fprintf(stdout, "%*sMajor version:         %d\n", indent, " ",
-            header->major_version);
-    fprintf(stdout, "%*sMinor version:         %d\n", indent, " ",
-            header->minor_version);    
-    fprintf(stdout, "%*sNumber of interfaces:  %d\n", indent, " ",
-            header->num_interfaces);
-
-    if (verbose_mode) {
-        fprintf(stdout, "%*sFile length:           %d\n", indent, " ",
-                header->file_length);
-        fprintf(stdout, "%*sData pool offset:      %d\n\n", indent, " ",
-                header->data_pool);
-    }
-    
-    fprintf(stdout, "%*sAnnotations:\n", indent, " ");
-    if (!XPT_DumpAnnotations(header->annotations, indent*2, verbose_mode))
-        return PR_FALSE;
-
-    fprintf(stdout, "\nInterface Directory:\n");
-    for (i=0; i<header->num_interfaces; i++) {
-        if (verbose_mode) {
-            fprintf(stdout, "%*sInterface #%d:\n", indent, " ", i);
-            if (!XPT_DumpInterfaceDirectoryEntry(cursor,
-                                                 &header->interface_directory[i],
-                                                 header, indent*2,
-                                                 verbose_mode)) {
-                return PR_FALSE;
-            }
-        } else {
-            if (!XPT_DumpInterfaceDirectoryEntry(cursor,
-                                                 &header->interface_directory[i],
-                                                 header, indent,
-                                                 verbose_mode)) {
-                return PR_FALSE;
-            }
-        }
-    }
-
-    return PR_TRUE;
-}    
-
-PRBool
-XPT_DumpAnnotations(XPTAnnotation *ann, const int indent, PRBool verbose_mode) 
-{
-    int i = -1;
-    XPTAnnotation *last;
-    int new_indent = indent + BASE_INDENT;
-
-    do {
-        i++;
-        if (XPT_ANN_IS_PRIVATE(ann->flags)) {
-            if (verbose_mode) {
-                fprintf(stdout, "%*sAnnotation #%d is private.\n", 
-                        indent, " ", i);
-            } else {
-                fprintf(stdout, "%*sAnnotation #%d:\n", 
-                        indent, " ", i);
-            }                
-            fprintf(stdout, "%*sCreator:      ", new_indent, " ");
-            if (!XPT_DumpXPTString(ann->creator))
-                return PR_FALSE;
-            fprintf(stdout, "\n");
-            fprintf(stdout, "%*sPrivate Data: ", new_indent, " ");            
-            if (!XPT_DumpXPTString(ann->private_data))
-                return PR_FALSE;
-            fprintf(stdout, "\n");
-        } else {
-            fprintf(stdout, "%*sAnnotation #%d is empty.\n", 
-                    indent, " ", i);
-        }
-        last = ann;
-        ann = ann->next;
-    } while (!XPT_ANN_IS_LAST(last->flags));
-        
-    if (verbose_mode) {
-        fprintf(stdout, "%*sAnnotation #%d is the last annotation.\n", 
-                indent, " ", i);
-    }
-
-    return PR_TRUE;
-}
-
-static void
-print_IID(struct nsID *iid, FILE *file)
-{
-    fprintf(file, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-            (PRUint32) iid->m0, (PRUint32) iid->m1,(PRUint32) iid->m2,
-            (PRUint32) iid->m3[0], (PRUint32) iid->m3[1],
-            (PRUint32) iid->m3[2], (PRUint32) iid->m3[3],
-            (PRUint32) iid->m3[4], (PRUint32) iid->m3[5],
-            (PRUint32) iid->m3[6], (PRUint32) iid->m3[7]);
-            
-}
-
-PRBool
-XPT_DumpInterfaceDirectoryEntry(XPTCursor *cursor, 
-                                XPTInterfaceDirectoryEntry *ide, 
-                                XPTHeader *header, const int indent,
-                                PRBool verbose_mode)
-{
-    int new_indent = indent + BASE_INDENT;
-
-    if (verbose_mode) {
-        fprintf(stdout, "%*sIID:                             ", indent, " ");
-        print_IID(&ide->iid, stdout);
-        fprintf(stdout, "\n");
-        
-        fprintf(stdout, "%*sName:                            %s\n", 
-                indent, " ", ide->name);
-        fprintf(stdout, "%*sNamespace:                       %s\n", 
-                indent, " ", ide->name_space ? ide->name_space : "none");
-        fprintf(stdout, "%*sAddress of interface descriptor: %p\n", 
-                indent, " ", (void*)(ide->interface_descriptor));
-
-        fprintf(stdout, "%*sDescriptor:\n", indent, " ");
-    
-        if (!XPT_DumpInterfaceDescriptor(cursor, ide->interface_descriptor, 
-                                         header, new_indent, verbose_mode)) {
-            return PR_FALSE;
-        }
-    } else {
-        fprintf(stdout, "%*s- %s::%s (", indent, " ", 
-                ide->name_space ? ide->name_space : "", ide->name);
-        print_IID(&ide->iid, stdout);
-        fprintf(stdout, "):\n");
-        if (!XPT_DumpInterfaceDescriptor(cursor, ide->interface_descriptor, 
-                                         header, new_indent, verbose_mode)) {
-            return PR_FALSE;
-        }
-    }
-
-    return PR_TRUE;
-}    
-
-PRBool
-XPT_DumpInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor *id,
-                            XPTHeader *header, const int indent,
-                            PRBool verbose_mode)
-{
-    XPTInterfaceDirectoryEntry *parent_ide;
-    int i;
-    int new_indent = indent + BASE_INDENT;
-    int more_indent = new_indent + BASE_INDENT;
-
-    if (!id) {
-        fprintf(stdout, "%*s[Unresolved]\n", indent, " ");
-        return PR_TRUE;
-    }
-
-    if (id->parent_interface) {
-
-        parent_ide = &header->interface_directory[id->parent_interface - 1];
-
-        fprintf(stdout, "%*sParent: %s::%s\n", indent, " ", 
-                parent_ide->name_space ? 
-                parent_ide->name_space : "", 
-                parent_ide->name);
-    }
-
-    fprintf(stdout, "%*sFlags:\n", indent, " ");
-
-    fprintf(stdout, "%*sScriptable: %s\n", new_indent, " ", 
-            XPT_ID_IS_SCRIPTABLE(id->flags) ? "TRUE" : "FALSE");
-
-    fprintf(stdout, "%*sFunction: %s\n", new_indent, " ", 
-            XPT_ID_IS_FUNCTION(id->flags) ? "TRUE" : "FALSE");
-
-    if (verbose_mode) {
-        if (id->parent_interface) {
-            fprintf(stdout, 
-                    "%*sIndex of parent interface (in data pool): %d\n", 
-                    indent, " ", id->parent_interface);
-            
-        }
-    } else {
-    }   
-
-    if (id->num_methods > 0) {
-        if (verbose_mode) {
-            fprintf(stdout, 
-                    "%*s# of Method Descriptors:                   %d\n", 
-                    indent, " ", id->num_methods);
-        } else {
-            fprintf(stdout, "%*sMethods:\n", indent, " ");
-        }
-
-        for (i=0; i<id->num_methods; i++) {
-            if (verbose_mode) {
-                fprintf(stdout, "%*sMethod #%d:\n", new_indent, " ", i);
-                if (!XPT_DumpMethodDescriptor(header,
-                                              &id->method_descriptors[i], id,
-                                              more_indent, verbose_mode)) {
-                    return PR_FALSE;
-                } 
-            } else { 
-                if (!XPT_DumpMethodDescriptor(header,
-                                              &id->method_descriptors[i], id,
-                                              new_indent, verbose_mode)) {
-                    return PR_FALSE;
-                } 
-            }
-        }        
-    } else {
-        fprintf(stdout, "%*sMethods:\n", indent, " ");
-        fprintf(stdout, "%*sNo Methods\n", new_indent, " ");
-    }
-    
-    if (id->num_constants > 0) {
-        if (verbose_mode) {
-            fprintf(stdout, 
-                    "%*s# of Constant Descriptors:                  %d\n", 
-                    indent, " ", id->num_constants);
-        } else {
-            fprintf(stdout, "%*sConstants:\n", indent, " ");
-        }
-        
-        for (i=0; i<id->num_constants; i++) {
-            if (verbose_mode) {
-                fprintf(stdout, "%*sConstant #%d:\n", new_indent, " ", i);
-                if (!XPT_DumpConstDescriptor(header, 
-                                             &id->const_descriptors[i], id,
-                                             more_indent, verbose_mode))
-                return PR_FALSE;
-            } else {
-                if (!XPT_DumpConstDescriptor(header, 
-                                             &id->const_descriptors[i], id,
-                                             new_indent, verbose_mode)) {
-                    return PR_FALSE;
-                }
-            }
-        }
-    } else { 
-        fprintf(stdout, "%*sConstants:\n", indent, " ");
-        fprintf(stdout, "%*sNo Constants\n", new_indent, " ");
-    }
-
-    return PR_TRUE;
-}
-
-PRBool
-XPT_DumpMethodDescriptor(XPTHeader *header, XPTMethodDescriptor *md,
-                         XPTInterfaceDescriptor *id,
-                         const int indent, PRBool verbose_mode)
-{
-    int i;
-    int new_indent = indent + BASE_INDENT;
-    int more_indent = new_indent + BASE_INDENT;
-
-    if (verbose_mode) {
-        fprintf(stdout, "%*sName:             %s\n", indent, " ", md->name);
-        fprintf(stdout, "%*sIs Getter?        ", indent, " ");
-        if (XPT_MD_IS_GETTER(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-        
-        fprintf(stdout, "%*sIs Setter?        ", indent, " ");
-        if (XPT_MD_IS_SETTER(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-        
-        fprintf(stdout, "%*sIs NotXPCOM?      ", indent, " ");
-        if (XPT_MD_IS_NOTXPCOM(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-        
-        fprintf(stdout, "%*sIs Constructor?   ", indent, " ");
-        if (XPT_MD_IS_CTOR(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-        
-        fprintf(stdout, "%*sIs Hidden?        ", indent, " ");
-        if (XPT_MD_IS_HIDDEN(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-
-        fprintf(stdout, "%*sWants Optional Argc?        ", indent, " ");
-        if (XPT_MD_WANTS_OPT_ARGC(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-
-        fprintf(stdout, "%*sWants JSContext?        ", indent, " ");
-        if (XPT_MD_WANTS_CONTEXT(md->flags))
-            fprintf(stdout, "TRUE\n");
-        else 
-            fprintf(stdout, "FALSE\n");
-
-        fprintf(stdout, "%*s# of arguments:   %d\n", indent, " ", md->num_args);
-        fprintf(stdout, "%*sParameter Descriptors:\n", indent, " ");
-        
-        for (i=0; i<md->num_args; i++) {
-            fprintf(stdout, "%*sParameter #%d:\n", new_indent, " ", i);
-            
-            if (!XPT_DumpParamDescriptor(header, &md->params[i], id, 
-                                         more_indent, verbose_mode, PR_FALSE))
-                return PR_FALSE;
-        }
-   
-        fprintf(stdout, "%*sResult:\n", indent, " ");
-        if (!XPT_DumpParamDescriptor(header, md->result, id, new_indent,
-                                     verbose_mode, PR_TRUE)) {
-            return PR_FALSE;
-        }
-    } else {
-        char *param_type;
-        XPTParamDescriptor *pd;
-
-        if (!XPT_GetStringForType(header, &md->result->type, id, &param_type)) {
-            return PR_FALSE;
-        }
-        fprintf(stdout, "%*s%c%c%c%c%c%c%c %s %s(", indent - 6, " ",
-                XPT_MD_IS_GETTER(md->flags) ? 'G' : ' ',
-                XPT_MD_IS_SETTER(md->flags) ? 'S' : ' ',
-                XPT_MD_IS_HIDDEN(md->flags) ? 'H' : ' ',
-                XPT_MD_IS_NOTXPCOM(md->flags) ? 'N' : ' ',
-                XPT_MD_IS_CTOR(md->flags) ? 'C' : ' ',
-                XPT_MD_WANTS_OPT_ARGC(md->flags) ? 'O' : ' ',
-                XPT_MD_WANTS_CONTEXT(md->flags) ? 'J' : ' ',
-                param_type, md->name);
-        for (i=0; i<md->num_args; i++) {
-            if (i!=0) {
-                fprintf(stdout, ", ");
-            }
-            pd = &md->params[i];
-            if (XPT_PD_IS_IN(pd->flags)) {
-                fprintf(stdout, "in");
-                if (XPT_PD_IS_OUT(pd->flags)) {
-                    fprintf(stdout, "out ");
-                    if (XPT_PD_IS_RETVAL(pd->flags)) {
-                        fprintf(stdout, "retval ");
-                    }
-                    if (XPT_PD_IS_SHARED(pd->flags)) {
-                        fprintf(stdout, "shared ");
-                    }
-                } else {
-                    fprintf(stdout, " ");
-                    if (XPT_PD_IS_DIPPER(pd->flags)) {
-                        fprintf(stdout, "dipper ");
-                    }
-                    if (XPT_PD_IS_RETVAL(pd->flags)) {
-                        fprintf(stdout, "retval ");
-                    }
-                }
-                if (XPT_PD_IS_OPTIONAL(pd->flags)) {
-                    fprintf(stdout, "optional ");
-                }
-            } else {
-                if (XPT_PD_IS_OUT(pd->flags)) {
-                    fprintf(stdout, "out ");
-                    if (XPT_PD_IS_RETVAL(pd->flags)) {
-                        fprintf(stdout, "retval ");
-                    }
-                    if (XPT_PD_IS_SHARED(pd->flags)) {
-                        fprintf(stdout, "shared ");
-                    }
-                    if (XPT_PD_IS_OPTIONAL(pd->flags)) {
-                        fprintf(stdout, "optional ");
-                    }
-                } else {
-                    param_problems = PR_TRUE;
-                    fprintf(stdout, "XXX ");
-                }
-            }
-            if (!XPT_GetStringForType(header, &pd->type, id, &param_type)) {
-                return PR_FALSE;
-            }
-            fprintf(stdout, "%s", param_type);
-        }
-        fprintf(stdout, ");\n");   
-    }
-    return PR_TRUE;
-}
-    
-PRBool
-XPT_GetStringForType(XPTHeader *header, XPTTypeDescriptor *td,
-                     XPTInterfaceDescriptor *id,
-                     char **type_string)
-{
-    static char buf[128]; /* ugly non-reentrant use of static buffer! */
-    PRBool isArray = PR_FALSE;
-
-    int tag = XPT_TDP_TAG(td->prefix);
-    
-    if (tag == TD_ARRAY) {
-        isArray = PR_TRUE;
-        td = &id->additional_types[td->type.additional_type];
-        tag = XPT_TDP_TAG(td->prefix);
-    }
-    
-    if (tag == TD_INTERFACE_TYPE) {
-        int idx = td->type.iface;
-        if (!idx || idx > header->num_interfaces)
-            *type_string = "UNKNOWN_INTERFACE";
-        else
-            *type_string = header->interface_directory[idx-1].name;
-    } else if (XPT_TDP_IS_POINTER(td->prefix.flags)) {
-        if (XPT_TDP_IS_REFERENCE(td->prefix.flags))
-            *type_string = rtype_array[tag];
-        else
-            *type_string = ptype_array[tag];
-    } else {
-        *type_string = type_array[tag];
-    }
-
-    if(isArray) {
-        sprintf(buf, "%s []", *type_string);
-        *type_string = buf;
-    }
-
-    return PR_TRUE;
-}
-
-PRBool
-XPT_DumpXPTString(XPTString *str)
-{
-    int i;
-    for (i=0; i<str->length; i++) {
-        fprintf(stdout, "%c", str->bytes[i]);
-    }
-    return PR_TRUE;
-}
-
-PRBool
-XPT_DumpParamDescriptor(XPTHeader *header, XPTParamDescriptor *pd,
-                        XPTInterfaceDescriptor *id,
-                        const int indent, PRBool verbose_mode, 
-                        PRBool is_result)
-{
-    int new_indent = indent + BASE_INDENT;
-    
-    if (!XPT_PD_IS_IN(pd->flags) && 
-        !XPT_PD_IS_OUT(pd->flags) &&
-        (XPT_PD_IS_RETVAL(pd->flags) ||
-         XPT_PD_IS_SHARED(pd->flags))) {
-        param_problems = PR_TRUE;
-        fprintf(stdout, "XXX\n");
-    } else {
-        if (!XPT_PD_IS_IN(pd->flags) && !XPT_PD_IS_OUT(pd->flags)) {
-            if (is_result) {
-                if (XPT_TDP_TAG(pd->type.prefix) != TD_UINT32 &&
-                    XPT_TDP_TAG(pd->type.prefix) != TD_VOID) {
-                    param_problems = PR_TRUE;
-                    fprintf(stdout, "XXX\n");   
-                }
-            } else {
-                param_problems = PR_TRUE;
-                fprintf(stdout, "XXX\n");
-            }
-        }
-    }
-
-    fprintf(stdout, "%*sIn Param?   ", indent, " ");
-    if (XPT_PD_IS_IN(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-    
-    fprintf(stdout, "%*sOut Param?  ", indent, " ");
-    if (XPT_PD_IS_OUT(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-    
-    fprintf(stdout, "%*sRetval?     ", indent, " ");
-    if (XPT_PD_IS_RETVAL(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sShared?     ", indent, " ");
-    if (XPT_PD_IS_SHARED(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sDipper?     ", indent, " ");
-    if (XPT_PD_IS_DIPPER(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sOptional?     ", indent, " ");
-    if (XPT_PD_IS_OPTIONAL(pd->flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-
-    fprintf(stdout, "%*sType Descriptor:\n", indent, " ");
-    if (!XPT_DumpTypeDescriptor(&pd->type, id, new_indent, verbose_mode))
-        return PR_FALSE;
-    
-    return PR_TRUE;
-}
-
-PRBool
-XPT_DumpTypeDescriptor(XPTTypeDescriptor *td, 
-                       XPTInterfaceDescriptor *id,
-                       int indent, PRBool verbose_mode)
-{
-    int new_indent;
-
-    if (XPT_TDP_TAG(td->prefix) == TD_ARRAY) {
-        fprintf(stdout, "%*sArray (size in arg %d and length in arg %d) of...\n", 
-            indent, " ", td->argnum, td->argnum2);
-        td = &id->additional_types[td->type.additional_type];
-        indent += BASE_INDENT;
-    }
-
-    new_indent = indent + BASE_INDENT;
-
-    fprintf(stdout, "%*sIs Pointer?        ", indent, " ");
-    if (XPT_TDP_IS_POINTER(td->prefix.flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sIs Unique Pointer? ", indent, " ");
-    if (XPT_TDP_IS_UNIQUE_POINTER(td->prefix.flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sIs Reference?      ", indent, " ");
-    if (XPT_TDP_IS_REFERENCE(td->prefix.flags))
-        fprintf(stdout, "TRUE\n");
-    else 
-        fprintf(stdout, "FALSE\n");
-
-    fprintf(stdout, "%*sTag:               %d\n", indent, " ", 
-            XPT_TDP_TAG(td->prefix));
-    
-    if (XPT_TDP_TAG(td->prefix) == TD_PSTRING_SIZE_IS ||
-        XPT_TDP_TAG(td->prefix) == TD_PWSTRING_SIZE_IS) {
-        fprintf(stdout, "%*s - size in arg %d and length in arg %d\n", 
-            indent, " ", td->argnum, td->argnum2);
-    }
-
-    if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
-        fprintf(stdout, "%*sInterfaceTypeDescriptor:\n", indent, " "); 
-        fprintf(stdout, "%*sIndex of IDE:             %d\n", new_indent, " ", 
-                td->type.iface);
-    }
-
-    if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_IS_TYPE) {
-        fprintf(stdout, "%*sInterfaceTypeDescriptor:\n", indent, " "); 
-        fprintf(stdout, "%*sIndex of Method Argument: %d\n", new_indent, " ", 
-                td->argnum);        
-    }
-
-    return PR_TRUE;
-}
-
-PRBool
-XPT_DumpConstDescriptor(XPTHeader *header, XPTConstDescriptor *cd,
-                        XPTInterfaceDescriptor *id,
-                        const int indent, PRBool verbose_mode)
-{
-    int new_indent = indent + BASE_INDENT;
-    char *const_type;
-/*      char *out; */
-    PRUint32 uintout;
-    PRInt32 intout;
-
-    if (verbose_mode) {
-        fprintf(stdout, "%*sName:   %s\n", indent, " ", cd->name);
-        fprintf(stdout, "%*sType Descriptor: \n", indent, " ");
-        if (!XPT_DumpTypeDescriptor(&cd->type, id, new_indent, verbose_mode))
-            return PR_FALSE;
-        fprintf(stdout, "%*sValue:  ", indent, " ");
-    } else {
-        if (!XPT_GetStringForType(header, &cd->type, id, &const_type)) {
-            return PR_FALSE;
-        }
-        fprintf(stdout, "%*s%s %s = ", indent, " ", const_type, cd->name);
-    }        
-
-    switch(XPT_TDP_TAG(cd->type.prefix)) {
-    case TD_INT8:
-        fprintf(stdout, "%d", cd->value.i8);
-        break;
-    case TD_INT16:
-        fprintf(stdout, "%d", cd->value.i16);
-        break;
-    case TD_INT64:
-        /* XXX punt for now to remove NSPR linkage...
-         * borrow from mozilla/nsprpub/pr/src/io/prprf.c::cvt_ll? */
-
-/*          out = PR_smprintf("%lld", cd->value.i64); */
-/*          fputs(out, stdout); */
-/*          PR_smprintf_free(out); */
-        LL_L2I(intout, cd->value.i64);
-        fprintf(stdout, "%d", intout);
-        break;
-    case TD_INT32:
-        fprintf(stdout, "%d", cd->value.i32);
-        break;
-    case TD_UINT8:
-        fprintf(stdout, "%u", cd->value.ui8);
-        break;
-    case TD_UINT16:
-        fprintf(stdout, "%u", cd->value.ui16);
-        break;
-    case TD_UINT64:
-/*          out = PR_smprintf("%lld", cd->value.ui64); */
-/*          fputs(out, stdout); */
-/*          PR_smprintf_free(out); */
-        /* XXX punt for now to remove NSPR linkage. */
-        LL_L2UI(uintout, cd->value.ui64);
-        fprintf(stdout, "%u", uintout);
-        break;
-    case TD_UINT32:
-        fprintf(stdout, "%u", cd->value.ui32);
-        break;
-    case TD_FLOAT:
-        fprintf(stdout, "%f", cd->value.flt);
-        break;
-    case TD_DOUBLE:
-        fprintf(stdout, "%g", cd->value.dbl);
-        break;
-    case TD_BOOL:
-        if (cd->value.bul)
-            fprintf(stdout, "TRUE");
-        else 
-            fprintf(stdout, "FALSE");
-            break;
-    case TD_CHAR:
-        fprintf(stdout, "%c", cd->value.ch);
-        break;
-    case TD_WCHAR:
-        fprintf(stdout, "%c", cd->value.wch & 0xff);
-        break;
-    case TD_VOID:
-        fprintf(stdout, "VOID");
-        break;
-    case TD_PNSIID:
-        if (XPT_TDP_IS_POINTER(cd->type.prefix.flags)) {
-            print_IID(cd->value.iid, stdout);
-        } else 
-            return PR_FALSE;
-        break;
-    case TD_PSTRING:
-        if (XPT_TDP_IS_POINTER(cd->type.prefix.flags)) {
-            fprintf(stdout, "%s", cd->value.str);
-        } else 
-            return PR_FALSE;
-        break;
-    case TD_PWSTRING:
-        if (XPT_TDP_IS_POINTER(cd->type.prefix.flags)) {
-            PRUint16 *ch = cd->value.wstr;
-            while (*ch) {
-                fprintf(stdout, "%c", *ch & 0xff);
-                ch++;
-            }
-        } else 
-            return PR_FALSE;
-        break;
-    default:
-        perror("Unrecognized type");
-        return PR_FALSE;
-        break;   
-    }
-    
-    if (verbose_mode) {
-        fprintf(stdout, "\n");
-    } else {
-        fprintf(stdout, ";\n");
-    }
-
-    return PR_TRUE;
-}
diff --git a/xpcom/typelib/xpt/tools/xpt_link.c b/xpcom/typelib/xpt/tools/xpt_link.c
deleted file mode 100644
index 76bb903ff301..000000000000
--- a/xpcom/typelib/xpt/tools/xpt_link.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A utility for linking multiple typelib files. 
- */ 
-
-#include "xpt_xdr.h"
-#include <stdio.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include "prlong.h"
-
-#ifdef WINCE
-#include "windows.h"
-static void perror(const char* a) {}
-#endif
-
-#ifndef NULL
-#define NULL (void *) 0
-#endif
-
-/* Forward declarations. */
-typedef struct fixElement fixElement;
-static int compare_IDEs_by_IID(const void *ap, const void *bp);
-static int compare_IDE_with_zero(const void *ap);
-static int compare_IDEs_by_name(const void *ap, const void *bp);
-static int compare_IDEs_by_name_space(const void *ap, const void *bp);
-static int compare_strings(const void *ap, const void *bp);
-static int compare_pointers(const void *ap, const void *bp);
-static int compare_fixElements_by_IID(const void *ap, const void *bp);
-static int compare_fixElements_by_name(const void *ap, const void *bp);
-static int compare_IIDs(const void *ap, const void *bp);
-PRBool shrink_IDE_array(XPTInterfaceDirectoryEntry *ide, 
-                        int element_to_delete, int num_interfaces);
-PRBool update_fix_array(XPTArena *arena, fixElement *fix, int element_to_delete, 
-                        int num_interfaces, int replacement); 
-static int get_new_index(const fixElement *fix, int num_elements,
-                         int target_file, int target_interface);
-PRBool copy_IDE(XPTInterfaceDirectoryEntry *from, 
-                XPTInterfaceDirectoryEntry *to);
-PRBool copy_fixElement(fixElement *from, fixElement *to);
-static void print_IID(struct nsID *iid, FILE *file);
-static void xpt_link_usage(char *argv[]);
-
-struct fixElement {
-    nsID iid;
-    char* name;
-    int file_num;
-    int interface_num;
-    PRBool is_deleted;
-    /* These next two variables will point you to the substitute interface
-     * if this one has been deleted.
-     */
-    int maps_to_file_num;
-    int maps_to_interface_num;
-};
-
-/* Global variables. */
-PRUint16 trueNumberOfInterfaces = 0;
-PRUint16 totalNumberOfInterfaces = 0;
-PRUint16 oldTotalNumberOfInterfaces = 0;
-
-/* The following globals are explained in xpt_struct.h */
-PRUint8 major_version     = XPT_MAJOR_VERSION;
-PRUint8 minor_version     = XPT_MINOR_VERSION;
-
-static size_t get_file_length(const char* filename)
-{
-#ifndef WINCE
-    struct stat file_stat;
-    if (stat(filename, &file_stat) != 0) {
-        perror("FAILED: get_file_length");
-        exit(1);
-    }
-    return file_stat.st_size;
-#else
-    DWORD fileSize;
-    HANDLE hFile = CreateFile(filename, 
-                              GENERIC_READ,
-                              0, 
-                              NULL,
-                              OPEN_EXISTING, 
-                              FILE_ATTRIBUTE_NORMAL, 
-                              NULL);
-    if (hFile == INVALID_HANDLE_VALUE)
-        return -1;
-    fileSize = GetFileSize(hFile,  NULL);
-    CloseHandle(hFile);
-    return fileSize;
-#endif
-}
-
-int 
-main(int argc, char **argv)
-{
-    #ifdef XP_OS2   /* Shell does not expand wildcards on OS/2, doesn't work with OW */
-    _wildcard (&argc, &argv);
-    #endif
-
-    XPTArena *arena;
-    XPTState *state;
-    XPTCursor curs, *cursor = &curs;
-    XPTHeader *header;
-    XPTInterfaceDirectoryEntry *IDE_array = NULL;
-    XPTInterfaceDescriptor *id;
-    XPTTypeDescriptor *td;
-    XPTAnnotation *ann, *first_ann;
-    PRUint32 header_sz, len;
-    PRUint32 oldOffset;
-    PRUint32 newOffset;
-    size_t flen = 0;
-    char *head, *data, *whole;
-    const char *outFileName;
-    FILE *in, *out;
-    fixElement *fix_array = NULL;
-    int i,j;
-    int k = 0;
-
-    if (argc < 3) {
-        xpt_link_usage(argv);
-        return 1;
-    }
-        
-    arena = XPT_NewArena(1024 * 10, sizeof(double), "main xpt_link arena");
-    if (!arena) {
-        perror("FAILED: XPT_NewArena");
-        return 1;
-    }
-
-    first_ann = XPT_NewAnnotation(arena, XPT_ANN_LAST, NULL, NULL);
-
-    /* Check if the "-t version numnber" cmd line arg is present */
-    i = 1;
-    if (argv[i][0] == '-' && argv[i][1] == 't') {
-        /* Parse for "-t version number" */
-
-        /* If -t is the last argument on the command line, we have a problem */
-        if (i + 1 == argc) {
-            fprintf(stderr, "ERROR: missing version number after -t\n");
-            xpt_link_usage(argv);
-            return 1;
-        }
-
-        /*
-         * Assume that the argument after "-t" is the version number string
-         * and search for it in our internal list of acceptable version
-         * numbers.
-         */
-
-        switch (XPT_ParseVersionString(argv[++i], &major_version, 
-                                       &minor_version)) {
-          case XPT_VERSION_CURRENT:            
-          case XPT_VERSION_OLD: 
-            break; 
-          case XPT_VERSION_UNSUPPORTED: 
-            fprintf(stderr, "ERROR: version \"%s\" not supported.\n", 
-                    argv[i]);
-            xpt_link_usage(argv);
-            return 1;          
-          case XPT_VERSION_UNKNOWN: 
-          default:
-            fprintf(stderr, "ERROR: version \"%s\" not recognised.\n", 
-                    argv[i]);
-            xpt_link_usage(argv);
-            return 1;          
-        }
-            
-        /* Hang onto the output file name. It's needed later. */
-        outFileName = argv[++i];
-
-        /* Increment i to the cmd line arg after outFileName */
-        i++;
-    }
-    else {        
-        outFileName = argv[1];
-        i = 2;
-    }
-
-    for ( /* use i from earlier */ ; i < argc; i++) {
-        char *name = argv[i];
-
-        flen = get_file_length(name);
-        if (!flen) {
-            fprintf(stderr, "ERROR: file %s is zero length\n", name);
-            return 1;
-        }
-
-        in = fopen(name, "rb");
-        if (!in) {
-            perror("FAILED: fopen");
-            return 1;
-        }
-
-        whole = XPT_MALLOC(arena, flen);
-        if (!whole) {
-            perror("FAILED: XPT_MALLOC for whole");
-            return 1;
-        }
-        
-        if (flen > 0) {
-            size_t rv = fread(whole, 1, flen, in);
-            if (rv < flen) {
-                fprintf(stderr, "short read (%u vs %u)! ouch!\n",
-                        (unsigned int)rv, (unsigned int)flen);
-                return 1;
-            }
-            if (ferror(in) != 0 || fclose(in) != 0) {
-                perror("FAILED: Unable to read typelib file.\n");
-                return 1;
-            }
-            
-            state = XPT_NewXDRState(XPT_DECODE, whole, flen);
-            if (!XPT_MakeCursor(state, XPT_HEADER, 0, cursor)) {
-                fprintf(stdout, "XPT_MakeCursor failed for %s\n", name);
-                return 1;
-            }
-            if (!XPT_DoHeader(arena, cursor, &header)) {
-                fprintf(stdout,
-                        "DoHeader failed for %s.  Is %s a valid .xpt file?\n",
-                        name, name);
-                return 1;
-            }
-            
-            /*
-             * Make sure that the version of the typelib file is less than or
-             * equal to the version specified in the -t cmd line arg.
-             */
-
-            if ((header->major_version > major_version ||
-                (header->major_version == major_version &&
-                 header->minor_version > minor_version))) { 
-                fprintf(stderr, "FAILED: %s's version, %d.%d, is newer than "
-                                "the version (%d.%d) specified in the -t "
-                                "command line argument.\n", 
-                                name, header->major_version, header->minor_version,
-                                major_version, minor_version);
-                return 1;
-            }
-            
-            oldTotalNumberOfInterfaces = totalNumberOfInterfaces;
-            totalNumberOfInterfaces += header->num_interfaces;
-            if (header->num_interfaces > 0) {
-                XPTInterfaceDirectoryEntry *newIDE;
-                fixElement *newFix;
-  
-                newIDE = (XPTInterfaceDirectoryEntry *)
-                    XPT_MALLOC(arena, totalNumberOfInterfaces * 
-                               sizeof(XPTInterfaceDirectoryEntry));
-                if (!newIDE) {
-                    perror("FAILED: XPT_MALLOC of IDE_array");
-                    return 1;
-                }
-
-                if (IDE_array) {
-                    if (oldTotalNumberOfInterfaces)
-                        memcpy(newIDE, IDE_array,
-                               oldTotalNumberOfInterfaces * 
-                               sizeof(XPTInterfaceDirectoryEntry));
-                    XPT_FREE(arena, IDE_array);
-                }
-                IDE_array = newIDE;
-
-
-                newFix = (fixElement *)
-                    XPT_MALLOC(arena, 
-                               totalNumberOfInterfaces * sizeof(fixElement));
-                if (!newFix) {
-                    perror("FAILED: XPT_MALLOC of fix_array");
-                    return 1;
-                }
-
-                if (fix_array) {
-                    if (oldTotalNumberOfInterfaces)
-                        memcpy(newFix, fix_array,
-                               oldTotalNumberOfInterfaces * 
-                               sizeof(fixElement));
-                    XPT_FREE(arena, fix_array);
-                }
-                fix_array = newFix;
-            
-                for (j=0; j<header->num_interfaces; j++) {
-                    if (!copy_IDE(&header->interface_directory[j], 
-                                  &IDE_array[k])) {
-                        perror("FAILED: 1st copying of IDE");
-                        return 1;
-                    }
-                    fix_array[k].iid = IDE_array[k].iid;
-                    fix_array[k].name = IDE_array[k].name;
-                    fix_array[k].file_num = i-2;
-                    fix_array[k].interface_num = j+1;
-                    fix_array[k].is_deleted = PR_FALSE;
-                    fix_array[k].maps_to_file_num = i-2;
-                    fix_array[k].maps_to_interface_num = j+1;
-
-                    k++;
-                }
-            }
-            
-            /* Copy the annotations if they are not 'empty'
-             */
-            if (header->annotations != NULL &&
-                header->annotations->flags != XPT_ANN_LAST) {
-                ann = first_ann;
-                while (ann->next != NULL) {
-                    ann = ann->next;
-                }
-                ann->next = header->annotations;
-            }
-            
-            XPT_FREEIF(arena, header);
-            if (state)
-                XPT_DestroyXDRState(state);
-            XPT_FREE(arena, whole);
-            flen = 0;            
-
-        } else {
-            fclose(in);
-            perror("FAILED: file length <= 0");
-            return 1;
-        }
-    }
-
-    /* Make sure the last annotation is the only one marked as XP_ANN_LAST.
-     */
-    ann = first_ann;
-    while (ann->next != NULL) {
-        ann->flags &= ~XPT_ANN_LAST;
-        ann = ann->next;
-    }    
-    ann->flags |= XPT_ANN_LAST;
-
-    /* Sort both IDE_array and fix_array by name so we can check for 
-     * name_space::name collisions. 
-     */
-    qsort(IDE_array, 
-          totalNumberOfInterfaces, 
-          sizeof(XPTInterfaceDirectoryEntry), 
-          compare_IDEs_by_name);
-
-    qsort(fix_array, 
-          totalNumberOfInterfaces, 
-          sizeof(fixElement), 
-          compare_fixElements_by_name);
-
-    /* trueNumberOfInterfaces == number of interfaces left after deletions
-     * are made. Initialize it here to be the same as the total number of
-     * interfaces we'ce encountered thus far.
-     */
-    trueNumberOfInterfaces = totalNumberOfInterfaces;
-
-    /* Iterate through the sorted interfaces. Start at one so we don't 
-     * accidentally walk off the end of the array.
-     */
-    i = 1;
-    while (i != trueNumberOfInterfaces) {
-        
-        /* Check for name_space::name collision. 
-         */
-        if (compare_strings(IDE_array[i-1].name, 
-                            IDE_array[i].name) == 0 && 
-            compare_strings(IDE_array[i-1].name_space, 
-                             IDE_array[i].name_space) == 0) {
-            int to_delete = -1;
-            /* If one of the interfaces is unresolved, delete that one 
-             * preferentially. If they're both unresolved, but one of
-             * them has an IID and the other IID is empty, then delete
-             * the one with the empty IID.
-             */
-            if (!IDE_array[i-1].interface_descriptor) {
-                if (!IDE_array[i].interface_descriptor) {
-                    /* both unresolved, see if one has a zero IID */
-                    if (compare_IDE_with_zero(&IDE_array[i])) {
-                        /* one or both is zero, doesn't really matter */
-                        to_delete = i;
-                    } else if (compare_IDE_with_zero(&IDE_array[i - 1])) {
-                        to_delete = i - 1;
-                    } else if(compare_IIDs(&IDE_array[i-1].iid, &IDE_array[i].iid) == 0) {
-                        /* they're the same, so just pick one */
-                        to_delete = i;
-                    } else {
-                        /*XXX: error, unresolved references with different IIDs? */
-                        char *ns = IDE_array[i].name_space;
-                        fprintf(stderr,
-                        "ERROR: found duplicate unresolved interfaces "
-                        "%s%s%s\n",
-                        ns ? ns : "", ns ? "::" : "", IDE_array[i].name);
-                        return 1;
-                    }
-                }
-                else {
-                    /* just i-1 is unresolved */
-                    to_delete = i - 1;
-                }
-            } else if (!IDE_array[i].interface_descriptor ||
-                       (compare_IIDs(&IDE_array[i-1].iid, &IDE_array[i].iid) == 0)) {
-                to_delete = i;
-            } else {
-                /* Found interfaces with duplicate names but different
-                 * iids! */
-                char *ns = IDE_array[i].name_space;
-                fprintf(stderr,
-                        "ERROR: found duplicate definitions of interface "
-                        "%s%s%s with iids \n",
-                        ns ? ns : "", ns ? "::" : "", IDE_array[i].name);
-                print_IID(&IDE_array[i].iid, stderr);
-                fprintf(stderr, " and ");
-                print_IID(&IDE_array[i-1].iid, stderr);
-                fprintf(stderr, "\n");
-                return 1;
-            }
-
-            if (to_delete == (i - 1)) {
-                /* Shrink the IDE_array to delete the duplicate interface.
-                 */
-                if (!shrink_IDE_array(IDE_array, 
-                                      i-1, 
-                                      trueNumberOfInterfaces)) {
-                    perror("FAILED: shrink_IDE_array");
-                    return 1;
-                }
-                /* Update the fix array. This involves moving the deleted 
-                 * entry to the end of the array (rather than deleting it)
-                 * and mapping it to the "replacement" element so we can
-                 * update interface indices appropriately later.
-                 */
-                update_fix_array(arena, fix_array, i-1, 
-                                 totalNumberOfInterfaces, i);
-                /* Decrement the true number of interfaces since we just
-                 * deleted one. There's more than one way to get out of
-                 * this loop.
-                 */
-                trueNumberOfInterfaces--;
-            } else if (to_delete == i) {
-                /* Shrink the IDE_array to delete the duplicate interface.
-                 */
-                if (!shrink_IDE_array(IDE_array, 
-                                      i, 
-                                      trueNumberOfInterfaces)) {
-                    perror("FAILED: shrink_IDE_array");
-                    return 1;
-                }
-                /* Update the fix array. This involves moving the deleted 
-                 * entry to the end of the array (rather than deleting it)
-                 * and mapping it to the "replacement" element so we can
-                 * update interface indices appropriately later.
-                 */
-                update_fix_array(arena, fix_array, i, 
-                                 totalNumberOfInterfaces, i-1);
-                /* Decrement the true number of interfaces since we just
-                 * deleted one. There's more than one way to get out of
-                 * this loop.
-                 */
-                trueNumberOfInterfaces--;
-            } else {
-                /* XXX: error! */
-                char *ns = IDE_array[i].name_space;
-                fprintf(stderr,
-                        "ERROR: duplicate interfaces, don't know what to do "
-                        "%s%s%s\n",
-                        ns ? ns : "", ns ? "::" : "", IDE_array[i].name);
-                return 1;
-            }
-        } else {
-            /* Only increment if there was no name_space::name collision.
-             */
-            i++;
-        }
-    }
-
-    /* Sort the IDE_array (put them in their final order) so that updating
-     * of indices will be meaningful.
-     */
-    qsort(IDE_array, 
-          trueNumberOfInterfaces, 
-          sizeof(XPTInterfaceDirectoryEntry), 
-          compare_IDEs_by_IID);
-
-    /* Sort the fix_array to match the IDE_array. 
-     */
-    qsort(fix_array, 
-          trueNumberOfInterfaces, 
-          sizeof(fixElement), 
-          compare_fixElements_by_IID);
-
-    /* Iterate through the remaining interfaces (those not deleted) 
-     * looking for references to interfaces (such as id->parent_interface)
-     * which need an updated index number.
-     */
-    for (i=0; i<trueNumberOfInterfaces; i++) {
-        
-        /* Define id to save some keystrokes.
-         */
-        id = IDE_array[i].interface_descriptor;
-
-        /* Check for unresolved interface.
-         */
-        if (id) {
-            
-            /* Fix parent_interface first.
-             */
-            if (id->parent_interface && id->parent_interface != 0) {
-                id->parent_interface = 
-                    get_new_index(fix_array, totalNumberOfInterfaces,
-                                  fix_array[i].file_num, id->parent_interface);
-            }
-            /* Iterate through the method descriptors looking for params of
-             * type TD_INTERFACE_TYPE.
-             */
-            for (j=0; j<id->num_methods; j++) {
-                /* Cycle through the params first.
-                 */
-                for (k=0; k<id->method_descriptors[j].num_args; k++) {
-                    /* Define td to save some keystrokes.
-                     */
-                    td = &id->method_descriptors[j].params[k].type;
-
-                    while (XPT_TDP_TAG(td->prefix) == TD_ARRAY) {
-                        td = &id->additional_types[td->type.additional_type];
-                    }
-
-                    if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
-                        td->type.iface = 
-                            get_new_index(fix_array, 
-                                          totalNumberOfInterfaces,
-                                          fix_array[i].file_num, 
-                                          td->type.iface);
-                    }                                                
-                }
-
-                /* Check the result param too. Define td again to save 
-                 * some keystrokes.
-                 */
-                td = &id->method_descriptors[j].result->type;
-                if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
-                    td->type.iface = 
-                        get_new_index(fix_array, totalNumberOfInterfaces,
-                                      fix_array[i].file_num, 
-                                      td->type.iface);
-                }                
-            }
-        } 
-    }
-    
-    /* Iterate through the array quickly looking for duplicate IIDS.
-     * This shouldn't happen, i.e. is a failure condition, so bail
-     * if we find a duplicate. If we have more than one entry, start 
-     * at one so we don't accidentally grep the ether.
-     */
-    if (trueNumberOfInterfaces>1) {
-        for (i=1; i<trueNumberOfInterfaces; i++) {
-            /* Only complain if the IIDs are identical and nonzero. */
-            if (compare_IIDs(&IDE_array[i-1].iid, &IDE_array[i].iid) == 0 && 
-                compare_IDE_with_zero(&IDE_array[i]) != 0) {
-                fprintf(stderr, "FATAL ERROR:\n"
-                        "Duplicate IID detected (");
-                print_IID(&IDE_array[i-1].iid, stderr);
-                fprintf(stderr, ") in\n"
-                        "interface %s::%s from %s\n"
-                        "and\n" 
-                        "interface %s::%s from %s\n",
-                        IDE_array[i-1].name_space ? 
-                        IDE_array[i-1].name_space : "", 
-                        IDE_array[i-1].name, 
-                        argv[fix_array[i-1].file_num+2],
-                        IDE_array[i].name_space ? 
-                        IDE_array[i].name_space : "", 
-                        IDE_array[i].name, 
-                        argv[fix_array[i].file_num+2]);
-                return 1;
-            }
-        }
-    }
-
-    header = XPT_NewHeader(arena, (PRUint16)trueNumberOfInterfaces, 
-                           major_version, minor_version);
-
-    header->annotations = first_ann;
-    for (i=0; i<trueNumberOfInterfaces; i++) {
-        if (!copy_IDE(&IDE_array[i], &header->interface_directory[i])) {
-            perror("FAILED: 2nd copying of IDE");
-            return 1;
-        }
-    }
-    
-    header_sz = XPT_SizeOfHeaderBlock(header); 
-
-    state = XPT_NewXDRState(XPT_ENCODE, NULL, 0);
-    if (!state) {
-        perror("FAILED: error creating XDRState");
-        return 1;
-    }
-    
-    XPT_SetDataOffset(state, header_sz);
-
-    if (!XPT_MakeCursor(state, XPT_HEADER, header_sz, cursor)) {
-        perror("FAILED: error making cursor");
-        return 1;
-    }
-    oldOffset = cursor->offset;
-    if (!XPT_DoHeader(arena, cursor, &header)) {
-        perror("FAILED: error doing Header");
-        return 1;
-    }
-    newOffset = cursor->offset;
-    XPT_GetXDRDataLength(state, XPT_HEADER, &len);
-    header->file_length = len;
-    XPT_GetXDRDataLength(state, XPT_DATA, &len);
-    header->file_length += len;
-    XPT_SeekTo(cursor, oldOffset);
-    if (!XPT_DoHeaderPrologue(arena, cursor, &header, NULL)) {
-        perror("FAILED: error doing Header");
-        return 1;
-    }
-    XPT_SeekTo(cursor, newOffset);
-    out = fopen(outFileName, "wb");
-    if (!out) {
-        perror("FAILED: fopen");
-        return 1;
-    }
-
-    XPT_GetXDRData(state, XPT_HEADER, &head, &len);
-    fwrite(head, len, 1, out);
- 
-    XPT_GetXDRData(state, XPT_DATA, &data, &len);
-    fwrite(data, len, 1, out);
- 
-    if (ferror(out) != 0 || fclose(out) != 0) {
-        fprintf(stderr, "Error writing file: %s\n", argv[1]);
-    } else {
-/*        fprintf(stderr, "File written: %s\n", argv[1]); */
-    }
- 
-    if (state)
-        XPT_DestroyXDRState(state);
-    
-    XPT_DestroyArena(arena);
-
-    return 0;        
-}
-
-static int 
-compare_IDEs_by_IID(const void *ap,
-                    const void *bp)
-{
-    const XPTInterfaceDirectoryEntry *ide1 = ap, *ide2 = bp;
-    
-    int answer = compare_IIDs(&ide1->iid, &ide2->iid);
-    if(!answer)
-        answer = compare_strings(ide1->name, ide2->name);
-
-    return answer;
-}  
-
-/* For detecting unresolved interfaces. */
-const nsID iid_zero = { 0x0, 0x0, 0x0,
-                        { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } };
-
-static int
-compare_IDE_with_zero(const void *ap)
-{
-    const XPTInterfaceDirectoryEntry *ide1 = ap;
-
-    return compare_IIDs(&ide1->iid, &iid_zero);
-}
-
-static int 
-compare_fixElements_by_IID(const void *ap,
-                           const void *bp)
-{
-    const fixElement *fix1 = ap, *fix2 = bp;
-    
-    int answer = compare_IIDs(&fix1->iid, &fix2->iid);
-    if(!answer)
-        answer = compare_strings(fix1->name, fix2->name);
-
-    return answer;
-}  
-
-static int 
-compare_IDEs_by_name(const void *ap,
-                     const void *bp)
-{
-    const XPTInterfaceDirectoryEntry *ide1 = ap, *ide2 = bp;
-
-    int answer = compare_strings(ide1->name, ide2->name);
-    if(!answer)
-        answer = compare_pointers(ide1->name, ide2->name);
-
-    return answer;
-}
-
-static int 
-compare_IDEs_by_name_space(const void *ap,
-                           const void *bp)
-{
-    const XPTInterfaceDirectoryEntry *ide1 = ap, *ide2 = bp;
-    
-    return compare_strings(ide1->name_space, ide2->name_space);
-}
-
-static int 
-compare_strings(const void *ap, const void *bp)
-{
-    const char *string1 = ap, *string2 = bp;
-
-    if (!string1 && !string2)
-        return 0;
-    if (!string1)
-        return -1;
-    if (!string2)
-        return 1;
-
-    return strcmp(string1, string2);    
-}     
-
-static int 
-compare_pointers(const void *ap, const void *bp)
-{
-    if (ap == bp) {
-#ifdef DEBUG_jband
-        perror("name addresses were equal!");
-#endif
-        return 0;
-    }
-    if (ap > bp)
-        return 1;
-    return -1;
-}        
-
-static int 
-compare_fixElements_by_name(const void *ap,
-                            const void *bp)
-{
-    const fixElement *fix1 = ap, *fix2 = bp;
-
-    int answer= compare_strings(fix1->name, fix2->name);
-    if(!answer)
-        answer = compare_pointers(fix1->name, fix2->name);
-
-    return answer;
-}
-
-static int
-compare_IIDs(const void *ap, const void *bp)
-{
-    const nsID *a = ap, *b = bp;
-    int i;
-#define COMPARE(field) if (a->field > b->field) return 1; \
-                       if (b->field > a->field) return -1;
-    COMPARE(m0);
-    COMPARE(m1);
-    COMPARE(m2);
-    for (i = 0; i < 8; i++) {
-        COMPARE(m3[i]);
-    }
-    return 0;
-#undef COMPARE
-}
-
-PRBool 
-shrink_IDE_array(XPTInterfaceDirectoryEntry *ide, int element_to_delete,
-                    int num_interfaces)
-{
-    int i;
-
-    if (element_to_delete >= num_interfaces) {
-        return PR_FALSE;
-    }
-
-    for (i=element_to_delete+1; i<num_interfaces; i++) {
-        if (!copy_IDE(&ide[i], &ide[i-1])) {
-            return PR_FALSE;
-        }
-    }
-
-    return PR_TRUE;
-}
-
-/* update_fix_array marks a fixElement as deleted, updates its mapping 
- * to point to the "replacement" element, and moves it to the end of 
- * the array.
- */
-PRBool 
-update_fix_array(XPTArena *arena, fixElement *fix, int element_to_delete, 
-                 int num_interfaces, int replacement) 
-{
-    fixElement *deleted;
-    int i;  
-
-    if (element_to_delete >= num_interfaces) {
-        return PR_FALSE;
-    }
-
-    deleted = XPT_CALLOC(arena, sizeof(fixElement));
-    if (!copy_fixElement(&fix[element_to_delete], deleted)) {
-        return PR_FALSE;
-    }
-    deleted->is_deleted = PR_TRUE;
-    deleted->maps_to_file_num = fix[replacement].file_num;
-    deleted->maps_to_interface_num = fix[replacement].interface_num;
-    
-    for (i=element_to_delete+1; i<num_interfaces; i++) {
-        if (!copy_fixElement(&fix[i], &fix[i-1])) {
-            return PR_FALSE;
-        }
-    }
-
-    if (!copy_fixElement(deleted, &fix[num_interfaces-1])) {
-        return PR_FALSE;
-    }
-    
-    return PR_TRUE;
-}
-
-/* get_new_index returns the new interface index by walking the fix_array
- * until the file_num and interface_num match the target values. If a match
- * is found, it checks to see if that element has been deleted. If it has 
- * been deleted, it follows that elements mapping until it gets to the 
- * proper interface (recursion). FYI, Indices are one-based; zero 
- * represents the special case (no parent interface). 
- */
-static int 
-get_new_index(const fixElement *fix, int num_elements, 
-              int target_file, int target_interface) 
-{
-    int i;
-    
-    for (i=0; i<num_elements; i++) { 
-        if (fix[i].file_num == target_file &&
-            fix[i].interface_num == target_interface) {
-            if (fix[i].is_deleted) {
-                return get_new_index(fix, num_elements, 
-                                     fix[i].maps_to_file_num,
-                                     fix[i].maps_to_interface_num);
-            }
-            return i+1;
-        }
-    }
-    
-    return 0;
-}
-
-PRBool
-copy_IDE(XPTInterfaceDirectoryEntry *from, XPTInterfaceDirectoryEntry *to) 
-{
-    if (!from || !to) {
-        return PR_FALSE;
-    }
-    
-    to->iid = from->iid;
-    to->name = from->name;
-    to->name_space = from->name_space;
-    to->interface_descriptor = from->interface_descriptor;
-    return PR_TRUE;
-}
-
-PRBool
-copy_fixElement(fixElement *from, fixElement *to)
-{
-    if (!from || !to) {
-        return PR_FALSE;
-    }
-
-    to->iid = from->iid;
-    to->name = from->name;
-    to->file_num = from->file_num;
-    to->interface_num = from->interface_num;
-    to->is_deleted = from->is_deleted;
-    to->maps_to_file_num = from->maps_to_file_num;
-    to->maps_to_interface_num = from->maps_to_interface_num;
-
-    return PR_TRUE;    
-}
-
-static void
-print_IID(struct nsID *iid, FILE *file)
-{
-    fprintf(file, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-            (PRUint32) iid->m0, (PRUint32) iid->m1,(PRUint32) iid->m2,
-            (PRUint32) iid->m3[0], (PRUint32) iid->m3[1],
-            (PRUint32) iid->m3[2], (PRUint32) iid->m3[3],
-            (PRUint32) iid->m3[4], (PRUint32) iid->m3[5],
-            (PRUint32) iid->m3[6], (PRUint32) iid->m3[7]); 
-}
-
-static void
-xpt_link_usage(char *argv[]) 
-{
-    fprintf(stdout, "Usage: %s [-t version number] outfile file1.xpt file2.xpt ...\n"
-            "       Links multiple typelib files into one outfile\n"
-            "       -t create a typelib of an older version number\n", argv[0]);
-}
-

From 2e34091c987c390e9536446296df2c1d77b811ef Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 14 Apr 2011 11:23:13 +0200
Subject: [PATCH 121/509] Bug 602245 - Don't build SIMPLE_PROGRAMS during
 MOZ_PROFILE_GENERATE pass. r=ted

---
 config/config.mk                        | 5 +++++
 config/rules.mk                         | 7 ++++++-
 js/src/config/config.mk                 | 5 +++++
 js/src/config/rules.mk                  | 7 ++++++-
 toolkit/mozapps/update/test/Makefile.in | 2 ++
 tools/trace-malloc/Makefile.in          | 2 ++
 uriloader/exthandler/tests/Makefile.in  | 2 ++
 xpcom/tests/Makefile.in                 | 2 ++
 xpcom/tests/windows/Makefile.in         | 3 ---
 9 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index df93f8fc4cf4..c2276abb5587 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -342,6 +342,11 @@ ifdef SIMPLE_PROGRAMS
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 
+# No sense in profiling unit tests
+ifdef CPP_UNIT_TESTS
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
+
 # Enable profile-based feedback
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 ifdef MOZ_PROFILE_GENERATE
diff --git a/config/rules.mk b/config/rules.mk
index 34f56d213b41..619263bab59c 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -361,6 +361,11 @@ ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
+# Don't build SIMPLE_PROGRAMS during the MOZ_PROFILE_GENERATE pass
+ifdef MOZ_PROFILE_GENERATE
+SIMPLE_PROGRAMS :=
+endif
+
 ifndef TARGETS
 TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
 endif
@@ -1701,7 +1706,7 @@ endif
 
 endif # SDK_LIBRARY
 
-ifneq (,$(SDK_BINARY))
+ifneq (,$(strip $(SDK_BINARY)))
 $(SDK_BIN_DIR)::
 	$(NSINSTALL) -D $@
 
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index df93f8fc4cf4..c2276abb5587 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -342,6 +342,11 @@ ifdef SIMPLE_PROGRAMS
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 
+# No sense in profiling unit tests
+ifdef CPP_UNIT_TESTS
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
+
 # Enable profile-based feedback
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 ifdef MOZ_PROFILE_GENERATE
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 34f56d213b41..619263bab59c 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -361,6 +361,11 @@ ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
+# Don't build SIMPLE_PROGRAMS during the MOZ_PROFILE_GENERATE pass
+ifdef MOZ_PROFILE_GENERATE
+SIMPLE_PROGRAMS :=
+endif
+
 ifndef TARGETS
 TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
 endif
@@ -1701,7 +1706,7 @@ endif
 
 endif # SDK_LIBRARY
 
-ifneq (,$(SDK_BINARY))
+ifneq (,$(strip $(SDK_BINARY)))
 $(SDK_BIN_DIR)::
 	$(NSINSTALL) -D $@
 
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
index 8e8258b0a9bd..c44325d56f68 100644
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -113,6 +113,8 @@ libs:: unit/head_update.js.in
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $^ > $(TESTROOT)/unit/head_update.js
 
 ifndef ANDROID
+ifndef MOZ_PROFILE_GENERATE
 libs::
 	$(INSTALL) TestAUSHelper$(BIN_SUFFIX) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
+endif
 endif # ANDROID
diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in
index b678ea1d2d72..ac50f705cd97 100644
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -68,7 +68,9 @@ CSRCS            = \
 		formdata.c \
 		$(NULL)
 
+ifndef MOZ_PROFILE_GENERATE
 PROGRAM		= spacetrace$(BIN_SUFFIX)
+endif
 
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -I$(topsrcdir)/config/os2
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
index afb95935fe80..0ef170614e61 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -75,5 +75,7 @@ export PERSONAL_MAILCAP=$(shell cd $(srcdir) && pwd)/mailcap
 endif
 
 # need the executable for running the xpcshell unit tests
+ifneq (,$(SIMPLE_PROGRAMS))
 libs::
 	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
+endif
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index bb031c9627b3..74f8f2ef5ec2 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -172,7 +172,9 @@ LOCAL_INCLUDES	= \
 
 libs::
 	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
+ifneq (,$(SIMPLE_PROGRAMS))
 	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
+endif
 
 # Copy TestHarness.h into its own module, for ease of setting up includes
 # correctly.
diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in
index 0816d46263e3..86f5dc43f851 100644
--- a/xpcom/tests/windows/Makefile.in
+++ b/xpcom/tests/windows/Makefile.in
@@ -44,9 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 
-
-include $(topsrcdir)/config/config.mk
-
 CPP_UNIT_TESTS	= \
                   TestCOM.cpp \
                   $(NULL)

From 031f1948494f0c67468943887719ab46808dae28 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 12:47:41 +0200
Subject: [PATCH 122/509] Bug 508760 - Remove MSVC6 support from the tree;
 (Jv1) nsEventQueue.h. r=benjamin.

---
 xpcom/threads/nsEventQueue.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xpcom/threads/nsEventQueue.h b/xpcom/threads/nsEventQueue.h
index c919ac034f3f..1e231aae585f 100644
--- a/xpcom/threads/nsEventQueue.h
+++ b/xpcom/threads/nsEventQueue.h
@@ -96,7 +96,6 @@ private:
 
   // Page objects are linked together to form a simple deque.
 
-  struct Page; friend struct Page; // VC6!
   struct Page {
     struct Page *mNext;
     nsIRunnable *mEvents[EVENTS_PER_PAGE];

From 2087815507513db815279d9ecbd0f30337a3b2ef Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 13:03:31 +0200
Subject: [PATCH 123/509] Bug 647404 - automation.py: fix extractZip() and
 installExtension(); (Av1) s|os.sep|'/'|, Add shutil.rmtree() call, Fix some
 code nits. r=jmaher.

---
 build/automation.py.in | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index c90e3b766db7..76eb248c3ecc 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -634,10 +634,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
       pExitCode = ctypes.wintypes.DWORD()
       ctypes.windll.kernel32.GetExitCodeProcess(pHandle, ctypes.byref(pExitCode))
       ctypes.windll.kernel32.CloseHandle(pHandle)
-      if (pExitCode.value == STILL_ACTIVE):
-        return True
-      else:
-        return False
+      return pExitCode.value == STILL_ACTIVE
 
     def killPid(self, pid):
       PROCESS_TERMINATE = 0x0001
@@ -668,10 +665,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
         # Wait on it to see if it's a zombie. This can throw OSError.ECHILD if
         # the process terminates before we get to this point.
         wpid, wstatus = os.waitpid(pid, os.WNOHANG)
-        if wpid == 0:
-          return True
-
-        return False
+        return wpid == 0
       except OSError, err:
         # Catch the errors we might expect from os.kill/os.waitpid, 
         # and re-raise any others
@@ -928,16 +922,18 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
                  this is the name of the folder in the <profileDir>/extensions/<extensionID>
   """
   def installExtension(self, extensionSource, profileDir, extensionID):
-    if (not os.path.exists(extensionSource)):
+    if not os.path.exists(extensionSource):
       self.log.info("INFO | automation.py | Cannot install extension no source at: %s", extensionSource) 
       return
       
-    if (not os.path.exists(profileDir)):
+    if not os.path.exists(profileDir):
       self.log.info("INFO | automation.py | Cannot install extension invalid profileDir at: %s", profileDir)
       return
 
     # See if we have an XPI or a directory
-    if (os.path.isfile(extensionSource)):
+    tmpd = None
+    if os.path.isfile(extensionSource):
+      # shutil.copytree() needs a directory as source.
       tmpd = tempfile.mkdtemp()
       extrootdir = self.extractZip(extensionSource, tmpd)
     else:
@@ -948,6 +944,11 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
     # Now we copy the extension source into the extnshome
     shutil.copytree(extrootdir, extnshome)
 
+    # Remove (temporary) extracted XPI directory.
+    if tmpd:
+      # Ignore (unlikely) error, as nothing can be done about it.
+      shutil.rmtree(tmpd, True)
+
   def extractZip(self, filename, dest):
     z = zipfile.ZipFile(filename, 'r')
     for n in z.namelist():
@@ -955,7 +956,8 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
       parentdir = os.path.dirname(fullpath)
       if not os.path.isdir(parentdir):
         os.makedirs(parentdir)
-      if (not n.endswith(os.sep)):
+      # Windows too returns '/', not os.sep ('\').
+      if not n.endswith('/'):
         data = z.read(n)
         f = open(fullpath, 'w')
         f.write(data)

From 60f7fa10ab06e052c62b55e8cba4125b7f71f134 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 13:03:47 +0200
Subject: [PATCH 124/509] Bug 647404 - automation.py: fix extractZip() and
 installExtension(); (Bv2) Rewrite installExtension() to copy xpi file without
 extracting it, Remove now unused extractZip(). r=jmaher.

---
 build/automation.py.in | 66 ++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index 76eb248c3ecc..a29185d671a9 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -911,57 +911,35 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
 
     return status
 
-  """ 
-   Copies an "installed" extension into the extensions directory of the given profile
-   extensionSource - the source location of the extension files.  This can be either 
+  """
+   Copies an extension into the extensions directory of the given profile.
+   extensionSource - the source location of the extension files.  This can be either
                      a directory or a path to an xpi file.
    profileDir      - the profile directory we are copying into.  We will create the
-                     "extensions" directory there if it doesn't exist
+                     "extensions" directory there if it doesn't exist.
    extensionID     - the id of the extension to be used as the containing directory for the
-                     extension, i.e.
+                     extension, if extensionSource is a directory, i.e.
                  this is the name of the folder in the <profileDir>/extensions/<extensionID>
   """
-  def installExtension(self, extensionSource, profileDir, extensionID):
-    if not os.path.exists(extensionSource):
-      self.log.info("INFO | automation.py | Cannot install extension no source at: %s", extensionSource) 
-      return
-      
-    if not os.path.exists(profileDir):
-      self.log.info("INFO | automation.py | Cannot install extension invalid profileDir at: %s", profileDir)
+  def installExtension(self, extensionSource, profileDir, extensionID = None):
+    if not os.path.isdir(profileDir):
+      self.log.info("INFO | automation.py | Cannot install extension, invalid profileDir at: %s", profileDir)
       return
 
-    # See if we have an XPI or a directory
-    tmpd = None
-    if os.path.isfile(extensionSource):
-      # shutil.copytree() needs a directory as source.
-      tmpd = tempfile.mkdtemp()
-      extrootdir = self.extractZip(extensionSource, tmpd)
-    else:
-      extrootdir = extensionSource 
     extnsdir = os.path.join(profileDir, "extensions")
-    extnshome = os.path.join(extnsdir, extensionID)
 
-    # Now we copy the extension source into the extnshome
-    shutil.copytree(extrootdir, extnshome)
-
-    # Remove (temporary) extracted XPI directory.
-    if tmpd:
-      # Ignore (unlikely) error, as nothing can be done about it.
-      shutil.rmtree(tmpd, True)
-
-  def extractZip(self, filename, dest):
-    z = zipfile.ZipFile(filename, 'r')
-    for n in z.namelist():
-      fullpath = os.path.join(dest, n)
-      parentdir = os.path.dirname(fullpath)
-      if not os.path.isdir(parentdir):
-        os.makedirs(parentdir)
-      # Windows too returns '/', not os.sep ('\').
-      if not n.endswith('/'):
-        data = z.read(n)
-        f = open(fullpath, 'w')
-        f.write(data)
-        f.close()
-    z.close()
-    return dest
+    if os.path.isfile(extensionSource):
+      # Copy extension xpi directly.
+      # "destination file is created or overwritten".
+      shutil.copy2(extensionSource, extnsdir)
+    elif os.path.isdir(extensionSource):
+      if extensionID == None:
+        self.log.info("INFO | automation.py | Cannot install extension, missing extensionID")
+        return
 
+      # Copy extension tree into its own directory.
+      # "destination directory must not already exist".
+      shutil.copytree(extensionSource, os.path.join(extnsdir, extensionID))
+    else:
+      self.log.info("INFO | automation.py | Cannot install extension, invalid extensionSource at: %s", extensionSource)
+      return

From b3553b389c9d684d2598ee758bef20171519d582 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Thu, 14 Apr 2011 20:49:38 +0900
Subject: [PATCH 125/509] Bug 649604 - crash [@ nsAccessible::NativeState()],
 r=marcoz, surkov

---
 accessible/src/html/nsHTMLFormControlAccessible.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/accessible/src/html/nsHTMLFormControlAccessible.cpp b/accessible/src/html/nsHTMLFormControlAccessible.cpp
index d76d6e4644a8..38d88793f02a 100644
--- a/accessible/src/html/nsHTMLFormControlAccessible.cpp
+++ b/accessible/src/html/nsHTMLFormControlAccessible.cpp
@@ -422,6 +422,9 @@ nsHTMLTextFieldAccessible::GetNameInternal(nsAString& aName)
 
 NS_IMETHODIMP nsHTMLTextFieldAccessible::GetValue(nsAString& _retval)
 {
+  if (IsDefunct())
+    return NS_ERROR_FAILURE;
+
   if (NativeState() & states::PROTECTED)    // Don't return password text!
     return NS_ERROR_FAILURE;
 

From be59bd7f41223fdd2bccab21742a34c3df372b0d Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 12 Apr 2011 21:44:17 +0200
Subject: [PATCH 126/509] Bug 643293 - Intermittent
 browser_tabview_bug626791.js | drag-to-create-group: panorama button should
 be in the toolbar - Didn't expect -1, but got it [f=raymond, r=ian]

---
 .../test/tabview/browser_tabview_bug626791.js | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug626791.js b/browser/base/content/test/tabview/browser_tabview_bug626791.js
index bc91fd9c536e..4029255d6a61 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug626791.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug626791.js
@@ -20,10 +20,6 @@ function test() {
        prefix + ": panorama button should not be in the toolbar");
   }
 
-  let assertNumberOfGroups = function (num) {
-    is(cw.GroupItems.groupItems.length, num, prefix + ': there are ' + num + ' groups');
-  }
-
   let assertNumberOfTabs = function (num) {
     is(win.gBrowser.tabs.length, num, prefix + ': there are ' + num + ' tabs');
   }
@@ -91,7 +87,7 @@ function test() {
       assertToolbarButtonExists();
 
       next();
-    });
+    }, win);
   }
 
   let testDragToCreateOrphan = function (tab) {
@@ -124,14 +120,19 @@ function test() {
     prefix = 're-adding-after-removal';
     assertToolbarButtonNotExists();
 
-    TabView.firstUseExperienced = true;
+    win.TabView.firstUseExperienced = true;
+    assertToolbarButtonExists();
     removeToolbarButton();
-
-    TabView.firstUseExperienced = true;
-    TabView._addToolbarButton();
-
     assertToolbarButtonNotExists();
-    next();
+
+    win.close();
+
+    newWindowWithTabView(function (newWin) {
+      win = newWin;
+      win.TabView.firstUseExperienced = true;
+      assertToolbarButtonNotExists();
+      next();
+    });
   }
 
   let tests = [testNameGroup, testDragToCreateGroup, testCreateOrphan,
@@ -140,39 +141,39 @@ function test() {
   let next = function () {
     let test = tests.shift();
 
-    if (win)
-      win.close();
-
     if (!test) {
       finish();
       return;
     }
 
-    newWindowWithTabView(
-      function (newWin) {
-        cw = win.TabView.getContentWindow();
-        let groupItem = cw.GroupItems.groupItems[0];
-        groupItem.setSize(200, 200, true);
-        groupItem.setUserSize();
+    if (win)
+      win.close();
 
+    TabView.firstUseExperienced = false;
+
+    let onLoad = function (newWin) {
+      win = newWin;
+      removeToolbarButton();
+    }
+
+    let onShow = function () {
+      cw = win.TabView.getContentWindow();
+
+      let groupItem = cw.GroupItems.groupItems[0];
+      groupItem.setSize(200, 200, true);
+      groupItem.setUserSize();
+
+      SimpleTest.waitForFocus(function () {
         assertToolbarButtonNotExists();
         test();
-      },
-      function(newWin) {
-        win = newWin;
-        removeToolbarButton();
-        TabView.firstUseExperienced = false;
-        TabView.init();
-      }
-    );
+      }, cw);
+    }
+
+    newWindowWithTabView(onShow, onLoad);
   }
 
   waitForExplicitFinish();
-
-  registerCleanupFunction(function () {
-    if (win && !win.closed)
-      win.close();
-  });
+  registerCleanupFunction(function () win && win.close());
 
   next();
 }

From e3b8a5d6d029411e07f72fc3f24956103c7aa51e Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 14 Apr 2011 14:04:08 +0200
Subject: [PATCH 127/509] Bug 620000 - Remove nsXULPDGlobalObject::OnFinalize's
 language id parameter; r=jst

---
 content/xbl/src/nsXBLDocumentInfo.cpp               | 11 ++++-------
 content/xul/document/src/nsXULPrototypeDocument.cpp |  8 +++-----
 dom/base/nsDOMClassInfo.cpp                         |  2 +-
 dom/base/nsGlobalWindow.cpp                         |  7 ++-----
 dom/base/nsGlobalWindow.h                           |  2 +-
 dom/base/nsIScriptGlobalObject.h                    | 11 +++++------
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp
index 19925a76b699..375285c1cc18 100644
--- a/content/xbl/src/nsXBLDocumentInfo.cpp
+++ b/content/xbl/src/nsXBLDocumentInfo.cpp
@@ -76,7 +76,7 @@ public:
 
   virtual nsIScriptContext *GetContext();
   virtual JSObject *GetGlobalJSObject();
-  virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal);
+  virtual void OnFinalize(JSObject* aObject);
   virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
   // nsIScriptObjectPrincipal methods
@@ -167,7 +167,7 @@ nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj)
   nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(nativeThis));
 
   if (sgo)
-    sgo->OnFinalize(nsIProgrammingLanguage::JAVASCRIPT, obj);
+    sgo->OnFinalize(obj);
 
   // The addref was part of JSObject construction
   NS_RELEASE(nativeThis);
@@ -383,13 +383,10 @@ nsXBLDocGlobalObject::GetGlobalJSObject()
 }
 
 void
-nsXBLDocGlobalObject::OnFinalize(PRUint32 aLangID, void *aObject)
+nsXBLDocGlobalObject::OnFinalize(JSObject* aObject)
 {
-  NS_ASSERTION(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
-               "Only JS supported");
   NS_ASSERTION(aObject == mJSObject, "Wrong object finalized!");
-
-  mJSObject = nsnull;
+  mJSObject = NULL;
 }
 
 void
diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp
index fcdcc5e1653d..918592e3ea0a 100644
--- a/content/xul/document/src/nsXULPrototypeDocument.cpp
+++ b/content/xul/document/src/nsXULPrototypeDocument.cpp
@@ -81,7 +81,7 @@ public:
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
     // nsIScriptGlobalObject methods
-    virtual void OnFinalize(PRUint32 aLangID, void *aGlobal);
+    virtual void OnFinalize(JSObject* aObject);
     virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
     virtual void *GetScriptGlobal(PRUint32 lang);
@@ -124,7 +124,7 @@ nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj)
     nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(nativeThis));
 
     if (sgo) {
-        sgo->OnFinalize(nsIProgrammingLanguage::JAVASCRIPT, obj);
+        sgo->OnFinalize(obj);
     }
 
     // The addref was part of JSObject construction
@@ -777,10 +777,8 @@ nsXULPDGlobalObject::ClearGlobalObjectOwner()
 
 
 void
-nsXULPDGlobalObject::OnFinalize(PRUint32 aLangID, void *aObject)
+nsXULPDGlobalObject::OnFinalize(JSObject* aObject)
 {
-  NS_ABORT_IF_FALSE(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
-                    "We don't support this language ID");
   mJSObject = NULL;
 }
 
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index f1c124fb5631..a2d4ddd88256 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -7079,7 +7079,7 @@ nsWindowSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryWrappedNative(wrapper));
   NS_ENSURE_TRUE(sgo, NS_ERROR_UNEXPECTED);
 
-  sgo->OnFinalize(nsIProgrammingLanguage::JAVASCRIPT, obj);
+  sgo->OnFinalize(obj);
 
   return NS_OK;
 }
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index ec762735c528..f2c9af49ee77 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -2760,13 +2760,10 @@ nsGlobalWindow::DispatchDOMEvent(nsEvent* aEvent,
 }
 
 void
-nsGlobalWindow::OnFinalize(PRUint32 aLangID, void *aObject)
+nsGlobalWindow::OnFinalize(JSObject* aObject)
 {
-  NS_ASSERTION(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
-               "We don't support this language ID");
-
   if (aObject == mJSObject) {
-    mJSObject = nsnull;
+    mJSObject = NULL;
   }
 }
 
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 141a561c4b8e..44233ca144ed 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -320,7 +320,7 @@ public:
   // for the context is created by the context's GetNativeGlobal() method.
   virtual nsresult SetScriptContext(PRUint32 lang, nsIScriptContext *aContext);
   
-  virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal);
+  virtual void OnFinalize(JSObject* aObject);
   virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
   // nsIScriptObjectPrincipal
diff --git a/dom/base/nsIScriptGlobalObject.h b/dom/base/nsIScriptGlobalObject.h
index e9063592faf9..c8a461f0c798 100644
--- a/dom/base/nsIScriptGlobalObject.h
+++ b/dom/base/nsIScriptGlobalObject.h
@@ -100,12 +100,12 @@ NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal,
 
 
 #define NS_ISCRIPTGLOBALOBJECT_IID \
-{ 0xe9f3f2c1, 0x2d94, 0x4722, \
-  { 0xbb, 0xd4, 0x2b, 0xf6, 0xfd, 0xf4, 0x2f, 0x48 } }
+{ 0x4eb16819, 0x4e81, 0x406e, \
+  { 0x93, 0x05, 0x6f, 0x30, 0xfc, 0xd2, 0x62, 0x4a } }
 
 /**
-  * The global object which keeps a script context for each supported script
-  * language. This often used to store per-window global state.
+ * The global object which keeps a script context for each supported script
+ * language. This often used to store per-window global state.
  */
 
 class nsIScriptGlobalObject : public nsISupports
@@ -156,8 +156,7 @@ public:
    * After this call, the passed object is dead - which should generally be the
    * same object the global is using for a global for that language.
    */
-
-  virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal) = 0;
+  virtual void OnFinalize(JSObject* aObject) = 0;
 
   /**
    * Called to enable/disable scripts.

From 473cebda59d86056ffd8f32f9bad4e7fe2f9b118 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 14 Apr 2011 14:04:12 +0200
Subject: [PATCH 128/509] Bug 589894 - Fix a number of build warnings in
 content/; r=smaug

---
 content/base/src/nsDocument.cpp                 |  5 ++++-
 content/base/src/nsGenericElement.cpp           |  4 +++-
 content/base/src/nsInProcessTabChildGlobal.cpp  |  5 ++++-
 content/base/src/nsObjectLoadingContent.cpp     |  4 ++++
 content/base/src/nsWebSocket.cpp                |  8 +++++---
 content/base/src/nsXMLContentSerializer.cpp     |  5 +++--
 content/canvas/src/CustomQS_Canvas2D.h          |  8 +++-----
 content/canvas/src/CustomQS_WebGL.h             | 15 +++++----------
 content/events/src/nsEventListenerManager.cpp   |  3 +--
 content/events/src/nsEventStateManager.cpp      | 17 ++++++++++-------
 .../html/content/src/nsGenericHTMLElement.cpp   |  4 ++--
 content/html/content/src/nsHTMLBodyElement.cpp  |  3 +++
 .../html/content/src/nsHTMLScriptElement.cpp    |  3 +++
 content/html/content/src/nsHTMLTitleElement.cpp |  3 +++
 content/html/document/src/nsHTMLDocument.cpp    | 10 +++-------
 content/media/nsMediaStream.cpp                 |  2 +-
 .../src/SVGAnimatedPreserveAspectRatio.h        |  6 ++++++
 content/svg/content/src/nsSVGAngle.cpp          |  4 ++--
 content/svg/content/src/nsSVGFilters.cpp        |  7 +++----
 content/svg/content/src/nsSVGPolyElement.cpp    |  2 +-
 content/xbl/src/nsXBLBinding.cpp                |  2 +-
 content/xslt/src/xpath/txCoreFunctionCall.cpp   |  2 +-
 content/xslt/src/xpath/txExprParser.cpp         |  4 ++--
 .../xslt/src/xpath/txXPCOMExtensionFunction.cpp |  2 +-
 content/xul/content/src/nsXULElement.cpp        |  4 ++--
 content/xul/templates/src/nsTemplateRule.cpp    |  8 ++++----
 layout/forms/nsTextControlFrame.h               | 10 +++++-----
 27 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index bdb4ccb06ec0..0e90554b0d3b 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -8285,7 +8285,10 @@ nsDocument::RemoveImage(imgIRequest* aImage)
 
   // Get the old count. It should exist and be > 0.
   PRUint32 count;
-  PRBool found = mImageTracker.Get(aImage, &count);
+#ifdef DEBUG
+  PRBool found =
+#endif
+  mImageTracker.Get(aImage, &count);
   NS_ABORT_IF_FALSE(found, "Removing image that wasn't in the tracker!");
   NS_ABORT_IF_FALSE(count > 0, "Entry in the cache tracker with count 0!");
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 7476757a0b6c..333131d9ec84 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -4582,7 +4582,9 @@ nsGenericElement::MaybeCheckSameAttrVal(PRInt32 aNamespaceID, nsIAtom* aName,
         // Need to store the old value
         info.mValue->ToString(*aOldValue);
         valueMatches = aValue.Equals(*aOldValue);
-      } else if (aNotify) {
+      } else {
+        NS_ABORT_IF_FALSE(aNotify,
+                          "Either hasListeners or aNotify should be true.");
         valueMatches = info.mValue->Equals(aValue, eCaseMatters);
       }
       if (valueMatches && aPrefix == info.mName->GetPrefix()) {
diff --git a/content/base/src/nsInProcessTabChildGlobal.cpp b/content/base/src/nsInProcessTabChildGlobal.cpp
index 6ba11e4adadf..aacd83c83950 100644
--- a/content/base/src/nsInProcessTabChildGlobal.cpp
+++ b/content/base/src/nsInProcessTabChildGlobal.cpp
@@ -129,7 +129,10 @@ nsInProcessTabChildGlobal::~nsInProcessTabChildGlobal()
 nsresult
 nsInProcessTabChildGlobal::Init()
 {
-  nsresult rv = InitTabChildGlobal();
+#ifdef DEBUG
+  nsresult rv =
+#endif
+  InitTabChildGlobal();
   NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
                    "Couldn't initialize nsInProcessTabChildGlobal");
   mMessageManager = new nsFrameMessageManager(PR_FALSE,
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 2695d9c715a4..6e168d2648ff 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -1077,6 +1077,10 @@ nsObjectLoadingContent::ObjectState() const
         case ePluginUnsupported:
           state |= NS_EVENT_STATE_TYPE_UNSUPPORTED;
           break;
+        case ePluginOutdated:
+        case ePluginOtherState:
+          // Do nothing, but avoid a compile warning
+          break;
       }
       return state;
   };
diff --git a/content/base/src/nsWebSocket.cpp b/content/base/src/nsWebSocket.cpp
index efbfa21486da..7c222ff278b2 100644
--- a/content/base/src/nsWebSocket.cpp
+++ b/content/base/src/nsWebSocket.cpp
@@ -897,6 +897,9 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_BEGIN(DoInitialRequest)
         buf->AppendLiteral("\r\n");
       }
       break;
+
+      case numberRequestHeaders:
+      break;
     }
 
     headersToSend.RemoveElementAt(headerPosToSendNow);
@@ -1733,10 +1736,9 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_BEGIN(AddWSConnecting)
   NS_ASSERTION(index == nsTArray<PRNetAddr>::NoIndex,
                "The ws connection shouldn't be already added in the "
                "serialization list.");
+  bool inserted = !!
 #endif
-
-  PRBool inserted =
-    !!(sWSsConnecting->InsertElementSorted(this, nsWSNetAddressComparator()));
+  sWSsConnecting->InsertElementSorted(this, nsWSNetAddressComparator());
   NS_ASSERTION(inserted, "Couldn't insert the ws connection into the "
                          "serialization list.");
 }
diff --git a/content/base/src/nsXMLContentSerializer.cpp b/content/base/src/nsXMLContentSerializer.cpp
index 47ce17d9a461..111541d65ad2 100644
--- a/content/base/src/nsXMLContentSerializer.cpp
+++ b/content/base/src/nsXMLContentSerializer.cpp
@@ -1319,7 +1319,8 @@ void
 nsXMLContentSerializer::IncrIndentation(nsIAtom* aName)
 {
   // we want to keep the source readable
-  if(mDoWrap && mIndent.Length() >= mMaxColumn - MIN_INDENTED_LINE_LENGTH) {
+  if (mDoWrap &&
+      mIndent.Length() >= PRUint32(mMaxColumn) - MIN_INDENTED_LINE_LENGTH) {
     ++mIndentOverflow;
   }
   else {
@@ -1658,7 +1659,7 @@ nsXMLContentSerializer::AppendToStringFormatedWrapped(const nsASingleFragmentStr
   PRBool mayIgnoreStartOfLineWhitespaceSequence =
     (!mColPos || (mIsIndentationAddedOnCurrentLine &&
                   sequenceStartAfterAWhitespace &&
-                  mColPos == mIndent.Length()));
+                  PRUint32(mColPos) == mIndent.Length()));
 
   while (pos < end) {
     sequenceStart = pos;
diff --git a/content/canvas/src/CustomQS_Canvas2D.h b/content/canvas/src/CustomQS_Canvas2D.h
index 00b0928a420c..27fe1890d870 100644
--- a/content/canvas/src/CustomQS_Canvas2D.h
+++ b/content/canvas/src/CustomQS_Canvas2D.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -58,8 +57,7 @@ Canvas2D_SetStyleHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
     if (!xpc_qsUnwrapThis(cx, obj, nsnull, &self, &selfref.ptr, tvr.jsval_addr(), nsnull))
         return JS_FALSE;
 
-    nsresult rv;
-
+    nsresult rv = NS_OK;
     if (JSVAL_IS_STRING(*vp)) {
         xpc_qsDOMString arg0(cx, *vp, vp,
                              xpc_qsDOMString::eDefaultNullBehavior,
diff --git a/content/canvas/src/CustomQS_WebGL.h b/content/canvas/src/CustomQS_WebGL.h
index 70df01103829..966aa93625cf 100644
--- a/content/canvas/src/CustomQS_WebGL.h
+++ b/content/canvas/src/CustomQS_WebGL.h
@@ -671,8 +671,6 @@ helper_nsIDOMWebGLRenderingContext_UniformMatrix_x_fv(JSContext *cx, uintN argc,
     if (!obj)
         return JS_FALSE;
 
-    nsresult rv;
-
     nsIDOMWebGLRenderingContext *self;
     xpc_qsSelfRef selfref;
     js::AutoValueRooter tvr(cx);
@@ -686,7 +684,7 @@ helper_nsIDOMWebGLRenderingContext_UniformMatrix_x_fv(JSContext *cx, uintN argc,
 
     nsIWebGLUniformLocation *location;
     xpc_qsSelfRef location_selfref;
-    rv = xpc_qsUnwrapArg(cx, argv[0], &location, &location_selfref.ptr, &argv[0]);
+    nsresult rv = xpc_qsUnwrapArg(cx, argv[0], &location, &location_selfref.ptr, &argv[0]);
     if (NS_FAILED(rv)) {
         xpc_qsThrowBadArg(cx, rv, vp, 0);
         return JS_FALSE;
@@ -746,8 +744,6 @@ helper_nsIDOMWebGLRenderingContext_VertexAttrib_x_fv(JSContext *cx, uintN argc,
     if (!obj)
         return JS_FALSE;
 
-    nsresult rv;
-
     nsIDOMWebGLRenderingContext *self;
     xpc_qsSelfRef selfref;
     js::AutoValueRooter tvr(cx);
@@ -790,6 +786,7 @@ helper_nsIDOMWebGLRenderingContext_VertexAttrib_x_fv(JSContext *cx, uintN argc,
         return JS_FALSE;
     }
 
+    nsresult rv = NS_OK;
     if (nElements == 1) {
         rv = self->VertexAttrib1fv_array(location, wa);
     } else if (nElements == 2) {
@@ -953,8 +950,7 @@ helper_nsIDOMWebGLRenderingContext_Uniform_x_iv_tn(JSContext *cx, JSObject *obj,
         return;
     }
 
-    nsresult rv;
-
+    nsresult rv = NS_OK;
     if (nElements == 1) {
         rv = self->Uniform1iv_array(location, wa);
     } else if (nElements == 2) {
@@ -1025,8 +1021,7 @@ helper_nsIDOMWebGLRenderingContext_Uniform_x_fv_tn(JSContext *cx, JSObject *obj,
         return;
     }
 
-    nsresult rv;
-
+    nsresult rv = NS_OK;
     if (nElements == 1) {
         rv = self->Uniform1fv_array(location, wa);
     } else if (nElements == 2) {
@@ -1099,7 +1094,7 @@ helper_nsIDOMWebGLRenderingContext_UniformMatrix_x_fv_tn(JSContext *cx, JSObject
         return;
     }
 
-    nsresult rv;
+    nsresult rv = NS_OK;
     if (nElements == 2) {
         rv = self->UniformMatrix2fv_array(location, transpose, wa);
     } else if (nElements == 3) {
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 5e060689e26c..b98f081a457f 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -697,8 +697,6 @@ nsEventListenerManager::AddScriptEventListener(nsISupports *aObject,
     return NS_ERROR_FAILURE;
   }
 
-  nsresult rv;
-
   nsCOMPtr<nsINode> node(do_QueryInterface(aObject));
 
   nsCOMPtr<nsIDocument> doc;
@@ -734,6 +732,7 @@ nsEventListenerManager::AddScriptEventListener(nsISupports *aObject,
     return NS_OK;
   }
 
+  nsresult rv = NS_OK;
   // return early preventing the event listener from being added
   // 'doc' is fetched above
   if (doc) {
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index ff936682ab95..3744ea0465cf 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -624,9 +624,11 @@ nsMouseWheelTransaction::SetTimeout()
     timer.swap(sTimer);
   }
   sTimer->Cancel();
+#ifdef DEBUG
   nsresult rv =
-    sTimer->InitWithFuncCallback(OnTimeout, nsnull, GetTimeoutTime(),
-                                 nsITimer::TYPE_ONE_SHOT);
+#endif
+  sTimer->InitWithFuncCallback(OnTimeout, nsnull, GetTimeoutTime(),
+                               nsITimer::TYPE_ONE_SHOT);
   NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "nsITimer::InitWithFuncCallback failed");
 }
 
@@ -3278,11 +3280,12 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
               // Shift focus forward or back depending on shift key
               PRBool isDocMove = ((nsInputEvent*)aEvent)->isControl ||
                                  (keyEvent->keyCode == NS_VK_F6);
-              PRUint32 dir = ((nsInputEvent*)aEvent)->isShift ?
-                             (isDocMove ? nsIFocusManager::MOVEFOCUS_BACKWARDDOC :
-                                          nsIFocusManager::MOVEFOCUS_BACKWARD) :
-                             (isDocMove ? nsIFocusManager::MOVEFOCUS_FORWARDDOC :
-                                          nsIFocusManager::MOVEFOCUS_FORWARD);
+              PRUint32 dir =
+                static_cast<nsInputEvent*>(aEvent)->isShift ?
+                  (isDocMove ? static_cast<PRUint32>(nsIFocusManager::MOVEFOCUS_BACKWARDDOC) :
+                               static_cast<PRUint32>(nsIFocusManager::MOVEFOCUS_BACKWARD)) :
+                  (isDocMove ? static_cast<PRUint32>(nsIFocusManager::MOVEFOCUS_FORWARDDOC) :
+                               static_cast<PRUint32>(nsIFocusManager::MOVEFOCUS_FORWARD));
               nsCOMPtr<nsIDOMElement> result;
               fm->MoveFocus(mDocument->GetWindow(), nsnull, dir,
                             nsIFocusManager::FLAG_BYKEY,
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 6277b3700e38..6948487f4f1e 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -1193,7 +1193,7 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
   PRBool accessKey = aName == nsGkAtoms::accesskey && 
                      aNameSpaceID == kNameSpaceID_None;
 
-  PRInt32 change;
+  PRInt32 change = 0;
   if (contentEditable) {
     change = GetContentEditableValue() == eTrue ? -1 : 0;
     SetMayHaveContentEditableAttr();
@@ -1228,7 +1228,7 @@ nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
                                 PRBool aNotify)
 {
   PRBool contentEditable = PR_FALSE;
-  PRInt32 contentEditableChange;
+  PRInt32 contentEditableChange = 0;
 
   // Check for event handlers
   if (aNameSpaceID == kNameSpaceID_None) {
diff --git a/content/html/content/src/nsHTMLBodyElement.cpp b/content/html/content/src/nsHTMLBodyElement.cpp
index c19a12a3afc5..f12131c76122 100644
--- a/content/html/content/src/nsHTMLBodyElement.cpp
+++ b/content/html/content/src/nsHTMLBodyElement.cpp
@@ -83,6 +83,9 @@ class nsHTMLBodyElement : public nsGenericHTMLElement,
                           public nsIDOMHTMLBodyElement
 {
 public:
+  using nsGenericElement::GetText;
+  using nsGenericElement::SetText;
+
   nsHTMLBodyElement(already_AddRefed<nsINodeInfo> aNodeInfo);
   virtual ~nsHTMLBodyElement();
 
diff --git a/content/html/content/src/nsHTMLScriptElement.cpp b/content/html/content/src/nsHTMLScriptElement.cpp
index 295582c51ff1..2716be767ba5 100644
--- a/content/html/content/src/nsHTMLScriptElement.cpp
+++ b/content/html/content/src/nsHTMLScriptElement.cpp
@@ -309,6 +309,9 @@ class nsHTMLScriptElement : public nsGenericHTMLElement,
                             public nsScriptElement
 {
 public:
+  using nsGenericElement::GetText;
+  using nsGenericElement::SetText;
+
   nsHTMLScriptElement(already_AddRefed<nsINodeInfo> aNodeInfo,
                       FromParser aFromParser);
   virtual ~nsHTMLScriptElement();
diff --git a/content/html/content/src/nsHTMLTitleElement.cpp b/content/html/content/src/nsHTMLTitleElement.cpp
index 68222a0570a0..a730458666ad 100644
--- a/content/html/content/src/nsHTMLTitleElement.cpp
+++ b/content/html/content/src/nsHTMLTitleElement.cpp
@@ -49,6 +49,9 @@ class nsHTMLTitleElement : public nsGenericHTMLElement,
                            public nsStubMutationObserver
 {
 public:
+  using nsGenericElement::GetText;
+  using nsGenericElement::SetText;
+
   nsHTMLTitleElement(already_AddRefed<nsINodeInfo> aNodeInfo);
   virtual ~nsHTMLTitleElement();
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index c8aaa0fe1333..20a22ce393ea 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -3287,7 +3287,7 @@ nsHTMLDocument::EditingStateChanged()
   }
 
   PRBool makeWindowEditable = mEditingState == eOff;
-  PRBool updateState;
+  bool updateState = false;
   PRBool spellRecheckAll = PR_FALSE;
   nsCOMPtr<nsIEditor> editor;
 
@@ -3356,7 +3356,7 @@ nsHTMLDocument::EditingStateChanged()
       rv = editSession->DisableJSAndPlugins(window);
       NS_ENSURE_SUCCESS(rv, rv);
 
-      updateState = PR_TRUE;
+      updateState = true;
       spellRecheckAll = oldState == eContentEditable;
     }
     else if (oldState == eDesignMode) {
@@ -3366,11 +3366,7 @@ nsHTMLDocument::EditingStateChanged()
       rv = editSession->RestoreJSAndPlugins(window);
       NS_ENSURE_SUCCESS(rv, rv);
 
-      updateState = PR_TRUE;
-    }
-    else {
-      // contentEditable is being turned on (and designMode is off).
-      updateState = PR_FALSE;
+      updateState = true;
     }
 
     rv = presShell->SetAgentStyleSheets(agentSheets);
diff --git a/content/media/nsMediaStream.cpp b/content/media/nsMediaStream.cpp
index 04f7da0ad55d..1da816e86c10 100644
--- a/content/media/nsMediaStream.cpp
+++ b/content/media/nsMediaStream.cpp
@@ -1004,7 +1004,7 @@ nsresult nsMediaFileStream::Open(nsIStreamListener** aStreamListener)
     *aStreamListener = nsnull;
   }
 
-  nsresult rv;
+  nsresult rv = NS_OK;
   if (aStreamListener) {
     // The channel is already open. We need a synchronous stream that
     // implements nsISeekableStream, so we have to find the underlying
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
index f129e79d46cf..6a91d8d374d9 100644
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
@@ -53,6 +53,12 @@ class SVGPreserveAspectRatio
   friend class SVGAnimatedPreserveAspectRatio;
 
 public:
+  SVGPreserveAspectRatio()
+    : mAlign(0)
+    , mMeetOrSlice(0)
+    , mDefer(false)
+  {};
+
   nsresult SetAlign(PRUint16 aAlign) {
     if (aAlign < nsIDOMSVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE ||
         aAlign > nsIDOMSVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_XMAXYMAX)
diff --git a/content/svg/content/src/nsSVGAngle.cpp b/content/svg/content/src/nsSVGAngle.cpp
index 0d16c0bca166..8ec6de0ec2c1 100644
--- a/content/svg/content/src/nsSVGAngle.cpp
+++ b/content/svg/content/src/nsSVGAngle.cpp
@@ -337,8 +337,8 @@ nsSVGAngle::SetBaseValueString(const nsAString &aValueAsString,
                                nsSVGElement *aSVGElement,
                                PRBool aDoSetAttr)
 {
-  float value;
-  PRUint16 unitType;
+  float value = 0;
+  PRUint16 unitType = 0;
   
   nsresult rv = GetValueFromString(aValueAsString, &value, &unitType);
   if (NS_FAILED(rv)) {
diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp
index b032f84c48c3..0447478ef23b 100644
--- a/content/svg/content/src/nsSVGFilters.cpp
+++ b/content/svg/content/src/nsSVGFilters.cpp
@@ -563,7 +563,7 @@ BoxBlur(const PRUint8 *aInput, PRUint8 *aOutput,
   }
 
   aOutput += aStrideMinor*aStartMinor;
-  if (aStartMinor + boxSize <= aEndMinor) {
+  if (aStartMinor + PRInt32(boxSize) <= aEndMinor) {
     const PRUint8 *lastInput = aInput + aStartMinor*aStrideMinor;
     const PRUint8 *nextInput = aInput + (aStartMinor + aRightLobe + 1)*aStrideMinor;
 #define OUTPUT(j)     aOutput[j] = (sums[j]*scaledDivisor) >> 24;
@@ -4876,7 +4876,8 @@ nsSVGFELightingElement::Filter(nsSVGFilterInstance *instance,
     L[1] = sin(azimuth * radPerDeg) * cos(elevation * radPerDeg);
     L[2] = sin(elevation * radPerDeg);
   }
-  float lightPos[3], pointsAt[3], specularExponent, cosConeAngle;
+  float lightPos[3], pointsAt[3], specularExponent;
+  float cosConeAngle = 0;
   if (pointLight) {
     static_cast<nsSVGFEPointLightElement*>
       (pointLight.get())->GetAnimatedNumberValues(lightPos,
@@ -4903,8 +4904,6 @@ nsSVGFELightingElement::Filter(nsSVGFilterInstance *instance,
     nsCOMPtr<nsIContent> spot = do_QueryInterface(spotLight);
     if (spot->HasAttr(kNameSpaceID_None, nsGkAtoms::limitingConeAngle)) {
       cosConeAngle = NS_MAX<double>(cos(limitingConeAngle * radPerDeg), 0.0);
-    } else {
-      cosConeAngle = 0;
     }
   }
 
diff --git a/content/svg/content/src/nsSVGPolyElement.cpp b/content/svg/content/src/nsSVGPolyElement.cpp
index 93d1f358c0ba..4dc6af550665 100644
--- a/content/svg/content/src/nsSVGPolyElement.cpp
+++ b/content/svg/content/src/nsSVGPolyElement.cpp
@@ -115,7 +115,7 @@ nsSVGPolyElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
   if (!points.Length())
     return;
 
-  float px = 0.0, py = 0.0, prevAngle;
+  float px = 0.0, py = 0.0, prevAngle = 0.0;
 
   for (PRUint32 i = 0; i < points.Length(); ++i) {
     float x = points[i].mX;
diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp
index 799b4d025891..f8c2a9743cd5 100644
--- a/content/xbl/src/nsXBLBinding.cpp
+++ b/content/xbl/src/nsXBLBinding.cpp
@@ -1254,7 +1254,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj,
 {
   // First ensure our JS class is initialized.
   jsval val;
-  JSObject* proto;
+  JSObject* proto = NULL;
 
   nsCAutoString className(aClassName);
   JSObject* parent_proto = nsnull;  // If we have an "obj" we can set this
diff --git a/content/xslt/src/xpath/txCoreFunctionCall.cpp b/content/xslt/src/xpath/txCoreFunctionCall.cpp
index 46236cb53fc3..84180e36f098 100644
--- a/content/xslt/src/xpath/txCoreFunctionCall.cpp
+++ b/content/xslt/src/xpath/txCoreFunctionCall.cpp
@@ -329,7 +329,7 @@ txCoreFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
             rv = mParams[1]->evaluateToString(aContext, arg2);
             NS_ENSURE_SUCCESS(rv, rv);
 
-            PRBool result;
+            PRBool result = PR_FALSE;
             if (arg2.IsEmpty()) {
                 result = PR_TRUE;
             }
diff --git a/content/xslt/src/xpath/txExprParser.cpp b/content/xslt/src/xpath/txExprParser.cpp
index fae09b52ef52..f9f39d7bfa03 100644
--- a/content/xslt/src/xpath/txExprParser.cpp
+++ b/content/xslt/src/xpath/txExprParser.cpp
@@ -602,8 +602,8 @@ txExprParser::createLocationStep(txExprLexer& lexer, txIParseContext* aContext,
             nodeTest =
               new txNameTest(prefix, lName, nspace,
                              axisIdentifier == LocationStep::ATTRIBUTE_AXIS ?
-                             txXPathNodeType::ATTRIBUTE_NODE :
-                             txXPathNodeType::ELEMENT_NODE);
+                             static_cast<PRUint16>(txXPathNodeType::ATTRIBUTE_NODE) :
+                             static_cast<PRUint16>(txXPathNodeType::ELEMENT_NODE));
             NS_ENSURE_TRUE(nodeTest, NS_ERROR_OUT_OF_MEMORY);
         }
         else {
diff --git a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
index 24b8399e33d6..16b0b8f32306 100644
--- a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
+++ b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
@@ -269,7 +269,7 @@ TX_ResolveFunctionCallXPCOM(const nsCString &aContractID, PRInt32 aNamespaceID,
                             FunctionCall **aFunction)
 {
     nsIID iid;
-    PRUint16 methodIndex;
+    PRUint16 methodIndex = 0;
     nsCOMPtr<nsISupports> helper;
 
     nsresult rv = LookupFunction(aContractID.get(), aName, iid, methodIndex,
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 6994ea44aecf..dafd9f7f3bc6 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -774,8 +774,8 @@ nsScriptEventHandlerOwnerTearoff::CompileEventHandler(
     // XXX sXBL/XBL2 issue! Owner or current document?
     nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(mElement->GetOwnerDoc());
 
-    nsIScriptContext *context;
-    nsXULPrototypeElement *elem = mElement->mPrototype;
+    nsIScriptContext* context = NULL;
+    nsXULPrototypeElement* elem = mElement->mPrototype;
     if (elem && xuldoc) {
         // It'll be shared among the instances of the prototype.
 
diff --git a/content/xul/templates/src/nsTemplateRule.cpp b/content/xul/templates/src/nsTemplateRule.cpp
index e928f6f6dcad..41eb01280627 100644
--- a/content/xul/templates/src/nsTemplateRule.cpp
+++ b/content/xul/templates/src/nsTemplateRule.cpp
@@ -207,8 +207,8 @@ nsTemplateCondition::CheckMatchStrings(const nsAString& aLeftString,
                 if (collation) {
                     PRInt32 sortOrder;
                     collation->CompareString((mIgnoreCase ?
-                                              nsICollation::kCollationCaseInSensitive :
-                                              nsICollation::kCollationCaseSensitive),
+                                              static_cast<PRInt32>(nsICollation::kCollationCaseInSensitive) :
+                                              static_cast<PRInt32>(nsICollation::kCollationCaseSensitive)),
                                               aLeftString,
                                               aRightString,
                                               &sortOrder);
@@ -230,8 +230,8 @@ nsTemplateCondition::CheckMatchStrings(const nsAString& aLeftString,
                 if (collation) {
                     PRInt32 sortOrder;
                     collation->CompareString((mIgnoreCase ?
-                                              nsICollation::kCollationCaseInSensitive :
-                                              nsICollation::kCollationCaseSensitive),
+                                              static_cast<PRInt32>(nsICollation::kCollationCaseInSensitive) :
+                                              static_cast<PRInt32>(nsICollation::kCollationCaseSensitive)),
                                               aLeftString,
                                               aRightString,
                                               &sortOrder);
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index b65f5f1c2a3d..1f31e9009bdb 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -205,16 +205,16 @@ public: //for methods who access nsTextControlFrame directly
     ValueSetter(nsTextControlFrame* aFrame,
                 PRBool aHasFocusValue)
       : mFrame(aFrame)
-      , mInited(PR_FALSE)
-    {
-      NS_ASSERTION(aFrame, "Should pass a valid frame");
-
       // This method isn't used for user-generated changes, except for calls
       // from nsFileControlFrame which sets mFireChangeEventState==true and
       // restores it afterwards (ie. we want 'change' events for those changes).
       // Focused value must be updated to prevent incorrect 'change' events,
       // but only if user hasn't changed the value.
-      mFocusValueInit = !mFrame->mFireChangeEventState && aHasFocusValue;
+      , mFocusValueInit(!mFrame->mFireChangeEventState && aHasFocusValue)
+      , mOuterTransaction(false)
+      , mInited(false)
+    {
+      NS_ASSERTION(aFrame, "Should pass a valid frame");
     }
     void Cancel() {
       mInited = PR_FALSE;

From b007736e513fd951bfb60258c5476775b4c102c6 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 14 Apr 2011 14:04:13 +0200
Subject: [PATCH 129/509] Bug 604595, part a - Remove support for
 DocumentType.entities and DocumentType.notations; r=sicking

---
 content/base/src/nsDOMDocumentType.cpp     | 50 +++-------------------
 content/base/src/nsDOMDocumentType.h       | 10 ++---
 dom/interfaces/core/nsIDOMDocumentType.idl |  4 +-
 3 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp
index 20fb07ef806f..b7008f0fa00a 100644
--- a/content/base/src/nsDOMDocumentType.cpp
+++ b/content/base/src/nsDOMDocumentType.cpp
@@ -58,8 +58,8 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
                       nsNodeInfoManager *aNodeInfoManager,
                       nsIPrincipal *aPrincipal,
                       nsIAtom *aName,
-                      nsIDOMNamedNodeMap *aEntities,
-                      nsIDOMNamedNodeMap *aNotations,
+                      nsIDOMNamedNodeMap*,
+                      nsIDOMNamedNodeMap*,
                       const nsAString& aPublicId,
                       const nsAString& aSystemId,
                       const nsAString& aInternalSubset)
@@ -69,17 +69,13 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
   NS_ENSURE_ARG_POINTER(aDocType);
   NS_ENSURE_ARG_POINTER(aName);
 
-  nsresult rv;
-
   nsRefPtr<nsNodeInfoManager> nimgr;
   if (aNodeInfoManager) {
     nimgr = aNodeInfoManager;
   }
   else {
     nimgr = new nsNodeInfoManager();
-    NS_ENSURE_TRUE(nimgr, NS_ERROR_OUT_OF_MEMORY);
-    
-    rv = nimgr->Init(nsnull);
+    nsresult rv = nimgr->Init(nsnull);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nimgr->SetDocumentPrincipal(aPrincipal);
@@ -90,12 +86,8 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
                           kNameSpaceID_None);
   NS_ENSURE_TRUE(ni, NS_ERROR_OUT_OF_MEMORY);
 
-  *aDocType = new nsDOMDocumentType(ni.forget(), aName, aEntities, aNotations,
-                                    aPublicId, aSystemId, aInternalSubset);
-  if (!*aDocType) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
+  *aDocType = new nsDOMDocumentType(ni.forget(), aName, aPublicId, aSystemId,
+                                    aInternalSubset);
   NS_ADDREF(*aDocType);
 
   return NS_OK;
@@ -103,15 +95,11 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
 
 nsDOMDocumentType::nsDOMDocumentType(already_AddRefed<nsINodeInfo> aNodeInfo,
                                      nsIAtom *aName,
-                                     nsIDOMNamedNodeMap *aEntities,
-                                     nsIDOMNamedNodeMap *aNotations,
                                      const nsAString& aPublicId,
                                      const nsAString& aSystemId,
                                      const nsAString& aInternalSubset) :
   nsGenericDOMDataNode(aNodeInfo),
   mName(aName),
-  mEntities(aEntities),
-  mNotations(aNotations),
   mPublicId(aPublicId),
   mSystemId(aSystemId),
   mInternalSubset(aInternalSubset)
@@ -158,30 +146,6 @@ nsDOMDocumentType::GetName(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP    
-nsDOMDocumentType::GetEntities(nsIDOMNamedNodeMap** aEntities)
-{
-  NS_ENSURE_ARG_POINTER(aEntities);
-
-  *aEntities = mEntities;
-
-  NS_IF_ADDREF(*aEntities);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsDOMDocumentType::GetNotations(nsIDOMNamedNodeMap** aNotations)
-{
-  NS_ENSURE_ARG_POINTER(aNotations);
-
-  *aNotations = mNotations;
-
-  NS_IF_ADDREF(*aNotations);
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMDocumentType::GetPublicId(nsAString& aPublicId)
 {
@@ -238,8 +202,8 @@ nsGenericDOMDataNode*
 nsDOMDocumentType::CloneDataNode(nsINodeInfo *aNodeInfo, PRBool aCloneText) const
 {
   nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
-  return new nsDOMDocumentType(ni.forget(), mName, mEntities, mNotations,
-                               mPublicId, mSystemId, mInternalSubset);
+  return new nsDOMDocumentType(ni.forget(), mName, mPublicId, mSystemId,
+                               mInternalSubset);
 }
 
 nsresult
diff --git a/content/base/src/nsDOMDocumentType.h b/content/base/src/nsDOMDocumentType.h
index f6e1a00028db..2548d8396dc0 100644
--- a/content/base/src/nsDOMDocumentType.h
+++ b/content/base/src/nsDOMDocumentType.h
@@ -39,8 +39,8 @@
  * Implementation of DOM Core's nsIDOMDocumentType node.
  */
 
-#ifndef nsDOMDocumentType_h___
-#define nsDOMDocumentType_h___
+#ifndef nsDOMDocumentType_h
+#define nsDOMDocumentType_h
 
 #include "nsCOMPtr.h"
 #include "nsIDOMDocumentType.h"
@@ -59,8 +59,6 @@ class nsDOMDocumentType : public nsGenericDOMDataNode,
 public:
   nsDOMDocumentType(already_AddRefed<nsINodeInfo> aNodeInfo,
                     nsIAtom *aName,
-                    nsIDOMNamedNodeMap *aEntities,
-                    nsIDOMNamedNodeMap *aNotations,
                     const nsAString& aPublicId,
                     const nsAString& aSystemId,
                     const nsAString& aInternalSubset);
@@ -86,8 +84,6 @@ public:
   virtual nsXPCClassInfo* GetClassInfo();
 protected:
   nsCOMPtr<nsIAtom> mName;
-  nsCOMPtr<nsIDOMNamedNodeMap> mEntities;
-  nsCOMPtr<nsIDOMNamedNodeMap> mNotations;
   nsString mPublicId;
   nsString mSystemId;
   nsString mInternalSubset;
@@ -104,4 +100,4 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
                       const nsAString& aSystemId,
                       const nsAString& aInternalSubset);
 
-#endif // nsDOMDocument_h___
+#endif // nsDOMDocumentType_h
diff --git a/dom/interfaces/core/nsIDOMDocumentType.idl b/dom/interfaces/core/nsIDOMDocumentType.idl
index 689c66947f9c..21dc761a3639 100644
--- a/dom/interfaces/core/nsIDOMDocumentType.idl
+++ b/dom/interfaces/core/nsIDOMDocumentType.idl
@@ -49,12 +49,10 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[scriptable, uuid(5725a7de-2883-45a5-878e-30773cd82478)]
+[scriptable, uuid(bfd028d4-fbbd-4d69-8899-dbee1778dde2)]
 interface nsIDOMDocumentType : nsIDOMNode
 {
   readonly attribute  DOMString            name;
-  readonly attribute  nsIDOMNamedNodeMap   entities;
-  readonly attribute  nsIDOMNamedNodeMap   notations;
   readonly attribute  DOMString            publicId;
   readonly attribute  DOMString            systemId;
   readonly attribute  DOMString            internalSubset;

From dcca90ed8288d7f96ac2d87f789ef70a5b00c11f Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 14 Apr 2011 14:04:21 +0200
Subject: [PATCH 130/509] Bug 604595, part b - Remove the nsIDOMNamedNodeMap*
 arguments to NS_NewDOMDocumentType; r=sicking

---
 content/base/src/nsDOMDocumentType.cpp          | 2 --
 content/base/src/nsDOMDocumentType.h            | 2 --
 content/base/src/nsDocument.cpp                 | 6 ++----
 content/base/src/nsNodeInfoManager.h            | 2 --
 content/html/document/src/nsHTMLContentSink.cpp | 5 ++---
 content/xml/document/src/nsXMLContentSink.cpp   | 3 +--
 content/xslt/src/xslt/txMozillaXMLOutput.cpp    | 2 +-
 parser/html/nsHtml5TreeOperation.cpp            | 2 --
 8 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp
index b7008f0fa00a..d61c9415f936 100644
--- a/content/base/src/nsDOMDocumentType.cpp
+++ b/content/base/src/nsDOMDocumentType.cpp
@@ -58,8 +58,6 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
                       nsNodeInfoManager *aNodeInfoManager,
                       nsIPrincipal *aPrincipal,
                       nsIAtom *aName,
-                      nsIDOMNamedNodeMap*,
-                      nsIDOMNamedNodeMap*,
                       const nsAString& aPublicId,
                       const nsAString& aSystemId,
                       const nsAString& aInternalSubset)
diff --git a/content/base/src/nsDOMDocumentType.h b/content/base/src/nsDOMDocumentType.h
index 2548d8396dc0..015f0130cd95 100644
--- a/content/base/src/nsDOMDocumentType.h
+++ b/content/base/src/nsDOMDocumentType.h
@@ -94,8 +94,6 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType,
                       nsNodeInfoManager *aOwnerDoc,
                       nsIPrincipal *aPrincipal,
                       nsIAtom *aName,
-                      nsIDOMNamedNodeMap *aEntities,
-                      nsIDOMNamedNodeMap *aNotations,
                       const nsAString& aPublicId,
                       const nsAString& aSystemId,
                       const nsAString& aInternalSubset);
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 0e90554b0d3b..523c9cf59328 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1441,8 +1441,8 @@ nsDOMImplementation::CreateDocumentType(const nsAString& aQualifiedName,
   // Indicate that there is no internal subset (not just an empty one)
   nsAutoString voidString;
   voidString.SetIsVoid(PR_TRUE);
-  return NS_NewDOMDocumentType(aReturn, nsnull, mPrincipal, name, nsnull,
-                               nsnull, aPublicId, aSystemId, voidString);
+  return NS_NewDOMDocumentType(aReturn, nsnull, mPrincipal, name, aPublicId,
+                               aSystemId, voidString);
 }
 
 NS_IMETHODIMP
@@ -1507,8 +1507,6 @@ nsDOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
                                       NULL, // aNodeInfoManager
                                       mPrincipal, // aPrincipal
                                       nsGkAtoms::html, // aName
-                                      NULL, // aEntities
-                                      NULL, // aNotations
                                       EmptyString(), // aPublicId
                                       EmptyString(), // aSystemId
                                       voidString); // aInternalSubset
diff --git a/content/base/src/nsNodeInfoManager.h b/content/base/src/nsNodeInfoManager.h
index 0ce5a0a7dc47..2d7d8ca5211f 100644
--- a/content/base/src/nsNodeInfoManager.h
+++ b/content/base/src/nsNodeInfoManager.h
@@ -138,8 +138,6 @@ protected:
                                         nsNodeInfoManager *,
                                         nsIPrincipal *,
                                         nsIAtom *,
-                                        nsIDOMNamedNodeMap *,
-                                        nsIDOMNamedNodeMap *,
                                         const nsAString& ,
                                         const nsAString& ,
                                         const nsAString& );
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
index 233f1e06cafd..d6d1f7b6cf61 100644
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -2465,9 +2465,8 @@ HTMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode)
     nsAutoString voidString;
     voidString.SetIsVoid(PR_TRUE);
     rv = NS_NewDOMDocumentType(getter_AddRefs(docType),
-                               mDocument->NodeInfoManager(), nsnull,
-                               nameAtom, nsnull, nsnull, publicId, systemId,
-                               voidString);
+                               mDocument->NodeInfoManager(), nsnull, nameAtom,
+                               publicId, systemId, voidString);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (oldDocType) {
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 0ae43349f853..f8cb2b2f3489 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -1231,8 +1231,7 @@ nsXMLContentSink::HandleDoctypeDecl(const nsAString & aSubset,
   // Create a new doctype node
   nsCOMPtr<nsIDOMDocumentType> docType;
   rv = NS_NewDOMDocumentType(getter_AddRefs(docType), mNodeInfoManager, nsnull,
-                             name, nsnull, nsnull, aPublicId, aSystemId,
-                             aSubset);
+                             name, aPublicId, aSystemId, aSubset);
   if (NS_FAILED(rv) || !docType) {
     return rv;
   }
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index e49d7da4dbd2..cd60dc5aeb0a 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -949,7 +949,7 @@ txMozillaXMLOutput::createResultDocument(const nsSubstring& aName, PRInt32 aNsID
             voidString.SetIsVoid(PR_TRUE);
             rv = NS_NewDOMDocumentType(getter_AddRefs(documentType),
                                        mNodeInfoManager, nsnull,
-                                       doctypeName, nsnull, nsnull,
+                                       doctypeName,
                                        mOutputFormat.mPublicId,
                                        mOutputFormat.mSystemId,
                                        voidString);
diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp
index fdfc9d77daa1..c8b81c490e3c 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -625,8 +625,6 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
                             aBuilder->GetNodeInfoManager(),
                             nsnull,
                             name,
-                            nsnull,
-                            nsnull,
                             publicId,
                             systemId,
                             voidString);

From f2937758425ee34738d89aa1b3be4641f62bbf3c Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 15:44:13 +0200
Subject: [PATCH 131/509] Bug 599748 - Remove custom |def check_call()|, now
 that Python 2.4 is unsupported; (Av1) Remove 'util.py'. r=ted.mielczarek.

---
 build/upload.py |  3 +--
 build/util.py   | 50 -------------------------------------------------
 client.py       |  2 +-
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 build/util.py

diff --git a/build/upload.py b/build/upload.py
index 2ddd4c8f970b..85c0a1004522 100644
--- a/build/upload.py
+++ b/build/upload.py
@@ -57,8 +57,7 @@
 
 import sys, os
 from optparse import OptionParser
-from subprocess import Popen, PIPE
-from util import check_call
+from subprocess import PIPE, Popen, check_call
 
 def RequireEnvironmentVariable(v):
     """Return the value of the environment variable named v, or print
diff --git a/build/util.py b/build/util.py
deleted file mode 100644
index c1be3e8b48f9..000000000000
--- a/build/util.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/python
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# The Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Ted Mielczarek <ted.mielczarek@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-try:
-    from subprocess import check_call
-except ImportError:
-    import subprocess
-    def check_call(*popenargs, **kwargs):
-        retcode = subprocess.call(*popenargs, **kwargs)
-        if retcode:
-            cmd = kwargs.get("args")
-            if cmd is None:
-                cmd = popenargs[0]
-                raise Exception("Command '%s' returned non-zero exit status %i" % (cmd, retcode))
diff --git a/client.py b/client.py
index d47a932f3842..ee262b3b7f2f 100755
--- a/client.py
+++ b/client.py
@@ -15,7 +15,7 @@ import sys
 import datetime
 import shutil
 from optparse import OptionParser
-from build.util import check_call
+from subprocess import check_call
 
 topsrcdir = os.path.dirname(__file__)
 if topsrcdir == '':

From cb5cc4ef6bf8c0e3d2a4a384b8617b75c9260480 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 10:18:02 -0400
Subject: [PATCH 132/509] Bug 643885 - Part 1: Add the new RemoveObjectsAt API
 to nsCOMArray; r=bsmedberg

---
 xpcom/glue/nsCOMArray.cpp    | 19 +++++++++++
 xpcom/glue/nsCOMArray.h      |  7 ++++
 xpcom/tests/TestCOMArray.cpp | 64 ++++++++++++++++++++++++++++++------
 3 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/xpcom/glue/nsCOMArray.cpp b/xpcom/glue/nsCOMArray.cpp
index cbc1998513aa..23fe36fa675a 100644
--- a/xpcom/glue/nsCOMArray.cpp
+++ b/xpcom/glue/nsCOMArray.cpp
@@ -140,6 +140,25 @@ nsCOMArray_base::RemoveObjectAt(PRInt32 aIndex)
     return PR_FALSE;
 }
 
+PRBool
+nsCOMArray_base::RemoveObjectsAt(PRInt32 aIndex, PRInt32 aCount)
+{
+    if (PRUint32(aIndex) + PRUint32(aCount) <= PRUint32(Count())) {
+        nsVoidArray elementsToDestroy(aCount);
+        for (PRInt32 i = 0; i < aCount; ++i) {
+            elementsToDestroy.InsertElementAt(mArray.FastElementAt(aIndex + i), i);
+        }
+        PRBool result = mArray.RemoveElementsAt(aIndex, aCount);
+        for (PRInt32 i = 0; i < aCount; ++i) {
+            nsISupports* element = static_cast<nsISupports*> (elementsToDestroy.FastElementAt(i));
+            NS_IF_RELEASE(element);
+        }
+        return result;
+    }
+
+    return PR_FALSE;
+}
+
 // useful for destructors
 PRBool
 ReleaseObjects(void* aElement, void*)
diff --git a/xpcom/glue/nsCOMArray.h b/xpcom/glue/nsCOMArray.h
index b4c3c5aa08aa..3d853a389640 100644
--- a/xpcom/glue/nsCOMArray.h
+++ b/xpcom/glue/nsCOMArray.h
@@ -88,6 +88,7 @@ protected:
     }
     PRBool RemoveObject(nsISupports *aObject);
     PRBool RemoveObjectAt(PRInt32 aIndex);
+    PRBool RemoveObjectsAt(PRInt32 aIndex, PRInt32 aCount);
 
 public:
     // override nsVoidArray stuff so that they can be accessed by
@@ -267,6 +268,12 @@ class nsCOMArray : public nsCOMArray_base
         return nsCOMArray_base::RemoveObjectAt(aIndex);
     }
 
+    // remove a range of elements at a specific position, shrinking the array
+    // as necessary
+    PRBool RemoveObjectsAt(PRInt32 aIndex, PRInt32 aCount) {
+        return nsCOMArray_base::RemoveObjectsAt(aIndex, aCount);
+    }
+
 private:
 
     // don't implement these!
diff --git a/xpcom/tests/TestCOMArray.cpp b/xpcom/tests/TestCOMArray.cpp
index 40ca258a758e..571c5bc90ccc 100644
--- a/xpcom/tests/TestCOMArray.cpp
+++ b/xpcom/tests/TestCOMArray.cpp
@@ -107,7 +107,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IBar, NS_IBAR_IID)
 class Bar : public IBar {
 public:
 
-  Bar(nsCOMArray<IBar>& aArray, PRInt32 aIndex);
+  explicit Bar(nsCOMArray<IBar>& aArray);
   ~Bar();
 
   // nsISupports implementation
@@ -117,22 +117,20 @@ public:
 
 private:
   nsCOMArray<IBar>& mArray;
-  PRInt32 mIndex;
 };
 
 PRInt32 Bar::sReleaseCalled = 0;
 
 typedef nsCOMArray<IBar> Array2;
 
-Bar::Bar(Array2& aArray, PRInt32 aIndex)
+Bar::Bar(Array2& aArray)
   : mArray(aArray)
-  , mIndex(aIndex)
 {
 }
 
 Bar::~Bar()
 {
-  if (mArray.RemoveObjectAt(mIndex)) {
+  if (mArray.RemoveObject(this)) {
     fail("We should never manage to remove the object here");
   }
 }
@@ -212,11 +210,21 @@ int main(int argc, char **argv)
   {
     Array2 arr2;
 
-    IBar *ninthObject;
+    IBar *thirdObject,
+         *fourthObject,
+         *fifthObject,
+         *ninthObject;
     for (PRInt32 i = 0; i < 20; ++i) {
-      nsCOMPtr<IBar> bar = new Bar(arr2, i);
-      if (i == 8) {
-        ninthObject = bar;
+      nsCOMPtr<IBar> bar = new Bar(arr2);
+      switch (i) {
+      case 2:
+        thirdObject = bar; break;
+      case 3:
+        fourthObject = bar; break;
+      case 4:
+        fifthObject = bar; break;
+      case 8:
+        ninthObject = bar; break;
       }
       arr2.AppendObject(bar);
     }
@@ -227,16 +235,52 @@ int main(int argc, char **argv)
     if (Bar::sReleaseCalled != base + 10) {
       fail("Release called multiple times for SetCount");
     }
+    if (arr2.Count() != 10) {
+      fail("SetCount(10) should remove exactly ten objects");
+    }
 
     arr2.RemoveObjectAt(9);
     if (Bar::sReleaseCalled != base + 11) {
       fail("Release called multiple times for RemoveObjectAt");
     }
+    if (arr2.Count() != 9) {
+      fail("RemoveObjectAt should remove exactly one object");
+    }
 
     arr2.RemoveObject(ninthObject);
     if (Bar::sReleaseCalled != base + 12) {
       fail("Release called multiple times for RemoveObject");
     }
+    if (arr2.Count() != 8) {
+      fail("RemoveObject should remove exactly one object");
+    }
+
+    arr2.RemoveObjectsAt(2, 3);
+    if (Bar::sReleaseCalled != base + 15) {
+      fail("Release called more or less than three times for RemoveObjectsAt");
+    }
+    if (arr2.Count() != 5) {
+      fail("RemoveObjectsAt should remove exactly three objects");
+    }
+    for (PRInt32 j = 0; j < arr2.Count(); ++j) {
+      if (arr2.ObjectAt(j) == thirdObject) {
+        fail("RemoveObjectsAt should have removed thirdObject");
+      }
+      if (arr2.ObjectAt(j) == fourthObject) {
+        fail("RemoveObjectsAt should have removed fourthObject");
+      }
+      if (arr2.ObjectAt(j) == fifthObject) {
+        fail("RemoveObjectsAt should have removed fifthObject");
+      }
+    }
+
+    arr2.RemoveObjectsAt(4, 1);
+    if (Bar::sReleaseCalled != base + 16) {
+      fail("Release called more or less than one time for RemoveObjectsAt");
+    }
+    if (arr2.Count() != 4) {
+      fail("RemoveObjectsAt should work for removing the last element");
+    }
 
     arr2.Clear();
     if (Bar::sReleaseCalled != base + 20) {
@@ -250,7 +294,7 @@ int main(int argc, char **argv)
     Array2 arr2;
 
     for (PRInt32 i = 0; i < 20; ++i) {
-      nsCOMPtr<IBar> bar  = new Bar(arr2, i);
+      nsCOMPtr<IBar> bar  = new Bar(arr2);
       arr2.AppendObject(bar);
     }
 

From e278db0f6399f9494183f97997f7beb9b58d956f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 10:18:28 -0400
Subject: [PATCH 133/509] Bug 643885 - Part 2: Optimize
 nsContentUtils::RemoveScriptBlocker to minimize the number of memmove's;
 r=bzbarsky

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

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index a66517eacc80..0bacc146dc43 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -4710,21 +4710,22 @@ nsContentUtils::RemoveScriptBlocker()
 
   PRUint32 firstBlocker = sRunnersCountAtFirstBlocker;
   PRUint32 lastBlocker = (PRUint32)sBlockedScriptRunners->Count();
+  PRUint32 originalFirstBlocker = firstBlocker;
+  PRUint32 blockersCount = lastBlocker - firstBlocker;
   sRunnersCountAtFirstBlocker = 0;
   NS_ASSERTION(firstBlocker <= lastBlocker,
                "bad sRunnersCountAtFirstBlocker");
 
   while (firstBlocker < lastBlocker) {
     nsCOMPtr<nsIRunnable> runnable = (*sBlockedScriptRunners)[firstBlocker];
-    sBlockedScriptRunners->RemoveObjectAt(firstBlocker);
-    --lastBlocker;
+    ++firstBlocker;
 
     runnable->Run();
-    NS_ASSERTION(lastBlocker == (PRUint32)sBlockedScriptRunners->Count() &&
-                 sRunnersCountAtFirstBlocker == 0,
+    NS_ASSERTION(sRunnersCountAtFirstBlocker == 0,
                  "Bad count");
     NS_ASSERTION(!sScriptBlockerCount, "This is really bad");
   }
+  sBlockedScriptRunners->RemoveObjectsAt(originalFirstBlocker, blockersCount);
 }
 
 /* static */

From 6dd48e75f1ba3a805faa8b890419544d64f0841d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 10:19:14 -0400
Subject: [PATCH 134/509] Bug 642469 - Sanitize the environment variables upon
 startup; r=bsmedberg

---
 xpcom/base/nsSetDllDirectory.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/xpcom/base/nsSetDllDirectory.cpp b/xpcom/base/nsSetDllDirectory.cpp
index f1e634c121e3..c1a04f9c90dd 100644
--- a/xpcom/base/nsSetDllDirectory.cpp
+++ b/xpcom/base/nsSetDllDirectory.cpp
@@ -41,8 +41,31 @@
 #endif
 
 #include <windows.h>
+#include <stdlib.h>
 #include "nsSetDllDirectory.h"
 
+void
+SanitizeEnvironmentVariables()
+{
+  DWORD bufferSize = GetEnvironmentVariableW(L"PATH", NULL, 0);
+  if (bufferSize) {
+    wchar_t* originalPath = new wchar_t[bufferSize];
+    if (bufferSize - 1 == GetEnvironmentVariableW(L"PATH", originalPath, bufferSize)) {
+      bufferSize = ExpandEnvironmentStringsW(originalPath, NULL, 0);
+      if (bufferSize) {
+        wchar_t* newPath = new wchar_t[bufferSize];
+        if (ExpandEnvironmentStringsW(originalPath,
+                                      newPath,
+                                      bufferSize)) {
+          SetEnvironmentVariableW(L"PATH", newPath);
+        }
+        delete[] newPath;
+      }
+    }
+    delete[] originalPath;
+  }
+}
+
 namespace mozilla {
 
 XPCOM_API(void)
@@ -54,6 +77,10 @@ NS_SetDllDirectory(const WCHAR *aDllDirectory)
   if (!setDllDirectory) {
     setDllDirectory = reinterpret_cast<pfnSetDllDirectory>
       (GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDllDirectoryW"));
+
+    // If it's the first time we're running this function, sanitize the
+    // environment variables too.
+    SanitizeEnvironmentVariables();
   }
   if (setDllDirectory) {
     setDllDirectory(aDllDirectory);

From 423e731fcb3d1f45026db0e4e06d28cde4bd91eb Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 10:19:34 -0400
Subject: [PATCH 135/509] Bug 649842 - Generate real unique values, instead of
 relying on Math.random() to generate unique values, which will lead into
 intermittent oranges; r=zpao

---
 browser/components/sessionstore/test/browser/head.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/components/sessionstore/test/browser/head.js b/browser/components/sessionstore/test/browser/head.js
index 6aca5141445f..c67a855a5f90 100644
--- a/browser/components/sessionstore/test/browser/head.js
+++ b/browser/components/sessionstore/test/browser/head.js
@@ -99,6 +99,7 @@ function waitForSaveState(aSaveStateCallback) {
   }, topic, false);
 };
 
+var gUniqueCounter = 0;
 function r() {
-  return Date.now() + Math.random();
+  return Date.now() + "-" + (++gUniqueCounter);
 }

From ccd3a1dae195269b102ae0190c2de0de0df06bd8 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 17:25:00 +0200
Subject: [PATCH 136/509] Bug 228448 - Remove '=='/'!=' 'PR_FALSE'/'PR_TRUE';
 (Gv1b) /xpfe/components/directory/nsDirectoryViewer.cpp. r=dean_tessman.

---
 .../directory/nsDirectoryViewer.cpp           | 61 ++++++++-----------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp
index 2a0584b1282b..431148681c94 100644
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -305,14 +305,13 @@ nsHTTPIndex::OnStartRequest(nsIRequest *request, nsISupports* aContext)
     jsval jslistener = OBJECT_TO_JSVAL(jsobj);
 
     // ...and stuff it into the global context
-    PRBool ok;
     JSAutoRequest ar(cx);
-    ok = JS_SetProperty(cx, global, "HTTPIndex", &jslistener);
-
+    PRBool ok = JS_SetProperty(cx, global, "HTTPIndex", &jslistener);
     NS_ASSERTION(ok, "unable to set Listener property");
-    if (! ok)
+    if (!ok)
       return NS_ERROR_FAILURE;
   }
+
   if (!aContext) {
     nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
     NS_ASSERTION(channel, "request should be a channel");
@@ -439,7 +438,6 @@ nsHTTPIndex::OnIndexAvailable(nsIRequest* aRequest, nsISupports *aContext,
     return rv;
 
   PRBool isDirType = (type == nsIDirIndex::TYPE_DIRECTORY);
-
   if (isDirType && entryuriC.Last() != '/') {
       entryuriC.Append('/');
   }
@@ -785,23 +783,16 @@ nsHTTPIndex::isWellknownContainerURI(nsIRDFResource *r)
 {
   nsCOMPtr<nsIRDFNode> node;
   GetTarget(r, kNC_IsContainer, PR_TRUE, getter_AddRefs(node));
-
-  PRBool isContainerFlag = PR_FALSE;
-
-  if (node && NS_SUCCEEDED(node->EqualsNode(kTrueLiteral, &isContainerFlag))) {
-    return isContainerFlag;
-  } else {
-    nsXPIDLCString uri;
-    
-    GetDestination(r,uri);
-
-    if ((uri.get()) && (!strncmp(uri, kFTPProtocol, sizeof(kFTPProtocol) - 1))) {
-      if (uri.Last() == '/') {
-        isContainerFlag = PR_TRUE;
-      }
-    }
+  if (node) {
+    PRBool isContainerFlag;
+    if (NS_SUCCEEDED(node->EqualsNode(kTrueLiteral, &isContainerFlag)))
+      return isContainerFlag;
   }
-  return isContainerFlag;
+
+  nsXPIDLCString uri;
+  GetDestination(r, uri);
+  return uri.get() && !strncmp(uri, kFTPProtocol, sizeof(kFTPProtocol) - 1) &&
+         (uri.Last() == '/');
 }
 
 
@@ -898,19 +889,16 @@ nsHTTPIndex::GetTargets(nsIRDFResource *aSource, nsIRDFResource *aProperty, PRBo
 		{
 			// check and see if we already have data for the search in question;
 			// if we do, don't bother doing the search again
-			PRBool		hasResults = PR_FALSE;
+			PRBool hasResults;
 			if (NS_SUCCEEDED((*_retval)->HasMoreElements(&hasResults)) &&
-			    (hasResults == PR_TRUE))
-			{
-				doNetworkRequest = PR_FALSE;
-			}
+			    hasResults)
+			  doNetworkRequest = PR_FALSE;
 		}
 
         // Note: if we need to do a network request, do it out-of-band
         // (because the XUL template builder isn't re-entrant)
         // by using a global connection list and an immediately-firing timer
-
-		if ((doNetworkRequest == PR_TRUE) && (mConnectionList))
+		if (doNetworkRequest && mConnectionList)
 		{
 		    PRInt32 connectionIndex = mConnectionList->IndexOf(aSource);
 		    if (connectionIndex < 0)
@@ -978,8 +966,6 @@ nsHTTPIndex::FireTimer(nsITimer* aTimer, void* aClosure)
   if (!httpIndex)	return;
   
   // don't return out of this loop as mTimer may need to be cancelled afterwards
-  PRBool      refireTimer = PR_FALSE;
-  
   PRUint32    numItems = 0;
   if (httpIndex->mConnectionList)
   {
@@ -1016,7 +1002,7 @@ nsHTTPIndex::FireTimer(nsITimer* aTimer, void* aClosure)
             rv = channel->AsyncOpen(httpIndex, aSource);
           }
         }
-    }
+  }
     if (httpIndex->mNodeList)
     {
         httpIndex->mNodeList->Count(&numItems);
@@ -1058,7 +1044,8 @@ nsHTTPIndex::FireTimer(nsITimer* aTimer, void* aClosure)
             }                
         }
     }
-    
+
+    PRBool refireTimer = PR_FALSE;
     // check both lists to see if the timer needs to continue firing
     if (httpIndex->mConnectionList)
     {
@@ -1243,10 +1230,10 @@ nsHTTPIndex::ArcLabelsOut(nsIRDFResource *aSource, nsISimpleEnumerator **_retval
 	{
 		nsCOMPtr<nsISimpleEnumerator>	anonArcs;
 		rv = mInner->ArcLabelsOut(aSource, getter_AddRefs(anonArcs));
-		PRBool	hasResults = PR_TRUE;
+		PRBool hasResults;
 		while (NS_SUCCEEDED(rv) &&
-                       NS_SUCCEEDED(anonArcs->HasMoreElements(&hasResults)) &&
-                       hasResults == PR_TRUE)
+		       NS_SUCCEEDED(anonArcs->HasMoreElements(&hasResults)) &&
+		       hasResults)
 		{
 			nsCOMPtr<nsISupports>	anonArc;
 			if (NS_FAILED(anonArcs->GetNext(getter_AddRefs(anonArc))))
@@ -1354,10 +1341,11 @@ nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
   nsCOMPtr<nsIPrefBranch> prefSrv = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
 
-  PRBool useXUL = PR_FALSE;  
   PRBool viewSource = (PL_strstr(aContentType,"view-source") != 0);
   
 #ifdef MOZ_RDF
+  PRBool useXUL = PR_FALSE;
+
   PRInt32 dirPref;
   rv = prefSrv->GetIntPref("network.dir.format", &dirPref);
   if (NS_SUCCEEDED(rv) && dirPref == FORMAT_XUL) {
@@ -1488,4 +1476,3 @@ nsDirectoryViewerFactory::CreateBlankDocument(nsILoadGroup *aLoadGroup,
   NS_NOTYETIMPLEMENTED("didn't expect to get here");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
-

From 20739294a01b35ddc952f09a884219fbc07939a1 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 17:25:00 +0200
Subject: [PATCH 137/509] Bug 228448 - Remove '=='/'!=' 'PR_FALSE'/'PR_TRUE';
 (Hv1) /extensions/*. r=cbiesinger.

---
 extensions/cookie/nsCookiePromptService.cpp   |  4 +--
 .../pref/autoconfig/src/nsAutoConfig.cpp      | 33 +++++--------------
 .../pref/system-pref/src/nsSystemPref.cpp     |  2 +-
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/extensions/cookie/nsCookiePromptService.cpp b/extensions/cookie/nsCookiePromptService.cpp
index 56a7edc03865..7d59790b3cb9 100644
--- a/extensions/cookie/nsCookiePromptService.cpp
+++ b/extensions/cookie/nsCookiePromptService.cpp
@@ -72,12 +72,10 @@ nsCookiePromptService::CookieDialog(nsIDOMWindow *aParent,
   nsCOMPtr<nsIDialogParamBlock> block = do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID,&rv);
   if (NS_FAILED(rv)) return rv;
 
-  // since we're setting PRInt32's here, we have to sanitize the PRBool's first.
-  // (myBool != PR_FALSE) is guaranteed to return either 1 or 0.
   block->SetInt(nsICookieAcceptDialog::ACCEPT_COOKIE, 1);
   block->SetString(nsICookieAcceptDialog::HOSTNAME, NS_ConvertUTF8toUTF16(aHostname).get());
   block->SetInt(nsICookieAcceptDialog::COOKIESFROMHOST, aCookiesFromHost);
-  block->SetInt(nsICookieAcceptDialog::CHANGINGCOOKIE, aChangingCookie != PR_FALSE);
+  block->SetInt(nsICookieAcceptDialog::CHANGINGCOOKIE, aChangingCookie ? 1 : 0);
   
   nsCOMPtr<nsIMutableArray> objects =
     do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
diff --git a/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/extensions/pref/autoconfig/src/nsAutoConfig.cpp
index 2f68482d0332..80c0804c9bef 100644
--- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp
@@ -244,7 +244,6 @@ nsresult nsAutoConfig::downloadAutoConfig()
     nsresult rv;
     nsCAutoString emailAddr;
     nsXPIDLCString urlName;
-    PRBool appendMail = PR_FALSE, offline = PR_FALSE;
     static PRBool firstTime = PR_TRUE;
     
     if (mConfigURL.IsEmpty()) {
@@ -267,7 +266,6 @@ nsresult nsAutoConfig::downloadAutoConfig()
 
     // Get the preferences branch and save it to the member variable
     if (!mPrefBranch) {
-
         nsCOMPtr<nsIPrefService> prefs =
             do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
         if (NS_FAILED(rv)) 
@@ -283,35 +281,30 @@ nsresult nsAutoConfig::downloadAutoConfig()
     if (NS_FAILED(rv)) 
         return rv;
     
+    PRBool offline;
     rv = ios->GetOffline(&offline);
     if (NS_FAILED(rv)) 
         return rv;
     
     if (offline) {
-        
-        PRBool offlineFailover = PR_FALSE;
+        PRBool offlineFailover;
         rv = mPrefBranch->GetBoolPref("autoadmin.offline_failover", 
                                       &offlineFailover);
-        
         // Read the failover.jsc if the network is offline and the pref says so
-        if (offlineFailover) {
+        if (NS_SUCCEEDED(rv) && offlineFailover)
             return readOfflineFile();
-        }
     }
 
-
     /* Append user's identity at the end of the URL if the pref says so.
        First we are checking for the user's email address but if it is not
        available in the case where the client is used without messenger, user's
        profile name will be used as an unique identifier
     */
-    
+    PRBool appendMail;
     rv = mPrefBranch->GetBoolPref("autoadmin.append_emailaddr", &appendMail);
-    
     if (NS_SUCCEEDED(rv) && appendMail) {
         rv = getEmailAddr(emailAddr);
         if (NS_SUCCEEDED(rv) && emailAddr.get()) {
-
             /* Adding the unique identifier at the end of autoconfig URL. 
                In this case the autoconfig URL is a script and 
                emailAddr as passed as an argument 
@@ -338,7 +331,6 @@ nsresult nsAutoConfig::downloadAutoConfig()
     if (NS_FAILED(rv)) 
         return rv;
 
-    
     rv = channel->AsyncOpen(this, nsnull); 
     if (NS_FAILED(rv)) {
         readOfflineFile();
@@ -350,7 +342,6 @@ nsresult nsAutoConfig::downloadAutoConfig()
     // Also We are having the event queue processing only for the startup
     // It is not needed with the repeating timer.
     if (firstTime) {
-
         firstTime = PR_FALSE;
     
         // Getting the current thread. If we start an AsyncOpen, the thread
@@ -370,11 +361,10 @@ nsresult nsAutoConfig::downloadAutoConfig()
         while (!mLoaded)
             NS_ENSURE_STATE(NS_ProcessNextEvent(thread));
         
-        PRInt32 minutes = 0;
+        PRInt32 minutes;
         rv = mPrefBranch->GetIntPref("autoadmin.refresh_interval", 
                                      &minutes);
         if (NS_SUCCEEDED(rv) && minutes > 0) {
-
             // Create a new timer and pass this nsAutoConfig 
             // object as a timer callback. 
             mTimer = do_CreateInstance("@mozilla.org/timer;1",&rv);
@@ -385,20 +375,16 @@ nsresult nsAutoConfig::downloadAutoConfig()
             if (NS_FAILED(rv)) 
                 return rv;
         }
-    
     } //first_time
     
     return NS_OK;
-
 } // nsPref::downloadAutoConfig()
 
 
 
 nsresult nsAutoConfig::readOfflineFile()
 {
-    PRBool failCache = PR_TRUE;
     nsresult rv;
-    PRBool offline;
     
     /* Releasing the lock to allow main thread to start 
        execution. At this point we do not need to stall 
@@ -406,10 +392,9 @@ nsresult nsAutoConfig::readOfflineFile()
     */
     mLoaded = PR_TRUE; 
 
+    PRBool failCache;
     rv = mPrefBranch->GetBoolPref("autoadmin.failover_to_cached", &failCache);
-    
-    if (failCache == PR_FALSE) {
-        
+    if (NS_SUCCEEDED(rv) && !failCache) {
         // disable network connections and return.
         
         nsCOMPtr<nsIIOService> ios =
@@ -417,6 +402,7 @@ nsresult nsAutoConfig::readOfflineFile()
         if (NS_FAILED(rv)) 
             return rv;
         
+        PRBool offline;
         rv = ios->GetOffline(&offline);
         if (NS_FAILED(rv)) 
             return rv;
@@ -432,6 +418,7 @@ nsresult nsAutoConfig::readOfflineFile()
         rv = mPrefBranch->SetBoolPref("network.online", PR_FALSE);
         if (NS_FAILED(rv)) 
             return rv;
+
         mPrefBranch->LockPref("network.online");
         return NS_OK;
     }
@@ -518,7 +505,6 @@ nsresult nsAutoConfig::getEmailAddr(nsACString & emailAddr)
     
     rv = mPrefBranch->GetCharPref("mail.accountmanager.defaultaccount", 
                                   getter_Copies(prefValue));
-    
     if (NS_SUCCEEDED(rv) && !prefValue.IsEmpty()) {
         emailAddr = NS_LITERAL_CSTRING("mail.account.") +
             prefValue + NS_LITERAL_CSTRING(".identities");
@@ -580,4 +566,3 @@ nsresult nsAutoConfig::PromptForEMailAddress(nsACString &emailAddress)
     LossyCopyUTF16toASCII(emailResult, emailAddress);
     return NS_OK;
 }
-
diff --git a/extensions/pref/system-pref/src/nsSystemPref.cpp b/extensions/pref/system-pref/src/nsSystemPref.cpp
index 09045205bcbc..4fe85335434a 100644
--- a/extensions/pref/system-pref/src/nsSystemPref.cpp
+++ b/extensions/pref/system-pref/src/nsSystemPref.cpp
@@ -210,7 +210,7 @@ nsSystemPref::Observe(nsISupports *aSubject,
     // outside mozilla. We need to read it again.
     else if (!nsCRT::strcmp(aTopic, NS_SYSTEMPREF_PREFCHANGE_TOPIC_ID) &&
              aData) {
-        NS_ASSERTION(mEnabled == PR_TRUE, "Should not listen when disabled");
+        NS_ASSERTION(mEnabled, "Should not listen when disabled");
         SYSPREF_LOG(("====== System Pref Notify topic=%s data=%s\n",
                      aTopic, (char*)aData));
         rv = ReadSystemPref(NS_LossyConvertUTF16toASCII(aData).get());

From 5d6365d877f30bbf29ec184d86490b635e5f2666 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Thu, 14 Apr 2011 17:28:46 +0200
Subject: [PATCH 138/509] Bug 647404 - automation.py: fix extractZip() and
 installExtension(); (Cv2) Explicitly support an optional path in
 --install-extension. r=jmaher.

---
 layout/tools/reftest/runreftest.py | 7 +++----
 testing/mochitest/runtests.py      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 168502c99614..62699d88ef91 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -177,9 +177,7 @@ class RefTest(object):
   def installExtensionsToProfile(self, options, profileDir):
     "Install the specified extensions on the command line to the testing profile."
     for f in options.extensionsToInstall:
-      abspath = self.getFullPath(f)
-      extensionID = f[:f.rfind(".")]
-      self.automation.installExtension(abspath, profileDir, extensionID)
+      self.automation.installExtension(self.getFullPath(f), profileDir)
 
 
 class ReftestOptions(OptionParser):
@@ -245,7 +243,8 @@ class ReftestOptions(OptionParser):
                     action = "append", dest = "extensionsToInstall",
                     help = "install the specified extension in the testing profile."
                            "The extension file's name should be <id>.xpi where <id> is"
-                           "the extension's id as indicated in its install.rdf.")
+                           "the extension's id as indicated in its install.rdf."
+                           "An optional path can be specified too.")
     defaults["extensionsToInstall"] = []
 
     self.set_defaults(**defaults)
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 61eac0461fca..69bab053fb37 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -211,7 +211,8 @@ class MochitestOptions(optparse.OptionParser):
                     action = "append", dest = "extensionsToInstall",
                     help = "install the specified extension in the testing profile."
                            "The extension file's name should be <id>.xpi where <id> is"
-                           "the extension's id as indicated in its install.rdf.")
+                           "the extension's id as indicated in its install.rdf."
+                           "An optional path can be specified too.")
     defaults["extensionsToInstall"] = []
 
     self.add_option("--profile-path", action = "store",
@@ -771,9 +772,7 @@ overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-t
   def installExtensionsToProfile(self, options):
     "Install the specified extensions on the command line to the testing profile."
     for f in options.extensionsToInstall:
-      abspath = self.getFullPath(f)
-      extensionID = f[:f.rfind(".")]
-      self.automation.installExtension(abspath, options.profilePath, extensionID)
+      self.automation.installExtension(self.getFullPath(f), options.profilePath)
 
 def main():
   automation = Automation()

From ebb2f0c7ec0c54b82fa79736555502deead88c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=BCchler?= <jan@kuechler-wuppertal.de>
Date: Thu, 7 Apr 2011 18:04:39 -0700
Subject: [PATCH 139/509] Bug 266236 part 1: Preliminary API cleanup on
 nsIRenderingContext.

--HG--
extra : rebase_source : a21ffad484f47103e403b8316eae5fdfd815c2cb
---
 gfx/src/nsIRenderingContext.h                 | 36 ++++++-----
 gfx/src/nsThebesRenderingContext.cpp          | 59 +++++++++++--------
 gfx/src/nsThebesRenderingContext.h            | 12 ++--
 layout/base/nsBidiPresUtils.cpp               |  3 +-
 layout/base/nsCSSRendering.cpp                |  6 +-
 layout/base/nsDisplayList.h                   |  2 +-
 layout/base/nsLayoutUtils.cpp                 |  8 +--
 layout/base/nsPresShell.cpp                   |  4 +-
 layout/forms/nsComboboxControlFrame.cpp       | 14 ++---
 layout/generic/nsBRFrame.cpp                  |  3 +-
 layout/generic/nsBlockFrame.cpp               |  3 +-
 layout/generic/nsFrameSetFrame.cpp            | 48 ++++++++-------
 layout/generic/nsImageFrame.cpp               |  9 +--
 layout/generic/nsInlineFrame.cpp              |  3 +-
 layout/generic/nsLineLayout.cpp               |  3 +-
 layout/generic/nsObjectFrame.cpp              |  6 +-
 layout/generic/nsPageFrame.cpp                |  2 +-
 layout/generic/nsSimplePageSequence.cpp       |  4 +-
 layout/mathml/nsMathMLChar.cpp                |  2 +-
 layout/mathml/nsMathMLContainerFrame.cpp      |  6 +-
 layout/mathml/nsMathMLFrame.cpp               |  6 +-
 layout/mathml/nsMathMLmencloseFrame.cpp       |  4 +-
 layout/mathml/nsMathMLmfencedFrame.cpp        |  3 +-
 layout/mathml/nsMathMLmfracFrame.cpp          |  3 +-
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp  |  3 +-
 layout/mathml/nsMathMLmoFrame.cpp             |  3 +-
 layout/mathml/nsMathMLmoverFrame.cpp          |  3 +-
 layout/mathml/nsMathMLmrootFrame.cpp          |  6 +-
 layout/mathml/nsMathMLmsubsupFrame.cpp        |  3 +-
 layout/mathml/nsMathMLmtableFrame.cpp         |  3 +-
 layout/mathml/nsMathMLmunderFrame.cpp         |  3 +-
 layout/mathml/nsMathMLmunderoverFrame.cpp     |  3 +-
 layout/svg/base/src/nsSVGIntegrationUtils.cpp |  6 +-
 layout/svg/base/src/nsSVGOuterSVGFrame.cpp    |  2 +-
 layout/tables/nsTableCellFrame.cpp            |  2 +-
 layout/tables/nsTableFrame.cpp                |  2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  5 +-
 widget/src/cocoa/nsNativeThemeCocoa.mm        |  3 +-
 widget/src/gtk2/nsNativeThemeGTK.cpp          |  3 +-
 widget/src/qt/nsNativeThemeQt.h               |  3 +-
 widget/src/windows/nsNativeThemeWin.cpp       |  6 +-
 41 files changed, 141 insertions(+), 167 deletions(-)

diff --git a/gfx/src/nsIRenderingContext.h b/gfx/src/nsIRenderingContext.h
index 343a09e80dfa..44dfbc8856b7 100644
--- a/gfx/src/nsIRenderingContext.h
+++ b/gfx/src/nsIRenderingContext.h
@@ -42,6 +42,7 @@
 #define nsIRenderingContext_h___
 
 #include "nscore.h"
+#include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsColor.h"
 #include "nsCoord.h"
@@ -139,11 +140,10 @@ public:
 
   /**
    * Get the DeviceContext that this RenderingContext was initialized
-   * with.  This function addrefs the device context.  Though it might
-   * be better if it just returned it directly, without addrefing.   
+   * with.
    * @result the device context
    */
-  NS_IMETHOD GetDeviceContext(nsIDeviceContext *& aDeviceContext) = 0;
+  virtual already_AddRefed<nsIDeviceContext> GetDeviceContext() = 0;
 
   /**
    * Save a graphical state onto a stack.
@@ -223,21 +223,20 @@ public:
    * Get the current fontmetrics for the RenderingContext
    * @return The current font of the RenderingContext
    */
-  NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics) = 0;
+  virtual already_AddRefed<nsIFontMetrics> GetFontMetrics() = 0;
 
   /**
-   *  Add in a translate to the RenderingContext's transformation matrix
-   * @param aX The horizontal translation
-   * @param aY The vertical translation
+   * Add in a translate to the RenderingContext's transformation matrix
+   * @param aPt The point to translate to
    */
-  NS_IMETHOD Translate(nscoord aX, nscoord aY) = 0;
-  
+  NS_IMETHOD Translate(const nsPoint& aPt) = 0;
+
   /**
    * Set the translation compoennt of the current transformation matrix.
    * Useful to set it to a known pixel value without incurring roundoff
    * errors.
    */
-  NS_IMETHOD SetTranslation(nscoord aX, nscoord aY) = 0;
+  NS_IMETHOD SetTranslation(const nsPoint& aPt) = 0;
 
   /**
    *  Add in a scale to the RenderingContext's transformation matrix
@@ -254,10 +253,10 @@ public:
     nsIRenderingContext* mCtx;
     PushedTranslation mPushed;
   public:
-    AutoPushTranslation(nsIRenderingContext* aCtx, nscoord aX, nscoord aY)
+    AutoPushTranslation(nsIRenderingContext* aCtx, const nsPoint& aPt)
       : mCtx(aCtx) {
       mCtx->PushTranslation(&mPushed);
-      mCtx->Translate(aX, aY);
+      mCtx->Translate(aPt);
     }
     ~AutoPushTranslation() {
       mCtx->PopTranslation(&mPushed);
@@ -268,15 +267,22 @@ public:
 
   NS_IMETHOD PopTranslation(PushedTranslation* aState) = 0;
 
-  /** 
+  /**
    * Get the current transformation matrix for the RenderingContext
    * @return The transformation matrix for the RenderingContext
    */
-  NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform) = 0;
+  virtual nsTransform2D* GetCurrentTransform() = 0;
 
   /**
    * Draw a line
-   * @param aXO starting horiztonal coord in twips
+   * @param aStartPt starting point
+   * @param aEndPt ending point
+   */
+  NS_IMETHOD DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt) = 0;
+
+  /**
+   * Draw a line
+   * @param aX0 starting horizontal coord in twips
    * @param aY0 starting vertical coord in twips
    * @param aX1 end horiztonal coord in twips
    * @param aY1 end vertical coord in twips
diff --git a/gfx/src/nsThebesRenderingContext.cpp b/gfx/src/nsThebesRenderingContext.cpp
index 735f40400b65..0460e9e1a0c4 100644
--- a/gfx/src/nsThebesRenderingContext.cpp
+++ b/gfx/src/nsThebesRenderingContext.cpp
@@ -185,12 +185,11 @@ nsThebesRenderingContext::CommonInit(void)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetDeviceContext(nsIDeviceContext *& aDeviceContext)
+already_AddRefed<nsIDeviceContext>
+nsThebesRenderingContext::GetDeviceContext()
 {
-    aDeviceContext = mDeviceContext;
-    NS_IF_ADDREF(aDeviceContext);
-    return NS_OK;
+    NS_IF_ADDREF(mDeviceContext);
+    return mDeviceContext.get();
 }
 
 NS_IMETHODIMP
@@ -214,13 +213,13 @@ nsThebesRenderingContext::PopTranslation(PushedTranslation* aState)
 }
 
 NS_IMETHODIMP
-nsThebesRenderingContext::SetTranslation(nscoord aX, nscoord aY)
+nsThebesRenderingContext::SetTranslation(const nsPoint& aPt)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetTranslation %d %d\n", this, aX, aY));
+    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetTranslation %d %d\n", this, aPt.x, aPt.y));
 
     gfxMatrix newMat(mThebes->CurrentMatrix());
-    newMat.x0 = aX;
-    newMat.y0 = aY;
+    newMat.x0 = aPt.x;
+    newMat.y0 = aPt.y;
     mThebes->SetMatrix(newMat);
     return NS_OK;
 }
@@ -357,10 +356,10 @@ nsThebesRenderingContext::GetColor(nscolor &aColor) const
 }
 
 NS_IMETHODIMP
-nsThebesRenderingContext::Translate(nscoord aX, nscoord aY)
+nsThebesRenderingContext::Translate(const nsPoint& aPt)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Translate %d %d\n", this, aX, aY));
-    mThebes->Translate (gfxPoint(FROM_TWIPS(aX), FROM_TWIPS(aY)));
+    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Translate %d %d\n", this, aPt.x, aPt.y));
+    mThebes->Translate (gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
     return NS_OK;
 }
 
@@ -410,13 +409,13 @@ nsThebesRenderingContext::CurrentTransform()
  **** fixed to not use this!
  ****/
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetCurrentTransform(nsTransform2D *&aTransform)
+nsTransform2D*
+nsThebesRenderingContext::GetCurrentTransform()
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::GetCurrentTransform\n", this));
+    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
+           ("## %p nsTRC::GetCurrentTransform\n", this));
     UpdateTempTransformMatrix();
-    aTransform = &mTempTransform;
-    return NS_OK;
+    return &mTempTransform;
 }
 
 void
@@ -433,15 +432,24 @@ nsThebesRenderingContext::TransformCoord (nscoord *aX, nscoord *aY)
 }
 
 NS_IMETHODIMP
-nsThebesRenderingContext::DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1)
+nsThebesRenderingContext::DrawLine(const nsPoint& aStartPt,
+                                   const nsPoint& aEndPt)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::DrawLine %d %d %d %d\n", this, aX0, aY0, aX1, aY1));
+    return DrawLine(aStartPt.x, aStartPt.y, aEndPt.x, aEndPt.y);
+}
+
+NS_IMETHODIMP
+nsThebesRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
+                                   nscoord aX1, nscoord aY1)
+{
+    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
+           ("## %p nsTRC::DrawLine %d %d %d %d\n", this, aX0, aY0, aX1, aY1));
 
     gfxPoint p0 = gfxPoint(FROM_TWIPS(aX0), FROM_TWIPS(aY0));
     gfxPoint p1 = gfxPoint(FROM_TWIPS(aX1), FROM_TWIPS(aY1));
 
-    // we can't draw thick lines with gfx, so we always assume we want pixel-aligned
-    // lines if the rendering context is at 1.0 scale
+    // we can't draw thick lines with gfx, so we always assume we want
+    // pixel-aligned lines if the rendering context is at 1.0 scale
     gfxMatrix savedMatrix = mThebes->CurrentMatrix();
     if (!savedMatrix.HasNonTranslation()) {
         p0 = mThebes->UserToDevice(p0);
@@ -826,12 +834,11 @@ nsThebesRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetFontMetrics(nsIFontMetrics *&aFontMetrics)
+already_AddRefed<nsIFontMetrics>
+nsThebesRenderingContext::GetFontMetrics()
 {
-    aFontMetrics = mFontMetrics;
-    NS_IF_ADDREF(aFontMetrics);
-    return NS_OK;
+    NS_IF_ADDREF(mFontMetrics);
+    return mFontMetrics.get();
 }
 
 PRInt32
diff --git a/gfx/src/nsThebesRenderingContext.h b/gfx/src/nsThebesRenderingContext.h
index 0c75f43c73e6..8ea72f7c7340 100644
--- a/gfx/src/nsThebesRenderingContext.h
+++ b/gfx/src/nsThebesRenderingContext.h
@@ -132,10 +132,9 @@ public:
 
     NS_IMETHOD Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
     NS_IMETHOD Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
-
     NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWidget);
     NS_IMETHOD CommonInit(void);
-    NS_IMETHOD GetDeviceContext(nsIDeviceContext *& aDeviceContext);
+    virtual already_AddRefed<nsIDeviceContext> GetDeviceContext();
     NS_IMETHOD PushState(void);
     NS_IMETHOD PopState(void);
     NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
@@ -148,11 +147,12 @@ public:
     NS_IMETHOD SetFont(const nsFont& aFont,
                        gfxUserFontSet *aUserFontSet);
     NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
-    NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics);
-    NS_IMETHOD Translate(nscoord aX, nscoord aY);
+    virtual already_AddRefed<nsIFontMetrics> GetFontMetrics();
+    NS_IMETHOD Translate(const nsPoint& aPt);
     NS_IMETHOD Scale(float aSx, float aSy);
-    NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform);
+    virtual nsTransform2D* GetCurrentTransform();
 
+    NS_IMETHOD DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
     NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
     NS_IMETHOD DrawRect(const nsRect& aRect);
     NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
@@ -173,7 +173,7 @@ public:
 
     NS_IMETHOD PushTranslation(PushedTranslation* aState);
     NS_IMETHOD PopTranslation(PushedTranslation* aState);
-    NS_IMETHOD SetTranslation(nscoord aX, nscoord aY);
+    NS_IMETHOD SetTranslation(const nsPoint& aPoint);
 
     /**
      * Let the device context know whether we want text reordered with
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 5df62524074a..71daec422ace 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -1787,8 +1787,7 @@ public:
   virtual void DrawText(nscoord aXOffset,
                         nscoord)
   {
-    nsCOMPtr<nsIFontMetrics> metrics;
-    mCtx->GetFontMetrics(*getter_AddRefs(metrics));
+    nsCOMPtr<nsIFontMetrics> metrics = mCtx->GetFontMetrics();
     nsIThebesFontMetrics* fm = static_cast<nsIThebesFontMetrics*>(metrics.get());
     fm->DrawString(mText, mLength, mPt.x + aXOffset, mPt.y,
                    mCtx, mTextRunConstructionContext);
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index fe6078fa8a1c..eaa9c050a60a 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1202,7 +1202,7 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
       nsCOMPtr<nsIRenderingContext> wrapperCtx;
       devCtx->CreateRenderingContextInstance(*getter_AddRefs(wrapperCtx));
       wrapperCtx->Init(devCtx, shadowContext);
-      wrapperCtx->Translate(shadowItem->mXOffset, shadowItem->mYOffset);
+      wrapperCtx->Translate(nsPoint(shadowItem->mXOffset, shadowItem->mYOffset));
 
       nsRect nativeRect;
       nativeRect.IntersectRect(frameRect, aDirtyRect);
@@ -3090,13 +3090,13 @@ DrawSolidBorderSegment(nsIRenderingContext& aContext,
     // simple line or rectangle
     if ((NS_SIDE_TOP == aStartBevelSide) || (NS_SIDE_BOTTOM == aStartBevelSide)) {
       if (1 == aRect.height)
-        aContext.DrawLine(aRect.x, aRect.y, aRect.x, aRect.y + aRect.height);
+        aContext.DrawLine(aRect.TopLeft(), aRect.BottomLeft());
       else
         aContext.FillRect(aRect);
     }
     else {
       if (1 == aRect.width)
-        aContext.DrawLine(aRect.x, aRect.y, aRect.x + aRect.width, aRect.y);
+        aContext.DrawLine(aRect.TopLeft(), aRect.TopRight());
       else
         aContext.FillRect(aRect);
     }
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 82b8cb854204..0fae59439fb9 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1328,7 +1328,7 @@ public:
   
   virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) {
     nsPoint pt = ToReferenceFrame();
-    nsIRenderingContext::AutoPushTranslation translate(aCtx, pt.x, pt.y);
+    nsIRenderingContext::AutoPushTranslation translate(aCtx, pt);
     mFrame->PresContext()->PresShell()->PaintCount(mFrameName, aCtx,
                                                       mFrame->PresContext(),
                                                       mFrame, mColor);
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index c0bec2f82367..173df2898d5e 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1496,7 +1496,7 @@ nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFra
         nsPoint pos = rootScrollableFrame->GetScrollPosition();
         visibleRegion.MoveBy(-pos);
         if (aRenderingContext) {
-          aRenderingContext->Translate(pos.x, pos.y);
+          aRenderingContext->Translate(pos);
         }
       }
       builder.SetIgnoreScrollFrame(rootScrollFrame);
@@ -3267,8 +3267,7 @@ DrawImageInternal(nsIRenderingContext* aRenderingContext,
                   const nsIntSize&     aImageSize,
                   PRUint32             aImageFlags)
 {
-  nsCOMPtr<nsIDeviceContext> dc;
-  aRenderingContext->GetDeviceContext(*getter_AddRefs(dc));
+  nsCOMPtr<nsIDeviceContext> dc = aRenderingContext->GetDeviceContext();
   PRInt32 appUnitsPerDevPixel = dc->AppUnitsPerDevPixel();
   gfxContext* ctx = aRenderingContext->ThebesContext();
 
@@ -3299,8 +3298,7 @@ nsLayoutUtils::DrawPixelSnapped(nsIRenderingContext* aRenderingContext,
                                 const nsPoint&       aAnchor,
                                 const nsRect&        aDirty)
 {
-  nsCOMPtr<nsIDeviceContext> dc;
-  aRenderingContext->GetDeviceContext(*getter_AddRefs(dc));
+  nsCOMPtr<nsIDeviceContext> dc = aRenderingContext->GetDeviceContext();
   PRInt32 appUnitsPerDevPixel = dc->AppUnitsPerDevPixel();
   gfxContext* ctx = aRenderingContext->ThebesContext();
   gfxIntSize drawableSize = aDrawable->Size();
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 8b7da5ac0da3..45e0b50ed136 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5622,7 +5622,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
     rc->Scale(scale, scale);
 
   // translate so that points are relative to the surface area
-  rc->Translate(-aArea.x, -aArea.y);
+  rc->Translate(-aArea.TopLeft());
 
   // temporarily hide the selection so that text is drawn normally. If a
   // selection is being rendered, use that, otherwise use the presshell's
@@ -5645,7 +5645,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
     // the display lists paint relative to the offset from the reference
     // frame, so translate the rendering context
     nsIRenderingContext::AutoPushTranslation
-      translate(rc, rangeInfo->mRootOffset.x, rangeInfo->mRootOffset.y);
+      translate(rc, rangeInfo->mRootOffset);
 
     aArea.MoveBy(-rangeInfo->mRootOffset.x, -rangeInfo->mRootOffset.y);
     nsRegion visible(aArea);
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 7f564eeadf42..662aafa51ff3 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1428,16 +1428,10 @@ void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,
   nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
   clipRect.width -= onePixel;
   clipRect.height -= onePixel;
-  aRenderingContext.DrawLine(clipRect.x, clipRect.y, 
-                             clipRect.x+clipRect.width, clipRect.y);
-  aRenderingContext.DrawLine(clipRect.x+clipRect.width, clipRect.y, 
-                             clipRect.x+clipRect.width, clipRect.y+clipRect.height);
-  aRenderingContext.DrawLine(clipRect.x+clipRect.width, clipRect.y+clipRect.height, 
-                             clipRect.x, clipRect.y+clipRect.height);
-  aRenderingContext.DrawLine(clipRect.x, clipRect.y+clipRect.height, 
-                             clipRect.x, clipRect.y);
-  aRenderingContext.DrawLine(clipRect.x, clipRect.y+clipRect.height, 
-                             clipRect.x, clipRect.y);
+  aRenderingContext.DrawLine(clipRect.TopLeft(), clipRect.TopRight());
+  aRenderingContext.DrawLine(clipRect.TopRight(), clipRect.BottomRight());
+  aRenderingContext.DrawLine(clipRect.BottomRight(), clipRect.BottomLeft());
+  aRenderingContext.DrawLine(clipRect.BottomLeft(), clipRect.TopLeft());
 
   aRenderingContext.PopState();
 }
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index a19545d64a1a..b2e47499f5fa 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -152,8 +152,7 @@ BRFrame::Reflow(nsPresContext* aPresContext,
       // normal inline frame.  That line-height is used is important
       // here for cases where the line-height is less than 1.
       nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-      nsCOMPtr<nsIFontMetrics> fm;
-      aReflowState.rendContext->GetFontMetrics(*getter_AddRefs(fm));
+      nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
       if (fm) {
         nscoord logicalHeight = aReflowState.CalcLineHeight();
         aMetrics.height = logicalHeight;
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 06a5856864e9..95ed383555f6 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -2370,8 +2370,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
 
       nsIRenderingContext *rc = aState.mReflowState.rendContext;
       nsLayoutUtils::SetFontFromStyle(rc, GetStyleContext());
-      nsCOMPtr<nsIFontMetrics> fm;
-      rc->GetFontMetrics(*getter_AddRefs(fm));
+      nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
 
       nscoord minAscent =
         nsLayoutUtils::GetCenteredFontBaseline(fm, aState.mMinLineHeight);
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index 3409347de898..9515d6a826c8 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -1690,7 +1690,7 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingConte
   nscolor sdwColor = NS_RGB(128,128,128);
 
   nsIRenderingContext::AutoPushTranslation
-    translate(&aRenderingContext, aPt.x, aPt.y);
+    translate(&aRenderingContext, aPt);
 
   {
     nsCOMPtr<nsILookAndFeel> lookAndFeel = do_GetService(kLookAndFeelCID);
@@ -1708,10 +1708,8 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingConte
   if (widthInPixels <= 0)
     return;
 
-  nscoord x0 = 0;
-  nscoord y0 = 0;
-  nscoord x1 = (mVertical) ? 0 : mRect.width;
-  nscoord y1 = (mVertical) ? mRect.height : 0;
+  nsPoint start(0,0);
+  nsPoint end((mVertical) ? 0 : mRect.width, (mVertical) ? mRect.height : 0);
 
   nscolor color = WHITE;
   if (mVisibility || mVisibilityOverride) {
@@ -1720,13 +1718,13 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingConte
   aRenderingContext.SetColor(color);
   // draw grey or white first
   for (int i = 0; i < widthInPixels; i++) {
-    aRenderingContext.DrawLine (x0, y0, x1, y1);
+    aRenderingContext.DrawLine (start, end);
     if (mVertical) {
-      x0 += pixelWidth;
-      x1 =  x0;
+      start.x += pixelWidth;
+      end.x =  start.x;
     } else {
-      y0 += pixelWidth;
-      y1 =  y0;
+      start.y += pixelWidth;
+      end.y =  start.y;
     }
   }
 
@@ -1735,29 +1733,29 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingConte
 
   if (widthInPixels >= 5) {
     aRenderingContext.SetColor(hltColor);
-    x0 = (mVertical) ? pixelWidth : 0;
-    y0 = (mVertical) ? 0 : pixelWidth;
-    x1 = (mVertical) ? x0 : mRect.width;
-    y1 = (mVertical) ? mRect.height : y0;
-    aRenderingContext.DrawLine(x0, y0, x1, y1);
+    start.x = (mVertical) ? pixelWidth : 0;
+    start.y = (mVertical) ? 0 : pixelWidth;
+    end.x   = (mVertical) ? start.x : mRect.width;
+    end.y   = (mVertical) ? mRect.height : start.y;
+    aRenderingContext.DrawLine(start, end);
   }
 
   if (widthInPixels >= 2) {
     aRenderingContext.SetColor(sdwColor);
-    x0 = (mVertical) ? mRect.width - (2 * pixelWidth) : 0;
-    y0 = (mVertical) ? 0 : mRect.height - (2 * pixelWidth);
-    x1 = (mVertical) ? x0 : mRect.width;
-    y1 = (mVertical) ? mRect.height : y0;
-    aRenderingContext.DrawLine(x0, y0, x1, y1);
+    start.x = (mVertical) ? mRect.width - (2 * pixelWidth) : 0;
+    start.y = (mVertical) ? 0 : mRect.height - (2 * pixelWidth);
+    end.x   = (mVertical) ? start.x : mRect.width;
+    end.y   = (mVertical) ? mRect.height : start.y;
+    aRenderingContext.DrawLine(start, end);
   }
 
   if (widthInPixels >= 1) {
     aRenderingContext.SetColor(fgColor);
-    x0 = (mVertical) ? mRect.width - pixelWidth : 0;
-    y0 = (mVertical) ? 0 : mRect.height - pixelWidth;
-    x1 = (mVertical) ? x0 : mRect.width;
-    y1 = (mVertical) ? mRect.height : y0;
-    aRenderingContext.DrawLine(x0, y0, x1, y1);
+    start.x = (mVertical) ? mRect.width - pixelWidth : 0;
+    start.y = (mVertical) ? 0 : mRect.height - pixelWidth;
+    end.x   = (mVertical) ? start.x : mRect.width;
+    end.y   = (mVertical) ? mRect.height : start.y;
+    aRenderingContext.DrawLine(start, end);
   }
 }
 
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index ab3249826f60..55ff28b664f5 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -976,8 +976,7 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
   nsLayoutUtils::SetFontFromStyle(&aRenderingContext, mStyleContext);
 
   // Format the text to display within the formatting rect
-  nsIFontMetrics* fm;
-  aRenderingContext.GetFontMetrics(fm);
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord maxAscent, maxDescent, height;
   fm->GetMaxAscent(maxAscent);
@@ -1028,8 +1027,6 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
     y += height;
     firstLine = PR_FALSE;
   }
-
-  NS_RELEASE(fm);
 }
 
 struct nsRecessedBorder : public nsStyleBorder {
@@ -1184,7 +1181,7 @@ static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx,
 
   aCtx->SetColor(NS_RGB(0, 0, 0));
   aCtx->PushState();
-  aCtx->Translate(inner.x, inner.y);
+  aCtx->Translate(inner.TopLeft());
   f->GetImageMap(pc)->Draw(aFrame, *aCtx);
   aCtx->PopState();
 }
@@ -1295,7 +1292,7 @@ nsImageFrame::PaintImage(nsIRenderingContext& aRenderingContext, nsPoint aPt,
     aRenderingContext.PushState();
     aRenderingContext.SetColor(NS_RGB(0, 0, 0));
     aRenderingContext.SetLineStyle(nsLineStyle_kDotted);
-    aRenderingContext.Translate(inner.x, inner.y);
+    aRenderingContext.Translate(inner.TopLeft());
     map->Draw(this, aRenderingContext);
     aRenderingContext.PopState();
   }
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 63a999c6d85e..68aa8bdafd53 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -644,8 +644,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
   }
 
   nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-  nsCOMPtr<nsIFontMetrics> fm;
-  aReflowState.rendContext->GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
 
   if (fm) {
     // Compute final height of the frame.
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 2ff1a7169dbc..229c00989f4e 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1563,8 +1563,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
   nsStyleContext* styleContext = spanFrame->GetStyleContext();
   nsIRenderingContext* rc = mBlockReflowState->rendContext;
   nsLayoutUtils::SetFontFromStyle(mBlockReflowState->rendContext, styleContext);
-  nsCOMPtr<nsIFontMetrics> fm;
-  rc->GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
 
   PRBool preMode = mStyleText->WhiteSpaceIsSignificant();
 
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index bff152385234..b7553fd5340d 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1323,7 +1323,7 @@ nsObjectFrame::PaintPrintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                                 const nsRect& aDirtyRect, nsPoint aPt)
 {
   nsPoint pt = aPt + aFrame->GetUsedBorderAndPadding().TopLeft();
-  nsIRenderingContext::AutoPushTranslation translate(aCtx, pt.x, pt.y);
+  nsIRenderingContext::AutoPushTranslation translate(aCtx, pt);
   // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
   static_cast<nsObjectFrame*>(aFrame)->PrintPlugin(*aCtx, aDirtyRect);
 }
@@ -2284,7 +2284,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
     } else {
       // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
       nsIRenderingContext::AutoPushTranslation
-        translate(&aRenderingContext, aPluginRect.x, aPluginRect.y);
+        translate(&aRenderingContext, aPluginRect.TopLeft());
 
       // this rect is used only in the CoreGraphics drawing model
       gfxRect tmpRect(0, 0, 0, 0);
@@ -2424,7 +2424,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
     if (window->type == NPWindowTypeDrawable) {
       // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
       nsIRenderingContext::AutoPushTranslation
-        translate(&aRenderingContext, aPluginRect.x, aPluginRect.y);
+        translate(&aRenderingContext, aPluginRect.TopLeft());
 
       // check if we need to call SetWindow with updated parameters
       PRBool doupdatewindow = PR_FALSE;
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 6fcb755c8f96..bee4f6407aeb 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -553,7 +553,7 @@ nsPageFrame::PaintPageContent(nsIRenderingContext& aRenderingContext,
   float scale = PresContext()->GetPageScale();
   aRenderingContext.PushState();
   nsPoint framePos = aPt + pageContentFrame->GetOffsetTo(this);
-  aRenderingContext.Translate(framePos.x, framePos.y);
+  aRenderingContext.Translate(framePos);
   // aPt translates to coords relative to this, then margins translate to
   // pageContentFrame's coords
   rect -= framePos;
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 21c9c3146fff..46e84b714e05 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -680,7 +680,7 @@ nsSimplePageSequenceFrame::PaintPageSequence(nsIRenderingContext& aRenderingCont
   float scale = PresContext()->GetPrintPreviewScale();
   aRenderingContext.PushState();
   nsPoint framePos = aPt;
-  aRenderingContext.Translate(framePos.x, framePos.y);
+  aRenderingContext.Translate(framePos);
   rect -= framePos;
   aRenderingContext.Scale(scale, scale);
   rect.ScaleRoundOut(1.0f / scale);
@@ -692,7 +692,7 @@ nsSimplePageSequenceFrame::PaintPageSequence(nsIRenderingContext& aRenderingCont
     nsPoint pt = child->GetPosition();
     // The rendering context has to be translated before each call to PaintFrame
     aRenderingContext.PushState();
-    aRenderingContext.Translate(pt.x, pt.y);
+    aRenderingContext.Translate(pt);
     nsLayoutUtils::PaintFrame(&aRenderingContext, child,
                               nsRegion(rect - pt), NS_RGBA(0,0,0,0),
                               nsLayoutUtils::PAINT_SYNC_DECODE_IMAGES);
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index bd1478261b35..3f0c6057bd1b 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -2132,7 +2132,7 @@ void
 nsMathMLChar::ApplyTransforms(nsIRenderingContext& aRenderingContext, nsRect &r)
 {
   // apply the transforms
-  aRenderingContext.Translate(r.x, r.y);
+  aRenderingContext.Translate(r.TopLeft());
   aRenderingContext.Scale(mScaleX, mScaleY);
 
   // update the bounding rectangle.
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index d0e818d1d05f..5a6b9ab4e887 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -109,8 +109,7 @@ nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext,
   }
 
   // reflow metrics
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
   fm->GetMaxAscent(aDesiredSize.ascent);
   nscoord descent;
   fm->GetMaxDescent(descent);
@@ -152,8 +151,7 @@ void nsDisplayMathMLError::Paint(nsDisplayListBuilder* aBuilder,
   aCtx->SetColor(NS_RGB(255,255,255));
 
   nscoord ascent;
-  nsCOMPtr<nsIFontMetrics> fm;
-  aCtx->GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aCtx->GetFontMetrics();
   fm->GetMaxAscent(ascent);
 
   nsAutoString errorMsg; errorMsg.AssignLiteral("invalid-markup");
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index da337dcc5c5c..32a62b1a3107 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -282,8 +282,7 @@ nsMathMLFrame::GetRuleThickness(nsIRenderingContext& aRenderingContext,
   // get the bounding metrics of the overbar char, the rendering context
   // is assumed to have been set with the font of the current style context
 #ifdef NS_DEBUG
-  nsCOMPtr<nsIFontMetrics> currFontMetrics;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(currFontMetrics));
+  nsCOMPtr<nsIFontMetrics> currFontMetrics = aRenderingContext.GetFontMetrics();
   NS_ASSERTION(currFontMetrics->Font().Equals(aFontMetrics->Font()),
       "unexpected state");
 #endif
@@ -321,8 +320,7 @@ nsMathMLFrame::GetAxisHeight(nsIRenderingContext& aRenderingContext,
   // get the bounding metrics of the minus sign, the rendering context
   // is assumed to have been set with the font of the current style context
 #ifdef NS_DEBUG
-  nsCOMPtr<nsIFontMetrics> currFontMetrics;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(currFontMetrics));
+  nsCOMPtr<nsIFontMetrics> currFontMetrics = aRenderingContext.GetFontMetrics();
   NS_ASSERTION(currFontMetrics->Font().Equals(aFontMetrics->Font()),
 	"unexpected state");
 #endif
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 30bf0f796f17..a0bc0859c403 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -374,11 +374,11 @@ nsMathMLmencloseFrame::PlaceInternal(nsIRenderingContext& aRenderingContext,
   ///////////////
   // Thickness of bars and font metrics
   nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
-  nsCOMPtr<nsIFontMetrics> fm;
+
   nscoord mEmHeight;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
   GetRuleThickness(aRenderingContext, fm, mRuleThickness);
   GetEmHeight(fm, mEmHeight);
 
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 117e84067474..7d7a108b142c 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -242,11 +242,10 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
   aDesiredSize.mBoundingMetrics.Clear();
 
   PRInt32 i;
-  nsCOMPtr<nsIFontMetrics> fm;
   const nsStyleFont* font = GetStyleFont();
   aReflowState.rendContext->SetFont(font->mFont,
                                     aPresContext->GetUserFontSet());
-  aReflowState.rendContext->GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
   nscoord axisHeight, em;
   GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);
   GetEmHeight(fm, em);
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 60e7152b6c7d..ee5a053ccc8b 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -270,8 +270,7 @@ nsMathMLmfracFrame::PlaceInternal(nsIRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             presContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord defaultRuleThickness, axisHeight;
   GetRuleThickness(aRenderingContext, fm, defaultRuleThickness);
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index 2d75ddd0d447..a17ad95a185a 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -163,8 +163,7 @@ nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext,
   const nsStyleFont* font = GetStyleFont();
   aRenderingContext.SetFont(font->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord xHeight;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index ec69b08b4812..e83c308ee085 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -638,10 +638,9 @@ nsMathMLmoFrame::Stretch(nsIRenderingContext& aRenderingContext,
   nsIFrame* firstChild = mFrames.FirstChild();
 
   // get the axis height;
-  nsCOMPtr<nsIFontMetrics> fm;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
   nscoord axisHeight, height;
   GetAxisHeight(aRenderingContext, fm, axisHeight);
 
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index 60396f9154a7..a6be6f0756aa 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -284,8 +284,7 @@ nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 89cc75245f09..8794e0f2079e 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -261,8 +261,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
 
   renderingContext.SetFont(GetStyleFont()->mFont,
                            aPresContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  renderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = renderingContext.GetFontMetrics();
 
   // For radical glyphs from TeX fonts and some of the radical glyphs from
   // Mathematica fonts, the thickness of the overline can be obtained from the
@@ -414,8 +413,7 @@ nsMathMLmrootFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext)
                                          nsLayoutUtils::PREF_WIDTH);
   nscoord sqrWidth = mSqrChar.GetMaxWidth(PresContext(), *aRenderingContext);
 
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext->GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext->GetFontMetrics();
   nscoord dxSqr;
   GetRadicalXOffsets(indexWidth, sqrWidth, fm, nsnull, &dxSqr);
 
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index 25905425d604..76a1d71613a3 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -196,8 +196,7 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
 
   aRenderingContext.SetFont(baseFrame->GetStyleFont()->mFont,
                             aPresContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   // get x-height (an ex)
   nscoord xHeight;
diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp
index 51053b876370..eb33261c017e 100644
--- a/layout/mathml/nsMathMLmtableFrame.cpp
+++ b/layout/mathml/nsMathMLmtableFrame.cpp
@@ -639,8 +639,7 @@ nsMathMLmtableOuterFrame::Reflow(nsPresContext*          aPresContext,
       // XXX should instead use style data from the row of reference here ?
       aReflowState.rendContext->SetFont(GetStyleFont()->mFont,
                                         aPresContext->GetUserFontSet());
-      nsCOMPtr<nsIFontMetrics> fm;
-      aReflowState.rendContext->GetFontMetrics(*getter_AddRefs(fm));
+      nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
       nscoord axisHeight;
       GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);
       if (rowFrame) {
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index e82975129839..9156efa60b2f 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -281,8 +281,7 @@ nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index 3eb2186c5308..875f2646bc1c 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -323,8 +323,7 @@ nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm;
-  aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
+  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/svg/base/src/nsSVGIntegrationUtils.cpp b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
index febff4989e7a..8c962d0f80f5 100644
--- a/layout/svg/base/src/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
@@ -219,7 +219,7 @@ public:
                      const nsIntRect* aDirtyRect)
   {
     nsIRenderingContext* ctx = aContext->GetRenderingContext(aTarget);
-    nsIRenderingContext::AutoPushTranslation push(ctx, -mOffset.x, -mOffset.y);
+    nsIRenderingContext::AutoPushTranslation push(ctx, -mOffset);
     mInnerList->PaintForFrame(mBuilder, ctx, mFrame, nsDisplayList::PAINT_DEFAULT);
   }
 
@@ -286,7 +286,7 @@ nsSVGIntegrationUtils::PaintFramesWithEffects(nsIRenderingContext* aCtx,
   nsRect userSpaceRect = GetNonSVGUserSpace(firstFrame) + aBuilder->ToReferenceFrame(firstFrame);
   PRInt32 appUnitsPerDevPixel = aEffectsFrame->PresContext()->AppUnitsPerDevPixel();
   userSpaceRect = userSpaceRect.ToNearestPixels(appUnitsPerDevPixel).ToAppUnits(appUnitsPerDevPixel);
-  aCtx->Translate(userSpaceRect.x, userSpaceRect.y);
+  aCtx->Translate(userSpaceRect.TopLeft());
 
   gfxMatrix matrix = GetInitialMatrix(aEffectsFrame);
 
@@ -319,7 +319,7 @@ nsSVGIntegrationUtils::PaintFramesWithEffects(nsIRenderingContext* aCtx,
     gfx->SetMatrix(savedCTM);
     aInnerList->PaintForFrame(aBuilder, aCtx, aEffectsFrame,
                               nsDisplayList::PAINT_DEFAULT);
-    aCtx->Translate(userSpaceRect.x, userSpaceRect.y);
+    aCtx->Translate(userSpaceRect.TopLeft());
   }
 
   if (clipPathFrame && isTrivialClip) {
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index e3ba27c08b4c..1d99c9aaeb2e 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -553,7 +553,7 @@ nsSVGOuterSVGFrame::Paint(const nsDisplayListBuilder* aBuilder,
   nsRect clipRect;
   clipRect.IntersectRect(aDirtyRect, viewportRect);
   aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
-  aRenderingContext.Translate(viewportRect.x, viewportRect.y);
+  aRenderingContext.Translate(viewportRect.TopLeft());
   nsRect dirtyRect = clipRect - viewportOffset;
 
 #if defined(DEBUG) && defined(SVG_DEBUG_PAINT_TIMING)
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 0c03ffceed1f..ca49c3f7d5f1 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -339,7 +339,7 @@ nsTableCellFrame::DecorateForSelection(nsIRenderingContext& aRenderingContext,
         bordercolor = EnsureDifferentColors(bordercolor,
                                             GetStyleBackground()->mBackgroundColor);
         nsIRenderingContext::AutoPushTranslation
-            translate(&aRenderingContext, aPt.x, aPt.y);
+            translate(&aRenderingContext, aPt);
         nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
 
         aRenderingContext.SetColor(bordercolor);
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 35c513bef197..7b89760227fd 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1369,7 +1369,7 @@ nsTableFrame::PaintTableBorderBackground(nsIRenderingContext& aRenderingContext,
     else {
       // XXX we should probably get rid of this translation at some stage
       // But that would mean modifying PaintBCBorders, ugh
-      nsIRenderingContext::AutoPushTranslation translate(&aRenderingContext, aPt.x, aPt.y);
+      nsIRenderingContext::AutoPushTranslation translate(&aRenderingContext, aPt);
       PaintBCBorders(aRenderingContext, aDirtyRect - aPt);
     }
   }
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index d9f3ece1f044..64a7044b3a05 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -655,11 +655,10 @@ nsTextBoxFrame::CalculateUnderline(nsIRenderingContext& aRenderingContext)
                                     mAccessKeyInfo->mAccessWidth);
 
          nscoord offset, baseline;
-         nsIFontMetrics *metrics;
-         aRenderingContext.GetFontMetrics(metrics);
+         nsCOMPtr<nsIFontMetrics> metrics
+             = aRenderingContext.GetFontMetrics();
          metrics->GetUnderline(offset, mAccessKeyInfo->mAccessUnderlineSize);
          metrics->GetMaxAscent(baseline);
-         NS_RELEASE(metrics);
          mAccessKeyInfo->mAccessOffset = baseline - offset;
     }
 }
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index 518182dd0bb8..5d4532840a06 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -1501,8 +1501,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   // setup to draw into the correct port
-  nsCOMPtr<nsIDeviceContext> dctx;
-  aContext->GetDeviceContext(*getter_AddRefs(dctx));
+  nsCOMPtr<nsIDeviceContext> dctx = aContext->GetDeviceContext();
   PRInt32 p2a = dctx->AppUnitsPerDevPixel();
 
   gfxRect nativeDirtyRect(aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 0f827a3671b7..e972fc49b402 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -1136,8 +1136,7 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsIRenderingContext* aContext,
     {
       // Just include our border, and let the box code augment the size.
 
-      nsCOMPtr<nsIDeviceContext> dc;
-      aContext->GetDeviceContext(*getter_AddRefs(dc));
+      nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
 
       nsIntMargin border;
       nsNativeThemeGTK::GetWidgetBorder(dc, aFrame, aWidgetType, &border);
diff --git a/widget/src/qt/nsNativeThemeQt.h b/widget/src/qt/nsNativeThemeQt.h
index 69ae36fb890c..f22ffffd1dd5 100644
--- a/widget/src/qt/nsNativeThemeQt.h
+++ b/widget/src/qt/nsNativeThemeQt.h
@@ -112,8 +112,7 @@ private:
                                        const nsRect& aClipRect);
 
   inline PRInt32 GetAppUnitsPerDevPixel(nsIRenderingContext* aContext){
-    nsCOMPtr<nsIDeviceContext> dctx = nsnull;
-    aContext->GetDeviceContext(*getter_AddRefs(dctx));
+    nsCOMPtr<nsIDeviceContext> dctx = aContext->GetDeviceContext();
     return dctx->AppUnitsPerDevPixel();
   }
 
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index cb5271522e89..9247fc2dd242 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1246,8 +1246,7 @@ nsNativeThemeWin::DrawWidgetBackground(nsIRenderingContext* aContext,
   if (NS_FAILED(rv))
     return rv;
 
-  nsCOMPtr<nsIDeviceContext> dc;
-  aContext->GetDeviceContext(*getter_AddRefs(dc));
+  nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
   gfxFloat p2a = gfxFloat(dc->AppUnitsPerDevPixel());
   RECT widgetRect;
   RECT clipRect;
@@ -3115,8 +3114,7 @@ nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsIRenderingContext* aCon
   if (NS_FAILED(rv))
     return rv;
 
-  nsCOMPtr<nsIDeviceContext> dc;
-  aContext->GetDeviceContext(*getter_AddRefs(dc));
+  nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
   gfxFloat p2a = gfxFloat(dc->AppUnitsPerDevPixel());
   RECT widgetRect;
   gfxRect tr(aRect.x, aRect.y, aRect.width, aRect.height),

From cbabd3ce0f73b41dc4c0873702f3ad96cce39f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=BCchler?= <jan@kuechler-wuppertal.de>
Date: Thu, 7 Apr 2011 18:04:39 -0700
Subject: [PATCH 140/509] Bug 266236 part 2: Merge nsIRenderingContext with
 nsThebesRenderingContext (the sole implementation) and remove XPCOM vestiges.
 Non-mechanical fixups. DOES NOT COMPILE without part 3.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : 9e149d30da5222d072071043d30d83033fec9787
---
 gfx/src/Makefile.in                           |   4 +-
 gfx/src/nsGfxCIID.h                           |   4 -
 gfx/src/nsIDeviceContext.h                    |   6 +-
 gfx/src/nsIRenderingContext.h                 | 830 ------------------
 gfx/src/nsIThebesFontMetrics.h                |   6 +-
 ...ringContext.cpp => nsRenderingContext.cpp} | 488 +++++-----
 gfx/src/nsRenderingContext.h                  | 454 ++++++++++
 gfx/src/nsSystemFontsAndroid.cpp              |   4 -
 gfx/src/nsSystemFontsAndroid.h                |   3 +-
 gfx/src/nsSystemFontsGTK2.cpp                 |   5 +-
 gfx/src/nsSystemFontsGTK2.h                   |   2 +
 gfx/src/nsSystemFontsMac.mm                   |   4 +-
 gfx/src/nsSystemFontsOS2.cpp                  |   8 +-
 gfx/src/nsSystemFontsOS2.h                    |   8 +-
 gfx/src/nsSystemFontsQt.cpp                   |   7 +-
 gfx/src/nsSystemFontsQt.h                     |   5 +-
 gfx/src/nsSystemFontsWin.cpp                  |   6 +-
 gfx/src/nsSystemFontsWin.h                    |   2 +-
 gfx/src/nsThebesGfxFactory.cpp                |   5 -
 gfx/src/nsThebesRenderingContext.h            | 291 ------
 widget/src/cocoa/nsChildView.mm               |   1 -
 widget/src/windows/nsWindow.cpp               |   3 -
 widget/src/windows/nsWindowGfx.cpp            |   9 -
 23 files changed, 725 insertions(+), 1430 deletions(-)
 delete mode 100644 gfx/src/nsIRenderingContext.h
 rename gfx/src/{nsThebesRenderingContext.cpp => nsRenderingContext.cpp} (72%)
 create mode 100644 gfx/src/nsRenderingContext.h
 delete mode 100644 gfx/src/nsThebesRenderingContext.h

diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 1be54bef9e1b..de4d3bcfedb9 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -72,7 +72,7 @@ EXPORTS	= \
 	nsSize.h \
 	nsMargin.h \
 	nsTransform2D.h \
-	nsIRenderingContext.h \
+	nsRenderingContext.h \
 	nsIFontMetrics.h \
 	nsIDeviceContext.h \
 	nsGfxCIID.h \
@@ -99,7 +99,7 @@ CPPSRCS = \
         nsThebesDeviceContext.cpp \
         nsThebesRegion.cpp \
         nsThebesGfxFactory.cpp \
-        nsThebesRenderingContext.cpp \
+        nsRenderingContext.cpp \
         nsThebesFontMetrics.cpp \
         nsThebesFontEnumerator.cpp \
        $(NULL)
diff --git a/gfx/src/nsGfxCIID.h b/gfx/src/nsGfxCIID.h
index 76a8229f4163..630cba013327 100644
--- a/gfx/src/nsGfxCIID.h
+++ b/gfx/src/nsGfxCIID.h
@@ -46,10 +46,6 @@
 { 0x6049b260, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
-#define NS_RENDERING_CONTEXT_CID \
-{ 0x6049b261, 0xc1e6, 0x11d1, \
-{ 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
 #define NS_DEVICE_CONTEXT_CID \
 { 0x6049b262, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
diff --git a/gfx/src/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
index 59d3b559c093..4e0c55194956 100644
--- a/gfx/src/nsIDeviceContext.h
+++ b/gfx/src/nsIDeviceContext.h
@@ -42,9 +42,8 @@
 #include "nsISupports.h"
 #include "nsCoord.h"
 #include "nsRect.h"
-#include "nsIRenderingContext.h"
-// XXX we need only gfxTypes.h, but we cannot include it directly.
-#include "gfxPoint.h"
+#include "gfxTypes.h"
+#include "nsStringFwd.h"
 
 class nsIView;
 class nsIFontMetrics;
@@ -52,6 +51,7 @@ class nsIWidget;
 class nsIDeviceContextSpec;
 class nsIAtom;
 class gfxUserFontSet;
+class nsRenderingContext;
 
 struct nsFont;
 
diff --git a/gfx/src/nsIRenderingContext.h b/gfx/src/nsIRenderingContext.h
deleted file mode 100644
index 44dfbc8856b7..000000000000
--- a/gfx/src/nsIRenderingContext.h
+++ /dev/null
@@ -1,830 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
- *   Leon Sha <leon.sha@sun.com>
- *   Boris Zbarsky <bzbarsky@mit.edu>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIRenderingContext_h___
-#define nsIRenderingContext_h___
-
-#include "nscore.h"
-#include "nsCOMPtr.h"
-#include "nsISupports.h"
-#include "nsColor.h"
-#include "nsCoord.h"
-#include "nsRect.h"
-#include "nsPoint.h"
-#include "nsSize.h"
-#include <stdio.h>
-
-class nsIWidget;
-class nsIFontMetrics;
-class nsTransform2D;
-class nsString;
-class nsIDeviceContext;
-class nsIntRegion;
-class nsIAtom;
-
-struct nsFont;
-struct nsTextDimensions;
-class gfxUserFontSet;
-#ifdef MOZ_MATHML
-struct nsBoundingMetrics;
-#endif
-
-class gfxASurface;
-class gfxContext;
-
-/* gfx2 */
-class imgIContainer;
-
-//cliprect/region combination methods
-
-typedef enum
-{
-  nsClipCombine_kIntersect = 0,
-  nsClipCombine_kUnion = 1,
-  nsClipCombine_kSubtract = 2,
-  nsClipCombine_kReplace = 3
-} nsClipCombine;
-
-//linestyles
-typedef enum
-{
-  nsLineStyle_kNone   = 0,
-  nsLineStyle_kSolid  = 1,
-  nsLineStyle_kDashed = 2,
-  nsLineStyle_kDotted = 3
-} nsLineStyle;
-
-typedef enum
-{
-  nsPenMode_kNone   = 0,
-  nsPenMode_kInvert = 1
-} nsPenMode;
-
-
-// IID for the nsIRenderingContext interface
-#define NS_IRENDERING_CONTEXT_IID \
-{ 0xefbfeb6c, 0x937e, 0x4889, \
-  { 0x92, 0x46, 0x16, 0xc0, 0xe8, 0x4b, 0xfa, 0xae } }
-
-//----------------------------------------------------------------------
-
-// RenderingContext interface
-class nsIRenderingContext : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRENDERING_CONTEXT_IID)
-
-  //TBD: bind/unbind, transformation of scalars (hacky), 
-  //potential drawmode for selection, polygons. MMP
-
-  /**
-   * Initialize the RenderingContext
-   * @param aContext the device context to use.
-   * @param aWidget the widget to hook up to
-   * @result The result of the initialization, NS_Ok if no errors
-   */
-  NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWidget) = 0;
-
-  /**
-   * Initialize the RenderingContext
-   * @param aContext the device context to use for the drawing.
-   * @param aThebesSurface the Thebes gfxASurface to which to draw
-   * @result The result of the initialization, NS_Ok if no errors
-   */
-  NS_IMETHOD Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface) = 0;
-
-  /**
-   * Initialize the RenderingContext
-   * @param aContext the device context to use for the drawing.
-   * @param aThebesContext an existing thebes context to use for the drawing
-   * @result The result of the initialization, NS_Ok if no errors
-   */
-  NS_IMETHOD Init(nsIDeviceContext* aContext, gfxContext* aThebesContext) = 0;
-
-  /**
-   * Get the DeviceContext that this RenderingContext was initialized
-   * with.
-   * @result the device context
-   */
-  virtual already_AddRefed<nsIDeviceContext> GetDeviceContext() = 0;
-
-  /**
-   * Save a graphical state onto a stack.
-   */
-  NS_IMETHOD PushState(void) = 0;
-
-  /**
-   * Get and and set RenderingContext to this graphical state
-   */
-  NS_IMETHOD PopState(void) = 0;
-
-  // XXX temporary
-  NS_IMETHOD PushFilter(const nsRect& aRect, PRBool aAreaIsOpaque, float aOpacity)
-  { return NS_ERROR_NOT_IMPLEMENTED; }
-  NS_IMETHOD PopFilter()
-  { return NS_ERROR_NOT_IMPLEMENTED; }
-
-  /**
-   * Sets the clipping for the RenderingContext to the passed in rectangle.
-   * The rectangle is in app units!
-   * @param aRect The rectangle to set the clipping rectangle to
-   * @param aCombine how to combine this rect with the current clip region.
-   *        see the bottom of nsIRenderingContext.h
-   */
-  NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine) = 0;
-
-  /**
-   * Sets the line style for the RenderingContext 
-   * @param aLineStyle The line style
-   * @return NS_OK if the line style is correctly set
-   */
-  NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle) = 0;
-
-  /**
-   * Sets the clipping for the RenderingContext to the passed in region.
-   * The region is in device coordinates!
-   * @param aRegion The region to set the clipping area to, IN DEVICE COORDINATES
-   * @param aCombine how to combine this region with the current clip region.
-   *        see the bottom of nsIRenderingContext.h
-   */
-  NS_IMETHOD SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine) = 0;
-
-  /**
-   * Sets the forground color for the RenderingContext
-   * @param aColor The color to set the RenderingContext to
-   */
-  NS_IMETHOD SetColor(nscolor aColor) = 0;
-
-  /**
-   * Get the forground color for the RenderingContext
-   * @return The current forground color of the RenderingContext
-   */
-  NS_IMETHOD GetColor(nscolor &aColor) const = 0;
-
-  /**
-   * Sets the font for the RenderingContext
-   * @param aFont The font to use in the RenderingContext
-   */
-  NS_IMETHOD SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                     gfxUserFontSet *aUserFontSet) = 0;
-
-  /**
-   * Sets the font for the RenderingContext, without language info
-   * @param aFont The font to use in the RenderingContext
-   */
-  NS_IMETHOD SetFont(const nsFont& aFont,
-                     gfxUserFontSet *aUserFontSet) = 0;
-
-  /**
-   * Sets the font for the RenderingContext
-   * @param aFontMetric The font metrics representing the
-   *        font to use in the RenderingContext
-   */
-  NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics) = 0;
-
-  /**
-   * Get the current fontmetrics for the RenderingContext
-   * @return The current font of the RenderingContext
-   */
-  virtual already_AddRefed<nsIFontMetrics> GetFontMetrics() = 0;
-
-  /**
-   * Add in a translate to the RenderingContext's transformation matrix
-   * @param aPt The point to translate to
-   */
-  NS_IMETHOD Translate(const nsPoint& aPt) = 0;
-
-  /**
-   * Set the translation compoennt of the current transformation matrix.
-   * Useful to set it to a known pixel value without incurring roundoff
-   * errors.
-   */
-  NS_IMETHOD SetTranslation(const nsPoint& aPt) = 0;
-
-  /**
-   *  Add in a scale to the RenderingContext's transformation matrix
-   * @param aX The horizontal scale
-   * @param aY The vertical scale
-   */
-  NS_IMETHOD Scale(float aSx, float aSy) = 0;
-
-  struct PushedTranslation {
-    float mSavedX, mSavedY;
-  };
-
-  class AutoPushTranslation {
-    nsIRenderingContext* mCtx;
-    PushedTranslation mPushed;
-  public:
-    AutoPushTranslation(nsIRenderingContext* aCtx, const nsPoint& aPt)
-      : mCtx(aCtx) {
-      mCtx->PushTranslation(&mPushed);
-      mCtx->Translate(aPt);
-    }
-    ~AutoPushTranslation() {
-      mCtx->PopTranslation(&mPushed);
-    }
-  };
-
-  NS_IMETHOD PushTranslation(PushedTranslation* aState) = 0;
-
-  NS_IMETHOD PopTranslation(PushedTranslation* aState) = 0;
-
-  /**
-   * Get the current transformation matrix for the RenderingContext
-   * @return The transformation matrix for the RenderingContext
-   */
-  virtual nsTransform2D* GetCurrentTransform() = 0;
-
-  /**
-   * Draw a line
-   * @param aStartPt starting point
-   * @param aEndPt ending point
-   */
-  NS_IMETHOD DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt) = 0;
-
-  /**
-   * Draw a line
-   * @param aX0 starting horizontal coord in twips
-   * @param aY0 starting vertical coord in twips
-   * @param aX1 end horiztonal coord in twips
-   * @param aY1 end vertical coord in twips
-   */
-  NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1) = 0;
-
-  /**
-   * Draw a rectangle
-   * @param aRect The rectangle to draw
-   */
-  NS_IMETHOD DrawRect(const nsRect& aRect) = 0;
-
-  /**
-   * Draw a rectangle
-   * @param aX Horizontal left Coordinate in twips
-   * @param aY Vertical top Coordinate in twips
-   * @param aWidth Width of rectangle in twips
-   * @param aHeight Height of rectangle in twips
-   */
-  NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) = 0;
-
-  /**
-   * Fill a rectangle in the current foreground color
-   * @param aRect The rectangle to draw
-   */
-  NS_IMETHOD FillRect(const nsRect& aRect) = 0;
-
-  /**
-   * Fill a rectangle in the current foreground color
-   * @param aX Horizontal left Coordinate in twips
-   * @param aY Vertical top Coordinate in twips
-   * @param aWidth Width of rectangle in twips
-   * @param aHeight Height of rectangle in twips
-   */
-  NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) = 0;
-
-  /**
-   * XOR Invert a rectangle in the current foreground color
-   * @param aRect The rectangle to draw
-   */
-  NS_IMETHOD InvertRect(const nsRect& aRect) = 0;
-
-  /**
-   * XOR Invert a rectangle in the current foreground color
-   * @param aX Horizontal left Coordinate in twips
-   * @param aY Vertical top Coordinate in twips
-   * @param aWidth Width of rectangle in twips
-   * @param aHeight Height of rectangle in twips
-   */
-  NS_IMETHOD InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) = 0;
-
-  /**
-   * Fill a poly in the current foreground color
-   * @param aPoints points to use for the drawing, last must equal first
-   * @param aNumPonts number of points in the polygon
-   */
-  NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints) = 0;
-
-  /**
-   * Draw an ellipse in the current foreground color
-   * @param aRect The rectangle define bounds of ellipse to draw
-   */
-  NS_IMETHOD DrawEllipse(const nsRect& aRect) = 0;
-
-  /**
-   * Draw an ellipse in the current foreground color
-   * @param aX Horizontal left Coordinate in twips
-   * @param aY Vertical top Coordinate in twips
-   * @param aWidth Width of horizontal axis in twips
-   * @param aHeight Height of vertical axis in twips
-   */
-  NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) = 0;
-
-  /**
-   * Fill an ellipse in the current foreground color
-   * @param aRect The rectangle define bounds of ellipse to draw
-   */
-  NS_IMETHOD FillEllipse(const nsRect& aRect) = 0;
-
-  /**
-   * Fill an ellipse in the current foreground color
-   * @param aX Horizontal left Coordinate in twips
-   * @param aY Vertical top Coordinate in twips
-   * @param aWidth Width of horizontal axis in twips
-   * @param aHeight Height of vertical axis in twips
-   */
-  NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) = 0;
-
-  /**
-   * Returns the width (in app units) of an 8-bit character
-   * If no font has been Set, the results are undefined.
-   * @param aC character to measure
-   * @param aWidth out parameter for width
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(char aC, nscoord &aWidth) = 0;
-
-  /**
-   * Returns the width (in app units) of a unicode character
-   * If no font has been Set, the results are undefined.
-   * @param aC character to measure
-   * @param aWidth out parameter for width
-   * @param aFontID an optional out parameter used to store a
-   *        font identifier that can be passed into the DrawString()
-   *        methods to speed rendering
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
-                      PRInt32 *aFontID = nsnull) = 0;
-
-  /**
-   * Returns the width (in app units) of an nsString
-   * If no font has been Set, the results are undefined.
-   * @param aString string to measure
-   * @param aWidth out parameter for width
-   * @param aFontID an optional out parameter used to store a
-   *        font identifier that can be passed into the DrawString()
-   *        methods to speed rendering
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
-                      PRInt32 *aFontID = nsnull) = 0;
-
-  /**
-   * Returns the width (in app units) of an 8-bit character string
-   * If no font has been Set, the results are undefined.
-   * @param aString string to measure
-   * @param aWidth out parameter for width
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(const char* aString, nscoord& aWidth) = 0;
-
-  /**
-   * Returns the width (in app units) of an 8-bit character string
-   * If no font has been Set, the results are undefined.
-   * @param aString string to measure
-   * @param aLength number of characters in string
-   * @param aWidth out parameter for width
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(const char* aString, PRUint32 aLength,
-                      nscoord& aWidth) = 0;
-
-  /**
-   * Returns the width (in app units) of a Unicode character string
-   * If no font has been Set, the results are undefined.
-   * @param aString string to measure
-   * @param aLength number of characters in string
-   * @param aWidth out parameter for width
-   * @param aFontID an optional out parameter used to store a
-   *        font identifier that can be passed into the DrawString()
-   *        methods to speed rendering
-   * @return error status
-   */
-  NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength,
-                      nscoord &aWidth, PRInt32 *aFontID = nsnull) = 0;
-
-  /**
-   * Returns the dimensions of a string, i.e., the overall extent of a string
-   * whose rendering may involve switching between different fonts that have
-   * different metrics.
-   * @param aString string to measure
-   * @param aLength number of characters in string
-   * @param aFontID an optional out parameter used to store a
-   *        font identifier that can be passed into the DrawString()
-   *        methods to speed measurements
-   * @return aDimensions struct that contains the extent of the string (see below)
-   */
-  NS_IMETHOD GetTextDimensions(const char* aString, PRUint32 aLength,
-                               nsTextDimensions& aDimensions) = 0;
-  NS_IMETHOD GetTextDimensions(const PRUnichar* aString, PRUint32 aLength,
-                               nsTextDimensions& aDimensions, PRInt32* aFontID = nsnull) = 0;
-
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
-  /**
-   * Given an available width and an array of break points,
-   * returns the dimensions (in app units) of the text that fit and
-   * the number of characters that fit. The number of characters
-   * corresponds to an entry in the break array.
-   * If no font has been set, the results are undefined.
-   * @param aString, string to measure
-   * @param aLength, number of characters in string
-   * @param aAvailWidth, the available space in which the text must fit
-   * @param aBreaks, array of places to break. Specified as offsets from the
-   *          start of the string
-   * @param aNumBreaks, the number of entries in the break array. The last
-   *          entry in the break array must equal the length of the string
-   * @param aDimensions, out parameter for the dimensions, the ascent and descent
-   *           of the last word are left out to allow possible line-breaking before
-   *           the last word. However, the width of the last word is included.
-   * @param aNumCharsFit, the number of characters that fit in the available space
-   * @param aLastWordDimensions, dimensions of the last word, the width field,
-   *             dimensions.width, should be -1 for an unknown width. But the 
-   *             ascent and descent are expected to be known.
-   * @param aFontID, an optional out parameter used to store a
-   *        font identifier that can be passed into the DrawString()
-   *        methods to speed rendering
-   * @return error status
-   */
-  NS_IMETHOD GetTextDimensions(const char*       aString,
-                               PRInt32           aLength,
-                               PRInt32           aAvailWidth,
-                               PRInt32*          aBreaks,
-                               PRInt32           aNumBreaks,
-                               nsTextDimensions& aDimensions,
-                               PRInt32&          aNumCharsFit,
-                               nsTextDimensions& aLastWordDimensions,
-                               PRInt32*          aFontID = nsnull) = 0;
-
-  NS_IMETHOD GetTextDimensions(const PRUnichar*  aString,
-                               PRInt32           aLength,
-                               PRInt32           aAvailWidth,
-                               PRInt32*          aBreaks,
-                               PRInt32           aNumBreaks,
-                               nsTextDimensions& aDimensions,
-                               PRInt32&          aNumCharsFit,
-                               nsTextDimensions& aLastWordDimensions,
-                               PRInt32*          aFontID = nsnull) = 0;
-#endif
-
-  /**
-   * Draw a string in the RenderingContext
-   * @param aString The string to draw
-   * @param aLength The length of the aString
-   * @param aX Horizontal starting point of baseline
-   * @param aY Vertical starting point of baseline.
-   * @param aSpacing inter-character spacing to apply
-   */
-  NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        const nscoord* aSpacing = nsnull) = 0;
-
-  /**
-   * Draw a string in the RenderingContext
-   * @param aString A PRUnichar of the string
-   * @param aLength The length of the aString
-   * @param aX Horizontal starting point of baseline
-   * @param aY Vertical starting point of baseline.
-   * @param aFontID an optional parameter used to speed font
-   *        selection for complex unicode strings. the value
-   *        passed is returned by the DrawString() methods.
-   * @param aSpacing inter-character spacing to apply
-   */
-  NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        PRInt32 aFontID = -1,
-                        const nscoord* aSpacing = nsnull) = 0;
-
-  /**
-   * Draw a string in the RenderingContext
-   * @param aString A nsString of the string
-   * @param aX Horizontal starting point of baseline
-   * @param aY Vertical starting point of baseline.
-   * @param aFontID an optional parameter used to speed font
-   *        selection for complex unicode strings. the value
-   *        passed is returned by the DrawString() methods.
-   * @param aSpacing inter-character spacing to apply
-   */
-  NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                        PRInt32 aFontID = -1,
-                        const nscoord* aSpacing = nsnull) = 0;
-
-  enum GraphicDataType {
-    NATIVE_CAIRO_CONTEXT = 1,
-    NATIVE_GDK_DRAWABLE = 2,
-    NATIVE_WINDOWS_DC = 3,
-    NATIVE_MAC_THING = 4,
-    NATIVE_THEBES_CONTEXT = 5,
-    NATIVE_OS2_PS = 6
-  };
-  /**
-   * Retrieve the native graphic data given by aType. Return
-   * nsnull if not available.
-   */
-  virtual void* GetNativeGraphicData(GraphicDataType aType) = 0;
-
-#ifdef MOZ_MATHML
-  /**
-   * Returns bounding metrics (in app units) of an 8-bit character string
-   * @param aString string to measure
-   * @param aLength number of characters in string
-   * @return aBoundingMetrics struct that contains various metrics (see below)
-   * @return error status
-   */
-  NS_IMETHOD
-  GetBoundingMetrics(const char*        aString,
-                     PRUint32           aLength,
-                     nsBoundingMetrics& aBoundingMetrics) = 0;
-  /**
-   * Returns bounding metrics (in app units) of an Unicode character string
-   * @param aString string to measure
-   * @param aLength number of characters in string
-   * @param aFontID an optional out parameter used to store a
-   *        font identifier that can be passed into the GetBoundingMetrics()
-   *        methods to speed measurements
-   * @return aBoundingMetrics struct that contains various metrics (see below)
-   * @return error status
-   */
-  NS_IMETHOD
-  GetBoundingMetrics(const PRUnichar*   aString,
-                     PRUint32           aLength,
-                     nsBoundingMetrics& aBoundingMetrics,
-                     PRInt32*           aFontID = nsnull) = 0;
-#endif
-
-
-  /**
-   * Let the device context know whether we want text reordered with
-   * right-to-left base direction
-   */
-  NS_IMETHOD SetRightToLeftText(PRBool aIsRTL) = 0;
-
-  /**
-   * This sets the direction of the text; all characters should be
-   * overridden to have this direction.
-   */
-  virtual void SetTextRunRTL(PRBool aIsRTL) = 0;
-
-  /**
-   * Find the closest cursor position for a given x coordinate.
-   *
-   * This will find the closest byte index for a given x coordinate.
-   * This takes into account grapheme clusters and bidi text.
-   *
-   * @param aText Text on which to operate.
-   * @param aLength Length of the text.
-   * @param aPt the x/y position in the string to check.
-   *
-   * @return Index where the cursor falls.  If the return is zero,
-   *   it's before the first character, if it falls off the end of
-   *   the string it's the length of the string + 1.
-   *
-   */
-  virtual PRInt32 GetPosition(const PRUnichar *aText,
-                              PRUint32 aLength,
-                              nsPoint aPt) = 0;
-
-  /**
-   * Get the width for the specific range of a given string.
-   *
-   * This function is similar to other GetWidth functions, except that
-   * it gets the width for a part of the string instead of the entire
-   * string.  This is useful when you're interested in finding out the
-   * length of a chunk in the middle of the string.  Lots of languages
-   * require you to include surrounding information to accurately
-   * determine the length of a substring.
-   *
-   * @param aText Text on which to operate
-   * @param aLength Length of the text
-   * @param aStart Start index into the string
-   * @param aEnd End index into the string (inclusive)
-   * @param aWidth Returned with in app coordinates
-   *
-   */
-  NS_IMETHOD GetRangeWidth(const PRUnichar *aText,
-                           PRUint32 aLength,
-                           PRUint32 aStart,
-                           PRUint32 aEnd,
-                           PRUint32 &aWidth) = 0;
-
-  /**
-   * Get the width for the specific range of a given string.
-   *
-   * Same as GetRangeWidth for PRUnichar, but takes a char * as the
-   * text argument.
-   *
-   */
-  NS_IMETHOD GetRangeWidth(const char *aText,
-                           PRUint32 aLength,
-                           PRUint32 aStart,
-                           PRUint32 aEnd,
-                           PRUint32 &aWidth) = 0;
-
-  /**
-   * Render an encapsulated postscript object onto the current rendering
-   * surface.
-   *
-   * The EPS object must conform to the EPSF standard. See Adobe
-   * specification #5002, "Encapsulated PostScript File Format Specification"
-   * at <http://partners.adobe.com/asn/developer/pdfs/tn/5002.EPSF_Spec.pdf>.
-   * In particular, the EPS object must contain a BoundingBox comment.
-   *
-   * @param aRect  Rectangle in which to render the EPSF.
-   * @param aDataFile - plugin data stored in a file
-   * @return NS_OK for success, or a suitable error value.
-   *         NS_ERROR_NOT_IMPLEMENTED is returned if the rendering context
-   *         doesn't support rendering EPSF, 
-   */
-  NS_IMETHOD RenderEPS(const nsRect& aRect, FILE *aDataFile) = 0;
-
-  /**
-   * Return the Thebes gfxContext associated with this nsIRenderingContext.
-   */
-  virtual gfxContext *ThebesContext() = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIRenderingContext, NS_IRENDERING_CONTEXT_IID)
-
-//flags for copy CopyOffScreenBits
-
-//when performing the blit, use the region, if any,
-//that exists in the source drawingsurface as a
-//blit mask.
-#define NS_COPYBITS_USE_SOURCE_CLIP_REGION  0x0001
-
-//transform the source offsets by the xform in the
-//rendering context
-#define NS_COPYBITS_XFORM_SOURCE_VALUES     0x0002
-
-//transform the destination rect by the xform in the
-//rendering context
-#define NS_COPYBITS_XFORM_DEST_VALUES       0x0004
-
-//this is basically a hack and is used by callers
-//who have selected an alternate drawing surface and
-//wish the copy to happen to that buffer rather than
-//the "front" buffer. i'm not proud of this. MMP
-//XXX: This is no longer needed by the XPCODE. It will
-//be removed once all of the platform specific nsRenderingContext's
-//stop using it.
-#define NS_COPYBITS_TO_BACK_BUFFER          0x0008
-
-/* Struct used to represent the overall extent of a string
-   whose rendering may involve switching between different
-   fonts that have different metrics.
-*/
-struct nsTextDimensions {
-  // max ascent amongst all the fonts needed to represent the string
-  nscoord ascent;
-
-  // max descent amongst all the fonts needed to represent the string
-  nscoord descent;
-
-  // width of the string
-  nscoord width;
-
-
-  nsTextDimensions()
-  {
-    Clear();
-  }
-
-  /* Set all member data to zero */
-  void 
-  Clear() {
-    ascent = descent = width = 0;
-  }
-
-  /* Sum with another dimension */
-  void 
-  Combine(const nsTextDimensions& aOther) {
-    if (ascent < aOther.ascent) ascent = aOther.ascent;
-    if (descent < aOther.descent) descent = aOther.descent;   
-    width += aOther.width;
-  }
-};
-
-#ifdef MOZ_MATHML
-/* Struct used for accurate measurements of a string in order
-   to allow precise positioning when processing MathML.
-*/
-struct nsBoundingMetrics {
-
-  ///////////
-  // Metrics that _exactly_ enclose the text:
-
-  // The character coordinate system is the one used on X Windows:
-  // 1. The origin is located at the intersection of the baseline
-  //    with the left of the character's cell.
-  // 2. All horizontal bearings are oriented from left to right.
-  // 3. The ascent is oriented from bottom to top (being 0 at the orgin).
-  // 4. The descent is oriented from top to bottom (being 0 at the origin).
-
-  // Note that Win32/Mac/PostScript use a different convention for
-  // the descent (all vertical measurements are oriented from bottom
-  // to top on these palatforms). Make sure to flip the sign of the
-  // descent on these platforms for cross-platform compatibility.
-
-  // Any of the following member variables listed here can have 
-  // positive or negative value.
-
-  nscoord leftBearing;
-       /* The horizontal distance from the origin of the drawing
-          operation to the left-most part of the drawn string. */
-
-  nscoord rightBearing;
-       /* The horizontal distance from the origin of the drawing
-          operation to the right-most part of the drawn string.
-          The _exact_ width of the string is therefore:
-          rightBearing - leftBearing */
-  
-  nscoord ascent;
-       /* The vertical distance from the origin of the drawing 
-          operation to the top-most part of the drawn string. */
-
-  nscoord descent;
-       /* The vertical distance from the origin of the drawing 
-          operation to the bottom-most part of the drawn string.
-          The _exact_ height of the string is therefore:
-          ascent + descent */
-
-  //////////
-  // Metrics for placing other surrounding text:
-
-  nscoord width;
-       /* The horizontal distance from the origin of the drawing
-          operation to the correct origin for drawing another string
-          to follow the current one. Depending on the font, this
-          could be greater than or less than the right bearing. */
-
-  nsBoundingMetrics() {
-    Clear();
-  }
-
-  //////////
-  // Utility methods and operators:
-
-  /* Set all member data to zero */
-  void 
-  Clear() {
-    leftBearing = rightBearing = 0;
-    ascent = descent = width = 0;
-  }
-
-  /* Append another bounding metrics */
-  void 
-  operator += (const nsBoundingMetrics& bm) {
-    if (ascent + descent == 0 && rightBearing - leftBearing == 0) {
-      ascent = bm.ascent;
-      descent = bm.descent;
-      leftBearing = width + bm.leftBearing;
-      rightBearing = width + bm.rightBearing;
-    }
-    else {
-      if (ascent < bm.ascent) ascent = bm.ascent;
-      if (descent < bm.descent) descent = bm.descent;   
-      leftBearing = PR_MIN(leftBearing, width + bm.leftBearing);
-      rightBearing = PR_MAX(rightBearing, width + bm.rightBearing);
-    }
-    width += bm.width;
-  }
-};
-#endif // MOZ_MATHML
-
-#endif /* nsIRenderingContext_h___ */
diff --git a/gfx/src/nsIThebesFontMetrics.h b/gfx/src/nsIThebesFontMetrics.h
index 7ea6629b96d4..bb9289bc7d8d 100644
--- a/gfx/src/nsIThebesFontMetrics.h
+++ b/gfx/src/nsIThebesFontMetrics.h
@@ -39,11 +39,11 @@
 #define __nsIThebesFontMetrics_h
 
 #include "nsIFontMetrics.h"
-#include "nsIRenderingContext.h"
-
-class nsThebesRenderingContext;
 
+struct nsTextDimensions;
+struct nsBoundingMetrics;
 class gfxFontGroup;
+class nsRenderingContext;
 
 class nsIThebesFontMetrics : public nsIFontMetrics {
 public:
diff --git a/gfx/src/nsThebesRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
similarity index 72%
rename from gfx/src/nsThebesRenderingContext.cpp
rename to gfx/src/nsRenderingContext.cpp
index 0460e9e1a0c4..b29198285ae6 100644
--- a/gfx/src/nsThebesRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsThebesRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsThebesDeviceContext.h"
 
 #include "nsString.h"
@@ -60,30 +60,22 @@
 #include "cairo-win32.h"
 #endif
 
-static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
-
-//////////////////////////////////////////////////////////////////////
-
 // XXXTodo: rename FORM_TWIPS to FROM_APPUNITS
 #define FROM_TWIPS(_x)  ((gfxFloat)((_x)/(mP2A)))
 #define FROM_TWIPS_INT(_x)  (NSToIntRound((gfxFloat)((_x)/(mP2A))))
 #define TO_TWIPS(_x)    ((nscoord)((_x)*(mP2A)))
 #define GFX_RECT_FROM_TWIPS_RECT(_r)   (gfxRect(FROM_TWIPS((_r).x), FROM_TWIPS((_r).y), FROM_TWIPS((_r).width), FROM_TWIPS((_r).height)))
 
-//////////////////////////////////////////////////////////////////////
-
-NS_IMPL_ISUPPORTS1(nsThebesRenderingContext, nsIRenderingContext)
-
 // Hard limit substring lengths to 8000 characters ... this lets us statically
 // size the cluster buffer array in FindSafeLength
 #define MAX_GFX_TEXT_BUF_SIZE 8000
-static PRInt32 GetMaxChunkLength(nsThebesRenderingContext* aContext)
+static PRInt32 GetMaxChunkLength(nsRenderingContext* aContext)
 {
     PRInt32 len = aContext->GetMaxStringLength();
     return PR_MIN(len, MAX_GFX_TEXT_BUF_SIZE);
 }
 
-static PRInt32 FindSafeLength(nsThebesRenderingContext* aContext,
+static PRInt32 FindSafeLength(nsRenderingContext* aContext,
                               const PRUnichar *aString, PRUint32 aLength,
                               PRUint32 aMaxChunkLength)
 {
@@ -107,7 +99,7 @@ static PRInt32 FindSafeLength(nsThebesRenderingContext* aContext,
     return len;
 }
 
-static PRInt32 FindSafeLength(nsThebesRenderingContext* aContext,
+static PRInt32 FindSafeLength(nsRenderingContext* aContext,
                               const char *aString, PRUint32 aLength,
                               PRUint32 aMaxChunkLength)
 {
@@ -115,21 +107,11 @@ static PRInt32 FindSafeLength(nsThebesRenderingContext* aContext,
     return PR_MIN(aLength, aMaxChunkLength);
 }
 
-nsThebesRenderingContext::nsThebesRenderingContext()
-  : mLineStyle(nsLineStyle_kNone)
-  , mColor(NS_RGB(0,0,0))
-{
-}
-
-nsThebesRenderingContext::~nsThebesRenderingContext()
-{
-}
-
 //////////////////////////////////////////////////////////////////////
 //// nsIRenderingContext
 
-NS_IMETHODIMP
-nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesSurface)
+nsresult
+nsRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesSurface)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesSurface %p\n", this, aContext, aThebesSurface));
 
@@ -141,8 +123,8 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesS
     return (CommonInit());
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxContext *aThebesContext)
+nsresult
+nsRenderingContext::Init(nsIDeviceContext* aContext, gfxContext *aThebesContext)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesContext %p\n", this, aContext, aThebesContext));
 
@@ -154,8 +136,8 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxContext *aThebesCo
     return (CommonInit());
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget)
+nsresult
+nsRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p widget %p\n", this, aContext, aWidget));
 
@@ -173,8 +155,8 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget)
     return (CommonInit());
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::CommonInit(void)
+nsresult
+nsRenderingContext::CommonInit(void)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::CommonInit\n", this));
 
@@ -186,14 +168,14 @@ nsThebesRenderingContext::CommonInit(void)
 }
 
 already_AddRefed<nsIDeviceContext>
-nsThebesRenderingContext::GetDeviceContext()
+nsRenderingContext::GetDeviceContext()
 {
     NS_IF_ADDREF(mDeviceContext);
     return mDeviceContext.get();
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PushTranslation(PushedTranslation* aState)
+nsresult
+nsRenderingContext::PushTranslation(PushedTranslation* aState)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PushTranslation\n", this));
 
@@ -202,8 +184,8 @@ nsThebesRenderingContext::PushTranslation(PushedTranslation* aState)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PopTranslation(PushedTranslation* aState)
+nsresult
+nsRenderingContext::PopTranslation(PushedTranslation* aState)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopTranslation\n", this));
 
@@ -212,8 +194,8 @@ nsThebesRenderingContext::PopTranslation(PushedTranslation* aState)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetTranslation(const nsPoint& aPt)
+nsresult
+nsRenderingContext::SetTranslation(const nsPoint& aPt)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetTranslation %d %d\n", this, aPt.x, aPt.y));
 
@@ -224,8 +206,8 @@ nsThebesRenderingContext::SetTranslation(const nsPoint& aPt)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PushState()
+nsresult
+nsRenderingContext::PushState()
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PushState\n", this));
 
@@ -233,8 +215,8 @@ nsThebesRenderingContext::PushState()
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PopState()
+nsresult
+nsRenderingContext::PopState()
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopState\n", this));
 
@@ -246,9 +228,8 @@ nsThebesRenderingContext::PopState()
 // clipping
 //
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetClipRect(const nsRect& aRect,
-                                      nsClipCombine aCombine)
+nsresult
+nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
 {
     //return NS_OK;
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetClipRect [%d,%d,%d,%d] %d\n", this, aRect.x, aRect.y, aRect.width, aRect.height, aCombine));
@@ -275,9 +256,9 @@ nsThebesRenderingContext::SetClipRect(const nsRect& aRect,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
-                                        nsClipCombine aCombine)
+nsresult
+nsRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
+                                  nsClipCombine aCombine)
 {
     // Region is in device coords, no transformation.
     // This should only be called when there is no transform in place, when we
@@ -290,7 +271,7 @@ nsThebesRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
     mThebes->IdentityMatrix();
 
     mThebes->ResetClip();
-    
+
     mThebes->NewPath();
     nsIntRegionRectIterator iter(aRegion);
     const nsIntRect* rect;
@@ -309,8 +290,8 @@ nsThebesRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
 // other junk
 //
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
+nsresult
+nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetLineStyle %d\n", this, aLineStyle));
     switch (aLineStyle) {
@@ -335,8 +316,8 @@ nsThebesRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
 }
 
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetColor(nscolor aColor)
+nsresult
+nsRenderingContext::SetColor(nscolor aColor)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetColor 0x%08x\n", this, aColor));
     /* This sets the color assuming the sRGB color space, since that's what all
@@ -348,23 +329,23 @@ nsThebesRenderingContext::SetColor(nscolor aColor)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetColor(nscolor &aColor) const
+nsresult
+nsRenderingContext::GetColor(nscolor &aColor) const
 {
     aColor = mColor;
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::Translate(const nsPoint& aPt)
+nsresult
+nsRenderingContext::Translate(const nsPoint& aPt)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Translate %d %d\n", this, aPt.x, aPt.y));
     mThebes->Translate (gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::Scale(float aSx, float aSy)
+nsresult
+nsRenderingContext::Scale(float aSx, float aSy)
 {
     // as far as I can tell, noone actually calls this
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Scale %f %f\n", this, aSx, aSy));
@@ -373,7 +354,7 @@ nsThebesRenderingContext::Scale(float aSx, float aSy)
 }
 
 void
-nsThebesRenderingContext::UpdateTempTransformMatrix()
+nsRenderingContext::UpdateTempTransformMatrix()
 {
     //PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::UpdateTempTransformMatrix\n", this));
 
@@ -391,7 +372,7 @@ nsThebesRenderingContext::UpdateTempTransformMatrix()
 }
 
 nsTransform2D&
-nsThebesRenderingContext::CurrentTransform()
+nsRenderingContext::CurrentTransform()
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::CurrentTransform\n", this));
     UpdateTempTransformMatrix();
@@ -410,7 +391,7 @@ nsThebesRenderingContext::CurrentTransform()
  ****/
 
 nsTransform2D*
-nsThebesRenderingContext::GetCurrentTransform()
+nsRenderingContext::GetCurrentTransform()
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
            ("## %p nsTRC::GetCurrentTransform\n", this));
@@ -419,7 +400,7 @@ nsThebesRenderingContext::GetCurrentTransform()
 }
 
 void
-nsThebesRenderingContext::TransformCoord (nscoord *aX, nscoord *aY)
+nsRenderingContext::TransformCoord (nscoord *aX, nscoord *aY)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::TransformCoord\n", this));
 
@@ -431,16 +412,15 @@ nsThebesRenderingContext::TransformCoord (nscoord *aX, nscoord *aY)
     *aY = TO_TWIPS(pt.y);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawLine(const nsPoint& aStartPt,
-                                   const nsPoint& aEndPt)
+nsresult
+nsRenderingContext::DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt)
 {
     return DrawLine(aStartPt.x, aStartPt.y, aEndPt.x, aEndPt.y);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
-                                   nscoord aX1, nscoord aY1)
+nsresult
+nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
+                             nscoord aX1, nscoord aY1)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
            ("## %p nsTRC::DrawLine %d %d %d %d\n", this, aX0, aY0, aX1, aY1));
@@ -485,8 +465,8 @@ nsThebesRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawRect(const nsRect& aRect)
+nsresult
+nsRenderingContext::DrawRect(const nsRect& aRect)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::DrawRect [%d,%d,%d,%d]\n", this, aRect.x, aRect.y, aRect.width, aRect.height));
 
@@ -497,8 +477,9 @@ nsThebesRenderingContext::DrawRect(const nsRect& aRect)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
+nsresult
+nsRenderingContext::DrawRect(nscoord aX, nscoord aY,
+                             nscoord aWidth, nscoord aHeight)
 {
     DrawRect(nsRect(aX, aY, aWidth, aHeight));
     return NS_OK;
@@ -566,8 +547,8 @@ ConditionRect(gfxRect& r) {
     return PR_TRUE;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::FillRect(const nsRect& aRect)
+nsresult
+nsRenderingContext::FillRect(const nsRect& aRect)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillRect [%d,%d,%d,%d]\n", this, aRect.x, aRect.y, aRect.width, aRect.height));
 
@@ -610,15 +591,16 @@ nsThebesRenderingContext::FillRect(const nsRect& aRect)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
+nsresult
+nsRenderingContext::FillRect(nscoord aX, nscoord aY,
+                             nscoord aWidth, nscoord aHeight)
 {
     FillRect(nsRect(aX, aY, aWidth, aHeight));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::InvertRect(const nsRect& aRect)
+nsresult
+nsRenderingContext::InvertRect(const nsRect& aRect)
 {
     gfxContext::GraphicsOperator lastOp = mThebes->CurrentOperator();
 
@@ -629,20 +611,22 @@ nsThebesRenderingContext::InvertRect(const nsRect& aRect)
     return rv;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
+nsresult
+nsRenderingContext::InvertRect(nscoord aX, nscoord aY,
+                               nscoord aWidth, nscoord aHeight)
 {
     return InvertRect(nsRect(aX, aY, aWidth, aHeight));
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawEllipse(const nsRect& aRect)
+nsresult
+nsRenderingContext::DrawEllipse(const nsRect& aRect)
 {
     return DrawEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
+nsresult
+nsRenderingContext::DrawEllipse(nscoord aX, nscoord aY,
+                                nscoord aWidth, nscoord aHeight)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::DrawEllipse [%d,%d,%d,%d]\n", this, aX, aY, aWidth, aHeight));
 
@@ -656,14 +640,15 @@ nsThebesRenderingContext::DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, ns
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::FillEllipse(const nsRect& aRect)
+nsresult
+nsRenderingContext::FillEllipse(const nsRect& aRect)
 {
     return FillEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
+nsresult
+nsRenderingContext::FillEllipse(nscoord aX, nscoord aY,
+                                nscoord aWidth, nscoord aHeight)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillEllipse [%d,%d,%d,%d]\n", this, aX, aY, aWidth, aHeight));
 
@@ -677,8 +662,8 @@ nsThebesRenderingContext::FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, ns
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
+nsresult
+nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillPolygon %d\n", this, aNumPoints));
 
@@ -703,7 +688,7 @@ nsThebesRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoin
 }
 
 void*
-nsThebesRenderingContext::GetNativeGraphicData(GraphicDataType aType)
+nsRenderingContext::GetNativeGraphicData(GraphicDataType aType)
 {
     if (aType == NATIVE_GDK_DRAWABLE)
     {
@@ -734,8 +719,9 @@ nsThebesRenderingContext::GetNativeGraphicData(GraphicDataType aType)
     return nsnull;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PushFilter(const nsRect& twRect, PRBool aAreaIsOpaque, float aOpacity)
+nsresult
+nsRenderingContext::PushFilter(const nsRect& twRect, PRBool aAreaIsOpaque,
+                               float aOpacity)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
            ("## %p nsTRC::PushFilter [%d,%d,%d,%d] isOpaque: %d opacity: %f\n",
@@ -751,8 +737,8 @@ nsThebesRenderingContext::PushFilter(const nsRect& twRect, PRBool aAreaIsOpaque,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::PopFilter()
+nsresult
+nsRenderingContext::PopFilter()
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopFilter\n"));
 
@@ -780,28 +766,28 @@ nsThebesRenderingContext::PopFilter()
 //
 // text junk
 //
-NS_IMETHODIMP
-nsThebesRenderingContext::SetRightToLeftText(PRBool aIsRTL)
+nsresult
+nsRenderingContext::SetRightToLeftText(PRBool aIsRTL)
 {
     return mFontMetrics->SetRightToLeftText(aIsRTL);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetRightToLeftText(PRBool* aIsRTL)
+nsresult
+nsRenderingContext::GetRightToLeftText(PRBool* aIsRTL)
 {
     *aIsRTL = mFontMetrics->GetRightToLeftText();
     return NS_OK;
 }
 
 void
-nsThebesRenderingContext::SetTextRunRTL(PRBool aIsRTL)
+nsRenderingContext::SetTextRunRTL(PRBool aIsRTL)
 {
     mFontMetrics->SetTextRunRTL(aIsRTL);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                                  gfxUserFontSet *aUserFontSet)
+nsresult
+nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
+                            gfxUserFontSet *aUserFontSet)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont %p\n", this, &aFont));
 
@@ -812,9 +798,9 @@ nsThebesRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetFont(const nsFont& aFont,
-                                  gfxUserFontSet *aUserFontSet)
+nsresult
+nsRenderingContext::SetFont(const nsFont& aFont,
+                            gfxUserFontSet *aUserFontSet)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont %p\n", this, &aFont));
 
@@ -825,8 +811,8 @@ nsThebesRenderingContext::SetFont(const nsFont& aFont,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
+nsresult
+nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont[Metrics] %p\n", this, aFontMetrics));
 
@@ -835,22 +821,22 @@ nsThebesRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 }
 
 already_AddRefed<nsIFontMetrics>
-nsThebesRenderingContext::GetFontMetrics()
+nsRenderingContext::GetFontMetrics()
 {
     NS_IF_ADDREF(mFontMetrics);
     return mFontMetrics.get();
 }
 
 PRInt32
-nsThebesRenderingContext::GetMaxStringLength()
+nsRenderingContext::GetMaxStringLength()
 {
     if (!mFontMetrics)
         return 1;
     return mFontMetrics->GetMaxStringLength();
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(char aC, nscoord &aWidth)
+nsresult
+nsRenderingContext::GetWidth(char aC, nscoord &aWidth)
 {
     if (aC == ' ' && mFontMetrics)
         return mFontMetrics->GetSpaceWidth(aWidth);
@@ -858,36 +844,37 @@ nsThebesRenderingContext::GetWidth(char aC, nscoord &aWidth)
     return GetWidth(&aC, 1, aWidth);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(PRUnichar aC, nscoord &aWidth, PRInt32 *aFontID)
+nsresult
+nsRenderingContext::GetWidth(PRUnichar aC, nscoord &aWidth, PRInt32 *aFontID)
 {
     return GetWidth(&aC, 1, aWidth, aFontID);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(const nsString& aString, nscoord &aWidth,
+nsresult
+nsRenderingContext::GetWidth(const nsString& aString, nscoord &aWidth,
                                    PRInt32 *aFontID)
 {
     return GetWidth(aString.get(), aString.Length(), aWidth, aFontID);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(const char* aString, nscoord& aWidth)
+nsresult
+nsRenderingContext::GetWidth(const char* aString, nscoord& aWidth)
 {
     return GetWidth(aString, strlen(aString), aWidth);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                                     PRInt32 aFontID, const nscoord* aSpacing)
+nsresult
+nsRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                               PRInt32 aFontID, const nscoord* aSpacing)
 {
-    return DrawString(aString.get(), aString.Length(), aX, aY, aFontID, aSpacing);
+    return DrawString(aString.get(), aString.Length(), aX, aY,
+                      aFontID, aSpacing);
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(const char* aString,
-                                   PRUint32 aLength,
-                                   nscoord& aWidth)
+nsresult
+nsRenderingContext::GetWidth(const char* aString,
+                             PRUint32 aLength,
+                             nscoord& aWidth)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     aWidth = 0;
@@ -904,11 +891,11 @@ nsThebesRenderingContext::GetWidth(const char* aString,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetWidth(const PRUnichar *aString,
-                                   PRUint32 aLength,
-                                   nscoord &aWidth,
-                                   PRInt32 *aFontID)
+nsresult
+nsRenderingContext::GetWidth(const PRUnichar *aString,
+                             PRUint32 aLength,
+                             nscoord &aWidth,
+                             PRInt32 *aFontID)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     aWidth = 0;
@@ -930,10 +917,10 @@ nsThebesRenderingContext::GetWidth(const PRUnichar *aString,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetTextDimensions(const char* aString,
-                                            PRUint32 aLength,
-                                            nsTextDimensions& aDimensions)
+nsresult
+nsRenderingContext::GetTextDimensions(const char* aString,
+                                      PRUint32 aLength,
+                                      nsTextDimensions& aDimensions)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= maxChunkLength)
@@ -961,11 +948,11 @@ nsThebesRenderingContext::GetTextDimensions(const char* aString,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetTextDimensions(const PRUnichar* aString,
-                                            PRUint32 aLength,
-                                            nsTextDimensions& aDimensions,
-                                            PRInt32* aFontID)
+nsresult
+nsRenderingContext::GetTextDimensions(const PRUnichar* aString,
+                                      PRUint32 aLength,
+                                      nsTextDimensions& aDimensions,
+                                      PRInt32* aFontID)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= maxChunkLength)
@@ -998,16 +985,16 @@ nsThebesRenderingContext::GetTextDimensions(const PRUnichar* aString,
 }
 
 #if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
-NS_IMETHODIMP
-nsThebesRenderingContext::GetTextDimensions(const char*       aString,
-                                            PRInt32           aLength,
-                                            PRInt32           aAvailWidth,
-                                            PRInt32*          aBreaks,
-                                            PRInt32           aNumBreaks,
-                                            nsTextDimensions& aDimensions,
-                                            PRInt32&          aNumCharsFit,
-                                            nsTextDimensions& aLastWordDimensions,
-                                            PRInt32*          aFontID)
+nsresult
+nsRenderingContext::GetTextDimensions(const char*       aString,
+                                      PRInt32           aLength,
+                                      PRInt32           aAvailWidth,
+                                      PRInt32*          aBreaks,
+                                      PRInt32           aNumBreaks,
+                                      nsTextDimensions& aDimensions,
+                                      PRInt32&          aNumCharsFit,
+                                      nsTextDimensions& aLastWordDimensions,
+                                      PRInt32*          aFontID)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= PRInt32(maxChunkLength))
@@ -1054,16 +1041,16 @@ nsThebesRenderingContext::GetTextDimensions(const char*       aString,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetTextDimensions(const PRUnichar*  aString,
-                                            PRInt32           aLength,
-                                            PRInt32           aAvailWidth,
-                                            PRInt32*          aBreaks,
-                                            PRInt32           aNumBreaks,
-                                            nsTextDimensions& aDimensions,
-                                            PRInt32&          aNumCharsFit,
-                                            nsTextDimensions& aLastWordDimensions,
-                                            PRInt32*          aFontID)
+nsresult
+nsRenderingContext::GetTextDimensions(const PRUnichar*  aString,
+                                      PRInt32           aLength,
+                                      PRInt32           aAvailWidth,
+                                      PRInt32*          aBreaks,
+                                      PRInt32           aNumBreaks,
+                                      nsTextDimensions& aDimensions,
+                                      PRInt32&          aNumCharsFit,
+                                      nsTextDimensions& aLastWordDimensions,
+                                      PRInt32*          aFontID)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= PRInt32(maxChunkLength))
@@ -1111,10 +1098,10 @@ nsThebesRenderingContext::GetTextDimensions(const PRUnichar*  aString,
 #endif
 
 #ifdef MOZ_MATHML
-NS_IMETHODIMP
-nsThebesRenderingContext::GetBoundingMetrics(const char*        aString,
-                                             PRUint32           aLength,
-                                             nsBoundingMetrics& aBoundingMetrics)
+nsresult
+nsRenderingContext::GetBoundingMetrics(const char*        aString,
+                                       PRUint32           aLength,
+                                       nsBoundingMetrics& aBoundingMetrics)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= maxChunkLength)
@@ -1143,11 +1130,11 @@ nsThebesRenderingContext::GetBoundingMetrics(const char*        aString,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
-                                             PRUint32           aLength,
-                                             nsBoundingMetrics& aBoundingMetrics,
-                                             PRInt32*           aFontID)
+nsresult
+nsRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
+                                       PRUint32           aLength,
+                                       nsBoundingMetrics& aBoundingMetrics,
+                                       PRInt32*           aFontID)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= maxChunkLength)
@@ -1181,10 +1168,10 @@ nsThebesRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
 }
 #endif
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawString(const char *aString, PRUint32 aLength,
-                                   nscoord aX, nscoord aY,
-                                   const nscoord* aSpacing)
+nsresult
+nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
+                               nscoord aX, nscoord aY,
+                               const nscoord* aSpacing)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     while (aLength > 0) {
@@ -1206,11 +1193,11 @@ nsThebesRenderingContext::DrawString(const char *aString, PRUint32 aLength,
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
-                                   nscoord aX, nscoord aY,
-                                   PRInt32 aFontID,
-                                   const nscoord* aSpacing)
+nsresult
+nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
+                               nscoord aX, nscoord aY,
+                               PRInt32 aFontID,
+                               const nscoord* aSpacing)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength(this);
     if (aLength <= maxChunkLength) {
@@ -1266,7 +1253,8 @@ nsThebesRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
 }
 
 nsresult
-nsThebesRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength, nscoord& aWidth)
+nsRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength,
+                                     nscoord& aWidth)
 {
 #ifdef DISABLE_TEXT
     aWidth = (8 * aLength);
@@ -1282,8 +1270,8 @@ nsThebesRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength
 }
 
 nsresult
-nsThebesRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
-                                           nscoord &aWidth, PRInt32 *aFontID)
+nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
+                                     nscoord &aWidth, PRInt32 *aFontID)
 {
 #ifdef DISABLE_TEXT
     aWidth = (8 * aLength);
@@ -1299,8 +1287,9 @@ nsThebesRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aL
 }
 
 nsresult
-nsThebesRenderingContext::GetTextDimensionsInternal(const char* aString, PRUint32 aLength,
-                                                    nsTextDimensions& aDimensions)
+nsRenderingContext::GetTextDimensionsInternal(const char* aString,
+                                              PRUint32 aLength,
+                                              nsTextDimensions& aDimensions)
 {
     mFontMetrics->GetMaxAscent(aDimensions.ascent);
     mFontMetrics->GetMaxDescent(aDimensions.descent);
@@ -1308,10 +1297,10 @@ nsThebesRenderingContext::GetTextDimensionsInternal(const char* aString, PRUint3
 }
 
 nsresult
-nsThebesRenderingContext::GetTextDimensionsInternal(const PRUnichar* aString,
-                                                    PRUint32 aLength,
-                                                    nsTextDimensions& aDimensions,
-                                                    PRInt32* aFontID)
+nsRenderingContext::GetTextDimensionsInternal(const PRUnichar* aString,
+                                              PRUint32 aLength,
+                                              nsTextDimensions& aDimensions,
+                                              PRInt32* aFontID)
 {
     mFontMetrics->GetMaxAscent(aDimensions.ascent);
     mFontMetrics->GetMaxDescent(aDimensions.descent);
@@ -1320,57 +1309,59 @@ nsThebesRenderingContext::GetTextDimensionsInternal(const PRUnichar* aString,
 
 #if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11) || defined(XP_MACOSX) || defined (MOZ_DFB)
 nsresult
-nsThebesRenderingContext::GetTextDimensionsInternal(const char*       aString,
-                                                    PRInt32           aLength,
-                                                    PRInt32           aAvailWidth,
-                                                    PRInt32*          aBreaks,
-                                                    PRInt32           aNumBreaks,
-                                                    nsTextDimensions& aDimensions,
-                                                    PRInt32&          aNumCharsFit,
-                                                    nsTextDimensions& aLastWordDimensions,
-                                                    PRInt32*          aFontID)
+nsRenderingContext::GetTextDimensionsInternal(const char*       aString,
+                                              PRInt32           aLength,
+                                              PRInt32           aAvailWidth,
+                                              PRInt32*          aBreaks,
+                                              PRInt32           aNumBreaks,
+                                              nsTextDimensions& aDimensions,
+                                              PRInt32&          aNumCharsFit,
+                                              nsTextDimensions& aLastWordDimensions,
+                                              PRInt32*          aFontID)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 nsresult
-nsThebesRenderingContext::GetTextDimensionsInternal(const PRUnichar*  aString,
-                                                    PRInt32           aLength,
-                                                    PRInt32           aAvailWidth,
-                                                    PRInt32*          aBreaks,
-                                                    PRInt32           aNumBreaks,
-                                                    nsTextDimensions& aDimensions,
-                                                    PRInt32&          aNumCharsFit,
-                                                    nsTextDimensions& aLastWordDimensions,
-                                                    PRInt32*          aFontID)
+nsRenderingContext::GetTextDimensionsInternal(const PRUnichar*  aString,
+                                              PRInt32           aLength,
+                                              PRInt32           aAvailWidth,
+                                              PRInt32*          aBreaks,
+                                              PRInt32           aNumBreaks,
+                                              nsTextDimensions& aDimensions,
+                                              PRInt32&          aNumCharsFit,
+                                              nsTextDimensions& aLastWordDimensions,
+                                              PRInt32*          aFontID)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
 
 #ifdef MOZ_MATHML
-nsresult 
-nsThebesRenderingContext::GetBoundingMetricsInternal(const char*        aString,
-                                                     PRUint32           aLength,
-                                                     nsBoundingMetrics& aBoundingMetrics)
+nsresult
+nsRenderingContext::GetBoundingMetricsInternal(const char*        aString,
+                                               PRUint32           aLength,
+                                               nsBoundingMetrics& aBoundingMetrics)
 {
-    return mFontMetrics->GetBoundingMetrics(aString, aLength, this, aBoundingMetrics);
+    return mFontMetrics->GetBoundingMetrics(aString, aLength, this,
+                                            aBoundingMetrics);
 }
 
 nsresult
-nsThebesRenderingContext::GetBoundingMetricsInternal(const PRUnichar*   aString,
-                                                     PRUint32           aLength,
-                                                     nsBoundingMetrics& aBoundingMetrics,
-                                                     PRInt32*           aFontID)
+nsRenderingContext::GetBoundingMetricsInternal(const PRUnichar*   aString,
+                                               PRUint32           aLength,
+                                               nsBoundingMetrics& aBoundingMetrics,
+                                               PRInt32*           aFontID)
 {
-    return mFontMetrics->GetBoundingMetrics(aString, aLength, this, aBoundingMetrics);
+    return mFontMetrics->GetBoundingMetrics(aString, aLength, this,
+                                            aBoundingMetrics);
 }
 #endif // MOZ_MATHML
 
 nsresult
-nsThebesRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLength,
-                                             nscoord aX, nscoord aY,
-                                             const nscoord* aSpacing)
+nsRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLength,
+                                       nscoord aX, nscoord aY,
+                                       const nscoord* aSpacing)
 {
 #ifdef DISABLE_TEXT
     return NS_OK;
@@ -1381,10 +1372,11 @@ nsThebesRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLeng
 }
 
 nsresult
-nsThebesRenderingContext::DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
-                                             nscoord aX, nscoord aY,
-                                             PRInt32 aFontID,
-                                             const nscoord* aSpacing)
+nsRenderingContext::DrawStringInternal(const PRUnichar *aString,
+                                       PRUint32 aLength,
+                                       nscoord aX, nscoord aY,
+                                       PRInt32 aFontID,
+                                       const nscoord* aSpacing)
 {
 #ifdef DISABLE_TEXT
     return NS_OK;
@@ -1395,35 +1387,35 @@ nsThebesRenderingContext::DrawStringInternal(const PRUnichar *aString, PRUint32
 }
 
 PRInt32
-nsThebesRenderingContext::GetPosition(const PRUnichar *aText,
-                                      PRUint32 aLength,
-                                      nsPoint aPt)
+nsRenderingContext::GetPosition(const PRUnichar *aText,
+                                PRUint32 aLength,
+                                nsPoint aPt)
 {
-  return -1;
+    return -1;
 }
 
-NS_IMETHODIMP
-nsThebesRenderingContext::GetRangeWidth(const PRUnichar *aText,
-                                        PRUint32 aLength,
-                                        PRUint32 aStart,
-                                        PRUint32 aEnd,
-                                        PRUint32 &aWidth)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsThebesRenderingContext::GetRangeWidth(const char *aText,
-                                        PRUint32 aLength,
-                                        PRUint32 aStart,
-                                        PRUint32 aEnd,
-                                        PRUint32 &aWidth)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsThebesRenderingContext::RenderEPS(const nsRect& aRect, FILE *aDataFile)
+nsresult
+nsRenderingContext::GetRangeWidth(const PRUnichar *aText,
+                                  PRUint32 aLength,
+                                  PRUint32 aStart,
+                                  PRUint32 aEnd,
+                                  PRUint32 &aWidth)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult
+nsRenderingContext::GetRangeWidth(const char *aText,
+                                  PRUint32 aLength,
+                                  PRUint32 aStart,
+                                  PRUint32 aEnd,
+                                  PRUint32 &aWidth)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult
+nsRenderingContext::RenderEPS(const nsRect& aRect, FILE *aDataFile)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
new file mode 100644
index 000000000000..c39f2a78ae94
--- /dev/null
+++ b/gfx/src/nsRenderingContext.h
@@ -0,0 +1,454 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is thebes gfx
+ *
+ * The Initial Developer of the Original Code is
+ * mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vladimir Vukicevic <vladimir@pobox.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef NSRENDERINGCONTEXT__H__
+#define NSRENDERINGCONTEXT__H__
+
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
+#include "nsIDeviceContext.h"
+#include "nsIFontMetrics.h"
+#include "nsIWidget.h"
+#include "nsPoint.h"
+#include "nsSize.h"
+#include "nsColor.h"
+#include "nsRect.h"
+#include "nsIRegion.h"
+#include "nsTransform2D.h"
+#include "nsIThebesFontMetrics.h"
+#include "gfxContext.h"
+
+typedef enum {
+    nsClipCombine_kIntersect = 0,
+    nsClipCombine_kUnion = 1,
+    nsClipCombine_kSubtract = 2,
+    nsClipCombine_kReplace = 3
+} nsClipCombine;
+
+typedef enum {
+    nsLineStyle_kNone   = 0,
+    nsLineStyle_kSolid  = 1,
+    nsLineStyle_kDashed = 2,
+    nsLineStyle_kDotted = 3
+} nsLineStyle;
+
+/* Struct used to represent the overall extent of a string
+ * whose rendering may involve switching between different
+ * fonts that have different metrics.
+ */
+struct nsTextDimensions {
+    // max ascent amongst all the fonts needed to represent the string
+    nscoord ascent;
+
+    // max descent amongst all the fonts needed to represent the string
+    nscoord descent;
+
+    // width of the string
+    nscoord width;
+
+
+    nsTextDimensions()
+    {
+        Clear();
+    }
+
+    /* Set all member data to zero */
+    void
+    Clear() {
+        ascent = descent = width = 0;
+    }
+
+    /* Sum with another dimension */
+    void
+    Combine(const nsTextDimensions& aOther) {
+        if (ascent < aOther.ascent) ascent = aOther.ascent;
+        if (descent < aOther.descent) descent = aOther.descent;
+        width += aOther.width;
+    }
+};
+
+#ifdef MOZ_MATHML
+/* Struct used for accurate measurements of a string in order
+ * to allow precise positioning when processing MathML.
+ */
+struct nsBoundingMetrics {
+
+    ///////////
+    // Metrics that _exactly_ enclose the text:
+
+    // The character coordinate system is the one used on X Windows:
+    // 1. The origin is located at the intersection of the baseline
+    //    with the left of the character's cell.
+    // 2. All horizontal bearings are oriented from left to right.
+    // 2. All horizontal bearings are oriented from left to right.
+    // 3. The ascent is oriented from bottom to top (being 0 at the orgin).
+    // 4. The descent is oriented from top to bottom (being 0 at the origin).
+
+    // Note that Win32/Mac/PostScript use a different convention for
+    // the descent (all vertical measurements are oriented from bottom
+    // to top on these palatforms). Make sure to flip the sign of the
+    // descent on these platforms for cross-platform compatibility.
+
+    // Any of the following member variables listed here can have
+    // positive or negative value.
+
+    nscoord leftBearing;
+    /* The horizontal distance from the origin of the drawing
+       operation to the left-most part of the drawn string. */
+
+    nscoord rightBearing;
+    /* The horizontal distance from the origin of the drawing
+       operation to the right-most part of the drawn string.
+       The _exact_ width of the string is therefore:
+       rightBearing - leftBearing */
+
+    nscoord ascent;
+    /* The vertical distance from the origin of the drawing
+       operation to the top-most part of the drawn string. */
+
+    nscoord descent;
+    /* The vertical distance from the origin of the drawing
+       operation to the bottom-most part of the drawn string.
+       The _exact_ height of the string is therefore:
+       ascent + descent */
+
+    //////////
+    // Metrics for placing other surrounding text:
+
+    nscoord width;
+    /* The horizontal distance from the origin of the drawing
+       operation to the correct origin for drawing another string
+       to follow the current one. Depending on the font, this
+       could be greater than or less than the right bearing. */
+
+    nsBoundingMetrics() {
+        Clear();
+    }
+
+    //////////
+    // Utility methods and operators:
+
+    /* Set all member data to zero */
+    void
+    Clear() {
+        leftBearing = rightBearing = 0;
+        ascent = descent = width = 0;
+    }
+
+    /* Append another bounding metrics */
+    void
+    operator += (const nsBoundingMetrics& bm) {
+        if (ascent + descent == 0 && rightBearing - leftBearing == 0) {
+            ascent = bm.ascent;
+            descent = bm.descent;
+            leftBearing = width + bm.leftBearing;
+            rightBearing = width + bm.rightBearing;
+        }
+        else {
+            if (ascent < bm.ascent) ascent = bm.ascent;
+            if (descent < bm.descent) descent = bm.descent;
+            leftBearing = PR_MIN(leftBearing, width + bm.leftBearing);
+            rightBearing = PR_MAX(rightBearing, width + bm.rightBearing);
+        }
+        width += bm.width;
+    }
+};
+#endif // MOZ_MATHML
+
+
+class nsRenderingContext
+{
+public:
+    nsRenderingContext()
+        : mP2A(0.), mLineStyle(nsLineStyle_kNone), mColor(NS_RGB(0,0,0))
+    {}
+    // ~nsRenderingContext() {}
+
+    NS_INLINE_DECL_REFCOUNTING(nsRenderingContext)
+
+    /**
+     * Return the maximum length of a string that can be handled by
+     * the platform using the current font metrics.
+     */
+    PRInt32 GetMaxStringLength();
+
+    // Safe string method variants: by default, these defer to the more
+    // elaborate methods below
+    nsresult GetWidth(const nsString& aString, nscoord &aWidth,
+                      PRInt32 *aFontID = nsnull);
+    nsresult GetWidth(const char* aString, nscoord& aWidth);
+    nsresult DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID = -1,
+                        const nscoord* aSpacing = nsnull);
+
+    // Safe string methods
+    nsresult GetWidth(const char* aString, PRUint32 aLength,
+                      nscoord& aWidth);
+    nsresult GetWidth(const PRUnichar *aString, PRUint32 aLength,
+                      nscoord &aWidth, PRInt32 *aFontID = nsnull);
+    nsresult GetWidth(char aC, nscoord &aWidth);
+    nsresult GetWidth(PRUnichar aC, nscoord &aWidth,
+                      PRInt32 *aFontID);
+
+    nsresult GetTextDimensions(const char* aString, PRUint32 aLength,
+                               nsTextDimensions& aDimensions);
+    nsresult GetTextDimensions(const PRUnichar* aString, PRUint32 aLength,
+                               nsTextDimensions& aDimensions,
+                               PRInt32* aFontID = nsnull);
+
+#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
+    nsresult GetTextDimensions(const char*       aString,
+                               PRInt32           aLength,
+                               PRInt32           aAvailWidth,
+                               PRInt32*          aBreaks,
+                               PRInt32           aNumBreaks,
+                               nsTextDimensions& aDimensions,
+                               PRInt32&          aNumCharsFit,
+                               nsTextDimensions& aLastWordDimensions,
+                               PRInt32*          aFontID = nsnull);
+
+    nsresult GetTextDimensions(const PRUnichar*  aString,
+                               PRInt32           aLength,
+                               PRInt32           aAvailWidth,
+                               PRInt32*          aBreaks,
+                               PRInt32           aNumBreaks,
+                               nsTextDimensions& aDimensions,
+                               PRInt32&          aNumCharsFit,
+                               nsTextDimensions& aLastWordDimensions,
+                               PRInt32*          aFontID = nsnull);
+#endif
+#ifdef MOZ_MATHML
+    nsresult GetBoundingMetrics(const char*        aString,
+                                PRUint32           aLength,
+                                nsBoundingMetrics& aBoundingMetrics);
+    nsresult GetBoundingMetrics(const PRUnichar*   aString,
+                                PRUint32           aLength,
+                                nsBoundingMetrics& aBoundingMetrics,
+                                PRInt32*           aFontID = nsnull);
+#endif
+    nsresult DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing = nsnull);
+    nsresult DrawString(const PRUnichar *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID = -1,
+                        const nscoord* aSpacing = nsnull);
+
+    nsresult Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
+    nsresult Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
+    nsresult Init(nsIDeviceContext* aContext, nsIWidget *aWidget);
+    nsresult CommonInit(void);
+    already_AddRefed<nsIDeviceContext> GetDeviceContext();
+    nsresult PushState(void);
+    nsresult PopState(void);
+    nsresult SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
+    nsresult SetLineStyle(nsLineStyle aLineStyle);
+    nsresult SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
+    nsresult SetColor(nscolor aColor);
+    nsresult GetColor(nscolor &aColor) const;
+    nsresult SetFont(const nsFont& aFont, nsIAtom* aLanguage,
+                     gfxUserFontSet *aUserFontSet);
+    nsresult SetFont(const nsFont& aFont,
+                     gfxUserFontSet *aUserFontSet);
+    nsresult SetFont(nsIFontMetrics *aFontMetrics);
+    already_AddRefed<nsIFontMetrics> GetFontMetrics();
+    nsresult Translate(const nsPoint& aPt);
+    nsresult Scale(float aSx, float aSy);
+    nsTransform2D* GetCurrentTransform();
+
+    nsresult DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
+    nsresult DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+    nsresult DrawRect(const nsRect& aRect);
+    nsresult DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    nsresult FillRect(const nsRect& aRect);
+    nsresult FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    nsresult InvertRect(const nsRect& aRect);
+    nsresult InvertRect(nscoord aX, nscoord aY,
+                        nscoord aWidth, nscoord aHeight);
+    nsresult FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+    nsresult DrawEllipse(const nsRect& aRect);
+    nsresult DrawEllipse(nscoord aX, nscoord aY,
+                         nscoord aWidth, nscoord aHeight);
+    nsresult FillEllipse(const nsRect& aRect);
+    nsresult FillEllipse(nscoord aX, nscoord aY,
+                         nscoord aWidth, nscoord aHeight);
+
+    nsresult PushFilter(const nsRect& aRect,
+                        PRBool aAreaIsOpaque, float aOpacity);
+    nsresult PopFilter();
+
+    enum GraphicDataType {
+        NATIVE_CAIRO_CONTEXT = 1,
+        NATIVE_GDK_DRAWABLE = 2,
+        NATIVE_WINDOWS_DC = 3,
+        NATIVE_MAC_THING = 4,
+        NATIVE_THEBES_CONTEXT = 5,
+        NATIVE_OS2_PS = 6
+    };
+    void* GetNativeGraphicData(GraphicDataType aType);
+
+    struct PushedTranslation {
+        float mSavedX, mSavedY;
+    };
+    class AutoPushTranslation {
+        nsRenderingContext* mCtx;
+        PushedTranslation mPushed;
+    public:
+        AutoPushTranslation(nsRenderingContext* aCtx, const nsPoint& aPt)
+            : mCtx(aCtx) {
+            mCtx->PushTranslation(&mPushed);
+            mCtx->Translate(aPt);
+        }
+        ~AutoPushTranslation() {
+            mCtx->PopTranslation(&mPushed);
+        }
+    };
+
+    nsresult PushTranslation(PushedTranslation* aState);
+    nsresult PopTranslation(PushedTranslation* aState);
+    nsresult SetTranslation(const nsPoint& aPoint);
+
+    /**
+     * Let the device context know whether we want text reordered with
+     * right-to-left base direction
+     */
+    nsresult SetRightToLeftText(PRBool aIsRTL);
+    nsresult GetRightToLeftText(PRBool* aIsRTL);
+    void SetTextRunRTL(PRBool aIsRTL);
+
+    PRInt32 GetPosition(const PRUnichar *aText,
+                        PRUint32 aLength,
+                        nsPoint aPt);
+    nsresult GetRangeWidth(const PRUnichar *aText,
+                           PRUint32 aLength,
+                           PRUint32 aStart,
+                           PRUint32 aEnd,
+                           PRUint32 &aWidth);
+    nsresult GetRangeWidth(const char *aText,
+                           PRUint32 aLength,
+                           PRUint32 aStart,
+                           PRUint32 aEnd,
+                           PRUint32 &aWidth);
+
+    nsresult RenderEPS(const nsRect& aRect, FILE *aDataFile);
+
+    // Thebes specific stuff
+
+    gfxContext *ThebesContext() { return mThebes; }
+
+    nsTransform2D& CurrentTransform();
+
+    void TransformCoord (nscoord *aX, nscoord *aY);
+
+protected:
+    nsresult GetWidthInternal(const char *aString, PRUint32 aLength,
+                              nscoord &aWidth);
+    nsresult GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
+                              nscoord &aWidth, PRInt32 *aFontID = nsnull);
+
+    nsresult DrawStringInternal(const char *aString, PRUint32 aLength,
+                                nscoord aX, nscoord aY,
+                                const nscoord* aSpacing = nsnull);
+    nsresult DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
+                                nscoord aX, nscoord aY,
+                                PRInt32 aFontID = -1,
+                                const nscoord* aSpacing = nsnull);
+
+    nsresult GetTextDimensionsInternal(const char*       aString,
+                                       PRUint32          aLength,
+                                       nsTextDimensions& aDimensions);
+    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
+                                       PRUint32          aLength,
+                                       nsTextDimensions& aDimensions,
+                                       PRInt32*          aFontID = nsnull);
+    nsresult GetTextDimensionsInternal(const char*       aString,
+                                       PRInt32           aLength,
+                                       PRInt32           aAvailWidth,
+                                       PRInt32*          aBreaks,
+                                       PRInt32           aNumBreaks,
+                                       nsTextDimensions& aDimensions,
+                                       PRInt32&          aNumCharsFit,
+                                       nsTextDimensions& aLastWordDimensions,
+                                       PRInt32*          aFontID = nsnull);
+    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
+                                       PRInt32           aLength,
+                                       PRInt32           aAvailWidth,
+                                       PRInt32*          aBreaks,
+                                       PRInt32           aNumBreaks,
+                                       nsTextDimensions& aDimensions,
+                                       PRInt32&          aNumCharsFit,
+                                       nsTextDimensions& aLastWordDimensions,
+                                       PRInt32*          aFontID = nsnull);
+
+    void UpdateTempTransformMatrix();
+
+#ifdef MOZ_MATHML
+    /**
+     * Returns metrics (in app units) of an 8-bit character string
+     */
+    nsresult GetBoundingMetricsInternal(const char*        aString,
+                                        PRUint32           aLength,
+                                        nsBoundingMetrics& aBoundingMetrics);
+
+    /**
+     * Returns metrics (in app units) of a Unicode character string
+     */
+    nsresult GetBoundingMetricsInternal(const PRUnichar*   aString,
+                                        PRUint32           aLength,
+                                        nsBoundingMetrics& aBoundingMetrics,
+                                        PRInt32*           aFontID = nsnull);
+
+#endif /* MOZ_MATHML */
+
+    nsRefPtr<gfxContext> mThebes;
+    nsCOMPtr<nsIDeviceContext> mDeviceContext;
+    nsCOMPtr<nsIWidget> mWidget;
+    nsCOMPtr<nsIThebesFontMetrics> mFontMetrics;
+
+    double mP2A; // cached app units per device pixel value
+    nsLineStyle mLineStyle;
+    nscolor mColor;
+
+    // for handing out to people
+    nsTransform2D mTempTransform;
+
+    // keeping track of pushgroup/popgroup opacities
+    nsTArray<float> mOpacityArray;
+};
+
+#endif  // NSRENDERINGCONTEXT__H__
diff --git a/gfx/src/nsSystemFontsAndroid.cpp b/gfx/src/nsSystemFontsAndroid.cpp
index d6dd4da271d8..409c53021c02 100644
--- a/gfx/src/nsSystemFontsAndroid.cpp
+++ b/gfx/src/nsSystemFontsAndroid.cpp
@@ -35,11 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
-
 #include "nsSystemFontsAndroid.h"
-
 #include "gfxPlatform.h"
 
 #define DEFAULT_FONT  "Droid Sans"
diff --git a/gfx/src/nsSystemFontsAndroid.h b/gfx/src/nsSystemFontsAndroid.h
index 874efca63433..0a9005446c3d 100644
--- a/gfx/src/nsSystemFontsAndroid.h
+++ b/gfx/src/nsSystemFontsAndroid.h
@@ -38,7 +38,8 @@
 #ifndef _NS_SYSTEMFONTSANDROID_H_
 #define _NS_SYSTEMFONTSANDROID_H_
 
-#include <gfxFont.h>
+#include "gfxFont.h"
+#include "nsIDeviceContext.h"
 
 class nsSystemFontsAndroid
 {
diff --git a/gfx/src/nsSystemFontsGTK2.cpp b/gfx/src/nsSystemFontsGTK2.cpp
index 026adf833a65..612c2404bd74 100644
--- a/gfx/src/nsSystemFontsGTK2.cpp
+++ b/gfx/src/nsSystemFontsGTK2.cpp
@@ -39,8 +39,8 @@
 // for strtod()
 #include <stdlib.h>
 
-#include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
+#include "nsSystemFontsGTK2.h"
+#include "nsRenderingContext.h"
 #include "prlink.h"
 
 #include <gtk/gtk.h>
@@ -52,7 +52,6 @@
 #endif
 
 #include <fontconfig/fontconfig.h>
-#include "nsSystemFontsGTK2.h"
 #include "gfxPlatformGtk.h"
 
 // Glue to avoid build/runtime dependencies on Pango > 1.6
diff --git a/gfx/src/nsSystemFontsGTK2.h b/gfx/src/nsSystemFontsGTK2.h
index 25b826aa364d..360a2d08c6ba 100644
--- a/gfx/src/nsSystemFontsGTK2.h
+++ b/gfx/src/nsSystemFontsGTK2.h
@@ -40,6 +40,8 @@
 #define _NS_SYSTEMFONTSGTK2_H_
 
 #include "gfxFont.h"
+#include "nsIDeviceContext.h"
+
 typedef struct _GtkWidget GtkWidget;
 
 class nsSystemFontsGTK2
diff --git a/gfx/src/nsSystemFontsMac.mm b/gfx/src/nsSystemFontsMac.mm
index e733a53c03a6..5f65f574425a 100644
--- a/gfx/src/nsSystemFontsMac.mm
+++ b/gfx/src/nsSystemFontsMac.mm
@@ -36,10 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <Cocoa/Cocoa.h>
-
 #include "nsSystemFontsMac.h"
-
+#include <Cocoa/Cocoa.h>
 
 nsSystemFontsMac::nsSystemFontsMac()
 {
diff --git a/gfx/src/nsSystemFontsOS2.cpp b/gfx/src/nsSystemFontsOS2.cpp
index 87bcdca0822a..134c30e13f58 100644
--- a/gfx/src/nsSystemFontsOS2.cpp
+++ b/gfx/src/nsSystemFontsOS2.cpp
@@ -39,8 +39,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDeviceContext.h"
 #include "nsSystemFontsOS2.h"
+
+#define INCL_WINWINDOWMGR
+#define INCL_WINSHELLDATA
+#define INCL_DOSNLS
+#define INCL_DOSERRORS
+#include <os2.h>
+
 #include <stdlib.h>
 
 /************************
diff --git a/gfx/src/nsSystemFontsOS2.h b/gfx/src/nsSystemFontsOS2.h
index 37f604e53436..7b5d88a04b48 100644
--- a/gfx/src/nsSystemFontsOS2.h
+++ b/gfx/src/nsSystemFontsOS2.h
@@ -41,12 +41,8 @@
 #ifndef _NS_SYSTEMFONTSOS2_H_
 #define _NS_SYSTEMFONTSOS2_H_
 
-#include <gfxFont.h>
-#define INCL_WINWINDOWMGR
-#define INCL_WINSHELLDATA
-#define INCL_DOSNLS
-#define INCL_DOSERRORS
-#include <os2.h>
+#include "gfxFont.h"
+#include "nsIDeviceContext.h"
 
 class nsSystemFontsOS2
 {
diff --git a/gfx/src/nsSystemFontsQt.cpp b/gfx/src/nsSystemFontsQt.cpp
index c703b1f265b0..9eddebd46065 100644
--- a/gfx/src/nsSystemFontsQt.cpp
+++ b/gfx/src/nsSystemFontsQt.cpp
@@ -36,12 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Qt headers must be included before anything that might pull in our
+// malloc wrappers.
 #include <QApplication>
 #include <QFont>
 
-#include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
-
 #include "nsSystemFontsQt.h"
 #include "gfxQtPlatform.h"
 
@@ -57,7 +56,7 @@ nsSystemFontsQt::nsSystemFontsQt()
    GetSystemFontInfo("QlineEdit", &mFieldFontName, &mFieldFontStyle);
 
    GetSystemFontInfo("QAction", &mMenuFontName, &mMenuFontStyle);
-  
+
    GetSystemFontInfo("QPushButton", &mButtonFontName, &mButtonFontStyle);
 }
 
diff --git a/gfx/src/nsSystemFontsQt.h b/gfx/src/nsSystemFontsQt.h
index a09bc9b2fb9f..07bb1d06f0f7 100644
--- a/gfx/src/nsSystemFontsQt.h
+++ b/gfx/src/nsSystemFontsQt.h
@@ -39,9 +39,8 @@
 #ifndef _NS_SYSTEMFONTSQT_H_
 #define _NS_SYSTEMFONTSQT_H_
 
-#include <gfxFont.h>
-
-class QFont;
+#include "gfxFont.h"
+#include "nsIDeviceContext.h"
 
 class nsSystemFontsQt
 {
diff --git a/gfx/src/nsSystemFontsWin.cpp b/gfx/src/nsSystemFontsWin.cpp
index 1a728dd01d39..b11af263b053 100644
--- a/gfx/src/nsSystemFontsWin.cpp
+++ b/gfx/src/nsSystemFontsWin.cpp
@@ -36,12 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIRenderingContext.h"
-
-#include "gfxWindowsSurface.h"
-
 #include "nsSystemFontsWin.h"
-
+#include "gfxWindowsSurface.h"
 
 nsresult nsSystemFontsWin::CopyLogFontToNSFont(HDC* aHDC, const LOGFONTW* ptrLogFont,
                                                nsString *aFontName,
diff --git a/gfx/src/nsSystemFontsWin.h b/gfx/src/nsSystemFontsWin.h
index 420abe840cfd..9c3031577a0a 100644
--- a/gfx/src/nsSystemFontsWin.h
+++ b/gfx/src/nsSystemFontsWin.h
@@ -41,6 +41,7 @@
 
 #include "gfxFont.h"
 #include "nsIDeviceContext.h"
+#include <windows.h> // need HDC and LOGFONTW
 
 class nsSystemFontsWin
 {
@@ -58,4 +59,3 @@ private:
 };
 
 #endif /* _NS_SYSTEMFONTSWIN_H_ */
-
diff --git a/gfx/src/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
index cc41c55c2df6..9ce25ee3ea80 100644
--- a/gfx/src/nsThebesGfxFactory.cpp
+++ b/gfx/src/nsThebesGfxFactory.cpp
@@ -43,7 +43,6 @@
 #include "nsScriptableRegion.h"
 
 #include "nsThebesDeviceContext.h"
-#include "nsThebesRenderingContext.h"
 #include "nsThebesRegion.h"
 #include "nsThebesFontMetrics.h"
 #include "nsThebesFontEnumerator.h"
@@ -51,7 +50,6 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontMetrics)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesDeviceContext)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRenderingContext)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRegion)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontEnumerator)
 
@@ -99,7 +97,6 @@ nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult
 NS_DEFINE_NAMED_CID(NS_FONT_METRICS_CID);
 NS_DEFINE_NAMED_CID(NS_FONT_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_CID);
-NS_DEFINE_NAMED_CID(NS_RENDERING_CONTEXT_CID);
 NS_DEFINE_NAMED_CID(NS_REGION_CID);
 NS_DEFINE_NAMED_CID(NS_SCRIPTABLE_REGION_CID);
 
@@ -107,7 +104,6 @@ static const mozilla::Module::CIDEntry kThebesCIDs[] = {
     { &kNS_FONT_METRICS_CID, false, NULL, nsThebesFontMetricsConstructor },
     { &kNS_FONT_ENUMERATOR_CID, false, NULL, nsThebesFontEnumeratorConstructor },
     { &kNS_DEVICE_CONTEXT_CID, false, NULL, nsThebesDeviceContextConstructor },
-    { &kNS_RENDERING_CONTEXT_CID, false, NULL, nsThebesRenderingContextConstructor },
     { &kNS_REGION_CID, false, NULL, nsThebesRegionConstructor },
     { &kNS_SCRIPTABLE_REGION_CID, false, NULL, nsScriptableRegionConstructor },
     { NULL }
@@ -117,7 +113,6 @@ static const mozilla::Module::ContractIDEntry kThebesContracts[] = {
     { "@mozilla.org/gfx/fontmetrics;1", &kNS_FONT_METRICS_CID },
     { "@mozilla.org/gfx/fontenumerator;1", &kNS_FONT_ENUMERATOR_CID },
     { "@mozilla.org/gfx/devicecontext;1", &kNS_DEVICE_CONTEXT_CID },
-    { "@mozilla.org/gfx/renderingcontext;1", &kNS_RENDERING_CONTEXT_CID },
     { "@mozilla.org/gfx/region/nsThebes;1", &kNS_REGION_CID },
     { "@mozilla.org/gfx/region;1", &kNS_SCRIPTABLE_REGION_CID },
     { NULL }
diff --git a/gfx/src/nsThebesRenderingContext.h b/gfx/src/nsThebesRenderingContext.h
deleted file mode 100644
index 8ea72f7c7340..000000000000
--- a/gfx/src/nsThebesRenderingContext.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is thebes gfx
- *
- * The Initial Developer of the Original Code is
- * mozilla.org.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vladimir Vukicevic <vladimir@pobox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef NSTHEBESRENDERINGCONTEXT__H__
-#define NSTHEBESRENDERINGCONTEXT__H__
-
-#include "nsCOMPtr.h"
-#include "nsTArray.h"
-#include "nsIRenderingContext.h"
-#include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIWidget.h"
-#include "nsPoint.h"
-#include "nsSize.h"
-#include "nsColor.h"
-#include "nsRect.h"
-#include "nsIRegion.h"
-#include "nsTransform2D.h"
-#include "nsIThebesFontMetrics.h"
-#include "gfxContext.h"
-
-class nsThebesRenderingContext : public nsIRenderingContext
-{
-public:
-    nsThebesRenderingContext();
-    virtual ~nsThebesRenderingContext();
-
-    NS_DECL_ISUPPORTS
-
-
-    /**
-     * Return the maximum length of a string that can be handled by the platform
-     * using the current font metrics.
-     */
-    virtual PRInt32 GetMaxStringLength();
-
-    // Safe string method variants: by default, these defer to the more
-    // elaborate methods below
-    NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
-                        PRInt32 *aFontID = nsnull);
-    NS_IMETHOD GetWidth(const char* aString, nscoord& aWidth);
-    NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                          PRInt32 aFontID = -1,
-                          const nscoord* aSpacing = nsnull);
-
-    // Safe string methods
-    NS_IMETHOD GetWidth(const char* aString, PRUint32 aLength,
-                        nscoord& aWidth);
-    NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength,
-                        nscoord &aWidth, PRInt32 *aFontID = nsnull);
-    NS_IMETHOD GetWidth(char aC, nscoord &aWidth);
-    NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
-                        PRInt32 *aFontID);
-
-    NS_IMETHOD GetTextDimensions(const char* aString, PRUint32 aLength,
-                                 nsTextDimensions& aDimensions);
-    NS_IMETHOD GetTextDimensions(const PRUnichar* aString, PRUint32 aLength,
-                                 nsTextDimensions& aDimensions, PRInt32* aFontID = nsnull);
-
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
-    NS_IMETHOD GetTextDimensions(const char*       aString,
-                                 PRInt32           aLength,
-                                 PRInt32           aAvailWidth,
-                                 PRInt32*          aBreaks,
-                                 PRInt32           aNumBreaks,
-                                 nsTextDimensions& aDimensions,
-                                 PRInt32&          aNumCharsFit,
-                                 nsTextDimensions& aLastWordDimensions,
-                                 PRInt32*          aFontID = nsnull);
-
-    NS_IMETHOD GetTextDimensions(const PRUnichar*  aString,
-                                 PRInt32           aLength,
-                                 PRInt32           aAvailWidth,
-                                 PRInt32*          aBreaks,
-                                 PRInt32           aNumBreaks,
-                                 nsTextDimensions& aDimensions,
-                                 PRInt32&          aNumCharsFit,
-                                 nsTextDimensions& aLastWordDimensions,
-                                 PRInt32*          aFontID = nsnull);
-#endif
-#ifdef MOZ_MATHML
-    NS_IMETHOD GetBoundingMetrics(const char*        aString,
-                                  PRUint32           aLength,
-                                  nsBoundingMetrics& aBoundingMetrics);
-    NS_IMETHOD GetBoundingMetrics(const PRUnichar*   aString,
-                                  PRUint32           aLength,
-                                  nsBoundingMetrics& aBoundingMetrics,
-                                  PRInt32*           aFontID = nsnull);
-#endif
-    NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
-                          nscoord aX, nscoord aY,
-                          const nscoord* aSpacing = nsnull);
-    NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
-                          nscoord aX, nscoord aY,
-                          PRInt32 aFontID = -1,
-                          const nscoord* aSpacing = nsnull);
-
-    NS_IMETHOD Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
-    NS_IMETHOD Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
-    NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWidget);
-    NS_IMETHOD CommonInit(void);
-    virtual already_AddRefed<nsIDeviceContext> GetDeviceContext();
-    NS_IMETHOD PushState(void);
-    NS_IMETHOD PopState(void);
-    NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
-    NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle);
-    NS_IMETHOD SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
-    NS_IMETHOD SetColor(nscolor aColor);
-    NS_IMETHOD GetColor(nscolor &aColor) const;
-    NS_IMETHOD SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                       gfxUserFontSet *aUserFontSet);
-    NS_IMETHOD SetFont(const nsFont& aFont,
-                       gfxUserFontSet *aUserFontSet);
-    NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
-    virtual already_AddRefed<nsIFontMetrics> GetFontMetrics();
-    NS_IMETHOD Translate(const nsPoint& aPt);
-    NS_IMETHOD Scale(float aSx, float aSy);
-    virtual nsTransform2D* GetCurrentTransform();
-
-    NS_IMETHOD DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
-    NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
-    NS_IMETHOD DrawRect(const nsRect& aRect);
-    NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    NS_IMETHOD FillRect(const nsRect& aRect);
-    NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    NS_IMETHOD InvertRect(const nsRect& aRect);
-    NS_IMETHOD InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
-    NS_IMETHOD DrawEllipse(const nsRect& aRect);
-    NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    NS_IMETHOD FillEllipse(const nsRect& aRect);
-    NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-
-    NS_IMETHOD PushFilter(const nsRect& aRect, PRBool aAreaIsOpaque, float aOpacity);
-    NS_IMETHOD PopFilter();
-
-    virtual void* GetNativeGraphicData(GraphicDataType aType);
-
-    NS_IMETHOD PushTranslation(PushedTranslation* aState);
-    NS_IMETHOD PopTranslation(PushedTranslation* aState);
-    NS_IMETHOD SetTranslation(const nsPoint& aPoint);
-
-    /**
-     * Let the device context know whether we want text reordered with
-     * right-to-left base direction
-     */
-    NS_IMETHOD SetRightToLeftText(PRBool aIsRTL);
-    NS_IMETHOD GetRightToLeftText(PRBool* aIsRTL);
-    virtual void SetTextRunRTL(PRBool aIsRTL);
-
-    virtual PRInt32 GetPosition(const PRUnichar *aText,
-                                PRUint32 aLength,
-                                nsPoint aPt);
-    NS_IMETHOD GetRangeWidth(const PRUnichar *aText,
-                             PRUint32 aLength,
-                             PRUint32 aStart,
-                             PRUint32 aEnd,
-                             PRUint32 &aWidth);
-    NS_IMETHOD GetRangeWidth(const char *aText,
-                             PRUint32 aLength,
-                             PRUint32 aStart,
-                             PRUint32 aEnd,
-                             PRUint32 &aWidth);
-
-    NS_IMETHOD RenderEPS(const nsRect& aRect, FILE *aDataFile);
-
-    // Thebes specific stuff
-
-    gfxContext *ThebesContext() { return mThebes; }
-
-    nsTransform2D& CurrentTransform();
-
-    void TransformCoord (nscoord *aX, nscoord *aY);
-
-protected:
-    nsresult GetWidthInternal(const char *aString, PRUint32 aLength, nscoord &aWidth);
-    nsresult GetWidthInternal(const PRUnichar *aString, PRUint32 aLength, nscoord &aWidth,
-                              PRInt32 *aFontID = nsnull);
-
-    nsresult DrawStringInternal(const char *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                const nscoord* aSpacing = nsnull);
-    nsresult DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                PRInt32 aFontID = -1,
-                                const nscoord* aSpacing = nsnull);
-
-    nsresult GetTextDimensionsInternal(const char*       aString,
-                                       PRUint32          aLength,
-                                       nsTextDimensions& aDimensions);
-    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
-                                       PRUint32          aLength,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32*          aFontID = nsnull);
-    nsresult GetTextDimensionsInternal(const char*       aString,
-                                       PRInt32           aLength,
-                                       PRInt32           aAvailWidth,
-                                       PRInt32*          aBreaks,
-                                       PRInt32           aNumBreaks,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32&          aNumCharsFit,
-                                       nsTextDimensions& aLastWordDimensions,
-                                       PRInt32*          aFontID = nsnull);
-    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
-                                       PRInt32           aLength,
-                                       PRInt32           aAvailWidth,
-                                       PRInt32*          aBreaks,
-                                       PRInt32           aNumBreaks,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32&          aNumCharsFit,
-                                       nsTextDimensions& aLastWordDimensions,
-                                       PRInt32*          aFontID = nsnull);
-
-#ifdef MOZ_MATHML
-    /**
-     * Returns metrics (in app units) of an 8-bit character string
-     */
-    nsresult GetBoundingMetricsInternal(const char*        aString,
-                                        PRUint32           aLength,
-                                        nsBoundingMetrics& aBoundingMetrics);
-
-    /**
-     * Returns metrics (in app units) of a Unicode character string
-     */
-    nsresult GetBoundingMetricsInternal(const PRUnichar*   aString,
-                                        PRUint32           aLength,
-                                        nsBoundingMetrics& aBoundingMetrics,
-                                        PRInt32*           aFontID = nsnull);
-
-#endif /* MOZ_MATHML */
-
-    nsCOMPtr<nsIDeviceContext> mDeviceContext;
-    // cached app units per device pixel value
-    double mP2A;
-
-    nsCOMPtr<nsIWidget> mWidget;
-
-    // we need to manage our own clip region (since we can't get at
-    // the old one from cairo)
-    nsCOMPtr<nsIThebesFontMetrics> mFontMetrics;
-
-    nsLineStyle mLineStyle;
-    nscolor mColor;
-
-    // the rendering context
-    nsRefPtr<gfxContext> mThebes;
-
-    // for handing out to people
-    void UpdateTempTransformMatrix();
-    nsTransform2D mTempTransform;
-
-    // keeping track of pushgroup/popgroup opacities
-    nsTArray<float> mOpacityArray;
-};
-
-#endif  // NSCAIRORENDERINGCONTEXT__H__
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index a567587a8079..0ac4b20a3848 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -135,7 +135,6 @@ extern nsISupportsArray *gDraggedTransferables;
 
 ChildView* ChildViewMouseTracker::sLastMouseEventView = nil;
 
-static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
 #ifdef INVALIDATE_DEBUGGING
 static void blinkRect(Rect* r);
 static void blinkRgn(RgnHandle rgn);
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 4284ef3fd1ae..c175e4074b34 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -355,9 +355,6 @@ PRBool          gDisableNativeTheme               = PR_FALSE;
 static PRBool   gWindowsVisible                   = PR_FALSE;
 
 static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
-#ifdef WINCE_WINDOWS_MOBILE
-static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
-#endif
 
 // General purpose user32.dll hook object
 static WindowsDllInterceptor sUser32Intercept;
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index 23a4b011611d..af1a2486dd06 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -107,15 +107,6 @@ using namespace mozilla::layers;
 static nsAutoPtr<PRUint8>  sSharedSurfaceData;
 static gfxIntSize          sSharedSurfaceSize;
 
-/**************************************************************
- *
- * SECTION: global variables.
- *
- **************************************************************/
-
-static NS_DEFINE_CID(kRegionCID,                  NS_REGION_CID);
-static NS_DEFINE_IID(kRenderingContextCID,        NS_RENDERING_CONTEXT_CID);
-
 /**************************************************************
  **************************************************************
  **

From c510bc3046385170fe6ae5799ee27adf9eae6554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=BCchler?= <jan@kuechler-wuppertal.de>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 141/509] Bug 266236 part 3: Mechanical rename of
 nsIRenderingContext and nsThebesRenderingContext to nsRenderingContext.
 Mechanical substitution of nsRefPtr<nsRenderingContext> for
 nsCOMPtr<nsRenderingContext>.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
extra : rebase_source : 34884bfcafd885feaf73300bc7246cd192062a48
---
 accessible/src/msaa/nsTextAccessibleWrap.cpp  |  7 +---
 accessible/src/msaa/nsTextAccessibleWrap.h    |  2 +-
 .../canvas/public/nsICanvasElementExternal.h  |  2 +-
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  2 +-
 .../html/content/public/nsHTMLCanvasElement.h |  2 +-
 .../html/content/src/nsHTMLAudioElement.cpp   |  2 +-
 .../html/content/src/nsHTMLMediaElement.cpp   |  2 +-
 .../html/content/src/nsHTMLVideoElement.cpp   |  2 +-
 content/media/nsMediaDecoder.cpp              |  2 +-
 embedding/browser/webBrowser/nsWebBrowser.cpp |  2 +-
 gfx/layers/basic/BasicLayers.cpp              |  2 +-
 gfx/src/nsIDeviceContext.h                    |  8 ++--
 gfx/src/nsIThebesFontMetrics.h                | 16 +++----
 gfx/src/nsITheme.h                            |  6 +--
 gfx/src/nsRenderingContext.cpp                |  2 +-
 gfx/src/nsThebesDeviceContext.cpp             | 16 +++----
 gfx/src/nsThebesDeviceContext.h               |  8 ++--
 gfx/src/nsThebesFontMetrics.cpp               | 16 +++----
 gfx/src/nsThebesFontMetrics.h                 | 22 +++++-----
 layout/base/FrameLayerBuilder.cpp             |  2 +-
 layout/base/nsBidiPresUtils.cpp               | 14 +++----
 layout/base/nsBidiPresUtils.h                 | 10 ++---
 layout/base/nsCSSRendering.cpp                | 36 ++++++++--------
 layout/base/nsCSSRendering.h                  | 22 +++++-----
 layout/base/nsCaret.cpp                       |  4 +-
 layout/base/nsCaret.h                         |  4 +-
 layout/base/nsDisplayList.cpp                 | 26 ++++++------
 layout/base/nsDisplayList.h                   | 38 ++++++++---------
 layout/base/nsDocumentViewer.cpp              |  2 +-
 layout/base/nsIPresShell.h                    |  6 +--
 layout/base/nsLayoutUtils.cpp                 | 32 +++++++-------
 layout/base/nsLayoutUtils.h                   | 28 ++++++-------
 layout/base/nsPresContext.cpp                 |  2 +-
 layout/base/nsPresContext.h                   |  2 +-
 layout/base/nsPresShell.cpp                   | 24 +++++------
 layout/forms/nsButtonFrameRenderer.cpp        | 18 ++++----
 layout/forms/nsButtonFrameRenderer.h          |  4 +-
 layout/forms/nsComboboxControlFrame.cpp       | 12 +++---
 layout/forms/nsComboboxControlFrame.h         |  8 ++--
 layout/forms/nsFieldSetFrame.cpp              | 24 +++++------
 layout/forms/nsFileControlFrame.cpp           |  2 +-
 layout/forms/nsFileControlFrame.h             |  2 +-
 layout/forms/nsGfxCheckboxControlFrame.cpp    |  4 +-
 layout/forms/nsGfxRadioControlFrame.cpp       |  2 +-
 layout/forms/nsHTMLButtonControlFrame.cpp     |  6 +--
 layout/forms/nsHTMLButtonControlFrame.h       |  6 +--
 layout/forms/nsImageControlFrame.cpp          |  2 +-
 layout/forms/nsIsIndexFrame.cpp               |  2 +-
 layout/forms/nsIsIndexFrame.h                 |  2 +-
 layout/forms/nsListControlFrame.cpp           |  6 +--
 layout/forms/nsListControlFrame.h             |  6 +--
 layout/forms/nsSelectsAreaFrame.cpp           |  2 +-
 layout/forms/nsTextControlFrame.cpp           |  6 +--
 layout/forms/nsTextControlFrame.h             |  6 +--
 layout/generic/nsBRFrame.cpp                  | 18 ++++----
 layout/generic/nsBlockFrame.cpp               |  6 +--
 layout/generic/nsBlockFrame.h                 |  4 +-
 layout/generic/nsBulletFrame.cpp              | 14 +++----
 layout/generic/nsBulletFrame.h                |  8 ++--
 layout/generic/nsCanvasFrame.cpp              | 12 +++---
 layout/generic/nsCanvasFrame.h                | 10 ++---
 layout/generic/nsColumnSetFrame.cpp           | 14 +++----
 layout/generic/nsContainerFrame.cpp           |  6 +--
 layout/generic/nsContainerFrame.h             |  4 +-
 layout/generic/nsFirstLetterFrame.cpp         | 10 ++---
 layout/generic/nsFirstLetterFrame.h           | 10 ++---
 layout/generic/nsFrame.cpp                    | 38 ++++++++---------
 layout/generic/nsFrame.h                      | 18 ++++----
 layout/generic/nsFrameSetFrame.cpp            | 16 +++----
 layout/generic/nsFrameSetFrame.h              |  2 +-
 layout/generic/nsGfxScrollFrame.cpp           |  6 +--
 layout/generic/nsGfxScrollFrame.h             | 12 +++---
 layout/generic/nsHTMLCanvasFrame.cpp          |  6 +--
 layout/generic/nsHTMLCanvasFrame.h            |  6 +--
 layout/generic/nsHTMLContainerFrame.cpp       | 10 ++---
 layout/generic/nsHTMLReflowMetrics.h          |  2 +-
 layout/generic/nsHTMLReflowState.cpp          |  4 +-
 layout/generic/nsHTMLReflowState.h            | 10 ++---
 layout/generic/nsIFrame.h                     | 20 ++++-----
 layout/generic/nsIScrollableFrame.h           |  2 +-
 layout/generic/nsImageFrame.cpp               | 24 +++++------
 layout/generic/nsImageFrame.h                 | 18 ++++----
 layout/generic/nsImageMap.cpp                 | 22 +++++-----
 layout/generic/nsImageMap.h                   |  4 +-
 layout/generic/nsInlineFrame.cpp              |  8 ++--
 layout/generic/nsInlineFrame.h                |  6 +--
 layout/generic/nsLeafFrame.cpp                |  6 +--
 layout/generic/nsLeafFrame.h                  |  6 +--
 layout/generic/nsLineLayout.cpp               |  4 +-
 layout/generic/nsObjectFrame.cpp              | 24 +++++------
 layout/generic/nsObjectFrame.h                | 12 +++---
 layout/generic/nsPageContentFrame.cpp         |  4 +-
 layout/generic/nsPageContentFrame.h           |  2 +-
 layout/generic/nsPageFrame.cpp                | 20 ++++-----
 layout/generic/nsPageFrame.h                  | 12 +++---
 layout/generic/nsPlaceholderFrame.cpp         | 12 +++---
 layout/generic/nsPlaceholderFrame.h           |  8 ++--
 layout/generic/nsSimplePageSequence.cpp       |  8 ++--
 layout/generic/nsSimplePageSequence.h         |  2 +-
 layout/generic/nsSubDocumentFrame.cpp         | 10 ++---
 layout/generic/nsSubDocumentFrame.h           |  8 ++--
 layout/generic/nsTextFrame.h                  | 20 ++++-----
 layout/generic/nsTextFrameThebes.cpp          | 38 ++++++++---------
 layout/generic/nsVideoFrame.cpp               | 10 ++---
 layout/generic/nsVideoFrame.h                 |  8 ++--
 layout/generic/nsViewportFrame.cpp            |  4 +-
 layout/generic/nsViewportFrame.h              |  4 +-
 layout/inspector/src/inFlasher.cpp            |  6 +--
 layout/inspector/src/inFlasher.h              |  6 +--
 layout/inspector/src/inLayoutUtils.h          |  2 +-
 layout/mathml/nsIMathMLFrame.h                |  4 +-
 layout/mathml/nsMathMLChar.cpp                | 42 +++++++++----------
 layout/mathml/nsMathMLChar.h                  | 16 +++----
 layout/mathml/nsMathMLContainerFrame.cpp      | 24 +++++------
 layout/mathml/nsMathMLContainerFrame.h        | 18 ++++----
 layout/mathml/nsMathMLForeignFrameWrapper.cpp |  2 +-
 layout/mathml/nsMathMLFrame.cpp               | 12 +++---
 layout/mathml/nsMathMLFrame.h                 |  8 ++--
 layout/mathml/nsMathMLTokenFrame.cpp          |  4 +-
 layout/mathml/nsMathMLTokenFrame.h            |  2 +-
 layout/mathml/nsMathMLmactionFrame.cpp        |  4 +-
 layout/mathml/nsMathMLmactionFrame.h          |  2 +-
 layout/mathml/nsMathMLmencloseFrame.cpp       | 12 +++---
 layout/mathml/nsMathMLmencloseFrame.h         |  6 +--
 layout/mathml/nsMathMLmfencedFrame.cpp        |  8 ++--
 layout/mathml/nsMathMLmfencedFrame.h          |  4 +-
 layout/mathml/nsMathMLmfracFrame.cpp          | 12 +++---
 layout/mathml/nsMathMLmfracFrame.h            |  6 +--
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp  |  4 +-
 layout/mathml/nsMathMLmmultiscriptsFrame.h    |  2 +-
 layout/mathml/nsMathMLmoFrame.cpp             |  6 +--
 layout/mathml/nsMathMLmoFrame.h               |  4 +-
 layout/mathml/nsMathMLmoverFrame.cpp          |  4 +-
 layout/mathml/nsMathMLmoverFrame.h            |  2 +-
 layout/mathml/nsMathMLmpaddedFrame.cpp        |  4 +-
 layout/mathml/nsMathMLmpaddedFrame.h          |  2 +-
 layout/mathml/nsMathMLmphantomFrame.cpp       |  2 +-
 layout/mathml/nsMathMLmrootFrame.cpp          |  6 +--
 layout/mathml/nsMathMLmrootFrame.h            |  2 +-
 layout/mathml/nsMathMLmrowFrame.cpp           |  2 +-
 layout/mathml/nsMathMLmspaceFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmstyleFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmsubFrame.cpp           |  6 +--
 layout/mathml/nsMathMLmsubFrame.h             |  4 +-
 layout/mathml/nsMathMLmsubsupFrame.cpp        |  6 +--
 layout/mathml/nsMathMLmsubsupFrame.h          |  4 +-
 layout/mathml/nsMathMLmsupFrame.cpp           |  6 +--
 layout/mathml/nsMathMLmsupFrame.h             |  4 +-
 layout/mathml/nsMathMLmtableFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmunderFrame.cpp         |  4 +-
 layout/mathml/nsMathMLmunderFrame.h           |  2 +-
 layout/mathml/nsMathMLmunderoverFrame.cpp     |  4 +-
 layout/mathml/nsMathMLmunderoverFrame.h       |  2 +-
 layout/printing/nsPrintEngine.cpp             | 14 +++----
 layout/printing/nsPrintEngine.h               |  6 +--
 .../svg/base/src/nsSVGForeignObjectFrame.cpp  |  4 +-
 layout/svg/base/src/nsSVGIntegrationUtils.cpp |  8 ++--
 layout/svg/base/src/nsSVGIntegrationUtils.h   |  6 +--
 layout/svg/base/src/nsSVGOuterSVGFrame.cpp    | 12 +++---
 layout/svg/base/src/nsSVGOuterSVGFrame.h      |  8 ++--
 layout/svg/base/src/nsSVGUtils.cpp            |  4 +-
 layout/svg/base/src/nsSVGUtils.h              |  8 ++--
 layout/tables/BasicTableLayoutStrategy.cpp    | 14 +++----
 layout/tables/BasicTableLayoutStrategy.h      |  8 ++--
 layout/tables/FixedTableLayoutStrategy.cpp    |  4 +-
 layout/tables/FixedTableLayoutStrategy.h      |  4 +-
 layout/tables/nsITableLayoutStrategy.h        |  6 +--
 layout/tables/nsTableCellFrame.cpp            | 24 +++++------
 layout/tables/nsTableCellFrame.h              | 14 +++----
 layout/tables/nsTableFrame.cpp                | 42 +++++++++----------
 layout/tables/nsTableFrame.h                  | 18 ++++----
 layout/tables/nsTableOuterFrame.cpp           | 12 +++---
 layout/tables/nsTableOuterFrame.h             |  8 ++--
 layout/tables/nsTablePainter.cpp              |  2 +-
 layout/tables/nsTablePainter.h                |  4 +-
 layout/tables/nsTableRowFrame.cpp             |  6 +--
 layout/tables/nsTableRowGroupFrame.cpp        |  6 +--
 layout/xul/base/src/nsBox.cpp                 |  4 +-
 layout/xul/base/src/nsBoxFrame.cpp            | 20 ++++-----
 layout/xul/base/src/nsBoxFrame.h              | 14 +++----
 layout/xul/base/src/nsBoxLayoutState.cpp      |  2 +-
 layout/xul/base/src/nsBoxLayoutState.h        |  8 ++--
 layout/xul/base/src/nsDocElementBoxFrame.cpp  |  2 +-
 layout/xul/base/src/nsGroupBoxFrame.cpp       |  8 ++--
 layout/xul/base/src/nsIBoxLayout.h            |  2 +-
 layout/xul/base/src/nsImageBoxFrame.cpp       |  8 ++--
 layout/xul/base/src/nsImageBoxFrame.h         |  2 +-
 layout/xul/base/src/nsLeafBoxFrame.cpp        |  8 ++--
 layout/xul/base/src/nsLeafBoxFrame.h          |  6 +--
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |  4 +-
 layout/xul/base/src/nsRootBoxFrame.cpp        |  2 +-
 layout/xul/base/src/nsSplitterFrame.cpp       |  2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        | 26 ++++++------
 layout/xul/base/src/nsTextBoxFrame.h          | 14 +++----
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 40 +++++++++---------
 .../xul/base/src/tree/src/nsTreeBodyFrame.h   | 30 ++++++-------
 tools/trace-malloc/types.dat                  |  2 +-
 view/public/nsIViewManager.h                  |  2 +-
 view/public/nsIViewObserver.h                 |  2 +-
 widget/public/nsGUIEvent.h                    |  2 +-
 widget/public/nsIWidget.h                     |  2 +-
 widget/src/android/nsWindow.cpp               |  2 +-
 widget/src/cocoa/nsNativeThemeCocoa.h         |  4 +-
 widget/src/cocoa/nsNativeThemeCocoa.mm        |  6 +--
 widget/src/gtk2/nsNativeThemeGTK.cpp          |  4 +-
 widget/src/gtk2/nsNativeThemeGTK.h            |  4 +-
 widget/src/gtk2/nsWindow.cpp                  |  2 +-
 widget/src/qt/nsNativeThemeQt.cpp             |  8 ++--
 widget/src/qt/nsNativeThemeQt.h               |  8 ++--
 widget/src/qt/nsWindow.cpp                    |  2 +-
 widget/src/windows/nsNativeThemeWin.cpp       | 10 ++---
 widget/src/windows/nsNativeThemeWin.h         |  8 ++--
 widget/src/windows/nsWindowGfx.cpp            |  2 +-
 widget/src/xpwidgets/nsBaseDragService.h      |  2 +-
 214 files changed, 932 insertions(+), 937 deletions(-)

diff --git a/accessible/src/msaa/nsTextAccessibleWrap.cpp b/accessible/src/msaa/nsTextAccessibleWrap.cpp
index 43d4d25a91c9..f7e0ad5e0ef2 100644
--- a/accessible/src/msaa/nsTextAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsTextAccessibleWrap.cpp
@@ -36,19 +36,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// NOTE: alphabetically ordered
 #include "nsTextAccessibleWrap.h"
 #include "ISimpleDOMText_i.c"
 
 #include "nsCoreUtils.h"
 #include "nsDocAccessible.h"
-
-#include "nsIThebesFontMetrics.h"
 #include "nsIFrame.h"
+#include "nsIThebesFontMetrics.h"
 #include "nsPresContext.h"
-#include "nsIPresShell.h"
-#include "nsIRenderingContext.h"
-#include "nsIComponentManager.h"
 
 #include "gfxFont.h"
 
diff --git a/accessible/src/msaa/nsTextAccessibleWrap.h b/accessible/src/msaa/nsTextAccessibleWrap.h
index 356c2e1bccff..b0de4df21126 100644
--- a/accessible/src/msaa/nsTextAccessibleWrap.h
+++ b/accessible/src/msaa/nsTextAccessibleWrap.h
@@ -44,7 +44,7 @@
 #include "nsRect.h"
 
 class nsIFrame;
-class nsIRenderingContext;
+class nsRenderingContext;
 
 class nsTextAccessibleWrap : public nsTextAccessible, 
                              public ISimpleDOMText
diff --git a/content/canvas/public/nsICanvasElementExternal.h b/content/canvas/public/nsICanvasElementExternal.h
index 0ecc65c4de17..62b30a94face 100644
--- a/content/canvas/public/nsICanvasElementExternal.h
+++ b/content/canvas/public/nsICanvasElementExternal.h
@@ -48,7 +48,7 @@ struct gfxRect;
 #define NS_ICANVASELEMENTEXTERNAL_IID \
   { 0x51870f54, 0x6c4c, 0x469a, {0xad, 0x46, 0xf0, 0xa9, 0x8e, 0x32, 0xa7, 0xe2 } }
 
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsICanvasRenderingContextInternal;
 
 struct _cairo_surface;
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 14f1010bf31b..5a8f0c462cc6 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -76,7 +76,7 @@
 #include "nsReadableUtils.h"
 
 #include "nsColor.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsGfxCIID.h"
 #include "nsIScriptSecurityManager.h"
diff --git a/content/html/content/public/nsHTMLCanvasElement.h b/content/html/content/public/nsHTMLCanvasElement.h
index 99b3a9a41c52..52dc798e09eb 100644
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@@ -48,7 +48,7 @@
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 
 #include "nsICanvasRenderingContextInternal.h"
 #include "nsICanvasElementExternal.h"
diff --git a/content/html/content/src/nsHTMLAudioElement.cpp b/content/html/content/src/nsHTMLAudioElement.cpp
index 2cec15d8749f..630ad57859fc 100644
--- a/content/html/content/src/nsHTMLAudioElement.cpp
+++ b/content/html/content/src/nsHTMLAudioElement.cpp
@@ -61,7 +61,7 @@
 #include "jstypedarray.h"
 #include "nsJSUtils.h"
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 8e9bd2c17a37..ca09e2835816 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -65,7 +65,7 @@
 #include "nsIXPConnect.h"
 #include "jsapi.h"
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLVideoElement.cpp b/content/html/content/src/nsHTMLVideoElement.cpp
index cca44102e242..25d6e2963099 100644
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -58,7 +58,7 @@
 #include "nsIXPConnect.h"
 #include "jsapi.h"
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/media/nsMediaDecoder.cpp b/content/media/nsMediaDecoder.cpp
index 38234daeb866..52e31158d925 100644
--- a/content/media/nsMediaDecoder.cpp
+++ b/content/media/nsMediaDecoder.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOMHTMLMediaElement.h"
 #include "nsNetUtil.h"
 #include "nsHTMLMediaElement.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "nsPresContext.h"
 #include "nsDOMError.h"
diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index f0b35569008e..b335a29edbde 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -76,7 +76,7 @@
 #include "gfxContext.h"
 
 // for painting the background window
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsIRegion.h"
 #include "nsILookAndFeel.h"
diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 55ac3fb5b772..0ed40484b5b6 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -48,7 +48,7 @@
 
 #include "nsTArray.h"
 #include "nsGUIEvent.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
 #include "gfxPattern.h"
diff --git a/gfx/src/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
index 4e0c55194956..2851ddd4ef95 100644
--- a/gfx/src/nsIDeviceContext.h
+++ b/gfx/src/nsIDeviceContext.h
@@ -220,7 +220,7 @@ public:
    * @param aContext out parameter for new rendering context
    * @return error status
    */
-  NS_IMETHOD  CreateRenderingContext(nsIView *aView, nsIRenderingContext *&aContext) = 0;
+  NS_IMETHOD  CreateRenderingContext(nsIView *aView, nsRenderingContext *&aContext) = 0;
 
   /**
    * Create a rendering context and initialize it from an nsIWidget
@@ -228,21 +228,21 @@ public:
    * @param aContext out parameter for new rendering context
    * @return error status
    */
-  NS_IMETHOD  CreateRenderingContext(nsIWidget *aWidget, nsIRenderingContext *&aContext) = 0;
+  NS_IMETHOD  CreateRenderingContext(nsIWidget *aWidget, nsRenderingContext *&aContext) = 0;
 
   /**
    * Create a rendering context and initialize it.
    * @param aContext out parameter for new rendering context
    * @return error status
    */
-  NS_IMETHOD  CreateRenderingContext(nsIRenderingContext *&aContext) = 0;
+  NS_IMETHOD  CreateRenderingContext(nsRenderingContext *&aContext) = 0;
 
   /**
    * Create an uninitalised rendering context.
    * @param aContext out parameter for new rendering context
    * @return error status
    */
-  NS_IMETHOD  CreateRenderingContextInstance(nsIRenderingContext *&aContext) = 0;
+  NS_IMETHOD  CreateRenderingContextInstance(nsRenderingContext *&aContext) = 0;
 
   /**
    * We are in the process of creating the native widget for aWidget.
diff --git a/gfx/src/nsIThebesFontMetrics.h b/gfx/src/nsIThebesFontMetrics.h
index bb9289bc7d8d..43e80f9c111f 100644
--- a/gfx/src/nsIThebesFontMetrics.h
+++ b/gfx/src/nsIThebesFontMetrics.h
@@ -51,10 +51,10 @@ public:
     // width in points, not twips.  Callers must convert it if they
     // want it in another format.
     virtual nsresult GetWidth(const char* aString, PRUint32 aLength,
-                              nscoord& aWidth, nsThebesRenderingContext *aContext) = 0;
+                              nscoord& aWidth, nsRenderingContext *aContext) = 0;
     virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
                               nscoord& aWidth, PRInt32 *aFontID,
-                              nsThebesRenderingContext *aContext) = 0;
+                              nsRenderingContext *aContext) = 0;
 
     // Get the text dimensions for this string
     virtual nsresult GetTextDimensions(const PRUnichar* aString,
@@ -84,16 +84,16 @@ public:
     virtual nsresult DrawString(const char *aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
                                 const nscoord* aSpacing,
-                                nsThebesRenderingContext *aContext) = 0;
+                                nsRenderingContext *aContext) = 0;
     virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
                                 PRInt32 aFontID,
                                 const nscoord* aSpacing,
-                                nsThebesRenderingContext *aContext) = 0;
+                                nsRenderingContext *aContext) = 0;
     virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
-                                nsIRenderingContext *aContext,
-                                nsIRenderingContext *aTextRunConstructionContext) = 0;
+                                nsRenderingContext *aContext,
+                                nsRenderingContext *aTextRunConstructionContext) = 0;
 
 #ifdef MOZ_MATHML
     // These two functions get the bounding metrics for this handle,
@@ -101,12 +101,12 @@ public:
     // caller will have to update them to twips before passing it
     // back.
     virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics) = 0;
     // aCachedOffset will be updated with a new offset.
     virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
                                         PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics) = 0;
 #endif /* MOZ_MATHML */
 
diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h
index 56c987067bdd..8cc89528e851 100644
--- a/gfx/src/nsITheme.h
+++ b/gfx/src/nsITheme.h
@@ -51,7 +51,7 @@ struct nsIntSize;
 struct nsFont;
 struct nsIntMargin;
 class nsPresContext;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIDeviceContext;
 class nsIFrame;
 class nsIContent;
@@ -95,7 +95,7 @@ public:
    * @param aRect the rectangle defining the area occupied by the widget
    * @param aDirtyRect the rectangle that needs to be drawn
    */
-  NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
+  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
@@ -150,7 +150,7 @@ public:
    * minimum size; if false, this size is the only valid size for the
    * widget.
    */
-  NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext,
+  NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntSize* aResult,
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index b29198285ae6..3cb776297425 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -108,7 +108,7 @@ static PRInt32 FindSafeLength(nsRenderingContext* aContext,
 }
 
 //////////////////////////////////////////////////////////////////////
-//// nsIRenderingContext
+//// nsRenderingContext
 
 nsresult
 nsRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesSurface)
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index cd5ad439ed02..a0f20ad0f1da 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -50,7 +50,7 @@
 #include "mozilla/Services.h"
 
 #include "nsThebesDeviceContext.h"
-#include "nsThebesRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxUserFontSet.h"
 #include "gfxPlatform.h"
 
@@ -711,7 +711,7 @@ nsThebesDeviceContext::Init(nsIWidget *aWidget)
 
 NS_IMETHODIMP
 nsThebesDeviceContext::CreateRenderingContext(nsIView *aView,
-                                              nsIRenderingContext *&aContext)
+                                              nsRenderingContext *&aContext)
 {
     // This is currently only called by the caret code
     NS_ENSURE_ARG_POINTER(aView);
@@ -725,12 +725,12 @@ nsThebesDeviceContext::CreateRenderingContext(nsIView *aView,
 
 NS_IMETHODIMP
 nsThebesDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
-                                              nsIRenderingContext *&aContext)
+                                              nsRenderingContext *&aContext)
 {
     nsresult rv;
 
     aContext = nsnull;
-    nsCOMPtr<nsIRenderingContext> pContext;
+    nsRefPtr<nsRenderingContext> pContext;
     rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
     if (NS_SUCCEEDED(rv)) {
         nsRefPtr<gfxASurface> surface(aWidget->GetThebesSurface());
@@ -749,12 +749,12 @@ nsThebesDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
 }
 
 NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContext(nsIRenderingContext *&aContext)
+nsThebesDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
 {
     nsresult rv = NS_OK;
 
     aContext = nsnull;
-    nsCOMPtr<nsIRenderingContext> pContext;
+    nsRefPtr<nsRenderingContext> pContext;
     rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
     if (NS_SUCCEEDED(rv)) {
         if (mPrintingSurface)
@@ -773,9 +773,9 @@ nsThebesDeviceContext::CreateRenderingContext(nsIRenderingContext *&aContext)
 }
 
 NS_IMETHODIMP
-nsThebesDeviceContext::CreateRenderingContextInstance(nsIRenderingContext *&aContext)
+nsThebesDeviceContext::CreateRenderingContextInstance(nsRenderingContext *&aContext)
 {
-    nsCOMPtr<nsIRenderingContext> renderingContext = new nsThebesRenderingContext();
+    nsRefPtr<nsRenderingContext> renderingContext = new nsRenderingContext();
     if (!renderingContext)
         return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/gfx/src/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
index 743f2b79904b..230502f3407c 100644
--- a/gfx/src/nsThebesDeviceContext.h
+++ b/gfx/src/nsThebesDeviceContext.h
@@ -83,10 +83,10 @@ public:
 
     NS_IMETHOD Init(nsIWidget *aWidget);
     NS_IMETHOD InitForPrinting(nsIDeviceContextSpec *aDevSpec);
-    NS_IMETHOD CreateRenderingContext(nsIView *aView, nsIRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContext(nsIWidget *aWidget, nsIRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContext(nsIRenderingContext *&aContext);
-    NS_IMETHOD CreateRenderingContextInstance(nsIRenderingContext *&aContext);
+    NS_IMETHOD CreateRenderingContext(nsIView *aView, nsRenderingContext *&aContext);
+    NS_IMETHOD CreateRenderingContext(nsIWidget *aWidget, nsRenderingContext *&aContext);
+    NS_IMETHOD CreateRenderingContext(nsRenderingContext *&aContext);
+    NS_IMETHOD CreateRenderingContextInstance(nsRenderingContext *&aContext);
 
     NS_IMETHOD GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                              gfxUserFontSet* aUserFontSet,
diff --git a/gfx/src/nsThebesFontMetrics.cpp b/gfx/src/nsThebesFontMetrics.cpp
index 6dfda868b145..9adf94b354eb 100644
--- a/gfx/src/nsThebesFontMetrics.cpp
+++ b/gfx/src/nsThebesFontMetrics.cpp
@@ -296,7 +296,7 @@ public:
 
 nsresult 
 nsThebesFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
-                              nsThebesRenderingContext *aContext)
+                              nsRenderingContext *aContext)
 {
     if (aLength == 0) {
         aWidth = 0;
@@ -320,7 +320,7 @@ nsThebesFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aW
 nsresult
 nsThebesFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
                               nscoord& aWidth, PRInt32 *aFontID,
-                              nsThebesRenderingContext *aContext)
+                              nsRenderingContext *aContext)
 {
     if (aLength == 0) {
         aWidth = 0;
@@ -383,7 +383,7 @@ nsresult
 nsThebesFontMetrics::DrawString(const char *aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
                                 const nscoord* aSpacing,
-                                nsThebesRenderingContext *aContext)
+                                nsRenderingContext *aContext)
 {
     if (aLength == 0)
         return NS_OK;
@@ -405,8 +405,8 @@ nsThebesFontMetrics::DrawString(const char *aString, PRUint32 aLength,
 nsresult
 nsThebesFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
-                                nsIRenderingContext *aContext,
-                                nsIRenderingContext *aTextRunConstructionContext)
+                                nsRenderingContext *aContext,
+                                nsRenderingContext *aTextRunConstructionContext)
 {
     if (aLength == 0)
         return NS_OK;
@@ -428,7 +428,7 @@ nsThebesFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
 
 static void
 GetTextRunBoundingMetrics(gfxTextRun *aTextRun, PRUint32 aStart, PRUint32 aLength,
-                          nsThebesRenderingContext *aContext,
+                          nsRenderingContext *aContext,
                           nsBoundingMetrics &aBoundingMetrics)
 {
     StubPropertyProvider provider;
@@ -447,7 +447,7 @@ GetTextRunBoundingMetrics(gfxTextRun *aTextRun, PRUint32 aStart, PRUint32 aLengt
 
 nsresult
 nsThebesFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
@@ -465,7 +465,7 @@ nsThebesFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
 
 nsresult
 nsThebesFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
diff --git a/gfx/src/nsThebesFontMetrics.h b/gfx/src/nsThebesFontMetrics.h
index 559cc3f29bff..1871182e37c6 100644
--- a/gfx/src/nsThebesFontMetrics.h
+++ b/gfx/src/nsThebesFontMetrics.h
@@ -40,7 +40,7 @@
 #define NSTHEBESFONTMETRICS__H__
 
 #include "nsIThebesFontMetrics.h"
-#include "nsThebesRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsCOMPtr.h"
 #include "nsThebesDeviceContext.h"
 #include "nsIAtom.h"
@@ -83,10 +83,10 @@ public:
 
 
     virtual nsresult GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
-                              nsThebesRenderingContext *aContext);
+                              nsRenderingContext *aContext);
     virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
                               nscoord& aWidth, PRInt32 *aFontID,
-                              nsThebesRenderingContext *aContext);
+                              nsRenderingContext *aContext);
 
     // Get the text dimensions for this string
     virtual nsresult GetTextDimensions(const PRUnichar* aString,
@@ -116,30 +116,30 @@ public:
     virtual nsresult DrawString(const char *aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
                                 const nscoord* aSpacing,
-                                nsThebesRenderingContext *aContext);
+                                nsRenderingContext *aContext);
     virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
                                 PRInt32 aFontID,
                                 const nscoord* aSpacing,
-                                nsThebesRenderingContext *aContext)
+                                nsRenderingContext *aContext)
     {
       NS_ASSERTION(!aSpacing, "Spacing not supported here");
       return DrawString(aString, aLength, aX, aY, aContext, aContext);
     }
     virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
                                 nscoord aX, nscoord aY,
-                                nsIRenderingContext *aContext,
-                                nsIRenderingContext *aTextRunConstructionContext);
+                                nsRenderingContext *aContext,
+                                nsRenderingContext *aTextRunConstructionContext);
 
 #ifdef MOZ_MATHML
     // These two functions get the bounding metrics for this handle,
     // updating the aBoundingMetrics in app units.
     virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics);
     virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
                                         PRUint32 aLength,
-                                        nsThebesRenderingContext *aContext,
+                                        nsRenderingContext *aContext,
                                         nsBoundingMetrics &aBoundingMetrics);
 #endif /* MOZ_MATHML */
 
@@ -162,7 +162,7 @@ protected:
 
     class AutoTextRun {
     public:
-        AutoTextRun(nsThebesFontMetrics* aMetrics, nsIRenderingContext* aRC,
+        AutoTextRun(nsThebesFontMetrics* aMetrics, nsRenderingContext* aRC,
                     const char* aString, PRInt32 aLength) {
             mTextRun = gfxTextRunCache::MakeTextRun(
                 reinterpret_cast<const PRUint8*>(aString), aLength,
@@ -170,7 +170,7 @@ protected:
                 aMetrics->mP2A,
                 ComputeFlags(aMetrics));
         }
-        AutoTextRun(nsThebesFontMetrics* aMetrics, nsIRenderingContext* aRC,
+        AutoTextRun(nsThebesFontMetrics* aMetrics, nsRenderingContext* aRC,
                     const PRUnichar* aString, PRInt32 aLength) {
             mTextRun = gfxTextRunCache::MakeTextRun(
                 aString, aLength, aMetrics->mFontGroup,
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 3c46e9755cd2..2622a555d475 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1891,7 +1891,7 @@ FrameLayerBuilder::DrawThebesLayer(ThebesLayer* aLayer,
     }
   }
 
-  nsRefPtr<nsIRenderingContext> rc;
+  nsRefPtr<nsRenderingContext> rc;
   nsresult rv =
     presContext->DeviceContext()->CreateRenderingContextInstance(*getter_AddRefs(rc));
   if (NS_FAILED(rv))
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 71daec422ace..1061cbde130b 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -44,7 +44,7 @@
 #include "nsTextFragment.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIServiceManager.h"
 #include "nsFrameManager.h"
 #include "nsBidiUtils.h"
@@ -1758,8 +1758,8 @@ nsresult nsBidiPresUtils::ProcessText(const PRUnichar*       aText,
 
 class NS_STACK_CLASS nsIRenderingContextBidiProcessor : public nsBidiPresUtils::BidiProcessor {
 public:
-  nsIRenderingContextBidiProcessor(nsIRenderingContext* aCtx,
-                                   nsIRenderingContext* aTextRunConstructionContext,
+  nsIRenderingContextBidiProcessor(nsRenderingContext* aCtx,
+                                   nsRenderingContext* aTextRunConstructionContext,
                                    const nsPoint&       aPt)
     : mCtx(aCtx), mTextRunConstructionContext(aTextRunConstructionContext), mPt(aPt) { }
 
@@ -1794,8 +1794,8 @@ public:
   }
 
 private:
-  nsIRenderingContext* mCtx;
-  nsIRenderingContext* mTextRunConstructionContext;
+  nsRenderingContext* mCtx;
+  nsRenderingContext* mTextRunConstructionContext;
   nsPoint mPt;
   const PRUnichar* mText;
   PRInt32 mLength;
@@ -1806,8 +1806,8 @@ nsresult nsBidiPresUtils::ProcessTextForRenderingContext(const PRUnichar*
                                                          PRInt32                aLength,
                                                          nsBidiDirection        aBaseDirection,
                                                          nsPresContext*         aPresContext,
-                                                         nsIRenderingContext&   aRenderingContext,
-                                                         nsIRenderingContext&   aTextRunConstructionContext,
+                                                         nsRenderingContext&   aRenderingContext,
+                                                         nsRenderingContext&   aTextRunConstructionContext,
                                                          Mode                   aMode,
                                                          nscoord                aX,
                                                          nscoord                aY,
diff --git a/layout/base/nsBidiPresUtils.h b/layout/base/nsBidiPresUtils.h
index a815a45e2b87..9147994e99ef 100644
--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@@ -226,8 +226,8 @@ public:
                              PRInt32                aLength,
                              nsBidiDirection        aBaseDirection,
                              nsPresContext*         aPresContext,
-                             nsIRenderingContext&   aRenderingContext,
-                             nsIRenderingContext&   aTextRunConstructionContext,
+                             nsRenderingContext&    aRenderingContext,
+                             nsRenderingContext&    aTextRunConstructionContext,
                              nscoord                aX,
                              nscoord                aY,
                              nsBidiPositionResolve* aPosResolve = nsnull,
@@ -241,7 +241,7 @@ public:
                                   PRInt32              aLength,
                                   nsBidiDirection      aBaseDirection,
                                   nsPresContext*       aPresContext,
-                                  nsIRenderingContext& aRenderingContext)
+                                  nsRenderingContext&  aRenderingContext)
   {
     nscoord length;
     nsresult rv = ProcessTextForRenderingContext(aText, aLength, aBaseDirection, aPresContext,
@@ -351,8 +351,8 @@ private:
                                                  PRInt32                aLength,
                                                  nsBidiDirection        aBaseDirection,
                                                  nsPresContext*         aPresContext,
-                                                 nsIRenderingContext&   aRenderingContext,
-                                                 nsIRenderingContext&   aTextRunConstructionContext,
+                                                 nsRenderingContext&    aRenderingContext,
+                                                 nsRenderingContext&    aTextRunConstructionContext,
                                                  Mode                   aMode,
                                                  nscoord                aX, // DRAW only
                                                  nscoord                aY, // DRAW only
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index eaa9c050a60a..1275ab5ed749 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -119,7 +119,7 @@ public:
    * @see nsLayoutUtils::DrawImage() for other parameters
    */
   void Draw(nsPresContext*       aPresContext,
-            nsIRenderingContext& aRenderingContext,
+            nsRenderingContext& aRenderingContext,
             const nsRect&        aDest,
             const nsRect&        aFill,
             const nsPoint&       aAnchor,
@@ -358,13 +358,13 @@ protected:
 
 /* Local functions */
 static void DrawBorderImage(nsPresContext* aPresContext,
-                            nsIRenderingContext& aRenderingContext,
+                            nsRenderingContext& aRenderingContext,
                             nsIFrame* aForFrame,
                             const nsRect& aBorderArea,
                             const nsStyleBorder& aStyleBorder,
                             const nsRect& aDirtyRect);
 
-static void DrawBorderImageComponent(nsIRenderingContext& aRenderingContext,
+static void DrawBorderImageComponent(nsRenderingContext& aRenderingContext,
                                      nsIFrame* aForFrame,
                                      imgIContainer* aImage,
                                      const nsRect& aDirtyRect,
@@ -472,7 +472,7 @@ nsCSSRendering::ComputePixelRadii(const nscoord *aAppUnitsRadii,
 
 void
 nsCSSRendering::PaintBorder(nsPresContext* aPresContext,
-                            nsIRenderingContext& aRenderingContext,
+                            nsRenderingContext& aRenderingContext,
                             nsIFrame* aForFrame,
                             const nsRect& aDirtyRect,
                             const nsRect& aBorderArea,
@@ -513,7 +513,7 @@ nsCSSRendering::PaintBorder(nsPresContext* aPresContext,
 
 void
 nsCSSRendering::PaintBorderWithStyleBorder(nsPresContext* aPresContext,
-                                           nsIRenderingContext& aRenderingContext,
+                                           nsRenderingContext& aRenderingContext,
                                            nsIFrame* aForFrame,
                                            const nsRect& aDirtyRect,
                                            const nsRect& aBorderArea,
@@ -664,7 +664,7 @@ GetOutlineInnerRect(nsIFrame* aFrame)
 
 void
 nsCSSRendering::PaintOutline(nsPresContext* aPresContext,
-                             nsIRenderingContext& aRenderingContext,
+                             nsRenderingContext& aRenderingContext,
                              nsIFrame* aForFrame,
                              const nsRect& aDirtyRect,
                              const nsRect& aBorderArea,
@@ -793,7 +793,7 @@ nsCSSRendering::PaintOutline(nsPresContext* aPresContext,
 
 void
 nsCSSRendering::PaintFocus(nsPresContext* aPresContext,
-                           nsIRenderingContext& aRenderingContext,
+                           nsRenderingContext& aRenderingContext,
                            const nsRect& aFocusRect,
                            nscolor aColor)
 {
@@ -1073,7 +1073,7 @@ nsCSSRendering::DidPaint()
 
 void
 nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
-                                    nsIRenderingContext& aRenderingContext,
+                                    nsRenderingContext& aRenderingContext,
                                     nsIFrame* aForFrame,
                                     const nsRect& aFrameArea,
                                     const nsRect& aDirtyRect)
@@ -1199,7 +1199,7 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
       // Draw the widget shape
       gfxContextMatrixAutoSaveRestore save(shadowContext);
       nsIDeviceContext* devCtx = aPresContext->DeviceContext();
-      nsCOMPtr<nsIRenderingContext> wrapperCtx;
+      nsRefPtr<nsRenderingContext> wrapperCtx;
       devCtx->CreateRenderingContextInstance(*getter_AddRefs(wrapperCtx));
       wrapperCtx->Init(devCtx, shadowContext);
       wrapperCtx->Translate(nsPoint(shadowItem->mXOffset, shadowItem->mYOffset));
@@ -1265,7 +1265,7 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
 
 void
 nsCSSRendering::PaintBoxShadowInner(nsPresContext* aPresContext,
-                                    nsIRenderingContext& aRenderingContext,
+                                    nsRenderingContext& aRenderingContext,
                                     nsIFrame* aForFrame,
                                     const nsRect& aFrameArea,
                                     const nsRect& aDirtyRect)
@@ -1430,7 +1430,7 @@ nsCSSRendering::PaintBoxShadowInner(nsPresContext* aPresContext,
 
 void
 nsCSSRendering::PaintBackground(nsPresContext* aPresContext,
-                                nsIRenderingContext& aRenderingContext,
+                                nsRenderingContext& aRenderingContext,
                                 nsIFrame* aForFrame,
                                 const nsRect& aDirtyRect,
                                 const nsRect& aBorderArea,
@@ -1924,7 +1924,7 @@ FindTileStart(nscoord aDirtyCoord, nscoord aTilePos, nscoord aTileDim)
 
 void
 nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
-                              nsIRenderingContext& aRenderingContext,
+                              nsRenderingContext& aRenderingContext,
                               nsStyleGradient* aGradient,
                               const nsRect& aDirtyRect,
                               const nsRect& aOneCellArea,
@@ -2248,7 +2248,7 @@ PrepareBackgroundLayer(nsPresContext* aPresContext,
 
 void
 nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
-                                      nsIRenderingContext& aRenderingContext,
+                                      nsRenderingContext& aRenderingContext,
                                       nsIFrame* aForFrame,
                                       const nsRect& aDirtyRect,
                                       const nsRect& aBorderArea,
@@ -2733,7 +2733,7 @@ nsCSSRendering::GetBackgroundLayerRect(nsPresContext* aPresContext,
 
 static void
 DrawBorderImage(nsPresContext*       aPresContext,
-                nsIRenderingContext& aRenderingContext,
+                nsRenderingContext& aRenderingContext,
                 nsIFrame*            aForFrame,
                 const nsRect&        aBorderArea,
                 const nsStyleBorder& aStyleBorder,
@@ -2940,7 +2940,7 @@ DrawBorderImage(nsPresContext*       aPresContext,
 }
 
 static void
-DrawBorderImageComponent(nsIRenderingContext& aRenderingContext,
+DrawBorderImageComponent(nsRenderingContext& aRenderingContext,
                          nsIFrame*            aForFrame,
                          imgIContainer*       aImage,
                          const nsRect&        aDirtyRect,
@@ -3076,7 +3076,7 @@ SetPoly(const nsRect& aRect,
 }
 
 static void
-DrawSolidBorderSegment(nsIRenderingContext& aContext,
+DrawSolidBorderSegment(nsRenderingContext& aContext,
                        nsRect               aRect,
                        nscoord              aTwipsPerPixel,
                        PRUint8              aStartBevelSide = 0,
@@ -3166,7 +3166,7 @@ GetDashInfo(nscoord  aBorderLength,
 }
 
 void
-nsCSSRendering::DrawTableBorderSegment(nsIRenderingContext&     aContext,
+nsCSSRendering::DrawTableBorderSegment(nsRenderingContext&     aContext,
                                        PRUint8                  aBorderStyle,
                                        nscolor                  aBorderColor,
                                        const nsStyleBackground* aBGColor,
@@ -3926,7 +3926,7 @@ ImageRenderer::ComputeSize(const nsSize& aDefault)
 
 void
 ImageRenderer::Draw(nsPresContext*       aPresContext,
-                         nsIRenderingContext& aRenderingContext,
+                         nsRenderingContext& aRenderingContext,
                          const nsRect&        aDest,
                          const nsRect&        aFill,
                          const nsPoint&       aAnchor,
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index 37112cf7059e..86f63d05fcf7 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -40,7 +40,7 @@
 #ifndef nsCSSRendering_h___
 #define nsCSSRendering_h___
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsStyleConsts.h"
 #include "gfxBlur.h"
 #include "gfxContext.h"
@@ -62,13 +62,13 @@ struct nsCSSRendering {
   static void Shutdown();
   
   static void PaintBoxShadowInner(nsPresContext* aPresContext,
-                                  nsIRenderingContext& aRenderingContext,
+                                  nsRenderingContext& aRenderingContext,
                                   nsIFrame* aForFrame,
                                   const nsRect& aFrameArea,
                                   const nsRect& aDirtyRect);
 
   static void PaintBoxShadowOuter(nsPresContext* aPresContext,
-                                  nsIRenderingContext& aRenderingContext,
+                                  nsRenderingContext& aRenderingContext,
                                   nsIFrame* aForFrame,
                                   const nsRect& aFrameArea,
                                   const nsRect& aDirtyRect);
@@ -83,7 +83,7 @@ struct nsCSSRendering {
    * when rendering. If 0 then no sides are skipped.
    */
   static void PaintBorder(nsPresContext* aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           nsIFrame* aForFrame,
                           const nsRect& aDirtyRect,
                           const nsRect& aBorderArea,
@@ -95,7 +95,7 @@ struct nsCSSRendering {
    * getting it from aStyleContext.
    */
   static void PaintBorderWithStyleBorder(nsPresContext* aPresContext,
-                                         nsIRenderingContext& aRenderingContext,
+                                         nsRenderingContext& aRenderingContext,
                                          nsIFrame* aForFrame,
                                          const nsRect& aDirtyRect,
                                          const nsRect& aBorderArea,
@@ -110,7 +110,7 @@ struct nsCSSRendering {
    * when rendering. If 0 then no sides are skipped.
    */
   static void PaintOutline(nsPresContext* aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           nsIFrame* aForFrame,
                           const nsRect& aDirtyRect,
                           const nsRect& aBorderArea,
@@ -123,7 +123,7 @@ struct nsCSSRendering {
    * Not used for controls, because the native theme may differ.
    */
   static void PaintFocus(nsPresContext* aPresContext,
-                         nsIRenderingContext& aRenderingContext,
+                         nsRenderingContext& aRenderingContext,
                          const nsRect& aFocusRect,
                          nscolor aColor);
 
@@ -131,7 +131,7 @@ struct nsCSSRendering {
    * Render a gradient for an element.
    */
   static void PaintGradient(nsPresContext* aPresContext,
-                            nsIRenderingContext& aRenderingContext,
+                            nsRenderingContext& aRenderingContext,
                             nsStyleGradient* aGradient,
                             const nsRect& aDirtyRect,
                             const nsRect& aOneCellArea,
@@ -234,7 +234,7 @@ struct nsCSSRendering {
     PAINTBG_TO_WINDOW = 0x04
   };
   static void PaintBackground(nsPresContext* aPresContext,
-                              nsIRenderingContext& aRenderingContext,
+                              nsRenderingContext& aRenderingContext,
                               nsIFrame* aForFrame,
                               const nsRect& aDirtyRect,
                               const nsRect& aBorderArea,
@@ -247,7 +247,7 @@ struct nsCSSRendering {
    * background is drawn on the canvas.
    */
   static void PaintBackgroundWithSC(nsPresContext* aPresContext,
-                                    nsIRenderingContext& aRenderingContext,
+                                    nsRenderingContext& aRenderingContext,
                                     nsIFrame* aForFrame,
                                     const nsRect& aDirtyRect,
                                     const nsRect& aBorderArea,
@@ -275,7 +275,7 @@ struct nsCSSRendering {
 
   // Draw a border segment in the table collapsing border model without
   // beveling corners
-  static void DrawTableBorderSegment(nsIRenderingContext& aContext,
+  static void DrawTableBorderSegment(nsRenderingContext& aContext,
                                      PRUint8              aBorderStyle,  
                                      nscolor              aBorderColor,
                                      const nsStyleBackground* aBGColor,
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 2fd141fe7d37..c3997b837c07 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -57,7 +57,7 @@
 #include "nsIDOMCharacterData.h"
 #include "nsIContent.h"
 #include "nsIPresShell.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsPresContext.h"
 #include "nsILookAndFeel.h"
@@ -526,7 +526,7 @@ void nsCaret::UpdateCaretPosition()
 }
 
 void nsCaret::PaintCaret(nsDisplayListBuilder *aBuilder,
-                         nsIRenderingContext *aCtx,
+                         nsRenderingContext *aCtx,
                          nsIFrame* aForFrame,
                          const nsPoint &aOffset)
 {
diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h
index 4ae582c8a522..3248031ba79f 100644
--- a/layout/base/nsCaret.h
+++ b/layout/base/nsCaret.h
@@ -48,7 +48,7 @@
 #include "nsWeakPtr.h"
 #include "nsFrameSelection.h"
 
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsDisplayListBuilder;
 
 //-----------------------------------------------------------------------------
@@ -170,7 +170,7 @@ class nsCaret : public nsISelectionListener
      *  Actually paint the caret onto the given rendering context.
      */
     void      PaintCaret(nsDisplayListBuilder *aBuilder,
-                         nsIRenderingContext *aCtx,
+                         nsRenderingContext *aCtx,
                          nsIFrame *aForFrame,
                          const nsPoint &aOffset);
     /**
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index ee439287d0c0..73445b08045e 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -499,7 +499,7 @@ nsDisplayList::ComputeVisibilityForSublist(nsDisplayListBuilder* aBuilder,
 }
 
 void nsDisplayList::PaintRoot(nsDisplayListBuilder* aBuilder,
-                              nsIRenderingContext* aCtx,
+                              nsRenderingContext* aCtx,
                               PRUint32 aFlags) const {
   PaintForFrame(aBuilder, aCtx, aBuilder->ReferenceFrame(), aFlags);
 }
@@ -510,7 +510,7 @@ void nsDisplayList::PaintRoot(nsDisplayListBuilder* aBuilder,
  * root of the layer manager, drawing into the ThebesLayers.
  */
 void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder,
-                                  nsIRenderingContext* aCtx,
+                                  nsRenderingContext* aCtx,
                                   nsIFrame* aForFrame,
                                   PRUint32 aFlags) const {
   NS_ASSERTION(mDidComputeVisibility,
@@ -818,7 +818,7 @@ PRBool nsDisplayItem::RecomputeVisibility(nsDisplayListBuilder* aBuilder,
 }
 
 void nsDisplaySolidColor::Paint(nsDisplayListBuilder* aBuilder,
-                                nsIRenderingContext* aCtx) {
+                                nsRenderingContext* aCtx) {
   aCtx->SetColor(mColor);
   aCtx->FillRect(mVisibleRect);
 }
@@ -1227,7 +1227,7 @@ nsDisplayBackground::ShouldFixToViewport(nsDisplayListBuilder* aBuilder)
 
 void
 nsDisplayBackground::Paint(nsDisplayListBuilder* aBuilder,
-                           nsIRenderingContext* aCtx) {
+                           nsRenderingContext* aCtx) {
   nsPoint offset = ToReferenceFrame();
   PRUint32 flags = aBuilder->GetBackgroundPaintFlags();
   nsDisplayItem* nextItem = GetAbove();
@@ -1262,7 +1262,7 @@ nsDisplayOutline::GetBounds(nsDisplayListBuilder* aBuilder) {
 
 void
 nsDisplayOutline::Paint(nsDisplayListBuilder* aBuilder,
-                        nsIRenderingContext* aCtx) {
+                        nsRenderingContext* aCtx) {
   // TODO join outlines together
   nsPoint offset = ToReferenceFrame();
   nsCSSRendering::PaintOutline(mFrame->PresContext(), *aCtx, mFrame,
@@ -1312,7 +1312,7 @@ nsDisplayEventReceiver::HitTest(nsDisplayListBuilder* aBuilder,
 
 void
 nsDisplayCaret::Paint(nsDisplayListBuilder* aBuilder,
-                      nsIRenderingContext* aCtx) {
+                      nsRenderingContext* aCtx) {
   // Note: Because we exist, we know that the caret is visible, so we don't
   // need to check for the caret's visibility.
   mCaret->PaintCaret(aBuilder, aCtx, mFrame, ToReferenceFrame());
@@ -1349,7 +1349,7 @@ nsDisplayBorder::ComputeVisibility(nsDisplayListBuilder* aBuilder,
 
 void
 nsDisplayBorder::Paint(nsDisplayListBuilder* aBuilder,
-                       nsIRenderingContext* aCtx) {
+                       nsRenderingContext* aCtx) {
   nsPoint offset = ToReferenceFrame();
   nsCSSRendering::PaintBorder(mFrame->PresContext(), *aCtx, mFrame,
                               mVisibleRect,
@@ -1398,7 +1398,7 @@ ComputeDisjointRectangles(const nsRegion& aRegion,
 
 void
 nsDisplayBoxShadowOuter::Paint(nsDisplayListBuilder* aBuilder,
-                               nsIRenderingContext* aCtx) {
+                               nsRenderingContext* aCtx) {
   nsPoint offset = ToReferenceFrame();
   nsRect borderRect = nsRect(offset, mFrame->GetSize());
   nsPresContext* presContext = mFrame->PresContext();
@@ -1451,7 +1451,7 @@ nsDisplayBoxShadowOuter::ComputeVisibility(nsDisplayListBuilder* aBuilder,
 
 void
 nsDisplayBoxShadowInner::Paint(nsDisplayListBuilder* aBuilder,
-                               nsIRenderingContext* aCtx) {
+                               nsRenderingContext* aCtx) {
   nsPoint offset = ToReferenceFrame();
   nsRect borderRect = nsRect(offset, mFrame->GetSize());
   nsPresContext* presContext = mFrame->PresContext();
@@ -1547,7 +1547,7 @@ PRBool nsDisplayWrapList::IsVaryingRelativeToMovingFrame(nsDisplayListBuilder* a
 }
 
 void nsDisplayWrapList::Paint(nsDisplayListBuilder* aBuilder,
-                              nsIRenderingContext* aCtx) {
+                              nsRenderingContext* aCtx) {
   NS_ERROR("nsDisplayWrapList should have been flattened away for painting");
 }
 
@@ -1886,7 +1886,7 @@ nsDisplayClip::~nsDisplayClip() {
 #endif
 
 void nsDisplayClip::Paint(nsDisplayListBuilder* aBuilder,
-                          nsIRenderingContext* aCtx) {
+                          nsRenderingContext* aCtx) {
   NS_ERROR("nsDisplayClip should have been flattened away for painting");
 }
 
@@ -2059,7 +2059,7 @@ void nsDisplayZoom::HitTest(nsDisplayListBuilder *aBuilder,
 }
 
 void nsDisplayZoom::Paint(nsDisplayListBuilder* aBuilder,
-                          nsIRenderingContext* aCtx)
+                          nsRenderingContext* aCtx)
 {
   mList.PaintForFrame(aBuilder, aCtx, mFrame, nsDisplayList::PAINT_DEFAULT);
 }
@@ -2570,7 +2570,7 @@ nsDisplaySVGEffects::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect
 }
 
 void nsDisplaySVGEffects::Paint(nsDisplayListBuilder* aBuilder,
-                                nsIRenderingContext* aCtx)
+                                nsRenderingContext* aCtx)
 {
   nsSVGIntegrationUtils::PaintFramesWithEffects(aCtx,
           mEffectsFrame, mVisibleRect, aBuilder, &mList);
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 0fae59439fb9..6a1358441513 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -61,7 +61,7 @@
 
 class nsIPresShell;
 class nsIContent;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIDeviceContext;
 class nsDisplayTableItem;
 class nsDisplayItem;
@@ -697,7 +697,7 @@ public:
    * Content outside mVisibleRect need not be painted.
    * aCtx must be set up as for nsDisplayList::Paint.
    */
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) {}
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {}
   /**
    * Get the layer drawn by this display item. Call this only if
    * GetLayerState() returns something other than LAYER_NONE.
@@ -1076,13 +1076,13 @@ public:
     PAINT_FLUSH_LAYERS = 0x02,
     PAINT_EXISTING_TRANSACTION = 0x04
   };
-  void PaintRoot(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
+  void PaintRoot(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx,
                  PRUint32 aFlags) const;
   /**
    * Like PaintRoot, but used for internal display sublists.
    * aForFrame is the frame that the list is associated with.
    */
-  void PaintForFrame(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
+  void PaintForFrame(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx,
                      nsIFrame* aForFrame, PRUint32 aFlags) const;
   /**
    * Get the bounds. Takes the union of the bounds of all children.
@@ -1258,7 +1258,7 @@ private:
  */
 class nsDisplayGeneric : public nsDisplayItem {
 public:
-  typedef void (* PaintCallback)(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+  typedef void (* PaintCallback)(nsIFrame* aFrame, nsRenderingContext* aCtx,
                                  const nsRect& aDirtyRect, nsPoint aFramePt);
 
   nsDisplayGeneric(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
@@ -1277,7 +1277,7 @@ public:
   }
 #endif
   
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) {
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {
     mPaint(mFrame, aCtx, mVisibleRect, ToReferenceFrame());
   }
   NS_DISPLAY_DECL_NAME(mName, mType)
@@ -1326,9 +1326,9 @@ public:
   }
 #endif
   
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) {
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {
     nsPoint pt = ToReferenceFrame();
-    nsIRenderingContext::AutoPushTranslation translate(aCtx, pt);
+    nsRenderingContext::AutoPushTranslation translate(aCtx, pt);
     mFrame->PresContext()->PresShell()->PaintCount(mFrameName, aCtx,
                                                       mFrame->PresContext(),
                                                       mFrame, mColor);
@@ -1397,7 +1397,7 @@ public:
     // The caret returns a rect in the coordinates of mFrame.
     return mCaret->GetCaretRect() + ToReferenceFrame();
   }
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("Caret", TYPE_CARET)
 protected:
   nsRefPtr<nsCaret> mCaret;
@@ -1420,7 +1420,7 @@ public:
 #endif
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
@@ -1478,7 +1478,7 @@ public:
     return PR_TRUE;
   }
 
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
 
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
@@ -1522,7 +1522,7 @@ public:
   virtual PRBool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor);
   virtual PRBool ShouldFixToViewport(nsDisplayListBuilder* aBuilder);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("Background", TYPE_BACKGROUND)
 protected:
   nsRegion GetInsideClipRegion(nsPresContext* aPresContext, PRUint8 aClip,
@@ -1549,7 +1549,7 @@ public:
   }
 #endif
 
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
@@ -1576,7 +1576,7 @@ public:
   }
 #endif
 
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
@@ -1603,7 +1603,7 @@ public:
 #endif
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
@@ -1666,7 +1666,7 @@ public:
   virtual PRBool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor);
   virtual PRBool IsVaryingRelativeToMovingFrame(nsDisplayListBuilder* aBuilder,
                                                 nsIFrame* aFrame);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
@@ -1881,7 +1881,7 @@ public:
 #endif
   
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
@@ -1964,7 +1964,7 @@ public:
 #endif
   
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                        HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
@@ -2002,7 +2002,7 @@ public:
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) {
     return mBounds + aBuilder->ToReferenceFrame(mEffectsFrame);
   }
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index d6a7e6e20268..3e20fee9d9c4 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -3293,7 +3293,7 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
 
   nscoord prefWidth;
   {
-    nsCOMPtr<nsIRenderingContext> rcx =
+    nsRefPtr<nsRenderingContext> rcx =
       presShell->GetReferenceRenderingContext();
     NS_ENSURE_TRUE(rcx, NS_ERROR_FAILURE);
     prefWidth = root->GetPrefWidth(rcx);
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 7a90912e51b8..22c4674c6472 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -77,7 +77,7 @@ class nsPresContext;
 class nsStyleSet;
 class nsIViewManager;
 class nsIView;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIPageSequenceFrame;
 class nsAString;
 class nsCaret;
@@ -504,7 +504,7 @@ public:
    * be rendered to, but is suitable for measuring text and performing
    * other non-rendering operations.
    */
-  virtual already_AddRefed<nsIRenderingContext> GetReferenceRenderingContext() = 0;
+  virtual already_AddRefed<nsRenderingContext> GetReferenceRenderingContext() = 0;
 
   /**
    * Informs the pres shell that the document is now at the anchor with
@@ -803,7 +803,7 @@ public:
   virtual NS_HIDDEN_(void) DumpReflows() = 0;
   virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame) = 0;
   virtual NS_HIDDEN_(void) PaintCount(const char * aName,
-                                      nsIRenderingContext* aRenderingContext,
+                                      nsRenderingContext* aRenderingContext,
                                       nsPresContext * aPresContext,
                                       nsIFrame * aFrame,
                                       PRUint32 aColor) = 0;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 173df2898d5e..39eb6fae5766 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1401,7 +1401,7 @@ GetNextPage(nsIFrame* aPageContentFrame)
 }
 
 nsresult
-nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
+nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFrame,
                           const nsRegion& aDirtyRegion, nscolor aBackstop,
                           PRUint32 aFlags)
 {
@@ -1692,7 +1692,7 @@ nsLayoutUtils::GetZIndex(nsIFrame* aFrame) {
  * before the cursor aIndex contains the index of the text where the cursor falls
  */
 PRBool
-nsLayoutUtils::BinarySearchForPosition(nsIRenderingContext* aRendContext,
+nsLayoutUtils::BinarySearchForPosition(nsRenderingContext* aRendContext,
                         const PRUnichar* aText,
                         PRInt32    aBaseWidth,
                         PRInt32    aBaseInx,
@@ -2125,7 +2125,7 @@ GetPercentHeight(const nsStyleCoord& aStyle,
 enum eWidthProperty { PROP_WIDTH, PROP_MAX_WIDTH, PROP_MIN_WIDTH };
 static PRBool
 GetIntrinsicCoord(const nsStyleCoord& aStyle,
-                  nsIRenderingContext* aRenderingContext,
+                  nsRenderingContext* aRenderingContext,
                   nsIFrame* aFrame,
                   eWidthProperty aProperty,
                   nscoord& aResult)
@@ -2170,7 +2170,7 @@ static PRInt32 gNoiseIndent = 0;
 #endif
 
 /* static */ nscoord
-nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext,
+nsLayoutUtils::IntrinsicForContainer(nsRenderingContext *aRenderingContext,
                                      nsIFrame *aFrame,
                                      IntrinsicWidthType aType)
 {
@@ -2415,7 +2415,7 @@ nsLayoutUtils::ComputeWidthDependentValue(
 
 /* static */ nscoord
 nsLayoutUtils::ComputeWidthValue(
-                 nsIRenderingContext* aRenderingContext,
+                 nsRenderingContext* aRenderingContext,
                  nsIFrame*            aFrame,
                  nscoord              aContainingBlockWidth,
                  nscoord              aContentEdgeToBoxSizing,
@@ -2503,7 +2503,7 @@ nsLayoutUtils::ComputeHeightDependentValue(
 
 /* static */ nsSize
 nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
-                   nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
+                   nsRenderingContext* aRenderingContext, nsIFrame* aFrame,
                    const nsIFrame::IntrinsicSize& aIntrinsicSize,
                    nsSize aIntrinsicRatio, nsSize aCBSize,
                    nsSize aMargin, nsSize aBorder, nsSize aPadding)
@@ -2772,7 +2772,7 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
 
 /* static */ nscoord
 nsLayoutUtils::MinWidthFromInline(nsIFrame* aFrame,
-                                  nsIRenderingContext* aRenderingContext)
+                                  nsRenderingContext* aRenderingContext)
 {
   nsIFrame::InlineMinWidthData data;
   DISPLAY_MIN_WIDTH(aFrame, data.prevLines);
@@ -2783,7 +2783,7 @@ nsLayoutUtils::MinWidthFromInline(nsIFrame* aFrame,
 
 /* static */ nscoord
 nsLayoutUtils::PrefWidthFromInline(nsIFrame* aFrame,
-                                   nsIRenderingContext* aRenderingContext)
+                                   nsRenderingContext* aRenderingContext)
 {
   nsIFrame::InlinePrefWidthData data;
   DISPLAY_PREF_WIDTH(aFrame, data.prevLines);
@@ -2794,7 +2794,7 @@ nsLayoutUtils::PrefWidthFromInline(nsIFrame* aFrame,
 
 void
 nsLayoutUtils::DrawString(const nsIFrame*      aFrame,
-                          nsIRenderingContext* aContext,
+                          nsRenderingContext* aContext,
                           const PRUnichar*     aString,
                           PRInt32              aLength,
                           nsPoint              aPoint,
@@ -2824,7 +2824,7 @@ nsLayoutUtils::DrawString(const nsIFrame*      aFrame,
 
 nscoord
 nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
-                              nsIRenderingContext* aContext,
+                              nsRenderingContext* aContext,
                               const PRUnichar*     aString,
                               PRInt32              aLength)
 {
@@ -3257,7 +3257,7 @@ ComputeSnappedImageDrawingParameters(gfxContext*     aCtx,
 
 
 static nsresult
-DrawImageInternal(nsIRenderingContext* aRenderingContext,
+DrawImageInternal(nsRenderingContext* aRenderingContext,
                   imgIContainer*       aImage,
                   GraphicsFilter       aGraphicsFilter,
                   const nsRect&        aDest,
@@ -3290,7 +3290,7 @@ DrawImageInternal(nsIRenderingContext* aRenderingContext,
 }
 
 /* static */ void
-nsLayoutUtils::DrawPixelSnapped(nsIRenderingContext* aRenderingContext,
+nsLayoutUtils::DrawPixelSnapped(nsRenderingContext* aRenderingContext,
                                 gfxDrawable*         aDrawable,
                                 GraphicsFilter       aFilter,
                                 const nsRect&        aDest,
@@ -3332,7 +3332,7 @@ nsLayoutUtils::DrawPixelSnapped(nsIRenderingContext* aRenderingContext,
 }
 
 /* static */ nsresult
-nsLayoutUtils::DrawSingleUnscaledImage(nsIRenderingContext* aRenderingContext,
+nsLayoutUtils::DrawSingleUnscaledImage(nsRenderingContext* aRenderingContext,
                                        imgIContainer*       aImage,
                                        GraphicsFilter       aGraphicsFilter,
                                        const nsPoint&       aDest,
@@ -3368,7 +3368,7 @@ nsLayoutUtils::DrawSingleUnscaledImage(nsIRenderingContext* aRenderingContext,
 }
 
 /* static */ nsresult
-nsLayoutUtils::DrawSingleImage(nsIRenderingContext* aRenderingContext,
+nsLayoutUtils::DrawSingleImage(nsRenderingContext* aRenderingContext,
                                imgIContainer*       aImage,
                                GraphicsFilter       aGraphicsFilter,
                                const nsRect&        aDest,
@@ -3450,7 +3450,7 @@ nsLayoutUtils::ComputeSizeForDrawing(imgIContainer *aImage,
 
 
 /* static */ nsresult
-nsLayoutUtils::DrawImage(nsIRenderingContext* aRenderingContext,
+nsLayoutUtils::DrawImage(nsRenderingContext* aRenderingContext,
                          imgIContainer*       aImage,
                          GraphicsFilter       aGraphicsFilter,
                          const nsRect&        aDest,
@@ -3493,7 +3493,7 @@ nsLayoutUtils::GetWholeImageDestination(const nsIntSize& aWholeImageSize,
 }
 
 void
-nsLayoutUtils::SetFontFromStyle(nsIRenderingContext* aRC, nsStyleContext* aSC)
+nsLayoutUtils::SetFontFromStyle(nsRenderingContext* aRC, nsStyleContext* aSC)
 {
   const nsStyleFont* font = aSC->GetStyleFont();
   const nsStyleVisibility* visibility = aSC->GetStyleVisibility();
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index f06ea3713220..efdc297f86c8 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -630,7 +630,7 @@ public:
    * necessarily correspond to what's visible in the window; we don't
    * want to mess up the widget's layer tree.
    */
-  static nsresult PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
+  static nsresult PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFrame,
                              const nsRegion& aDirtyRegion, nscolor aBackstop,
                              PRUint32 aFlags = 0);
 
@@ -653,7 +653,7 @@ public:
    * before the cursor aIndex contains the index of the text where the cursor falls
    */
   static PRBool
-  BinarySearchForPosition(nsIRenderingContext* acx,
+  BinarySearchForPosition(nsRenderingContext* acx,
                           const PRUnichar* aText,
                           PRInt32    aBaseWidth,
                           PRInt32    aBaseInx,
@@ -809,7 +809,7 @@ public:
    * and margin.
    */
   enum IntrinsicWidthType { MIN_WIDTH, PREF_WIDTH };
-  static nscoord IntrinsicForContainer(nsIRenderingContext* aRenderingContext,
+  static nscoord IntrinsicForContainer(nsRenderingContext* aRenderingContext,
                                        nsIFrame* aFrame,
                                        IntrinsicWidthType aType);
 
@@ -839,7 +839,7 @@ public:
    * @param aCoord The width value to compute.
    */
   static nscoord ComputeWidthValue(
-                   nsIRenderingContext* aRenderingContext,
+                   nsRenderingContext* aRenderingContext,
                    nsIFrame*            aFrame,
                    nscoord              aContainingBlockWidth,
                    nscoord              aContentEdgeToBoxSizing,
@@ -904,28 +904,28 @@ public:
    *   http://www.w3.org/TR/CSS21/visudet.html#min-max-widths
    */
   static nsSize ComputeSizeWithIntrinsicDimensions(
-                    nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
+                    nsRenderingContext* aRenderingContext, nsIFrame* aFrame,
                     const nsIFrame::IntrinsicSize& aIntrinsicSize,
                     nsSize aIntrinsicRatio, nsSize aCBSize,
                     nsSize aMargin, nsSize aBorder, nsSize aPadding);
 
   // Implement nsIFrame::GetPrefWidth in terms of nsIFrame::AddInlinePrefWidth
   static nscoord PrefWidthFromInline(nsIFrame* aFrame,
-                                     nsIRenderingContext* aRenderingContext);
+                                     nsRenderingContext* aRenderingContext);
 
   // Implement nsIFrame::GetMinWidth in terms of nsIFrame::AddInlineMinWidth
   static nscoord MinWidthFromInline(nsIFrame* aFrame,
-                                    nsIRenderingContext* aRenderingContext);
+                                    nsRenderingContext* aRenderingContext);
 
   static void DrawString(const nsIFrame*      aFrame,
-                         nsIRenderingContext* aContext,
+                         nsRenderingContext* aContext,
                          const PRUnichar*     aString,
                          PRInt32              aLength,
                          nsPoint              aPoint,
                          PRUint8              aDirection = NS_STYLE_DIRECTION_INHERIT);
 
   static nscoord GetStringWidth(const nsIFrame*      aFrame,
-                                nsIRenderingContext* aContext,
+                                nsRenderingContext* aContext,
                                 const PRUnichar*     aString,
                                 PRInt32              aLength);
 
@@ -1022,7 +1022,7 @@ public:
    *   @param aDirty            Pixels outside this area may be skipped.
    *   @param aImageFlags       Image flags of the imgIContainer::FLAG_* variety
    */
-  static nsresult DrawImage(nsIRenderingContext* aRenderingContext,
+  static nsresult DrawImage(nsRenderingContext* aRenderingContext,
                             imgIContainer*       aImage,
                             GraphicsFilter       aGraphicsFilter,
                             const nsRect&        aDest,
@@ -1052,7 +1052,7 @@ public:
    *                            pixel-aligned in the output.
    *   @param aDirty            Pixels outside this area may be skipped.
    */
-  static void DrawPixelSnapped(nsIRenderingContext* aRenderingContext,
+  static void DrawPixelSnapped(nsRenderingContext* aRenderingContext,
                                gfxDrawable*         aDrawable,
                                GraphicsFilter       aFilter,
                                const nsRect&        aDest,
@@ -1076,7 +1076,7 @@ public:
    *                            in appunits. For best results it should
    *                            be aligned with image pixels.
    */
-  static nsresult DrawSingleUnscaledImage(nsIRenderingContext* aRenderingContext,
+  static nsresult DrawSingleUnscaledImage(nsRenderingContext* aRenderingContext,
                                           imgIContainer*       aImage,
                                           GraphicsFilter       aGraphicsFilter,
                                           const nsPoint&       aDest,
@@ -1099,7 +1099,7 @@ public:
    *                            be aligned with image pixels.
    *   @param aImageFlags       Image flags of the imgIContainer::FLAG_* variety
    */
-  static nsresult DrawSingleImage(nsIRenderingContext* aRenderingContext,
+  static nsresult DrawSingleImage(nsRenderingContext* aRenderingContext,
                                   imgIContainer*       aImage,
                                   GraphicsFilter       aGraphicsFilter,
                                   const nsRect&        aDest,
@@ -1140,7 +1140,7 @@ public:
   /**
    * Set the font on aRC based on the style in aSC
    */
-  static void SetFontFromStyle(nsIRenderingContext* aRC, nsStyleContext* aSC);
+  static void SetFontFromStyle(nsRenderingContext* aRC, nsStyleContext* aSC);
 
   /**
    * Determine if any corner radius is of nonzero size
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 9cbb66429e22..9c8db2de8bab 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -52,7 +52,7 @@
 #include "nsImageLoader.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIURL.h"
 #include "nsIDocument.h"
 #include "nsStyleContext.h"
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 11e32c6336a4..c1d348a5595e 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -109,7 +109,7 @@ class nsRefreshDriver;
 class imgIContainer;
 
 #ifdef MOZ_REFLOW_PERF
-class nsIRenderingContext;
+class nsRenderingContext;
 #endif
 
 enum nsWidgetType {
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 45e0b50ed136..b606d00ab647 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -141,7 +141,7 @@
 #include "nsRegion.h"
 
 #ifdef MOZ_REFLOW_PERF
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #endif
 
@@ -407,7 +407,7 @@ public:
   void Add(const char * aName, nsIFrame * aFrame);
   ReflowCounter * LookUp(const char * aName);
 
-  void PaintCount(const char * aName, nsIRenderingContext* aRenderingContext, nsPresContext* aPresContext, nsIFrame * aFrame, PRUint32 aColor);
+  void PaintCount(const char * aName, nsRenderingContext* aRenderingContext, nsPresContext* aPresContext, nsIFrame * aFrame, PRUint32 aColor);
 
   FILE * GetOutFile() { return mFD; }
 
@@ -773,7 +773,7 @@ public:
   virtual NS_HIDDEN_(void) CancelReflowCallback(nsIReflowCallback* aCallback);
 
   virtual NS_HIDDEN_(void) ClearFrameRefs(nsIFrame* aFrame);
-  virtual NS_HIDDEN_(already_AddRefed<nsIRenderingContext>) GetReferenceRenderingContext();
+  virtual NS_HIDDEN_(already_AddRefed<nsRenderingContext>) GetReferenceRenderingContext();
   virtual NS_HIDDEN_(nsresult) GoToAnchor(const nsAString& aAnchorName, PRBool aScroll);
   virtual NS_HIDDEN_(nsresult) ScrollToAnchor();
 
@@ -930,7 +930,7 @@ public:
   virtual NS_HIDDEN_(void) DumpReflows();
   virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame);
   virtual NS_HIDDEN_(void) PaintCount(const char * aName,
-                                      nsIRenderingContext* aRenderingContext,
+                                      nsRenderingContext* aRenderingContext,
                                       nsPresContext* aPresContext,
                                       nsIFrame * aFrame,
                                       PRUint32 aColor);
@@ -3751,13 +3751,13 @@ PresShell::ClearFrameRefs(nsIFrame* aFrame)
   }
 }
 
-already_AddRefed<nsIRenderingContext>
+already_AddRefed<nsRenderingContext>
 PresShell::GetReferenceRenderingContext()
 {
   NS_TIME_FUNCTION_MIN(1.0);
 
   nsIDeviceContext* devCtx = mPresContext->DeviceContext();
-  nsRefPtr<nsIRenderingContext> rc;
+  nsRefPtr<nsRenderingContext> rc;
   if (mPresContext->IsScreen()) {
     devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
     if (rc) {
@@ -5281,7 +5281,7 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags,
 
   AutoSaveRestoreRenderingState _(this);
 
-  nsCOMPtr<nsIRenderingContext> rc;
+  nsRefPtr<nsRenderingContext> rc;
   devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
   rc->Init(devCtx, aThebesContext);
 
@@ -5606,7 +5606,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
   context.Rectangle(gfxRect(0, 0, pixelArea.width, pixelArea.height));
   context.Fill();
 
-  nsCOMPtr<nsIRenderingContext> rc;
+  nsRefPtr<nsRenderingContext> rc;
   deviceContext->CreateRenderingContextInstance(*getter_AddRefs(rc));
   rc->Init(deviceContext, surface);
 
@@ -5644,7 +5644,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
     RangePaintInfo* rangeInfo = (*aItems)[i];
     // the display lists paint relative to the offset from the reference
     // frame, so translate the rendering context
-    nsIRenderingContext::AutoPushTranslation
+    nsRenderingContext::AutoPushTranslation
       translate(rc, rangeInfo->mRootOffset);
 
     aArea.MoveBy(-rangeInfo->mRootOffset.x, -rangeInfo->mRootOffset.y);
@@ -7638,7 +7638,7 @@ PresShell::DoReflow(nsIFrame* target, PRBool aInterruptible)
 
   nsIFrame* rootFrame = FrameManager()->GetRootFrame();
 
-  nsCOMPtr<nsIRenderingContext> rcx = GetReferenceRenderingContext();
+  nsRefPtr<nsRenderingContext> rcx = GetReferenceRenderingContext();
   if (!rcx) {
     NS_NOTREACHED("CreateRenderingContext failure");
     return PR_FALSE;
@@ -8590,7 +8590,7 @@ PresShell::CountReflows(const char * aName, nsIFrame * aFrame)
 //-------------------------------------------------------------
 void
 PresShell::PaintCount(const char * aName,
-                      nsIRenderingContext* aRenderingContext,
+                      nsRenderingContext* aRenderingContext,
                       nsPresContext* aPresContext,
                       nsIFrame * aFrame,
                       PRUint32 aColor)
@@ -8780,7 +8780,7 @@ void ReflowCountMgr::Add(const char * aName, nsIFrame * aFrame)
 
 //------------------------------------------------------------------
 void ReflowCountMgr::PaintCount(const char *    aName, 
-                                nsIRenderingContext* aRenderingContext, 
+                                nsRenderingContext* aRenderingContext, 
                                 nsPresContext* aPresContext, 
                                 nsIFrame*       aFrame, 
                                 PRUint32        aColor)
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index e4bc9ad38a9e..a605dd74a61f 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsButtonFrameRenderer.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsCSSRendering.h"
 #include "nsPresContext.h"
 #include "nsGkAtoms.h"
@@ -106,7 +106,7 @@ public:
 #endif  
   
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("ButtonBoxShadowOuter", TYPE_BUTTON_BOX_SHADOW_OUTER)
 private:
@@ -120,7 +120,7 @@ nsDisplayButtonBoxShadowOuter::GetBounds(nsDisplayListBuilder* aBuilder) {
 
 void
 nsDisplayButtonBoxShadowOuter::Paint(nsDisplayListBuilder* aBuilder,
-                                     nsIRenderingContext* aCtx) {
+                                     nsRenderingContext* aCtx) {
   nsRect frameRect = nsRect(ToReferenceFrame(), mFrame->GetSize());
 
   nsRect buttonRect;
@@ -148,7 +148,7 @@ public:
     aOutFrames->AppendElement(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("ButtonBorderBackground", TYPE_BUTTON_BORDER_BACKGROUND)
 private:
   nsButtonFrameRenderer* mBFR;
@@ -168,14 +168,14 @@ public:
 #endif  
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("ButtonForeground", TYPE_BUTTON_FOREGROUND)
 private:
   nsButtonFrameRenderer* mBFR;
 };
 
 void nsDisplayButtonBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                            nsIRenderingContext* aCtx)
+                                            nsRenderingContext* aCtx)
 {
   NS_ASSERTION(mFrame, "No frame?");
   nsPresContext* pc = mFrame->PresContext();
@@ -187,7 +187,7 @@ void nsDisplayButtonBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
 }
 
 void nsDisplayButtonForeground::Paint(nsDisplayListBuilder* aBuilder,
-                                      nsIRenderingContext* aCtx)
+                                      nsRenderingContext* aCtx)
 {
   nsPresContext *presContext = mFrame->PresContext();
   const nsStyleDisplay *disp = mFrame->GetStyleDisplay();
@@ -220,7 +220,7 @@ nsButtonFrameRenderer::DisplayButton(nsDisplayListBuilder* aBuilder,
 
 void
 nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsPresContext* aPresContext,
-          nsIRenderingContext& aRenderingContext,
+          nsRenderingContext& aRenderingContext,
           const nsRect& aDirtyRect,
           const nsRect& aRect)
 {
@@ -255,7 +255,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsPresContext* aPresContext,
 
 void
 nsButtonFrameRenderer::PaintBorderAndBackground(nsPresContext* aPresContext,
-          nsIRenderingContext& aRenderingContext,
+          nsRenderingContext& aRenderingContext,
           const nsRect& aDirtyRect,
           const nsRect& aRect,
           PRUint32 aBGFlags)
diff --git a/layout/forms/nsButtonFrameRenderer.h b/layout/forms/nsButtonFrameRenderer.h
index 3476e2beb469..c377820a781e 100644
--- a/layout/forms/nsButtonFrameRenderer.h
+++ b/layout/forms/nsButtonFrameRenderer.h
@@ -68,12 +68,12 @@ public:
 
 
   void PaintOutlineAndFocusBorders(nsPresContext* aPresContext,
-                                   nsIRenderingContext& aRenderingContext,
+                                   nsRenderingContext& aRenderingContext,
                                    const nsRect& aDirtyRect,
                                    const nsRect& aRect);
 
   void PaintBorderAndBackground(nsPresContext* aPresContext,
-                                nsIRenderingContext& aRenderingContext,
+                                nsRenderingContext& aRenderingContext,
                                 const nsRect& aDirtyRect,
                                 const nsRect& aRect,
                                 PRUint32 aBGFlags);
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 662aafa51ff3..c3f1c04c9541 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -558,7 +558,7 @@ static void printSize(char * aDesc, nscoord aSize)
 //-------------------------------------------------------------------
 
 nscoord
-nsComboboxControlFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
+nsComboboxControlFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
                                           nsLayoutUtils::IntrinsicWidthType aType)
 {
   // get the scrollbar width, we'll use this later
@@ -602,7 +602,7 @@ nsComboboxControlFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext
 }
 
 nscoord
-nsComboboxControlFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsComboboxControlFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord minWidth;
   DISPLAY_MIN_WIDTH(this, minWidth);
@@ -611,7 +611,7 @@ nsComboboxControlFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 nscoord
-nsComboboxControlFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsComboboxControlFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord prefWidth;
   DISPLAY_PREF_WIDTH(this, prefWidth);
@@ -1348,12 +1348,12 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("ComboboxFocus", TYPE_COMBOBOX_FOCUS)
 };
 
 void nsDisplayComboboxFocus::Paint(nsDisplayListBuilder* aBuilder,
-                                   nsIRenderingContext* aCtx)
+                                   nsRenderingContext* aCtx)
 {
   static_cast<nsComboboxControlFrame*>(mFrame)
     ->PaintFocus(*aCtx, ToReferenceFrame());
@@ -1401,7 +1401,7 @@ nsComboboxControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   return DisplaySelectionOverlay(aBuilder, aLists.Content());
 }
 
-void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,
+void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
                                         nsPoint aPt)
 {
   /* Do we need to do anything? */
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index 917d94ec554a..fd90c98515d3 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -107,9 +107,9 @@ public:
   virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
 
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD Reflow(nsPresContext*          aCX,
                     nsHTMLReflowMetrics&     aDesiredSize,
@@ -124,7 +124,7 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  void PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt);
+  void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
 
   // XXXbz this is only needed to prevent the quirk percent height stuff from
   // leaking out of the combobox.  We may be able to get rid of this as more
@@ -226,7 +226,7 @@ protected:
                           const nsHTMLReflowState& aReflowState);
 
   // Helper for GetMinWidth/GetPrefWidth
-  nscoord GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
+  nscoord GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
                             nsLayoutUtils::IntrinsicWidthType aType);
 protected:
   class RedisplayTextEvent;
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 1f86d11a3f93..d24e38716838 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -74,11 +74,11 @@ public:
                                  nsFrameList&   aChildList);
 
   NS_HIDDEN_(nscoord)
-    GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
+    GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
                       nsLayoutUtils::IntrinsicWidthType);
-  virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext* aRenderingContext);
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext);
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
@@ -93,7 +93,7 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  void PaintBorderBackground(nsIRenderingContext& aRenderingContext,
+  void PaintBorderBackground(nsRenderingContext& aRenderingContext,
     nsPoint aPt, const nsRect& aDirtyRect, PRUint32 aBGFlags);
 
   NS_IMETHOD AppendFrames(nsIAtom*       aListName,
@@ -190,7 +190,7 @@ public:
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                        HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("FieldSetBorderBackground", TYPE_FIELDSET_BORDER_BACKGROUND)
 };
 
@@ -205,7 +205,7 @@ void nsDisplayFieldSetBorderBackground::HitTest(nsDisplayListBuilder* aBuilder,
 
 void
 nsDisplayFieldSetBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                         nsIRenderingContext* aCtx)
+                                         nsRenderingContext* aCtx)
 {
   static_cast<nsFieldSetFrame*>(mFrame)->
     PaintBorderBackground(*aCtx, ToReferenceFrame(),
@@ -267,7 +267,7 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsFieldSetFrame::PaintBorderBackground(nsIRenderingContext& aRenderingContext,
+nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     nsPoint aPt, const nsRect& aDirtyRect, PRUint32 aBGFlags)
 {
   PRIntn skipSides = GetSkipSides();
@@ -349,7 +349,7 @@ nsFieldSetFrame::PaintBorderBackground(nsIRenderingContext& aRenderingContext,
 }
 
 nscoord
-nsFieldSetFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
+nsFieldSetFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
                                    nsLayoutUtils::IntrinsicWidthType aType)
 {
   nscoord legendWidth = 0;
@@ -371,7 +371,7 @@ nsFieldSetFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
 
 
 nscoord
-nsFieldSetFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
+nsFieldSetFrame::GetMinWidth(nsRenderingContext* aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_MIN_WIDTH(this, result);
@@ -381,7 +381,7 @@ nsFieldSetFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
 }
 
 nscoord
-nsFieldSetFrame::GetPrefWidth(nsIRenderingContext* aRenderingContext)
+nsFieldSetFrame::GetPrefWidth(nsRenderingContext* aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_PREF_WIDTH(this, result);
@@ -391,7 +391,7 @@ nsFieldSetFrame::GetPrefWidth(nsIRenderingContext* aRenderingContext)
 }
 
 /* virtual */ nsSize
-nsFieldSetFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsFieldSetFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap)
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index 6385ba166ec7..f6a818c624f4 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -499,7 +499,7 @@ nsFileControlFrame::BrowseMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
 }
 
 nscoord
-nsFileControlFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsFileControlFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h
index 951b76645c65..6eb8e10ef540 100644
--- a/layout/forms/nsFileControlFrame.h
+++ b/layout/forms/nsFileControlFrame.h
@@ -71,7 +71,7 @@ public:
   virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
   virtual void SetFocus(PRBool aOn, PRBool aRepaint);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
   
   NS_IMETHOD Reflow(nsPresContext*          aCX,
                     nsHTMLReflowMetrics&     aDesiredSize,
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index 934372aeed48..34229911f93c 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -50,7 +50,7 @@
 
 static void
 PaintCheckMark(nsIFrame* aFrame,
-               nsIRenderingContext* aCtx,
+               nsRenderingContext* aCtx,
                const nsRect& aDirtyRect,
                nsPoint aPt)
 {
@@ -83,7 +83,7 @@ PaintCheckMark(nsIFrame* aFrame,
 
 static void
 PaintIndeterminateMark(nsIFrame* aFrame,
-                       nsIRenderingContext* aCtx,
+                       nsRenderingContext* aCtx,
                        const nsRect& aDirtyRect,
                        nsPoint aPt)
 {
diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp
index fe1d3cac1ade..009e0d0b589a 100644
--- a/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/layout/forms/nsGfxRadioControlFrame.cpp
@@ -82,7 +82,7 @@ nsGfxRadioControlFrame::CreateAccessible()
 // Draw the dot for a non-native radio button in the checked state.
 static void
 PaintCheckedRadioButton(nsIFrame* aFrame,
-                        nsIRenderingContext* aCtx,
+                        nsRenderingContext* aCtx,
                         const nsRect& aDirtyRect,
                         nsPoint aPt)
 {
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index fd983178ec70..8b4c1689ae1a 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -43,7 +43,7 @@
 #include "nsHTMLParts.h"
 #include "nsIFormControl.h"
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
@@ -198,7 +198,7 @@ nsHTMLButtonControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 nscoord
-nsHTMLButtonControlFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
+nsHTMLButtonControlFrame::GetMinWidth(nsRenderingContext* aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -214,7 +214,7 @@ nsHTMLButtonControlFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
 }
 
 nscoord
-nsHTMLButtonControlFrame::GetPrefWidth(nsIRenderingContext* aRenderingContext)
+nsHTMLButtonControlFrame::GetPrefWidth(nsRenderingContext* aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
diff --git a/layout/forms/nsHTMLButtonControlFrame.h b/layout/forms/nsHTMLButtonControlFrame.h
index 511c0dae7ab7..75b6ffdcca94 100644
--- a/layout/forms/nsHTMLButtonControlFrame.h
+++ b/layout/forms/nsHTMLButtonControlFrame.h
@@ -51,7 +51,7 @@
 #include "nsIComponentManager.h"
 #include "nsButtonFrameRenderer.h"
 
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsPresContext;
 
 class nsHTMLButtonControlFrame : public nsHTMLContainerFrame,
@@ -70,9 +70,9 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
 
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 1bc00dc58c0f..7c5587254569 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -39,7 +39,7 @@
 #include "nsIFormControlFrame.h"
 #include "nsIFormControl.h"
 #include "nsHTMLParts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp
index 695d64855195..336f80a61dac 100644
--- a/layout/forms/nsIsIndexFrame.cpp
+++ b/layout/forms/nsIsIndexFrame.cpp
@@ -259,7 +259,7 @@ NS_IMPL_ISUPPORTS2(nsIsIndexFrame::KeyListener,
                    nsIDOMEventListener)
 
 nscoord
-nsIsIndexFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsIsIndexFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
diff --git a/layout/forms/nsIsIndexFrame.h b/layout/forms/nsIsIndexFrame.h
index 0723bcc03344..b717c6079461 100644
--- a/layout/forms/nsIsIndexFrame.h
+++ b/layout/forms/nsIsIndexFrame.h
@@ -83,7 +83,7 @@ public:
   NS_DECL_FRAMEARENA_HELPERS
 
   // nsIFormControlFrame
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
   
   virtual PRBool IsLeaf() const;
 
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 2791c84d2682..b4df0b206fa3 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -262,7 +262,7 @@ nsListControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
  * @param aPt the offset of this frame, relative to the rendering reference
  * frame
  */
-void nsListControlFrame::PaintFocus(nsIRenderingContext& aRC, nsPoint aPt)
+void nsListControlFrame::PaintFocus(nsRenderingContext& aRC, nsPoint aPt)
 {
   if (mFocused != this) return;
 
@@ -486,7 +486,7 @@ nsListControlFrame::CalcHeightOfARow()
 }
 
 nscoord
-nsListControlFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsListControlFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -502,7 +502,7 @@ nsListControlFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 nscoord
-nsListControlFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsListControlFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h
index 3ff966fdc6bc..1fe90c7617b7 100644
--- a/layout/forms/nsListControlFrame.h
+++ b/layout/forms/nsListControlFrame.h
@@ -88,8 +88,8 @@ public:
   NS_IMETHOD SetInitialChildList(nsIAtom*        aListName,
                                  nsFrameList&    aChildList);
 
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD Reflow(nsPresContext*          aCX,
                     nsHTMLReflowMetrics&     aDesiredSize,
@@ -238,7 +238,7 @@ public:
    * @param aPt the offset of this frame, relative to the rendering reference
    * frame
    */
-  void PaintFocus(nsIRenderingContext& aRC, nsPoint aPt);
+  void PaintFocus(nsRenderingContext& aRC, nsPoint aPt);
   /**
    * If this frame IsFocused(), invalidates an area that includes anything
    * that PaintFocus will or could have painted --- basically the whole
diff --git a/layout/forms/nsSelectsAreaFrame.cpp b/layout/forms/nsSelectsAreaFrame.cpp
index a82dc8ff6fc1..cd98c76d2d92 100644
--- a/layout/forms/nsSelectsAreaFrame.cpp
+++ b/layout/forms/nsSelectsAreaFrame.cpp
@@ -182,7 +182,7 @@ public:
            aBuilder->ToReferenceFrame(listFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx) {
+                     nsRenderingContext* aCtx) {
     nsListControlFrame* listFrame = GetEnclosingListFrame(GetUnderlyingFrame());
     // listFrame must be non-null or we wouldn't get called.
     listFrame->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(listFrame));
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index dacee33f9785..fa26ec11cd3e 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -221,7 +221,7 @@ nsTextControlFrame::GetType() const
 }
 
 nsresult
-nsTextControlFrame::CalcIntrinsicSize(nsIRenderingContext* aRenderingContext,
+nsTextControlFrame::CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
                                       nsSize&              aIntrinsicSize)
 {
   // Get leading and the Average/MaxAdvance char width 
@@ -466,7 +466,7 @@ nsTextControlFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
 }
 
 nscoord
-nsTextControlFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
+nsTextControlFrame::GetMinWidth(nsRenderingContext* aRenderingContext)
 {
   // Our min width is just our preferred width if we have auto width.
   nscoord result;
@@ -478,7 +478,7 @@ nsTextControlFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
 }
 
 nsSize
-nsTextControlFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsTextControlFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                     nsSize aCBSize, nscoord aAvailableWidth,
                                     nsSize aMargin, nsSize aBorder,
                                     nsSize aPadding, PRBool aShrinkWrap)
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index 1f31e9009bdb..b1b18dece88b 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -79,8 +79,8 @@ public:
     return do_QueryFrame(GetFirstChild(nsnull));
   }
 
-  virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext);
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
@@ -367,7 +367,7 @@ protected:
   // Compute our intrinsic size.  This does not include any borders, paddings,
   // etc.  Just the size of our actual area for the text (and the scrollbars,
   // for <textarea>).
-  nsresult CalcIntrinsicSize(nsIRenderingContext* aRenderingContext,
+  nsresult CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
                              nsSize&              aIntrinsicSize);
 
   nsresult ScrollSelectionIntoView();
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index b2e47499f5fa..30948ca52afa 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
 #include "nsIFontMetrics.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsLayoutUtils.h"
 
 #ifdef ACCESSIBILITY
@@ -78,12 +78,12 @@ public:
                     nsHTMLReflowMetrics& aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
                     nsReflowStatus& aStatus);
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual nsIAtom* GetType() const;
   virtual nscoord GetBaseline() const;
 
@@ -194,21 +194,21 @@ BRFrame::Reflow(nsPresContext* aPresContext,
 }
 
 /* virtual */ void
-BRFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+BRFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                            nsIFrame::InlineMinWidthData *aData)
 {
   aData->ForceBreak(aRenderingContext);
 }
 
 /* virtual */ void
-BRFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+BRFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                             nsIFrame::InlinePrefWidthData *aData)
 {
   aData->ForceBreak(aRenderingContext);
 }
 
 /* virtual */ nscoord
-BRFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+BRFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_MIN_WIDTH(this, result);
@@ -216,7 +216,7 @@ BRFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-BRFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+BRFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_PREF_WIDTH(this, result);
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 95ed383555f6..619c45246c56 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -701,7 +701,7 @@ nsBlockFrame::MarkIntrinsicWidthsDirty()
 }
 
 /* virtual */ nscoord
-nsBlockFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsBlockFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nsIFrame* firstInFlow = GetFirstContinuation();
   if (firstInFlow != this)
@@ -778,7 +778,7 @@ nsBlockFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsBlockFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsBlockFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nsIFrame* firstInFlow = GetFirstContinuation();
   if (firstInFlow != this)
@@ -2368,7 +2368,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
         metrics.ascent = metrics.height;
       }
 
-      nsIRenderingContext *rc = aState.mReflowState.rendContext;
+      nsRenderingContext *rc = aState.mReflowState.rendContext;
       nsLayoutUtils::SetFontFromStyle(rc, GetStyleContext());
       nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
 
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index 58b65392bcaf..7eefb632dbbf 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -262,8 +262,8 @@ public:
   virtual bool HasBullet() const;
 
   virtual void MarkIntrinsicWidthsDirty();
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   virtual nsRect ComputeTightBounds(gfxContext* aContext) const;
   
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 00dd73b926c8..8bdae1d07b80 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -47,7 +47,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsILoadGroup.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
@@ -234,7 +234,7 @@ public:
     aOutFrames->AppendElement(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("Bullet", TYPE_BULLET)
 
   virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
@@ -244,7 +244,7 @@ public:
 };
 
 void nsDisplayBullet::Paint(nsDisplayListBuilder* aBuilder,
-                            nsIRenderingContext* aCtx)
+                            nsRenderingContext* aCtx)
 {
   static_cast<nsBulletFrame*>(mFrame)->
     PaintBullet(*aCtx, ToReferenceFrame(), mVisibleRect);
@@ -265,7 +265,7 @@ nsBulletFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsBulletFrame::PaintBullet(nsIRenderingContext& aRenderingContext, nsPoint aPt,
+nsBulletFrame::PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
                            const nsRect& aDirtyRect)
 {
   const nsStyleList* myList = GetStyleList();
@@ -1311,7 +1311,7 @@ nsBulletFrame::GetListItemText(const nsStyleList& aListStyle,
 
 void
 nsBulletFrame::GetDesiredSize(nsPresContext*  aCX,
-                              nsIRenderingContext *aRenderingContext,
+                              nsRenderingContext *aRenderingContext,
                               nsHTMLReflowMetrics& aMetrics)
 {
   // Reset our padding.  If we need it, we'll set it below.
@@ -1463,7 +1463,7 @@ nsBulletFrame::Reflow(nsPresContext* aPresContext,
 }
 
 /* virtual */ nscoord
-nsBulletFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsBulletFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nsHTMLReflowMetrics metrics;
   DISPLAY_MIN_WIDTH(this, metrics.width);
@@ -1472,7 +1472,7 @@ nsBulletFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsBulletFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsBulletFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nsHTMLReflowMetrics metrics;
   DISPLAY_PREF_WIDTH(this, metrics.width);
diff --git a/layout/generic/nsBulletFrame.h b/layout/generic/nsBulletFrame.h
index 9ef601d77eca..3dcca6efafc3 100644
--- a/layout/generic/nsBulletFrame.h
+++ b/layout/generic/nsBulletFrame.h
@@ -73,8 +73,8 @@ public:
                     nsHTMLReflowMetrics& aMetrics,
                     const nsHTMLReflowState& aReflowState,
                     nsReflowStatus& aStatus);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   // nsBulletFrame
   PRInt32 SetListItemOrdinal(PRInt32 aNextOrdinal, PRBool* aChanged);
@@ -99,7 +99,7 @@ public:
   PRBool GetListItemText(const nsStyleList& aStyleList,
                          nsString& aResult);
                          
-  void PaintBullet(nsIRenderingContext& aRenderingContext, nsPoint aPt,
+  void PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
                    const nsRect& aDirtyRect);
   
   virtual PRBool IsEmpty();
@@ -108,7 +108,7 @@ public:
 
 protected:
   void GetDesiredSize(nsPresContext* aPresContext,
-                      nsIRenderingContext *aRenderingContext,
+                      nsRenderingContext *aRenderingContext,
                       nsHTMLReflowMetrics& aMetrics);
 
   void GetLoadGroup(nsPresContext *aPresContext, nsILoadGroup **aLoadGroup);
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index 237ce9afa441..3a6b32d44b97 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsCSSRendering.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
@@ -253,7 +253,7 @@ nsRect nsCanvasFrame::CanvasArea() const
 
 void
 nsDisplayCanvasBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                 nsIRenderingContext* aCtx)
+                                 nsRenderingContext* aCtx)
 {
   nsCanvasFrame* frame = static_cast<nsCanvasFrame*>(mFrame);
   nsPoint offset = ToReferenceFrame();
@@ -295,7 +295,7 @@ public:
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx)
+                     nsRenderingContext* aCtx)
   {
     nsCanvasFrame* frame = static_cast<nsCanvasFrame*>(mFrame);
     frame->PaintFocus(*aCtx, ToReferenceFrame());
@@ -368,7 +368,7 @@ nsCanvasFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsCanvasFrame::PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt)
+nsCanvasFrame::PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt)
 {
   nsRect focusRect(aPt, GetSize());
 
@@ -396,7 +396,7 @@ nsCanvasFrame::PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt)
 }
 
 /* virtual */ nscoord
-nsCanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsCanvasFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -408,7 +408,7 @@ nsCanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsCanvasFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsCanvasFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
diff --git a/layout/generic/nsCanvasFrame.h b/layout/generic/nsCanvasFrame.h
index 0e921638c488..dea780ada95c 100644
--- a/layout/generic/nsCanvasFrame.h
+++ b/layout/generic/nsCanvasFrame.h
@@ -43,7 +43,7 @@
 
 #include "nsHTMLContainerFrame.h"
 #include "nsStyleContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsGkAtoms.h"
 #include "nsIScrollPositionListener.h"
@@ -89,8 +89,8 @@ public:
   virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
   virtual nsFrameList GetChildList(nsIAtom* aListName) const;
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
@@ -111,7 +111,7 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  void PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt);
+  void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
 
   // nsIScrollPositionListener
   virtual void ScrollPositionWillChange(nscoord aX, nscoord aY);
@@ -224,7 +224,7 @@ public:
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
 
   void SetExtraBackgroundColor(nscolor aColor)
   {
diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index 77c746f2d56f..f217e79e1504 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -74,8 +74,8 @@ public:
   NS_IMETHOD  RemoveFrame(nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);  
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);  
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   virtual nsIFrame* GetContentInsertionFrame() {
     nsIFrame* frame = GetFirstChild(nsnull);
@@ -100,7 +100,7 @@ public:
 
   virtual nsIAtom* GetType() const;
 
-  virtual void PaintColumnRule(nsIRenderingContext* aCtx,
+  virtual void PaintColumnRule(nsRenderingContext* aCtx,
                                const nsRect&        aDirtyRect,
                                const nsPoint&       aPt);
 
@@ -209,14 +209,14 @@ nsColumnSetFrame::GetType() const
 }
 
 static void
-PaintColumnRule(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+PaintColumnRule(nsIFrame* aFrame, nsRenderingContext* aCtx,
                 const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsColumnSetFrame*>(aFrame)->PaintColumnRule(aCtx, aDirtyRect, aPt);
 }
 
 void
-nsColumnSetFrame::PaintColumnRule(nsIRenderingContext* aCtx,
+nsColumnSetFrame::PaintColumnRule(nsRenderingContext* aCtx,
                                   const nsRect& aDirtyRect,
                                   const nsPoint& aPt)
 {
@@ -454,7 +454,7 @@ static void MoveChildTo(nsIFrame* aParent, nsIFrame* aChild, nsPoint aOrigin) {
 }
 
 nscoord
-nsColumnSetFrame::GetMinWidth(nsIRenderingContext *aRenderingContext) {
+nsColumnSetFrame::GetMinWidth(nsRenderingContext *aRenderingContext) {
   nscoord width = 0;
   DISPLAY_MIN_WIDTH(this, width);
   if (mFrames.FirstChild()) {
@@ -485,7 +485,7 @@ nsColumnSetFrame::GetMinWidth(nsIRenderingContext *aRenderingContext) {
 }
 
 nscoord
-nsColumnSetFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext) {
+nsColumnSetFrame::GetPrefWidth(nsRenderingContext *aRenderingContext) {
   // Our preferred width is our desired column width, if specified, otherwise
   // the child's preferred width, times the number of columns, plus the width
   // of any required column gaps
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 5f71e7cb174c..44a65f3dea72 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsRect.h"
 #include "nsPoint.h"
@@ -595,7 +595,7 @@ static nscoord GetCoord(const nsStyleCoord& aCoord, nscoord aIfNotCoord)
 }
 
 void
-nsContainerFrame::DoInlineIntrinsicWidth(nsIRenderingContext *aRenderingContext,
+nsContainerFrame::DoInlineIntrinsicWidth(nsRenderingContext *aRenderingContext,
                                          InlineIntrinsicWidthData *aData,
                                          nsLayoutUtils::IntrinsicWidthType aType)
 {
@@ -677,7 +677,7 @@ nsContainerFrame::DoInlineIntrinsicWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ nsSize
-nsContainerFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsContainerFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                   nsSize aCBSize, nscoord aAvailableWidth,
                                   nsSize aMargin, nsSize aBorder,
                                   nsSize aPadding, PRBool aShrinkWrap)
diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
index 2160a73c2a22..2c413a88f99e 100644
--- a/layout/generic/nsContainerFrame.h
+++ b/layout/generic/nsContainerFrame.h
@@ -151,7 +151,7 @@ public:
                                       PRUint32         aFlags = 0);
 
   // Used by both nsInlineFrame and nsFirstLetterFrame.
-  void DoInlineIntrinsicWidth(nsIRenderingContext *aRenderingContext,
+  void DoInlineIntrinsicWidth(nsRenderingContext *aRenderingContext,
                               InlineIntrinsicWidthData *aData,
                               nsLayoutUtils::IntrinsicWidthType aType);
 
@@ -159,7 +159,7 @@ public:
    * This is the CSS block concept of computing 'auto' widths, which most
    * classes derived from nsContainerFrame want.
    */
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp
index 0d5f677f474d..1d498d9a380f 100644
--- a/layout/generic/nsFirstLetterFrame.cpp
+++ b/layout/generic/nsFirstLetterFrame.cpp
@@ -137,7 +137,7 @@ nsFirstLetterFrame::GetChildFrameContainingOffset(PRInt32 inContentOffset,
 // Needed for non-floating first-letter frames and for the continuations
 // following the first-letter that we also use nsFirstLetterFrame for.
 /* virtual */ void
-nsFirstLetterFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsFirstLetterFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                       nsIFrame::InlineMinWidthData *aData)
 {
   DoInlineIntrinsicWidth(aRenderingContext, aData, nsLayoutUtils::MIN_WIDTH);
@@ -146,7 +146,7 @@ nsFirstLetterFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
 // Needed for non-floating first-letter frames and for the continuations
 // following the first-letter that we also use nsFirstLetterFrame for.
 /* virtual */ void
-nsFirstLetterFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsFirstLetterFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                        nsIFrame::InlinePrefWidthData *aData)
 {
   DoInlineIntrinsicWidth(aRenderingContext, aData, nsLayoutUtils::PREF_WIDTH);
@@ -154,20 +154,20 @@ nsFirstLetterFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
 
 // Needed for floating first-letter frames.
 /* virtual */ nscoord
-nsFirstLetterFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsFirstLetterFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   return nsLayoutUtils::MinWidthFromInline(this, aRenderingContext);
 }
 
 // Needed for floating first-letter frames.
 /* virtual */ nscoord
-nsFirstLetterFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsFirstLetterFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   return nsLayoutUtils::PrefWidthFromInline(this, aRenderingContext);
 }
 
 /* virtual */ nsSize
-nsFirstLetterFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsFirstLetterFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                 nsSize aCBSize, nscoord aAvailableWidth,
                                 nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                 PRBool aShrinkWrap)
diff --git a/layout/generic/nsFirstLetterFrame.h b/layout/generic/nsFirstLetterFrame.h
index d0eaf5da6932..f144d0e09a26 100644
--- a/layout/generic/nsFirstLetterFrame.h
+++ b/layout/generic/nsFirstLetterFrame.h
@@ -70,13 +70,13 @@ public:
       ~(nsIFrame::eBidiInlineContainer));
   }
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index da85cc0e4688..a0c067b289d3 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -980,14 +980,14 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("SelectionOverlay", TYPE_SELECTION_OVERLAY)
 private:
   PRInt16 mSelectionValue;
 };
 
 void nsDisplaySelectionOverlay::Paint(nsDisplayListBuilder* aBuilder,
-                                      nsIRenderingContext* aCtx)
+                                      nsRenderingContext* aCtx)
 {
   nscolor color = NS_RGB(255, 255, 255);
   
@@ -1363,7 +1363,7 @@ BuildDisplayListWithOverflowClip(nsDisplayListBuilder* aBuilder, nsIFrame* aFram
 }
 
 #ifdef NS_DEBUG
-static void PaintDebugBorder(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintDebugBorder(nsIFrame* aFrame, nsRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt) {
   nsRect r(aPt, aFrame->GetSize());
   if (aFrame->HasView()) {
@@ -1374,7 +1374,7 @@ static void PaintDebugBorder(nsIFrame* aFrame, nsIRenderingContext* aCtx,
   aCtx->DrawRect(r);
 }
 
-static void PaintEventTargetBorder(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintEventTargetBorder(nsIFrame* aFrame, nsRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt) {
   nsRect r(aPt, aFrame->GetSize());
   aCtx->SetColor(NS_RGB(128,0,128));
@@ -3118,7 +3118,7 @@ nsFrame::MarkIntrinsicWidthsDirty()
 }
 
 /* virtual */ nscoord
-nsFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_MIN_WIDTH(this, result);
@@ -3126,7 +3126,7 @@ nsFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_PREF_WIDTH(this, result);
@@ -3134,7 +3134,7 @@ nsFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ void
-nsFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                            nsIFrame::InlineMinWidthData *aData)
 {
   NS_ASSERTION(GetParent(), "Must have a parent if we get here!");
@@ -3154,7 +3154,7 @@ nsFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ void
-nsFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                             nsIFrame::InlinePrefWidthData *aData)
 {
   aData->trailingWhitespace = 0;
@@ -3165,7 +3165,7 @@ nsFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
 }
 
 void
-nsIFrame::InlineMinWidthData::ForceBreak(nsIRenderingContext *aRenderingContext)
+nsIFrame::InlineMinWidthData::ForceBreak(nsRenderingContext *aRenderingContext)
 {
   currentLine -= trailingWhitespace;
   prevLines = NS_MAX(prevLines, currentLine);
@@ -3185,7 +3185,7 @@ nsIFrame::InlineMinWidthData::ForceBreak(nsIRenderingContext *aRenderingContext)
 }
 
 void
-nsIFrame::InlineMinWidthData::OptionallyBreak(nsIRenderingContext *aRenderingContext,
+nsIFrame::InlineMinWidthData::OptionallyBreak(nsRenderingContext *aRenderingContext,
                                               nscoord aHyphenWidth)
 {
   trailingTextFrame = nsnull;
@@ -3202,7 +3202,7 @@ nsIFrame::InlineMinWidthData::OptionallyBreak(nsIRenderingContext *aRenderingCon
 }
 
 void
-nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext)
+nsIFrame::InlinePrefWidthData::ForceBreak(nsRenderingContext *aRenderingContext)
 {
   if (floats.Length() != 0) {
             // preferred widths accumulated for floats that have already
@@ -3260,7 +3260,7 @@ nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext
 
 static void
 AddCoord(const nsStyleCoord& aStyle,
-         nsIRenderingContext* aRenderingContext,
+         nsRenderingContext* aRenderingContext,
          nsIFrame* aFrame,
          nscoord* aCoord, float* aPercent,
          PRBool aClampNegativeToZero)
@@ -3297,7 +3297,7 @@ AddCoord(const nsStyleCoord& aStyle,
 }
 
 /* virtual */ nsIFrame::IntrinsicWidthOffsetData
-nsFrame::IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext)
+nsFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
 {
   IntrinsicWidthOffsetData result;
 
@@ -3352,7 +3352,7 @@ nsFrame::GetIntrinsicRatio()
 }
 
 /* virtual */ nsSize
-nsFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                      nsSize aCBSize, nscoord aAvailableWidth,
                      nsSize aMargin, nsSize aBorder, nsSize aPadding,
                      PRBool aShrinkWrap)
@@ -3487,7 +3487,7 @@ nsFrame::ComputeSimpleTightBounds(gfxContext* aContext) const
 }
 
 /* virtual */ nsSize
-nsFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                          nsSize aCBSize, nscoord aAvailableWidth,
                          nsSize aMargin, nsSize aBorder, nsSize aPadding,
                          PRBool aShrinkWrap)
@@ -3505,7 +3505,7 @@ nsFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
 }
 
 nscoord
-nsFrame::ShrinkWidthToFit(nsIRenderingContext *aRenderingContext,
+nsFrame::ShrinkWidthToFit(nsRenderingContext *aRenderingContext,
                           nscoord aWidthInCB)
 {
   nscoord result;
@@ -6661,7 +6661,7 @@ nsFrame::RefreshSizeCache(nsBoxLayoutState& aState)
 
   // if we do have a rendering context
   nsresult rv = NS_OK;
-  nsIRenderingContext* rendContext = aState.GetRenderingContext();
+  nsRenderingContext* rendContext = aState.GetRenderingContext();
   if (rendContext) {
     nsPresContext* presContext = aState.PresContext();
 
@@ -6877,7 +6877,7 @@ nsFrame::DoLayout(nsBoxLayoutState& aState)
 {
   nsRect ourRect(mRect);
 
-  nsIRenderingContext* rendContext = aState.GetRenderingContext();
+  nsRenderingContext* rendContext = aState.GetRenderingContext();
   nsPresContext* presContext = aState.PresContext();
   nsHTMLReflowMetrics desiredSize;
   nsresult rv = NS_OK;
@@ -6933,7 +6933,7 @@ nsresult
 nsFrame::BoxReflow(nsBoxLayoutState&        aState,
                    nsPresContext*           aPresContext,
                    nsHTMLReflowMetrics&     aDesiredSize,
-                   nsIRenderingContext*     aRenderingContext,
+                   nsRenderingContext*     aRenderingContext,
                    nscoord                  aX,
                    nscoord                  aY,
                    nscoord                  aWidth,
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index f65e92fca094..4064abf8227c 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -273,18 +273,18 @@ public:
   virtual PRBool IsSelfEmpty();
 
   virtual void MarkIntrinsicWidthsDirty();
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
   virtual IntrinsicWidthOffsetData
-    IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext);
+    IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
   virtual IntrinsicSize GetIntrinsicSize();
   virtual nsSize GetIntrinsicRatio();
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
@@ -308,7 +308,7 @@ public:
    * likewise for height, since in such cases the result is guaranteed
    * to be unused.
    */
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
@@ -317,7 +317,7 @@ public:
    * Utility function for ComputeAutoSize implementations.  Return
    * max(GetMinWidth(), min(aWidthInCB, GetPrefWidth()))
    */
-  nscoord ShrinkWidthToFit(nsIRenderingContext *aRenderingContext,
+  nscoord ShrinkWidthToFit(nsRenderingContext *aRenderingContext,
                            nscoord aWidthInCB);
 
   NS_IMETHOD  WillReflow(nsPresContext* aPresContext);
@@ -618,7 +618,7 @@ private:
   nsresult BoxReflow(nsBoxLayoutState& aState,
                      nsPresContext*    aPresContext,
                      nsHTMLReflowMetrics&     aDesiredSize,
-                     nsIRenderingContext* aRenderingContext,
+                     nsRenderingContext* aRenderingContext,
                      nscoord aX,
                      nscoord aY,
                      nscoord aWidth,
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index 9515d6a826c8..fbbe9db6af2c 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -62,7 +62,7 @@
 #include "nsWidgetsCID.h"
 #include "nsIComponentManager.h"
 #include "nsGUIEvent.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIServiceManager.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsINameSpaceManager.h"
@@ -143,7 +143,7 @@ public:
   void SetVisibility(PRBool aVisibility);
   void SetColor(nscolor aColor);
 
-  void PaintBorder(nsIRenderingContext& aRenderingContext, nsPoint aPt);
+  void PaintBorder(nsRenderingContext& aRenderingContext, nsPoint aPt);
 
 protected:
   nsHTMLFramesetBorderFrame(nsStyleContext* aContext, PRInt32 aWidth, PRBool aVertical, PRBool aVisible);
@@ -1660,12 +1660,12 @@ public:
     aOutFrames->AppendElement(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("FramesetBorder", TYPE_FRAMESET_BORDER)
 };
 
 void nsDisplayFramesetBorder::Paint(nsDisplayListBuilder* aBuilder,
-                                    nsIRenderingContext* aCtx)
+                                    nsRenderingContext* aCtx)
 {
   static_cast<nsHTMLFramesetBorderFrame*>(mFrame)->
     PaintBorder(*aCtx, ToReferenceFrame());
@@ -1680,7 +1680,7 @@ nsHTMLFramesetBorderFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
       new (aBuilder) nsDisplayFramesetBorder(aBuilder, this));
 }
 
-void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingContext,
+void nsHTMLFramesetBorderFrame::PaintBorder(nsRenderingContext& aRenderingContext,
                                             nsPoint aPt)
 {
   nscolor WHITE    = NS_RGB(255, 255, 255);
@@ -1689,7 +1689,7 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsIRenderingContext& aRenderingConte
   nscolor hltColor = NS_RGB(255,255,255);
   nscolor sdwColor = NS_RGB(128,128,128);
 
-  nsIRenderingContext::AutoPushTranslation
+  nsRenderingContext::AutoPushTranslation
     translate(&aRenderingContext, aPt);
 
   {
@@ -1857,12 +1857,12 @@ public:
   }
 #endif
 
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("FramesetBlank", TYPE_FRAMESET_BLANK)
 };
 
 void nsDisplayFramesetBlank::Paint(nsDisplayListBuilder* aBuilder,
-                                   nsIRenderingContext* aCtx)
+                                   nsRenderingContext* aCtx)
 {
   nscolor white = NS_RGB(255,255,255);
   aCtx->SetColor(white);
diff --git a/layout/generic/nsFrameSetFrame.h b/layout/generic/nsFrameSetFrame.h
index bb8467053f8a..5346d1164610 100644
--- a/layout/generic/nsFrameSetFrame.h
+++ b/layout/generic/nsFrameSetFrame.h
@@ -50,7 +50,7 @@
 class  nsIContent;
 class  nsIFrame;
 class  nsPresContext;
-class  nsIRenderingContext;
+class  nsRenderingContext;
 struct nsRect;
 struct nsHTMLReflowState;
 struct nsSize;
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 8d97771df43d..cc03532820e5 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -748,7 +748,7 @@ nsHTMLScrollFrame::PlaceScrollArea(const ScrollReflowState& aState,
 }
 
 nscoord
-nsHTMLScrollFrame::GetIntrinsicVScrollbarWidth(nsIRenderingContext *aRenderingContext)
+nsHTMLScrollFrame::GetIntrinsicVScrollbarWidth(nsRenderingContext *aRenderingContext)
 {
   nsGfxScrollFrameInner::ScrollbarStyles ss = GetScrollbarStyles();
   if (ss.mVertical != NS_STYLE_OVERFLOW_SCROLL || !mInner.mVScrollbarBox)
@@ -764,7 +764,7 @@ nsHTMLScrollFrame::GetIntrinsicVScrollbarWidth(nsIRenderingContext *aRenderingCo
 }
 
 /* virtual */ nscoord
-nsHTMLScrollFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsHTMLScrollFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = mInner.mScrolledFrame->GetMinWidth(aRenderingContext);
   DISPLAY_MIN_WIDTH(this, result);
@@ -772,7 +772,7 @@ nsHTMLScrollFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsHTMLScrollFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsHTMLScrollFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = mInner.mScrolledFrame->GetPrefWidth(aRenderingContext);
   DISPLAY_PREF_WIDTH(this, result);
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 749d3cacd65d..01cdbc0ec4a9 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -372,14 +372,14 @@ public:
                           const nsHTMLReflowMetrics& aDesiredSize);
   void PlaceScrollArea(const ScrollReflowState& aState,
                        const nsPoint& aScrollPosition);
-  nscoord GetIntrinsicVScrollbarWidth(nsIRenderingContext *aRenderingContext);
+  nscoord GetIntrinsicVScrollbarWidth(nsRenderingContext *aRenderingContext);
 
   virtual PRBool GetBorderRadii(nscoord aRadii[8]) const {
     return mInner.GetBorderRadii(aRadii);
   }
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   NS_IMETHOD GetPadding(nsMargin& aPadding);
   virtual PRBool IsCollapsed(nsBoxLayoutState& aBoxLayoutState);
   
@@ -445,7 +445,7 @@ public:
     return mInner.GetDesiredScrollbarSizes(aState);
   }
   virtual nsMargin GetDesiredScrollbarSizes(nsPresContext* aPresContext,
-          nsIRenderingContext* aRC) {
+          nsRenderingContext* aRC) {
     nsBoxLayoutState bls(aPresContext, aRC, 0);
     return GetDesiredScrollbarSizes(&bls);
   }
@@ -585,7 +585,7 @@ public:
 
   // XXXldb Is this actually used?
 #if 0
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
 #endif
 
   // Because there can be only one child frame, these two function return
@@ -680,7 +680,7 @@ public:
     return mInner.GetDesiredScrollbarSizes(aState);
   }
   virtual nsMargin GetDesiredScrollbarSizes(nsPresContext* aPresContext,
-          nsIRenderingContext* aRC) {
+          nsRenderingContext* aRC) {
     nsBoxLayoutState bls(aPresContext, aRC, 0);
     return GetDesiredScrollbarSizes(&bls);
   }
diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp
index 9f6cf57d7e46..54168e380439 100644
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -156,7 +156,7 @@ nsHTMLCanvasFrame::GetCanvasSize()
 }
 
 /* virtual */ nscoord
-nsHTMLCanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsHTMLCanvasFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   // XXX The caller doesn't account for constraints of the height,
   // min-height, and max-height properties.
@@ -166,7 +166,7 @@ nsHTMLCanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsHTMLCanvasFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsHTMLCanvasFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   // XXX The caller doesn't account for constraints of the height,
   // min-height, and max-height properties.
@@ -184,7 +184,7 @@ nsHTMLCanvasFrame::GetIntrinsicRatio()
 }
 
 /* virtual */ nsSize
-nsHTMLCanvasFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsHTMLCanvasFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                nsSize aCBSize, nscoord aAvailableWidth,
                                nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                PRBool aShrinkWrap)
diff --git a/layout/generic/nsHTMLCanvasFrame.h b/layout/generic/nsHTMLCanvasFrame.h
index 6e245bfd7c14..cb316189ac35 100644
--- a/layout/generic/nsHTMLCanvasFrame.h
+++ b/layout/generic/nsHTMLCanvasFrame.h
@@ -77,11 +77,11 @@ public:
   /* get the size of the canvas's image */
   nsIntSize GetCanvasSize();
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual nsSize GetIntrinsicRatio();
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index 387361d287ea..fe7121854036 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -40,7 +40,7 @@
 
 #include "nsHTMLContainerFrame.h"
 #include "nsFirstLetterFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
@@ -87,7 +87,7 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("TextDecoration", TYPE_TEXT_DECORATION)
 
@@ -105,7 +105,7 @@ private:
 
 void
 nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
-                               nsIRenderingContext* aCtx)
+                               nsRenderingContext* aCtx)
 {
   nsCOMPtr<nsIFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
@@ -173,7 +173,7 @@ public:
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("TextShadowContainer", TYPE_TEXT_SHADOW)
 private:
@@ -186,7 +186,7 @@ private:
 
 void
 nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
-                           nsIRenderingContext* aCtx)
+                           nsRenderingContext* aCtx)
 {
   nsCOMPtr<nsIFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
diff --git a/layout/generic/nsHTMLReflowMetrics.h b/layout/generic/nsHTMLReflowMetrics.h
index 8ea5d44bc974..6aafaef2c17f 100644
--- a/layout/generic/nsHTMLReflowMetrics.h
+++ b/layout/generic/nsHTMLReflowMetrics.h
@@ -45,7 +45,7 @@
 #include "nsMargin.h"
 #include "nsRect.h"
 // for MOZ_MATHML
-#include "nsIRenderingContext.h" //to get struct nsBoundingMetrics
+#include "nsRenderingContext.h" //to get struct nsBoundingMetrics
 
 //----------------------------------------------------------------------
 
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 69b5e118cb98..d61378aeeef1 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -47,7 +47,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsBlockFrame.h"
 #include "nsLineBox.h"
@@ -87,7 +87,7 @@ static eNormalLineHeightControl sNormalLineHeightControl = eUninitialized;
 // use for measuring things.
 nsHTMLReflowState::nsHTMLReflowState(nsPresContext*       aPresContext,
                                      nsIFrame*            aFrame,
-                                     nsIRenderingContext* aRenderingContext,
+                                     nsRenderingContext* aRenderingContext,
                                      const nsSize&        aAvailableSpace)
   : nsCSSOffsetState(aFrame, aRenderingContext)
   , mBlockDelta(0)
diff --git a/layout/generic/nsHTMLReflowState.h b/layout/generic/nsHTMLReflowState.h
index 261c9abfbf5f..7a84d8612b4f 100644
--- a/layout/generic/nsHTMLReflowState.h
+++ b/layout/generic/nsHTMLReflowState.h
@@ -45,7 +45,7 @@
 #include "nsIFrame.h"
 
 class nsPresContext;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsFloatManager;
 class nsLineLayout;
 class nsIPercentHeightObserver;
@@ -147,7 +147,7 @@ public:
   nsIFrame*           frame;
 
   // rendering context to use for measurement
-  nsIRenderingContext* rendContext;
+  nsRenderingContext* rendContext;
 
   // Computed margin values
   nsMargin         mComputedMargin;
@@ -159,13 +159,13 @@ public:
   nsMargin         mComputedPadding;
 
   // Callers using this constructor must call InitOffsets on their own.
-  nsCSSOffsetState(nsIFrame *aFrame, nsIRenderingContext *aRenderingContext)
+  nsCSSOffsetState(nsIFrame *aFrame, nsRenderingContext *aRenderingContext)
     : frame(aFrame)
     , rendContext(aRenderingContext)
   {
   }
 
-  nsCSSOffsetState(nsIFrame *aFrame, nsIRenderingContext *aRenderingContext,
+  nsCSSOffsetState(nsIFrame *aFrame, nsRenderingContext *aRenderingContext,
                    nscoord aContainingBlockWidth)
     : frame(aFrame)
     , rendContext(aRenderingContext)
@@ -377,7 +377,7 @@ public:
   // use for measuring things.
   nsHTMLReflowState(nsPresContext*           aPresContext,
                     nsIFrame*                aFrame,
-                    nsIRenderingContext*     aRenderingContext,
+                    nsRenderingContext*     aRenderingContext,
                     const nsSize&            aAvailableSpace);
 
   // Initialize a reflow state for a child frames reflow. Some state
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index e43ef706fc74..278fa93aa7df 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -85,7 +85,7 @@ class nsHTMLReflowCommand;
 class nsIAtom;
 class nsPresContext;
 class nsIPresShell;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIView;
 class nsIWidget;
 class nsIDOMRange;
@@ -1406,7 +1406,7 @@ public:
    *
    * This method must not return a negative value.
    */
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext) = 0;
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) = 0;
 
   /**
    * Get the intrinsic width of the frame.  This must be greater than or
@@ -1414,7 +1414,7 @@ public:
    *
    * Otherwise, all the comments for |GetMinWidth| above apply.
    */
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext) = 0;
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) = 0;
 
   /**
    * |InlineIntrinsicWidth| represents the intrinsic width information
@@ -1471,11 +1471,11 @@ public:
     // current line total is negative.  When it is, we need to ignore
     // optional breaks to prevent min-width from ending up bigger than
     // pref-width.
-    void ForceBreak(nsIRenderingContext *aRenderingContext);
+    void ForceBreak(nsRenderingContext *aRenderingContext);
 
     // If the break here is actually taken, aHyphenWidth must be added to the
     // width of the current line.
-    void OptionallyBreak(nsIRenderingContext *aRenderingContext,
+    void OptionallyBreak(nsRenderingContext *aRenderingContext,
                          nscoord aHyphenWidth = 0);
 
     // The last text frame processed so far in the current line, when
@@ -1490,7 +1490,7 @@ public:
   };
 
   struct InlinePrefWidthData : public InlineIntrinsicWidthData {
-    void ForceBreak(nsIRenderingContext *aRenderingContext);
+    void ForceBreak(nsRenderingContext *aRenderingContext);
   };
 
   /**
@@ -1513,7 +1513,7 @@ public:
    * which calls |GetMinWidth|.
    */
   virtual void
-  AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                     InlineMinWidthData *aData) = 0;
 
   /**
@@ -1527,7 +1527,7 @@ public:
    * based on using all *mandatory* breakpoints within the frame.
    */
   virtual void
-  AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                      InlinePrefWidthData *aData) = 0;
 
   /**
@@ -1544,7 +1544,7 @@ public:
     {}
   };
   virtual IntrinsicWidthOffsetData
-    IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext) = 0;
+    IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) = 0;
 
   /*
    * For replaced elements only. Gets the intrinsic dimensions of this element.
@@ -1625,7 +1625,7 @@ public:
    *                     it's floating, absolutely positioned, or
    *                     inline-block).
    */
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap) = 0;
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index a6b2e5041e11..7fe9b805ea59 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -100,7 +100,7 @@ public:
    * of the scrolled contents.
    */
   virtual nsMargin GetDesiredScrollbarSizes(nsPresContext* aPresContext,
-                                            nsIRenderingContext* aRC) = 0;
+                                            nsRenderingContext* aRC) = 0;
 
   /**
    * Get the area of the scrollport relative to the origin of this frame's
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 55ff28b664f5..df6f05bb5a51 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsGkAtoms.h"
 #include "nsIDocument.h"
@@ -737,7 +737,7 @@ nsImageFrame::EnsureIntrinsicSizeAndRatio(nsPresContext* aPresContext)
 }
 
 /* virtual */ nsSize
-nsImageFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsImageFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                           nsSize aCBSize, nscoord aAvailableWidth,
                           nsSize aMargin, nsSize aBorder, nsSize aPadding,
                           PRBool aShrinkWrap)
@@ -770,7 +770,7 @@ nsImageFrame::GetContinuationOffset() const
 }
 
 /* virtual */ nscoord
-nsImageFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsImageFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   // XXX The caller doesn't account for constraints of the height,
   // min-height, and max-height properties.
@@ -783,7 +783,7 @@ nsImageFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsImageFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsImageFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   // XXX The caller doesn't account for constraints of the height,
   // min-height, and max-height properties.
@@ -907,7 +907,7 @@ nsImageFrame::MeasureString(const PRUnichar*     aString,
                             PRInt32              aLength,
                             nscoord              aMaxWidth,
                             PRUint32&            aMaxFit,
-                            nsIRenderingContext& aContext)
+                            nsRenderingContext& aContext)
 {
   nscoord totalWidth = 0;
   nscoord spaceWidth;
@@ -967,7 +967,7 @@ nsImageFrame::MeasureString(const PRUnichar*     aString,
 // between words if a word would extend past the edge of the rectangle
 void
 nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
-                             nsIRenderingContext& aRenderingContext,
+                             nsRenderingContext& aRenderingContext,
                              const nsString&      aAltText,
                              const nsRect&        aRect)
 {
@@ -1046,7 +1046,7 @@ struct nsRecessedBorder : public nsStyleBorder {
 };
 
 void
-nsImageFrame::DisplayAltFeedback(nsIRenderingContext& aRenderingContext,
+nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
                                  const nsRect&        aDirtyRect,
                                  imgIRequest*         aRequest,
                                  nsPoint              aPt)
@@ -1160,7 +1160,7 @@ nsImageFrame::DisplayAltFeedback(nsIRenderingContext& aRenderingContext,
   aRenderingContext.PopState();
 }
 
-static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintAltFeedback(nsIFrame* aFrame, nsRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt)
 {
   nsImageFrame* f = static_cast<nsImageFrame*>(aFrame);
@@ -1173,7 +1173,7 @@ static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx,
 }
 
 #ifdef NS_DEBUG
-static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintDebugImageMap(nsIFrame* aFrame, nsRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt) {
   nsImageFrame* f = static_cast<nsImageFrame*>(aFrame);
   nsRect inner = f->GetInnerArea() + aPt;
@@ -1189,7 +1189,7 @@ static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx,
 
 void
 nsDisplayImage::Paint(nsDisplayListBuilder* aBuilder,
-                      nsIRenderingContext* aCtx) {
+                      nsRenderingContext* aCtx) {
   static_cast<nsImageFrame*>(mFrame)->
     PaintImage(*aCtx, ToReferenceFrame(), mVisibleRect, mImage,
                aBuilder->ShouldSyncDecodeImages()
@@ -1271,7 +1271,7 @@ nsImageFrame::GetContainer(LayerManager* aManager, imgIContainer* aImage)
 }
 
 void
-nsImageFrame::PaintImage(nsIRenderingContext& aRenderingContext, nsPoint aPt,
+nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
                          const nsRect& aDirtyRect, imgIContainer* aImage,
                          PRUint32 aFlags)
 {
@@ -2092,7 +2092,7 @@ IsInAutoWidthTableCellForQuirk(nsIFrame *aFrame)
 }
 
 /* virtual */ void
-nsImageFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsImageFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                 nsIFrame::InlineMinWidthData *aData)
 {
 
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index 578af96bb0e6..efc408546f20 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -115,8 +115,8 @@ public:
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual IntrinsicSize GetIntrinsicSize();
   virtual nsSize GetIntrinsicRatio();
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
@@ -174,7 +174,7 @@ public:
   static PRBool ShouldCreateImageFrameFor(nsIContent* aContent,
                                           nsStyleContext* aStyleContext);
   
-  void DisplayAltFeedback(nsIRenderingContext& aRenderingContext,
+  void DisplayAltFeedback(nsRenderingContext& aRenderingContext,
                           const nsRect&        aDirtyRect,
                           imgIRequest*         aRequest,
                           nsPoint              aPt);
@@ -183,7 +183,7 @@ public:
 
   nsImageMap* GetImageMap(nsPresContext* aPresContext);
 
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
 
   nsRefPtr<ImageContainer> GetContainer(LayerManager* aManager,
@@ -194,7 +194,7 @@ protected:
 
   void EnsureIntrinsicSizeAndRatio(nsPresContext* aPresContext);
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
@@ -219,14 +219,14 @@ protected:
                         PRInt32              aLength,
                         nscoord              aMaxWidth,
                         PRUint32&            aMaxFit,
-                        nsIRenderingContext& aContext);
+                        nsRenderingContext& aContext);
 
   void DisplayAltText(nsPresContext*      aPresContext,
-                      nsIRenderingContext& aRenderingContext,
+                      nsRenderingContext& aRenderingContext,
                       const nsString&      aAltText,
                       const nsRect&        aRect);
 
-  void PaintImage(nsIRenderingContext& aRenderingContext, nsPoint aPt,
+  void PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
                   const nsRect& aDirtyRect, imgIContainer* aImage,
                   PRUint32 aFlags);
 
@@ -393,7 +393,7 @@ public:
     MOZ_COUNT_DTOR(nsDisplayImage);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   nsCOMPtr<imgIContainer> GetImage();
  
   /**
diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp
index da80842319af..06026d1175ce 100644
--- a/layout/generic/nsImageMap.cpp
+++ b/layout/generic/nsImageMap.cpp
@@ -41,7 +41,7 @@
 #include "nsImageMap.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIURL.h"
 #include "nsIURL.h"
@@ -80,7 +80,7 @@ public:
   virtual void ParseCoords(const nsAString& aSpec);
 
   virtual PRBool IsInside(nscoord x, nscoord y) const = 0;
-  virtual void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC) = 0;
+  virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC) = 0;
   virtual void GetRect(nsIFrame* aFrame, nsRect& aRect) = 0;
 
   void HasFocus(PRBool aHasFocus);
@@ -312,7 +312,7 @@ public:
   DefaultArea(nsIContent* aArea);
 
   virtual PRBool IsInside(nscoord x, nscoord y) const;
-  virtual void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC);
+  virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
   virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
 };
 
@@ -326,7 +326,7 @@ PRBool DefaultArea::IsInside(nscoord x, nscoord y) const
   return PR_TRUE;
 }
 
-void DefaultArea::Draw(nsIFrame* aFrame, nsIRenderingContext& aRC)
+void DefaultArea::Draw(nsIFrame* aFrame, nsRenderingContext& aRC)
 {
   if (mHasFocus) {
     nsRect r = aFrame->GetRect();
@@ -358,7 +358,7 @@ public:
 
   virtual void ParseCoords(const nsAString& aSpec);
   virtual PRBool IsInside(nscoord x, nscoord y) const;
-  virtual void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC);
+  virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
   virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
 };
 
@@ -420,7 +420,7 @@ PRBool RectArea::IsInside(nscoord x, nscoord y) const
   return PR_FALSE;
 }
 
-void RectArea::Draw(nsIFrame* aFrame, nsIRenderingContext& aRC)
+void RectArea::Draw(nsIFrame* aFrame, nsRenderingContext& aRC)
 {
   if (mHasFocus) {
     if (mNumCoords >= 4) {
@@ -460,7 +460,7 @@ public:
 
   virtual void ParseCoords(const nsAString& aSpec);
   virtual PRBool IsInside(nscoord x, nscoord y) const;
-  virtual void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC);
+  virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
   virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
 };
 
@@ -552,7 +552,7 @@ PRBool PolyArea::IsInside(nscoord x, nscoord y) const
   return PR_FALSE;
 }
 
-void PolyArea::Draw(nsIFrame* aFrame, nsIRenderingContext& aRC)
+void PolyArea::Draw(nsIFrame* aFrame, nsRenderingContext& aRC)
 {
   if (mHasFocus) {
     if (mNumCoords >= 6) {
@@ -600,7 +600,7 @@ public:
 
   virtual void ParseCoords(const nsAString& aSpec);
   virtual PRBool IsInside(nscoord x, nscoord y) const;
-  virtual void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC);
+  virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
   virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
 };
 
@@ -659,7 +659,7 @@ PRBool CircleArea::IsInside(nscoord x, nscoord y) const
   return PR_FALSE;
 }
 
-void CircleArea::Draw(nsIFrame* aFrame, nsIRenderingContext& aRC)
+void CircleArea::Draw(nsIFrame* aFrame, nsRenderingContext& aRC)
 {
   if (mHasFocus) {
     if (mNumCoords >= 3) {
@@ -899,7 +899,7 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
 }
 
 void
-nsImageMap::Draw(nsIFrame* aFrame, nsIRenderingContext& aRC)
+nsImageMap::Draw(nsIFrame* aFrame, nsRenderingContext& aRC)
 {
   PRUint32 i, n = mAreas.Length();
   for (i = 0; i < n; i++) {
diff --git a/layout/generic/nsImageMap.h b/layout/generic/nsImageMap.h
index 2796d00b01d3..3d31d43336e2 100644
--- a/layout/generic/nsImageMap.h
+++ b/layout/generic/nsImageMap.h
@@ -50,7 +50,7 @@
 
 class nsIDOMHTMLAreaElement;
 class nsIDOMHTMLMapElement;
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIURI;
 class nsString;
 class nsIDOMEvent;
@@ -73,7 +73,7 @@ public:
   PRBool IsInside(nscoord aX, nscoord aY,
                   nsIContent** aContent) const;
 
-  void Draw(nsIFrame* aFrame, nsIRenderingContext& aRC);
+  void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
   
   /** 
    * Called just before the nsImageFrame releases us. 
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 68aa8bdafd53..41a2fa158b53 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -46,7 +46,7 @@
 #include "nsStyleContext.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsCSSAnonBoxes.h"
@@ -204,21 +204,21 @@ nsInlineFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 // Reflow methods
 
 /* virtual */ void
-nsInlineFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsInlineFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  nsIFrame::InlineMinWidthData *aData)
 {
   DoInlineIntrinsicWidth(aRenderingContext, aData, nsLayoutUtils::MIN_WIDTH);
 }
 
 /* virtual */ void
-nsInlineFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsInlineFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   nsIFrame::InlinePrefWidthData *aData)
 {
   DoInlineIntrinsicWidth(aRenderingContext, aData, nsLayoutUtils::PREF_WIDTH);
 }
 
 /* virtual */ nsSize
-nsInlineFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsInlineFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                            nsSize aCBSize, nscoord aAvailableWidth,
                            nsSize aMargin, nsSize aBorder, nsSize aPadding,
                            PRBool aShrinkWrap)
diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h
index acdd234f17c8..f6cf87c8cba2 100644
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -101,11 +101,11 @@ public:
                                      PRBool aRespectClusters = PR_TRUE);
   
   // nsIHTMLReflow overrides
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
diff --git a/layout/generic/nsLeafFrame.cpp b/layout/generic/nsLeafFrame.cpp
index 170e81cc89ea..1d2d4eccb64c 100644
--- a/layout/generic/nsLeafFrame.cpp
+++ b/layout/generic/nsLeafFrame.cpp
@@ -50,7 +50,7 @@ nsLeafFrame::~nsLeafFrame()
 NS_IMPL_FRAMEARENA_HELPERS(nsLeafFrame)
 
 /* virtual */ nscoord
-nsLeafFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsLeafFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -60,7 +60,7 @@ nsLeafFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsLeafFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsLeafFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -69,7 +69,7 @@ nsLeafFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nsSize
-nsLeafFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsLeafFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder,
                              nsSize aPadding, PRBool aShrinkWrap)
diff --git a/layout/generic/nsLeafFrame.h b/layout/generic/nsLeafFrame.h
index 73089dc6c2ec..4750cf06052b 100644
--- a/layout/generic/nsLeafFrame.h
+++ b/layout/generic/nsLeafFrame.h
@@ -65,13 +65,13 @@ public:
    * Both GetMinWidth and GetPrefWidth will return whatever GetIntrinsicWidth
    * returns.
    */
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   /**
    * Our auto size is just intrinsic width and intrinsic height.
    */
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 229c00989f4e..6864b90b21bc 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -57,7 +57,7 @@
 #include "nsPresContext.h"
 #include "nsIFontMetrics.h"
 #include "nsIThebesFontMetrics.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsPlaceholderFrame.h"
 #include "nsIDocument.h"
@@ -1561,7 +1561,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
 
   // Get the parent frame's font for all of the frames in this span
   nsStyleContext* styleContext = spanFrame->GetStyleContext();
-  nsIRenderingContext* rc = mBlockReflowState->rendContext;
+  nsRenderingContext* rc = mBlockReflowState->rendContext;
   nsLayoutUtils::SetFontFromStyle(mBlockReflowState->rendContext, styleContext);
   nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
 
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index b7553fd5340d..e8f462746e78 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -117,7 +117,7 @@ enum { XKeyPress = KeyPress };
 #include "nsIDOMRange.h"
 #include "nsIPluginWidget.h"
 #include "nsGUIEvent.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "npapi.h"
 #include "nsTransform2D.h"
 #include "nsIImageLoadingContent.h"
@@ -935,7 +935,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth,
 #define EMBED_DEF_HEIGHT 200
 
 /* virtual */ nscoord
-nsObjectFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsObjectFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
 
@@ -951,7 +951,7 @@ nsObjectFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsObjectFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsObjectFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   return nsObjectFrame::GetMinWidth(aRenderingContext);
 }
@@ -1319,11 +1319,11 @@ nsObjectFrame::DidReflow(nsPresContext*            aPresContext,
 }
 
 /* static */ void
-nsObjectFrame::PaintPrintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+nsObjectFrame::PaintPrintPlugin(nsIFrame* aFrame, nsRenderingContext* aCtx,
                                 const nsRect& aDirtyRect, nsPoint aPt)
 {
   nsPoint pt = aPt + aFrame->GetUsedBorderAndPadding().TopLeft();
-  nsIRenderingContext::AutoPushTranslation translate(aCtx, pt);
+  nsRenderingContext::AutoPushTranslation translate(aCtx, pt);
   // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
   static_cast<nsObjectFrame*>(aFrame)->PrintPlugin(*aCtx, aDirtyRect);
 }
@@ -1404,7 +1404,7 @@ nsDisplayPlugin::GetBounds(nsDisplayListBuilder* aBuilder)
 
 void
 nsDisplayPlugin::Paint(nsDisplayListBuilder* aBuilder,
-                       nsIRenderingContext* aCtx)
+                       nsRenderingContext* aCtx)
 {
   nsObjectFrame* f = static_cast<nsObjectFrame*>(mFrame);
   f->PaintPlugin(aBuilder, *aCtx, mVisibleRect, GetBounds(aBuilder));
@@ -1663,7 +1663,7 @@ nsObjectFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsObjectFrame::PrintPlugin(nsIRenderingContext& aRenderingContext,
+nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
                            const nsRect& aDirtyRect)
 {
   nsCOMPtr<nsIObjectLoadingContent> obj(do_QueryInterface(mContent));
@@ -1804,7 +1804,7 @@ nsObjectFrame::PrintPlugin(nsIRenderingContext& aRenderingContext,
    */
 
 #elif defined(XP_OS2)
-  void *hps = aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_OS2_PS);
+  void *hps = aRenderingContext.GetNativeGraphicData(nsRenderingContext::NATIVE_OS2_PS);
   if (!hps)
     return;
 
@@ -2181,7 +2181,7 @@ nsObjectFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
 void
 nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
-                           nsIRenderingContext& aRenderingContext,
+                           nsRenderingContext& aRenderingContext,
                            const nsRect& aDirtyRect, const nsRect& aPluginRect)
 {
   // Screen painting code
@@ -2283,7 +2283,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
       nativeDrawing.EndNativeDrawing();
     } else {
       // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
-      nsIRenderingContext::AutoPushTranslation
+      nsRenderingContext::AutoPushTranslation
         translate(&aRenderingContext, aPluginRect.TopLeft());
 
       // this rect is used only in the CoreGraphics drawing model
@@ -2423,7 +2423,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
 
     if (window->type == NPWindowTypeDrawable) {
       // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
-      nsIRenderingContext::AutoPushTranslation
+      nsRenderingContext::AutoPushTranslation
         translate(&aRenderingContext, aPluginRect.TopLeft());
 
       // check if we need to call SetWindow with updated parameters
@@ -2470,7 +2470,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
       }
 
       // check if we need to update the PS
-      HPS hps = (HPS)aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_OS2_PS);
+      HPS hps = (HPS)aRenderingContext.GetNativeGraphicData(nsRenderingContext::NATIVE_OS2_PS);
       if (reinterpret_cast<HPS>(window->window) != hps) {
         window->window = reinterpret_cast<void*>(hps);
         doupdatewindow = PR_TRUE;
diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h
index e5eab06eeff8..36a493424747 100644
--- a/layout/generic/nsObjectFrame.h
+++ b/layout/generic/nsObjectFrame.h
@@ -85,8 +85,8 @@ public:
   NS_IMETHOD Init(nsIContent* aContent,
                   nsIFrame* aParent,
                   nsIFrame* aPrevInFlow);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   NS_IMETHOD Reflow(nsPresContext* aPresContext,
                     nsHTMLReflowMetrics& aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
@@ -248,12 +248,12 @@ protected:
   nsIntPoint GetWindowOriginInPixels(PRBool aWindowless);
 
   static void PaintPrintPlugin(nsIFrame* aFrame,
-                               nsIRenderingContext* aRenderingContext,
+                               nsRenderingContext* aRenderingContext,
                                const nsRect& aDirtyRect, nsPoint aPt);
-  void PrintPlugin(nsIRenderingContext& aRenderingContext,
+  void PrintPlugin(nsRenderingContext& aRenderingContext,
                    const nsRect& aDirtyRect);
   void PaintPlugin(nsDisplayListBuilder* aBuilder,
-                   nsIRenderingContext& aRenderingContext,
+                   nsRenderingContext& aRenderingContext,
                    const nsRect& aDirtyRect, const nsRect& aPluginRect);
 
   /**
@@ -336,7 +336,7 @@ public:
   virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
                                    PRBool* aForceTransparentSurface = nsnull);
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual PRBool ComputeVisibility(nsDisplayListBuilder* aBuilder,
                                    nsRegion* aVisibleRegion,
                                    const nsRect& aAllowVisibleRegionExpansion,
diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index 769defbeb232..4a51f8304941 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsHTMLParts.h"
 #include "nsIContent.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsIDeviceContext.h"
@@ -59,7 +59,7 @@ NS_NewPageContentFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 NS_IMPL_FRAMEARENA_HELPERS(nsPageContentFrame)
 
 /* virtual */ nsSize
-nsPageContentFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsPageContentFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                 nsSize aCBSize, nscoord aAvailableWidth,
                                 nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                 PRBool aShrinkWrap)
diff --git a/layout/generic/nsPageContentFrame.h b/layout/generic/nsPageContentFrame.h
index 7c22544e6141..5643fec4de2d 100644
--- a/layout/generic/nsPageContentFrame.h
+++ b/layout/generic/nsPageContentFrame.h
@@ -69,7 +69,7 @@ public:
    *  Computes page size based on shared page data; SetSharedPageData must be
    *  given valid data first.
    */
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index bee4f6407aeb..abac5b0245a8 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -38,7 +38,7 @@
 #include "nsPageFrame.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsCSSFrameConstructor.h"
@@ -245,7 +245,7 @@ nsPageFrame::ProcessSpecialCodes(const nsString& aStr, nsString& aNewStr)
 
 
 //------------------------------------------------------------------------------
-nscoord nsPageFrame::GetXPosition(nsIRenderingContext& aRenderingContext, 
+nscoord nsPageFrame::GetXPosition(nsRenderingContext& aRenderingContext, 
                                   const nsRect&        aRect, 
                                   PRInt32              aJust,
                                   const nsString&      aStr)
@@ -281,7 +281,7 @@ nscoord nsPageFrame::GetXPosition(nsIRenderingContext& aRenderingContext,
 // @param aAscent - the ascent of the font
 // @param aHeight - the height of the font
 void
-nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
+nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
                               nsHeaderFooterEnum   aHeaderFooter,
                               const nsString&      aStrLeft,
                               const nsString&      aStrCenter,
@@ -325,7 +325,7 @@ nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
 // @param aAscent - the ascent of the font
 // @param aWidth - available width for the string
 void
-nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
+nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
                               nsHeaderFooterEnum   aHeaderFooter,
                               PRInt32              aJust,
                               const nsString&      aStr,
@@ -395,19 +395,19 @@ nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
   }
 }
 
-static void PaintPrintPreviewBackground(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintPrintPreviewBackground(nsIFrame* aFrame, nsRenderingContext* aCtx,
                                         const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsPageFrame*>(aFrame)->PaintPrintPreviewBackground(*aCtx, aPt);
 }
 
-static void PaintPageContent(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintPageContent(nsIFrame* aFrame, nsRenderingContext* aCtx,
                              const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsPageFrame*>(aFrame)->PaintPageContent(*aCtx, aDirtyRect, aPt);
 }
 
-static void PaintHeaderFooter(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintHeaderFooter(nsIFrame* aFrame, nsRenderingContext* aCtx,
                               const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsPageFrame*>(aFrame)->PaintHeaderFooter(*aCtx, aPt);
@@ -458,7 +458,7 @@ nsPageFrame::SetPageNumInfo(PRInt32 aPageNumber, PRInt32 aTotalPages)
 
 
 void
-nsPageFrame::PaintPrintPreviewBackground(nsIRenderingContext& aRenderingContext,
+nsPageFrame::PaintPrintPreviewBackground(nsRenderingContext& aRenderingContext,
                                          nsPoint aPt)
 {
   // fill page with White
@@ -493,7 +493,7 @@ nsPageFrame::PaintPrintPreviewBackground(nsIRenderingContext& aRenderingContext,
 }
 
 void
-nsPageFrame::PaintHeaderFooter(nsIRenderingContext& aRenderingContext,
+nsPageFrame::PaintHeaderFooter(nsRenderingContext& aRenderingContext,
                                nsPoint aPt)
 {
   nsPresContext* pc = PresContext();
@@ -545,7 +545,7 @@ nsPageFrame::PaintHeaderFooter(nsIRenderingContext& aRenderingContext,
 
 //------------------------------------------------------------------------------
 void
-nsPageFrame::PaintPageContent(nsIRenderingContext& aRenderingContext,
+nsPageFrame::PaintPageContent(nsRenderingContext& aRenderingContext,
                               const nsRect&        aDirtyRect,
                               nsPoint              aPt) {
   nsIFrame* pageContentFrame  = mFrames.FirstChild();
diff --git a/layout/generic/nsPageFrame.h b/layout/generic/nsPageFrame.h
index d912083743f8..e95052ce17c0 100644
--- a/layout/generic/nsPageFrame.h
+++ b/layout/generic/nsPageFrame.h
@@ -81,11 +81,11 @@ public:
 
   virtual void SetSharedPageData(nsSharedPageData* aPD);
 
-  void PaintPrintPreviewBackground(nsIRenderingContext& aRenderingContext,
+  void PaintPrintPreviewBackground(nsRenderingContext& aRenderingContext,
                                    nsPoint aPt);
-  void PaintHeaderFooter(nsIRenderingContext& aRenderingContext,
+  void PaintHeaderFooter(nsRenderingContext& aRenderingContext,
                          nsPoint aPt);
-  void PaintPageContent(nsIRenderingContext& aRenderingContext,
+  void PaintPageContent(nsRenderingContext& aRenderingContext,
                         const nsRect&        aDirtyRect,
                         nsPoint              aPt);
 
@@ -98,12 +98,12 @@ protected:
     eFooter
   } nsHeaderFooterEnum;
 
-  nscoord GetXPosition(nsIRenderingContext& aRenderingContext, 
+  nscoord GetXPosition(nsRenderingContext& aRenderingContext, 
                        const nsRect&        aRect, 
                        PRInt32              aJust,
                        const nsString&      aStr);
 
-  void DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
+  void DrawHeaderFooter(nsRenderingContext& aRenderingContext,
                         nsHeaderFooterEnum   aHeaderFooter,
                         PRInt32              aJust,
                         const nsString&      sStr,
@@ -112,7 +112,7 @@ protected:
                         nscoord              aAscent,
                         nscoord              aWidth);
 
-  void DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
+  void DrawHeaderFooter(nsRenderingContext& aRenderingContext,
                         nsHeaderFooterEnum   aHeaderFooter,
                         const nsString&      aStrLeft,
                         const nsString&      aStrRight,
diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp
index b5c033d76519..85ba57e27a86 100644
--- a/layout/generic/nsPlaceholderFrame.cpp
+++ b/layout/generic/nsPlaceholderFrame.cpp
@@ -46,7 +46,7 @@
 #include "nsLineLayout.h"
 #include "nsIContent.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsFrameManager.h"
 #include "nsDisplayList.h"
@@ -65,7 +65,7 @@ nsPlaceholderFrame::~nsPlaceholderFrame()
 }
 
 /* virtual */ nscoord
-nsPlaceholderFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsPlaceholderFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_MIN_WIDTH(this, result);
@@ -73,7 +73,7 @@ nsPlaceholderFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsPlaceholderFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsPlaceholderFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_PREF_WIDTH(this, result);
@@ -105,7 +105,7 @@ nsPlaceholderFrame::GetMaxSize(nsBoxLayoutState& aBoxLayoutState)
 }
 
 /* virtual */ void
-nsPlaceholderFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsPlaceholderFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                       nsIFrame::InlineMinWidthData *aData)
 {
   // Override AddInlineMinWith so that *nothing* happens.  In
@@ -120,7 +120,7 @@ nsPlaceholderFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ void
-nsPlaceholderFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsPlaceholderFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                        nsIFrame::InlinePrefWidthData *aData)
 {
   // Override AddInlinePrefWith so that *nothing* happens.  In
@@ -210,7 +210,7 @@ nsPlaceholderFrame::GetParentStyleContextFrame(nsPresContext* aPresContext,
 
 #ifdef DEBUG
 static void
-PaintDebugPlaceholder(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+PaintDebugPlaceholder(nsIFrame* aFrame, nsRenderingContext* aCtx,
                       const nsRect& aDirtyRect, nsPoint aPt)
 {
   aCtx->SetColor(NS_RGB(0, 255, 255));
diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h
index 2fc3c1d618c1..a76fd70a1f0a 100644
--- a/layout/generic/nsPlaceholderFrame.h
+++ b/layout/generic/nsPlaceholderFrame.h
@@ -122,11 +122,11 @@ public:
   // nsIHTMLReflow overrides
   // We need to override GetMinWidth and GetPrefWidth because XUL uses
   // placeholders not within lines.
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
   virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
   virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index 46e84b714e05..deb14536a9fa 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -39,7 +39,7 @@
 #include "nsSimplePageSequence.h"
 #include "nsPresContext.h"
 #include "gfxContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
@@ -604,7 +604,7 @@ nsSimplePageSequenceFrame::PrintNextPage()
 
       PR_PL(("SeqFr::PrintNextPage -> %p PageNo: %d", pf, mPageNum));
 
-      nsCOMPtr<nsIRenderingContext> renderingContext;
+      nsRefPtr<nsRenderingContext> renderingContext;
       dc->CreateRenderingContext(*getter_AddRefs(renderingContext));
       NS_ENSURE_TRUE(renderingContext, NS_ERROR_OUT_OF_MEMORY);
 
@@ -665,7 +665,7 @@ nsSimplePageSequenceFrame::DoPageEnd()
   return rv;
 }
 
-static void PaintPageSequence(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+static void PaintPageSequence(nsIFrame* aFrame, nsRenderingContext* aCtx,
                              const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsSimplePageSequenceFrame*>(aFrame)->PaintPageSequence(*aCtx, aDirtyRect, aPt);
@@ -673,7 +673,7 @@ static void PaintPageSequence(nsIFrame* aFrame, nsIRenderingContext* aCtx,
 
 //------------------------------------------------------------------------------
 void
-nsSimplePageSequenceFrame::PaintPageSequence(nsIRenderingContext& aRenderingContext,
+nsSimplePageSequenceFrame::PaintPageSequence(nsRenderingContext& aRenderingContext,
                                              const nsRect&        aDirtyRect,
                                              nsPoint              aPt) {
   nsRect rect = aDirtyRect;
diff --git a/layout/generic/nsSimplePageSequence.h b/layout/generic/nsSimplePageSequence.h
index 8eabb7ccf4d4..0f90ea3cd80a 100644
--- a/layout/generic/nsSimplePageSequence.h
+++ b/layout/generic/nsSimplePageSequence.h
@@ -131,7 +131,7 @@ public:
   NS_IMETHOD  GetFrameName(nsAString& aResult) const;
 #endif
 
-  void PaintPageSequence(nsIRenderingContext& aRenderingContext,
+  void PaintPageSequence(nsRenderingContext& aRenderingContext,
                          const nsRect&        aDirtyRect,
                          nsPoint              aPt);
 
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index d55920ea589a..9f4cad9ca404 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -82,7 +82,7 @@ using mozilla::layout::RenderFrameParent;
 #include "nsWeakReference.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMDocument.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsDisplayList.h"
 #include "nsUnicharUtils.h"
@@ -485,7 +485,7 @@ nsSubDocumentFrame::GetType() const
 }
 
 /* virtual */ nscoord
-nsSubDocumentFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsSubDocumentFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -501,7 +501,7 @@ nsSubDocumentFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsSubDocumentFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsSubDocumentFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -537,7 +537,7 @@ nsSubDocumentFrame::GetIntrinsicRatio()
 }
 
 /* virtual */ nsSize
-nsSubDocumentFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsSubDocumentFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                     nsSize aCBSize, nscoord aAvailableWidth,
                                     nsSize aMargin, nsSize aBorder,
                                     nsSize aPadding, PRBool aShrinkWrap)
@@ -555,7 +555,7 @@ nsSubDocumentFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
 
 
 /* virtual */ nsSize
-nsSubDocumentFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsSubDocumentFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                 nsSize aCBSize, nscoord aAvailableWidth,
                                 nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                 PRBool aShrinkWrap)
diff --git a/layout/generic/nsSubDocumentFrame.h b/layout/generic/nsSubDocumentFrame.h
index cccc562fbdfa..35231e458b20 100644
--- a/layout/generic/nsSubDocumentFrame.h
+++ b/layout/generic/nsSubDocumentFrame.h
@@ -75,18 +75,18 @@ public:
 
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   virtual IntrinsicSize GetIntrinsicSize();
   virtual nsSize  GetIntrinsicRatio();
 
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
index 6bc88d9307b8..a2e9085e6745 100644
--- a/layout/generic/nsTextFrame.h
+++ b/layout/generic/nsTextFrame.h
@@ -226,13 +226,13 @@ public:
 #endif
   
   virtual void MarkIntrinsicWidthsDirty();
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
@@ -256,7 +256,7 @@ public:
     // an amount to *subtract* from the frame's width (zero if !mChanged)
     nscoord      mDeltaWidth;
   };
-  TrimOutput TrimTrailingWhiteSpace(nsIRenderingContext* aRC);
+  TrimOutput TrimTrailingWhiteSpace(nsRenderingContext* aRC);
   virtual nsresult GetRenderedText(nsAString* aString = nsnull,
                                    gfxSkipChars* aSkipChars = nsnull,
                                    gfxSkipCharsIterator* aSkipIter = nsnull,
@@ -265,16 +265,16 @@ public:
 
   nsOverflowAreas RecomputeOverflow();
 
-  void AddInlineMinWidthForFlow(nsIRenderingContext *aRenderingContext,
+  void AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
                                 nsIFrame::InlineMinWidthData *aData);
-  void AddInlinePrefWidthForFlow(nsIRenderingContext *aRenderingContext,
+  void AddInlinePrefWidthForFlow(nsRenderingContext *aRenderingContext,
                                  InlinePrefWidthData *aData);
 
   gfxFloat GetSnappedBaselineY(gfxContext* aContext, gfxFloat aY);
 
   // primary frame paint method called from nsDisplayText
   // The private DrawText() is what applies the text to a graphics context
-  void PaintText(nsIRenderingContext* aRenderingContext, nsPoint aPt,
+  void PaintText(nsRenderingContext* aRenderingContext, nsPoint aPt,
                  const nsRect& aDirtyRect);
   // helper: paint quirks-mode CSS text decorations
   void PaintTextDecorations(gfxContext* aCtx, const gfxRect& aDirtyRect,
@@ -378,7 +378,7 @@ public:
 
   // Similar to Reflow(), but for use from nsLineLayout
   void ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
-                  nsIRenderingContext* aRenderingContext, PRBool aShouldBlink,
+                  nsRenderingContext* aRenderingContext, PRBool aShouldBlink,
                   nsHTMLReflowMetrics& aMetrics, nsReflowStatus& aStatus);
 
 protected:
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index b6ea3b0d0551..92e8bcb25aa6 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -64,7 +64,7 @@
 #include "nsStyleContext.h"
 #include "nsCoord.h"
 #include "nsIFontMetrics.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsITimer.h"
 #include "nsTArray.h"
@@ -1607,9 +1607,9 @@ GetFontGroupForFrame(nsIFrame* aFrame,
 }
 
 static already_AddRefed<gfxContext>
-GetReferenceRenderingContext(nsTextFrame* aTextFrame, nsIRenderingContext* aRC)
+GetReferenceRenderingContext(nsTextFrame* aTextFrame, nsRenderingContext* aRC)
 {
-  nsCOMPtr<nsIRenderingContext> tmp = aRC;
+  nsRefPtr<nsRenderingContext> tmp = aRC;
   if (!tmp) {
     tmp = aTextFrame->PresContext()->PresShell()->GetReferenceRenderingContext();
     if (!tmp)
@@ -3708,9 +3708,9 @@ public:
   virtual nsIFrame* GetFirstInFlow() const;
   virtual nsIFrame* GetFirstContinuation() const;
 
-  virtual void AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                  InlineMinWidthData *aData);
-  virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+  virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                   InlinePrefWidthData *aData);
   
   virtual nsresult GetRenderedText(nsAString* aString = nsnull,
@@ -3855,20 +3855,20 @@ nsContinuingTextFrame::GetFirstContinuation() const
 
 // Needed for text frames in XUL.
 /* virtual */ nscoord
-nsTextFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsTextFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   return nsLayoutUtils::MinWidthFromInline(this, aRenderingContext);
 }
 
 // Needed for text frames in XUL.
 /* virtual */ nscoord
-nsTextFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsTextFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   return nsLayoutUtils::PrefWidthFromInline(this, aRenderingContext);
 }
 
 /* virtual */ void
-nsContinuingTextFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsContinuingTextFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                          InlineMinWidthData *aData)
 {
   // Do nothing, since the first-in-flow accounts for everything.
@@ -3876,7 +3876,7 @@ nsContinuingTextFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ void
-nsContinuingTextFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsContinuingTextFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                           InlinePrefWidthData *aData)
 {
   // Do nothing, since the first-in-flow accounts for everything.
@@ -4116,7 +4116,7 @@ public:
     }
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("Text", TYPE_TEXT)
 
   virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
@@ -4131,7 +4131,7 @@ public:
 
 void
 nsDisplayText::Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx) {
+                     nsRenderingContext* aCtx) {
   // Add 1 pixel of dirty area around mVisibleRect to allow us to paint
   // antialiased pixels beyond the measured text extents.
   // This is temporary until we do this in the actual calculation of text extents.
@@ -5059,7 +5059,7 @@ nsTextFrame::GetSnappedBaselineY(gfxContext* aContext, gfxFloat aY)
 }
 
 void
-nsTextFrame::PaintText(nsIRenderingContext* aRenderingContext, nsPoint aPt,
+nsTextFrame::PaintText(nsRenderingContext* aRenderingContext, nsPoint aPt,
                        const nsRect& aDirtyRect)
 {
   // Don't pass in aRenderingContext here, because we need a *reference*
@@ -6025,7 +6025,7 @@ void nsTextFrame::MarkIntrinsicWidthsDirty()
 // XXX this doesn't handle characters shaped by line endings. We need to
 // temporarily override the "current line ending" settings.
 void
-nsTextFrame::AddInlineMinWidthForFlow(nsIRenderingContext *aRenderingContext,
+nsTextFrame::AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
                                       nsIFrame::InlineMinWidthData *aData)
 {
   PRUint32 flowEndInTextRun;
@@ -6152,7 +6152,7 @@ nsTextFrame::AddInlineMinWidthForFlow(nsIRenderingContext *aRenderingContext,
 // XXX Need to do something here to avoid incremental reflow bugs due to
 // first-line and first-letter changing min-width
 /* virtual */ void
-nsTextFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
+nsTextFrame::AddInlineMinWidth(nsRenderingContext *aRenderingContext,
                                nsIFrame::InlineMinWidthData *aData)
 {
   nsTextFrame* f;
@@ -6183,7 +6183,7 @@ nsTextFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
 // XXX this doesn't handle characters shaped by line endings. We need to
 // temporarily override the "current line ending" settings.
 void
-nsTextFrame::AddInlinePrefWidthForFlow(nsIRenderingContext *aRenderingContext,
+nsTextFrame::AddInlinePrefWidthForFlow(nsRenderingContext *aRenderingContext,
                                        nsIFrame::InlinePrefWidthData *aData)
 {
   PRUint32 flowEndInTextRun;
@@ -6276,7 +6276,7 @@ nsTextFrame::AddInlinePrefWidthForFlow(nsIRenderingContext *aRenderingContext,
 // XXX Need to do something here to avoid incremental reflow bugs due to
 // first-line and first-letter changing pref-width
 /* virtual */ void
-nsTextFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
+nsTextFrame::AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
                                 nsIFrame::InlinePrefWidthData *aData)
 {
   nsTextFrame* f;
@@ -6305,7 +6305,7 @@ nsTextFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ nsSize
-nsTextFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsTextFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                          nsSize aCBSize, nscoord aAvailableWidth,
                          nsSize aMargin, nsSize aBorder, nsSize aPadding,
                          PRBool aShrinkWrap)
@@ -6532,7 +6532,7 @@ nsTextFrame::Reflow(nsPresContext*           aPresContext,
 
 void
 nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
-                        nsIRenderingContext* aRenderingContext,
+                        nsRenderingContext* aRenderingContext,
                         PRBool aShouldBlink,
                         nsHTMLReflowMetrics& aMetrics,
                         nsReflowStatus& aStatus)
@@ -7057,7 +7057,7 @@ nsTextFrame::CanContinueTextRun() const
 }
 
 nsTextFrame::TrimOutput
-nsTextFrame::TrimTrailingWhiteSpace(nsIRenderingContext* aRC)
+nsTextFrame::TrimTrailingWhiteSpace(nsRenderingContext* aRC)
 {
   TrimOutput result;
   result.mChanged = PR_FALSE;
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index ea936495f0e7..24fbed44e7cc 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -47,7 +47,7 @@
 #include "nsHTMLVideoElement.h"
 #include "nsIDOMHTMLVideoElement.h"
 #include "nsDisplayList.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
 #include "nsPresContext.h"
@@ -491,7 +491,7 @@ nsVideoFrame::GetFrameName(nsAString& aResult) const
 }
 #endif
 
-nsSize nsVideoFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsSize nsVideoFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                      nsSize aCBSize,
                                      nscoord aAvailableWidth,
                                      nsSize aMargin,
@@ -517,14 +517,14 @@ nsSize nsVideoFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
                                                            aPadding);
 }
 
-nscoord nsVideoFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nscoord nsVideoFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = GetVideoIntrinsicSize(aRenderingContext).width;
   DISPLAY_MIN_WIDTH(this, result);
   return result;
 }
 
-nscoord nsVideoFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nscoord nsVideoFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = GetVideoIntrinsicSize(aRenderingContext).width;
   DISPLAY_PREF_WIDTH(this, result);
@@ -564,7 +564,7 @@ PRBool nsVideoFrame::ShouldDisplayPoster()
 }
 
 nsSize
-nsVideoFrame::GetVideoIntrinsicSize(nsIRenderingContext *aRenderingContext)
+nsVideoFrame::GetVideoIntrinsicSize(nsRenderingContext *aRenderingContext)
 {
   // Defaulting size to 300x150 if no size given.
   nsIntSize size(300, 150);
diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h
index 67728abe8795..a6584cd2dac6 100644
--- a/layout/generic/nsVideoFrame.h
+++ b/layout/generic/nsVideoFrame.h
@@ -76,14 +76,14 @@ public:
                               PRInt32 aModType);
 
   /* get the size of the video's display */
-  nsSize GetVideoIntrinsicSize(nsIRenderingContext *aRenderingContext);
+  nsSize GetVideoIntrinsicSize(nsRenderingContext *aRenderingContext);
   virtual nsSize GetIntrinsicRatio();
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
   virtual PRBool IsLeaf() const;
 
diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp
index db96f8c794db..b7de4eb48155 100644
--- a/layout/generic/nsViewportFrame.cpp
+++ b/layout/generic/nsViewportFrame.cpp
@@ -192,7 +192,7 @@ ViewportFrame::GetChildList(nsIAtom* aListName) const
 }
 
 /* virtual */ nscoord
-ViewportFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+ViewportFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -207,7 +207,7 @@ ViewportFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-ViewportFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+ViewportFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
diff --git a/layout/generic/nsViewportFrame.h b/layout/generic/nsViewportFrame.h
index 84e261e3731b..0ff6eeb117ff 100644
--- a/layout/generic/nsViewportFrame.h
+++ b/layout/generic/nsViewportFrame.h
@@ -94,8 +94,8 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
diff --git a/layout/inspector/src/inFlasher.cpp b/layout/inspector/src/inFlasher.cpp
index 75c3603b1273..afd774f54522 100644
--- a/layout/inspector/src/inFlasher.cpp
+++ b/layout/inspector/src/inFlasher.cpp
@@ -158,7 +158,7 @@ inFlasher::DrawElementOutline(nsIDOMElement* aElement)
     nsPoint offset;
     nsIWidget* widget = frame->GetNearestWidget(offset);
     if (widget) {
-      nsCOMPtr<nsIRenderingContext> rcontext;
+      nsRefPtr<nsRenderingContext> rcontext;
       frame->PresContext()->DeviceContext()->
         CreateRenderingContext(widget, *getter_AddRefs(rcontext));
       if (rcontext) {
@@ -207,7 +207,7 @@ inFlasher::ScrollElementIntoView(nsIDOMElement *aElement)
 
 void
 inFlasher::DrawOutline(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
-                       nsIRenderingContext* aRenderContext,
+                       nsRenderingContext* aRenderContext,
                        PRBool aDrawBegin, PRBool aDrawEnd)
 {
   aRenderContext->SetColor(mColor);
@@ -225,7 +225,7 @@ inFlasher::DrawOutline(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
 void
 inFlasher::DrawLine(nscoord aX, nscoord aY, nscoord aLength,
                     PRBool aDir, PRBool aBounds,
-                    nsIRenderingContext* aRenderContext)
+                    nsRenderingContext* aRenderContext)
 {
   nscoord thickTwips = nsPresContext::CSSPixelsToAppUnits(mThickness);
   if (aDir) { // horizontal
diff --git a/layout/inspector/src/inFlasher.h b/layout/inspector/src/inFlasher.h
index 2e101dc0794d..9c3c5ba001e5 100644
--- a/layout/inspector/src/inFlasher.h
+++ b/layout/inspector/src/inFlasher.h
@@ -41,7 +41,7 @@
 #include "inIFlasher.h"
 
 #include "nsIDOMElement.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 
 #include "nsCOMPtr.h"
 
@@ -62,11 +62,11 @@ public:
 
 protected:
   void DrawOutline(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
-                   nsIRenderingContext* aRenderContext,
+                   nsRenderingContext* aRenderContext,
                    PRBool aDrawBegin, PRBool aDrawEnd);
   void DrawLine(nscoord aX, nscoord aY, nscoord aLength,
                 PRBool aDir, PRBool aBounds,
-                nsIRenderingContext* aRenderContext);
+                nsRenderingContext* aRenderContext);
 
   nscolor mColor;
 
diff --git a/layout/inspector/src/inLayoutUtils.h b/layout/inspector/src/inLayoutUtils.h
index b9e669203953..02f29f966768 100644
--- a/layout/inspector/src/inLayoutUtils.h
+++ b/layout/inspector/src/inLayoutUtils.h
@@ -42,7 +42,7 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIEventStateManager.h"
 #include "nsIDOMDocument.h"
 #include "nsBindingManager.h"
diff --git a/layout/mathml/nsIMathMLFrame.h b/layout/mathml/nsIMathMLFrame.h
index 7292c51b5bc6..d87b72dec1f8 100644
--- a/layout/mathml/nsIMathMLFrame.h
+++ b/layout/mathml/nsIMathMLFrame.h
@@ -40,7 +40,7 @@
 #ifndef nsIMathMLFrame_h___
 #define nsIMathMLFrame_h___
 
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFrame.h"
 
 struct nsPresentationData;
@@ -113,7 +113,7 @@ public:
   *        of the frame, on output the size after stretching.
   */
   NS_IMETHOD 
-  Stretch(nsIRenderingContext& aRenderingContext,
+  Stretch(nsRenderingContext& aRenderingContext,
           nsStretchDirection   aStretchDirection,
           nsBoundingMetrics&   aContainerSize,
           nsHTMLReflowMetrics& aDesiredStretchSize) = 0;
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 3f0c6057bd1b..0b5dd643971f 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -46,7 +46,7 @@
 #include "nsStyleConsts.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxPlatform.h"
 #include "nsIFontMetrics.h"
 
@@ -1133,7 +1133,7 @@ insert:
 // Update the font and rendering context if there is a family change
 static void
 SetFontFamily(nsPresContext*       aPresContext,
-              nsIRenderingContext& aRenderingContext,
+              nsRenderingContext& aRenderingContext,
               nsFont&              aFont,
               const nsGlyphTable*  aGlyphTable,
               const nsGlyphCode&   aGlyphCode,
@@ -1151,7 +1151,7 @@ class nsMathMLChar::StretchEnumContext {
 public:
   StretchEnumContext(nsMathMLChar*        aChar,
                      nsPresContext*       aPresContext,
-                     nsIRenderingContext& aRenderingContext,
+                     nsRenderingContext& aRenderingContext,
                      nsStretchDirection   aStretchDirection,
                      nscoord              aTargetSize,
                      PRUint32             aStretchHint,
@@ -1182,7 +1182,7 @@ private:
 
   nsMathMLChar* mChar;
   nsPresContext* mPresContext;
-  nsIRenderingContext& mRenderingContext;
+  nsRenderingContext& mRenderingContext;
   const nsStretchDirection mDirection;
   const nscoord mTargetSize;
   const PRUint32 mStretchHint;
@@ -1525,7 +1525,7 @@ nsMathMLChar::StretchEnumContext::EnumCallback(const nsString& aFamily,
 
 nsresult
 nsMathMLChar::StretchInternal(nsPresContext*           aPresContext,
-                              nsIRenderingContext&     aRenderingContext,
+                              nsRenderingContext&     aRenderingContext,
                               nsStretchDirection&      aStretchDirection,
                               const nsBoundingMetrics& aContainerSize,
                               nsBoundingMetrics&       aDesiredStretchSize,
@@ -1798,7 +1798,7 @@ nsMathMLChar::StretchInternal(nsPresContext*           aPresContext,
 
 nsresult
 nsMathMLChar::Stretch(nsPresContext*           aPresContext,
-                      nsIRenderingContext&     aRenderingContext,
+                      nsRenderingContext&     aRenderingContext,
                       nsStretchDirection       aStretchDirection,
                       const nsBoundingMetrics& aContainerSize,
                       nsBoundingMetrics&       aDesiredStretchSize,
@@ -1836,7 +1836,7 @@ nsMathMLChar::Stretch(nsPresContext*           aPresContext,
 // considered.
 nscoord
 nsMathMLChar::GetMaxWidth(nsPresContext* aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           PRUint32 aStretchHint,
                           float aMaxSize, PRBool aMaxSizeIsAbsolute)
 {
@@ -1852,7 +1852,7 @@ nsMathMLChar::GetMaxWidth(nsPresContext* aPresContext,
 
 nsresult
 nsMathMLChar::ComposeChildren(nsPresContext*      aPresContext,
-                              nsIRenderingContext& aRenderingContext,
+                              nsRenderingContext& aRenderingContext,
                               nsGlyphTable*        aGlyphTable,
                               nscoord              aTargetSize,
                               nsBoundingMetrics&   aCompositeSize,
@@ -1946,14 +1946,14 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLSelectionRect", TYPE_MATHML_SELECTION_RECT)
 private:
   nsRect    mRect;
 };
 
 void nsDisplayMathMLSelectionRect::Paint(nsDisplayListBuilder* aBuilder,
-                                         nsIRenderingContext* aCtx)
+                                         nsRenderingContext* aCtx)
 {
   // get color to use for selection from the look&feel object
   nscolor bgColor = NS_RGB(0, 0, 0);
@@ -1978,7 +1978,7 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLCharBackground", TYPE_MATHML_CHAR_BACKGROUND)
 private:
   nsStyleContext* mStyleContext;
@@ -1986,7 +1986,7 @@ private:
 };
 
 void nsDisplayMathMLCharBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                          nsIRenderingContext* aCtx)
+                                          nsRenderingContext* aCtx)
 {
   const nsStyleBorder* border = mStyleContext->GetStyleBorder();
   nsRect rect(mRect + ToReferenceFrame());
@@ -2021,7 +2021,7 @@ public:
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx)
+                     nsRenderingContext* aCtx)
   {
     mChar->PaintForeground(mFrame->PresContext(), *aCtx,
                            ToReferenceFrame(), mIsSelected);
@@ -2054,7 +2054,7 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLCharDebug", TYPE_MATHML_CHAR_DEBUG)
 
 private:
@@ -2062,7 +2062,7 @@ private:
 };
 
 void nsDisplayMathMLCharDebug::Paint(nsDisplayListBuilder* aBuilder,
-                                     nsIRenderingContext* aCtx)
+                                     nsRenderingContext* aCtx)
 {
   // for visual debug
   PRIntn skipSides = 0;
@@ -2129,7 +2129,7 @@ nsMathMLChar::Display(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsMathMLChar::ApplyTransforms(nsIRenderingContext& aRenderingContext, nsRect &r)
+nsMathMLChar::ApplyTransforms(nsRenderingContext& aRenderingContext, nsRect &r)
 {
   // apply the transforms
   aRenderingContext.Translate(r.TopLeft());
@@ -2143,7 +2143,7 @@ nsMathMLChar::ApplyTransforms(nsIRenderingContext& aRenderingContext, nsRect &r)
 
 void
 nsMathMLChar::PaintForeground(nsPresContext* aPresContext,
-                              nsIRenderingContext& aRenderingContext,
+                              nsRenderingContext& aRenderingContext,
                               nsPoint aPt,
                               PRBool aIsSelected)
 {
@@ -2210,9 +2210,9 @@ nsMathMLChar::PaintForeground(nsPresContext* aPresContext,
  */
 
 class AutoPushClipRect {
-  nsIRenderingContext& mCtx;
+  nsRenderingContext& mCtx;
 public:
-  AutoPushClipRect(nsIRenderingContext& aCtx, const nsRect& aRect)
+  AutoPushClipRect(nsRenderingContext& aCtx, const nsRect& aRect)
     : mCtx(aCtx) {
     mCtx.PushState();
     mCtx.SetClipRect(aRect, nsClipCombine_kIntersect);
@@ -2238,7 +2238,7 @@ SnapToDevPixels(const gfxContext* aThebesContext, PRInt32 aAppUnitsPerGfxUnit,
 // paint a stretchy char by assembling glyphs vertically
 nsresult
 nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
-                              nsIRenderingContext& aRenderingContext,
+                              nsRenderingContext& aRenderingContext,
                               nsFont&              aFont,
                               nsStyleContext*      aStyleContext,
                               nsGlyphTable*        aGlyphTable,
@@ -2471,7 +2471,7 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
 // paint a stretchy char by assembling glyphs horizontally
 nsresult
 nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
-                                nsIRenderingContext& aRenderingContext,
+                                nsRenderingContext& aRenderingContext,
                                 nsFont&              aFont,
                                 nsStyleContext*      aStyleContext,
                                 nsGlyphTable*        aGlyphTable,
diff --git a/layout/mathml/nsMathMLChar.h b/layout/mathml/nsMathMLChar.h
index 2076f64bfe11..947978b774d6 100644
--- a/layout/mathml/nsMathMLChar.h
+++ b/layout/mathml/nsMathMLChar.h
@@ -131,7 +131,7 @@ public:
           const nsRect*           aSelectedRect = nsnull);
           
   void PaintForeground(nsPresContext* aPresContext,
-                       nsIRenderingContext& aRenderingContext,
+                       nsRenderingContext& aRenderingContext,
                        nsPoint aPt,
                        PRBool aIsSelected);
 
@@ -140,7 +140,7 @@ public:
   // @param aDesiredStretchSize - OUT - the size that the char wants
   nsresult
   Stretch(nsPresContext*           aPresContext,
-          nsIRenderingContext&     aRenderingContext,
+          nsRenderingContext&     aRenderingContext,
           nsStretchDirection       aStretchDirection,
           const nsBoundingMetrics& aContainerSize,
           nsBoundingMetrics&       aDesiredStretchSize,
@@ -201,7 +201,7 @@ public:
   // value in app units (PR_TRUE) or a multiplier of the base size (PR_FALSE).
   nscoord
   GetMaxWidth(nsPresContext* aPresContext,
-              nsIRenderingContext& aRenderingContext,
+              nsRenderingContext& aRenderingContext,
               PRUint32 aStretchHint = NS_STRETCH_NORMAL,
               float aMaxSize = NS_MATHML_OPERATOR_SIZE_INFINITY,
               // Perhaps just nsOperatorFlags aFlags.
@@ -263,7 +263,7 @@ private:
   // helper methods
   nsresult
   StretchInternal(nsPresContext*           aPresContext,
-                  nsIRenderingContext&     aRenderingContext,
+                  nsRenderingContext&     aRenderingContext,
                   nsStretchDirection&      aStretchDirection,
                   const nsBoundingMetrics& aContainerSize,
                   nsBoundingMetrics&       aDesiredStretchSize,
@@ -273,7 +273,7 @@ private:
 
   nsresult
   ComposeChildren(nsPresContext*       aPresContext,
-                  nsIRenderingContext& aRenderingContext,
+                  nsRenderingContext& aRenderingContext,
                   nsGlyphTable*        aGlyphTable,
                   nscoord              aTargetSize,
                   nsBoundingMetrics&   aCompositeSize,
@@ -281,7 +281,7 @@ private:
 
   nsresult
   PaintVertically(nsPresContext*       aPresContext,
-                  nsIRenderingContext& aRenderingContext,
+                  nsRenderingContext& aRenderingContext,
                   nsFont&              aFont,
                   nsStyleContext*      aStyleContext,
                   nsGlyphTable*        aGlyphTable,
@@ -289,14 +289,14 @@ private:
 
   nsresult
   PaintHorizontally(nsPresContext*       aPresContext,
-                    nsIRenderingContext& aRenderingContext,
+                    nsRenderingContext& aRenderingContext,
                     nsFont&              aFont,
                     nsStyleContext*      aStyleContext,
                     nsGlyphTable*        aGlyphTable,
                     nsRect&              aRect);
 
   void
-  ApplyTransforms(nsIRenderingContext& aRenderingContext, nsRect &r);
+  ApplyTransforms(nsRenderingContext& aRenderingContext, nsRect &r);
 };
 
 #endif /* nsMathMLChar_h___ */
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index 5a6b9ab4e887..3d696d2256ed 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -49,7 +49,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsIDOMText.h"
@@ -83,7 +83,7 @@ NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 // error handlers
 // provide a feedback to the user when a frame with bad markup can not be rendered
 nsresult
-nsMathMLContainerFrame::ReflowError(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
                                     nsHTMLReflowMetrics& aDesiredSize)
 {
   nsresult rv;
@@ -135,12 +135,12 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLError", TYPE_MATHML_ERROR)
 };
 
 void nsDisplayMathMLError::Paint(nsDisplayListBuilder* aBuilder,
-                                 nsIRenderingContext* aCtx)
+                                 nsRenderingContext* aCtx)
 {
   // Set color and font ...
   nsLayoutUtils::SetFontFromStyle(aCtx, mFrame->GetStyleContext());
@@ -238,7 +238,7 @@ nsMathMLContainerFrame::ClearSavedChildMetrics()
 // helper to get the preferred size that a container frame should use to fire
 // the stretch on its stretchy child frames.
 void
-nsMathMLContainerFrame::GetPreferredStretchSize(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::GetPreferredStretchSize(nsRenderingContext& aRenderingContext,
                                                 PRUint32             aOptions,
                                                 nsStretchDirection   aStretchDirection,
                                                 nsBoundingMetrics&   aPreferredStretchSize)
@@ -333,7 +333,7 @@ nsMathMLContainerFrame::GetPreferredStretchSize(nsIRenderingContext& aRenderingC
 }
 
 NS_IMETHODIMP
-nsMathMLContainerFrame::Stretch(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::Stretch(nsRenderingContext& aRenderingContext,
                                 nsStretchDirection   aStretchDirection,
                                 nsBoundingMetrics&   aContainerSize,
                                 nsHTMLReflowMetrics& aDesiredStretchSize)
@@ -484,7 +484,7 @@ nsMathMLContainerFrame::Stretch(nsIRenderingContext& aRenderingContext,
 }
 
 nsresult
-nsMathMLContainerFrame::FinalizeReflow(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::FinalizeReflow(nsRenderingContext& aRenderingContext,
                                        nsHTMLReflowMetrics& aDesiredSize)
 {
   // During reflow, we use rect.x and rect.y as placeholders for the child's ascent
@@ -1031,7 +1031,7 @@ nsMathMLContainerFrame::Reflow(nsPresContext*           aPresContext,
 }
 
 /* virtual */ nscoord
-nsMathMLContainerFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsMathMLContainerFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -1040,7 +1040,7 @@ nsMathMLContainerFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsMathMLContainerFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsMathMLContainerFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -1049,7 +1049,7 @@ nsMathMLContainerFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsMathMLContainerFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext)
+nsMathMLContainerFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext)
 {
   // Get child widths
   nsIFrame* childFrame = mFrames.FirstChild();
@@ -1087,7 +1087,7 @@ nsMathMLContainerFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext
 }
 
 /* virtual */ nsresult
-nsMathMLContainerFrame::MeasureForWidth(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::MeasureForWidth(nsRenderingContext& aRenderingContext,
                                         nsHTMLReflowMetrics& aDesiredSize)
 {
   return Place(aRenderingContext, PR_FALSE, aDesiredSize);
@@ -1281,7 +1281,7 @@ private:
 };
 
 /* virtual */ nsresult
-nsMathMLContainerFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLContainerFrame::Place(nsRenderingContext& aRenderingContext,
                               PRBool               aPlaceOrigin,
                               nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLContainerFrame.h b/layout/mathml/nsMathMLContainerFrame.h
index 9c3ad2296c7c..eb99ade18c4c 100644
--- a/layout/mathml/nsMathMLContainerFrame.h
+++ b/layout/mathml/nsMathMLContainerFrame.h
@@ -79,7 +79,7 @@ public:
   // Overloaded nsMathMLFrame methods -- see documentation in nsIMathMLFrame.h
 
   NS_IMETHOD
-  Stretch(nsIRenderingContext& aRenderingContext,
+  Stretch(nsRenderingContext& aRenderingContext,
           nsStretchDirection   aStretchDirection,
           nsBoundingMetrics&   aContainerSize,
           nsHTMLReflowMetrics& aDesiredStretchSize);
@@ -136,13 +136,13 @@ public:
    * Both GetMinWidth and GetPrefWidth return whatever
    * GetIntrinsicWidth returns.
    */
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   /**
    * Return the intrinsic width of the frame's content area.
    */
-  virtual nscoord GetIntrinsicWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetIntrinsicWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD
   Reflow(nsPresContext*          aPresContext,
@@ -227,7 +227,7 @@ protected:
    *        return.
    */
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
@@ -240,7 +240,7 @@ protected:
   // if in an <mrow>, and so their frames implement MeasureForWidth to use
   // nsMathMLContainerFrame::Place.
   virtual nsresult
-  MeasureForWidth(nsIRenderingContext& aRenderingContext,
+  MeasureForWidth(nsRenderingContext& aRenderingContext,
                   nsHTMLReflowMetrics& aDesiredSize);
 
 
@@ -252,7 +252,7 @@ protected:
   // helper to get the preferred size that a container frame should use to fire
   // the stretch on its stretchy child frames.
   void
-  GetPreferredStretchSize(nsIRenderingContext& aRenderingContext,
+  GetPreferredStretchSize(nsRenderingContext& aRenderingContext,
                           PRUint32             aOptions,
                           nsStretchDirection   aStretchDirection,
                           nsBoundingMetrics&   aPreferredStretchSize);
@@ -266,7 +266,7 @@ public:
   // error handlers to provide a visual feedback to the user when an error
   // (typically invalid markup) was encountered during reflow.
   nsresult
-  ReflowError(nsIRenderingContext& aRenderingContext,
+  ReflowError(nsRenderingContext& aRenderingContext,
               nsHTMLReflowMetrics& aDesiredSize);
 
   // helper method to reflow a child frame. We are inline frames, and we don't
@@ -293,7 +293,7 @@ protected:
   // helper method to complete the post-reflow hook and ensure that embellished
   // operators don't terminate their Reflow without receiving a Stretch command.
   virtual nsresult
-  FinalizeReflow(nsIRenderingContext& aRenderingContext,
+  FinalizeReflow(nsRenderingContext& aRenderingContext,
                  nsHTMLReflowMetrics& aDesiredSize);
 
   // Record metrics of a child frame for recovery through the following method
diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.cpp b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
index 537766a224b4..421efa54edc1 100644
--- a/layout/mathml/nsMathMLForeignFrameWrapper.cpp
+++ b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
@@ -49,7 +49,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLForeignFrameWrapper.h"
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index 32a62b1a3107..e050ff01d50b 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -275,7 +275,7 @@ nsMathMLFrame::GetAttribute(nsIContent* aContent,
 }
 
 /* static */ void
-nsMathMLFrame::GetRuleThickness(nsIRenderingContext& aRenderingContext,
+nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
                                 nsIFontMetrics*      aFontMetrics,
                                 nscoord&             aRuleThickness)
 {
@@ -313,7 +313,7 @@ nsMathMLFrame::GetRuleThickness(nsIRenderingContext& aRenderingContext,
 }
 
 /* static */ void
-nsMathMLFrame::GetAxisHeight(nsIRenderingContext& aRenderingContext,
+nsMathMLFrame::GetAxisHeight(nsRenderingContext& aRenderingContext,
                              nsIFontMetrics*      aFontMetrics,
                              nscoord&             aAxisHeight)
 {
@@ -464,14 +464,14 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLBoundingMetrics", TYPE_MATHML_BOUNDING_METRICS)
 private:
   nsRect    mRect;
 };
 
 void nsDisplayMathMLBoundingMetrics::Paint(nsDisplayListBuilder* aBuilder,
-                                           nsIRenderingContext* aCtx)
+                                           nsRenderingContext* aCtx)
 {
   aCtx->SetColor(NS_RGB(0,0,255));
   aCtx->DrawRect(mRect + ToReferenceFrame());
@@ -509,14 +509,14 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLBar", TYPE_MATHML_BAR)
 private:
   nsRect    mRect;
 };
 
 void nsDisplayMathMLBar::Paint(nsDisplayListBuilder* aBuilder,
-                               nsIRenderingContext* aCtx)
+                               nsRenderingContext* aCtx)
 {
   // paint the bar with the current text color
   aCtx->SetColor(mFrame->GetStyleColor()->mColor);
diff --git a/layout/mathml/nsMathMLFrame.h b/layout/mathml/nsMathMLFrame.h
index 336a35d641c6..47b1246fc5f2 100644
--- a/layout/mathml/nsMathMLFrame.h
+++ b/layout/mathml/nsMathMLFrame.h
@@ -41,7 +41,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsStyleContext.h"
 #include "nsMathMLAtoms.h"
@@ -85,7 +85,7 @@ public:
   virtual eMathMLFrameType GetMathMLFrameType();
 
   NS_IMETHOD
-  Stretch(nsIRenderingContext& aRenderingContext,
+  Stretch(nsRenderingContext& aRenderingContext,
           nsStretchDirection   aStretchDirection,
           nsBoundingMetrics&   aContainerSize,
           nsHTMLReflowMetrics& aDesiredStretchSize)
@@ -385,12 +385,12 @@ public:
   // Here are some slower variants to obtain the desired metrics
   // by actually measuring some characters
   static void
-  GetRuleThickness(nsIRenderingContext& aRenderingContext, 
+  GetRuleThickness(nsRenderingContext& aRenderingContext, 
                    nsIFontMetrics*      aFontMetrics,
                    nscoord&             aRuleThickness);
 
   static void
-  GetAxisHeight(nsIRenderingContext& aRenderingContext, 
+  GetAxisHeight(nsRenderingContext& aRenderingContext, 
                 nsIFontMetrics*      aFontMetrics,
                 nscoord&             aAxisHeight);
 
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index 86594bac96ff..1954e20d5a31 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
@@ -197,7 +197,7 @@ nsMathMLTokenFrame::Reflow(nsPresContext*          aPresContext,
 // pass, it is not computed here because our children may be text frames
 // that do not implement the GetBoundingMetrics() interface.
 /* virtual */ nsresult
-nsMathMLTokenFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLTokenFrame::Place(nsRenderingContext& aRenderingContext,
                           PRBool               aPlaceOrigin,
                           nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLTokenFrame.h b/layout/mathml/nsMathMLTokenFrame.h
index 000366a3e0cb..fc3e1e61bba0 100644
--- a/layout/mathml/nsMathMLTokenFrame.h
+++ b/layout/mathml/nsMathMLTokenFrame.h
@@ -80,7 +80,7 @@ public:
          nsReflowStatus&          aStatus);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp
index 7a3f841a122d..07d365023166 100644
--- a/layout/mathml/nsMathMLmactionFrame.cpp
+++ b/layout/mathml/nsMathMLmactionFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsCSSRendering.h"
@@ -316,7 +316,7 @@ nsMathMLmactionFrame::Reflow(nsPresContext*          aPresContext,
 
 // Only place the selected child ...
 /* virtual */ nsresult
-nsMathMLmactionFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmactionFrame::Place(nsRenderingContext& aRenderingContext,
                             PRBool               aPlaceOrigin,
                             nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLmactionFrame.h b/layout/mathml/nsMathMLmactionFrame.h
index b59bcd4de55a..6daaa006e5d3 100644
--- a/layout/mathml/nsMathMLmactionFrame.h
+++ b/layout/mathml/nsMathMLmactionFrame.h
@@ -72,7 +72,7 @@ public:
                               const nsDisplayListSet& aLists);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index a0bc0859c403..63f4751672fa 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -47,7 +47,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsWhitespaceTokenizer.h"
 
@@ -332,14 +332,14 @@ nsMathMLmencloseFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 /* virtual */ nsresult
-nsMathMLmencloseFrame::MeasureForWidth(nsIRenderingContext& aRenderingContext,
+nsMathMLmencloseFrame::MeasureForWidth(nsRenderingContext& aRenderingContext,
                                        nsHTMLReflowMetrics& aDesiredSize)
 {
   return PlaceInternal(aRenderingContext, PR_FALSE, aDesiredSize, PR_TRUE);
 }
 
 /* virtual */ nsresult
-nsMathMLmencloseFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmencloseFrame::Place(nsRenderingContext& aRenderingContext,
                              PRBool               aPlaceOrigin,
                              nsHTMLReflowMetrics& aDesiredSize)
 {
@@ -347,7 +347,7 @@ nsMathMLmencloseFrame::Place(nsIRenderingContext& aRenderingContext,
 }
 
 /* virtual */ nsresult
-nsMathMLmencloseFrame::PlaceInternal(nsIRenderingContext& aRenderingContext,
+nsMathMLmencloseFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
                                      PRBool               aPlaceOrigin,
                                      nsHTMLReflowMetrics& aDesiredSize,
                                      PRBool               aWidthOnly)
@@ -753,7 +753,7 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLMencloseNotation", TYPE_MATHML_MENCLOSE_NOTATION)
 
 private:
@@ -763,7 +763,7 @@ private:
 };
 
 void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder,
-                              nsIRenderingContext* aCtx)
+                              nsRenderingContext* aCtx)
 {
   // get the gfxRect
   nsPresContext* presContext = mFrame->PresContext();
diff --git a/layout/mathml/nsMathMLmencloseFrame.h b/layout/mathml/nsMathMLmencloseFrame.h
index 5204f8b443e2..5040b480f63b 100644
--- a/layout/mathml/nsMathMLmencloseFrame.h
+++ b/layout/mathml/nsMathMLmencloseFrame.h
@@ -85,12 +85,12 @@ public:
                                              nsStyleContext* aContext);
   
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
   
   virtual nsresult
-  MeasureForWidth(nsIRenderingContext& aRenderingContext,
+  MeasureForWidth(nsRenderingContext& aRenderingContext,
                   nsHTMLReflowMetrics& aDesiredSize);
   
   NS_IMETHOD
@@ -126,7 +126,7 @@ protected:
   nsMathMLmencloseFrame(nsStyleContext* aContext);
   virtual ~nsMathMLmencloseFrame();
 
-  nsresult PlaceInternal(nsIRenderingContext& aRenderingContext,
+  nsresult PlaceInternal(nsRenderingContext& aRenderingContext,
                          PRBool               aPlaceOrigin,
                          nsHTMLReflowMetrics& aDesiredSize,
                          PRBool               aWidthOnly);
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 7d7a108b142c..38081f2d5cdf 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmfencedFrame.h"
@@ -467,7 +467,7 @@ GetCharSpacing(nsMathMLChar*        aMathMLChar,
 // helper functions to perform the common task of formatting our chars
 /*static*/ nsresult
 nsMathMLmfencedFrame::ReflowChar(nsPresContext*      aPresContext,
-                                 nsIRenderingContext& aRenderingContext,
+                                 nsRenderingContext& aRenderingContext,
                                  nsMathMLChar*        aMathMLChar,
                                  nsOperatorFlags      aForm,
                                  PRInt32              aScriptLevel,
@@ -564,7 +564,7 @@ nsMathMLmfencedFrame::PlaceChar(nsMathMLChar*      aMathMLChar,
 
 static nscoord
 GetMaxCharWidth(nsPresContext*       aPresContext,
-                nsIRenderingContext* aRenderingContext,
+                nsRenderingContext* aRenderingContext,
                 nsMathMLChar*        aMathMLChar,
                 nsOperatorFlags      aForm,
                 PRInt32              aScriptLevel,
@@ -584,7 +584,7 @@ GetMaxCharWidth(nsPresContext*       aPresContext,
 }
 
 /* virtual */ nscoord
-nsMathMLmfencedFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext)
+nsMathMLmfencedFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext)
 {
   nscoord width = 0;
 
diff --git a/layout/mathml/nsMathMLmfencedFrame.h b/layout/mathml/nsMathMLmfencedFrame.h
index 54f8e3914614..00ade33eb92e 100644
--- a/layout/mathml/nsMathMLmfencedFrame.h
+++ b/layout/mathml/nsMathMLmfencedFrame.h
@@ -78,7 +78,7 @@ public:
                               const nsDisplayListSet& aLists);
 
   virtual nscoord
-  GetIntrinsicWidth(nsIRenderingContext* aRenderingContext);
+  GetIntrinsicWidth(nsRenderingContext* aRenderingContext);
 
   NS_IMETHOD
   AttributeChanged(PRInt32         aNameSpaceID,
@@ -96,7 +96,7 @@ public:
   // helper routines to format the MathMLChars involved here
   static nsresult
   ReflowChar(nsPresContext*      aPresContext,
-             nsIRenderingContext& aRenderingContext,
+             nsRenderingContext& aRenderingContext,
              nsMathMLChar*        aMathMLChar,
              nsOperatorFlags      aForm,
              PRInt32              aScriptLevel,
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index ee5a053ccc8b..7ae94a35f451 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmfracFrame.h"
@@ -213,7 +213,7 @@ nsMathMLmfracFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 /* virtual */ nsresult
-nsMathMLmfracFrame::MeasureForWidth(nsIRenderingContext& aRenderingContext,
+nsMathMLmfracFrame::MeasureForWidth(nsRenderingContext& aRenderingContext,
                                     nsHTMLReflowMetrics& aDesiredSize)
 {
   return PlaceInternal(aRenderingContext,
@@ -233,7 +233,7 @@ nsMathMLmfracFrame::FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize)
 }
 
 /* virtual */ nsresult
-nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmfracFrame::Place(nsRenderingContext& aRenderingContext,
                           PRBool               aPlaceOrigin,
                           nsHTMLReflowMetrics& aDesiredSize)
 {
@@ -244,7 +244,7 @@ nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext,
 }
 
 nsresult
-nsMathMLmfracFrame::PlaceInternal(nsIRenderingContext& aRenderingContext,
+nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
                                   PRBool               aPlaceOrigin,
                                   nsHTMLReflowMetrics& aDesiredSize,
                                   PRBool               aWidthOnly)
@@ -596,7 +596,7 @@ public:
   }
 #endif
 
-  virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx);
+  virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("MathMLSlash", TYPE_MATHML_SLASH)
 
 private:
@@ -605,7 +605,7 @@ private:
 };
 
 void nsDisplayMathMLSlash::Paint(nsDisplayListBuilder* aBuilder,
-                                 nsIRenderingContext* aCtx)
+                                 nsRenderingContext* aCtx)
 {
   // get the gfxRect
   nsPresContext* presContext = mFrame->PresContext();
diff --git a/layout/mathml/nsMathMLmfracFrame.h b/layout/mathml/nsMathMLmfracFrame.h
index eafdf9e5f734..968710b771f8 100644
--- a/layout/mathml/nsMathMLmfracFrame.h
+++ b/layout/mathml/nsMathMLmfracFrame.h
@@ -104,11 +104,11 @@ public:
        nsIFrame*        aPrevInFlow);
 
   virtual nsresult
-  MeasureForWidth(nsIRenderingContext& aRenderingContext,
+  MeasureForWidth(nsRenderingContext& aRenderingContext,
                   nsHTMLReflowMetrics& aDesiredSize);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
@@ -146,7 +146,7 @@ protected:
   PRBool
   IsBevelled();
 
-  nsresult PlaceInternal(nsIRenderingContext& aRenderingContext,
+  nsresult PlaceInternal(nsRenderingContext& aRenderingContext,
                          PRBool               aPlaceOrigin,
                          nsHTMLReflowMetrics& aDesiredSize,
                          PRBool               aWidthOnly);
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index a17ad95a185a..7710cc710f84 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmmultiscriptsFrame.h"
@@ -143,7 +143,7 @@ nsMathMLmmultiscriptsFrame::ProcessAttributes()
 }
 
 /* virtual */ nsresult
-nsMathMLmmultiscriptsFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
                                   PRBool               aPlaceOrigin,
                                   nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.h b/layout/mathml/nsMathMLmmultiscriptsFrame.h
index e91c1cf01837..710527ef7293 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.h
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.h
@@ -58,7 +58,7 @@ public:
   TransmitAutomaticData();
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index e83c308ee085..975672e38f7a 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 
@@ -624,7 +624,7 @@ GetStretchHint(nsOperatorFlags aFlags, nsPresentationData aPresentationData,
 //       On input  - it contains our current size
 //       On output - the same size or the new size that we want
 NS_IMETHODIMP
-nsMathMLmoFrame::Stretch(nsIRenderingContext& aRenderingContext,
+nsMathMLmoFrame::Stretch(nsRenderingContext& aRenderingContext,
                          nsStretchDirection   aStretchDirection,
                          nsBoundingMetrics&   aContainerSize,
                          nsHTMLReflowMetrics& aDesiredStretchSize)
@@ -1005,7 +1005,7 @@ nsMathMLmoFrame::MarkIntrinsicWidthsDirty()
 }
 
 /* virtual */ nscoord
-nsMathMLmoFrame::GetIntrinsicWidth(nsIRenderingContext *aRenderingContext)
+nsMathMLmoFrame::GetIntrinsicWidth(nsRenderingContext *aRenderingContext)
 {
   ProcessOperatorData();
   nscoord width;
diff --git a/layout/mathml/nsMathMLmoFrame.h b/layout/mathml/nsMathMLmoFrame.h
index 590e7f13762e..277629093ded 100644
--- a/layout/mathml/nsMathMLmoFrame.h
+++ b/layout/mathml/nsMathMLmoFrame.h
@@ -81,7 +81,7 @@ public:
   virtual void MarkIntrinsicWidthsDirty();
 
   virtual nscoord
-  GetIntrinsicWidth(nsIRenderingContext *aRenderingContext);
+  GetIntrinsicWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD
   AttributeChanged(PRInt32         aNameSpaceID,
@@ -91,7 +91,7 @@ public:
   // This method is called by the parent frame to ask <mo> 
   // to stretch itself.
   NS_IMETHOD
-  Stretch(nsIRenderingContext& aRenderingContext,
+  Stretch(nsRenderingContext& aRenderingContext,
           nsStretchDirection   aStretchDirection,
           nsBoundingMetrics&   aContainerSize,
           nsHTMLReflowMetrics& aDesiredStretchSize);
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index a6be6f0756aa..055427562156 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -46,7 +46,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmoverFrame.h"
@@ -246,7 +246,7 @@ i.e.:
 */
 
 /* virtual */ nsresult
-nsMathMLmoverFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmoverFrame::Place(nsRenderingContext& aRenderingContext,
                           PRBool               aPlaceOrigin,
                           nsHTMLReflowMetrics& aDesiredSize)
 { 
diff --git a/layout/mathml/nsMathMLmoverFrame.h b/layout/mathml/nsMathMLmoverFrame.h
index f6bdba150e0b..97675d0c3b14 100644
--- a/layout/mathml/nsMathMLmoverFrame.h
+++ b/layout/mathml/nsMathMLmoverFrame.h
@@ -55,7 +55,7 @@ public:
   friend nsIFrame* NS_NewMathMLmoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmpaddedFrame.cpp b/layout/mathml/nsMathMLmpaddedFrame.cpp
index 2e238d0150ed..a640ff373f79 100644
--- a/layout/mathml/nsMathMLmpaddedFrame.cpp
+++ b/layout/mathml/nsMathMLmpaddedFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmpaddedFrame.h"
@@ -376,7 +376,7 @@ nsMathMLmpaddedFrame::Reflow(nsPresContext*          aPresContext,
 }
 
 /* virtual */ nsresult
-nsMathMLmpaddedFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmpaddedFrame::Place(nsRenderingContext& aRenderingContext,
                             PRBool               aPlaceOrigin,
                             nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLmpaddedFrame.h b/layout/mathml/nsMathMLmpaddedFrame.h
index d538838d5069..6d9430f72ea5 100644
--- a/layout/mathml/nsMathMLmpaddedFrame.h
+++ b/layout/mathml/nsMathMLmpaddedFrame.h
@@ -69,7 +69,7 @@ public:
          nsReflowStatus&          aStatus);
   
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmphantomFrame.cpp b/layout/mathml/nsMathMLmphantomFrame.cpp
index 2e81455cf975..866a32b64baa 100644
--- a/layout/mathml/nsMathMLmphantomFrame.cpp
+++ b/layout/mathml/nsMathMLmphantomFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsFrame.h"
 #include "nsPresContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmphantomFrame.h"
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 8794e0f2079e..5d195e017d27 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -45,7 +45,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmrootFrame.h"
@@ -206,7 +206,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
   aDesiredSize.ascent = 0;
 
   nsBoundingMetrics bmSqr, bmBase, bmIndex;
-  nsIRenderingContext& renderingContext = *aReflowState.rendContext;
+  nsRenderingContext& renderingContext = *aReflowState.rendContext;
 
   //////////////////
   // Reflow Children
@@ -393,7 +393,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
 }
 
 /* virtual */ nscoord
-nsMathMLmrootFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext)
+nsMathMLmrootFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext)
 {
   nsIFrame* baseFrame = mFrames.FirstChild();
   nsIFrame* indexFrame = nsnull;
diff --git a/layout/mathml/nsMathMLmrootFrame.h b/layout/mathml/nsMathMLmrootFrame.h
index eb9785f3cb62..0d34596c623e 100644
--- a/layout/mathml/nsMathMLmrootFrame.h
+++ b/layout/mathml/nsMathMLmrootFrame.h
@@ -75,7 +75,7 @@ public:
          nsReflowStatus&          aStatus);
 
   virtual nscoord
-  GetIntrinsicWidth(nsIRenderingContext* aRenderingContext);
+  GetIntrinsicWidth(nsRenderingContext* aRenderingContext);
 
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                               const nsRect&           aDirtyRect,
diff --git a/layout/mathml/nsMathMLmrowFrame.cpp b/layout/mathml/nsMathMLmrowFrame.cpp
index 4333a55b80c6..7fcc5de6364c 100644
--- a/layout/mathml/nsMathMLmrowFrame.cpp
+++ b/layout/mathml/nsMathMLmrowFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsFrame.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmrowFrame.h"
diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp
index e1a9b2f6bfa2..e55b29cd65bc 100644
--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmspaceFrame.h"
diff --git a/layout/mathml/nsMathMLmstyleFrame.cpp b/layout/mathml/nsMathMLmstyleFrame.cpp
index 1dabf4703e42..dc187cff26ad 100644
--- a/layout/mathml/nsMathMLmstyleFrame.cpp
+++ b/layout/mathml/nsMathMLmstyleFrame.cpp
@@ -43,7 +43,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmstyleFrame.h"
diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp
index b81ef030cf9a..7ea5d371d0b3 100644
--- a/layout/mathml/nsMathMLmsubFrame.cpp
+++ b/layout/mathml/nsMathMLmsubFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubFrame.h"
@@ -84,7 +84,7 @@ nsMathMLmsubFrame::TransmitAutomaticData()
 }
 
 /* virtual */ nsresult
-nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext,
+nsMathMLmsubFrame::Place (nsRenderingContext& aRenderingContext,
                           PRBool               aPlaceOrigin,
                           nsHTMLReflowMetrics& aDesiredSize)
 {
@@ -116,7 +116,7 @@ nsMathMLmsubFrame::Place (nsIRenderingContext& aRenderingContext,
 // munder uses this when movablelimits is set.
 nsresult
 nsMathMLmsubFrame::PlaceSubScript (nsPresContext*      aPresContext,
-                                   nsIRenderingContext& aRenderingContext,
+                                   nsRenderingContext& aRenderingContext,
                                    PRBool               aPlaceOrigin,
                                    nsHTMLReflowMetrics& aDesiredSize,
                                    nsMathMLContainerFrame* aFrame,
diff --git a/layout/mathml/nsMathMLmsubFrame.h b/layout/mathml/nsMathMLmsubFrame.h
index 79ec1b344720..0d03a701801a 100644
--- a/layout/mathml/nsMathMLmsubFrame.h
+++ b/layout/mathml/nsMathMLmsubFrame.h
@@ -58,13 +58,13 @@ public:
   TransmitAutomaticData();
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
   static nsresult
   PlaceSubScript (nsPresContext*      aPresContext,
-                  nsIRenderingContext& aRenderingContext,
+                  nsRenderingContext& aRenderingContext,
                   PRBool               aPlaceOrigin,
                   nsHTMLReflowMetrics& aDesiredSize,
                   nsMathMLContainerFrame* aForFrame,
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index 76a1d71613a3..1259db5f61d4 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubsupFrame.h"
@@ -89,7 +89,7 @@ nsMathMLmsubsupFrame::TransmitAutomaticData()
 }
 
 /* virtual */ nsresult
-nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmsubsupFrame::Place(nsRenderingContext& aRenderingContext,
                             PRBool               aPlaceOrigin,
                             nsHTMLReflowMetrics& aDesiredSize)
 {
@@ -132,7 +132,7 @@ nsMathMLmsubsupFrame::Place(nsIRenderingContext& aRenderingContext,
 // munderover uses this when movablelimits is set.
 nsresult
 nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
-                                        nsIRenderingContext& aRenderingContext,
+                                        nsRenderingContext& aRenderingContext,
                                         PRBool               aPlaceOrigin,
                                         nsHTMLReflowMetrics& aDesiredSize,
                                         nsMathMLContainerFrame* aFrame,
diff --git a/layout/mathml/nsMathMLmsubsupFrame.h b/layout/mathml/nsMathMLmsubsupFrame.h
index b0b68b7555da..c5eaec099235 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.h
+++ b/layout/mathml/nsMathMLmsubsupFrame.h
@@ -58,13 +58,13 @@ public:
   TransmitAutomaticData();
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
   static nsresult
   PlaceSubSupScript(nsPresContext*      aPresContext,
-                    nsIRenderingContext& aRenderingContext,
+                    nsRenderingContext& aRenderingContext,
                     PRBool               aPlaceOrigin,
                     nsHTMLReflowMetrics& aDesiredSize,
                     nsMathMLContainerFrame* aForFrame,
diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp
index 4b451ea179cd..dc1f7fbab40c 100644
--- a/layout/mathml/nsMathMLmsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsupFrame.cpp
@@ -43,7 +43,7 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmsupFrame.h"
@@ -84,7 +84,7 @@ nsMathMLmsupFrame::TransmitAutomaticData()
 }
 
 /* virtual */ nsresult
-nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmsupFrame::Place(nsRenderingContext& aRenderingContext,
                          PRBool               aPlaceOrigin,
                          nsHTMLReflowMetrics& aDesiredSize)
 {
@@ -116,7 +116,7 @@ nsMathMLmsupFrame::Place(nsIRenderingContext& aRenderingContext,
 // mover uses this when movablelimits is set.
 nsresult
 nsMathMLmsupFrame::PlaceSuperScript(nsPresContext*      aPresContext,
-                                    nsIRenderingContext& aRenderingContext,
+                                    nsRenderingContext& aRenderingContext,
                                     PRBool               aPlaceOrigin,
                                     nsHTMLReflowMetrics& aDesiredSize,
                                     nsMathMLContainerFrame* aFrame,
diff --git a/layout/mathml/nsMathMLmsupFrame.h b/layout/mathml/nsMathMLmsupFrame.h
index 1d954d8cacae..8e691669567a 100644
--- a/layout/mathml/nsMathMLmsupFrame.h
+++ b/layout/mathml/nsMathMLmsupFrame.h
@@ -58,13 +58,13 @@ public:
   TransmitAutomaticData();
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
   static nsresult
   PlaceSuperScript (nsPresContext*      aPresContext,
-                    nsIRenderingContext& aRenderingContext,
+                    nsRenderingContext& aRenderingContext,
                     PRBool               aPlaceOrigin,
                     nsHTMLReflowMetrics& aDesiredSize,
                     nsMathMLContainerFrame* aForFrame,
diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp
index eb33261c017e..c3e4c3b0d508 100644
--- a/layout/mathml/nsMathMLmtableFrame.cpp
+++ b/layout/mathml/nsMathMLmtableFrame.cpp
@@ -43,7 +43,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsTArray.h"
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index 9156efa60b2f..2abca025adea 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -46,7 +46,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderFrame.h"
@@ -243,7 +243,7 @@ i.e.,:
 */
 
 /* virtual */ nsresult
-nsMathMLmunderFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmunderFrame::Place(nsRenderingContext& aRenderingContext,
                            PRBool               aPlaceOrigin,
                            nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLmunderFrame.h b/layout/mathml/nsMathMLmunderFrame.h
index f73e4d8f2e9b..97c99772a41f 100644
--- a/layout/mathml/nsMathMLmunderFrame.h
+++ b/layout/mathml/nsMathMLmunderFrame.h
@@ -55,7 +55,7 @@ public:
   friend nsIFrame* NS_NewMathMLmunderFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index 875f2646bc1c..15515490bc87 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -46,7 +46,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderoverFrame.h"
@@ -279,7 +279,7 @@ i.e.,:
 */
 
 /* virtual */ nsresult
-nsMathMLmunderoverFrame::Place(nsIRenderingContext& aRenderingContext,
+nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
                                PRBool               aPlaceOrigin,
                                nsHTMLReflowMetrics& aDesiredSize)
 {
diff --git a/layout/mathml/nsMathMLmunderoverFrame.h b/layout/mathml/nsMathMLmunderoverFrame.h
index 63591d9358f7..5a1fc27ceea5 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.h
+++ b/layout/mathml/nsMathMLmunderoverFrame.h
@@ -55,7 +55,7 @@ public:
   friend nsIFrame* NS_NewMathMLmunderoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
   virtual nsresult
-  Place(nsIRenderingContext& aRenderingContext,
+  Place(nsRenderingContext& aRenderingContext,
         PRBool               aPlaceOrigin,
         nsHTMLReflowMetrics& aDesiredSize);
 
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index ff4310e317e1..cb3a16b3d103 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -2083,7 +2083,7 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO)
         fprintf(fd, "Title: %s\n", docStr?docStr:"");
         fprintf(fd, "URL:   %s\n", urlStr?urlStr:"");
         fprintf(fd, "--------------- Frames ----------------\n");
-        nsCOMPtr<nsIRenderingContext> renderingContext;
+        nsRefPtr<nsRenderingContext> renderingContext;
         mPrt->mPrintDocDC->CreateRenderingContext(*getter_AddRefs(renderingContext));
         RootFrameList(aPO->mPresContext, fd, 0);
         //DumpFrames(fd, aPO->mPresContext, renderingContext, theRootFrame, 0);
@@ -2335,7 +2335,7 @@ nsPrintEngine::DoPrint(nsPrintObject * aPO)
         poPresContext->SetIsRenderingOnlySelection(PR_TRUE);
         // temporarily creating rendering context
         // which is needed to dinf the selection frames
-        nsCOMPtr<nsIRenderingContext> rc;
+        nsRefPtr<nsRenderingContext> rc;
         mPrt->mPrintDC->CreateRenderingContext(*getter_AddRefs(rc));
 
         // find the starting and ending page numbers
@@ -2563,7 +2563,7 @@ nsPrintEngine::PrintPage(nsPrintObject*    aPO,
  */
 nsresult 
 nsPrintEngine::FindSelectionBoundsWithList(nsPresContext* aPresContext,
-                                           nsIRenderingContext& aRC,
+                                           nsRenderingContext& aRC,
                                            nsIAtom*        aList,
                                            nsIFrame *      aParentFrame,
                                            nsRect&         aRect,
@@ -2607,7 +2607,7 @@ nsPrintEngine::FindSelectionBoundsWithList(nsPresContext* aPresContext,
 // Find the Frame that is XMost
 nsresult 
 nsPrintEngine::FindSelectionBounds(nsPresContext* aPresContext,
-                                   nsIRenderingContext& aRC,
+                                   nsRenderingContext& aRC,
                                    nsIFrame *      aParentFrame,
                                    nsRect&         aRect,
                                    nsIFrame *&     aStartFrame,
@@ -2638,7 +2638,7 @@ nsPrintEngine::FindSelectionBounds(nsPresContext* aPresContext,
 nsresult 
 nsPrintEngine::GetPageRangeForSelection(nsIPresShell *        aPresShell,
                                         nsPresContext*       aPresContext,
-                                        nsIRenderingContext&  aRC,
+                                        nsRenderingContext&  aRC,
                                         nsISelection*         aSelection,
                                         nsIPageSequenceFrame* aPageSeqFrame,
                                         nsIFrame**            aStartFrame,
@@ -3491,7 +3491,7 @@ static void RootFrameList(nsPresContext* aPresContext, FILE* out, PRInt32 aInden
  */
 static void DumpFrames(FILE*                 out,
                        nsPresContext*       aPresContext,
-                       nsIRenderingContext * aRendContext,
+                       nsRenderingContext * aRendContext,
                        nsIFrame *            aFrame,
                        PRInt32               aLevel)
 {
@@ -3597,7 +3597,7 @@ void DumpLayoutData(char*              aTitleStr,
     fprintf(fd, "URL:   %s\n", aURLStr?aURLStr:"");
     fprintf(fd, "--------------- Frames ----------------\n");
     fprintf(fd, "--------------- Frames ----------------\n");
-    nsCOMPtr<nsIRenderingContext> renderingContext;
+    nsRefPtr<nsRenderingContext> renderingContext;
     aDC->CreateRenderingContext(*getter_AddRefs(renderingContext));
     RootFrameList(aPresContext, fd, 0);
     //DumpFrames(fd, aPresContext, renderingContext, aRootFrame, 0);
diff --git a/layout/printing/nsPrintEngine.h b/layout/printing/nsPrintEngine.h
index b379378a68ac..b54ec12493eb 100644
--- a/layout/printing/nsPrintEngine.h
+++ b/layout/printing/nsPrintEngine.h
@@ -237,7 +237,7 @@ protected:
                                                    PRInt32&        aCount);
 
   static nsresult FindSelectionBoundsWithList(nsPresContext* aPresContext,
-                                              nsIRenderingContext& aRC,
+                                              nsRenderingContext& aRC,
                                               nsIAtom*        aList,
                                               nsIFrame *      aParentFrame,
                                               nsRect&         aRect,
@@ -247,7 +247,7 @@ protected:
                                               nsRect&         aEndRect);
 
   static nsresult FindSelectionBounds(nsPresContext* aPresContext,
-                                      nsIRenderingContext& aRC,
+                                      nsRenderingContext& aRC,
                                       nsIFrame *      aParentFrame,
                                       nsRect&         aRect,
                                       nsIFrame *&     aStartFrame,
@@ -257,7 +257,7 @@ protected:
 
   static nsresult GetPageRangeForSelection(nsIPresShell *        aPresShell,
                                            nsPresContext*       aPresContext,
-                                           nsIRenderingContext&  aRC,
+                                           nsRenderingContext&  aRC,
                                            nsISelection*         aSelection,
                                            nsIPageSequenceFrame* aPageSeqFrame,
                                            nsIFrame**            aStartFrame,
diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
index 1f588025ab78..a0bc072a2c91 100644
--- a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
@@ -208,7 +208,7 @@ nsSVGForeignObjectFrame::PaintSVG(nsSVGRenderState *aContext,
   gfxMatrix matrixForChildren = GetCanvasTMForChildren();
   gfxMatrix matrix = GetCanvasTM();
 
-  nsIRenderingContext *ctx = aContext->GetRenderingContext(this);
+  nsRenderingContext *ctx = aContext->GetRenderingContext(this);
 
   if (!ctx || matrixForChildren.IsSingular()) {
     NS_WARNING("Can't render foreignObject element!");
@@ -581,7 +581,7 @@ nsSVGForeignObjectFrame::DoReflow()
   nsSize availableSpace(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
   nsIPresShell* presShell = presContext->PresShell();
   NS_ASSERTION(presShell, "null presShell");
-  nsCOMPtr<nsIRenderingContext> renderingContext =
+  nsRefPtr<nsRenderingContext> renderingContext =
     presShell->GetReferenceRenderingContext();
   if (!renderingContext)
     return;
diff --git a/layout/svg/base/src/nsSVGIntegrationUtils.cpp b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
index 8c962d0f80f5..afcea3b599d1 100644
--- a/layout/svg/base/src/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
@@ -218,8 +218,8 @@ public:
   virtual void Paint(nsSVGRenderState *aContext, nsIFrame *aTarget,
                      const nsIntRect* aDirtyRect)
   {
-    nsIRenderingContext* ctx = aContext->GetRenderingContext(aTarget);
-    nsIRenderingContext::AutoPushTranslation push(ctx, -mOffset);
+    nsRenderingContext* ctx = aContext->GetRenderingContext(aTarget);
+    nsRenderingContext::AutoPushTranslation push(ctx, -mOffset);
     mInnerList->PaintForFrame(mBuilder, ctx, mFrame, nsDisplayList::PAINT_DEFAULT);
   }
 
@@ -231,7 +231,7 @@ private:
 };
 
 void
-nsSVGIntegrationUtils::PaintFramesWithEffects(nsIRenderingContext* aCtx,
+nsSVGIntegrationUtils::PaintFramesWithEffects(nsRenderingContext* aCtx,
                                               nsIFrame* aEffectsFrame,
                                               const nsRect& aDirtyRect,
                                               nsDisplayListBuilder* aBuilder,
@@ -538,7 +538,7 @@ DrawableFromPaintServer(nsIFrame*         aFrame,
 }
 
 /* static */ void
-nsSVGIntegrationUtils::DrawPaintServer(nsIRenderingContext* aRenderingContext,
+nsSVGIntegrationUtils::DrawPaintServer(nsRenderingContext* aRenderingContext,
                                        nsIFrame*            aTarget,
                                        nsIFrame*            aPaintServer,
                                        gfxPattern::GraphicsFilter aFilter,
diff --git a/layout/svg/base/src/nsSVGIntegrationUtils.h b/layout/svg/base/src/nsSVGIntegrationUtils.h
index 0c54fba4f930..3692bca9d4f5 100644
--- a/layout/svg/base/src/nsSVGIntegrationUtils.h
+++ b/layout/svg/base/src/nsSVGIntegrationUtils.h
@@ -47,7 +47,7 @@
 class nsIFrame;
 class nsDisplayListBuilder;
 class nsDisplayList;
-class nsIRenderingContext;
+class nsRenderingContext;
 
 /***** Integration of SVG effects with regular frame painting *****/
 
@@ -99,7 +99,7 @@ public:
    * in aCtx's coordinate system
    */
   static void
-  PaintFramesWithEffects(nsIRenderingContext* aCtx,
+  PaintFramesWithEffects(nsRenderingContext* aCtx,
                          nsIFrame* aEffectsFrame, const nsRect& aDirtyRect,
                          nsDisplayListBuilder* aBuilder,
                          nsDisplayList* aInnerList);
@@ -140,7 +140,7 @@ public:
    * patterns this would be the whole target frame fill area.
    */
   static void
-  DrawPaintServer(nsIRenderingContext* aRenderingContext,
+  DrawPaintServer(nsRenderingContext* aRenderingContext,
                   nsIFrame*            aTarget,
                   nsIFrame*            aPaintServer,
                   gfxPattern::GraphicsFilter aFilter,
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 1d99c9aaeb2e..7d74238b2d24 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -202,7 +202,7 @@ NS_QUERYFRAME_TAIL_INHERITING(nsSVGOuterSVGFrameBase)
 // reflowing
 
 /* virtual */ nscoord
-nsSVGOuterSVGFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsSVGOuterSVGFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -213,7 +213,7 @@ nsSVGOuterSVGFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsSVGOuterSVGFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsSVGOuterSVGFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -311,7 +311,7 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio()
 }
 
 /* virtual */ nsSize
-nsSVGOuterSVGFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsSVGOuterSVGFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                                 nsSize aCBSize, nscoord aAvailableWidth,
                                 nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                 PRBool aShrinkWrap)
@@ -447,7 +447,7 @@ public:
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                        HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("SVGEventReceiver", TYPE_SVG_EVENT_RECEIVER)
 };
 
@@ -474,7 +474,7 @@ nsDisplaySVG::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
 
 void
 nsDisplaySVG::Paint(nsDisplayListBuilder* aBuilder,
-                    nsIRenderingContext* aCtx)
+                    nsRenderingContext* aCtx)
 {
   static_cast<nsSVGOuterSVGFrame*>(mFrame)->
     Paint(aBuilder, *aCtx, mVisibleRect, ToReferenceFrame());
@@ -540,7 +540,7 @@ nsSVGOuterSVGFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
 void
 nsSVGOuterSVGFrame::Paint(const nsDisplayListBuilder* aBuilder,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           const nsRect& aDirtyRect, nsPoint aPt)
 {
   // initialize Mozilla rendering context
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.h b/layout/svg/base/src/nsSVGOuterSVGFrame.h
index 6f24ba892230..431017919eeb 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.h
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.h
@@ -73,13 +73,13 @@ public:
 #endif
 
   // nsIFrame:
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   virtual IntrinsicSize GetIntrinsicSize();
   virtual nsSize  GetIntrinsicRatio();
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
@@ -111,7 +111,7 @@ public:
   virtual nsIAtom* GetType() const;
 
   void Paint(const nsDisplayListBuilder* aBuilder,
-             nsIRenderingContext& aRenderingContext,
+             nsRenderingContext& aRenderingContext,
              const nsRect& aDirtyRect, nsPoint aPt);
 
 #ifdef DEBUG
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 3ab4b0456179..6b8d70b0251e 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1446,7 +1446,7 @@ nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
 
 // ----------------------------------------------------------------------
 
-nsSVGRenderState::nsSVGRenderState(nsIRenderingContext *aContext) :
+nsSVGRenderState::nsSVGRenderState(nsRenderingContext *aContext) :
   mRenderMode(NORMAL), mRenderingContext(aContext), mPaintingToWindow(PR_FALSE)
 {
   mGfxContext = aContext->ThebesContext();
@@ -1463,7 +1463,7 @@ nsSVGRenderState::nsSVGRenderState(gfxASurface *aSurface) :
   mGfxContext = new gfxContext(aSurface);
 }
 
-nsIRenderingContext*
+nsRenderingContext*
 nsSVGRenderState::GetRenderingContext(nsIFrame *aFrame)
 {
   if (!mRenderingContext) {
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index fef83e8eb1b0..0ad995598957 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -45,7 +45,7 @@
 #include "nsCOMPtr.h"
 #include "nsRect.h"
 #include "gfxContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "gfxRect.h"
 #include "gfxMatrix.h"
 #include "nsSVGMatrix.h"
@@ -161,7 +161,7 @@ public:
   /**
    * Render SVG to a legacy rendering context
    */
-  nsSVGRenderState(nsIRenderingContext *aContext);
+  nsSVGRenderState(nsRenderingContext *aContext);
   /**
    * Render SVG to a modern rendering context
    */
@@ -171,7 +171,7 @@ public:
    */
   nsSVGRenderState(gfxASurface *aSurface);
 
-  nsIRenderingContext *GetRenderingContext(nsIFrame *aFrame);
+  nsRenderingContext *GetRenderingContext(nsIFrame *aFrame);
   gfxContext *GetGfxContext() { return mGfxContext; }
 
   void SetRenderMode(RenderMode aMode) { mRenderMode = aMode; }
@@ -184,7 +184,7 @@ public:
 
 private:
   RenderMode                    mRenderMode;
-  nsCOMPtr<nsIRenderingContext> mRenderingContext;
+  nsRefPtr<nsRenderingContext> mRenderingContext;
   nsRefPtr<gfxContext>          mGfxContext;
   PRPackedBool                  mPaintingToWindow;
 };
diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp
index 54584dff294c..a1758f732932 100644
--- a/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/layout/tables/BasicTableLayoutStrategy.cpp
@@ -65,7 +65,7 @@ BasicTableLayoutStrategy::~BasicTableLayoutStrategy()
 }
 
 /* virtual */ nscoord
-BasicTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
+BasicTableLayoutStrategy::GetMinWidth(nsRenderingContext* aRenderingContext)
 {
     DISPLAY_MIN_WIDTH(mTableFrame, mMinWidth);
     if (mMinWidth == NS_INTRINSIC_WIDTH_UNKNOWN)
@@ -74,7 +74,7 @@ BasicTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
 }
 
 /* virtual */ nscoord
-BasicTableLayoutStrategy::GetPrefWidth(nsIRenderingContext* aRenderingContext,
+BasicTableLayoutStrategy::GetPrefWidth(nsRenderingContext* aRenderingContext,
                                        PRBool aComputingSize)
 {
     DISPLAY_PREF_WIDTH(mTableFrame, mPrefWidth);
@@ -105,7 +105,7 @@ struct CellWidthInfo {
 // Used for both column and cell calculations.  The parts needed only
 // for cells are skipped when aIsCell is false.
 static CellWidthInfo
-GetWidthInfo(nsIRenderingContext *aRenderingContext,
+GetWidthInfo(nsRenderingContext *aRenderingContext,
              nsIFrame *aFrame, PRBool aIsCell)
 {
     nscoord minCoord, prefCoord;
@@ -232,14 +232,14 @@ GetWidthInfo(nsIRenderingContext *aRenderingContext,
 }
 
 static inline CellWidthInfo
-GetCellWidthInfo(nsIRenderingContext *aRenderingContext,
+GetCellWidthInfo(nsRenderingContext *aRenderingContext,
                  nsTableCellFrame *aCellFrame)
 {
     return GetWidthInfo(aRenderingContext, aCellFrame, PR_TRUE);
 }
 
 static inline CellWidthInfo
-GetColWidthInfo(nsIRenderingContext *aRenderingContext,
+GetColWidthInfo(nsRenderingContext *aRenderingContext,
                 nsIFrame *aFrame)
 {
     return GetWidthInfo(aRenderingContext, aFrame, PR_FALSE);
@@ -253,7 +253,7 @@ GetColWidthInfo(nsIRenderingContext *aRenderingContext,
  * browsers are).
  */
 void
-BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsIRenderingContext* aRenderingContext)
+BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsRenderingContext* aRenderingContext)
 {
     nsTableFrame *tableFrame = mTableFrame;
     nsTableCellMap *cellMap = tableFrame->GetCellMap();
@@ -413,7 +413,7 @@ BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsIRenderingContext* aRen
 }
 
 void
-BasicTableLayoutStrategy::ComputeIntrinsicWidths(nsIRenderingContext* aRenderingContext)
+BasicTableLayoutStrategy::ComputeIntrinsicWidths(nsRenderingContext* aRenderingContext)
 {
     ComputeColumnIntrinsicWidths(aRenderingContext);
 
diff --git a/layout/tables/BasicTableLayoutStrategy.h b/layout/tables/BasicTableLayoutStrategy.h
index 205b682feff4..d2d5efa9f3f6 100644
--- a/layout/tables/BasicTableLayoutStrategy.h
+++ b/layout/tables/BasicTableLayoutStrategy.h
@@ -55,8 +55,8 @@ public:
     virtual ~BasicTableLayoutStrategy();
 
     // nsITableLayoutStrategy implementation
-    virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext);
-    virtual nscoord GetPrefWidth(nsIRenderingContext* aRenderingContext,
+    virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
+    virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext,
                                  PRBool aComputingSize);
     virtual void MarkIntrinsicWidthsDirty();
     virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState);
@@ -69,7 +69,7 @@ private:
                          BTLS_FINAL_WIDTH };
 
     // Compute intrinsic width member variables on the columns.
-    void ComputeColumnIntrinsicWidths(nsIRenderingContext* aRenderingContext);
+    void ComputeColumnIntrinsicWidths(nsRenderingContext* aRenderingContext);
 
     // Distribute a colspanning cell's percent width (if any) to its columns.
     void DistributePctWidthToColumns(float aSpanPrefPct,
@@ -100,7 +100,7 @@ private:
 
     // Compute the min and pref widths of the table from the width
     // variables on the columns.
-    void ComputeIntrinsicWidths(nsIRenderingContext* aRenderingContext);
+    void ComputeIntrinsicWidths(nsRenderingContext* aRenderingContext);
 
     nsTableFrame *mTableFrame;
     nscoord mMinWidth;
diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp
index 5c7b2bf8c4e0..40f9e985971d 100644
--- a/layout/tables/FixedTableLayoutStrategy.cpp
+++ b/layout/tables/FixedTableLayoutStrategy.cpp
@@ -59,7 +59,7 @@ FixedTableLayoutStrategy::~FixedTableLayoutStrategy()
 }
 
 /* virtual */ nscoord
-FixedTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
+FixedTableLayoutStrategy::GetMinWidth(nsRenderingContext* aRenderingContext)
 {
     DISPLAY_MIN_WIDTH(mTableFrame, mMinWidth);
     if (mMinWidth != NS_INTRINSIC_WIDTH_UNKNOWN)
@@ -148,7 +148,7 @@ FixedTableLayoutStrategy::GetMinWidth(nsIRenderingContext* aRenderingContext)
 }
 
 /* virtual */ nscoord
-FixedTableLayoutStrategy::GetPrefWidth(nsIRenderingContext* aRenderingContext,
+FixedTableLayoutStrategy::GetPrefWidth(nsRenderingContext* aRenderingContext,
                                        PRBool aComputingSize)
 {
     // It's theoretically possible to do something much better here that
diff --git a/layout/tables/FixedTableLayoutStrategy.h b/layout/tables/FixedTableLayoutStrategy.h
index 925598e9002f..95478e033780 100644
--- a/layout/tables/FixedTableLayoutStrategy.h
+++ b/layout/tables/FixedTableLayoutStrategy.h
@@ -55,8 +55,8 @@ public:
     virtual ~FixedTableLayoutStrategy();
 
     // nsITableLayoutStrategy implementation
-    virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext);
-    virtual nscoord GetPrefWidth(nsIRenderingContext* aRenderingContext,
+    virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
+    virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext,
                                  PRBool aComputingSize);
     virtual void MarkIntrinsicWidthsDirty();
     virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState);
diff --git a/layout/tables/nsITableLayoutStrategy.h b/layout/tables/nsITableLayoutStrategy.h
index c836027226be..357db673abfa 100644
--- a/layout/tables/nsITableLayoutStrategy.h
+++ b/layout/tables/nsITableLayoutStrategy.h
@@ -47,7 +47,7 @@
 #include "nscore.h"
 #include "nsCoord.h"
 
-class nsIRenderingContext;
+class nsRenderingContext;
 struct nsHTMLReflowState;
 
 class nsITableLayoutStrategy
@@ -56,10 +56,10 @@ public:
     virtual ~nsITableLayoutStrategy() {}
 
     /** Implement nsIFrame::GetMinWidth for the table */
-    virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext) = 0;
+    virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext) = 0;
 
     /** Implement nsIFrame::GetPrefWidth for the table */
-    virtual nscoord GetPrefWidth(nsIRenderingContext* aRenderingContext,
+    virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext,
                                  PRBool aComputingSize) = 0;
 
     /** Implement nsIFrame::MarkIntrinsicWidthsDirty for the table */
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index ca49c3f7d5f1..90eb92f57fe6 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -44,7 +44,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "nsGenericHTMLElement.h"
@@ -310,7 +310,7 @@ inline nscolor EnsureDifferentColors(nscolor colorA, nscolor colorB)
 }
 
 void
-nsTableCellFrame::DecorateForSelection(nsIRenderingContext& aRenderingContext,
+nsTableCellFrame::DecorateForSelection(nsRenderingContext& aRenderingContext,
                                        nsPoint aPt)
 {
   NS_ASSERTION(GetStateBits() & NS_FRAME_SELECTED_CONTENT,
@@ -338,7 +338,7 @@ nsTableCellFrame::DecorateForSelection(nsIRenderingContext& aRenderingContext,
         //compare bordercolor to ((nsStyleColor *)myColor)->mBackgroundColor)
         bordercolor = EnsureDifferentColors(bordercolor,
                                             GetStyleBackground()->mBackgroundColor);
-        nsIRenderingContext::AutoPushTranslation
+        nsRenderingContext::AutoPushTranslation
             translate(&aRenderingContext, aPt);
         nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
 
@@ -361,7 +361,7 @@ nsTableCellFrame::DecorateForSelection(nsIRenderingContext& aRenderingContext,
 }
 
 void
-nsTableCellFrame::PaintBackground(nsIRenderingContext& aRenderingContext,
+nsTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
                                   const nsRect&        aDirtyRect,
                                   nsPoint              aPt,
                                   PRUint32             aFlags)
@@ -373,7 +373,7 @@ nsTableCellFrame::PaintBackground(nsIRenderingContext& aRenderingContext,
 
 // Called by nsTablePainter
 void
-nsTableCellFrame::PaintCellBackground(nsIRenderingContext& aRenderingContext,
+nsTableCellFrame::PaintCellBackground(nsRenderingContext& aRenderingContext,
                                       const nsRect& aDirtyRect, nsPoint aPt,
                                       PRUint32 aFlags)
 {
@@ -401,14 +401,14 @@ public:
     aOutFrames->AppendElement(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
 
   NS_DISPLAY_DECL_NAME("TableCellBackground", TYPE_TABLE_CELL_BACKGROUND)
 };
 
 void nsDisplayTableCellBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                         nsIRenderingContext* aCtx)
+                                         nsRenderingContext* aCtx)
 {
   static_cast<nsTableCellFrame*>(mFrame)->
     PaintBackground(*aCtx, mVisibleRect, ToReferenceFrame(),
@@ -424,7 +424,7 @@ nsDisplayTableCellBackground::GetBounds(nsDisplayListBuilder* aBuilder)
 }
 
 static void
-PaintTableCellSelection(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+PaintTableCellSelection(nsIFrame* aFrame, nsRenderingContext* aCtx,
                         const nsRect& aRect, nsPoint aPt)
 {
   static_cast<nsTableCellFrame*>(aFrame)->DecorateForSelection(*aCtx, aPt);
@@ -718,7 +718,7 @@ PRInt32 nsTableCellFrame::GetColSpan()
 }
 
 /* virtual */ nscoord
-nsTableCellFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsTableCellFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_MIN_WIDTH(this, result);
@@ -730,7 +730,7 @@ nsTableCellFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsTableCellFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsTableCellFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result = 0;
   DISPLAY_PREF_WIDTH(this, result);
@@ -742,7 +742,7 @@ nsTableCellFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nsIFrame::IntrinsicWidthOffsetData
-nsTableCellFrame::IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext)
+nsTableCellFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
 {
   IntrinsicWidthOffsetData result =
     nsHTMLContainerFrame::IntrinsicWidthOffsets(aRenderingContext);
@@ -1158,7 +1158,7 @@ nsBCTableCellFrame::GetBorderOverflow()
 
 
 void
-nsBCTableCellFrame::PaintBackground(nsIRenderingContext& aRenderingContext,
+nsBCTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
                                     const nsRect&        aDirtyRect,
                                     nsPoint              aPt,
                                     PRUint32             aFlags)
diff --git a/layout/tables/nsTableCellFrame.h b/layout/tables/nsTableCellFrame.h
index cc6943ec576c..8c4c39d4596b 100644
--- a/layout/tables/nsTableCellFrame.h
+++ b/layout/tables/nsTableCellFrame.h
@@ -128,14 +128,14 @@ public:
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
 
-  void PaintCellBackground(nsIRenderingContext& aRenderingContext,
+  void PaintCellBackground(nsRenderingContext& aRenderingContext,
                            const nsRect& aDirtyRect, nsPoint aPt,
                            PRUint32 aFlags);
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual IntrinsicWidthOffsetData
-    IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext);
+    IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
 
   NS_IMETHOD Reflow(nsPresContext*      aPresContext,
                     nsHTMLReflowMetrics& aDesiredSize,
@@ -234,12 +234,12 @@ public:
 
   virtual nsMargin* GetBorderWidth(nsMargin& aBorder) const;
 
-  virtual void PaintBackground(nsIRenderingContext& aRenderingContext,
+  virtual void PaintBackground(nsRenderingContext& aRenderingContext,
                                const nsRect&        aDirtyRect,
                                nsPoint              aPt,
                                PRUint32             aFlags);
 
-  void DecorateForSelection(nsIRenderingContext& aRenderingContext,
+  void DecorateForSelection(nsRenderingContext& aRenderingContext,
                             nsPoint              aPt);
 
 protected:
@@ -338,7 +338,7 @@ public:
   NS_IMETHOD GetFrameName(nsAString& aResult) const;
 #endif
 
-  virtual void PaintBackground(nsIRenderingContext& aRenderingContext,
+  virtual void PaintBackground(nsRenderingContext& aRenderingContext,
                                const nsRect&        aDirtyRect,
                                nsPoint              aPt,
                                PRUint32             aFlags);
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 7b89760227fd..15de0adb2f22 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -39,7 +39,7 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsCOMPtr.h"
 #include "nsTableFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsIContent.h"
@@ -1134,13 +1134,13 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("TableBorderBackground", TYPE_TABLE_BORDER_BACKGROUND)
 };
 
 void
 nsDisplayTableBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                      nsIRenderingContext* aCtx)
+                                      nsRenderingContext* aCtx)
 {
   static_cast<nsTableFrame*>(mFrame)->
     PaintTableBorderBackground(*aCtx, mVisibleRect,
@@ -1344,7 +1344,7 @@ nsTableFrame::GetDeflationForBackground(nsPresContext* aPresContext) const
 // XXX We don't put the borders and backgrounds in tree order like we should.
 // That requires some major surgery which we aren't going to do right now.
 void
-nsTableFrame::PaintTableBorderBackground(nsIRenderingContext& aRenderingContext,
+nsTableFrame::PaintTableBorderBackground(nsRenderingContext& aRenderingContext,
                                          const nsRect& aDirtyRect,
                                          nsPoint aPt, PRUint32 aBGPaintFlags)
 {
@@ -1369,7 +1369,7 @@ nsTableFrame::PaintTableBorderBackground(nsIRenderingContext& aRenderingContext,
     else {
       // XXX we should probably get rid of this translation at some stage
       // But that would mean modifying PaintBCBorders, ugh
-      nsIRenderingContext::AutoPushTranslation translate(&aRenderingContext, aPt);
+      nsRenderingContext::AutoPushTranslation translate(&aRenderingContext, aPt);
       PaintBCBorders(aRenderingContext, aDirtyRect - aPt);
     }
   }
@@ -1492,7 +1492,7 @@ nsTableFrame::MarkIntrinsicWidthsDirty()
 }
 
 /* virtual */ nscoord
-nsTableFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsTableFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   if (NeedToCalcBCBorders())
     CalcBCBorders();
@@ -1503,7 +1503,7 @@ nsTableFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsTableFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsTableFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   if (NeedToCalcBCBorders())
     CalcBCBorders();
@@ -1514,7 +1514,7 @@ nsTableFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nsIFrame::IntrinsicWidthOffsetData
-nsTableFrame::IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext)
+nsTableFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
 {
   IntrinsicWidthOffsetData result =
     nsHTMLContainerFrame::IntrinsicWidthOffsets(aRenderingContext);
@@ -1531,7 +1531,7 @@ nsTableFrame::IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext)
 }
 
 /* virtual */ nsSize
-nsTableFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
+nsTableFrame::ComputeSize(nsRenderingContext *aRenderingContext,
                           nsSize aCBSize, nscoord aAvailableWidth,
                           nsSize aMargin, nsSize aBorder, nsSize aPadding,
                           PRBool aShrinkWrap)
@@ -1550,7 +1550,7 @@ nsTableFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
 }
 
 nscoord
-nsTableFrame::TableShrinkWidthToFit(nsIRenderingContext *aRenderingContext,
+nsTableFrame::TableShrinkWidthToFit(nsRenderingContext *aRenderingContext,
                                     nscoord aWidthInCB)
 {
   nscoord result;
@@ -1577,7 +1577,7 @@ nsTableFrame::TableShrinkWidthToFit(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ nsSize
-nsTableFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsTableFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                               nsSize aCBSize, nscoord aAvailableWidth,
                               nsSize aMargin, nsSize aBorder, nsSize aPadding,
                               PRBool aShrinkWrap)
@@ -2919,7 +2919,7 @@ nsTableFrame::ReflowChildren(nsTableReflowState& aReflowState,
 }
 
 void
-nsTableFrame::ReflowColGroups(nsIRenderingContext *aRenderingContext)
+nsTableFrame::ReflowColGroups(nsRenderingContext *aRenderingContext)
 {
   if (!GetPrevInFlow() && !HaveReflowedColGroups()) {
     nsHTMLReflowMetrics kidMet;
@@ -5934,7 +5934,7 @@ struct BCVerticalSeg
 
 
    void Paint(BCPaintBorderIterator& aIter,
-              nsIRenderingContext&   aRenderingContext,
+              nsRenderingContext&   aRenderingContext,
               BCPixelSize            aHorSegHeight);
   void AdvanceOffsetY();
   void IncludeCurrentBorder(BCPaintBorderIterator& aIter);
@@ -5985,7 +5985,7 @@ struct BCHorizontalSeg
    void AdvanceOffsetX(PRInt32 aIncrement);
    void IncludeCurrentBorder(BCPaintBorderIterator& aIter);
    void Paint(BCPaintBorderIterator& aIter,
-              nsIRenderingContext&   aRenderingContext);
+              nsRenderingContext&   aRenderingContext);
 
   nscoord            mOffsetX;       // x-offset with respect to the table edge
   nscoord            mOffsetY;       // y-offset with respect to the table edge
@@ -6025,8 +6025,8 @@ public:
   PRBool SetDamageArea(nsRect aDirtyRect);
   void First();
   void Next();
-  void AccumulateOrPaintHorizontalSegment(nsIRenderingContext& aRenderingContext);
-  void AccumulateOrPaintVerticalSegment(nsIRenderingContext& aRenderingContext);
+  void AccumulateOrPaintHorizontalSegment(nsRenderingContext& aRenderingContext);
+  void AccumulateOrPaintVerticalSegment(nsRenderingContext& aRenderingContext);
   void ResetVerInfo();
   void StoreColumnWidth(PRInt32 aIndex);
   PRBool VerticalSegmentOwnsCorner();
@@ -6689,7 +6689,7 @@ BCVerticalSeg::GetBottomCorner(BCPaintBorderIterator& aIter,
  */
 void
 BCVerticalSeg::Paint(BCPaintBorderIterator& aIter,
-                     nsIRenderingContext&   aRenderingContext,
+                     nsRenderingContext&   aRenderingContext,
                      BCPixelSize            aHorSegHeight)
 {
   // get the border style, color and paint the segment
@@ -6871,7 +6871,7 @@ BCHorizontalSeg::GetRightCorner(BCPaintBorderIterator& aIter,
  */
 void
 BCHorizontalSeg::Paint(BCPaintBorderIterator& aIter,
-                       nsIRenderingContext&   aRenderingContext)
+                       nsRenderingContext&   aRenderingContext)
 {
   // get the border style, color and paint the segment
   mozilla::css::Side side = (aIter.IsDamageAreaBottomMost()) ? NS_SIDE_BOTTOM :
@@ -7013,7 +7013,7 @@ BCPaintBorderIterator::VerticalSegmentOwnsCorner()
  * @param aRenderingContext - the rendering context
  */
 void
-BCPaintBorderIterator::AccumulateOrPaintHorizontalSegment(nsIRenderingContext& aRenderingContext)
+BCPaintBorderIterator::AccumulateOrPaintHorizontalSegment(nsRenderingContext& aRenderingContext)
 {
 
   PRInt32 relColIndex = GetRelativeColIndex();
@@ -7061,7 +7061,7 @@ BCPaintBorderIterator::AccumulateOrPaintHorizontalSegment(nsIRenderingContext& a
  * @param aRenderingContext - the rendering context
  */
 void
-BCPaintBorderIterator::AccumulateOrPaintVerticalSegment(nsIRenderingContext& aRenderingContext)
+BCPaintBorderIterator::AccumulateOrPaintVerticalSegment(nsRenderingContext& aRenderingContext)
 {
   BCBorderOwner borderOwner = eCellOwner;
   BCBorderOwner ignoreBorderOwner;
@@ -7120,7 +7120,7 @@ BCPaintBorderIterator::ResetVerInfo()
  * @param aDirtyRect        - inside this rectangle the BC Borders will redrawn
  */
 void
-nsTableFrame::PaintBCBorders(nsIRenderingContext& aRenderingContext,
+nsTableFrame::PaintBCBorders(nsRenderingContext& aRenderingContext,
                              const nsRect&        aDirtyRect)
 {
   // We first transfer the aDirtyRect into cellmap coordinates to compute which
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 7b4531191e73..45a0a08c8f78 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -269,7 +269,7 @@ public:
    * columns, row groups, rows, and cells), and the table border, and all
    * internal borders if border-collapse is on.
    */
-  void PaintTableBorderBackground(nsIRenderingContext& aRenderingContext,
+  void PaintTableBorderBackground(nsRenderingContext& aRenderingContext,
                                   const nsRect& aDirtyRect,
                                   nsPoint aPt, PRUint32 aBGPaintFlags);
 
@@ -308,22 +308,22 @@ public:
   void SetBCDamageArea(const nsRect& aValue);
   PRBool BCRecalcNeeded(nsStyleContext* aOldStyleContext,
                         nsStyleContext* aNewStyleContext);
-  void PaintBCBorders(nsIRenderingContext& aRenderingContext,
+  void PaintBCBorders(nsRenderingContext& aRenderingContext,
                       const nsRect&        aDirtyRect);
 
   virtual void MarkIntrinsicWidthsDirty();
   // For border-collapse tables, the caller must not add padding and
   // border to the results of these functions.
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   virtual IntrinsicWidthOffsetData
-    IntrinsicWidthOffsets(nsIRenderingContext* aRenderingContext);
+    IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
 
-  virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
                              nsSize aCBSize, nscoord aAvailableWidth,
                              nsSize aMargin, nsSize aBorder, nsSize aPadding,
                              PRBool aShrinkWrap);
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
@@ -331,7 +331,7 @@ public:
    * A copy of nsFrame::ShrinkWidthToFit that calls a different
    * GetPrefWidth, since tables have two different ones.
    */
-  nscoord TableShrinkWidthToFit(nsIRenderingContext *aRenderingContext,
+  nscoord TableShrinkWidthToFit(nsRenderingContext *aRenderingContext,
                                 nscoord aWidthInCB);
 
   // XXXldb REWRITE THIS COMMENT!
@@ -557,7 +557,7 @@ protected:
   // This calls the col group and column reflow methods, which do two things:
   //  (1) set all the dimensions to 0
   //  (2) notify the table about colgroups or columns with hidden visibility
-  void ReflowColGroups(nsIRenderingContext* aRenderingContext);
+  void ReflowColGroups(nsRenderingContext* aRenderingContext);
 
   /** return the width of the table taking into account visibility collapse
     * on columns and colgroups
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index 62372e36c39f..1d7431b94e0e 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -40,7 +40,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "prinrval.h"
@@ -91,7 +91,7 @@ nsTableOuterFrame::GetBaseline() const
 }
 
 /* virtual */ nsSize
-nsTableCaptionFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsTableCaptionFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                      nsSize aCBSize, nscoord aAvailableWidth,
                                      nsSize aMargin, nsSize aBorder,
                                      nsSize aPadding, PRBool aShrinkWrap)
@@ -494,7 +494,7 @@ GetContainingBlockSize(const nsHTMLReflowState& aOuterRS)
 }
 
 /* virtual */ nscoord
-nsTableOuterFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsTableOuterFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord width = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
                     mInnerTableFrame, nsLayoutUtils::MIN_WIDTH);
@@ -515,7 +515,7 @@ nsTableOuterFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsTableOuterFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsTableOuterFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord maxWidth;
   DISPLAY_PREF_WIDTH(this, maxWidth);
@@ -563,7 +563,7 @@ nsTableOuterFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
 // aMarginResult is non-null, fill it with the part of the margin-width
 // that was contributed by the margin.
 static nscoord
-ChildShrinkWrapWidth(nsIRenderingContext *aRenderingContext,
+ChildShrinkWrapWidth(nsRenderingContext *aRenderingContext,
                      nsIFrame *aChildFrame,
                      nsSize aCBSize, nscoord aAvailableWidth,
                      nscoord *aMarginResult = nsnull)
@@ -588,7 +588,7 @@ ChildShrinkWrapWidth(nsIRenderingContext *aRenderingContext,
 }
 
 /* virtual */ nsSize
-nsTableOuterFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsTableOuterFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                    nsSize aCBSize, nscoord aAvailableWidth,
                                    nsSize aMargin, nsSize aBorder,
                                    nsSize aPadding, PRBool aShrinkWrap)
diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h
index 1da58f9585ec..250d5cb17f7b 100644
--- a/layout/tables/nsTableOuterFrame.h
+++ b/layout/tables/nsTableOuterFrame.h
@@ -54,7 +54,7 @@ public:
   virtual nsIAtom* GetType() const;
   friend nsIFrame* NS_NewTableCaptionFrame(nsIPresShell* aPresShell, nsStyleContext*  aContext);
 
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
@@ -139,9 +139,9 @@ public:
 
   virtual nscoord GetBaseline() const;
 
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index 763a0fad36f7..bd146a306b92 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -231,7 +231,7 @@ TableBackgroundPainter::TableBackgroundData::SetBCBorder(nsMargin& aBorder,
 TableBackgroundPainter::TableBackgroundPainter(nsTableFrame*        aTableFrame,
                                                Origin               aOrigin,
                                                nsPresContext*       aPresContext,
-                                               nsIRenderingContext& aRenderingContext,
+                                               nsRenderingContext& aRenderingContext,
                                                const nsRect&        aDirtyRect,
                                                const nsPoint&       aRenderPt,
                                                PRUint32             aBGPaintFlags)
diff --git a/layout/tables/nsTablePainter.h b/layout/tables/nsTablePainter.h
index aea0bdbacad3..fe28a4e19a53 100644
--- a/layout/tables/nsTablePainter.h
+++ b/layout/tables/nsTablePainter.h
@@ -77,7 +77,7 @@ class TableBackgroundPainter
     TableBackgroundPainter(nsTableFrame*        aTableFrame,
                            Origin               aOrigin,
                            nsPresContext*       aPresContext,
-                           nsIRenderingContext& aRenderingContext,
+                           nsRenderingContext& aRenderingContext,
                            const nsRect&        aDirtyRect,
                            const nsPoint&       aPt,
                            PRUint32             aBGPaintFlags);
@@ -233,7 +233,7 @@ class TableBackgroundPainter
     };
 
     nsPresContext*      mPresContext;
-    nsIRenderingContext& mRenderingContext;
+    nsRenderingContext& mRenderingContext;
     nsPoint              mRenderPt;
     nsRect               mDirtyRect;
 #ifdef DEBUG
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 3d205433eb65..504135238c26 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
@@ -591,13 +591,13 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("TableRowBackground", TYPE_TABLE_ROW_BACKGROUND)
 };
 
 void
 nsDisplayTableRowBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                   nsIRenderingContext* aCtx) {
+                                   nsRenderingContext* aCtx) {
   nsTableFrame* tableFrame = nsTableFrame::GetTableFrame(mFrame);
 
   TableBackgroundPainter painter(tableFrame,
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 5c30b253123b..85d6f2c286f8 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -40,7 +40,7 @@
 #include "nsTableRowFrame.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
@@ -178,14 +178,14 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
 
   NS_DISPLAY_DECL_NAME("TableRowGroupBackground", TYPE_TABLE_ROW_GROUP_BACKGROUND)
 };
 
 void
 nsDisplayTableRowGroupBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                        nsIRenderingContext* aCtx) {
+                                        nsRenderingContext* aCtx) {
   nsTableFrame* tableFrame = nsTableFrame::GetTableFrame(mFrame);
 
   TableBackgroundPainter painter(tableFrame,
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index babe2fa5088e..f935eeb6ade0 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -50,7 +50,7 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMNamedNodeMap.h"
 #include "nsIDOMAttr.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDocument.h"
 #include "nsIDeviceContext.h"
 #include "nsITheme.h"
@@ -759,7 +759,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize,
       nsITheme *theme = aState.PresContext()->GetTheme();
       if (theme && theme->ThemeSupportsWidget(aState.PresContext(), aBox, display->mAppearance)) {
         nsIntSize size;
-        nsIRenderingContext* rendContext = aState.GetRenderingContext();
+        nsRenderingContext* rendContext = aState.GetRenderingContext();
         if (rendContext) {
           theme->GetMinimumWidgetSize(rendContext, aBox,
                                       display->mAppearance, &size, &canOverride);
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 061689f92bfe..fc5d46d26949 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -600,7 +600,7 @@ static void printSize(char * aDesc, nscoord aSize)
 #endif
 
 /* virtual */ nscoord
-nsBoxFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsBoxFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -622,7 +622,7 @@ nsBoxFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsBoxFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsBoxFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -1270,20 +1270,20 @@ public:
     aOutFrames->AppendElement(this);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("XULDebug", TYPE_XUL_DEBUG)
 };
 
 void
 nsDisplayXULDebug::Paint(nsDisplayListBuilder* aBuilder,
-                         nsIRenderingContext* aCtx)
+                         nsRenderingContext* aCtx)
 {
   static_cast<nsBoxFrame*>(mFrame)->
     PaintXULDebugOverlay(*aCtx, ToReferenceFrame());
 }
 
 static void
-PaintXULDebugBackground(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+PaintXULDebugBackground(nsIFrame* aFrame, nsRenderingContext* aCtx,
                         const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsBoxFrame*>(aFrame)->PaintXULDebugBackground(*aCtx, aPt);
@@ -1378,7 +1378,7 @@ nsBoxFrame::BuildDisplayListForChildren(nsDisplayListBuilder*   aBuilder,
 // whereas it did used to respect OVERFLOW_CLIP, but too bad.
 #ifdef DEBUG_LAYOUT
 void
-nsBoxFrame::PaintXULDebugBackground(nsIRenderingContext& aRenderingContext,
+nsBoxFrame::PaintXULDebugBackground(nsRenderingContext& aRenderingContext,
                                     nsPoint aPt)
 {
   nsMargin border;
@@ -1448,7 +1448,7 @@ nsBoxFrame::PaintXULDebugBackground(nsIRenderingContext& aRenderingContext,
 }
 
 void
-nsBoxFrame::PaintXULDebugOverlay(nsIRenderingContext& aRenderingContext,
+nsBoxFrame::PaintXULDebugOverlay(nsRenderingContext& aRenderingContext,
                                  nsPoint aPt)
   nsMargin border;
   GetBorder(border);
@@ -1574,7 +1574,7 @@ nsBoxFrame::GetDebug(PRBool& aDebug)
 
 #ifdef DEBUG_LAYOUT
 void
-nsBoxFrame::DrawLine(nsIRenderingContext& aRenderingContext, PRBool aHorizontal, nscoord x1, nscoord y1, nscoord x2, nscoord y2)
+nsBoxFrame::DrawLine(nsRenderingContext& aRenderingContext, PRBool aHorizontal, nscoord x1, nscoord y1, nscoord x2, nscoord y2)
 {
     if (aHorizontal)
        aRenderingContext.DrawLine(x1,y1,x2,y2);
@@ -1583,7 +1583,7 @@ nsBoxFrame::DrawLine(nsIRenderingContext& aRenderingContext, PRBool aHorizontal,
 }
 
 void
-nsBoxFrame::FillRect(nsIRenderingContext& aRenderingContext, PRBool aHorizontal, nscoord x, nscoord y, nscoord width, nscoord height)
+nsBoxFrame::FillRect(nsRenderingContext& aRenderingContext, PRBool aHorizontal, nscoord x, nscoord y, nscoord width, nscoord height)
 {
     if (aHorizontal)
        aRenderingContext.FillRect(x,y,width,height);
@@ -1592,7 +1592,7 @@ nsBoxFrame::FillRect(nsIRenderingContext& aRenderingContext, PRBool aHorizontal,
 }
 
 void 
-nsBoxFrame::DrawSpacer(nsPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize)
+nsBoxFrame::DrawSpacer(nsPresContext* aPresContext, nsRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize)
 {    
          nscoord onePixel = aPresContext->IntScaledPixelsToTwips(1);
 
diff --git a/layout/xul/base/src/nsBoxFrame.h b/layout/xul/base/src/nsBoxFrame.h
index 8b7f30726495..9689b4383a21 100644
--- a/layout/xul/base/src/nsBoxFrame.h
+++ b/layout/xul/base/src/nsBoxFrame.h
@@ -122,8 +122,8 @@ public:
                               PRInt32         aModType);
 
   virtual void MarkIntrinsicWidthsDirty();
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
@@ -224,9 +224,9 @@ public:
 protected:
 #ifdef DEBUG_LAYOUT
     virtual void GetBoxName(nsAutoString& aName);
-    void PaintXULDebugBackground(nsIRenderingContext& aRenderingContext,
+    void PaintXULDebugBackground(nsRenderingContext& aRenderingContext,
                                  nsPoint aPt);
-    void PaintXULDebugOverlay(nsIRenderingContext& aRenderingContext,
+    void PaintXULDebugOverlay(nsRenderingContext& aRenderingContext,
                               nsPoint aPt);
 #endif
 
@@ -269,9 +269,9 @@ private:
 
     void GetValue(nsPresContext* aPresContext, const nsSize& a, const nsSize& b, char* value);
     void GetValue(nsPresContext* aPresContext, PRInt32 a, PRInt32 b, char* value);
-    void DrawSpacer(nsPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize);
-    void DrawLine(nsIRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x1, nscoord y1, nscoord x2, nscoord y2);
-    void FillRect(nsIRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x, nscoord y, nscoord width, nscoord height);
+    void DrawSpacer(nsPresContext* aPresContext, nsRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize);
+    void DrawLine(nsRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x1, nscoord y1, nscoord x2, nscoord y2);
+    void FillRect(nsRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x, nscoord y, nscoord width, nscoord height);
 #endif
     virtual void UpdateMouseThrough();
 
diff --git a/layout/xul/base/src/nsBoxLayoutState.cpp b/layout/xul/base/src/nsBoxLayoutState.cpp
index 76a3e1fc7a49..539cdfa126a7 100644
--- a/layout/xul/base/src/nsBoxLayoutState.cpp
+++ b/layout/xul/base/src/nsBoxLayoutState.cpp
@@ -45,7 +45,7 @@
 #include "nsBoxLayoutState.h"
 
 nsBoxLayoutState::nsBoxLayoutState(nsPresContext* aPresContext,
-                                   nsIRenderingContext* aRenderingContext,
+                                   nsRenderingContext* aRenderingContext,
                                    PRUint16 aReflowDepth)
   : mPresContext(aPresContext)
   , mRenderingContext(aRenderingContext)
diff --git a/layout/xul/base/src/nsBoxLayoutState.h b/layout/xul/base/src/nsBoxLayoutState.h
index 6ea3d804adac..3ca7d4408313 100644
--- a/layout/xul/base/src/nsBoxLayoutState.h
+++ b/layout/xul/base/src/nsBoxLayoutState.h
@@ -50,7 +50,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsCalculatedBoxInfo;
 struct nsHTMLReflowMetrics;
 class nsString;
@@ -59,7 +59,7 @@ class nsHTMLReflowCommand;
 class NS_STACK_CLASS nsBoxLayoutState
 {
 public:
-  nsBoxLayoutState(nsPresContext* aPresContext, nsIRenderingContext* aRenderingContext = nsnull,
+  nsBoxLayoutState(nsPresContext* aPresContext, nsRenderingContext* aRenderingContext = nsnull,
                    PRUint16 aReflowDepth = 0) NS_HIDDEN;
   nsBoxLayoutState(const nsBoxLayoutState& aState) NS_HIDDEN;
 
@@ -77,7 +77,7 @@ public:
   // nsBoxLayoutState and should be null-checked before it is used.
   // However, passing a null rendering context to the constructor when
   // doing box layout or intrinsic size calculation will cause bugs.
-  nsIRenderingContext* GetRenderingContext() const { return mRenderingContext; }
+  nsRenderingContext* GetRenderingContext() const { return mRenderingContext; }
 
   void PushStackMemory() { PresShell()->PushStackMemory(); ++mReflowDepth; }
   void PopStackMemory()  { PresShell()->PopStackMemory(); --mReflowDepth; }
@@ -88,7 +88,7 @@ public:
   
 private:
   nsRefPtr<nsPresContext> mPresContext;
-  nsIRenderingContext *mRenderingContext;
+  nsRenderingContext *mRenderingContext;
   PRUint32 mLayoutFlags;
   PRUint16 mReflowDepth; 
   PRPackedBool mPaintingDisabled;
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
index 056390b6503c..bf6a5d890bbd 100644
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -39,7 +39,7 @@
 #include "nsCSSRendering.h"
 #include "nsIDocument.h"
 #include "nsPageFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsIDOMEvent.h"
 #include "nsStyleConsts.h"
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/base/src/nsGroupBoxFrame.cpp
index c212be459cd9..f6f568545052 100644
--- a/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -63,7 +63,7 @@ public:
 
   virtual PRBool HonorPrintBackgroundSettings() { return PR_FALSE; }
 
-  void PaintBorderBackground(nsIRenderingContext& aRenderingContext,
+  void PaintBorderBackground(nsRenderingContext& aRenderingContext,
       nsPoint aPt, const nsRect& aDirtyRect);
 
   // make sure we our kids get our orient and align instead of us.
@@ -123,13 +123,13 @@ public:
     aOutFrames->AppendElement(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("XULGroupBackground", TYPE_XUL_GROUP_BACKGROUND)
 };
 
 void
 nsDisplayXULGroupBackground::Paint(nsDisplayListBuilder* aBuilder,
-                                   nsIRenderingContext* aCtx)
+                                   nsRenderingContext* aCtx)
 {
   static_cast<nsGroupBoxFrame*>(mFrame)->
     PaintBorderBackground(*aCtx, ToReferenceFrame(), mVisibleRect);
@@ -155,7 +155,7 @@ nsGroupBoxFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsGroupBoxFrame::PaintBorderBackground(nsIRenderingContext& aRenderingContext,
+nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     nsPoint aPt, const nsRect& aDirtyRect) {
   PRIntn skipSides = 0;
   const nsStyleBorder* borderStyleData = GetStyleBorder();
diff --git a/layout/xul/base/src/nsIBoxLayout.h b/layout/xul/base/src/nsIBoxLayout.h
index 7924d85378e1..063b0839de4c 100644
--- a/layout/xul/base/src/nsIBoxLayout.h
+++ b/layout/xul/base/src/nsIBoxLayout.h
@@ -43,7 +43,7 @@
 
 class nsBoxLayout;
 class nsBoxLayoutState;
-class nsIRenderingContext;
+class nsRenderingContext;
 struct nsRect;
 
 // 6a529924-c73d-4fae-af7a-0e8084e701d5
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 1638f8861383..17e6fee13a7e 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -55,7 +55,7 @@
 #include "nsHTMLParts.h"
 #include "nsString.h"
 #include "nsLeafFrame.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
@@ -329,12 +329,12 @@ public:
   // Doesn't handle HitTest because nsLeafBoxFrame already creates an
   // event receiver for us
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   NS_DISPLAY_DECL_NAME("XULImage", TYPE_XUL_IMAGE)
 };
 
 void nsDisplayXULImage::Paint(nsDisplayListBuilder* aBuilder,
-                              nsIRenderingContext* aCtx)
+                              nsRenderingContext* aCtx)
 {
   static_cast<nsImageBoxFrame*>(mFrame)->
     PaintImage(*aCtx, mVisibleRect, ToReferenceFrame(),
@@ -366,7 +366,7 @@ nsImageBoxFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsImageBoxFrame::PaintImage(nsIRenderingContext& aRenderingContext,
+nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
                             const nsRect& aDirtyRect, nsPoint aPt,
                             PRUint32 aFlags)
 {
diff --git a/layout/xul/base/src/nsImageBoxFrame.h b/layout/xul/base/src/nsImageBoxFrame.h
index f409aabd2e6a..e445ee2cb6db 100644
--- a/layout/xul/base/src/nsImageBoxFrame.h
+++ b/layout/xul/base/src/nsImageBoxFrame.h
@@ -127,7 +127,7 @@ public:
 
   virtual ~nsImageBoxFrame();
 
-  void  PaintImage(nsIRenderingContext& aRenderingContext,
+  void  PaintImage(nsRenderingContext& aRenderingContext,
                    const nsRect& aDirtyRect,
                    nsPoint aPt, PRUint32 aFlags);
 
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 6909d91ced0d..78e412a8ccb2 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -49,7 +49,7 @@
 #include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
@@ -157,7 +157,7 @@ nsLeafBoxFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 /* virtual */ nscoord
-nsLeafBoxFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
+nsLeafBoxFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
@@ -177,7 +177,7 @@ nsLeafBoxFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
 }
 
 /* virtual */ nscoord
-nsLeafBoxFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
+nsLeafBoxFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
@@ -204,7 +204,7 @@ nsLeafBoxFrame::GetIntrinsicWidth()
 }
 
 nsSize
-nsLeafBoxFrame::ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+nsLeafBoxFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                 nsSize aCBSize, nscoord aAvailableWidth,
                                 nsSize aMargin, nsSize aBorder,
                                 nsSize aPadding, PRBool aShrinkWrap)
diff --git a/layout/xul/base/src/nsLeafBoxFrame.h b/layout/xul/base/src/nsLeafBoxFrame.h
index 28ca13edec04..4f340462a119 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.h
+++ b/layout/xul/base/src/nsLeafBoxFrame.h
@@ -71,11 +71,11 @@ public:
   // nsIHTMLReflow overrides
 
   virtual void MarkIntrinsicWidthsDirty();
-  virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
-  virtual nscoord GetPrefWidth(nsIRenderingContext *aRenderingContext);
+  virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
+  virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
 
   // Our auto size is that provided by nsFrame, not nsLeafFrame
-  virtual nsSize ComputeAutoSize(nsIRenderingContext *aRenderingContext,
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
                                  nsSize aCBSize, nscoord aAvailableWidth,
                                  nsSize aMargin, nsSize aBorder,
                                  nsSize aPadding, PRBool aShrinkWrap);
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index a199ff9d195a..b076c7c49730 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -58,7 +58,7 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsStyleContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsIFontMetrics.h"
 #include "nsITimer.h"
@@ -729,7 +729,7 @@ nsListBoxBodyFrame::ComputeIntrinsicWidth(nsBoxLayoutState& aBoxLayoutState)
       nsIContent *child = (*iter);
 
       if (child->Tag() == nsGkAtoms::listitem) {
-        nsIRenderingContext* rendContext = aBoxLayoutState.GetRenderingContext();
+        nsRenderingContext* rendContext = aBoxLayoutState.GetRenderingContext();
         if (rendContext) {
           nsAutoString value;
           PRUint32 textCount = child->GetChildCount();
diff --git a/layout/xul/base/src/nsRootBoxFrame.cpp b/layout/xul/base/src/nsRootBoxFrame.cpp
index 4269991cae3f..bd1141ca67a7 100644
--- a/layout/xul/base/src/nsRootBoxFrame.cpp
+++ b/layout/xul/base/src/nsRootBoxFrame.cpp
@@ -37,7 +37,7 @@
 
 #include "nsHTMLParts.h"
 #include "nsIDocument.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp
index 495695463280..03e92262b650 100644
--- a/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/layout/xul/base/src/nsSplitterFrame.cpp
@@ -664,7 +664,7 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
   if (childIndex == childCount - 1 && GetResizeAfter() != Grow)
     return NS_OK;
 
-  nsCOMPtr<nsIRenderingContext> rc =
+  nsRefPtr<nsRenderingContext> rc =
     outerPresContext->PresShell()->GetReferenceRenderingContext();
   NS_ENSURE_TRUE(rc, NS_ERROR_FAILURE);
   nsBoxLayoutState state(outerPresContext, rc);
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 64a7044b3a05..76197848cc84 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -52,7 +52,7 @@
 #include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
@@ -339,7 +339,7 @@ public:
 #endif
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
-                     nsIRenderingContext* aCtx);
+                     nsRenderingContext* aCtx);
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("XULTextBox", TYPE_XUL_TEXT_BOX)
 
@@ -352,7 +352,7 @@ public:
 
 void
 nsDisplayXULTextBox::Paint(nsDisplayListBuilder* aBuilder,
-                           nsIRenderingContext* aCtx)
+                           nsRenderingContext* aCtx)
 {
   gfxContextAutoDisableSubpixelAntialiasing disable(aCtx->ThebesContext(),
                                                     mDisableSubpixelAA);
@@ -388,7 +388,7 @@ nsTextBoxFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsTextBoxFrame::PaintTitle(nsIRenderingContext& aRenderingContext,
+nsTextBoxFrame::PaintTitle(nsRenderingContext& aRenderingContext,
                            const nsRect&        aDirtyRect,
                            nsPoint              aPt)
 {
@@ -415,7 +415,7 @@ nsTextBoxFrame::PaintTitle(nsIRenderingContext& aRenderingContext,
 }
 
 void
-nsTextBoxFrame::DrawText(nsIRenderingContext& aRenderingContext,
+nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
                          const nsRect&        aTextRect,
                          const nscolor*       aOverrideColor)
 {
@@ -518,7 +518,7 @@ nsTextBoxFrame::DrawText(nsIRenderingContext& aRenderingContext,
       }
     }
 
-    nsCOMPtr<nsIRenderingContext> refContext =
+    nsRefPtr<nsRenderingContext> refContext =
         PresContext()->PresShell()->GetReferenceRenderingContext();
 
     aRenderingContext.SetFont(fontMet);
@@ -623,8 +623,8 @@ void nsTextBoxFrame::PaintOneShadow(gfxContext*      aCtx,
   else
     shadowColor = aForegroundColor;
 
-  // Conjure an nsIRenderingContext from a gfxContext for DrawText
-  nsCOMPtr<nsIRenderingContext> renderingContext = nsnull;
+  // Conjure an nsRenderingContext from a gfxContext for DrawText
+  nsRefPtr<nsRenderingContext> renderingContext = nsnull;
   nsIDeviceContext* devCtx = PresContext()->DeviceContext();
   devCtx->CreateRenderingContextInstance(*getter_AddRefs(renderingContext));
   if (!renderingContext)
@@ -644,7 +644,7 @@ void nsTextBoxFrame::PaintOneShadow(gfxContext*      aCtx,
 }
 
 void
-nsTextBoxFrame::CalculateUnderline(nsIRenderingContext& aRenderingContext)
+nsTextBoxFrame::CalculateUnderline(nsRenderingContext& aRenderingContext)
 {
     if (mAccessKeyInfo && mAccessKeyInfo->mAccesskeyIndex != kNotFound) {
          // Calculate all fields of mAccessKeyInfo which
@@ -665,7 +665,7 @@ nsTextBoxFrame::CalculateUnderline(nsIRenderingContext& aRenderingContext)
 
 nscoord
 nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
-                                       nsIRenderingContext& aRenderingContext,
+                                       nsRenderingContext& aRenderingContext,
                                        nscoord              aWidth)
 {
     if (mTitle.IsEmpty())
@@ -997,7 +997,7 @@ nsTextBoxFrame::MarkIntrinsicWidthsDirty()
 }
 
 void
-nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext, nsIRenderingContext& aRenderingContext,
+nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext, nsRenderingContext& aRenderingContext,
                                 const nsString& aString, nsSize& aSize, nscoord& aAscent)
 {
     nsCOMPtr<nsIFontMetrics> fontMet;
@@ -1016,7 +1016,7 @@ nsTextBoxFrame::CalcTextSize(nsBoxLayoutState& aBoxLayoutState)
     {
         nsSize size;
         nsPresContext* presContext = aBoxLayoutState.PresContext();
-        nsIRenderingContext* rendContext = aBoxLayoutState.GetRenderingContext();
+        nsRenderingContext* rendContext = aBoxLayoutState.GetRenderingContext();
         if (rendContext) {
             GetTextSize(presContext, *rendContext,
                         mTitle, size, mAscent);
@@ -1027,7 +1027,7 @@ nsTextBoxFrame::CalcTextSize(nsBoxLayoutState& aBoxLayoutState)
 }
 
 void
-nsTextBoxFrame::CalcDrawRect(nsIRenderingContext &aRenderingContext)
+nsTextBoxFrame::CalcDrawRect(nsRenderingContext &aRenderingContext)
 {
     nsRect textRect(nsPoint(0, 0), GetSize());
     nsMargin borderPadding;
diff --git a/layout/xul/base/src/nsTextBoxFrame.h b/layout/xul/base/src/nsTextBoxFrame.h
index f0aa64c870d2..7f71a64e1170 100644
--- a/layout/xul/base/src/nsTextBoxFrame.h
+++ b/layout/xul/base/src/nsTextBoxFrame.h
@@ -84,7 +84,7 @@ public:
 
   virtual ~nsTextBoxFrame();
 
-  void PaintTitle(nsIRenderingContext& aRenderingContext,
+  void PaintTitle(nsRenderingContext& aRenderingContext,
                   const nsRect&        aDirtyRect,
                   nsPoint              aPt);
 
@@ -102,23 +102,23 @@ protected:
 
   // REVIEW: SORRY! Couldn't resist devirtualizing these
   void LayoutTitle(nsPresContext*      aPresContext,
-                   nsIRenderingContext& aRenderingContext,
+                   nsRenderingContext& aRenderingContext,
                    const nsRect&        aRect);
 
-  void CalculateUnderline(nsIRenderingContext& aRenderingContext);
+  void CalculateUnderline(nsRenderingContext& aRenderingContext);
 
   void CalcTextSize(nsBoxLayoutState& aBoxLayoutState);
 
-  void CalcDrawRect(nsIRenderingContext &aRenderingContext);
+  void CalcDrawRect(nsRenderingContext &aRenderingContext);
 
   nsTextBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext);
 
   nscoord CalculateTitleForWidth(nsPresContext*      aPresContext,
-                                 nsIRenderingContext& aRenderingContext,
+                                 nsRenderingContext& aRenderingContext,
                                  nscoord              aWidth);
 
   void GetTextSize(nsPresContext*      aPresContext,
-                   nsIRenderingContext& aRenderingContext,
+                   nsRenderingContext& aRenderingContext,
                    const nsString&      aString,
                    nsSize&              aSize,
                    nscoord&             aAscent);
@@ -130,7 +130,7 @@ private:
   PRBool AlwaysAppendAccessKey();
   PRBool InsertSeparatorBeforeAccessKey();
 
-  void DrawText(nsIRenderingContext& aRenderingContext,
+  void DrawText(nsRenderingContext& aRenderingContext,
                          const nsRect&        aTextRect,
                          const nscolor*       aOverrideColor);
 
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index fb99c744348f..1a89293c5491 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -270,7 +270,7 @@ nsTreeBodyFrame::CalcMaxRowWidth()
   nscoord rowWidth;
   nsTreeColumn* col;
 
-  nsCOMPtr<nsIRenderingContext> rc =
+  nsRefPtr<nsRenderingContext> rc =
     PresContext()->PresShell()->GetReferenceRenderingContext();
   if (!rc)
     return 0;
@@ -1175,7 +1175,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, nsITreeColumn* aCol, const n
     // interfere with our computations.
     AdjustForBorderPadding(cellContext, cellRect);
 
-    nsCOMPtr<nsIRenderingContext> rc =
+    nsRefPtr<nsRenderingContext> rc =
       presContext->PresShell()->GetReferenceRenderingContext();
     if (!rc)
       return NS_ERROR_OUT_OF_MEMORY;
@@ -1334,7 +1334,7 @@ nsTreeBodyFrame::CheckTextForBidi(nsAutoString& aText)
 void
 nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
                                    PRInt32 aRowIndex,  nsTreeColumn* aColumn,
-                                   nsIRenderingContext& aRenderingContext,
+                                   nsRenderingContext& aRenderingContext,
                                    nsRect& aTextRect)
 {
   NS_PRECONDITION(aColumn && aColumn->GetFrame(), "invalid column passed");
@@ -1526,7 +1526,7 @@ nsTreeBodyFrame::GetItemWithinCellAt(nscoord aX, const nsRect& aCellRect,
   PRBool isRTL = GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL;
 
   nsPresContext* presContext = PresContext();
-  nsCOMPtr<nsIRenderingContext> rc =
+  nsRefPtr<nsRenderingContext> rc =
     presContext->PresShell()->GetReferenceRenderingContext();
   if (!rc)
     return nsCSSAnonBoxes::moztreecell;
@@ -1684,7 +1684,7 @@ nsTreeBodyFrame::GetCellAt(nscoord aX, nscoord aY, PRInt32* aRow,
 
 nsresult
 nsTreeBodyFrame::GetCellWidth(PRInt32 aRow, nsTreeColumn* aCol,
-                              nsIRenderingContext* aRenderingContext,
+                              nsRenderingContext* aRenderingContext,
                               nscoord& aDesiredSize, nscoord& aCurrentSize)
 {
   NS_PRECONDITION(aCol, "aCol must not be null");
@@ -1777,7 +1777,7 @@ nsTreeBodyFrame::IsCellCropped(PRInt32 aRow, nsITreeColumn* aCol, PRBool *_retva
   if (!col)
     return NS_ERROR_INVALID_ARG;
 
-  nsCOMPtr<nsIRenderingContext> rc =
+  nsRefPtr<nsRenderingContext> rc =
     PresContext()->PresShell()->GetReferenceRenderingContext();
   NS_ENSURE_TRUE(rc, NS_ERROR_FAILURE);
 
@@ -2072,7 +2072,7 @@ nsTreeBodyFrame::GetTwistyRect(PRInt32 aRowIndex,
                                nsRect& aImageRect,
                                nsRect& aTwistyRect,
                                nsPresContext* aPresContext,
-                               nsIRenderingContext& aRenderingContext,
+                               nsRenderingContext& aRenderingContext,
                                nsStyleContext* aTwistyContext)
 {
   // The twisty rect extends all the way to the end of the cell.  This is incorrect.  We need to
@@ -2787,7 +2787,7 @@ nsLineStyle nsTreeBodyFrame::ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle)
 }
 
 static void
-PaintTreeBody(nsIFrame* aFrame, nsIRenderingContext* aCtx,
+PaintTreeBody(nsIFrame* aFrame, nsRenderingContext* aCtx,
               const nsRect& aDirtyRect, nsPoint aPt)
 {
   static_cast<nsTreeBodyFrame*>(aFrame)->PaintTreeBody(*aCtx, aDirtyRect, aPt);
@@ -2818,7 +2818,7 @@ nsTreeBodyFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 void
-nsTreeBodyFrame::PaintTreeBody(nsIRenderingContext& aRenderingContext,
+nsTreeBodyFrame::PaintTreeBody(nsRenderingContext& aRenderingContext,
                                const nsRect& aDirtyRect, nsPoint aPt)
 {
   // Update our available height and our page count.
@@ -2891,7 +2891,7 @@ void
 nsTreeBodyFrame::PaintColumn(nsTreeColumn*        aColumn,
                              const nsRect&        aColumnRect,
                              nsPresContext*      aPresContext,
-                             nsIRenderingContext& aRenderingContext,
+                             nsRenderingContext& aRenderingContext,
                              const nsRect&        aDirtyRect)
 {
   NS_PRECONDITION(aColumn && aColumn->GetFrame(), "invalid column passed");
@@ -2918,7 +2918,7 @@ void
 nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
                           const nsRect&        aRowRect,
                           nsPresContext*       aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           const nsRect&        aDirtyRect,
                           nsPoint              aPt)
 {
@@ -3072,7 +3072,7 @@ void
 nsTreeBodyFrame::PaintSeparator(PRInt32              aRowIndex,
                                 const nsRect&        aSeparatorRect,
                                 nsPresContext*      aPresContext,
-                                nsIRenderingContext& aRenderingContext,
+                                nsRenderingContext& aRenderingContext,
                                 const nsRect&        aDirtyRect)
 {
   // Resolve style for the separator.
@@ -3124,7 +3124,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
                            nsTreeColumn*        aColumn,
                            const nsRect&        aCellRect,
                            nsPresContext*       aPresContext,
-                           nsIRenderingContext& aRenderingContext,
+                           nsRenderingContext& aRenderingContext,
                            const nsRect&        aDirtyRect,
                            nscoord&             aCurrX,
                            nsPoint              aPt)
@@ -3303,7 +3303,7 @@ nsTreeBodyFrame::PaintTwisty(PRInt32              aRowIndex,
                              nsTreeColumn*        aColumn,
                              const nsRect&        aTwistyRect,
                              nsPresContext*      aPresContext,
-                             nsIRenderingContext& aRenderingContext,
+                             nsRenderingContext& aRenderingContext,
                              const nsRect&        aDirtyRect,
                              nscoord&             aRemainingWidth,
                              nscoord&             aCurrX)
@@ -3396,7 +3396,7 @@ nsTreeBodyFrame::PaintImage(PRInt32              aRowIndex,
                             nsTreeColumn*        aColumn,
                             const nsRect&        aImageRect,
                             nsPresContext*       aPresContext,
-                            nsIRenderingContext& aRenderingContext,
+                            nsRenderingContext& aRenderingContext,
                             const nsRect&        aDirtyRect,
                             nscoord&             aRemainingWidth,
                             nscoord&             aCurrX)
@@ -3532,7 +3532,7 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
                            nsTreeColumn*        aColumn,
                            const nsRect&        aTextRect,
                            nsPresContext*      aPresContext,
-                           nsIRenderingContext& aRenderingContext,
+                           nsRenderingContext& aRenderingContext,
                            const nsRect&        aDirtyRect,
                            nscoord&             aCurrX,
                            PRBool               aTextRTL)
@@ -3640,7 +3640,7 @@ nsTreeBodyFrame::PaintCheckbox(PRInt32              aRowIndex,
                                nsTreeColumn*        aColumn,
                                const nsRect&        aCheckboxRect,
                                nsPresContext*      aPresContext,
-                               nsIRenderingContext& aRenderingContext,
+                               nsRenderingContext& aRenderingContext,
                                const nsRect&        aDirtyRect)
 {
   NS_PRECONDITION(aColumn && aColumn->GetFrame(), "invalid column passed");
@@ -3703,7 +3703,7 @@ nsTreeBodyFrame::PaintProgressMeter(PRInt32              aRowIndex,
                                     nsTreeColumn*        aColumn,
                                     const nsRect&        aProgressMeterRect,
                                     nsPresContext*      aPresContext,
-                                    nsIRenderingContext& aRenderingContext,
+                                    nsRenderingContext& aRenderingContext,
                                     const nsRect&        aDirtyRect)
 {
   NS_PRECONDITION(aColumn && aColumn->GetFrame(), "invalid column passed");
@@ -3790,7 +3790,7 @@ nsTreeBodyFrame::PaintProgressMeter(PRInt32              aRowIndex,
 void
 nsTreeBodyFrame::PaintDropFeedback(const nsRect&        aDropFeedbackRect,
                                    nsPresContext*      aPresContext,
-                                   nsIRenderingContext& aRenderingContext,
+                                   nsRenderingContext& aRenderingContext,
                                    const nsRect&        aDirtyRect,
                                    nsPoint              aPt)
 {
@@ -3893,7 +3893,7 @@ nsTreeBodyFrame::PaintDropFeedback(const nsRect&        aDropFeedbackRect,
 void
 nsTreeBodyFrame::PaintBackgroundLayer(nsStyleContext*      aStyleContext,
                                       nsPresContext*      aPresContext,
-                                      nsIRenderingContext& aRenderingContext,
+                                      nsRenderingContext& aRenderingContext,
                                       const nsRect&        aRect,
                                       const nsRect&        aDirtyRect)
 {
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
index c1347be6707a..d643578aebca 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
@@ -181,7 +181,7 @@ public:
     nsIScrollableFrame*  mColumnsScrollFrame;
   };
 
-  void PaintTreeBody(nsIRenderingContext& aRenderingContext,
+  void PaintTreeBody(nsRenderingContext& aRenderingContext,
                      const nsRect& aDirtyRect, nsPoint aPt);
 
   nsITreeBoxObject* GetTreeBoxObject() const { return mTreeBoxObject; }
@@ -196,14 +196,14 @@ protected:
   void PaintColumn(nsTreeColumn*        aColumn,
                    const nsRect&        aColumnRect,
                    nsPresContext*      aPresContext,
-                   nsIRenderingContext& aRenderingContext,
+                   nsRenderingContext& aRenderingContext,
                    const nsRect&        aDirtyRect);
 
   // This method paints a single row in the tree.
   void PaintRow(PRInt32              aRowIndex,
                 const nsRect&        aRowRect,
                 nsPresContext*       aPresContext,
-                nsIRenderingContext& aRenderingContext,
+                nsRenderingContext& aRenderingContext,
                 const nsRect&        aDirtyRect,
                 nsPoint              aPt);
 
@@ -211,7 +211,7 @@ protected:
   void PaintSeparator(PRInt32              aRowIndex,
                       const nsRect&        aSeparatorRect,
                       nsPresContext*      aPresContext,
-                      nsIRenderingContext& aRenderingContext,
+                      nsRenderingContext& aRenderingContext,
                       const nsRect&        aDirtyRect);
 
   // This method paints a specific cell in a given row of the tree.
@@ -219,7 +219,7 @@ protected:
                  nsTreeColumn*        aColumn,
                  const nsRect&        aCellRect,
                  nsPresContext*       aPresContext,
-                 nsIRenderingContext& aRenderingContext,
+                 nsRenderingContext& aRenderingContext,
                  const nsRect&        aDirtyRect,
                  nscoord&             aCurrX,
                  nsPoint              aPt);
@@ -229,7 +229,7 @@ protected:
                    nsTreeColumn*        aColumn,
                    const nsRect&        aTwistyRect,
                    nsPresContext*      aPresContext,
-                   nsIRenderingContext& aRenderingContext,
+                   nsRenderingContext& aRenderingContext,
                    const nsRect&        aDirtyRect,
                    nscoord&             aRemainingWidth,
                    nscoord&             aCurrX);
@@ -239,7 +239,7 @@ protected:
                   nsTreeColumn*        aColumn,
                   const nsRect&        aImageRect,
                   nsPresContext*      aPresContext,
-                  nsIRenderingContext& aRenderingContext,
+                  nsRenderingContext& aRenderingContext,
                   const nsRect&        aDirtyRect,
                   nscoord&             aRemainingWidth,
                   nscoord&             aCurrX);
@@ -249,7 +249,7 @@ protected:
                  nsTreeColumn*        aColumn,
                  const nsRect&        aTextRect,
                  nsPresContext*      aPresContext,
-                 nsIRenderingContext& aRenderingContext,
+                 nsRenderingContext& aRenderingContext,
                  const nsRect&        aDirtyRect,
                  nscoord&             aCurrX,
                  PRBool               aTextRTL);
@@ -259,7 +259,7 @@ protected:
                      nsTreeColumn*        aColumn,
                      const nsRect&        aCheckboxRect,
                      nsPresContext*      aPresContext,
-                     nsIRenderingContext& aRenderingContext,
+                     nsRenderingContext& aRenderingContext,
                      const nsRect&        aDirtyRect);
 
   // This method paints the progress meter inside a particular cell of the tree.
@@ -267,13 +267,13 @@ protected:
                           nsTreeColumn*        aColumn,
                           const nsRect&        aProgressMeterRect,
                           nsPresContext*      aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           const nsRect&        aDirtyRect);
 
   // This method paints a drop feedback of the tree.
   void PaintDropFeedback(const nsRect&        aDropFeedbackRect, 
                          nsPresContext*      aPresContext,
-                         nsIRenderingContext& aRenderingContext,
+                         nsRenderingContext& aRenderingContext,
                          const nsRect&        aDirtyRect,
                          nsPoint              aPt);
 
@@ -281,7 +281,7 @@ protected:
   // paint the background rect as if it were a full-blown frame.
   void PaintBackgroundLayer(nsStyleContext*      aStyleContext,
                             nsPresContext*      aPresContext, 
-                            nsIRenderingContext& aRenderingContext, 
+                            nsRenderingContext& aRenderingContext, 
                             const nsRect&        aRect,
                             const nsRect&        aDirtyRect);
 
@@ -300,7 +300,7 @@ protected:
 
   void AdjustForCellText(nsAutoString& aText,
                          PRInt32 aRowIndex,  nsTreeColumn* aColumn,
-                         nsIRenderingContext& aRenderingContext,
+                         nsRenderingContext& aRenderingContext,
                          nsRect& aTextRect);
 
   // A helper used when hit testing.
@@ -318,7 +318,7 @@ protected:
                           nsRect& aImageRect,
                           nsRect& aTwistyRect,
                           nsPresContext* aPresContext,
-                          nsIRenderingContext& aRenderingContext,
+                          nsRenderingContext& aRenderingContext,
                           nsStyleContext* aTwistyContext);
 
   // Fetch an image from the image cache.
@@ -398,7 +398,7 @@ protected:
   nsIContent* GetBaseElement();
 
   nsresult GetCellWidth(PRInt32 aRow, nsTreeColumn* aCol,
-                        nsIRenderingContext* aRenderingContext,
+                        nsRenderingContext* aRenderingContext,
                         nscoord& aDesiredSize, nscoord& aCurrentSize);
   nscoord CalcMaxRowWidth();
 
diff --git a/tools/trace-malloc/types.dat b/tools/trace-malloc/types.dat
index 7b85d614f902..4e0a369dd3c0 100644
--- a/tools/trace-malloc/types.dat
+++ b/tools/trace-malloc/types.dat
@@ -2935,7 +2935,7 @@ nsString::SetCapacity(unsigned int)
 nsString::SetLength(unsigned int)
 nsAString::do_AssignFromReadable(nsAString const &)
 nsAString::AssignFromReadable(nsAString const &)
-nsTextBoxFrame::CalculateTitleForWidth(nsIPresContext *, nsIRenderingContext &, int)
+nsTextBoxFrame::CalculateTitleForWidth(nsIPresContext *, nsRenderingContext &, int)
 
 # ----------------------------------------------------------------------
 #
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 99b543ee92ea..c6cc1717c0bb 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -41,7 +41,7 @@
 #include "nscore.h"
 #include "nsIView.h"
 #include "nsEvent.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 
 class nsIWidget;
 struct nsRect;
diff --git a/view/public/nsIViewObserver.h b/view/public/nsIViewObserver.h
index d7d4159d63bf..2871c23af904 100644
--- a/view/public/nsIViewObserver.h
+++ b/view/public/nsIViewObserver.h
@@ -43,7 +43,7 @@
 #include "nsColor.h"
 #include "nsRect.h"
 
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsGUIEvent;
 
 #define NS_IVIEWOBSERVER_IID  \
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index a31ccf6f51ab..4956a0aee311 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -71,7 +71,7 @@ namespace dom {
 #ifdef ACCESSIBILITY
 class nsAccessible;
 #endif
-class nsIRenderingContext;
+class nsRenderingContext;
 class nsIMenuItem;
 class nsIContent;
 class nsIURI;
diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h
index faa1abf9683d..7dbc66b1d519 100644
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -59,7 +59,7 @@
 class   nsIAppShell;
 class   nsIToolkit;
 class   nsIFontMetrics;
-class   nsIRenderingContext;
+class   nsRenderingContext;
 class   nsIDeviceContext;
 struct  nsFont;
 class   nsIRollupListener;
diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index 7a7a79334995..4b4e451a9ba7 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -54,7 +54,7 @@ using mozilla::unused;
 #include "nsIObserverService.h"
 
 #include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDOMSimpleGestureEvent.h"
 
 #include "nsWidgetAtoms.h"
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.h b/widget/src/cocoa/nsNativeThemeCocoa.h
index cabebf87b0e4..3f11d6b0bffe 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.h
+++ b/widget/src/cocoa/nsNativeThemeCocoa.h
@@ -62,7 +62,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // The nsITheme interface.
-  NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
+  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
@@ -80,7 +80,7 @@ public:
   virtual PRBool GetWidgetOverflow(nsIDeviceContext* aContext, nsIFrame* aFrame,
                                    PRUint8 aWidgetType, nsRect* aOverflowRect);
 
-  NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+  NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntSize* aResult, PRBool* aIsOverridable);
   NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType, 
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index 5d4532840a06..ef5568004d5d 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -42,7 +42,7 @@
 
 #include "nsNativeThemeCocoa.h"
 #include "nsObjCExceptions.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsRect.h"
 #include "nsSize.h"
 #include "nsThemeConstants.h"
@@ -1494,7 +1494,7 @@ nsNativeThemeCocoa::DrawResizer(CGContextRef cgContext, const HIRect& aRect,
 }
 
 NS_IMETHODIMP
-nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame* aFrame,
+nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, nsIFrame* aFrame,
                                          PRUint8 aWidgetType, const nsRect& aRect,
                                          const nsRect& aDirtyRect)
 {
@@ -2114,7 +2114,7 @@ static const PRInt32 kRegularScrollbarThumbMinSize = 22;
 static const PRInt32 kSmallScrollbarThumbMinSize = 19;
 
 NS_IMETHODIMP
-nsNativeThemeCocoa::GetMinimumWidgetSize(nsIRenderingContext* aContext,
+nsNativeThemeCocoa::GetMinimumWidgetSize(nsRenderingContext* aContext,
                                          nsIFrame* aFrame,
                                          PRUint8 aWidgetType,
                                          nsIntSize* aResult,
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index e972fc49b402..f15b69c1aa80 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -756,7 +756,7 @@ nsNativeThemeGTK::GetExtraSizeForWidget(nsIFrame* aFrame, PRUint8 aWidgetType,
 }
 
 NS_IMETHODIMP
-nsNativeThemeGTK::DrawWidgetBackground(nsIRenderingContext* aContext,
+nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
                                        nsIFrame* aFrame,
                                        PRUint8 aWidgetType,
                                        const nsRect& aRect,
@@ -979,7 +979,7 @@ nsNativeThemeGTK::GetWidgetOverflow(nsIDeviceContext* aContext,
 }
 
 NS_IMETHODIMP
-nsNativeThemeGTK::GetMinimumWidgetSize(nsIRenderingContext* aContext,
+nsNativeThemeGTK::GetMinimumWidgetSize(nsRenderingContext* aContext,
                                        nsIFrame* aFrame, PRUint8 aWidgetType,
                                        nsIntSize* aResult, PRBool* aIsOverridable)
 {
diff --git a/widget/src/gtk2/nsNativeThemeGTK.h b/widget/src/gtk2/nsNativeThemeGTK.h
index 0d6a1a2c5ccc..3ecd5208ec80 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.h
+++ b/widget/src/gtk2/nsNativeThemeGTK.h
@@ -54,7 +54,7 @@ public:
   NS_DECL_NSIOBSERVER
 
   // The nsITheme interface.
-  NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
+  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame, PRUint8 aWidgetType,
                                   const nsRect& aRect,
                                   const nsRect& aDirtyRect);
@@ -72,7 +72,7 @@ public:
                                                PRUint8 aWidgetType,
                                                nsRect* aOverflowRect);
 
-  NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext,
+  NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext,
                                   nsIFrame* aFrame, PRUint8 aWidgetType,
                                   nsIntSize* aResult, PRBool* aIsOverridable);
 
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 9e27b9af3082..38cf0033e8c9 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -47,7 +47,7 @@
 #include "nsWindow.h"
 #include "nsGTKToolkit.h"
 #include "nsIDeviceContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIRollupListener.h"
 #include "nsIMenuRollup.h"
 #include "nsIDOMNode.h"
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 5a2a4117c971..879ef35e0421 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -74,7 +74,7 @@
 #ifdef MOZ_X11
 #include "gfxXlibSurface.h"
 #endif
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 
 nsNativeThemeQt::nsNativeThemeQt()
 {
@@ -123,7 +123,7 @@ _qimage_from_gfximage_format (gfxASurface::gfxImageFormat aFormat)
 }
 
 NS_IMETHODIMP
-nsNativeThemeQt::DrawWidgetBackground(nsIRenderingContext* aContext,
+nsNativeThemeQt::DrawWidgetBackground(nsRenderingContext* aContext,
                                       nsIFrame* aFrame,
                                       PRUint8 aWidgetType,
                                       const nsRect& aRect,
@@ -172,7 +172,7 @@ nsNativeThemeQt::DrawWidgetBackground(nsIRenderingContext* aContext,
 
 nsresult
 nsNativeThemeQt::DrawWidgetBackground(QPainter *qPainter,
-                                      nsIRenderingContext* aContext,
+                                      nsRenderingContext* aContext,
                                       nsIFrame* aFrame,
                                       PRUint8 aWidgetType,
                                       const nsRect& aRect,
@@ -386,7 +386,7 @@ nsNativeThemeQt::GetWidgetPadding(nsIDeviceContext* ,
 }
 
 NS_IMETHODIMP
-nsNativeThemeQt::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+nsNativeThemeQt::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                       PRUint8 aWidgetType,
                                       nsIntSize* aResult, PRBool* aIsOverridable)
 {
diff --git a/widget/src/qt/nsNativeThemeQt.h b/widget/src/qt/nsNativeThemeQt.h
index f22ffffd1dd5..ca2cb46f593f 100644
--- a/widget/src/qt/nsNativeThemeQt.h
+++ b/widget/src/qt/nsNativeThemeQt.h
@@ -62,7 +62,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // The nsITheme interface.
-  NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
+  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
@@ -73,7 +73,7 @@ public:
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
 
-  NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+  NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntSize* aResult,
                                   PRBool* aIsOverridable);
@@ -105,13 +105,13 @@ public:
 private:
 
   inline nsresult DrawWidgetBackground(QPainter *qPainter,
-                                       nsIRenderingContext* aContext,
+                                       nsRenderingContext* aContext,
                                        nsIFrame* aFrame,
                                        PRUint8 aWidgetType,
                                        const nsRect& aRect,
                                        const nsRect& aClipRect);
 
-  inline PRInt32 GetAppUnitsPerDevPixel(nsIRenderingContext* aContext){
+  inline PRInt32 GetAppUnitsPerDevPixel(nsRenderingContext* aContext){
     nsCOMPtr<nsIDeviceContext> dctx = aContext->GetDeviceContext();
     return dctx->AppUnitsPerDevPixel();
   }
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index 723be50cd3a9..b8d14b618906 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -96,7 +96,7 @@ using namespace QtMobility;
 #include "nsToolkit.h"
 #include "nsIDeviceContext.h"
 #include "nsIdleService.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
 #include "nsIMenuRollup.h"
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 9247fc2dd242..6d84161b7c42 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -41,7 +41,7 @@
 
 #include <windows.h>
 #include "nsNativeThemeWin.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsRect.h"
 #include "nsSize.h"
@@ -1197,7 +1197,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
 }
 
 NS_IMETHODIMP
-nsNativeThemeWin::DrawWidgetBackground(nsIRenderingContext* aContext,
+nsNativeThemeWin::DrawWidgetBackground(nsRenderingContext* aContext,
                                        nsIFrame* aFrame,
                                        PRUint8 aWidgetType,
                                        const nsRect& aRect,
@@ -1847,7 +1847,7 @@ nsNativeThemeWin::GetWidgetOverflow(nsIDeviceContext* aContext,
 }
 
 NS_IMETHODIMP
-nsNativeThemeWin::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                        PRUint8 aWidgetType,
                                        nsIntSize* aResult, PRBool* aIsOverridable)
 {
@@ -2427,7 +2427,7 @@ nsNativeThemeWin::ClassicGetWidgetBorder(nsIDeviceContext* aContext,
 }
 
 nsresult
-nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                        PRUint8 aWidgetType,
                                        nsIntSize* aResult, PRBool* aIsOverridable)
 {
@@ -3101,7 +3101,7 @@ void nsNativeThemeWin::DrawCheckedRect(HDC hdc, const RECT& rc, PRInt32 fore, PR
   }
 }
 
-nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsIRenderingContext* aContext,
+nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
diff --git a/widget/src/windows/nsNativeThemeWin.h b/widget/src/windows/nsNativeThemeWin.h
index 25fc44400d7b..916f06484e71 100644
--- a/widget/src/windows/nsNativeThemeWin.h
+++ b/widget/src/windows/nsNativeThemeWin.h
@@ -52,7 +52,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // The nsITheme interface.
-  NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
+  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
@@ -73,7 +73,7 @@ public:
                                    PRUint8 aWidgetType,
                                    nsRect* aOverflowRect);
 
-  NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+  NS_IMETHOD GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntSize* aResult,
                                   PRBool* aIsOverridable);
@@ -104,7 +104,7 @@ protected:
                                 PRInt32& aPart, PRInt32& aState);
   nsresult ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
                                    PRInt32& aPart, PRInt32& aState, PRBool& aFocused);
-  nsresult ClassicDrawWidgetBackground(nsIRenderingContext* aContext,
+  nsresult ClassicDrawWidgetBackground(nsRenderingContext* aContext,
                                   nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   const nsRect& aRect,
@@ -114,7 +114,7 @@ protected:
                              PRUint8 aWidgetType,
                              nsIntMargin* aResult);
 
-  nsresult ClassicGetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
+  nsresult ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aFrame,
                                   PRUint8 aWidgetType,
                                   nsIntSize* aResult,
                                   PRBool* aIsOverridable);
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index af1a2486dd06..7dc8c917910d 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -64,7 +64,7 @@ using mozilla::plugins::PluginInstanceParent;
 #include "gfxWindowsPlatform.h"
 #include "nsGfxCIID.h"
 #include "gfxContext.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "prmem.h"
 
diff --git a/widget/src/xpwidgets/nsBaseDragService.h b/widget/src/xpwidgets/nsBaseDragService.h
index f334794a563f..f8584c128a38 100644
--- a/widget/src/xpwidgets/nsBaseDragService.h
+++ b/widget/src/xpwidgets/nsBaseDragService.h
@@ -44,7 +44,7 @@
 #include "nsISupportsArray.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
-#include "nsIRenderingContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDOMDataTransfer.h"
 
 #include "gfxImageSurface.h"

From 4e540ce52fa7f541c3e910497a3ab4b3b7a57278 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 142/509] Bug 266236 part 4: Aggressively prune unused methods
 and dead #ifdefs from nsRenderingContext.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : b2911406bbe1b5995d1a501c59e02b5fffefa390
---
 gfx/src/nsRenderingContext.cpp                | 664 +-----------------
 gfx/src/nsRenderingContext.h                  | 330 ++-------
 gfx/src/nsThebesFontMetrics.cpp               |   4 +-
 layout/generic/nsHTMLReflowMetrics.h          |  38 +-
 layout/generic/nsImageFrame.cpp               |   6 +-
 layout/generic/nsObjectFrame.cpp              |  17 +-
 layout/mathml/nsMathMLChar.cpp                |   2 +-
 layout/mathml/nsMathMLContainerFrame.cpp      |   4 +-
 layout/mathml/nsMathMLForeignFrameWrapper.cpp |   2 +-
 layout/mathml/nsMathMLTokenFrame.cpp          |   4 +-
 layout/mathml/nsMathMLmactionFrame.cpp        |   4 +-
 layout/mathml/nsMathMLmfencedFrame.cpp        |  12 +-
 layout/mathml/nsMathMLmoFrame.cpp             |   2 +-
 layout/mathml/nsMathMLmspaceFrame.cpp         |   2 +-
 layout/mathml/nsMathMLmtableFrame.cpp         |   2 +-
 15 files changed, 145 insertions(+), 948 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 3cb776297425..bfafbf31665c 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -38,27 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsRenderingContext.h"
-#include "nsThebesDeviceContext.h"
-
-#include "nsString.h"
-#include "nsTransform2D.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsGfxCIID.h"
-
-#include "nsThebesRegion.h"
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "gfxPlatform.h"
-
-#ifdef XP_WIN
-#include "gfxWindowsSurface.h"
-#include "cairo-win32.h"
-#endif
 
 // XXXTodo: rename FORM_TWIPS to FROM_APPUNITS
 #define FROM_TWIPS(_x)  ((gfxFloat)((_x)/(mP2A)))
@@ -69,14 +48,8 @@
 // Hard limit substring lengths to 8000 characters ... this lets us statically
 // size the cluster buffer array in FindSafeLength
 #define MAX_GFX_TEXT_BUF_SIZE 8000
-static PRInt32 GetMaxChunkLength(nsRenderingContext* aContext)
-{
-    PRInt32 len = aContext->GetMaxStringLength();
-    return PR_MIN(len, MAX_GFX_TEXT_BUF_SIZE);
-}
 
-static PRInt32 FindSafeLength(nsRenderingContext* aContext,
-                              const PRUnichar *aString, PRUint32 aLength,
+static PRInt32 FindSafeLength(const PRUnichar *aString, PRUint32 aLength,
                               PRUint32 aMaxChunkLength)
 {
     if (aLength <= aMaxChunkLength)
@@ -99,8 +72,7 @@ static PRInt32 FindSafeLength(nsRenderingContext* aContext,
     return len;
 }
 
-static PRInt32 FindSafeLength(nsRenderingContext* aContext,
-                              const char *aString, PRUint32 aLength,
+static PRInt32 FindSafeLength(const char *aString, PRUint32 aLength,
                               PRUint32 aMaxChunkLength)
 {
     // Since it's ASCII, we don't need to worry about clusters or RTL
@@ -111,57 +83,20 @@ static PRInt32 FindSafeLength(nsRenderingContext* aContext,
 //// nsRenderingContext
 
 nsresult
-nsRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesSurface)
+nsRenderingContext::Init(nsIDeviceContext* aContext,
+                         gfxASurface *aThebesSurface)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesSurface %p\n", this, aContext, aThebesSurface));
-
-    mDeviceContext = aContext;
-    mWidget = nsnull;
-
-    mThebes = new gfxContext(aThebesSurface);
-
-    return (CommonInit());
+    return Init(aContext, new gfxContext(aThebesSurface));
 }
 
 nsresult
-nsRenderingContext::Init(nsIDeviceContext* aContext, gfxContext *aThebesContext)
+nsRenderingContext::Init(nsIDeviceContext* aContext,
+                         gfxContext *aThebesContext)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesContext %p\n", this, aContext, aThebesContext));
-
     mDeviceContext = aContext;
-    mWidget = nsnull;
-
     mThebes = aThebesContext;
 
-    return (CommonInit());
-}
-
-nsresult
-nsRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p widget %p\n", this, aContext, aWidget));
-
-    mDeviceContext = aContext;
-    mWidget = aWidget;
-
-    mThebes = new gfxContext(aWidget->GetThebesSurface());
-
-    //mThebes->SetColor(gfxRGBA(0.9, 0.0, 0.0, 0.3));
-    //mThebes->Paint();
-
-    //mThebes->Translate(gfxPoint(300,0));
-    //mThebes->Rotate(M_PI/4);
-
-    return (CommonInit());
-}
-
-nsresult
-nsRenderingContext::CommonInit(void)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::CommonInit\n", this));
-
     mThebes->SetLineWidth(1.0);
-
     mP2A = mDeviceContext->AppUnitsPerDevPixel();
 
     return NS_OK;
@@ -174,43 +109,9 @@ nsRenderingContext::GetDeviceContext()
     return mDeviceContext.get();
 }
 
-nsresult
-nsRenderingContext::PushTranslation(PushedTranslation* aState)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PushTranslation\n", this));
-
-    // XXX this is slow!
-    PushState();
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::PopTranslation(PushedTranslation* aState)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopTranslation\n", this));
-
-    // XXX this is slow!
-    PopState();
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::SetTranslation(const nsPoint& aPt)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetTranslation %d %d\n", this, aPt.x, aPt.y));
-
-    gfxMatrix newMat(mThebes->CurrentMatrix());
-    newMat.x0 = aPt.x;
-    newMat.y0 = aPt.y;
-    mThebes->SetMatrix(newMat);
-    return NS_OK;
-}
-
 nsresult
 nsRenderingContext::PushState()
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PushState\n", this));
-
     mThebes->Save();
     return NS_OK;
 }
@@ -218,8 +119,6 @@ nsRenderingContext::PushState()
 nsresult
 nsRenderingContext::PopState()
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopState\n", this));
-
     mThebes->Restore();
     return NS_OK;
 }
@@ -231,9 +130,6 @@ nsRenderingContext::PopState()
 nsresult
 nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
 {
-    //return NS_OK;
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetClipRect [%d,%d,%d,%d] %d\n", this, aRect.x, aRect.y, aRect.width, aRect.height, aCombine));
-
     if (aCombine == nsClipCombine_kReplace) {
         mThebes->ResetClip();
     } else if (aCombine != nsClipCombine_kIntersect) {
@@ -293,7 +189,6 @@ nsRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
 nsresult
 nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetLineStyle %d\n", this, aLineStyle));
     switch (aLineStyle) {
         case nsLineStyle_kSolid:
             mThebes->SetDash(gfxContext::gfxLineSolid);
@@ -310,8 +205,6 @@ nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
             NS_ERROR("SetLineStyle: Invalid line style");
             break;
     }
-
-    mLineStyle = aLineStyle;
     return NS_OK;
 }
 
@@ -319,27 +212,16 @@ nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
 nsresult
 nsRenderingContext::SetColor(nscolor aColor)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetColor 0x%08x\n", this, aColor));
-    /* This sets the color assuming the sRGB color space, since that's what all
-     * CSS colors are defined to be in by the spec.
+    /* This sets the color assuming the sRGB color space, since that's
+     * what all CSS colors are defined to be in by the spec.
      */
     mThebes->SetColor(gfxRGBA(aColor));
-
-    mColor = aColor;
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::GetColor(nscolor &aColor) const
-{
-    aColor = mColor;
     return NS_OK;
 }
 
 nsresult
 nsRenderingContext::Translate(const nsPoint& aPt)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Translate %d %d\n", this, aPt.x, aPt.y));
     mThebes->Translate (gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
     return NS_OK;
 }
@@ -347,71 +229,10 @@ nsRenderingContext::Translate(const nsPoint& aPt)
 nsresult
 nsRenderingContext::Scale(float aSx, float aSy)
 {
-    // as far as I can tell, noone actually calls this
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Scale %f %f\n", this, aSx, aSy));
     mThebes->Scale (aSx, aSy);
     return NS_OK;
 }
 
-void
-nsRenderingContext::UpdateTempTransformMatrix()
-{
-    //PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::UpdateTempTransformMatrix\n", this));
-
-    /*****
-     * Thebes matrix layout:   gfx matrix layout:
-     * | xx yx 0 |            | m00 m01  0 |
-     * | xy yy 0 |            | m10 m11  0 |
-     * | x0 y0 1 |            | m20 m21  1 |
-     *****/
-
-    const gfxMatrix& ctm = mThebes->CurrentMatrix();
-    NS_ASSERTION(ctm.yx == 0 && ctm.xy == 0, "Can't represent Thebes matrix to Gfx");
-    mTempTransform.SetToTranslate(TO_TWIPS(ctm.x0), TO_TWIPS(ctm.y0));
-    mTempTransform.AddScale(ctm.xx, ctm.yy);
-}
-
-nsTransform2D&
-nsRenderingContext::CurrentTransform()
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::CurrentTransform\n", this));
-    UpdateTempTransformMatrix();
-    return mTempTransform;
-}
-
-/****
- **** XXXXXX
- ****
- **** On other gfx implementations, the transform returned by this
- **** has a built in twips to pixels ratio.  That is, you pass in
- **** twips to any nsTransform2D TransformCoord method, and you
- **** get back pixels.  This makes no sense.  We don't do this.
- **** This in turn breaks SVG and <object>; those should just be
- **** fixed to not use this!
- ****/
-
-nsTransform2D*
-nsRenderingContext::GetCurrentTransform()
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
-           ("## %p nsTRC::GetCurrentTransform\n", this));
-    UpdateTempTransformMatrix();
-    return &mTempTransform;
-}
-
-void
-nsRenderingContext::TransformCoord (nscoord *aX, nscoord *aY)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::TransformCoord\n", this));
-
-    gfxPoint pt(FROM_TWIPS(*aX), FROM_TWIPS(*aY));
-
-    pt = mThebes->UserToDevice (pt);
-
-    *aX = TO_TWIPS(pt.x);
-    *aY = TO_TWIPS(pt.y);
-}
-
 nsresult
 nsRenderingContext::DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt)
 {
@@ -422,9 +243,6 @@ nsresult
 nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
                              nscoord aX1, nscoord aY1)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
-           ("## %p nsTRC::DrawLine %d %d %d %d\n", this, aX0, aY0, aX1, aY1));
-
     gfxPoint p0 = gfxPoint(FROM_TWIPS(aX0), FROM_TWIPS(aY0));
     gfxPoint p1 = gfxPoint(FROM_TWIPS(aX1), FROM_TWIPS(aY1));
 
@@ -468,8 +286,6 @@ nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
 nsresult
 nsRenderingContext::DrawRect(const nsRect& aRect)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::DrawRect [%d,%d,%d,%d]\n", this, aRect.x, aRect.y, aRect.width, aRect.height));
-
     mThebes->NewPath();
     mThebes->Rectangle(GFX_RECT_FROM_TWIPS_RECT(aRect), PR_TRUE);
     mThebes->Stroke();
@@ -550,8 +366,6 @@ ConditionRect(gfxRect& r) {
 nsresult
 nsRenderingContext::FillRect(const nsRect& aRect)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillRect [%d,%d,%d,%d]\n", this, aRect.x, aRect.y, aRect.width, aRect.height));
-
     gfxRect r(GFX_RECT_FROM_TWIPS_RECT(aRect));
 
     /* Clamp coordinates to work around a design bug in cairo */
@@ -573,8 +387,6 @@ nsRenderingContext::FillRect(const nsRect& aRect)
         mThebes->IdentityMatrix();
         mThebes->NewPath();
 
-        PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillRect conditioned to [%f,%f,%f,%f]\n", this, r.pos.x, r.pos.y, r.size.width, r.size.height));
-
         mThebes->Rectangle(r, PR_TRUE);
         mThebes->Fill();
         mThebes->SetMatrix(mat);
@@ -582,8 +394,6 @@ nsRenderingContext::FillRect(const nsRect& aRect)
         return NS_OK;
     }
 
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillRect raw [%f,%f,%f,%f]\n", this, r.pos.x, r.pos.y, r.size.width, r.size.height));
-
     mThebes->NewPath();
     mThebes->Rectangle(r, PR_TRUE);
     mThebes->Fill();
@@ -628,8 +438,6 @@ nsresult
 nsRenderingContext::DrawEllipse(nscoord aX, nscoord aY,
                                 nscoord aWidth, nscoord aHeight)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::DrawEllipse [%d,%d,%d,%d]\n", this, aX, aY, aWidth, aHeight));
-
     mThebes->NewPath();
     mThebes->Ellipse(gfxPoint(FROM_TWIPS(aX) + FROM_TWIPS(aWidth)/2.0,
                               FROM_TWIPS(aY) + FROM_TWIPS(aHeight)/2.0),
@@ -650,8 +458,6 @@ nsresult
 nsRenderingContext::FillEllipse(nscoord aX, nscoord aY,
                                 nscoord aWidth, nscoord aHeight)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillEllipse [%d,%d,%d,%d]\n", this, aX, aY, aWidth, aHeight));
-
     mThebes->NewPath();
     mThebes->Ellipse(gfxPoint(FROM_TWIPS(aX) + FROM_TWIPS(aWidth)/2.0,
                               FROM_TWIPS(aY) + FROM_TWIPS(aHeight)/2.0),
@@ -665,8 +471,6 @@ nsRenderingContext::FillEllipse(nscoord aX, nscoord aY,
 nsresult
 nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::FillPolygon %d\n", this, aNumPoints));
-
     if (aNumPoints == 0)
         return NS_OK;
 
@@ -687,98 +491,14 @@ nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
     return NS_OK;
 }
 
-void*
-nsRenderingContext::GetNativeGraphicData(GraphicDataType aType)
-{
-    if (aType == NATIVE_GDK_DRAWABLE)
-    {
-        if (mWidget)
-            return mWidget->GetNativeData(NS_NATIVE_WIDGET);
-    }
-    if (aType == NATIVE_THEBES_CONTEXT)
-        return mThebes;
-    if (aType == NATIVE_CAIRO_CONTEXT)
-        return mThebes->GetCairo();
-#ifdef XP_WIN
-    if (aType == NATIVE_WINDOWS_DC) {
-        nsRefPtr<gfxASurface> surf(mThebes->CurrentSurface());
-        if (!surf || surf->CairoStatus())
-            return nsnull;
-        return static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()))->GetDC();
-    }
-#endif
-#ifdef XP_OS2
-    if (aType == NATIVE_OS2_PS) {
-        nsRefPtr<gfxASurface> surf(mThebes->CurrentSurface());
-        if (!surf || surf->CairoStatus())
-            return nsnull;
-        return (void*)(static_cast<gfxOS2Surface*>(static_cast<gfxASurface*>(surf.get()))->GetPS());
-    }
-#endif
+// text
 
-    return nsnull;
-}
-
-nsresult
-nsRenderingContext::PushFilter(const nsRect& twRect, PRBool aAreaIsOpaque,
-                               float aOpacity)
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG,
-           ("## %p nsTRC::PushFilter [%d,%d,%d,%d] isOpaque: %d opacity: %f\n",
-            this, twRect.x, twRect.y, twRect.width, twRect.height,
-            aAreaIsOpaque, aOpacity));
-
-    mOpacityArray.AppendElement(aOpacity);
-
-    mThebes->Save();
-    mThebes->Clip(GFX_RECT_FROM_TWIPS_RECT(twRect));
-    mThebes->PushGroup(gfxASurface::CONTENT_COLOR_ALPHA);
-
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::PopFilter()
-{
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::PopFilter\n"));
-
-    if (mOpacityArray.Length() > 0) {
-        float f = mOpacityArray[mOpacityArray.Length()-1];
-        mOpacityArray.RemoveElementAt(mOpacityArray.Length()-1);
-
-        mThebes->PopGroupToSource();
-
-        if (f < 0.0) {
-            mThebes->SetOperator(gfxContext::OPERATOR_SOURCE);
-            mThebes->Paint();
-        } else {
-            mThebes->SetOperator(gfxContext::OPERATOR_OVER);
-            mThebes->Paint(f);
-        }
-
-        mThebes->Restore();
-    }
-
-
-    return NS_OK;
-}
-
-//
-// text junk
-//
 nsresult
 nsRenderingContext::SetRightToLeftText(PRBool aIsRTL)
 {
     return mFontMetrics->SetRightToLeftText(aIsRTL);
 }
 
-nsresult
-nsRenderingContext::GetRightToLeftText(PRBool* aIsRTL)
-{
-    *aIsRTL = mFontMetrics->GetRightToLeftText();
-    return NS_OK;
-}
-
 void
 nsRenderingContext::SetTextRunRTL(PRBool aIsRTL)
 {
@@ -789,8 +509,6 @@ nsresult
 nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
                             gfxUserFontSet *aUserFontSet)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont %p\n", this, &aFont));
-
     nsCOMPtr<nsIFontMetrics> newMetrics;
     mDeviceContext->GetMetricsFor(aFont, aLanguage, aUserFontSet,
                                   *getter_AddRefs(newMetrics));
@@ -802,8 +520,6 @@ nsresult
 nsRenderingContext::SetFont(const nsFont& aFont,
                             gfxUserFontSet *aUserFontSet)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont %p\n", this, &aFont));
-
     nsCOMPtr<nsIFontMetrics> newMetrics;
     mDeviceContext->GetMetricsFor(aFont, nsnull, aUserFontSet,
                                   *getter_AddRefs(newMetrics));
@@ -814,8 +530,6 @@ nsRenderingContext::SetFont(const nsFont& aFont,
 nsresult
 nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 {
-    PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont[Metrics] %p\n", this, aFontMetrics));
-
     mFontMetrics = static_cast<nsIThebesFontMetrics*>(aFontMetrics);
     return NS_OK;
 }
@@ -828,11 +542,11 @@ nsRenderingContext::GetFontMetrics()
 }
 
 PRInt32
-nsRenderingContext::GetMaxStringLength()
+nsRenderingContext::GetMaxChunkLength()
 {
     if (!mFontMetrics)
         return 1;
-    return mFontMetrics->GetMaxStringLength();
+    return PR_MIN(mFontMetrics->GetMaxStringLength(), MAX_GFX_TEXT_BUF_SIZE);
 }
 
 nsresult
@@ -876,10 +590,10 @@ nsRenderingContext::GetWidth(const char* aString,
                              PRUint32 aLength,
                              nscoord& aWidth)
 {
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
+    PRUint32 maxChunkLength = GetMaxChunkLength();
     aWidth = 0;
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
+        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
         nscoord width;
         nsresult rv = GetWidthInternal(aString, len, width);
         if (NS_FAILED(rv))
@@ -897,7 +611,7 @@ nsRenderingContext::GetWidth(const PRUnichar *aString,
                              nscoord &aWidth,
                              PRInt32 *aFontID)
 {
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
+    PRUint32 maxChunkLength = GetMaxChunkLength();
     aWidth = 0;
 
     if (aFontID) {
@@ -905,7 +619,7 @@ nsRenderingContext::GetWidth(const PRUnichar *aString,
     }
 
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
+        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
         nscoord width;
         nsresult rv = GetWidthInternal(aString, len, width);
         if (NS_FAILED(rv))
@@ -917,228 +631,17 @@ nsRenderingContext::GetWidth(const PRUnichar *aString,
     return NS_OK;
 }
 
-nsresult
-nsRenderingContext::GetTextDimensions(const char* aString,
-                                      PRUint32 aLength,
-                                      nsTextDimensions& aDimensions)
-{
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
-    if (aLength <= maxChunkLength)
-        return GetTextDimensionsInternal(aString, aLength, aDimensions);
-
-    PRBool firstIteration = PR_TRUE;
-    while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
-        nsTextDimensions dimensions;
-        nsresult rv = GetTextDimensionsInternal(aString, len, dimensions);
-        if (NS_FAILED(rv))
-            return rv;
-        if (firstIteration) {
-            // Instead of combining with a Clear()ed nsTextDimensions, we
-            // assign directly in the first iteration. This ensures that
-            // negative ascent/ descent can be returned.
-            aDimensions = dimensions;
-        } else {
-            aDimensions.Combine(dimensions);
-        }
-        aLength -= len;
-        aString += len;
-        firstIteration = PR_FALSE;
-    }
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::GetTextDimensions(const PRUnichar* aString,
-                                      PRUint32 aLength,
-                                      nsTextDimensions& aDimensions,
-                                      PRInt32* aFontID)
-{
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
-    if (aLength <= maxChunkLength)
-        return GetTextDimensionsInternal(aString, aLength, aDimensions);
-
-    if (aFontID) {
-        *aFontID = nsnull;
-    }
-
-    PRBool firstIteration = PR_TRUE;
-    while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
-        nsTextDimensions dimensions;
-        nsresult rv = GetTextDimensionsInternal(aString, len, dimensions);
-        if (NS_FAILED(rv))
-            return rv;
-        if (firstIteration) {
-            // Instead of combining with a Clear()ed nsTextDimensions, we
-            // assign directly in the first iteration. This ensures that
-            // negative ascent/ descent can be returned.
-            aDimensions = dimensions;
-        } else {
-            aDimensions.Combine(dimensions);
-        }
-        aLength -= len;
-        aString += len;
-        firstIteration = PR_FALSE;
-    }
-    return NS_OK;
-}
-
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
-nsresult
-nsRenderingContext::GetTextDimensions(const char*       aString,
-                                      PRInt32           aLength,
-                                      PRInt32           aAvailWidth,
-                                      PRInt32*          aBreaks,
-                                      PRInt32           aNumBreaks,
-                                      nsTextDimensions& aDimensions,
-                                      PRInt32&          aNumCharsFit,
-                                      nsTextDimensions& aLastWordDimensions,
-                                      PRInt32*          aFontID)
-{
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
-    if (aLength <= PRInt32(maxChunkLength))
-        return GetTextDimensionsInternal(aString, aLength, aAvailWidth, aBreaks, aNumBreaks,
-                                         aDimensions, aNumCharsFit, aLastWordDimensions, aFontID);
-
-    if (aFontID) {
-        *aFontID = 0;
-    }
-
-    // Do a naive implementation based on 3-arg GetTextDimensions
-    PRInt32 x = 0;
-    PRInt32 wordCount;
-    for (wordCount = 0; wordCount < aNumBreaks; ++wordCount) {
-        PRInt32 lastBreak = wordCount > 0 ? aBreaks[wordCount - 1] : 0;
-        nsTextDimensions dimensions;
-
-        NS_ASSERTION(aBreaks[wordCount] > lastBreak, "Breaks must be monotonically increasing");
-        NS_ASSERTION(aBreaks[wordCount] <= aLength, "Breaks can't exceed string length");
-
-         // Call safe method
-
-        nsresult rv =
-            GetTextDimensions(aString + lastBreak, aBreaks[wordCount] - lastBreak,
-                            dimensions);
-        if (NS_FAILED(rv))
-            return rv;
-        x += dimensions.width;
-        // The first word always "fits"
-        if (x > aAvailWidth && wordCount > 0)
-            break;
-        // aDimensions ascent/descent should exclude the last word (unless there
-        // is only one word) so we let it run one word behind
-        if (wordCount == 0) {
-            aDimensions = dimensions;
-        } else {
-            aDimensions.Combine(aLastWordDimensions);
-        }
-        aNumCharsFit = aBreaks[wordCount];
-        aLastWordDimensions = dimensions;
-    }
-    // aDimensions width should include all the text
-    aDimensions.width = x;
-    return NS_OK;
-}
-
-nsresult
-nsRenderingContext::GetTextDimensions(const PRUnichar*  aString,
-                                      PRInt32           aLength,
-                                      PRInt32           aAvailWidth,
-                                      PRInt32*          aBreaks,
-                                      PRInt32           aNumBreaks,
-                                      nsTextDimensions& aDimensions,
-                                      PRInt32&          aNumCharsFit,
-                                      nsTextDimensions& aLastWordDimensions,
-                                      PRInt32*          aFontID)
-{
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
-    if (aLength <= PRInt32(maxChunkLength))
-        return GetTextDimensionsInternal(aString, aLength, aAvailWidth, aBreaks, aNumBreaks,
-                                     aDimensions, aNumCharsFit, aLastWordDimensions, aFontID);
-
-    if (aFontID) {
-        *aFontID = 0;
-    }
-
-    // Do a naive implementation based on 3-arg GetTextDimensions
-    PRInt32 x = 0;
-    PRInt32 wordCount;
-    for (wordCount = 0; wordCount < aNumBreaks; ++wordCount) {
-        PRInt32 lastBreak = wordCount > 0 ? aBreaks[wordCount - 1] : 0;
-
-        NS_ASSERTION(aBreaks[wordCount] > lastBreak, "Breaks must be monotonically increasing");
-        NS_ASSERTION(aBreaks[wordCount] <= aLength, "Breaks can't exceed string length");
-
-        nsTextDimensions dimensions;
-        // Call safe method
-        nsresult rv =
-            GetTextDimensions(aString + lastBreak, aBreaks[wordCount] - lastBreak,
-                        dimensions);
-        if (NS_FAILED(rv))
-            return rv;
-        x += dimensions.width;
-        // The first word always "fits"
-        if (x > aAvailWidth && wordCount > 0)
-            break;
-        // aDimensions ascent/descent should exclude the last word (unless there
-        // is only one word) so we let it run one word behind
-        if (wordCount == 0) {
-            aDimensions = dimensions;
-        } else {
-            aDimensions.Combine(aLastWordDimensions);
-        }
-        aNumCharsFit = aBreaks[wordCount];
-        aLastWordDimensions = dimensions;
-    }
-    // aDimensions width should include all the text
-    aDimensions.width = x;
-    return NS_OK;
-}
-#endif
-
 #ifdef MOZ_MATHML
-nsresult
-nsRenderingContext::GetBoundingMetrics(const char*        aString,
-                                       PRUint32           aLength,
-                                       nsBoundingMetrics& aBoundingMetrics)
-{
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
-    if (aLength <= maxChunkLength)
-        return GetBoundingMetricsInternal(aString, aLength, aBoundingMetrics);
-
-    PRBool firstIteration = PR_TRUE;
-    while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
-        nsBoundingMetrics metrics;
-        nsresult rv = GetBoundingMetricsInternal(aString, len, metrics);
-        if (NS_FAILED(rv))
-            return rv;
-        if (firstIteration) {
-            // Instead of combining with a Clear()ed nsBoundingMetrics, we
-            // assign directly in the first iteration. This ensures that
-            // negative ascent/ descent can be returned and the left bearing
-            // is properly initialized.
-            aBoundingMetrics = metrics;
-        } else {
-            aBoundingMetrics += metrics;
-        }
-        aLength -= len;
-        aString += len;
-        firstIteration = PR_FALSE;
-    }
-    return NS_OK;
-}
-
 nsresult
 nsRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
                                        PRUint32           aLength,
                                        nsBoundingMetrics& aBoundingMetrics,
                                        PRInt32*           aFontID)
 {
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
+    PRUint32 maxChunkLength = GetMaxChunkLength();
     if (aLength <= maxChunkLength)
-        return GetBoundingMetricsInternal(aString, aLength, aBoundingMetrics, aFontID);
+        return GetBoundingMetricsInternal(aString, aLength, aBoundingMetrics,
+                                          aFontID);
 
     if (aFontID) {
         *aFontID = 0;
@@ -1146,7 +649,7 @@ nsRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
 
     PRBool firstIteration = PR_TRUE;
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
+        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
         nsBoundingMetrics metrics;
         nsresult rv = GetBoundingMetricsInternal(aString, len, metrics);
         if (NS_FAILED(rv))
@@ -1173,9 +676,9 @@ nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
                                nscoord aX, nscoord aY,
                                const nscoord* aSpacing)
 {
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
+    PRUint32 maxChunkLength = GetMaxChunkLength();
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
+        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
         nsresult rv = DrawStringInternal(aString, len, aX, aY);
         if (NS_FAILED(rv))
             return rv;
@@ -1199,13 +702,12 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
                                PRInt32 aFontID,
                                const nscoord* aSpacing)
 {
-    PRUint32 maxChunkLength = GetMaxChunkLength(this);
+    PRUint32 maxChunkLength = GetMaxChunkLength();
     if (aLength <= maxChunkLength) {
         return DrawStringInternal(aString, aLength, aX, aY, aFontID, aSpacing);
     }
 
-    PRBool isRTL = PR_FALSE;
-    GetRightToLeftText(&isRTL);
+    PRBool isRTL = mFontMetrics->GetRightToLeftText();
 
     if (isRTL) {
         nscoord totalWidth = 0;
@@ -1222,7 +724,7 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
     }
 
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(this, aString, aLength, maxChunkLength);
+        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
         nscoord width = 0;
         if (aSpacing) {
             for (PRInt32 i = 0; i < len; ++i) {
@@ -1256,11 +758,6 @@ nsresult
 nsRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength,
                                      nscoord& aWidth)
 {
-#ifdef DISABLE_TEXT
-    aWidth = (8 * aLength);
-    return NS_OK;
-#endif
-
     if (aLength == 0) {
         aWidth = 0;
         return NS_OK;
@@ -1273,11 +770,6 @@ nsresult
 nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
                                      nscoord &aWidth, PRInt32 *aFontID)
 {
-#ifdef DISABLE_TEXT
-    aWidth = (8 * aLength);
-    return NS_OK;
-#endif
-
     if (aLength == 0) {
         aWidth = 0;
         return NS_OK;
@@ -1286,67 +778,7 @@ nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
     return mFontMetrics->GetWidth(aString, aLength, aWidth, aFontID, this);
 }
 
-nsresult
-nsRenderingContext::GetTextDimensionsInternal(const char* aString,
-                                              PRUint32 aLength,
-                                              nsTextDimensions& aDimensions)
-{
-    mFontMetrics->GetMaxAscent(aDimensions.ascent);
-    mFontMetrics->GetMaxDescent(aDimensions.descent);
-    return GetWidth(aString, aLength, aDimensions.width);
-}
-
-nsresult
-nsRenderingContext::GetTextDimensionsInternal(const PRUnichar* aString,
-                                              PRUint32 aLength,
-                                              nsTextDimensions& aDimensions,
-                                              PRInt32* aFontID)
-{
-    mFontMetrics->GetMaxAscent(aDimensions.ascent);
-    mFontMetrics->GetMaxDescent(aDimensions.descent);
-    return GetWidth(aString, aLength, aDimensions.width, aFontID);
-}
-
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11) || defined(XP_MACOSX) || defined (MOZ_DFB)
-nsresult
-nsRenderingContext::GetTextDimensionsInternal(const char*       aString,
-                                              PRInt32           aLength,
-                                              PRInt32           aAvailWidth,
-                                              PRInt32*          aBreaks,
-                                              PRInt32           aNumBreaks,
-                                              nsTextDimensions& aDimensions,
-                                              PRInt32&          aNumCharsFit,
-                                              nsTextDimensions& aLastWordDimensions,
-                                              PRInt32*          aFontID)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-nsRenderingContext::GetTextDimensionsInternal(const PRUnichar*  aString,
-                                              PRInt32           aLength,
-                                              PRInt32           aAvailWidth,
-                                              PRInt32*          aBreaks,
-                                              PRInt32           aNumBreaks,
-                                              nsTextDimensions& aDimensions,
-                                              PRInt32&          aNumCharsFit,
-                                              nsTextDimensions& aLastWordDimensions,
-                                              PRInt32*          aFontID)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif
-
 #ifdef MOZ_MATHML
-nsresult
-nsRenderingContext::GetBoundingMetricsInternal(const char*        aString,
-                                               PRUint32           aLength,
-                                               nsBoundingMetrics& aBoundingMetrics)
-{
-    return mFontMetrics->GetBoundingMetrics(aString, aLength, this,
-                                            aBoundingMetrics);
-}
-
 nsresult
 nsRenderingContext::GetBoundingMetricsInternal(const PRUnichar*   aString,
                                                PRUint32           aLength,
@@ -1363,12 +795,7 @@ nsRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLength,
                                        nscoord aX, nscoord aY,
                                        const nscoord* aSpacing)
 {
-#ifdef DISABLE_TEXT
-    return NS_OK;
-#endif
-
-    return mFontMetrics->DrawString(aString, aLength, aX, aY, aSpacing,
-                                    this);
+    return mFontMetrics->DrawString(aString, aLength, aX, aY, aSpacing, this);
 }
 
 nsresult
@@ -1378,45 +805,6 @@ nsRenderingContext::DrawStringInternal(const PRUnichar *aString,
                                        PRInt32 aFontID,
                                        const nscoord* aSpacing)
 {
-#ifdef DISABLE_TEXT
-    return NS_OK;
-#endif
-
     return mFontMetrics->DrawString(aString, aLength, aX, aY, aFontID,
                                     aSpacing, this);
 }
-
-PRInt32
-nsRenderingContext::GetPosition(const PRUnichar *aText,
-                                PRUint32 aLength,
-                                nsPoint aPt)
-{
-    return -1;
-}
-
-nsresult
-nsRenderingContext::GetRangeWidth(const PRUnichar *aText,
-                                  PRUint32 aLength,
-                                  PRUint32 aStart,
-                                  PRUint32 aEnd,
-                                  PRUint32 &aWidth)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-nsRenderingContext::GetRangeWidth(const char *aText,
-                                  PRUint32 aLength,
-                                  PRUint32 aStart,
-                                  PRUint32 aEnd,
-                                  PRUint32 &aWidth)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-nsRenderingContext::RenderEPS(const nsRect& aRect, FILE *aDataFile)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index c39f2a78ae94..5a76698869df 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -40,17 +40,13 @@
 #define NSRENDERINGCONTEXT__H__
 
 #include "nsCOMPtr.h"
-#include "nsTArray.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIWidget.h"
+#include "nsIThebesFontMetrics.h"
+#include "nsIRegion.h"
 #include "nsPoint.h"
 #include "nsSize.h"
 #include "nsColor.h"
 #include "nsRect.h"
-#include "nsIRegion.h"
-#include "nsTransform2D.h"
-#include "nsIThebesFontMetrics.h"
 #include "gfxContext.h"
 
 typedef enum {
@@ -67,41 +63,6 @@ typedef enum {
     nsLineStyle_kDotted = 3
 } nsLineStyle;
 
-/* Struct used to represent the overall extent of a string
- * whose rendering may involve switching between different
- * fonts that have different metrics.
- */
-struct nsTextDimensions {
-    // max ascent amongst all the fonts needed to represent the string
-    nscoord ascent;
-
-    // max descent amongst all the fonts needed to represent the string
-    nscoord descent;
-
-    // width of the string
-    nscoord width;
-
-
-    nsTextDimensions()
-    {
-        Clear();
-    }
-
-    /* Set all member data to zero */
-    void
-    Clear() {
-        ascent = descent = width = 0;
-    }
-
-    /* Sum with another dimension */
-    void
-    Combine(const nsTextDimensions& aOther) {
-        if (ascent < aOther.ascent) ascent = aOther.ascent;
-        if (descent < aOther.descent) descent = aOther.descent;
-        width += aOther.width;
-    }
-};
-
 #ifdef MOZ_MATHML
 /* Struct used for accurate measurements of a string in order
  * to allow precise positioning when processing MathML.
@@ -147,30 +108,16 @@ struct nsBoundingMetrics {
        The _exact_ height of the string is therefore:
        ascent + descent */
 
-    //////////
-    // Metrics for placing other surrounding text:
-
     nscoord width;
     /* The horizontal distance from the origin of the drawing
        operation to the correct origin for drawing another string
        to follow the current one. Depending on the font, this
        could be greater than or less than the right bearing. */
 
-    nsBoundingMetrics() {
-        Clear();
-    }
+    nsBoundingMetrics() : leftBearing(0), rightBearing(0),
+                          ascent(0), descent(0), width(0)
+    {}
 
-    //////////
-    // Utility methods and operators:
-
-    /* Set all member data to zero */
-    void
-    Clear() {
-        leftBearing = rightBearing = 0;
-        ascent = descent = width = 0;
-    }
-
-    /* Append another bounding metrics */
     void
     operator += (const nsBoundingMetrics& bm) {
         if (ascent + descent == 0 && rightBearing - leftBearing == 0) {
@@ -194,73 +141,93 @@ struct nsBoundingMetrics {
 class nsRenderingContext
 {
 public:
-    nsRenderingContext()
-        : mP2A(0.), mLineStyle(nsLineStyle_kNone), mColor(NS_RGB(0,0,0))
-    {}
+    nsRenderingContext() : mP2A(0.) {}
     // ~nsRenderingContext() {}
 
     NS_INLINE_DECL_REFCOUNTING(nsRenderingContext)
 
-    /**
-     * Return the maximum length of a string that can be handled by
-     * the platform using the current font metrics.
-     */
-    PRInt32 GetMaxStringLength();
+    nsresult Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
+    nsresult Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
+
+    already_AddRefed<nsIDeviceContext> GetDeviceContext();
+    gfxContext *ThebesContext() { return mThebes; }
+
+    // Graphics state
+
+    nsresult PushState(void);
+    nsresult PopState(void);
+    nsresult SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
+    nsresult SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
+    nsresult SetLineStyle(nsLineStyle aLineStyle);
+    nsresult SetColor(nscolor aColor);
+    nsresult Translate(const nsPoint& aPt);
+    nsresult Scale(float aSx, float aSy);
+
+    class AutoPushTranslation {
+        nsRenderingContext* mCtx;
+    public:
+        AutoPushTranslation(nsRenderingContext* aCtx, const nsPoint& aPt)
+            : mCtx(aCtx) {
+            mCtx->PushState();
+            mCtx->Translate(aPt);
+        }
+        ~AutoPushTranslation() {
+            mCtx->PopState();
+        }
+    };
+
+    // Shapes
+
+    nsresult DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
+    nsresult DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+    nsresult DrawRect(const nsRect& aRect);
+    nsresult DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    nsresult DrawEllipse(nscoord aX, nscoord aY,
+                         nscoord aWidth, nscoord aHeight);
+    nsresult DrawEllipse(const nsRect& aRect);
+
+    nsresult FillRect(const nsRect& aRect);
+    nsresult FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    nsresult FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+    nsresult FillEllipse(const nsRect& aRect);
+    nsresult FillEllipse(nscoord aX, nscoord aY,
+                         nscoord aWidth, nscoord aHeight);
+
+    nsresult InvertRect(const nsRect& aRect);
+    nsresult InvertRect(nscoord aX, nscoord aY,
+                        nscoord aWidth, nscoord aHeight);
+
+    // Text
+
+    nsresult SetFont(const nsFont& aFont, nsIAtom* aLanguage,
+                     gfxUserFontSet *aUserFontSet);
+    nsresult SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
+    nsresult SetFont(nsIFontMetrics *aFontMetrics);
+    already_AddRefed<nsIFontMetrics> GetFontMetrics();
+    nsresult SetRightToLeftText(PRBool aIsRTL);
+    void SetTextRunRTL(PRBool aIsRTL);
 
-    // Safe string method variants: by default, these defer to the more
-    // elaborate methods below
     nsresult GetWidth(const nsString& aString, nscoord &aWidth,
                       PRInt32 *aFontID = nsnull);
     nsresult GetWidth(const char* aString, nscoord& aWidth);
-    nsresult DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                        PRInt32 aFontID = -1,
-                        const nscoord* aSpacing = nsnull);
-
-    // Safe string methods
     nsresult GetWidth(const char* aString, PRUint32 aLength,
                       nscoord& aWidth);
     nsresult GetWidth(const PRUnichar *aString, PRUint32 aLength,
                       nscoord &aWidth, PRInt32 *aFontID = nsnull);
     nsresult GetWidth(char aC, nscoord &aWidth);
-    nsresult GetWidth(PRUnichar aC, nscoord &aWidth,
-                      PRInt32 *aFontID);
+    nsresult GetWidth(PRUnichar aC, nscoord &aWidth, PRInt32 *aFontID = nsnull);
 
-    nsresult GetTextDimensions(const char* aString, PRUint32 aLength,
-                               nsTextDimensions& aDimensions);
-    nsresult GetTextDimensions(const PRUnichar* aString, PRUint32 aLength,
-                               nsTextDimensions& aDimensions,
-                               PRInt32* aFontID = nsnull);
-
-#if defined(_WIN32) || defined(XP_OS2) || defined(MOZ_X11)
-    nsresult GetTextDimensions(const char*       aString,
-                               PRInt32           aLength,
-                               PRInt32           aAvailWidth,
-                               PRInt32*          aBreaks,
-                               PRInt32           aNumBreaks,
-                               nsTextDimensions& aDimensions,
-                               PRInt32&          aNumCharsFit,
-                               nsTextDimensions& aLastWordDimensions,
-                               PRInt32*          aFontID = nsnull);
-
-    nsresult GetTextDimensions(const PRUnichar*  aString,
-                               PRInt32           aLength,
-                               PRInt32           aAvailWidth,
-                               PRInt32*          aBreaks,
-                               PRInt32           aNumBreaks,
-                               nsTextDimensions& aDimensions,
-                               PRInt32&          aNumCharsFit,
-                               nsTextDimensions& aLastWordDimensions,
-                               PRInt32*          aFontID = nsnull);
-#endif
 #ifdef MOZ_MATHML
-    nsresult GetBoundingMetrics(const char*        aString,
-                                PRUint32           aLength,
-                                nsBoundingMetrics& aBoundingMetrics);
     nsresult GetBoundingMetrics(const PRUnichar*   aString,
                                 PRUint32           aLength,
                                 nsBoundingMetrics& aBoundingMetrics,
                                 PRInt32*           aFontID = nsnull);
 #endif
+
+    nsresult DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID = -1,
+                        const nscoord* aSpacing = nsnull);
     nsresult DrawString(const char *aString, PRUint32 aLength,
                         nscoord aX, nscoord aY,
                         const nscoord* aSpacing = nsnull);
@@ -269,113 +236,9 @@ public:
                         PRInt32 aFontID = -1,
                         const nscoord* aSpacing = nsnull);
 
-    nsresult Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
-    nsresult Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
-    nsresult Init(nsIDeviceContext* aContext, nsIWidget *aWidget);
-    nsresult CommonInit(void);
-    already_AddRefed<nsIDeviceContext> GetDeviceContext();
-    nsresult PushState(void);
-    nsresult PopState(void);
-    nsresult SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
-    nsresult SetLineStyle(nsLineStyle aLineStyle);
-    nsresult SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
-    nsresult SetColor(nscolor aColor);
-    nsresult GetColor(nscolor &aColor) const;
-    nsresult SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                     gfxUserFontSet *aUserFontSet);
-    nsresult SetFont(const nsFont& aFont,
-                     gfxUserFontSet *aUserFontSet);
-    nsresult SetFont(nsIFontMetrics *aFontMetrics);
-    already_AddRefed<nsIFontMetrics> GetFontMetrics();
-    nsresult Translate(const nsPoint& aPt);
-    nsresult Scale(float aSx, float aSy);
-    nsTransform2D* GetCurrentTransform();
-
-    nsresult DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
-    nsresult DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
-    nsresult DrawRect(const nsRect& aRect);
-    nsresult DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    nsresult FillRect(const nsRect& aRect);
-    nsresult FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    nsresult InvertRect(const nsRect& aRect);
-    nsresult InvertRect(nscoord aX, nscoord aY,
-                        nscoord aWidth, nscoord aHeight);
-    nsresult FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
-    nsresult DrawEllipse(const nsRect& aRect);
-    nsresult DrawEllipse(nscoord aX, nscoord aY,
-                         nscoord aWidth, nscoord aHeight);
-    nsresult FillEllipse(const nsRect& aRect);
-    nsresult FillEllipse(nscoord aX, nscoord aY,
-                         nscoord aWidth, nscoord aHeight);
-
-    nsresult PushFilter(const nsRect& aRect,
-                        PRBool aAreaIsOpaque, float aOpacity);
-    nsresult PopFilter();
-
-    enum GraphicDataType {
-        NATIVE_CAIRO_CONTEXT = 1,
-        NATIVE_GDK_DRAWABLE = 2,
-        NATIVE_WINDOWS_DC = 3,
-        NATIVE_MAC_THING = 4,
-        NATIVE_THEBES_CONTEXT = 5,
-        NATIVE_OS2_PS = 6
-    };
-    void* GetNativeGraphicData(GraphicDataType aType);
-
-    struct PushedTranslation {
-        float mSavedX, mSavedY;
-    };
-    class AutoPushTranslation {
-        nsRenderingContext* mCtx;
-        PushedTranslation mPushed;
-    public:
-        AutoPushTranslation(nsRenderingContext* aCtx, const nsPoint& aPt)
-            : mCtx(aCtx) {
-            mCtx->PushTranslation(&mPushed);
-            mCtx->Translate(aPt);
-        }
-        ~AutoPushTranslation() {
-            mCtx->PopTranslation(&mPushed);
-        }
-    };
-
-    nsresult PushTranslation(PushedTranslation* aState);
-    nsresult PopTranslation(PushedTranslation* aState);
-    nsresult SetTranslation(const nsPoint& aPoint);
-
-    /**
-     * Let the device context know whether we want text reordered with
-     * right-to-left base direction
-     */
-    nsresult SetRightToLeftText(PRBool aIsRTL);
-    nsresult GetRightToLeftText(PRBool* aIsRTL);
-    void SetTextRunRTL(PRBool aIsRTL);
-
-    PRInt32 GetPosition(const PRUnichar *aText,
-                        PRUint32 aLength,
-                        nsPoint aPt);
-    nsresult GetRangeWidth(const PRUnichar *aText,
-                           PRUint32 aLength,
-                           PRUint32 aStart,
-                           PRUint32 aEnd,
-                           PRUint32 &aWidth);
-    nsresult GetRangeWidth(const char *aText,
-                           PRUint32 aLength,
-                           PRUint32 aStart,
-                           PRUint32 aEnd,
-                           PRUint32 &aWidth);
-
-    nsresult RenderEPS(const nsRect& aRect, FILE *aDataFile);
-
-    // Thebes specific stuff
-
-    gfxContext *ThebesContext() { return mThebes; }
-
-    nsTransform2D& CurrentTransform();
-
-    void TransformCoord (nscoord *aX, nscoord *aY);
-
 protected:
+    PRInt32 GetMaxChunkLength();
+
     nsresult GetWidthInternal(const char *aString, PRUint32 aLength,
                               nscoord &aWidth);
     nsresult GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
@@ -389,42 +252,7 @@ protected:
                                 PRInt32 aFontID = -1,
                                 const nscoord* aSpacing = nsnull);
 
-    nsresult GetTextDimensionsInternal(const char*       aString,
-                                       PRUint32          aLength,
-                                       nsTextDimensions& aDimensions);
-    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
-                                       PRUint32          aLength,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32*          aFontID = nsnull);
-    nsresult GetTextDimensionsInternal(const char*       aString,
-                                       PRInt32           aLength,
-                                       PRInt32           aAvailWidth,
-                                       PRInt32*          aBreaks,
-                                       PRInt32           aNumBreaks,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32&          aNumCharsFit,
-                                       nsTextDimensions& aLastWordDimensions,
-                                       PRInt32*          aFontID = nsnull);
-    nsresult GetTextDimensionsInternal(const PRUnichar*  aString,
-                                       PRInt32           aLength,
-                                       PRInt32           aAvailWidth,
-                                       PRInt32*          aBreaks,
-                                       PRInt32           aNumBreaks,
-                                       nsTextDimensions& aDimensions,
-                                       PRInt32&          aNumCharsFit,
-                                       nsTextDimensions& aLastWordDimensions,
-                                       PRInt32*          aFontID = nsnull);
-
-    void UpdateTempTransformMatrix();
-
 #ifdef MOZ_MATHML
-    /**
-     * Returns metrics (in app units) of an 8-bit character string
-     */
-    nsresult GetBoundingMetricsInternal(const char*        aString,
-                                        PRUint32           aLength,
-                                        nsBoundingMetrics& aBoundingMetrics);
-
     /**
      * Returns metrics (in app units) of a Unicode character string
      */
@@ -432,23 +260,13 @@ protected:
                                         PRUint32           aLength,
                                         nsBoundingMetrics& aBoundingMetrics,
                                         PRInt32*           aFontID = nsnull);
-
 #endif /* MOZ_MATHML */
 
     nsRefPtr<gfxContext> mThebes;
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
-    nsCOMPtr<nsIWidget> mWidget;
     nsCOMPtr<nsIThebesFontMetrics> mFontMetrics;
 
     double mP2A; // cached app units per device pixel value
-    nsLineStyle mLineStyle;
-    nscolor mColor;
-
-    // for handing out to people
-    nsTransform2D mTempTransform;
-
-    // keeping track of pushgroup/popgroup opacities
-    nsTArray<float> mOpacityArray;
 };
 
 #endif  // NSRENDERINGCONTEXT__H__
diff --git a/gfx/src/nsThebesFontMetrics.cpp b/gfx/src/nsThebesFontMetrics.cpp
index 9adf94b354eb..876081c451d6 100644
--- a/gfx/src/nsThebesFontMetrics.cpp
+++ b/gfx/src/nsThebesFontMetrics.cpp
@@ -451,7 +451,7 @@ nsThebesFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
                                         nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
-        aBoundingMetrics.Clear();
+        aBoundingMetrics = nsBoundingMetrics();
         return NS_OK;
     }
 
@@ -469,7 +469,7 @@ nsThebesFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLeng
                                         nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
-        aBoundingMetrics.Clear();
+        aBoundingMetrics = nsBoundingMetrics();
         return NS_OK;
     }
 
diff --git a/layout/generic/nsHTMLReflowMetrics.h b/layout/generic/nsHTMLReflowMetrics.h
index 6aafaef2c17f..2df6f94e6367 100644
--- a/layout/generic/nsHTMLReflowMetrics.h
+++ b/layout/generic/nsHTMLReflowMetrics.h
@@ -235,6 +235,8 @@ struct nsHTMLReflowMetrics {
   nscoord width, height;    // [OUT] desired width and height (border-box)
   nscoord ascent;           // [OUT] baseline (from top), or ASK_FOR_BASELINE
 
+  PRUint32 mFlags;
+
   enum { ASK_FOR_BASELINE = nscoord_MAX };
 
 #ifdef MOZ_MATHML
@@ -276,39 +278,15 @@ struct nsHTMLReflowMetrics {
   // Union all of mOverflowAreas with (0, 0, width, height).
   void UnionOverflowAreasWithDesiredBounds();
 
-  PRUint32 mFlags;
-
   // XXXldb Should |aFlags| generally be passed from parent to child?
   // Some places do it, and some don't.  |aFlags| should perhaps go away
   // entirely.
-  nsHTMLReflowMetrics(PRUint32 aFlags = 0) {
-    mFlags = aFlags;
-#ifdef MOZ_MATHML
-    mBoundingMetrics.Clear();
-#endif
-
-    // XXX These are OUT parameters and so they shouldn't have to be
-    // initialized, but there are some bad frame classes that aren't
-    // properly setting them when returning from Reflow()...
-    width = height = 0;
-    ascent = ASK_FOR_BASELINE;
-  }
-
-  nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
-  {
-    mFlags = aOther.mFlags;
-    mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
-    mOverflowAreas = aOther.mOverflowAreas;
-#ifdef MOZ_MATHML
-    mBoundingMetrics = aOther.mBoundingMetrics;
-#endif
-
-    width = aOther.width;
-    height = aOther.height;
-    ascent = aOther.ascent;
-    return *this;
-  }
-
+  // XXX width/height/ascent are OUT parameters and so they shouldn't
+  // have to be initialized, but there are some bad frame classes that
+  // aren't properly setting them when returning from Reflow()...
+  nsHTMLReflowMetrics(PRUint32 aFlags = 0)
+    : width(0), height(0), ascent(ASK_FOR_BASELINE), mFlags(aFlags)
+  {}
 };
 
 #endif /* nsHTMLReflowMetrics_h___ */
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index df6f05bb5a51..9ba37b7c5409 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1131,12 +1131,12 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
                          inner.XMost() - size : inner.x;
       nscoord twoPX = nsPresContext::CSSPixelsToAppUnits(2);
       aRenderingContext.DrawRect(iconXPos, inner.y,size,size);
-      aRenderingContext.GetColor(oldColor);
+      aRenderingContext.PushState();
       aRenderingContext.SetColor(NS_RGB(0xFF,0,0));
       aRenderingContext.FillEllipse(size/2 + iconXPos, size/2 + inner.y,
                                     size/2 - twoPX, size/2 - twoPX);
-      aRenderingContext.SetColor(oldColor);
-    }  
+      aRenderingContext.PopState();
+    }
 
     // Reduce the inner rect by the width of the icon, and leave an
     // additional ICON_PADDING pixels for padding
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index e8f462746e78..977d2a16df14 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1662,6 +1662,19 @@ nsObjectFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   return NS_OK;
 }
 
+#ifdef XP_OS2
+static void *
+GetPSFromRC(nsRenderingContext& aRC)
+{
+  nsRefPtr<gfxASurface>
+    surf = aRenderingContext.ThebesContext()->CurrentSurface();
+  if (!surf || surf->CairoStatus())
+    return nsnull;
+  return (void *)(static_cast<gfxOS2Surface*>
+                  (static_cast<gfxASurface*>(surf.get()))->GetPS());
+}
+#endif
+
 void
 nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
                            const nsRect& aDirtyRect)
@@ -1804,7 +1817,7 @@ nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
    */
 
 #elif defined(XP_OS2)
-  void *hps = aRenderingContext.GetNativeGraphicData(nsRenderingContext::NATIVE_OS2_PS);
+  void *hps = GetPSFromRC(aRenderingContext);
   if (!hps)
     return;
 
@@ -2470,7 +2483,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
       }
 
       // check if we need to update the PS
-      HPS hps = (HPS)aRenderingContext.GetNativeGraphicData(nsRenderingContext::NATIVE_OS2_PS);
+      HPS hps = (HPS)GetPSFromRC(aRenderingContext);
       if (reinterpret_cast<HPS>(window->window) != hps) {
         window->window = reinterpret_cast<void*>(hps);
         doupdatewindow = PR_TRUE;
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 0b5dd643971f..c4aa976fed99 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -864,7 +864,7 @@ nsMathMLChar::SetData(nsPresContext* aPresContext,
   // some assumptions until proven otherwise
   // note that mGlyph is not initialized
   mDirection = NS_STRETCH_DIRECTION_UNSUPPORTED;
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   mGlyphTable = nsnull;
   // check if stretching is applicable ...
   if (gGlyphTableList && (1 == mData.Length())) {
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index 3d696d2256ed..d19359f68485 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -949,7 +949,7 @@ nsMathMLContainerFrame::Reflow(nsPresContext*           aPresContext,
 {
   aDesiredSize.width = aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
-  aDesiredSize.mBoundingMetrics.Clear();
+  aDesiredSize.mBoundingMetrics = nsBoundingMetrics();
 
   /////////////
   // Reflow children
@@ -1286,7 +1286,7 @@ nsMathMLContainerFrame::Place(nsRenderingContext& aRenderingContext,
                               nsHTMLReflowMetrics& aDesiredSize)
 {
   // This is needed in case this frame is empty (i.e., no child frames)
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
 
   RowChildFrameIterator child(this);
   nscoord ascent = 0, descent = 0;
diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.cpp b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
index 421efa54edc1..1f0e8fc09f69 100644
--- a/layout/mathml/nsMathMLForeignFrameWrapper.cpp
+++ b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
@@ -79,7 +79,7 @@ nsMathMLForeignFrameWrapper::Reflow(nsPresContext*          aPresContext,
   mReference.y = aDesiredSize.ascent;
 
   // just make-up a bounding metrics
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   mBoundingMetrics.ascent = aDesiredSize.ascent;
   mBoundingMetrics.descent = aDesiredSize.height - aDesiredSize.ascent;
   mBoundingMetrics.width = aDesiredSize.width;
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index 1954e20d5a31..d36a06d36cbd 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -159,7 +159,7 @@ nsMathMLTokenFrame::Reflow(nsPresContext*          aPresContext,
   // initializations needed for empty markup like <mtag></mtag>
   aDesiredSize.width = aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
-  aDesiredSize.mBoundingMetrics.Clear();
+  aDesiredSize.mBoundingMetrics = nsBoundingMetrics();
 
   nsSize availSize(aReflowState.ComputedWidth(), NS_UNCONSTRAINEDSIZE);
   nsIFrame* childFrame = GetFirstChild(nsnull);
@@ -201,7 +201,7 @@ nsMathMLTokenFrame::Place(nsRenderingContext& aRenderingContext,
                           PRBool               aPlaceOrigin,
                           nsHTMLReflowMetrics& aDesiredSize)
 {
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   for (nsIFrame* childFrame = GetFirstChild(nsnull); childFrame;
        childFrame = childFrame->GetNextSibling()) {
     nsHTMLReflowMetrics childSize;
diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp
index 07d365023166..95f6d5b378a7 100644
--- a/layout/mathml/nsMathMLmactionFrame.cpp
+++ b/layout/mathml/nsMathMLmactionFrame.cpp
@@ -297,7 +297,7 @@ nsMathMLmactionFrame::Reflow(nsPresContext*          aPresContext,
   aStatus = NS_FRAME_COMPLETE;
   aDesiredSize.width = aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   nsIFrame* childFrame = GetSelectedFrame();
   if (childFrame) {
     nsSize availSize(aReflowState.ComputedWidth(), NS_UNCONSTRAINEDSIZE);
@@ -322,7 +322,7 @@ nsMathMLmactionFrame::Place(nsRenderingContext& aRenderingContext,
 {
   aDesiredSize.width = aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   nsIFrame* childFrame = GetSelectedFrame();
   if (childFrame) {
     GetReflowAndBoundingMetricsFor(childFrame, aDesiredSize, mBoundingMetrics);
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 38081f2d5cdf..4744312c4b78 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -239,7 +239,7 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
   nsresult rv;
   aDesiredSize.width = aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
-  aDesiredSize.mBoundingMetrics.Clear();
+  aDesiredSize.mBoundingMetrics = nsBoundingMetrics();
 
   PRInt32 i;
   const nsStyleFont* font = GetStyleFont();
@@ -502,11 +502,11 @@ nsMathMLmfencedFrame::ReflowChar(nsPresContext*      aPresContext,
       if (NS_FAILED(res)) {
         nsAutoString data;
         aMathMLChar->GetData(data);
-        nsTextDimensions dimensions;
-        aRenderingContext.GetTextDimensions(data.get(), data.Length(), dimensions);
-        charSize.ascent = dimensions.ascent;
-        charSize.descent = dimensions.descent;
-        charSize.width = dimensions.width;
+        nsBoundingMetrics metrics;
+        aRenderingContext.GetBoundingMetrics(data.get(), data.Length(), metrics);
+        charSize.ascent = metrics.ascent;
+        charSize.descent = metrics.descent;
+        charSize.width = metrics.width;
         // Set this as the bounding metrics of the MathMLChar to leave
         // the necessary room to paint the char.
         aMathMLChar->SetBoundingMetrics(charSize);
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index 975672e38f7a..32a7b866ff76 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -968,7 +968,7 @@ nsMathMLmoFrame::Reflow(nsPresContext*          aPresContext,
     aDesiredSize.width = 0;
     aDesiredSize.height = 0;
     aDesiredSize.ascent = 0;
-    aDesiredSize.mBoundingMetrics.Clear();
+    aDesiredSize.mBoundingMetrics = nsBoundingMetrics();
     aStatus = NS_FRAME_COMPLETE;
 
     NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp
index e55b29cd65bc..b29f7a7a433f 100644
--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@@ -129,7 +129,7 @@ nsMathMLmspaceFrame::Reflow(nsPresContext*          aPresContext,
 {
   ProcessAttributes(aPresContext);
 
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   mBoundingMetrics.width = mWidth;
   mBoundingMetrics.ascent = mHeight;
   mBoundingMetrics.descent = mDepth;
diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp
index c3e4c3b0d508..701ef0fcf8d2 100644
--- a/layout/mathml/nsMathMLmtableFrame.cpp
+++ b/layout/mathml/nsMathMLmtableFrame.cpp
@@ -661,7 +661,7 @@ nsMathMLmtableOuterFrame::Reflow(nsPresContext*          aPresContext,
   mReference.y = aDesiredSize.ascent;
 
   // just make-up a bounding metrics
-  mBoundingMetrics.Clear();
+  mBoundingMetrics = nsBoundingMetrics();
   mBoundingMetrics.ascent = aDesiredSize.ascent;
   mBoundingMetrics.descent = aDesiredSize.height - aDesiredSize.ascent;
   mBoundingMetrics.width = aDesiredSize.width;

From f1c21fabf84085987e7385f096d1c69a55c2b021 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 143/509] Bug 266236 part 5: Make all nsRenderingContext
 methods with no out-parameters and that never fail return nothing.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : 7c11bd0cd2a93d30347a1bb6c1b7675e85f0f579
---
 gfx/src/nsRenderingContext.cpp    | 166 +++++++++++-------------------
 gfx/src/nsRenderingContext.h      |  94 +++++++++--------
 gfx/src/nsThebesDeviceContext.cpp |  20 ++--
 3 files changed, 113 insertions(+), 167 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index bfafbf31665c..95b940afb4cc 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -82,14 +82,14 @@ static PRInt32 FindSafeLength(const char *aString, PRUint32 aLength,
 //////////////////////////////////////////////////////////////////////
 //// nsRenderingContext
 
-nsresult
+void
 nsRenderingContext::Init(nsIDeviceContext* aContext,
                          gfxASurface *aThebesSurface)
 {
-    return Init(aContext, new gfxContext(aThebesSurface));
+    Init(aContext, new gfxContext(aThebesSurface));
 }
 
-nsresult
+void
 nsRenderingContext::Init(nsIDeviceContext* aContext,
                          gfxContext *aThebesContext)
 {
@@ -98,8 +98,6 @@ nsRenderingContext::Init(nsIDeviceContext* aContext,
 
     mThebes->SetLineWidth(1.0);
     mP2A = mDeviceContext->AppUnitsPerDevPixel();
-
-    return NS_OK;
 }
 
 already_AddRefed<nsIDeviceContext>
@@ -109,25 +107,23 @@ nsRenderingContext::GetDeviceContext()
     return mDeviceContext.get();
 }
 
-nsresult
+void
 nsRenderingContext::PushState()
 {
     mThebes->Save();
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::PopState()
 {
     mThebes->Restore();
-    return NS_OK;
 }
 
 //
 // clipping
 //
 
-nsresult
+void
 nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
 {
     if (aCombine == nsClipCombine_kReplace) {
@@ -148,11 +144,9 @@ nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
     }
 
     mThebes->Clip();
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
                                   nsClipCombine aCombine)
 {
@@ -176,17 +170,10 @@ nsRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
                            PR_TRUE);
     }
     mThebes->Clip();
-
     mThebes->SetMatrix(mat);
-
-    return NS_OK;
 }
 
-//
-// other junk
-//
-
-nsresult
+void
 nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
 {
     switch (aLineStyle) {
@@ -205,41 +192,37 @@ nsRenderingContext::SetLineStyle(nsLineStyle aLineStyle)
             NS_ERROR("SetLineStyle: Invalid line style");
             break;
     }
-    return NS_OK;
 }
 
 
-nsresult
+void
 nsRenderingContext::SetColor(nscolor aColor)
 {
     /* This sets the color assuming the sRGB color space, since that's
      * what all CSS colors are defined to be in by the spec.
      */
     mThebes->SetColor(gfxRGBA(aColor));
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::Translate(const nsPoint& aPt)
 {
-    mThebes->Translate (gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
-    return NS_OK;
+    mThebes->Translate(gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
 }
 
-nsresult
+void
 nsRenderingContext::Scale(float aSx, float aSy)
 {
-    mThebes->Scale (aSx, aSy);
-    return NS_OK;
+    mThebes->Scale(aSx, aSy);
 }
 
-nsresult
+void
 nsRenderingContext::DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt)
 {
-    return DrawLine(aStartPt.x, aStartPt.y, aEndPt.x, aEndPt.y);
+    DrawLine(aStartPt.x, aStartPt.y, aEndPt.x, aEndPt.y);
 }
 
-nsresult
+void
 nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
                              nscoord aX1, nscoord aY1)
 {
@@ -279,26 +262,21 @@ nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
         mThebes->Line(p0, p1);
         mThebes->Stroke();
     }
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::DrawRect(const nsRect& aRect)
 {
     mThebes->NewPath();
     mThebes->Rectangle(GFX_RECT_FROM_TWIPS_RECT(aRect), PR_TRUE);
     mThebes->Stroke();
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::DrawRect(nscoord aX, nscoord aY,
                              nscoord aWidth, nscoord aHeight)
 {
     DrawRect(nsRect(aX, aY, aWidth, aHeight));
-    return NS_OK;
 }
 
 
@@ -363,7 +341,7 @@ ConditionRect(gfxRect& r) {
     return PR_TRUE;
 }
 
-nsresult
+void
 nsRenderingContext::FillRect(const nsRect& aRect)
 {
     gfxRect r(GFX_RECT_FROM_TWIPS_RECT(aRect));
@@ -382,7 +360,7 @@ nsRenderingContext::FillRect(const nsRect& aRect)
         r = mat.Transform(r);
 
         if (!ConditionRect(r))
-            return NS_OK;
+            return;
 
         mThebes->IdentityMatrix();
         mThebes->NewPath();
@@ -390,51 +368,44 @@ nsRenderingContext::FillRect(const nsRect& aRect)
         mThebes->Rectangle(r, PR_TRUE);
         mThebes->Fill();
         mThebes->SetMatrix(mat);
-
-        return NS_OK;
     }
 
     mThebes->NewPath();
     mThebes->Rectangle(r, PR_TRUE);
     mThebes->Fill();
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::FillRect(nscoord aX, nscoord aY,
                              nscoord aWidth, nscoord aHeight)
 {
     FillRect(nsRect(aX, aY, aWidth, aHeight));
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::InvertRect(const nsRect& aRect)
 {
     gfxContext::GraphicsOperator lastOp = mThebes->CurrentOperator();
 
     mThebes->SetOperator(gfxContext::OPERATOR_XOR);
-    nsresult rv = FillRect(aRect);
+    FillRect(aRect);
     mThebes->SetOperator(lastOp);
-
-    return rv;
 }
 
-nsresult
+void
 nsRenderingContext::InvertRect(nscoord aX, nscoord aY,
                                nscoord aWidth, nscoord aHeight)
 {
-    return InvertRect(nsRect(aX, aY, aWidth, aHeight));
+    InvertRect(nsRect(aX, aY, aWidth, aHeight));
 }
 
-nsresult
+void
 nsRenderingContext::DrawEllipse(const nsRect& aRect)
 {
-    return DrawEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
+    DrawEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
 }
 
-nsresult
+void
 nsRenderingContext::DrawEllipse(nscoord aX, nscoord aY,
                                 nscoord aWidth, nscoord aHeight)
 {
@@ -444,17 +415,15 @@ nsRenderingContext::DrawEllipse(nscoord aX, nscoord aY,
                      gfxSize(FROM_TWIPS(aWidth),
                              FROM_TWIPS(aHeight)));
     mThebes->Stroke();
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::FillEllipse(const nsRect& aRect)
 {
-    return FillEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
+    FillEllipse(aRect.x, aRect.y, aRect.width, aRect.height);
 }
 
-nsresult
+void
 nsRenderingContext::FillEllipse(nscoord aX, nscoord aY,
                                 nscoord aWidth, nscoord aHeight)
 {
@@ -464,18 +433,13 @@ nsRenderingContext::FillEllipse(nscoord aX, nscoord aY,
                      gfxSize(FROM_TWIPS(aWidth),
                              FROM_TWIPS(aHeight)));
     mThebes->Fill();
-
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
 {
     if (aNumPoints == 0)
-        return NS_OK;
-
-    if (aNumPoints == 4) {
-    }
+        return;
 
     nsAutoArrayPtr<gfxPoint> pxPoints(new gfxPoint[aNumPoints]);
 
@@ -487,16 +451,14 @@ nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
     mThebes->NewPath();
     mThebes->Polygon(pxPoints, aNumPoints);
     mThebes->Fill();
-
-    return NS_OK;
 }
 
 // text
 
-nsresult
+void
 nsRenderingContext::SetRightToLeftText(PRBool aIsRTL)
 {
-    return mFontMetrics->SetRightToLeftText(aIsRTL);
+    mFontMetrics->SetRightToLeftText(aIsRTL);
 }
 
 void
@@ -505,7 +467,7 @@ nsRenderingContext::SetTextRunRTL(PRBool aIsRTL)
     mFontMetrics->SetTextRunRTL(aIsRTL);
 }
 
-nsresult
+void
 nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
                             gfxUserFontSet *aUserFontSet)
 {
@@ -513,10 +475,9 @@ nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
     mDeviceContext->GetMetricsFor(aFont, aLanguage, aUserFontSet,
                                   *getter_AddRefs(newMetrics));
     mFontMetrics = reinterpret_cast<nsIThebesFontMetrics*>(newMetrics.get());
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::SetFont(const nsFont& aFont,
                             gfxUserFontSet *aUserFontSet)
 {
@@ -524,14 +485,12 @@ nsRenderingContext::SetFont(const nsFont& aFont,
     mDeviceContext->GetMetricsFor(aFont, nsnull, aUserFontSet,
                                   *getter_AddRefs(newMetrics));
     mFontMetrics = reinterpret_cast<nsIThebesFontMetrics*>(newMetrics.get());
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 {
     mFontMetrics = static_cast<nsIThebesFontMetrics*>(aFontMetrics);
-    return NS_OK;
 }
 
 already_AddRefed<nsIFontMetrics>
@@ -577,14 +536,6 @@ nsRenderingContext::GetWidth(const char* aString, nscoord& aWidth)
     return GetWidth(aString, strlen(aString), aWidth);
 }
 
-nsresult
-nsRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                               PRInt32 aFontID, const nscoord* aSpacing)
-{
-    return DrawString(aString.get(), aString.Length(), aX, aY,
-                      aFontID, aSpacing);
-}
-
 nsresult
 nsRenderingContext::GetWidth(const char* aString,
                              PRUint32 aLength,
@@ -671,7 +622,14 @@ nsRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
 }
 #endif
 
-nsresult
+void
+nsRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                               PRInt32 aFontID, const nscoord* aSpacing)
+{
+    DrawString(aString.get(), aString.Length(), aX, aY, aFontID, aSpacing);
+}
+
+void
 nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
                                nscoord aX, nscoord aY,
                                const nscoord* aSpacing)
@@ -679,24 +637,21 @@ nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
     PRUint32 maxChunkLength = GetMaxChunkLength();
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        nsresult rv = DrawStringInternal(aString, len, aX, aY);
-        if (NS_FAILED(rv))
-            return rv;
+        DrawStringInternal(aString, len, aX, aY);
         aLength -= len;
 
         if (aLength > 0) {
             nscoord width;
-            rv = GetWidthInternal(aString, len, width);
+            nsresult rv = GetWidthInternal(aString, len, width);
             if (NS_FAILED(rv))
-                return rv;
+                return;
             aX += width;
             aString += len;
         }
     }
-    return NS_OK;
 }
 
-nsresult
+void
 nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
                                nscoord aX, nscoord aY,
                                PRInt32 aFontID,
@@ -704,7 +659,8 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
     if (aLength <= maxChunkLength) {
-        return DrawStringInternal(aString, aLength, aX, aY, aFontID, aSpacing);
+        DrawStringInternal(aString, aLength, aX, aY, aFontID, aSpacing);
+        return;
     }
 
     PRBool isRTL = mFontMetrics->GetRightToLeftText();
@@ -718,7 +674,7 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
         } else {
             nsresult rv = GetWidth(aString, aLength, totalWidth);
             if (NS_FAILED(rv))
-                return rv;
+                return;
         }
         aX += totalWidth;
     }
@@ -733,15 +689,13 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
         } else {
             nsresult rv = GetWidthInternal(aString, len, width);
             if (NS_FAILED(rv))
-                return rv;
+                return;
         }
 
         if (isRTL) {
             aX -= width;
         }
-        nsresult rv = DrawStringInternal(aString, len, aX, aY, aFontID, aSpacing);
-        if (NS_FAILED(rv))
-            return rv;
+        DrawStringInternal(aString, len, aX, aY, aFontID, aSpacing);
         aLength -= len;
         if (!isRTL) {
             aX += width;
@@ -751,7 +705,6 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
             aSpacing += len;
         }
     }
-    return NS_OK;
 }
 
 nsresult
@@ -790,21 +743,20 @@ nsRenderingContext::GetBoundingMetricsInternal(const PRUnichar*   aString,
 }
 #endif // MOZ_MATHML
 
-nsresult
+void
 nsRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLength,
                                        nscoord aX, nscoord aY,
                                        const nscoord* aSpacing)
 {
-    return mFontMetrics->DrawString(aString, aLength, aX, aY, aSpacing, this);
+    mFontMetrics->DrawString(aString, aLength, aX, aY, aSpacing, this);
 }
 
-nsresult
+void
 nsRenderingContext::DrawStringInternal(const PRUnichar *aString,
                                        PRUint32 aLength,
                                        nscoord aX, nscoord aY,
                                        PRInt32 aFontID,
                                        const nscoord* aSpacing)
 {
-    return mFontMetrics->DrawString(aString, aLength, aX, aY, aFontID,
-                                    aSpacing, this);
+    mFontMetrics->DrawString(aString, aLength, aX, aY, aFontID, aSpacing, this);
 }
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 5a76698869df..c844a2eff652 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -146,22 +146,22 @@ public:
 
     NS_INLINE_DECL_REFCOUNTING(nsRenderingContext)
 
-    nsresult Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
-    nsresult Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
+    void Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
+    void Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
 
     already_AddRefed<nsIDeviceContext> GetDeviceContext();
     gfxContext *ThebesContext() { return mThebes; }
 
     // Graphics state
 
-    nsresult PushState(void);
-    nsresult PopState(void);
-    nsresult SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
-    nsresult SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
-    nsresult SetLineStyle(nsLineStyle aLineStyle);
-    nsresult SetColor(nscolor aColor);
-    nsresult Translate(const nsPoint& aPt);
-    nsresult Scale(float aSx, float aSy);
+    void PushState(void);
+    void PopState(void);
+    void SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
+    void SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
+    void SetLineStyle(nsLineStyle aLineStyle);
+    void SetColor(nscolor aColor);
+    void Translate(const nsPoint& aPt);
+    void Scale(float aSx, float aSy);
 
     class AutoPushTranslation {
         nsRenderingContext* mCtx;
@@ -178,34 +178,32 @@ public:
 
     // Shapes
 
-    nsresult DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
-    nsresult DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
-    nsresult DrawRect(const nsRect& aRect);
-    nsresult DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    nsresult DrawEllipse(nscoord aX, nscoord aY,
-                         nscoord aWidth, nscoord aHeight);
-    nsresult DrawEllipse(const nsRect& aRect);
+    void DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
+    void DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+    void DrawRect(const nsRect& aRect);
+    void DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    void DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    void DrawEllipse(const nsRect& aRect);
 
-    nsresult FillRect(const nsRect& aRect);
-    nsresult FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
-    nsresult FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+    void FillRect(const nsRect& aRect);
+    void FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+    void FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
 
-    nsresult FillEllipse(const nsRect& aRect);
-    nsresult FillEllipse(nscoord aX, nscoord aY,
-                         nscoord aWidth, nscoord aHeight);
+    void FillEllipse(const nsRect& aRect);
+    void FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
 
-    nsresult InvertRect(const nsRect& aRect);
-    nsresult InvertRect(nscoord aX, nscoord aY,
-                        nscoord aWidth, nscoord aHeight);
+    void InvertRect(const nsRect& aRect);
+    void InvertRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
 
     // Text
 
-    nsresult SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                     gfxUserFontSet *aUserFontSet);
-    nsresult SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
-    nsresult SetFont(nsIFontMetrics *aFontMetrics);
+    void SetFont(const nsFont& aFont, nsIAtom* aLanguage,
+                 gfxUserFontSet *aUserFontSet);
+    void SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
+    void SetFont(nsIFontMetrics *aFontMetrics);
     already_AddRefed<nsIFontMetrics> GetFontMetrics();
-    nsresult SetRightToLeftText(PRBool aIsRTL);
+
+    void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
 
     nsresult GetWidth(const nsString& aString, nscoord &aWidth,
@@ -225,16 +223,16 @@ public:
                                 PRInt32*           aFontID = nsnull);
 #endif
 
-    nsresult DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                        PRInt32 aFontID = -1,
-                        const nscoord* aSpacing = nsnull);
-    nsresult DrawString(const char *aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        const nscoord* aSpacing = nsnull);
-    nsresult DrawString(const PRUnichar *aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        PRInt32 aFontID = -1,
-                        const nscoord* aSpacing = nsnull);
+    void DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                    PRInt32 aFontID = -1,
+                    const nscoord* aSpacing = nsnull);
+    void DrawString(const char *aString, PRUint32 aLength,
+                    nscoord aX, nscoord aY,
+                    const nscoord* aSpacing = nsnull);
+    void DrawString(const PRUnichar *aString, PRUint32 aLength,
+                    nscoord aX, nscoord aY,
+                    PRInt32 aFontID = -1,
+                    const nscoord* aSpacing = nsnull);
 
 protected:
     PRInt32 GetMaxChunkLength();
@@ -244,13 +242,13 @@ protected:
     nsresult GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
                               nscoord &aWidth, PRInt32 *aFontID = nsnull);
 
-    nsresult DrawStringInternal(const char *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                const nscoord* aSpacing = nsnull);
-    nsresult DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                PRInt32 aFontID = -1,
-                                const nscoord* aSpacing = nsnull);
+    void DrawStringInternal(const char *aString, PRUint32 aLength,
+                            nscoord aX, nscoord aY,
+                            const nscoord* aSpacing = nsnull);
+    void DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
+                            nscoord aX, nscoord aY,
+                            PRInt32 aFontID = -1,
+                            const nscoord* aSpacing = nsnull);
 
 #ifdef MOZ_MATHML
     /**
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index a0f20ad0f1da..c08d564ebdd9 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -734,14 +734,12 @@ nsThebesDeviceContext::CreateRenderingContext(nsIWidget *aWidget,
     rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
     if (NS_SUCCEEDED(rv)) {
         nsRefPtr<gfxASurface> surface(aWidget->GetThebesSurface());
-        if (surface)
-            rv = pContext->Init(this, surface);
-        else
-            rv = NS_ERROR_FAILURE;
-
-        if (NS_SUCCEEDED(rv)) {
+        if (surface) {
+            pContext->Init(this, surface);
             aContext = pContext;
             NS_ADDREF(aContext);
+        } else {
+            rv = NS_ERROR_FAILURE;
         }
     }
 
@@ -757,15 +755,13 @@ nsThebesDeviceContext::CreateRenderingContext(nsRenderingContext *&aContext)
     nsRefPtr<nsRenderingContext> pContext;
     rv = CreateRenderingContextInstance(*getter_AddRefs(pContext));
     if (NS_SUCCEEDED(rv)) {
-        if (mPrintingSurface)
-            rv = pContext->Init(this, mPrintingSurface);
-        else
-            rv = NS_ERROR_FAILURE;
-
-        if (NS_SUCCEEDED(rv)) {
+        if (mPrintingSurface) {
+            pContext->Init(this, mPrintingSurface);
             pContext->Scale(mPrintingScale, mPrintingScale);
             aContext = pContext;
             NS_ADDREF(aContext);
+        } else {
+            rv = NS_ERROR_FAILURE;
         }
     }
 

From ab24450ef1a45dfa17b2f52a4f8f09e2af914bce Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 144/509] Bug 266236 part 6: Change out-parameters to return
 values and remove a bunch of default parameters that were never called with
 non-default values.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : 0511852e51c2ad4d4833d6f8f2f61d46130a7151
---
 gfx/src/nsRenderingContext.cpp                | 228 ++++++------------
 gfx/src/nsRenderingContext.h                  |  57 +----
 layout/base/nsBidiPresUtils.cpp               |   4 +-
 layout/base/nsLayoutUtils.cpp                 |   9 +-
 layout/generic/nsImageFrame.cpp               |   3 +-
 layout/mathml/nsMathMLChar.cpp                | 101 +++-----
 layout/mathml/nsMathMLContainerFrame.cpp      |  11 +-
 layout/mathml/nsMathMLFrame.cpp               |  30 +--
 layout/mathml/nsMathMLmencloseFrame.cpp       |   4 +-
 layout/mathml/nsMathMLmfencedFrame.cpp        |   4 +-
 layout/mathml/nsMathMLmrootFrame.cpp          |   4 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  20 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |  11 +-
 13 files changed, 157 insertions(+), 329 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 95b940afb4cc..2d76feee2e70 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -508,255 +508,167 @@ nsRenderingContext::GetMaxChunkLength()
     return PR_MIN(mFontMetrics->GetMaxStringLength(), MAX_GFX_TEXT_BUF_SIZE);
 }
 
-nsresult
-nsRenderingContext::GetWidth(char aC, nscoord &aWidth)
+nscoord
+nsRenderingContext::GetWidth(char aC)
 {
-    if (aC == ' ' && mFontMetrics)
-        return mFontMetrics->GetSpaceWidth(aWidth);
+    if (aC == ' ' && mFontMetrics) {
+        nscoord width;
+        mFontMetrics->GetSpaceWidth(width);
+        return width;
+    }
 
-    return GetWidth(&aC, 1, aWidth);
+    return GetWidth(&aC, 1);
 }
 
-nsresult
-nsRenderingContext::GetWidth(PRUnichar aC, nscoord &aWidth, PRInt32 *aFontID)
+nscoord
+nsRenderingContext::GetWidth(PRUnichar aC)
 {
-    return GetWidth(&aC, 1, aWidth, aFontID);
+    return GetWidth(&aC, 1);
 }
 
-nsresult
-nsRenderingContext::GetWidth(const nsString& aString, nscoord &aWidth,
-                                   PRInt32 *aFontID)
+nscoord
+nsRenderingContext::GetWidth(const nsString& aString)
 {
-    return GetWidth(aString.get(), aString.Length(), aWidth, aFontID);
+    return GetWidth(aString.get(), aString.Length());
 }
 
-nsresult
-nsRenderingContext::GetWidth(const char* aString, nscoord& aWidth)
+nscoord
+nsRenderingContext::GetWidth(const char* aString)
 {
-    return GetWidth(aString, strlen(aString), aWidth);
+    return GetWidth(aString, strlen(aString));
 }
 
-nsresult
-nsRenderingContext::GetWidth(const char* aString,
-                             PRUint32 aLength,
-                             nscoord& aWidth)
+nscoord
+nsRenderingContext::GetWidth(const char* aString, PRUint32 aLength)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
-    aWidth = 0;
+    nscoord width = 0;
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        nscoord width;
-        nsresult rv = GetWidthInternal(aString, len, width);
-        if (NS_FAILED(rv))
-            return rv;
-        aWidth += width;
+        width += GetWidthInternal(aString, len);
         aLength -= len;
         aString += len;
     }
-    return NS_OK;
+    return width;
 }
 
-nsresult
-nsRenderingContext::GetWidth(const PRUnichar *aString,
-                             PRUint32 aLength,
-                             nscoord &aWidth,
-                             PRInt32 *aFontID)
+nscoord
+nsRenderingContext::GetWidth(const PRUnichar *aString, PRUint32 aLength)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
-    aWidth = 0;
-
-    if (aFontID) {
-        *aFontID = 0;
-    }
-
+    nscoord width = 0;
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        nscoord width;
-        nsresult rv = GetWidthInternal(aString, len, width);
-        if (NS_FAILED(rv))
-            return rv;
-        aWidth += width;
+        width += GetWidthInternal(aString, len);
         aLength -= len;
         aString += len;
     }
-    return NS_OK;
+    return width;
 }
 
 #ifdef MOZ_MATHML
-nsresult
-nsRenderingContext::GetBoundingMetrics(const PRUnichar*   aString,
-                                       PRUint32           aLength,
-                                       nsBoundingMetrics& aBoundingMetrics,
-                                       PRInt32*           aFontID)
+nsBoundingMetrics
+nsRenderingContext::GetBoundingMetrics(const PRUnichar* aString,
+                                       PRUint32 aLength)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
-    if (aLength <= maxChunkLength)
-        return GetBoundingMetricsInternal(aString, aLength, aBoundingMetrics,
-                                          aFontID);
+    PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
+    // Assign directly in the first iteration. This ensures that
+    // negative ascent/descent can be returned and the left bearing
+    // is properly initialized.
+    nsBoundingMetrics totalMetrics;
+    mFontMetrics->GetBoundingMetrics(aString, len, this, totalMetrics);
+    aLength -= len;
+    aString += len;
 
-    if (aFontID) {
-        *aFontID = 0;
-    }
-
-    PRBool firstIteration = PR_TRUE;
     while (aLength > 0) {
-        PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
+        len = FindSafeLength(aString, aLength, maxChunkLength);
         nsBoundingMetrics metrics;
-        nsresult rv = GetBoundingMetricsInternal(aString, len, metrics);
-        if (NS_FAILED(rv))
-            return rv;
-        if (firstIteration) {
-            // Instead of combining with a Clear()ed nsBoundingMetrics, we
-            // assign directly in the first iteration. This ensures that
-            // negative ascent/ descent can be returned and the left bearing
-            // is properly initialized.
-            aBoundingMetrics = metrics;
-        } else {
-            aBoundingMetrics += metrics;
-        }
+        mFontMetrics->GetBoundingMetrics(aString, len, this, metrics);
+        totalMetrics += metrics;
         aLength -= len;
         aString += len;
-        firstIteration = PR_FALSE;
     }
-    return NS_OK;
+    return totalMetrics;
 }
 #endif
 
-void
-nsRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                               PRInt32 aFontID, const nscoord* aSpacing)
-{
-    DrawString(aString.get(), aString.Length(), aX, aY, aFontID, aSpacing);
-}
-
 void
 nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
-                               nscoord aX, nscoord aY,
-                               const nscoord* aSpacing)
+                               nscoord aX, nscoord aY)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        DrawStringInternal(aString, len, aX, aY);
+        mFontMetrics->DrawString(aString, len, aX, aY, nsnull, this);
         aLength -= len;
 
         if (aLength > 0) {
-            nscoord width;
-            nsresult rv = GetWidthInternal(aString, len, width);
-            if (NS_FAILED(rv))
-                return;
+            nscoord width = GetWidthInternal(aString, len);
             aX += width;
             aString += len;
         }
     }
 }
 
+void
+nsRenderingContext::DrawString(const nsString& aString, nscoord aX, nscoord aY)
+{
+    DrawString(aString.get(), aString.Length(), aX, aY);
+}
+
 void
 nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
-                               nscoord aX, nscoord aY,
-                               PRInt32 aFontID,
-                               const nscoord* aSpacing)
+                               nscoord aX, nscoord aY)
 {
     PRUint32 maxChunkLength = GetMaxChunkLength();
     if (aLength <= maxChunkLength) {
-        DrawStringInternal(aString, aLength, aX, aY, aFontID, aSpacing);
+        mFontMetrics->DrawString(aString, aLength, aX, aY, this, this);
         return;
     }
 
     PRBool isRTL = mFontMetrics->GetRightToLeftText();
 
+    // If we're drawing right to left, we must start at the end.
     if (isRTL) {
-        nscoord totalWidth = 0;
-        if (aSpacing) {
-            for (PRUint32 i = 0; i < aLength; ++i) {
-                totalWidth += aSpacing[i];
-            }
-        } else {
-            nsresult rv = GetWidth(aString, aLength, totalWidth);
-            if (NS_FAILED(rv))
-                return;
-        }
-        aX += totalWidth;
+        aX += GetWidth(aString, aLength);
     }
 
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        nscoord width = 0;
-        if (aSpacing) {
-            for (PRInt32 i = 0; i < len; ++i) {
-                width += aSpacing[i];
-            }
-        } else {
-            nsresult rv = GetWidthInternal(aString, len, width);
-            if (NS_FAILED(rv))
-                return;
-        }
-
+        nscoord width = GetWidthInternal(aString, len);
         if (isRTL) {
             aX -= width;
         }
-        DrawStringInternal(aString, len, aX, aY, aFontID, aSpacing);
-        aLength -= len;
+        mFontMetrics->DrawString(aString, len, aX, aY, this, this);
         if (!isRTL) {
             aX += width;
         }
+        aLength -= len;
         aString += len;
-        if (aSpacing) {
-            aSpacing += len;
-        }
     }
 }
 
-nsresult
-nsRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength,
-                                     nscoord& aWidth)
+nscoord
+nsRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength)
 {
     if (aLength == 0) {
-        aWidth = 0;
-        return NS_OK;
+        return 0;
     }
 
-    return mFontMetrics->GetWidth(aString, aLength, aWidth, this);
+    nscoord width;
+    mFontMetrics->GetWidth(aString, aLength, width, this);
+    return width;
 }
 
-nsresult
-nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
-                                     nscoord &aWidth, PRInt32 *aFontID)
+nscoord
+nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength)
 {
     if (aLength == 0) {
-        aWidth = 0;
-        return NS_OK;
+        return 0;
     }
 
-    return mFontMetrics->GetWidth(aString, aLength, aWidth, aFontID, this);
-}
-
-#ifdef MOZ_MATHML
-nsresult
-nsRenderingContext::GetBoundingMetricsInternal(const PRUnichar*   aString,
-                                               PRUint32           aLength,
-                                               nsBoundingMetrics& aBoundingMetrics,
-                                               PRInt32*           aFontID)
-{
-    return mFontMetrics->GetBoundingMetrics(aString, aLength, this,
-                                            aBoundingMetrics);
-}
-#endif // MOZ_MATHML
-
-void
-nsRenderingContext::DrawStringInternal(const char *aString, PRUint32 aLength,
-                                       nscoord aX, nscoord aY,
-                                       const nscoord* aSpacing)
-{
-    mFontMetrics->DrawString(aString, aLength, aX, aY, aSpacing, this);
-}
-
-void
-nsRenderingContext::DrawStringInternal(const PRUnichar *aString,
-                                       PRUint32 aLength,
-                                       nscoord aX, nscoord aY,
-                                       PRInt32 aFontID,
-                                       const nscoord* aSpacing)
-{
-    mFontMetrics->DrawString(aString, aLength, aX, aY, aFontID, aSpacing, this);
+    nscoord width;
+    mFontMetrics->GetWidth(aString, aLength, width, nsnull, this);
+    return width;
 }
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index c844a2eff652..a91cd9d0e95b 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -206,59 +206,28 @@ public:
     void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
 
-    nsresult GetWidth(const nsString& aString, nscoord &aWidth,
-                      PRInt32 *aFontID = nsnull);
-    nsresult GetWidth(const char* aString, nscoord& aWidth);
-    nsresult GetWidth(const char* aString, PRUint32 aLength,
-                      nscoord& aWidth);
-    nsresult GetWidth(const PRUnichar *aString, PRUint32 aLength,
-                      nscoord &aWidth, PRInt32 *aFontID = nsnull);
-    nsresult GetWidth(char aC, nscoord &aWidth);
-    nsresult GetWidth(PRUnichar aC, nscoord &aWidth, PRInt32 *aFontID = nsnull);
+    nscoord GetWidth(char aC);
+    nscoord GetWidth(PRUnichar aC);
+    nscoord GetWidth(const nsString& aString);
+    nscoord GetWidth(const char* aString);
+    nscoord GetWidth(const char* aString, PRUint32 aLength);
+    nscoord GetWidth(const PRUnichar *aString, PRUint32 aLength);
 
 #ifdef MOZ_MATHML
-    nsresult GetBoundingMetrics(const PRUnichar*   aString,
-                                PRUint32           aLength,
-                                nsBoundingMetrics& aBoundingMetrics,
-                                PRInt32*           aFontID = nsnull);
+    nsBoundingMetrics GetBoundingMetrics(const PRUnichar *aString,
+                                         PRUint32 aLength);
 #endif
 
-    void DrawString(const nsString& aString, nscoord aX, nscoord aY,
-                    PRInt32 aFontID = -1,
-                    const nscoord* aSpacing = nsnull);
+    void DrawString(const nsString& aString, nscoord aX, nscoord aY);
     void DrawString(const char *aString, PRUint32 aLength,
-                    nscoord aX, nscoord aY,
-                    const nscoord* aSpacing = nsnull);
+                    nscoord aX, nscoord aY);
     void DrawString(const PRUnichar *aString, PRUint32 aLength,
-                    nscoord aX, nscoord aY,
-                    PRInt32 aFontID = -1,
-                    const nscoord* aSpacing = nsnull);
+                    nscoord aX, nscoord aY);
 
 protected:
     PRInt32 GetMaxChunkLength();
-
-    nsresult GetWidthInternal(const char *aString, PRUint32 aLength,
-                              nscoord &aWidth);
-    nsresult GetWidthInternal(const PRUnichar *aString, PRUint32 aLength,
-                              nscoord &aWidth, PRInt32 *aFontID = nsnull);
-
-    void DrawStringInternal(const char *aString, PRUint32 aLength,
-                            nscoord aX, nscoord aY,
-                            const nscoord* aSpacing = nsnull);
-    void DrawStringInternal(const PRUnichar *aString, PRUint32 aLength,
-                            nscoord aX, nscoord aY,
-                            PRInt32 aFontID = -1,
-                            const nscoord* aSpacing = nsnull);
-
-#ifdef MOZ_MATHML
-    /**
-     * Returns metrics (in app units) of a Unicode character string
-     */
-    nsresult GetBoundingMetricsInternal(const PRUnichar*   aString,
-                                        PRUint32           aLength,
-                                        nsBoundingMetrics& aBoundingMetrics,
-                                        PRInt32*           aFontID = nsnull);
-#endif /* MOZ_MATHML */
+    nscoord GetWidthInternal(const char *aString, PRUint32 aLength);
+    nscoord GetWidthInternal(const PRUnichar *aString, PRUint32 aLength);
 
     nsRefPtr<gfxContext> mThebes;
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 1061cbde130b..dae23e64c512 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -1779,9 +1779,7 @@ public:
 
   virtual nscoord GetWidth()
   {
-    nscoord width;
-    mTextRunConstructionContext->GetWidth(mText, mLength, width, nsnull);
-    return width;
+    return mTextRunConstructionContext->GetWidth(mText, mLength);
   }
 
   virtual void DrawText(nscoord aXOffset,
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 39eb6fae5766..8b29a4f99204 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1705,7 +1705,7 @@ nsLayoutUtils::BinarySearchForPosition(nsRenderingContext* aRendContext,
   PRInt32 range = aEndInx - aStartInx;
   if ((range == 1) || (range == 2 && NS_IS_HIGH_SURROGATE(aText[aStartInx]))) {
     aIndex   = aStartInx + aBaseInx;
-    aRendContext->GetWidth(aText, aIndex, aTextWidth);
+    aTextWidth = aRendContext->GetWidth(aText, aIndex);
     return PR_TRUE;
   }
 
@@ -1715,8 +1715,7 @@ nsLayoutUtils::BinarySearchForPosition(nsRenderingContext* aRendContext,
   if (NS_IS_HIGH_SURROGATE(aText[inx-1]))
     inx++;
 
-  PRInt32 textWidth = 0;
-  aRendContext->GetWidth(aText, inx, textWidth);
+  PRInt32 textWidth = aRendContext->GetWidth(aText, inx);
 
   PRInt32 fullWidth = aBaseWidth + textWidth;
   if (fullWidth == aCursorPos) {
@@ -2840,9 +2839,7 @@ nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
   }
 #endif // IBMBIDI
   aContext->SetTextRunRTL(PR_FALSE);
-  nscoord width;
-  aContext->GetWidth(aString, aLength, width);
-  return width;
+  return aContext->GetWidth(aString, aLength);
 }
 
 /* static */ nscoord
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 9ba37b7c5409..4b874a0530e9 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -910,9 +910,8 @@ nsImageFrame::MeasureString(const PRUnichar*     aString,
                             nsRenderingContext& aContext)
 {
   nscoord totalWidth = 0;
-  nscoord spaceWidth;
   aContext.SetTextRunRTL(PR_FALSE);
-  aContext.GetWidth(' ', spaceWidth);
+  nscoord spaceWidth = aContext.GetWidth(' ');
 
   aMaxFit = 0;
   while (aLength > 0) {
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index c4aa976fed99..01b142ba3dab 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -1244,47 +1244,44 @@ nsMathMLChar::StretchEnumContext::TryVariants(nsGlyphTable*    aGlyphTable,
                  !font.name.Equals(mChar->mFamily),
                  "glyph table incorrectly set -- duplicate found");
 
-    nsBoundingMetrics bm;
-    nsresult rv = mRenderingContext.GetBoundingMetrics(&ch.code, 1, bm);
-    if (NS_SUCCEEDED(rv)) {
-      nscoord charSize =
-        isVertical ? bm.ascent + bm.descent
-                   : bm.rightBearing - bm.leftBearing;
+    nsBoundingMetrics bm = mRenderingContext.GetBoundingMetrics(&ch.code, 1);
+    nscoord charSize =
+      isVertical ? bm.ascent + bm.descent
+      : bm.rightBearing - bm.leftBearing;
 
-      if (largeopOnly ||
-          IsSizeBetter(charSize, bestSize, mTargetSize, mStretchHint)) {
-        mGlyphFound = PR_TRUE;
-        if (maxWidth) {
-          // IsSizeBetter() checked that charSize < maxsize;
-          // Leave ascent, descent, and bestsize as these contain maxsize.
-          if (mBoundingMetrics.width < bm.width)
-            mBoundingMetrics.width = bm.width;
-          if (mBoundingMetrics.leftBearing > bm.leftBearing)
-            mBoundingMetrics.leftBearing = bm.leftBearing;
-          if (mBoundingMetrics.rightBearing < bm.rightBearing)
-            mBoundingMetrics.rightBearing = bm.rightBearing;
-          // Continue to check other sizes unless largeopOnly
-          haveBetter = largeopOnly;
-        }
-        else {
-          mBoundingMetrics = bm;
-          haveBetter = PR_TRUE;
-          bestSize = charSize;
-          mChar->mGlyphTable = aGlyphTable;
-          mChar->mGlyph = ch;
-          mChar->mFamily = font.name;
-        }
-#ifdef NOISY_SEARCH
-        printf("    size:%d Current best\n", size);
-#endif
+    if (largeopOnly ||
+        IsSizeBetter(charSize, bestSize, mTargetSize, mStretchHint)) {
+      mGlyphFound = PR_TRUE;
+      if (maxWidth) {
+        // IsSizeBetter() checked that charSize < maxsize;
+        // Leave ascent, descent, and bestsize as these contain maxsize.
+        if (mBoundingMetrics.width < bm.width)
+          mBoundingMetrics.width = bm.width;
+        if (mBoundingMetrics.leftBearing > bm.leftBearing)
+          mBoundingMetrics.leftBearing = bm.leftBearing;
+        if (mBoundingMetrics.rightBearing < bm.rightBearing)
+          mBoundingMetrics.rightBearing = bm.rightBearing;
+        // Continue to check other sizes unless largeopOnly
+        haveBetter = largeopOnly;
       }
       else {
-#ifdef NOISY_SEARCH
-        printf("    size:%d Rejected!\n", size);
-#endif
-        if (haveBetter)
-          break; // Not making an futher progress, stop searching
+        mBoundingMetrics = bm;
+        haveBetter = PR_TRUE;
+        bestSize = charSize;
+        mChar->mGlyphTable = aGlyphTable;
+        mChar->mGlyph = ch;
+        mChar->mFamily = font.name;
       }
+#ifdef NOISY_SEARCH
+      printf("    size:%d Current best\n", size);
+#endif
+    }
+    else {
+#ifdef NOISY_SEARCH
+      printf("    size:%d Rejected!\n", size);
+#endif
+      if (haveBetter)
+        break; // Not making an futher progress, stop searching
     }
 
     // if largeopOnly is set, break now
@@ -1356,7 +1353,6 @@ nsMathMLChar::StretchEnumContext::TryParts(nsGlyphTable*    aGlyphTable,
     }
     // empty slots are filled with the glue if it is not null
     if (!ch.Exists()) ch = glue;
-    nsBoundingMetrics bm;
     chdata[i] = ch;
     if (!ch.Exists()) {
       // Null glue indicates that a rule will be drawn, which can stretch to
@@ -1366,12 +1362,7 @@ nsMathMLChar::StretchEnumContext::TryParts(nsGlyphTable*    aGlyphTable,
     else {
       SetFontFamily(mChar->mStyleContext->PresContext(), mRenderingContext,
                     font, aGlyphTable, ch, aFamily);
-      nsresult rv = mRenderingContext.GetBoundingMetrics(&ch.code, 1, bm);
-      if (NS_FAILED(rv)) {
-        // stop if we failed to compute the bounding metrics of a part.
-        NS_WARNING("GetBoundingMetrics failed");
-        return PR_FALSE; // to next table
-      }
+      nsBoundingMetrics bm = mRenderingContext.GetBoundingMetrics(&ch.code, 1);
 
       // TODO: For the generic Unicode table, ideally we should check that the
       // glyphs are actually found and that they each come from the same
@@ -1561,14 +1552,8 @@ nsMathMLChar::StretchInternal(nsPresContext*           aPresContext,
   }
 
   aRenderingContext.SetFont(font, aPresContext->GetUserFontSet());
-  nsresult rv =
-    aRenderingContext.GetBoundingMetrics(mData.get(), PRUint32(mData.Length()),
-                                         aDesiredStretchSize);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("GetBoundingMetrics failed");
-    mDirection = NS_STRETCH_DIRECTION_UNSUPPORTED;
-    return rv;
-  }
+  aDesiredStretchSize =
+    aRenderingContext.GetBoundingMetrics(mData.get(), PRUint32(mData.Length()));
 
   if (!maxWidth) {
     mUnscaledAscent = aDesiredStretchSize.ascent;
@@ -2280,11 +2265,7 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
     if (ch.Exists()) {
       SetFontFamily(aPresContext, aRenderingContext,
                     aFont, aGlyphTable, ch, mFamily);
-      rv = aRenderingContext.GetBoundingMetrics(&ch.code, 1, bmdata[i]);
-      if (NS_FAILED(rv)) {
-        NS_WARNING("GetBoundingMetrics failed");
-        return rv;
-      }
+      bmdata[i] = aRenderingContext.GetBoundingMetrics(&ch.code, 1);
     }
     chdata[i] = ch;
     ++i;
@@ -2513,11 +2494,7 @@ nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
     if (ch.Exists()) {
       SetFontFamily(aPresContext, aRenderingContext,
                     aFont, aGlyphTable, ch, mFamily);
-      rv = aRenderingContext.GetBoundingMetrics(&ch.code, 1, bmdata[i]);
-      if (NS_FAILED(rv)) {
-        NS_WARNING("GetBoundingMetrics failed");
-        return rv;
-      }
+      bmdata[i] = aRenderingContext.GetBoundingMetrics(&ch.code, 1);
     }
     chdata[i] = ch;
     ++i;
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index d19359f68485..aee7c6e117fb 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -98,15 +98,8 @@ nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
 
   // bounding metrics
   nsAutoString errorMsg; errorMsg.AssignLiteral("invalid-markup");
-  rv = aRenderingContext.GetBoundingMetrics(errorMsg.get(),
-                                            PRUint32(errorMsg.Length()),
-                                            mBoundingMetrics);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("GetBoundingMetrics failed");
-    aDesiredSize.width = aDesiredSize.height = 0;
-    aDesiredSize.ascent = 0;
-    return NS_OK;
-  }
+  mBoundingMetrics =
+    aRenderingContext.GetBoundingMetrics(errorMsg.get(), errorMsg.Length());
 
   // reflow metrics
   nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index e050ff01d50b..f141f2816d65 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -289,27 +289,12 @@ nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
   nscoord xHeight;
   aFontMetrics->GetXHeight(xHeight);
   PRUnichar overBar = 0x00AF;
-  nsBoundingMetrics bm;
-  nsresult rv = aRenderingContext.GetBoundingMetrics(&overBar, PRUint32(1), bm);
-  if (NS_SUCCEEDED(rv)) {
-    aRuleThickness = bm.ascent + bm.descent;
-  }
-  if (NS_FAILED(rv) || aRuleThickness <= 0 || aRuleThickness >= xHeight) {
+  nsBoundingMetrics bm = aRenderingContext.GetBoundingMetrics(&overBar, 1);
+  aRuleThickness = bm.ascent + bm.descent;
+  if (aRuleThickness <= 0 || aRuleThickness >= xHeight) {
     // fall-back to the other version
     GetRuleThickness(aFontMetrics, aRuleThickness);
   }
-
-#if 0
-  nscoord oldRuleThickness;
-  GetRuleThickness(aFontMetrics, oldRuleThickness);
-
-  PRUnichar sqrt = 0xE063; // a sqrt glyph from TeX's CMEX font
-  rv = aRenderingContext.GetBoundingMetrics(&sqrt, PRUint32(1), bm);
-  nscoord sqrtrule = bm.ascent; // according to TeX, the ascent should be the rule
-
-  printf("xheight:%4d rule:%4d oldrule:%4d  sqrtrule:%4d\n",
-          xHeight, aRuleThickness, oldRuleThickness, sqrtrule);
-#endif
 }
 
 /* static */ void
@@ -327,12 +312,9 @@ nsMathMLFrame::GetAxisHeight(nsRenderingContext& aRenderingContext,
   nscoord xHeight;
   aFontMetrics->GetXHeight(xHeight);
   PRUnichar minus = 0x2212; // not '-', but official Unicode minus sign
-  nsBoundingMetrics bm;
-  nsresult rv = aRenderingContext.GetBoundingMetrics(&minus, PRUint32(1), bm);
-  if (NS_SUCCEEDED(rv)) {
-    aAxisHeight = bm.ascent - (bm.ascent + bm.descent)/2;
-  }
-  if (NS_FAILED(rv) || aAxisHeight <= 0 || aAxisHeight >= xHeight) {
+  nsBoundingMetrics bm = aRenderingContext.GetBoundingMetrics(&minus, 1);
+  aAxisHeight = bm.ascent - (bm.ascent + bm.descent)/2;
+  if (aAxisHeight <= 0 || aAxisHeight >= xHeight) {
     // fall-back to the other version
     GetAxisHeight(aFontMetrics, aAxisHeight);
   }
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 63f4751672fa..0e158cc31e8e 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -382,8 +382,8 @@ nsMathMLmencloseFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
   GetRuleThickness(aRenderingContext, fm, mRuleThickness);
   GetEmHeight(fm, mEmHeight);
 
-  nsBoundingMetrics bmOne;
-  aRenderingContext.GetBoundingMetrics(NS_LITERAL_STRING("1").get(), 1, bmOne);
+  PRUnichar one = '1';
+  nsBoundingMetrics bmOne = aRenderingContext.GetBoundingMetrics(&one, 1);
 
   ///////////////
   // General rules: the menclose element takes the size of the enclosed content.
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 4744312c4b78..a091db171ee2 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -502,8 +502,8 @@ nsMathMLmfencedFrame::ReflowChar(nsPresContext*      aPresContext,
       if (NS_FAILED(res)) {
         nsAutoString data;
         aMathMLChar->GetData(data);
-        nsBoundingMetrics metrics;
-        aRenderingContext.GetBoundingMetrics(data.get(), data.Length(), metrics);
+        nsBoundingMetrics metrics =
+          aRenderingContext.GetBoundingMetrics(data.get(), data.Length());
         charSize.ascent = metrics.ascent;
         charSize.descent = metrics.descent;
         charSize.width = metrics.width;
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 5d195e017d27..7d8ac7c1acb0 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -270,8 +270,8 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
   nscoord ruleThickness, leading, em;
   GetRuleThickness(renderingContext, fm, ruleThickness);
 
-  nsBoundingMetrics bmOne;
-  renderingContext.GetBoundingMetrics(NS_LITERAL_STRING("1").get(), 1, bmOne);
+  PRUnichar one = '1';
+  nsBoundingMetrics bmOne = renderingContext.GetBoundingMetrics(&one, 1);
 
   // get the leading to be left at the top of the resulting frame
   // this seems more reliable than using fm->GetLeading() on suspicious fonts
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 76197848cc84..b34e8439db29 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -567,8 +567,9 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
            // underline position by getting the text metric.
            // XXX are attribute values always two byte?
            if (mAccessKeyInfo->mAccesskeyIndex > 0)
-               refContext->GetWidth(mCroppedTitle.get(), mAccessKeyInfo->mAccesskeyIndex,
-                                    mAccessKeyInfo->mBeforeWidth);
+               mAccessKeyInfo->mBeforeWidth =
+                   refContext->GetWidth(mCroppedTitle.get(),
+                                        mAccessKeyInfo->mAccesskeyIndex);
            else
                mAccessKeyInfo->mBeforeWidth = 0;
        }
@@ -651,8 +652,9 @@ nsTextBoxFrame::CalculateUnderline(nsRenderingContext& aRenderingContext)
          // are the same for both BiDi and non-BiDi frames.
          const PRUnichar *titleString = mCroppedTitle.get();
          aRenderingContext.SetTextRunRTL(PR_FALSE);
-         aRenderingContext.GetWidth(titleString[mAccessKeyInfo->mAccesskeyIndex],
-                                    mAccessKeyInfo->mAccessWidth);
+         mAccessKeyInfo->mAccessWidth =
+             aRenderingContext.GetWidth(titleString[mAccessKeyInfo->
+                                                    mAccesskeyIndex]);
 
          nscoord offset, baseline;
          nsCOMPtr<nsIFontMetrics> metrics
@@ -694,7 +696,7 @@ nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
     // see if the width is even smaller than the ellipsis
     // if so, clear the text (XXX set as many '.' as we can?).
     aRenderingContext.SetTextRunRTL(PR_FALSE);
-    aRenderingContext.GetWidth(kEllipsis, titleWidth);
+    titleWidth = aRenderingContext.GetWidth(kEllipsis);
 
     if (titleWidth > aWidth) {
         mCroppedTitle.SetLength(0);
@@ -722,7 +724,7 @@ nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
             for (i = 0; i < length; ++i) {
                 PRUnichar ch = mTitle.CharAt(i);
                 // still in LTR mode
-                aRenderingContext.GetWidth(ch,cwidth);
+                cwidth = aRenderingContext.GetWidth(ch);
                 if (twidth + cwidth > aWidth)
                     break;
 
@@ -752,7 +754,7 @@ nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
             int i;
             for (i=length-1; i >= 0; --i) {
                 PRUnichar ch = mTitle.CharAt(i);
-                aRenderingContext.GetWidth(ch,cwidth);
+                cwidth = aRenderingContext.GetWidth(ch);
                 if (twidth + cwidth > aWidth)
                     break;
 
@@ -796,7 +798,7 @@ nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
             for (leftPos = 0; leftPos <= rightPos;) {
                 // look at the next character on the left end
                 ch = mTitle.CharAt(leftPos);
-                aRenderingContext.GetWidth(ch, charWidth);
+                charWidth = aRenderingContext.GetWidth(ch);
                 totalWidth += charWidth;
                 if (totalWidth > aWidth)
                     // greater than the allowable width
@@ -812,7 +814,7 @@ nsTextBoxFrame::CalculateTitleForWidth(nsPresContext*      aPresContext,
                 if (rightPos > leftPos) {
                     // haven't looked at this character yet
                     ch = mTitle.CharAt(rightPos);
-                    aRenderingContext.GetWidth(ch, charWidth);
+                    charWidth = aRenderingContext.GetWidth(ch);
                     totalWidth += charWidth;
                     if (totalWidth > aWidth)
                         // greater than the allowable width
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 1a89293c5491..51ca6fb716f2 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1384,9 +1384,8 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
     // See if the width is even smaller than the ellipsis
     // If so, clear the text completely.
     const nsDependentString& kEllipsis = nsContentUtils::GetLocalizedEllipsis();
-    nscoord ellipsisWidth;
     aRenderingContext.SetTextRunRTL(PR_FALSE);
-    aRenderingContext.GetWidth(kEllipsis, ellipsisWidth);
+    nscoord ellipsisWidth = aRenderingContext.GetWidth(kEllipsis);
 
     width = maxWidth;
     if (ellipsisWidth > width)
@@ -1411,7 +1410,7 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           for (i = 0; i < length; ++i) {
             PRUnichar ch = aText[i];
             // XXX this is horrible and doesn't handle clusters
-            aRenderingContext.GetWidth(ch,cwidth);
+            cwidth = aRenderingContext.GetWidth(ch);
             if (twidth + cwidth > width)
               break;
             twidth += cwidth;
@@ -1429,7 +1428,7 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           int i;
           for (i=length-1; i >= 0; --i) {
             PRUnichar ch = aText[i];
-            aRenderingContext.GetWidth(ch,cwidth);
+            cwidth = aRenderingContext.GetWidth(ch);
             if (twidth + cwidth > width)
               break;
             twidth += cwidth;
@@ -1451,14 +1450,14 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           int rightPos = length - 1;
           for (int leftPos = 0; leftPos < rightPos; ++leftPos) {
             PRUnichar ch = aText[leftPos];
-            aRenderingContext.GetWidth(ch, cwidth);
+            cwidth = aRenderingContext.GetWidth(ch);
             twidth += cwidth;
             if (twidth > width)
               break;
             leftStr.Append(ch);
 
             ch = aText[rightPos];
-            aRenderingContext.GetWidth(ch, cwidth);
+            cwidth = aRenderingContext.GetWidth(ch);
             twidth += cwidth;
             if (twidth > width)
               break;

From f8eccd9ec7d5aff21229c9a1a2aa7ba5a7653b33 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 145/509] Bug 266236 part 7: Simplify calling convention of
 SetClipRect and SetClipRegion.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : b1c68e23a4fa67cdc09b151ad39d7560cdd8baf7
---
 gfx/src/nsRenderingContext.cpp                | 22 ++++++-------------
 gfx/src/nsRenderingContext.h                  | 11 ++--------
 layout/base/nsDisplayList.cpp                 |  4 ++--
 layout/base/nsPresShell.cpp                   |  2 +-
 layout/forms/nsComboboxControlFrame.cpp       |  2 +-
 layout/forms/nsFieldSetFrame.cpp              |  6 ++---
 layout/generic/nsImageFrame.cpp               |  2 +-
 layout/generic/nsPageFrame.cpp                |  4 ++--
 layout/mathml/nsMathMLChar.cpp                |  2 +-
 layout/svg/base/src/nsSVGIntegrationUtils.cpp |  3 +--
 layout/svg/base/src/nsSVGOuterSVGFrame.cpp    |  2 +-
 layout/xul/base/src/nsGroupBoxFrame.cpp       |  6 ++---
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |  2 +-
 13 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 2d76feee2e70..a89bf772c4f2 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -124,14 +124,8 @@ nsRenderingContext::PopState()
 //
 
 void
-nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
+nsRenderingContext::IntersectClip(const nsRect& aRect)
 {
-    if (aCombine == nsClipCombine_kReplace) {
-        mThebes->ResetClip();
-    } else if (aCombine != nsClipCombine_kIntersect) {
-        NS_WARNING("Unexpected usage of SetClipRect");
-    }
-
     mThebes->NewPath();
     gfxRect clipRect(GFX_RECT_FROM_TWIPS_RECT(aRect));
     if (mThebes->UserToDevicePixelSnapped(clipRect, PR_TRUE)) {
@@ -147,15 +141,13 @@ nsRenderingContext::SetClipRect(const nsRect& aRect, nsClipCombine aCombine)
 }
 
 void
-nsRenderingContext::SetClipRegion(const nsIntRegion& aRegion,
-                                  nsClipCombine aCombine)
+nsRenderingContext::SetClip(const nsIntRegion& aRegion)
 {
-    // Region is in device coords, no transformation.
-    // This should only be called when there is no transform in place, when we
-    // we just start painting a widget. The region is set by the platform paint
-    // routine.
-    NS_ASSERTION(aCombine == nsClipCombine_kReplace,
-                 "Unexpected usage of SetClipRegion");
+    // Region is in device coords, no transformation.  This should
+    // only be called when there is no transform in place, when we we
+    // just start painting a widget. The region is set by the platform
+    // paint routine.  Therefore, there is no option to intersect with
+    // an existing clip.
 
     gfxMatrix mat = mThebes->CurrentMatrix();
     mThebes->IdentityMatrix();
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index a91cd9d0e95b..e7955f624536 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -49,13 +49,6 @@
 #include "nsRect.h"
 #include "gfxContext.h"
 
-typedef enum {
-    nsClipCombine_kIntersect = 0,
-    nsClipCombine_kUnion = 1,
-    nsClipCombine_kSubtract = 2,
-    nsClipCombine_kReplace = 3
-} nsClipCombine;
-
 typedef enum {
     nsLineStyle_kNone   = 0,
     nsLineStyle_kSolid  = 1,
@@ -156,8 +149,8 @@ public:
 
     void PushState(void);
     void PopState(void);
-    void SetClipRect(const nsRect& aRect, nsClipCombine aCombine);
-    void SetClipRegion(const nsIntRegion& aRegion, nsClipCombine aCombine);
+    void IntersectClip(const nsRect& aRect);
+    void SetClip(const nsIntRegion& aRegion);
     void SetLineStyle(nsLineStyle aLineStyle);
     void SetColor(nscolor aColor);
     void Translate(const nsPoint& aPt);
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 73445b08045e..5b79c0139f48 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1407,7 +1407,7 @@ nsDisplayBoxShadowOuter::Paint(nsDisplayListBuilder* aBuilder,
 
   for (PRUint32 i = 0; i < rects.Length(); ++i) {
     aCtx->PushState();
-    aCtx->SetClipRect(rects[i], nsClipCombine_kIntersect);
+    aCtx->IntersectClip(rects[i]);
     nsCSSRendering::PaintBoxShadowOuter(presContext, *aCtx, mFrame,
                                         borderRect, rects[i]);
     aCtx->PopState();
@@ -1460,7 +1460,7 @@ nsDisplayBoxShadowInner::Paint(nsDisplayListBuilder* aBuilder,
 
   for (PRUint32 i = 0; i < rects.Length(); ++i) {
     aCtx->PushState();
-    aCtx->SetClipRect(rects[i], nsClipCombine_kIntersect);
+    aCtx->IntersectClip(rects[i]);
     nsCSSRendering::PaintBoxShadowInner(presContext, *aCtx, mFrame,
                                         borderRect, rects[i]);
     aCtx->PopState();
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index b606d00ab647..af767e5c14bf 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5615,7 +5615,7 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
     nsIntRegion region =
       aRegion->ToAppUnits(nsPresContext::AppUnitsPerCSSPixel())
         .ToOutsidePixels(pc->AppUnitsPerDevPixel());
-    rc->SetClipRegion(region, nsClipCombine_kReplace);
+    rc->SetClip(region);
   }
 
   if (resize)
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index c3f1c04c9541..4d5ff333bcfc 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1411,7 +1411,7 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.PushState();
   nsRect clipRect = mDisplayFrame->GetRect() + aPt;
-  aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+  aRenderingContext.IntersectClip(clipRect);
 
   // REVIEW: Why does the old code paint mDisplayFrame again? We've
   // already painted it in the children above. So clipping it here won't do
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index d24e38716838..c6d03a5daa47 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -307,7 +307,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = topBorder;
 
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
@@ -321,7 +321,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = topBorder;
 
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
@@ -334,7 +334,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = mRect.height - (yoff + topBorder);
     
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 4b874a0530e9..d6bd4278f717 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1087,7 +1087,7 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
 
   // Clip so we don't render outside the inner rect
   aRenderingContext.PushState();
-  aRenderingContext.SetClipRect(inner, nsClipCombine_kIntersect);
+  aRenderingContext.IntersectClip(inner);
 
   // Check if we should display image placeholders
   if (gIconLoad->mPrefShowPlaceholders) {
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index abac5b0245a8..0256bab55da4 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -389,7 +389,7 @@ nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
     // set up new clip and draw the text
     aRenderingContext.PushState();
     aRenderingContext.SetColor(NS_RGB(0,0,0));
-    aRenderingContext.SetClipRect(aRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(aRect);
     nsLayoutUtils::DrawString(this, &aRenderingContext, str.get(), str.Length(), nsPoint(x, y + aAscent));
     aRenderingContext.PopState();
   }
@@ -580,7 +580,7 @@ nsPageFrame::PaintPageContent(nsRenderingContext& aRenderingContext,
     NS_ASSERTION(clipRect.y < pageContentFrame->GetSize().height,
                  "Should be clipping to region inside the page content bounds");
   }
-  aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+  aRenderingContext.IntersectClip(clipRect);
 
   nsRect backgroundRect = nsRect(nsPoint(0, 0), pageContentFrame->GetSize());
   nsCSSRendering::PaintBackground(PresContext(), aRenderingContext, this,
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 01b142ba3dab..d0e82902a4c9 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -2200,7 +2200,7 @@ public:
   AutoPushClipRect(nsRenderingContext& aCtx, const nsRect& aRect)
     : mCtx(aCtx) {
     mCtx.PushState();
-    mCtx.SetClipRect(aRect, nsClipCombine_kIntersect);
+    mCtx.IntersectClip(aRect);
   }
   ~AutoPushClipRect() {
     mCtx.PopState();
diff --git a/layout/svg/base/src/nsSVGIntegrationUtils.cpp b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
index afcea3b599d1..a52b7c9da4c6 100644
--- a/layout/svg/base/src/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/base/src/nsSVGIntegrationUtils.cpp
@@ -296,8 +296,7 @@ nsSVGIntegrationUtils::PaintFramesWithEffects(nsRenderingContext* aCtx,
   if (opacity != 1.0f || maskFrame || (clipPathFrame && !isTrivialClip)) {
     complexEffects = PR_TRUE;
     gfx->Save();
-    aCtx->SetClipRect(aEffectsFrame->GetVisualOverflowRect(),
-                      nsClipCombine_kIntersect);
+    aCtx->IntersectClip(aEffectsFrame->GetVisualOverflowRect());
     gfx->PushGroup(gfxASurface::CONTENT_COLOR_ALPHA);
   }
 
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 7d74238b2d24..2fafffcd999b 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -552,7 +552,7 @@ nsSVGOuterSVGFrame::Paint(const nsDisplayListBuilder* aBuilder,
 
   nsRect clipRect;
   clipRect.IntersectRect(aDirtyRect, viewportRect);
-  aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+  aRenderingContext.IntersectClip(clipRect);
   aRenderingContext.Translate(viewportRect.TopLeft());
   nsRect dirtyRect = clipRect - viewportOffset;
 
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/base/src/nsGroupBoxFrame.cpp
index f6f568545052..3e40ca969cf2 100644
--- a/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -196,7 +196,7 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = border.top;
 
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
@@ -210,7 +210,7 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = border.top;
 
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
@@ -225,7 +225,7 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.height = mRect.height - (yoff + border.top);
   
     aRenderingContext.PushState();
-    aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
+    aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 51ca6fb716f2..db6b4fe39939 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -2823,7 +2823,7 @@ nsTreeBodyFrame::PaintTreeBody(nsRenderingContext& aRenderingContext,
   // Update our available height and our page count.
   CalcInnerBox();
   aRenderingContext.PushState();
-  aRenderingContext.SetClipRect(mInnerBox + aPt, nsClipCombine_kIntersect);
+  aRenderingContext.IntersectClip(mInnerBox + aPt);
   PRInt32 oldPageCount = mPageLength;
   if (!mHasFixedRowCount)
     mPageLength = mInnerBox.height/mRowHeight;

From 86131020a536ef7c3ad05dcf660ce3f1a6779791 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 146/509] Bug 266236 part 8: Change
 nsRenderingContext::GetDeviceContext and ::GetFontMetrics to return bare
 pointers.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : 36dd32d715cb75e99cd3a69e460c000c1777d6a6
---
 gfx/src/nsRenderingContext.cpp               | 26 +++++++-------------
 gfx/src/nsRenderingContext.h                 |  6 +++--
 layout/base/nsBidiPresUtils.cpp              |  6 ++---
 layout/base/nsLayoutUtils.cpp                |  6 ++---
 layout/generic/nsBRFrame.cpp                 |  2 +-
 layout/generic/nsBlockFrame.cpp              |  4 +--
 layout/generic/nsImageFrame.cpp              |  2 +-
 layout/generic/nsInlineFrame.cpp             |  2 +-
 layout/generic/nsLineLayout.cpp              |  2 +-
 layout/mathml/nsMathMLContainerFrame.cpp     |  5 ++--
 layout/mathml/nsMathMLFrame.cpp              | 18 ++++++--------
 layout/mathml/nsMathMLmencloseFrame.cpp      |  2 +-
 layout/mathml/nsMathMLmfencedFrame.cpp       |  2 +-
 layout/mathml/nsMathMLmfracFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp |  2 +-
 layout/mathml/nsMathMLmoFrame.cpp            |  4 +--
 layout/mathml/nsMathMLmoverFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmrootFrame.cpp         |  6 ++---
 layout/mathml/nsMathMLmsubsupFrame.cpp       |  2 +-
 layout/mathml/nsMathMLmtableFrame.cpp        |  5 ++--
 layout/mathml/nsMathMLmunderFrame.cpp        |  2 +-
 layout/mathml/nsMathMLmunderoverFrame.cpp    |  2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp       |  3 +--
 widget/src/cocoa/nsNativeThemeCocoa.mm       | 14 ++++++-----
 widget/src/gtk2/nsNativeThemeGTK.cpp         |  6 ++---
 widget/src/qt/nsNativeThemeQt.cpp            |  4 +--
 widget/src/qt/nsNativeThemeQt.h              |  5 ----
 widget/src/windows/nsNativeThemeWin.cpp      |  6 ++---
 28 files changed, 64 insertions(+), 84 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index a89bf772c4f2..17388c40eba0 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -100,12 +100,9 @@ nsRenderingContext::Init(nsIDeviceContext* aContext,
     mP2A = mDeviceContext->AppUnitsPerDevPixel();
 }
 
-already_AddRefed<nsIDeviceContext>
-nsRenderingContext::GetDeviceContext()
-{
-    NS_IF_ADDREF(mDeviceContext);
-    return mDeviceContext.get();
-}
+//
+// graphics state
+//
 
 void
 nsRenderingContext::PushState()
@@ -119,10 +116,6 @@ nsRenderingContext::PopState()
     mThebes->Restore();
 }
 
-//
-// clipping
-//
-
 void
 nsRenderingContext::IntersectClip(const nsRect& aRect)
 {
@@ -208,6 +201,10 @@ nsRenderingContext::Scale(float aSx, float aSy)
     mThebes->Scale(aSx, aSy);
 }
 
+//
+// shapes
+//
+
 void
 nsRenderingContext::DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt)
 {
@@ -445,7 +442,9 @@ nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
     mThebes->Fill();
 }
 
+//
 // text
+//
 
 void
 nsRenderingContext::SetRightToLeftText(PRBool aIsRTL)
@@ -485,13 +484,6 @@ nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
     mFontMetrics = static_cast<nsIThebesFontMetrics*>(aFontMetrics);
 }
 
-already_AddRefed<nsIFontMetrics>
-nsRenderingContext::GetFontMetrics()
-{
-    NS_IF_ADDREF(mFontMetrics);
-    return mFontMetrics.get();
-}
-
 PRInt32
 nsRenderingContext::GetMaxChunkLength()
 {
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index e7955f624536..94b2c359b120 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -142,8 +142,10 @@ public:
     void Init(nsIDeviceContext* aContext, gfxASurface* aThebesSurface);
     void Init(nsIDeviceContext* aContext, gfxContext* aThebesContext);
 
-    already_AddRefed<nsIDeviceContext> GetDeviceContext();
+    // These accessors will never return null.
     gfxContext *ThebesContext() { return mThebes; }
+    nsIDeviceContext *DeviceContext() { return mDeviceContext; }
+    PRInt32 AppUnitsPerDevPixel() { return mP2A; }
 
     // Graphics state
 
@@ -194,7 +196,7 @@ public:
                  gfxUserFontSet *aUserFontSet);
     void SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
     void SetFont(nsIFontMetrics *aFontMetrics);
-    already_AddRefed<nsIFontMetrics> GetFontMetrics();
+    nsIThebesFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
 
     void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index dae23e64c512..b63cc402009f 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -1785,10 +1785,8 @@ public:
   virtual void DrawText(nscoord aXOffset,
                         nscoord)
   {
-    nsCOMPtr<nsIFontMetrics> metrics = mCtx->GetFontMetrics();
-    nsIThebesFontMetrics* fm = static_cast<nsIThebesFontMetrics*>(metrics.get());
-    fm->DrawString(mText, mLength, mPt.x + aXOffset, mPt.y,
-                   mCtx, mTextRunConstructionContext);
+    mCtx->FontMetrics()->DrawString(mText, mLength, mPt.x + aXOffset, mPt.y,
+                                    mCtx, mTextRunConstructionContext);
   }
 
 private:
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 8b29a4f99204..ad2a608c5e17 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -3264,8 +3264,7 @@ DrawImageInternal(nsRenderingContext* aRenderingContext,
                   const nsIntSize&     aImageSize,
                   PRUint32             aImageFlags)
 {
-  nsCOMPtr<nsIDeviceContext> dc = aRenderingContext->GetDeviceContext();
-  PRInt32 appUnitsPerDevPixel = dc->AppUnitsPerDevPixel();
+  PRInt32 appUnitsPerDevPixel = aRenderingContext->AppUnitsPerDevPixel();
   gfxContext* ctx = aRenderingContext->ThebesContext();
 
   SnappedImageDrawingParameters drawingParams =
@@ -3295,8 +3294,7 @@ nsLayoutUtils::DrawPixelSnapped(nsRenderingContext* aRenderingContext,
                                 const nsPoint&       aAnchor,
                                 const nsRect&        aDirty)
 {
-  nsCOMPtr<nsIDeviceContext> dc = aRenderingContext->GetDeviceContext();
-  PRInt32 appUnitsPerDevPixel = dc->AppUnitsPerDevPixel();
+  PRInt32 appUnitsPerDevPixel = aRenderingContext->AppUnitsPerDevPixel();
   gfxContext* ctx = aRenderingContext->ThebesContext();
   gfxIntSize drawableSize = aDrawable->Size();
   nsIntSize imageSize(drawableSize.width, drawableSize.height);
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index 30948ca52afa..0fbe88912517 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -152,7 +152,7 @@ BRFrame::Reflow(nsPresContext* aPresContext,
       // normal inline frame.  That line-height is used is important
       // here for cases where the line-height is less than 1.
       nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-      nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
+      nsIFontMetrics *fm = aReflowState.rendContext->FontMetrics();
       if (fm) {
         nscoord logicalHeight = aReflowState.CalcLineHeight();
         aMetrics.height = logicalHeight;
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 619c45246c56..6126f8b59469 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -2370,10 +2370,10 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
 
       nsRenderingContext *rc = aState.mReflowState.rendContext;
       nsLayoutUtils::SetFontFromStyle(rc, GetStyleContext());
-      nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
 
       nscoord minAscent =
-        nsLayoutUtils::GetCenteredFontBaseline(fm, aState.mMinLineHeight);
+        nsLayoutUtils::GetCenteredFontBaseline(rc->FontMetrics(),
+                                               aState.mMinLineHeight);
       nscoord minDescent = aState.mMinLineHeight - minAscent;
 
       aState.mY += NS_MAX(minAscent, metrics.ascent) +
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index d6bd4278f717..7b46a08f9520 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -975,7 +975,7 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
   nsLayoutUtils::SetFontFromStyle(&aRenderingContext, mStyleContext);
 
   // Format the text to display within the formatting rect
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord maxAscent, maxDescent, height;
   fm->GetMaxAscent(maxAscent);
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 41a2fa158b53..de2ef02646fa 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -644,7 +644,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
   }
 
   nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-  nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
+  nsIFontMetrics* fm = aReflowState.rendContext->FontMetrics();
 
   if (fm) {
     // Compute final height of the frame.
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 6864b90b21bc..dee33d9c8088 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1563,7 +1563,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
   nsStyleContext* styleContext = spanFrame->GetStyleContext();
   nsRenderingContext* rc = mBlockReflowState->rendContext;
   nsLayoutUtils::SetFontFromStyle(mBlockReflowState->rendContext, styleContext);
-  nsCOMPtr<nsIFontMetrics> fm = rc->GetFontMetrics();
+  nsIFontMetrics* fm = rc->FontMetrics();
 
   PRBool preMode = mStyleText->WhiteSpaceIsSignificant();
 
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index aee7c6e117fb..c579deba8520 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -102,7 +102,7 @@ nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
     aRenderingContext.GetBoundingMetrics(errorMsg.get(), errorMsg.Length());
 
   // reflow metrics
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
   fm->GetMaxAscent(aDesiredSize.ascent);
   nscoord descent;
   fm->GetMaxDescent(descent);
@@ -144,8 +144,7 @@ void nsDisplayMathMLError::Paint(nsDisplayListBuilder* aBuilder,
   aCtx->SetColor(NS_RGB(255,255,255));
 
   nscoord ascent;
-  nsCOMPtr<nsIFontMetrics> fm = aCtx->GetFontMetrics();
-  fm->GetMaxAscent(ascent);
+  aCtx->FontMetrics()->GetMaxAscent(ascent);
 
   nsAutoString errorMsg; errorMsg.AssignLiteral("invalid-markup");
   aCtx->DrawString(errorMsg.get(), PRUint32(errorMsg.Length()), pt.x, pt.y+ascent);
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index f141f2816d65..82db5245b074 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -281,11 +281,10 @@ nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
 {
   // get the bounding metrics of the overbar char, the rendering context
   // is assumed to have been set with the font of the current style context
-#ifdef NS_DEBUG
-  nsCOMPtr<nsIFontMetrics> currFontMetrics = aRenderingContext.GetFontMetrics();
-  NS_ASSERTION(currFontMetrics->Font().Equals(aFontMetrics->Font()),
-      "unexpected state");
-#endif
+  NS_ASSERTION(aRenderingContext.FontMetrics()->Font().
+               Equals(aFontMetrics->Font()),
+               "unexpected state");
+
   nscoord xHeight;
   aFontMetrics->GetXHeight(xHeight);
   PRUnichar overBar = 0x00AF;
@@ -304,11 +303,10 @@ nsMathMLFrame::GetAxisHeight(nsRenderingContext& aRenderingContext,
 {
   // get the bounding metrics of the minus sign, the rendering context
   // is assumed to have been set with the font of the current style context
-#ifdef NS_DEBUG
-  nsCOMPtr<nsIFontMetrics> currFontMetrics = aRenderingContext.GetFontMetrics();
-  NS_ASSERTION(currFontMetrics->Font().Equals(aFontMetrics->Font()),
-	"unexpected state");
-#endif
+  NS_ASSERTION(aRenderingContext.FontMetrics()->Font().
+               Equals(aFontMetrics->Font()),
+               "unexpected state");
+
   nscoord xHeight;
   aFontMetrics->GetXHeight(xHeight);
   PRUnichar minus = 0x2212; // not '-', but official Unicode minus sign
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 0e158cc31e8e..39be5d717baf 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -378,7 +378,7 @@ nsMathMLmencloseFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
   nscoord mEmHeight;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
   GetRuleThickness(aRenderingContext, fm, mRuleThickness);
   GetEmHeight(fm, mEmHeight);
 
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index a091db171ee2..d85f09b3d28a 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -245,7 +245,7 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
   const nsStyleFont* font = GetStyleFont();
   aReflowState.rendContext->SetFont(font->mFont,
                                     aPresContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
+  nsIFontMetrics* fm = aReflowState.rendContext->FontMetrics();
   nscoord axisHeight, em;
   GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);
   GetEmHeight(fm, em);
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 7ae94a35f451..070430189d9d 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -270,7 +270,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             presContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord defaultRuleThickness, axisHeight;
   GetRuleThickness(aRenderingContext, fm, defaultRuleThickness);
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index 7710cc710f84..2fed0b9a9c37 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -163,7 +163,7 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
   const nsStyleFont* font = GetStyleFont();
   aRenderingContext.SetFont(font->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index 32a7b866ff76..d9e01b371ac4 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -640,12 +640,12 @@ nsMathMLmoFrame::Stretch(nsRenderingContext& aRenderingContext,
   // get the axis height;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
   nscoord axisHeight, height;
   GetAxisHeight(aRenderingContext, fm, axisHeight);
 
   // get the leading to be left at the top and the bottom of the stretched char
-  // this seems more reliable than using fm->GetLeading() on suspicious fonts               
+  // this seems more reliable than using fm->GetLeading() on suspicious fonts
   nscoord em;
   GetEmHeight(fm, em);
   nscoord leading = NSToCoordRound(0.2f * em);
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index 055427562156..53c318f48579 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -284,7 +284,7 @@ nsMathMLmoverFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 7d8ac7c1acb0..96c3a82ca29b 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -261,7 +261,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
 
   renderingContext.SetFont(GetStyleFont()->mFont,
                            aPresContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = renderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = renderingContext.FontMetrics();
 
   // For radical glyphs from TeX fonts and some of the radical glyphs from
   // Mathematica fonts, the thickness of the overline can be obtained from the
@@ -413,9 +413,9 @@ nsMathMLmrootFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext)
                                          nsLayoutUtils::PREF_WIDTH);
   nscoord sqrWidth = mSqrChar.GetMaxWidth(PresContext(), *aRenderingContext);
 
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext->GetFontMetrics();
   nscoord dxSqr;
-  GetRadicalXOffsets(indexWidth, sqrWidth, fm, nsnull, &dxSqr);
+  GetRadicalXOffsets(indexWidth, sqrWidth, aRenderingContext->FontMetrics(),
+                     nsnull, &dxSqr);
 
   return dxSqr + sqrWidth + baseWidth;
 }
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index 1259db5f61d4..8ea764dfae75 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -196,7 +196,7 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
 
   aRenderingContext.SetFont(baseFrame->GetStyleFont()->mFont,
                             aPresContext->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   // get x-height (an ex)
   nscoord xHeight;
diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp
index 701ef0fcf8d2..91a1c550b806 100644
--- a/layout/mathml/nsMathMLmtableFrame.cpp
+++ b/layout/mathml/nsMathMLmtableFrame.cpp
@@ -639,9 +639,10 @@ nsMathMLmtableOuterFrame::Reflow(nsPresContext*          aPresContext,
       // XXX should instead use style data from the row of reference here ?
       aReflowState.rendContext->SetFont(GetStyleFont()->mFont,
                                         aPresContext->GetUserFontSet());
-      nsCOMPtr<nsIFontMetrics> fm = aReflowState.rendContext->GetFontMetrics();
       nscoord axisHeight;
-      GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);
+      GetAxisHeight(*aReflowState.rendContext,
+                    aReflowState.rendContext->FontMetrics(),
+                    axisHeight);
       if (rowFrame) {
         // anchor the table on the axis of the row of reference
         // XXX fallback to baseline because it is a hard problem
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index 2abca025adea..6108e1f3d33f 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -281,7 +281,7 @@ nsMathMLmunderFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index 15515490bc87..b6b14929f352 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -323,7 +323,7 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsCOMPtr<nsIFontMetrics> fm = aRenderingContext.GetFontMetrics();
+  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index b34e8439db29..c7758f7af326 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -657,8 +657,7 @@ nsTextBoxFrame::CalculateUnderline(nsRenderingContext& aRenderingContext)
                                                     mAccesskeyIndex]);
 
          nscoord offset, baseline;
-         nsCOMPtr<nsIFontMetrics> metrics
-             = aRenderingContext.GetFontMetrics();
+         nsIFontMetrics* metrics = aRenderingContext.FontMetrics();
          metrics->GetUnderline(offset, mAccessKeyInfo->mAccessUnderlineSize);
          metrics->GetMaxAscent(baseline);
          mAccessKeyInfo->mAccessOffset = baseline - offset;
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index ef5568004d5d..3a52ff8392f1 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -1494,17 +1494,19 @@ nsNativeThemeCocoa::DrawResizer(CGContextRef cgContext, const HIRect& aRect,
 }
 
 NS_IMETHODIMP
-nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, nsIFrame* aFrame,
-                                         PRUint8 aWidgetType, const nsRect& aRect,
+nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
+                                         nsIFrame* aFrame,
+                                         PRUint8 aWidgetType,
+                                         const nsRect& aRect,
                                          const nsRect& aDirtyRect)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   // setup to draw into the correct port
-  nsCOMPtr<nsIDeviceContext> dctx = aContext->GetDeviceContext();
-  PRInt32 p2a = dctx->AppUnitsPerDevPixel();
+  PRInt32 p2a = aContext->AppUnitsPerDevPixel();
 
-  gfxRect nativeDirtyRect(aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
+  gfxRect nativeDirtyRect(aDirtyRect.x, aDirtyRect.y,
+                          aDirtyRect.width, aDirtyRect.height);
   gfxRect nativeWidgetRect(aRect.x, aRect.y, aRect.width, aRect.height);
   nativeWidgetRect.ScaleInverse(gfxFloat(p2a));
   nativeDirtyRect.ScaleInverse(gfxFloat(p2a));
@@ -1512,7 +1514,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, nsIFrame*
   if (nativeWidgetRect.IsEmpty())
     return NS_OK; // Don't attempt to draw invisible widgets.
 
-  nsRefPtr<gfxContext> thebesCtx = aContext->ThebesContext();
+  gfxContext* thebesCtx = aContext->ThebesContext();
   if (!thebesCtx)
     return NS_ERROR_FAILURE;
 
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index f15b69c1aa80..0aa8cff26030 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -1135,11 +1135,9 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsRenderingContext* aContext,
   case NS_THEME_TREEVIEW_HEADER_CELL:
     {
       // Just include our border, and let the box code augment the size.
-
-      nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
-
       nsIntMargin border;
-      nsNativeThemeGTK::GetWidgetBorder(dc, aFrame, aWidgetType, &border);
+      nsNativeThemeGTK::GetWidgetBorder(aContext->DeviceContext(),
+                                        aFrame, aWidgetType, &border);
       aResult->width = border.left + border.right;
       aResult->height = border.top + border.bottom;
     }
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 879ef35e0421..e9b616bcadcd 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -200,7 +200,7 @@ nsNativeThemeQt::DrawWidgetBackground(QPainter *qPainter,
     QMatrix qctm(ctm.xx, ctm.yx, ctm.xy, ctm.yy, ctm.x0, ctm.y0);
     qPainter->setWorldMatrix(qctm, true);
 
-    PRInt32 p2a = GetAppUnitsPerDevPixel(aContext);
+    PRInt32 p2a = aContext->AppUnitsPerDevPixel();
 
     QRect r = qRectInPixels(aRect, p2a);
     QRect cr = qRectInPixels(aClipRect, p2a);
@@ -395,7 +395,7 @@ nsNativeThemeQt::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* aF
 
     QStyle *s = qApp->style();
 
-    PRInt32 p2a = GetAppUnitsPerDevPixel(aContext);
+    PRInt32 p2a = aContext->AppUnitsPerDevPixel();
 
     switch (aWidgetType) {
     case NS_THEME_RADIO:
diff --git a/widget/src/qt/nsNativeThemeQt.h b/widget/src/qt/nsNativeThemeQt.h
index ca2cb46f593f..266b32c47b0a 100644
--- a/widget/src/qt/nsNativeThemeQt.h
+++ b/widget/src/qt/nsNativeThemeQt.h
@@ -111,11 +111,6 @@ private:
                                        const nsRect& aRect,
                                        const nsRect& aClipRect);
 
-  inline PRInt32 GetAppUnitsPerDevPixel(nsRenderingContext* aContext){
-    nsCOMPtr<nsIDeviceContext> dctx = aContext->GetDeviceContext();
-    return dctx->AppUnitsPerDevPixel();
-  }
-
   void InitButtonStyle(PRUint8 widgetType,
                        nsIFrame* aFrame,
                        QRect rect,
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 6d84161b7c42..6c9058754adb 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1246,8 +1246,7 @@ nsNativeThemeWin::DrawWidgetBackground(nsRenderingContext* aContext,
   if (NS_FAILED(rv))
     return rv;
 
-  nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
-  gfxFloat p2a = gfxFloat(dc->AppUnitsPerDevPixel());
+  gfxFloat p2a = gfxFloat(aContext->AppUnitsPerDevPixel());
   RECT widgetRect;
   RECT clipRect;
   gfxRect tr(aRect.x, aRect.y, aRect.width, aRect.height),
@@ -3114,8 +3113,7 @@ nsresult nsNativeThemeWin::ClassicDrawWidgetBackground(nsRenderingContext* aCont
   if (NS_FAILED(rv))
     return rv;
 
-  nsCOMPtr<nsIDeviceContext> dc = aContext->GetDeviceContext();
-  gfxFloat p2a = gfxFloat(dc->AppUnitsPerDevPixel());
+  gfxFloat p2a = gfxFloat(aContext->AppUnitsPerDevPixel());
   RECT widgetRect;
   gfxRect tr(aRect.x, aRect.y, aRect.width, aRect.height),
           dr(aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);

From 1628ea1551b335e62dc81bddf9e1cf6bb89a99ba Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:40 -0700
Subject: [PATCH 147/509] Bug 266236 part 9: Move nsBoundingMetrics to its own
 header and prune inclusions of nsRenderingContext.h.

--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
rename : gfx/src/nsThebesRenderingContext.h => gfx/src/nsRenderingContext.h
extra : rebase_source : 92660748436f03475e011184e2828f1db0ad63e0
---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |   1 -
 .../html/content/public/nsHTMLCanvasElement.h |   2 -
 .../html/content/src/nsHTMLAudioElement.cpp   |   1 -
 .../html/content/src/nsHTMLMediaElement.cpp   |   1 -
 .../html/content/src/nsHTMLVideoElement.cpp   |   1 -
 content/media/nsMediaDecoder.cpp              |   1 -
 embedding/browser/webBrowser/nsWebBrowser.cpp |   1 -
 gfx/layers/basic/BasicLayers.cpp              |   1 -
 gfx/src/Makefile.in                           |   1 +
 gfx/src/nsBoundingMetrics.h                   | 120 ++++++++++++++++++
 gfx/src/nsRenderingContext.cpp                |   2 +
 gfx/src/nsRenderingContext.h                  |  83 +-----------
 gfx/src/nsSystemFontsGTK2.cpp                 |   1 -
 gfx/src/nsSystemFontsMac.h                    |   4 +-
 gfx/src/nsThebesDeviceContext.cpp             |   2 +-
 gfx/src/nsThebesFontMetrics.cpp               |   4 +-
 gfx/src/nsThebesFontMetrics.h                 |  11 +-
 layout/base/FrameLayerBuilder.cpp             |   1 +
 layout/base/nsCSSRendering.h                  |   2 +-
 layout/base/nsDisplayList.cpp                 |   1 +
 layout/base/nsDisplayList.h                   |   9 +-
 layout/base/nsDocumentViewer.cpp              |   1 +
 layout/base/nsIPresShell.h                    |   1 +
 layout/base/nsPresContext.cpp                 |   1 -
 layout/base/nsPresShell.cpp                   |  28 ++--
 layout/forms/nsButtonFrameRenderer.cpp        |   1 -
 layout/forms/nsComboboxControlFrame.cpp       |   1 +
 layout/forms/nsFieldSetFrame.cpp              |   1 +
 layout/forms/nsGfxCheckboxControlFrame.cpp    |   1 +
 layout/forms/nsGfxRadioControlFrame.cpp       |   1 +
 layout/forms/nsHTMLButtonControlFrame.cpp     |   1 -
 layout/forms/nsImageControlFrame.cpp          |   1 -
 layout/forms/nsTextControlFrame.cpp           |   1 +
 layout/generic/nsBlockFrame.cpp               |   1 +
 layout/generic/nsCanvasFrame.h                |  12 +-
 layout/generic/nsContainerFrame.cpp           |   1 -
 layout/generic/nsHTMLReflowMetrics.h          |   3 +-
 layout/generic/nsHTMLReflowState.cpp          |   1 -
 layout/generic/nsPageContentFrame.cpp         |   1 -
 layout/generic/nsSubDocumentFrame.cpp         |   1 -
 layout/generic/nsVideoFrame.cpp               |   1 -
 layout/inspector/src/inDOMView.cpp            |   1 +
 layout/inspector/src/inDeepTreeWalker.cpp     |   2 +
 layout/inspector/src/inFlasher.cpp            |   1 +
 layout/inspector/src/inFlasher.h              |   9 +-
 layout/inspector/src/inLayoutUtils.h          |  17 ++-
 layout/mathml/nsIMathMLFrame.h                |   2 +-
 layout/mathml/nsMathMLForeignFrameWrapper.cpp |   1 -
 layout/mathml/nsMathMLFrame.cpp               |   1 +
 layout/mathml/nsMathMLFrame.h                 |   1 -
 layout/mathml/nsMathMLTokenFrame.cpp          |   1 -
 layout/mathml/nsMathMLmactionFrame.cpp        |   1 -
 layout/mathml/nsMathMLmpaddedFrame.cpp        |   1 -
 layout/mathml/nsMathMLmphantomFrame.cpp       |   1 -
 layout/mathml/nsMathMLmrowFrame.cpp           |   1 -
 layout/mathml/nsMathMLmspaceFrame.cpp         |   1 -
 layout/mathml/nsMathMLmstyleFrame.cpp         |   1 -
 layout/mathml/nsMathMLmsubFrame.cpp           |   1 -
 layout/mathml/nsMathMLmsupFrame.cpp           |   1 -
 layout/printing/nsPrintEngine.cpp             |   3 +-
 layout/tables/nsTableOuterFrame.cpp           |   1 -
 layout/tables/nsTableRowFrame.cpp             |   1 -
 layout/tables/nsTableRowGroupFrame.cpp        |   1 -
 layout/xul/base/src/nsBox.cpp                 |   1 -
 layout/xul/base/src/nsDocElementBoxFrame.cpp  |   1 -
 layout/xul/base/src/nsGroupBoxFrame.cpp       |   1 +
 layout/xul/base/src/nsImageBoxFrame.cpp       |   1 -
 layout/xul/base/src/nsLeafBoxFrame.cpp        |   1 -
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |   1 -
 layout/xul/base/src/nsRootBoxFrame.cpp        |   1 -
 layout/xul/base/src/nsSplitterFrame.cpp       |   1 +
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   5 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.h   |   5 +-
 view/public/nsIViewManager.h                  |   1 -
 widget/src/gtk2/nsNativeThemeGTK.cpp          |   1 +
 widget/src/gtk2/nsWindow.cpp                  |   1 -
 widget/src/windows/nsDragService.cpp          |   1 +
 widget/src/xpwidgets/nsBaseDragService.h      |   4 +-
 78 files changed, 208 insertions(+), 178 deletions(-)
 create mode 100644 gfx/src/nsBoundingMetrics.h

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 5a8f0c462cc6..cf067f8f2005 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -76,7 +76,6 @@
 #include "nsReadableUtils.h"
 
 #include "nsColor.h"
-#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsGfxCIID.h"
 #include "nsIScriptSecurityManager.h"
diff --git a/content/html/content/public/nsHTMLCanvasElement.h b/content/html/content/public/nsHTMLCanvasElement.h
index 52dc798e09eb..630a789899dd 100644
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@@ -48,8 +48,6 @@
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"
 
-#include "nsRenderingContext.h"
-
 #include "nsICanvasRenderingContextInternal.h"
 #include "nsICanvasElementExternal.h"
 #include "nsIDOMCanvasRenderingContext2D.h"
diff --git a/content/html/content/src/nsHTMLAudioElement.cpp b/content/html/content/src/nsHTMLAudioElement.cpp
index 630ad57859fc..af5520c883b1 100644
--- a/content/html/content/src/nsHTMLAudioElement.cpp
+++ b/content/html/content/src/nsHTMLAudioElement.cpp
@@ -61,7 +61,6 @@
 #include "jstypedarray.h"
 #include "nsJSUtils.h"
 
-#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index ca09e2835816..4f257d55dc6b 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -65,7 +65,6 @@
 #include "nsIXPConnect.h"
 #include "jsapi.h"
 
-#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLVideoElement.cpp b/content/html/content/src/nsHTMLVideoElement.cpp
index 25d6e2963099..57213ef092e7 100644
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -58,7 +58,6 @@
 #include "nsIXPConnect.h"
 #include "jsapi.h"
 
-#include "nsRenderingContext.h"
 #include "nsITimer.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/media/nsMediaDecoder.cpp b/content/media/nsMediaDecoder.cpp
index 52e31158d925..c4573a37c56c 100644
--- a/content/media/nsMediaDecoder.cpp
+++ b/content/media/nsMediaDecoder.cpp
@@ -47,7 +47,6 @@
 #include "nsIDOMHTMLMediaElement.h"
 #include "nsNetUtil.h"
 #include "nsHTMLMediaElement.h"
-#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "nsPresContext.h"
 #include "nsDOMError.h"
diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index b335a29edbde..629d6c410265 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -76,7 +76,6 @@
 #include "gfxContext.h"
 
 // for painting the background window
-#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsIRegion.h"
 #include "nsILookAndFeel.h"
diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 0ed40484b5b6..e0b15584483c 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -48,7 +48,6 @@
 
 #include "nsTArray.h"
 #include "nsGUIEvent.h"
-#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
 #include "gfxPattern.h"
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index de4d3bcfedb9..30b94cf093bc 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -81,6 +81,7 @@ EXPORTS	= \
 	nsThemeConstants.h \
 	gfxCrashReporterUtils.h \
 	nsIThebesFontMetrics.h \
+	nsBoundingMetrics.h \
 	$(NULL)
 
 ifdef MOZ_X11
diff --git a/gfx/src/nsBoundingMetrics.h b/gfx/src/nsBoundingMetrics.h
new file mode 100644
index 000000000000..a90827623f9d
--- /dev/null
+++ b/gfx/src/nsBoundingMetrics.h
@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Christopher Blizzard <blizzard@mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef __nsBoundingMetrics_h
+#define __nsBoundingMetrics_h
+
+#include "nsCoord.h"
+
+/* Struct used for accurate measurements of a string, in order to
+ * allow precise positioning when processing MathML.  This is in its
+ * own header file because some very-widely-included headers need it
+ * but not the rest of nsIFontMetrics, or vice versa.
+ */
+
+#ifdef MOZ_MATHML
+struct nsBoundingMetrics {
+
+    ///////////
+    // Metrics that _exactly_ enclose the text:
+
+    // The character coordinate system is the one used on X Windows:
+    // 1. The origin is located at the intersection of the baseline
+    //    with the left of the character's cell.
+    // 2. All horizontal bearings are oriented from left to right.
+    // 2. All horizontal bearings are oriented from left to right.
+    // 3. The ascent is oriented from bottom to top (being 0 at the orgin).
+    // 4. The descent is oriented from top to bottom (being 0 at the origin).
+
+    // Note that Win32/Mac/PostScript use a different convention for
+    // the descent (all vertical measurements are oriented from bottom
+    // to top on these palatforms). Make sure to flip the sign of the
+    // descent on these platforms for cross-platform compatibility.
+
+    // Any of the following member variables listed here can have
+    // positive or negative value.
+
+    nscoord leftBearing;
+    /* The horizontal distance from the origin of the drawing
+       operation to the left-most part of the drawn string. */
+
+    nscoord rightBearing;
+    /* The horizontal distance from the origin of the drawing
+       operation to the right-most part of the drawn string.
+       The _exact_ width of the string is therefore:
+       rightBearing - leftBearing */
+
+    nscoord ascent;
+    /* The vertical distance from the origin of the drawing
+       operation to the top-most part of the drawn string. */
+
+    nscoord descent;
+    /* The vertical distance from the origin of the drawing
+       operation to the bottom-most part of the drawn string.
+       The _exact_ height of the string is therefore:
+       ascent + descent */
+
+    nscoord width;
+    /* The horizontal distance from the origin of the drawing
+       operation to the correct origin for drawing another string
+       to follow the current one. Depending on the font, this
+       could be greater than or less than the right bearing. */
+
+    nsBoundingMetrics() : leftBearing(0), rightBearing(0),
+                          ascent(0), descent(0), width(0)
+    {}
+
+    void
+    operator += (const nsBoundingMetrics& bm) {
+        if (ascent + descent == 0 && rightBearing - leftBearing == 0) {
+            ascent = bm.ascent;
+            descent = bm.descent;
+            leftBearing = width + bm.leftBearing;
+            rightBearing = width + bm.rightBearing;
+        }
+        else {
+            if (ascent < bm.ascent) ascent = bm.ascent;
+            if (descent < bm.descent) descent = bm.descent;
+            leftBearing = PR_MIN(leftBearing, width + bm.leftBearing);
+            rightBearing = PR_MAX(rightBearing, width + bm.rightBearing);
+        }
+        width += bm.width;
+    }
+};
+#endif // MOZ_MATHML
+
+#endif // __nsBoundingMetrics_h
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 17388c40eba0..e5a1b0830d55 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -38,6 +38,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsRenderingContext.h"
+#include "nsBoundingMetrics.h"
+#include "nsRegion.h"
 
 // XXXTodo: rename FORM_TWIPS to FROM_APPUNITS
 #define FROM_TWIPS(_x)  ((gfxFloat)((_x)/(mP2A)))
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 94b2c359b120..0cd6236738d0 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -39,16 +39,16 @@
 #ifndef NSRENDERINGCONTEXT__H__
 #define NSRENDERINGCONTEXT__H__
 
+#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
 #include "nsIThebesFontMetrics.h"
-#include "nsIRegion.h"
-#include "nsPoint.h"
-#include "nsSize.h"
 #include "nsColor.h"
-#include "nsRect.h"
+#include "nsCoord.h"
 #include "gfxContext.h"
 
+class nsIntRegion;
+
 typedef enum {
     nsLineStyle_kNone   = 0,
     nsLineStyle_kSolid  = 1,
@@ -56,81 +56,6 @@ typedef enum {
     nsLineStyle_kDotted = 3
 } nsLineStyle;
 
-#ifdef MOZ_MATHML
-/* Struct used for accurate measurements of a string in order
- * to allow precise positioning when processing MathML.
- */
-struct nsBoundingMetrics {
-
-    ///////////
-    // Metrics that _exactly_ enclose the text:
-
-    // The character coordinate system is the one used on X Windows:
-    // 1. The origin is located at the intersection of the baseline
-    //    with the left of the character's cell.
-    // 2. All horizontal bearings are oriented from left to right.
-    // 2. All horizontal bearings are oriented from left to right.
-    // 3. The ascent is oriented from bottom to top (being 0 at the orgin).
-    // 4. The descent is oriented from top to bottom (being 0 at the origin).
-
-    // Note that Win32/Mac/PostScript use a different convention for
-    // the descent (all vertical measurements are oriented from bottom
-    // to top on these palatforms). Make sure to flip the sign of the
-    // descent on these platforms for cross-platform compatibility.
-
-    // Any of the following member variables listed here can have
-    // positive or negative value.
-
-    nscoord leftBearing;
-    /* The horizontal distance from the origin of the drawing
-       operation to the left-most part of the drawn string. */
-
-    nscoord rightBearing;
-    /* The horizontal distance from the origin of the drawing
-       operation to the right-most part of the drawn string.
-       The _exact_ width of the string is therefore:
-       rightBearing - leftBearing */
-
-    nscoord ascent;
-    /* The vertical distance from the origin of the drawing
-       operation to the top-most part of the drawn string. */
-
-    nscoord descent;
-    /* The vertical distance from the origin of the drawing
-       operation to the bottom-most part of the drawn string.
-       The _exact_ height of the string is therefore:
-       ascent + descent */
-
-    nscoord width;
-    /* The horizontal distance from the origin of the drawing
-       operation to the correct origin for drawing another string
-       to follow the current one. Depending on the font, this
-       could be greater than or less than the right bearing. */
-
-    nsBoundingMetrics() : leftBearing(0), rightBearing(0),
-                          ascent(0), descent(0), width(0)
-    {}
-
-    void
-    operator += (const nsBoundingMetrics& bm) {
-        if (ascent + descent == 0 && rightBearing - leftBearing == 0) {
-            ascent = bm.ascent;
-            descent = bm.descent;
-            leftBearing = width + bm.leftBearing;
-            rightBearing = width + bm.rightBearing;
-        }
-        else {
-            if (ascent < bm.ascent) ascent = bm.ascent;
-            if (descent < bm.descent) descent = bm.descent;
-            leftBearing = PR_MIN(leftBearing, width + bm.leftBearing);
-            rightBearing = PR_MAX(rightBearing, width + bm.rightBearing);
-        }
-        width += bm.width;
-    }
-};
-#endif // MOZ_MATHML
-
-
 class nsRenderingContext
 {
 public:
diff --git a/gfx/src/nsSystemFontsGTK2.cpp b/gfx/src/nsSystemFontsGTK2.cpp
index 612c2404bd74..f2d231853ad6 100644
--- a/gfx/src/nsSystemFontsGTK2.cpp
+++ b/gfx/src/nsSystemFontsGTK2.cpp
@@ -40,7 +40,6 @@
 #include <stdlib.h>
 
 #include "nsSystemFontsGTK2.h"
-#include "nsRenderingContext.h"
 #include "prlink.h"
 
 #include <gtk/gtk.h>
diff --git a/gfx/src/nsSystemFontsMac.h b/gfx/src/nsSystemFontsMac.h
index bef1a57a16a8..e41ca1d95be9 100644
--- a/gfx/src/nsSystemFontsMac.h
+++ b/gfx/src/nsSystemFontsMac.h
@@ -38,8 +38,8 @@
 #ifndef _NS_SYSTEMFONTSMAC_H_
 #define _NS_SYSTEMFONTSMAC_H_
 
-#include <gfxFont.h>
-#include <nsIDeviceContext.h>
+#include "gfxFont.h"
+#include "nsIDeviceContext.h"
 
 class nsSystemFontsMac
 {
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index c08d564ebdd9..c39cedd9f542 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -39,7 +39,7 @@
 
 #include "nsFont.h"
 #include "nsGfxCIID.h"
-#include "nsIFontMetrics.h"
+#include "nsIThebesFontMetrics.h"
 #include "nsHashtable.h"
 #include "nsILanguageAtomService.h"
 #include "nsUnicharUtils.h"
diff --git a/gfx/src/nsThebesFontMetrics.cpp b/gfx/src/nsThebesFontMetrics.cpp
index 876081c451d6..de033ccdb85f 100644
--- a/gfx/src/nsThebesFontMetrics.cpp
+++ b/gfx/src/nsThebesFontMetrics.cpp
@@ -36,7 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsThebesFontMetrics.h"    
+#include "nsThebesFontMetrics.h"
+#include "nsBoundingMetrics.h"
+#include "nsThebesDeviceContext.h"
 #include "nsFont.h"
 
 #include "nsString.h"
diff --git a/gfx/src/nsThebesFontMetrics.h b/gfx/src/nsThebesFontMetrics.h
index 1871182e37c6..da6d6a12f971 100644
--- a/gfx/src/nsThebesFontMetrics.h
+++ b/gfx/src/nsThebesFontMetrics.h
@@ -40,14 +40,15 @@
 #define NSTHEBESFONTMETRICS__H__
 
 #include "nsIThebesFontMetrics.h"
-#include "nsRenderingContext.h"
 #include "nsCOMPtr.h"
-#include "nsThebesDeviceContext.h"
-#include "nsIAtom.h"
-
+#include "nsRenderingContext.h"
 #include "gfxFont.h"
 #include "gfxTextRunCache.h"
 
+class nsIAtom;
+class nsIDeviceContext;
+class nsThebesDeviceContext;
+
 class nsThebesFontMetrics : public nsIThebesFontMetrics
 {
 public:
@@ -57,7 +58,7 @@ public:
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLanguage,
-                     nsIDeviceContext *aContext, 
+                     nsIDeviceContext *aContext,
                      gfxUserFontSet *aUserFontSet = nsnull);
     NS_IMETHOD  Destroy();
     NS_IMETHOD  GetXHeight(nscoord& aResult);
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 2622a555d475..a9c772ed3cdb 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -47,6 +47,7 @@
 #include "nsCSSFrameConstructor.h"
 #include "gfxUtils.h"
 #include "nsImageFrame.h"
+#include "nsRenderingContext.h"
 
 #ifdef DEBUG
 #include <stdio.h>
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index 86f63d05fcf7..0f9c97d16458 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -40,7 +40,6 @@
 #ifndef nsCSSRendering_h___
 #define nsCSSRendering_h___
 
-#include "nsRenderingContext.h"
 #include "nsStyleConsts.h"
 #include "gfxBlur.h"
 #include "gfxContext.h"
@@ -49,6 +48,7 @@
 struct nsPoint;
 class nsStyleContext;
 class nsPresContext;
+class nsRenderingContext;
 
 struct nsCSSRendering {
   /**
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 5b79c0139f48..abcc562d24c7 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -45,6 +45,7 @@
 #include "nsDisplayList.h"
 
 #include "nsCSSRendering.h"
+#include "nsRenderingContext.h"
 #include "nsISelectionController.h"
 #include "nsIPresShell.h"
 #include "nsRegion.h"
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 6a1358441513..c6ed1dceabb2 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1325,13 +1325,12 @@ public:
     MOZ_COUNT_DTOR(nsDisplayReflowCount);
   }
 #endif
-  
+
   virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {
-    nsPoint pt = ToReferenceFrame();
-    nsRenderingContext::AutoPushTranslation translate(aCtx, pt);
     mFrame->PresContext()->PresShell()->PaintCount(mFrameName, aCtx,
-                                                      mFrame->PresContext(),
-                                                      mFrame, mColor);
+                                                   mFrame->PresContext(),
+                                                   mFrame, ToReferenceFrame(),
+                                                   mColor);
   }
   NS_DISPLAY_DECL_NAME("nsDisplayReflowCount", TYPE_REFLOW_COUNT)
 protected:
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 3e20fee9d9c4..17c3e5d42b0d 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -128,6 +128,7 @@
 #include "nsGfxCIID.h"
 #include "nsStyleSheetService.h"
 #include "nsURILoader.h"
+#include "nsRenderingContext.h"
 
 #include "nsIPrompt.h"
 #include "imgIContainer.h" // image animation mode constants
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 22c4674c6472..969b31737f37 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -806,6 +806,7 @@ public:
                                       nsRenderingContext* aRenderingContext,
                                       nsPresContext * aPresContext,
                                       nsIFrame * aFrame,
+                                      const nsPoint& aOffset,
                                       PRUint32 aColor) = 0;
   virtual NS_HIDDEN_(void) SetPaintFrameCount(PRBool aOn) = 0;
   virtual PRBool IsPaintingFrameCounts() = 0;
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 9c8db2de8bab..c85dc91ec2d4 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -52,7 +52,6 @@
 #include "nsImageLoader.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
-#include "nsRenderingContext.h"
 #include "nsIURL.h"
 #include "nsIDocument.h"
 #include "nsStyleContext.h"
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index af767e5c14bf..60e184577149 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -139,9 +139,9 @@
 #include "nsDisplayList.h"
 #include "nsIRegion.h"
 #include "nsRegion.h"
+#include "nsRenderingContext.h"
 
 #ifdef MOZ_REFLOW_PERF
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #endif
 
@@ -407,7 +407,9 @@ public:
   void Add(const char * aName, nsIFrame * aFrame);
   ReflowCounter * LookUp(const char * aName);
 
-  void PaintCount(const char * aName, nsRenderingContext* aRenderingContext, nsPresContext* aPresContext, nsIFrame * aFrame, PRUint32 aColor);
+  void PaintCount(const char *aName, nsRenderingContext* aRenderingContext,
+                  nsPresContext *aPresContext, nsIFrame *aFrame,
+                  const nsPoint &aOffset, PRUint32 aColor);
 
   FILE * GetOutFile() { return mFD; }
 
@@ -933,6 +935,7 @@ public:
                                       nsRenderingContext* aRenderingContext,
                                       nsPresContext* aPresContext,
                                       nsIFrame * aFrame,
+                                      const nsPoint& aOffset,
                                       PRUint32 aColor);
   virtual NS_HIDDEN_(void) SetPaintFrameCount(PRBool aOn);
   virtual PRBool IsPaintingFrameCounts();
@@ -8593,10 +8596,12 @@ PresShell::PaintCount(const char * aName,
                       nsRenderingContext* aRenderingContext,
                       nsPresContext* aPresContext,
                       nsIFrame * aFrame,
+                      const nsPoint& aOffset,
                       PRUint32 aColor)
 {
   if (mReflowCountMgr) {
-    mReflowCountMgr->PaintCount(aName, aRenderingContext, aPresContext, aFrame, aColor);
+    mReflowCountMgr->PaintCount(aName, aRenderingContext, aPresContext,
+                                aFrame, aOffset, aColor);
   }
 }
 
@@ -8779,20 +8784,23 @@ void ReflowCountMgr::Add(const char * aName, nsIFrame * aFrame)
 }
 
 //------------------------------------------------------------------
-void ReflowCountMgr::PaintCount(const char *    aName, 
-                                nsRenderingContext* aRenderingContext, 
-                                nsPresContext* aPresContext, 
-                                nsIFrame*       aFrame, 
+void ReflowCountMgr::PaintCount(const char*     aName,
+                                nsRenderingContext* aRenderingContext,
+                                nsPresContext*  aPresContext,
+                                nsIFrame*       aFrame,
+                                const nsPoint&  aOffset,
                                 PRUint32        aColor)
 {
-  if (mPaintFrameByFrameCounts && 
-      nsnull != mIndiFrameCounts && 
+  if (mPaintFrameByFrameCounts &&
+      nsnull != mIndiFrameCounts &&
       aFrame != nsnull) {
     char * key = new char[16];
     sprintf(key, "%p", (void*)aFrame);
-    IndiReflowCounter * counter = (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
+    IndiReflowCounter * counter =
+      (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
     if (counter != nsnull && counter->mName.EqualsASCII(aName)) {
       aRenderingContext->PushState();
+      aRenderingContext->Translate(aOffset);
       nsFont font("Times", NS_FONT_STYLE_NORMAL, NS_FONT_VARIANT_NORMAL,
                   NS_FONT_WEIGHT_NORMAL, NS_FONT_STRETCH_NORMAL, 0,
                   nsPresContext::CSSPixelsToAppUnits(11));
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index a605dd74a61f..1d61068b6336 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsButtonFrameRenderer.h"
-#include "nsRenderingContext.h"
 #include "nsCSSRendering.h"
 #include "nsPresContext.h"
 #include "nsGkAtoms.h"
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 4d5ff333bcfc..3367bce8ee24 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -91,6 +91,7 @@
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
 #include "nsPLDOMEvent.h"
+#include "nsRenderingContext.h"
 
 namespace dom = mozilla::dom;
 
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index c6d03a5daa47..29fc0104cce5 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -61,6 +61,7 @@
 #endif
 #include "nsIServiceManager.h"
 #include "nsDisplayList.h"
+#include "nsRenderingContext.h"
 
 class nsLegendFrame;
 
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index 34229911f93c..40a36950657a 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -39,6 +39,7 @@
 #include "nsIContent.h"
 #include "nsCOMPtr.h"
 #include "nsCSSRendering.h"
+#include "nsRenderingContext.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
 #endif
diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp
index 009e0d0b589a..8803475dbc81 100644
--- a/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/layout/forms/nsGfxRadioControlFrame.cpp
@@ -39,6 +39,7 @@
 #include "nsIContent.h"
 #include "nsCOMPtr.h"
 #include "nsCSSRendering.h"
+#include "nsRenderingContext.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
 #endif
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index 8b4c1689ae1a..112aae7a6d21 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsHTMLParts.h"
 #include "nsIFormControl.h"
 
-#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 7c5587254569..0a95b9484f2d 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -39,7 +39,6 @@
 #include "nsIFormControlFrame.h"
 #include "nsIFormControl.h"
 #include "nsHTMLParts.h"
-#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index fa26ec11cd3e..995eb25c8907 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -68,6 +68,7 @@
 #include "nsIContent.h"
 #include "nsIAtom.h"
 #include "nsPresContext.h"
+#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsLayoutUtils.h"
 #include "nsIComponentManager.h"
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 6126f8b59469..ab8dd116d221 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -89,6 +89,7 @@
 #include "nsCSSFrameConstructor.h"
 #include "nsCSSRendering.h"
 #include "FrameLayerBuilder.h"
+#include "nsRenderingContext.h"
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
diff --git a/layout/generic/nsCanvasFrame.h b/layout/generic/nsCanvasFrame.h
index dea780ada95c..6affa1a1ad8c 100644
--- a/layout/generic/nsCanvasFrame.h
+++ b/layout/generic/nsCanvasFrame.h
@@ -40,17 +40,15 @@
 #ifndef nsCanvasFrame_h___
 #define nsCanvasFrame_h___
 
-
 #include "nsHTMLContainerFrame.h"
-#include "nsStyleContext.h"
-#include "nsRenderingContext.h"
-#include "nsGUIEvent.h"
-#include "nsGkAtoms.h"
 #include "nsIScrollPositionListener.h"
-#include "nsDisplayList.h"
 #include "nsAbsoluteContainingBlock.h"
+#include "nsDisplayList.h"
+#include "nsGkAtoms.h"
 
 class nsPresContext;
+class nsRenderingContext;
+class nsEvent;
 
 /**
  * Root frame class.
@@ -59,7 +57,7 @@ class nsPresContext;
  * It only supports having a single child frame which must be an area
  * frame
  */
-class nsCanvasFrame : public nsHTMLContainerFrame, 
+class nsCanvasFrame : public nsHTMLContainerFrame,
                       public nsIScrollPositionListener
 {
 public:
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 44a65f3dea72..462105f09fe0 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsRect.h"
 #include "nsPoint.h"
diff --git a/layout/generic/nsHTMLReflowMetrics.h b/layout/generic/nsHTMLReflowMetrics.h
index 2df6f94e6367..4c6913492bc4 100644
--- a/layout/generic/nsHTMLReflowMetrics.h
+++ b/layout/generic/nsHTMLReflowMetrics.h
@@ -44,8 +44,7 @@
 #include "nsISupports.h"
 #include "nsMargin.h"
 #include "nsRect.h"
-// for MOZ_MATHML
-#include "nsRenderingContext.h" //to get struct nsBoundingMetrics
+#include "nsBoundingMetrics.h" // for MOZ_MATHML
 
 //----------------------------------------------------------------------
 
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index d61378aeeef1..dbb93b0a4e73 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -47,7 +47,6 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDeviceContext.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsBlockFrame.h"
 #include "nsLineBox.h"
diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index 4a51f8304941..c63215c6dc6c 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsHTMLParts.h"
 #include "nsIContent.h"
 #include "nsPresContext.h"
-#include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsIDeviceContext.h"
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 9f4cad9ca404..b4f7c3282288 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -82,7 +82,6 @@ using mozilla::layout::RenderFrameParent;
 #include "nsWeakReference.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMDocument.h"
-#include "nsRenderingContext.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsDisplayList.h"
 #include "nsUnicharUtils.h"
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index 24fbed44e7cc..6427ed46b9d3 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsHTMLVideoElement.h"
 #include "nsIDOMHTMLVideoElement.h"
 #include "nsDisplayList.h"
-#include "nsRenderingContext.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
 #include "nsPresContext.h"
diff --git a/layout/inspector/src/inDOMView.cpp b/layout/inspector/src/inDOMView.cpp
index 0eb5bfe937f4..d92b06767da6 100644
--- a/layout/inspector/src/inDOMView.cpp
+++ b/layout/inspector/src/inDOMView.cpp
@@ -57,6 +57,7 @@
 #include "nsIDocument.h"
 #include "nsIServiceManager.h"
 #include "nsITreeColumns.h"
+#include "mozilla/dom/Element.h"
 
 #ifdef ACCESSIBILITY
 #include "nsIAccessible.h"
diff --git a/layout/inspector/src/inDeepTreeWalker.cpp b/layout/inspector/src/inDeepTreeWalker.cpp
index b2cbef46e7b8..f2a46272d030 100644
--- a/layout/inspector/src/inDeepTreeWalker.cpp
+++ b/layout/inspector/src/inDeepTreeWalker.cpp
@@ -46,6 +46,8 @@
 #include "nsIDOMNodeList.h"
 #include "nsServiceManagerUtils.h"
 #include "inIDOMUtils.h"
+#include "nsIContent.h"
+#include "nsBindingManager.h"
 
 /*****************************************************************************
  * This implementation does not currently operaate according to the W3C spec.
diff --git a/layout/inspector/src/inFlasher.cpp b/layout/inspector/src/inFlasher.cpp
index afd774f54522..ca1b3f4209a1 100644
--- a/layout/inspector/src/inFlasher.cpp
+++ b/layout/inspector/src/inFlasher.cpp
@@ -43,6 +43,7 @@
 #include "nsIPresShell.h"
 #include "nsIFrame.h"
 #include "nsReadableUtils.h"
+#include "nsRenderingContext.h"
 
 #include "prprf.h"
 
diff --git a/layout/inspector/src/inFlasher.h b/layout/inspector/src/inFlasher.h
index 9c3c5ba001e5..6ec4263361a8 100644
--- a/layout/inspector/src/inFlasher.h
+++ b/layout/inspector/src/inFlasher.h
@@ -39,17 +39,16 @@
 #define __inFlasher_h__
 
 #include "inIFlasher.h"
+#include "nsCoord.h"
+#include "nsColor.h"
 
-#include "nsIDOMElement.h"
-#include "nsRenderingContext.h"
-
-#include "nsCOMPtr.h"
+class nsRenderingContext;
 
 #define BOUND_INNER 0
 #define BOUND_OUTER 1
 
 #define DIR_VERTICAL 0
-#define DIR_HORIZONTAL 1 
+#define DIR_HORIZONTAL 1
 
 class inFlasher : public inIFlasher
 {
diff --git a/layout/inspector/src/inLayoutUtils.h b/layout/inspector/src/inLayoutUtils.h
index 02f29f966768..1ff0a7bfa4d7 100644
--- a/layout/inspector/src/inLayoutUtils.h
+++ b/layout/inspector/src/inLayoutUtils.h
@@ -38,16 +38,15 @@
 #ifndef __inLayoutUtils_h__
 #define __inLayoutUtils_h__
 
-#include "nsCOMPtr.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIFrame.h"
-#include "nsRenderingContext.h"
-#include "nsIEventStateManager.h"
-#include "nsIDOMDocument.h"
-#include "nsBindingManager.h"
-
+class nsBindingManager;
+class nsIDOMDocument;
+class nsIDOMElement;
+class nsIDOMNode;
+class nsIDOMWindowInternal;
+class nsIEventStateManager;
+class nsIFrame;
 class nsIPresShell;
+class nsISupports;
 
 class inLayoutUtils
 {
diff --git a/layout/mathml/nsIMathMLFrame.h b/layout/mathml/nsIMathMLFrame.h
index d87b72dec1f8..4a01a6d085cd 100644
--- a/layout/mathml/nsIMathMLFrame.h
+++ b/layout/mathml/nsIMathMLFrame.h
@@ -40,12 +40,12 @@
 #ifndef nsIMathMLFrame_h___
 #define nsIMathMLFrame_h___
 
-#include "nsRenderingContext.h"
 #include "nsIFrame.h"
 
 struct nsPresentationData;
 struct nsEmbellishData;
 struct nsHTMLReflowMetrics;
+class nsRenderingContext;
 
 // For MathML, this 'type' will be used to determine the spacing between frames
 // Subclasses can return a 'type' that will give them a particular spacing
diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.cpp b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
index 1f0e8fc09f69..ac314b4184e1 100644
--- a/layout/mathml/nsMathMLForeignFrameWrapper.cpp
+++ b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
@@ -49,7 +49,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLForeignFrameWrapper.h"
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index 82db5245b074..fb705cbb1187 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -57,6 +57,7 @@
 #include "nsStyleUtil.h"
 #include "nsDisplayList.h"
 #include "nsAttrName.h"
+#include "nsRenderingContext.h"
 
 eMathMLFrameType
 nsMathMLFrame::GetMathMLFrameType()
diff --git a/layout/mathml/nsMathMLFrame.h b/layout/mathml/nsMathMLFrame.h
index 47b1246fc5f2..00a2b106aaef 100644
--- a/layout/mathml/nsMathMLFrame.h
+++ b/layout/mathml/nsMathMLFrame.h
@@ -41,7 +41,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsStyleContext.h"
 #include "nsMathMLAtoms.h"
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index d36a06d36cbd..db5511bc9d5c 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp
index 95f6d5b378a7..da8cf51b2501 100644
--- a/layout/mathml/nsMathMLmactionFrame.cpp
+++ b/layout/mathml/nsMathMLmactionFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsCSSRendering.h"
diff --git a/layout/mathml/nsMathMLmpaddedFrame.cpp b/layout/mathml/nsMathMLmpaddedFrame.cpp
index a640ff373f79..d72b532fbce5 100644
--- a/layout/mathml/nsMathMLmpaddedFrame.cpp
+++ b/layout/mathml/nsMathMLmpaddedFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmpaddedFrame.h"
diff --git a/layout/mathml/nsMathMLmphantomFrame.cpp b/layout/mathml/nsMathMLmphantomFrame.cpp
index 866a32b64baa..c9dff332dde7 100644
--- a/layout/mathml/nsMathMLmphantomFrame.cpp
+++ b/layout/mathml/nsMathMLmphantomFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsPresContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmphantomFrame.h"
diff --git a/layout/mathml/nsMathMLmrowFrame.cpp b/layout/mathml/nsMathMLmrowFrame.cpp
index 7fcc5de6364c..c399454c52fc 100644
--- a/layout/mathml/nsMathMLmrowFrame.cpp
+++ b/layout/mathml/nsMathMLmrowFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmrowFrame.h"
diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp
index b29f7a7a433f..a655a7f15738 100644
--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmspaceFrame.h"
diff --git a/layout/mathml/nsMathMLmstyleFrame.cpp b/layout/mathml/nsMathMLmstyleFrame.cpp
index dc187cff26ad..b3f9dca35e13 100644
--- a/layout/mathml/nsMathMLmstyleFrame.cpp
+++ b/layout/mathml/nsMathMLmstyleFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmstyleFrame.h"
diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp
index 7ea5d371d0b3..664ac6797b87 100644
--- a/layout/mathml/nsMathMLmsubFrame.cpp
+++ b/layout/mathml/nsMathMLmsubFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubFrame.h"
diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp
index dc1f7fbab40c..fcda402b81b4 100644
--- a/layout/mathml/nsMathMLmsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsupFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsRenderingContext.h"
 #include "nsIFontMetrics.h"
 
 #include "nsMathMLmsupFrame.h"
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index cb3a16b3d103..7b5cdf6fc0b6 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -130,6 +130,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsIDeviceContextSpec.h"
 #include "nsIViewManager.h"
 #include "nsIView.h"
+#include "nsRenderingContext.h"
 
 #include "nsIPageSequenceFrame.h"
 #include "nsIURL.h"
@@ -2334,7 +2335,7 @@ nsPrintEngine::DoPrint(nsPrintObject * aPO)
 
         poPresContext->SetIsRenderingOnlySelection(PR_TRUE);
         // temporarily creating rendering context
-        // which is needed to dinf the selection frames
+        // which is needed to find the selection frames
         nsRefPtr<nsRenderingContext> rc;
         mPrt->mPrintDC->CreateRenderingContext(*getter_AddRefs(rc));
 
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index 1d7431b94e0e..316cbf0f3e4a 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -40,7 +40,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsRenderingContext.h"
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "prinrval.h"
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 504135238c26..48fd823b4db1 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -36,7 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
-#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 85d6f2c286f8..cb0b864eb2a7 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -40,7 +40,6 @@
 #include "nsTableRowFrame.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
-#include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index f935eeb6ade0..e7b72cd3048b 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -50,7 +50,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMNamedNodeMap.h"
 #include "nsIDOMAttr.h"
-#include "nsRenderingContext.h"
 #include "nsIDocument.h"
 #include "nsIDeviceContext.h"
 #include "nsITheme.h"
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
index bf6a5d890bbd..55f534f798ca 100644
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -39,7 +39,6 @@
 #include "nsCSSRendering.h"
 #include "nsIDocument.h"
 #include "nsPageFrame.h"
-#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsIDOMEvent.h"
 #include "nsStyleConsts.h"
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/base/src/nsGroupBoxFrame.cpp
index 3e40ca969cf2..cd6aca7abe40 100644
--- a/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -39,6 +39,7 @@
 
 #include "nsBoxFrame.h"
 #include "nsCSSRendering.h"
+#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsDisplayList.h"
 
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 17e6fee13a7e..ae87465d8e12 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -55,7 +55,6 @@
 #include "nsHTMLParts.h"
 #include "nsString.h"
 #include "nsLeafFrame.h"
-#include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 78e412a8ccb2..933f7b7a74cd 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -49,7 +49,6 @@
 #include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsRenderingContext.h"
 #include "nsStyleContext.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index b076c7c49730..aebec40297ed 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -58,7 +58,6 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsStyleContext.h"
-#include "nsRenderingContext.h"
 #include "nsIDeviceContext.h"
 #include "nsIFontMetrics.h"
 #include "nsITimer.h"
diff --git a/layout/xul/base/src/nsRootBoxFrame.cpp b/layout/xul/base/src/nsRootBoxFrame.cpp
index bd1141ca67a7..281ce625d6c3 100644
--- a/layout/xul/base/src/nsRootBoxFrame.cpp
+++ b/layout/xul/base/src/nsRootBoxFrame.cpp
@@ -37,7 +37,6 @@
 
 #include "nsHTMLParts.h"
 #include "nsIDocument.h"
-#include "nsRenderingContext.h"
 #include "nsGUIEvent.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp
index 03e92262b650..29e224f0ab4a 100644
--- a/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/layout/xul/base/src/nsSplitterFrame.cpp
@@ -49,6 +49,7 @@
 #include "nsIDOMXULElement.h"
 #include "nsIDOMDocument.h"
 #include "nsPresContext.h"
+#include "nsRenderingContext.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsScrollbarButtonFrame.h"
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index db6b4fe39939..8813d0d8a0a2 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -106,6 +106,7 @@
 #include "nsEventDispatcher.h"
 #include "nsDisplayList.h"
 #include "nsTreeBoxObject.h"
+#include "nsRenderingContext.h"
 
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
@@ -2772,8 +2773,8 @@ nsTreeBodyFrame::HandleEvent(nsPresContext* aPresContext,
   return NS_OK;
 }
 
-
-nsLineStyle nsTreeBodyFrame::ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle)
+static nsLineStyle
+ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle)
 {
   switch (aBorderStyle) {
     case NS_STYLE_BORDER_STYLE_DOTTED:
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
index d643578aebca..2b2d6a5eec00 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
@@ -382,13 +382,10 @@ protected:
   nsresult ScrollToColumnInternal(const ScrollParts& aParts, nsITreeColumn* aCol);
   nsresult ScrollHorzInternal(const ScrollParts& aParts, PRInt32 aPosition);
   nsresult EnsureRowIsVisibleInternal(const ScrollParts& aParts, PRInt32 aRow);
-  
+
   // Convert client pixels into appunits in our coordinate space.
   nsPoint AdjustClientCoordsToBoxCoordSpace(PRInt32 aX, PRInt32 aY);
 
-  // Convert a border style into line style.
-  nsLineStyle ConvertBorderStyleToLineStyle(PRUint8 aBorderStyle);
-
   // Cache the box object
   void EnsureBoxObject();
 
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index c6cc1717c0bb..934fc00c5e01 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -41,7 +41,6 @@
 #include "nscore.h"
 #include "nsIView.h"
 #include "nsEvent.h"
-#include "nsRenderingContext.h"
 
 class nsIWidget;
 struct nsRect;
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 0aa8cff26030..200fb1dc9b9c 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -59,6 +59,7 @@
 #include "nsIMenuFrame.h"
 #include "prlink.h"
 #include "nsIDOMHTMLInputElement.h"
+#include "nsRenderingContext.h"
 #include "nsWidgetAtoms.h"
 #include "mozilla/Services.h"
 
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 38cf0033e8c9..5e343f73f7be 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -47,7 +47,6 @@
 #include "nsWindow.h"
 #include "nsGTKToolkit.h"
 #include "nsIDeviceContext.h"
-#include "nsRenderingContext.h"
 #include "nsIRollupListener.h"
 #include "nsIMenuRollup.h"
 #include "nsIDOMNode.h"
diff --git a/widget/src/windows/nsDragService.cpp b/widget/src/windows/nsDragService.cpp
index 39bc27434b0e..62d55356a73a 100644
--- a/widget/src/windows/nsDragService.cpp
+++ b/widget/src/windows/nsDragService.cpp
@@ -72,6 +72,7 @@
 #include "nsUnicharUtils.h"
 #include "gfxASurface.h"
 #include "gfxContext.h"
+#include "nsRect.h"
 #include "nsMathUtils.h"
 
 //-------------------------------------------------------------------------
diff --git a/widget/src/xpwidgets/nsBaseDragService.h b/widget/src/xpwidgets/nsBaseDragService.h
index f8584c128a38..1711021b24d7 100644
--- a/widget/src/xpwidgets/nsBaseDragService.h
+++ b/widget/src/xpwidgets/nsBaseDragService.h
@@ -43,9 +43,9 @@
 #include "nsITransferable.h"
 #include "nsISupportsArray.h"
 #include "nsIDOMDocument.h"
-#include "nsCOMPtr.h"
-#include "nsRenderingContext.h"
 #include "nsIDOMDataTransfer.h"
+#include "nsCOMPtr.h"
+#include "nsPoint.h"
 
 #include "gfxImageSurface.h"
 

From 9f143f420f6ac452538e3b9b51f238fd9f83015c Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:04:41 -0700
Subject: [PATCH 148/509] Bug 174055, part 1: minimize inclusion of
 nsI(Thebes)FontMetrics.h.

---
 accessible/src/html/nsHyperTextAccessible.cpp    | 1 -
 gfx/src/nsThebesDeviceContext.cpp                | 1 -
 layout/base/nsBidiPresUtils.cpp                  | 1 -
 layout/base/nsCaret.cpp                          | 1 -
 layout/base/nsLayoutUtils.cpp                    | 1 -
 layout/forms/nsGfxButtonControlFrame.cpp         | 1 -
 layout/forms/nsImageControlFrame.cpp             | 1 -
 layout/forms/nsTextControlFrame.cpp              | 1 -
 layout/generic/nsBRFrame.cpp                     | 1 -
 layout/generic/nsBlockFrame.cpp                  | 1 -
 layout/generic/nsBlockReflowContext.cpp          | 1 -
 layout/generic/nsBulletFrame.cpp                 | 1 -
 layout/generic/nsHTMLContainerFrame.cpp          | 2 --
 layout/generic/nsImageFrame.cpp                  | 1 -
 layout/generic/nsInlineFrame.cpp                 | 1 -
 layout/generic/nsLineLayout.cpp                  | 2 --
 layout/generic/nsPageFrame.cpp                   | 1 -
 layout/generic/nsSimplePageSequence.cpp          | 1 -
 layout/generic/nsTextFrameThebes.cpp             | 2 --
 layout/mathml/nsMathMLChar.cpp                   | 1 -
 layout/mathml/nsMathMLContainerFrame.cpp         | 1 -
 layout/mathml/nsMathMLForeignFrameWrapper.cpp    | 1 -
 layout/mathml/nsMathMLTokenFrame.cpp             | 1 -
 layout/mathml/nsMathMLmactionFrame.cpp           | 1 -
 layout/mathml/nsMathMLmencloseFrame.cpp          | 1 -
 layout/mathml/nsMathMLmfencedFrame.cpp           | 1 -
 layout/mathml/nsMathMLmfracFrame.cpp             | 1 -
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp     | 1 -
 layout/mathml/nsMathMLmoFrame.cpp                | 1 -
 layout/mathml/nsMathMLmoverFrame.cpp             | 1 -
 layout/mathml/nsMathMLmpaddedFrame.cpp           | 1 -
 layout/mathml/nsMathMLmphantomFrame.cpp          | 1 -
 layout/mathml/nsMathMLmrootFrame.cpp             | 1 -
 layout/mathml/nsMathMLmrowFrame.cpp              | 1 -
 layout/mathml/nsMathMLmspaceFrame.cpp            | 1 -
 layout/mathml/nsMathMLmstyleFrame.cpp            | 1 -
 layout/mathml/nsMathMLmsubFrame.cpp              | 1 -
 layout/mathml/nsMathMLmsubsupFrame.cpp           | 1 -
 layout/mathml/nsMathMLmsupFrame.cpp              | 1 -
 layout/mathml/nsMathMLmtableFrame.cpp            | 1 -
 layout/mathml/nsMathMLmunderFrame.cpp            | 1 -
 layout/mathml/nsMathMLmunderoverFrame.cpp        | 1 -
 layout/style/StyleRule.cpp                       | 1 -
 layout/svg/base/src/nsSVGUtils.cpp               | 1 -
 layout/xul/base/src/nsImageBoxFrame.cpp          | 2 --
 layout/xul/base/src/nsLeafBoxFrame.cpp           | 1 -
 layout/xul/base/src/nsTextBoxFrame.cpp           | 2 --
 layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp | 1 -
 48 files changed, 53 deletions(-)

diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index 7a000594282e..601e5b145e18 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -58,7 +58,6 @@
 #include "nsIDOMXULDocument.h"
 #include "nsIEditingSession.h"
 #include "nsIEditor.h"
-#include "nsIFontMetrics.h"
 #include "nsIFrame.h"
 #include "nsFrameSelection.h"
 #include "nsILineIterator.h"
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index 123562caf248..d6571f25ee1f 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -39,7 +39,6 @@
 
 #include "nsFont.h"
 #include "nsGfxCIID.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsILanguageAtomService.h"
 #include "nsUnicharUtils.h"
 
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index b63cc402009f..8bf0176cf991 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -55,7 +55,6 @@
 #include "nsContainerFrame.h"
 #include "nsFirstLetterFrame.h"
 #include "gfxUnicodeProperties.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsTextFrame.h"
 
 #undef NOISY_BIDI
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index c3997b837c07..189a9282a1c2 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -51,7 +51,6 @@
 #include "nsIScrollableFrame.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMRange.h"
-#include "nsIFontMetrics.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMCharacterData.h"
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index ad2a608c5e17..98fc545abdfa 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -39,7 +39,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsLayoutUtils.h"
-#include "nsIFontMetrics.h"
 #include "nsIFormControlFrame.h"
 #include "nsPresContext.h"
 #include "nsIContent.h"
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index 4a15bbfb3447..1296ce4be583 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -37,7 +37,6 @@
 
 #include "nsGfxButtonControlFrame.h"
 #include "nsWidgetsCID.h"
-#include "nsIFontMetrics.h"
 #include "nsFormControlFrame.h"
 #include "nsIFormControl.h"
 #include "nsINameSpaceManager.h"
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 0a95b9484f2d..111e237e3139 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsISupports.h"
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsStyleConsts.h"
 #include "nsFormControlFrame.h"
 #include "nsGUIEvent.h"
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 995eb25c8907..50f4eb2e08ef 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -118,7 +118,6 @@
 #include "nsIJSContextStack.h"
 #include "nsFocusManager.h"
 #include "nsTextEditRules.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsPresState.h"
 
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index 0fbe88912517..be0465b67745 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsLineLayout.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
-#include "nsIFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsLayoutUtils.h"
 
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index ab8dd116d221..48f6df0be056 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -61,7 +61,6 @@
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
 #include "nsIView.h"
-#include "nsIFontMetrics.h"
 #include "nsHTMLParts.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMEvent.h"
diff --git a/layout/generic/nsBlockReflowContext.cpp b/layout/generic/nsBlockReflowContext.cpp
index b3d035abda62..c2b0a957c9ce 100644
--- a/layout/generic/nsBlockReflowContext.cpp
+++ b/layout/generic/nsBlockReflowContext.cpp
@@ -42,7 +42,6 @@
 #include "nsBlockReflowContext.h"
 #include "nsLineLayout.h"
 #include "nsFloatManager.h"
-#include "nsIFontMetrics.h"
 #include "nsPresContext.h"
 #include "nsFrameManager.h"
 #include "nsIContent.h"
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 8bdae1d07b80..35e700401788 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsGkAtoms.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsIFontMetrics.h"
 #include "nsGenericHTMLElement.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index fe7121854036..9a69425dd040 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -61,8 +61,6 @@
 #include "nsWidgetsCID.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIThebesFontMetrics.h"
 #include "gfxFont.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 7b46a08f9520..acd2c4c7ca16 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -67,7 +67,6 @@
 #include "nsNetUtil.h"
 #include "nsHTMLContainerFrame.h"
 #include "prprf.h"
-#include "nsIFontMetrics.h"
 #include "nsCSSRendering.h"
 #include "nsILink.h"
 #include "nsIDOMHTMLAnchorElement.h"
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index de2ef02646fa..9702107af234 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsAutoPtr.h"
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index dee33d9c8088..dd8623e46573 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -55,8 +55,6 @@
 #include "nsFloatManager.h"
 #include "nsStyleContext.h"
 #include "nsPresContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsPlaceholderFrame.h"
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 0256bab55da4..a21ca579d72f 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -53,7 +53,6 @@
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
 #endif
-#include "nsIFontMetrics.h"
 #include "nsIPrintSettings.h"
 #include "nsRegion.h"
 
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index deb14536a9fa..aa7c3841744a 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -43,7 +43,6 @@
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
-#include "nsIFontMetrics.h"
 #include "nsIPrintSettings.h"
 #include "nsPageFrame.h"
 #include "nsStyleConsts.h"
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 92e8bcb25aa6..027512ba08c2 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -63,7 +63,6 @@
 #include "nsStyleConsts.h"
 #include "nsStyleContext.h"
 #include "nsCoord.h"
-#include "nsIFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsITimer.h"
@@ -110,7 +109,6 @@
 
 #include "nsBidiUtils.h"
 
-#include "nsIThebesFontMetrics.h"
 #include "gfxFont.h"
 #include "gfxContext.h"
 #include "gfxTextRunWordCache.h"
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 05600f7a9838..0a229e8f1386 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -48,7 +48,6 @@
 #include "nsUnicharUtils.h"
 #include "nsRenderingContext.h"
 #include "gfxPlatform.h"
-#include "nsIFontMetrics.h"
 
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index c579deba8520..aa0b707a020b 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -50,7 +50,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsIDOMText.h"
 #include "nsIDOMMutationEvent.h"
diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.cpp b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
index ac314b4184e1..581b5f0fe735 100644
--- a/layout/mathml/nsMathMLForeignFrameWrapper.cpp
+++ b/layout/mathml/nsMathMLForeignFrameWrapper.cpp
@@ -49,7 +49,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLForeignFrameWrapper.h"
 
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index db5511bc9d5c..e9718beae319 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsMathMLTokenFrame.h"
diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp
index da8cf51b2501..e173a6f0f7d0 100644
--- a/layout/mathml/nsMathMLmactionFrame.cpp
+++ b/layout/mathml/nsMathMLmactionFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIFontMetrics.h"
 
 #include "nsCSSRendering.h"
 #include "prprf.h"         // For PR_snprintf()
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 39be5d717baf..b3f7f68130dc 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -48,7 +48,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsWhitespaceTokenizer.h"
 
 #include "nsMathMLmencloseFrame.h"
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index d85f09b3d28a..73ddb52782ef 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmfencedFrame.h"
 
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 070430189d9d..023ec02e7400 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmfracFrame.h"
 #include "nsDisplayList.h"
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index 2fed0b9a9c37..f2a13afff544 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmmultiscriptsFrame.h"
 
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index d9e01b371ac4..f0862faf41e0 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 
 #include "nsIDOMText.h"
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index 53c318f48579..a814a7feb2c6 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmoverFrame.h"
 #include "nsMathMLmsupFrame.h"
diff --git a/layout/mathml/nsMathMLmpaddedFrame.cpp b/layout/mathml/nsMathMLmpaddedFrame.cpp
index d72b532fbce5..2dfe23f11783 100644
--- a/layout/mathml/nsMathMLmpaddedFrame.cpp
+++ b/layout/mathml/nsMathMLmpaddedFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmpaddedFrame.h"
 
diff --git a/layout/mathml/nsMathMLmphantomFrame.cpp b/layout/mathml/nsMathMLmphantomFrame.cpp
index c9dff332dde7..63f5a218836a 100644
--- a/layout/mathml/nsMathMLmphantomFrame.cpp
+++ b/layout/mathml/nsMathMLmphantomFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsPresContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmphantomFrame.h"
 
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 96c3a82ca29b..c654d27a4952 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmrootFrame.h"
 
diff --git a/layout/mathml/nsMathMLmrowFrame.cpp b/layout/mathml/nsMathMLmrowFrame.cpp
index c399454c52fc..598fce781578 100644
--- a/layout/mathml/nsMathMLmrowFrame.cpp
+++ b/layout/mathml/nsMathMLmrowFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmrowFrame.h"
 
diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp
index a655a7f15738..98a519a13c37 100644
--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmspaceFrame.h"
 
diff --git a/layout/mathml/nsMathMLmstyleFrame.cpp b/layout/mathml/nsMathMLmstyleFrame.cpp
index b3f9dca35e13..bf7340c8d87d 100644
--- a/layout/mathml/nsMathMLmstyleFrame.cpp
+++ b/layout/mathml/nsMathMLmstyleFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmstyleFrame.h"
 
diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp
index 664ac6797b87..bd0ceb097c54 100644
--- a/layout/mathml/nsMathMLmsubFrame.cpp
+++ b/layout/mathml/nsMathMLmsubFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubFrame.h"
 
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index 8ea764dfae75..c6b72d935244 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -45,7 +45,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubsupFrame.h"
 
diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp
index fcda402b81b4..89f3c168e648 100644
--- a/layout/mathml/nsMathMLmsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsupFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsupFrame.h"
 
diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp
index 91a1c550b806..18cd3d84ba87 100644
--- a/layout/mathml/nsMathMLmtableFrame.cpp
+++ b/layout/mathml/nsMathMLmtableFrame.cpp
@@ -44,7 +44,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsTArray.h"
 #include "nsCSSFrameConstructor.h"
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index 6108e1f3d33f..14fb656a72ba 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderFrame.h"
 #include "nsMathMLmsubFrame.h"
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index b6b14929f352..4f1c0489dbcb 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderoverFrame.h"
 #include "nsMathMLmsubsupFrame.h"
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 244afffd7b0d..143f2dc3f73b 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -57,7 +57,6 @@
 #include "nsString.h"
 #include "nsStyleConsts.h"
 #include "nsStyleUtil.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMCSSStyleSheet.h"
 #include "nsICSSStyleRuleDOMWrapper.h"
 #include "nsIDOMCSSStyleDeclaration.h"
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 6b8d70b0251e..c57692c6d362 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -78,7 +78,6 @@
 #include "gfxImageSurface.h"
 #include "gfxPlatform.h"
 #include "nsSVGForeignObjectFrame.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMSVGUnitTypes.h"
 #include "nsSVGEffects.h"
 #include "nsMathUtils.h"
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index ae87465d8e12..502f87396183 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -44,7 +44,6 @@
 
 #include "nsImageBoxFrame.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
@@ -65,7 +64,6 @@
 #include "nsILoadGroup.h"
 #include "nsHTMLContainerFrame.h"
 #include "prprf.h"
-#include "nsIFontMetrics.h"
 #include "nsCSSRendering.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIDeviceContext.h"
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 933f7b7a74cd..460ace1b86ad 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsBoxFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index c7758f7af326..6b3d60893d14 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -49,7 +49,6 @@
 #include "nsTextBoxFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
@@ -72,7 +71,6 @@
 #include "nsCSSRendering.h"
 #include "nsIReflowCallback.h"
 #include "nsBoxFrame.h"
-#include "nsIThebesFontMetrics.h"
 
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 8813d0d8a0a2..6c75326d3966 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -76,7 +76,6 @@
 #include "nsIContent.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsCSSRendering.h"
-#include "nsIFontMetrics.h"
 #include "nsIDeviceContext.h"
 #include "nsIXULTemplateBuilder.h"
 #include "nsXPIDLString.h"

From c49f97544f8ed800f3fcca882a52124416541484 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:05:25 -0700
Subject: [PATCH 149/509] Bug 174055, part 2: merge nsIThebesFontMetrics into
 nsIFontMetrics.

---
 accessible/src/base/nsTextAttrs.cpp          |   5 +-
 accessible/src/msaa/nsTextAccessibleWrap.cpp |   6 +-
 gfx/src/Makefile.in                          |   1 -
 gfx/src/nsIFontMetrics.h                     | 100 +++++++++++++--
 gfx/src/nsIThebesFontMetrics.h               | 127 -------------------
 gfx/src/nsRenderingContext.cpp               |  10 +-
 gfx/src/nsRenderingContext.h                 |   6 +-
 gfx/src/nsThebesDeviceContext.cpp            |   5 +-
 gfx/src/nsThebesFontMetrics.h                |   4 +-
 layout/generic/nsHTMLContainerFrame.cpp      |   9 +-
 layout/generic/nsTextFrameThebes.cpp         |  17 +--
 layout/style/nsRuleNode.cpp                  |   5 +-
 layout/xul/base/src/nsTextBoxFrame.cpp       |   6 +-
 13 files changed, 119 insertions(+), 182 deletions(-)
 delete mode 100644 gfx/src/nsIThebesFontMetrics.h

diff --git a/accessible/src/base/nsTextAttrs.cpp b/accessible/src/base/nsTextAttrs.cpp
index af21de58dbf8..90099a0bddd4 100644
--- a/accessible/src/base/nsTextAttrs.cpp
+++ b/accessible/src/base/nsTextAttrs.cpp
@@ -44,7 +44,7 @@
 
 #include "gfxFont.h"
 #include "gfxUserFontSet.h"
-#include "nsIThebesFontMetrics.h"
+#include "nsIFontMetrics.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Constants and structures
@@ -537,8 +537,7 @@ nsFontWeightTextAttr::GetFontWeight(nsIFrame *aFrame)
     GetMetricsFor(styleFont->mFont, aFrame->GetStyleVisibility()->mLanguage,
                   fs, *getter_AddRefs(fm));
 
-  nsCOMPtr<nsIThebesFontMetrics> tfm = do_QueryInterface(fm);
-  gfxFontGroup *fontGroup = tfm->GetThebesFontGroup();
+  gfxFontGroup *fontGroup = fm->GetThebesFontGroup();
   gfxFont *font = fontGroup->GetFontAt(0);
 
   // When there doesn't exist a bold font in the family and so the rendering of
diff --git a/accessible/src/msaa/nsTextAccessibleWrap.cpp b/accessible/src/msaa/nsTextAccessibleWrap.cpp
index f7e0ad5e0ef2..92adecaf2493 100644
--- a/accessible/src/msaa/nsTextAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsTextAccessibleWrap.cpp
@@ -42,7 +42,7 @@
 #include "nsCoreUtils.h"
 #include "nsDocAccessible.h"
 #include "nsIFrame.h"
-#include "nsIThebesFontMetrics.h"
+#include "nsIFontMetrics.h"
 #include "nsPresContext.h"
 
 #include "gfxFont.h"
@@ -262,9 +262,7 @@ __try {
                   frame->PresContext()->GetUserFontSet(),
                   *getter_AddRefs(fm));
 
-  nsCOMPtr<nsIThebesFontMetrics> tfm = do_QueryInterface(fm);
-  const nsString& name = tfm->GetThebesFontGroup()->GetFontAt(0)->GetName();
-
+  const nsString& name = fm->GetThebesFontGroup()->GetFontAt(0)->GetName();
   if (name.IsEmpty())
     return S_FALSE;
 
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 30b94cf093bc..5bac15113ab7 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -80,7 +80,6 @@ EXPORTS	= \
 	nsITheme.h \
 	nsThemeConstants.h \
 	gfxCrashReporterUtils.h \
-	nsIThebesFontMetrics.h \
 	nsBoundingMetrics.h \
 	$(NULL)
 
diff --git a/gfx/src/nsIFontMetrics.h b/gfx/src/nsIFontMetrics.h
index 185445db2f0e..a7ac12f3ce5f 100644
--- a/gfx/src/nsIFontMetrics.h
+++ b/gfx/src/nsIFontMetrics.h
@@ -46,14 +46,16 @@ class nsString;
 class nsIDeviceContext;
 class nsIAtom;
 class gfxUserFontSet;
+struct nsTextDimensions;
+struct nsBoundingMetrics;
+class gfxFontGroup;
+class nsRenderingContext;
 
 // IID for the nsIFontMetrics interface
 #define NS_IFONT_METRICS_IID   \
 { 0x360C5575, 0xF7AC, 0x4079, \
 { 0xB8, 0xA6, 0x56, 0x91, 0x4B, 0xEA, 0x2A, 0xEA } }
 
-//----------------------------------------------------------------------
-
 /**
  * A native font handle
  */
@@ -103,8 +105,8 @@ public:
 
   /**
    * Return the font's superscript offset (the distance from the
-   * baseline to where a superscript's baseline should be placed). The
-   * value returned will be a positive value.
+   * baseline to where a superscript's baseline should be placed).
+   * The value returned will be positive.
    */
   NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult) = 0;
 
@@ -116,14 +118,14 @@ public:
   NS_IMETHOD  GetSubscriptOffset(nscoord& aResult) = 0;
 
   /**
-   * Return the font's strikeout offset (the distance from the 
-   * baseline to where a strikeout should be placed) and size
+   * Return the font's strikeout offset (the distance from the
+   * baseline to where a strikeout should be placed) and size.
    * Positive values are above the baseline, negative below.
    */
   NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize) = 0;
 
   /**
-   * Return the font's underline offset (the distance from the 
+   * Return the font's underline offset (the distance from the
    * baseline to where a underline should be placed) and size.
    * Positive values are above the baseline, negative below.
    */
@@ -145,9 +147,9 @@ public:
   NS_IMETHOD  GetInternalLeading(nscoord &aLeading) = 0;
 
   /**
-   * Returns the amount of external leading (in app units) as suggested by font
-   * vendor. This value is suggested by font vendor to add to normal line-height 
-   * beside font height.
+   * Returns the amount of external leading (in app units) as
+   * suggested by font vendor. This value is suggested by font vendor
+   * to add to normal line-height beside font height.
    */
   NS_IMETHOD  GetExternalLeading(nscoord &aLeading) = 0;
 
@@ -216,6 +218,84 @@ public:
    */
   NS_IMETHOD  GetSpaceWidth(nscoord& aSpaceCharWidth) = 0;
 
+  // methods formerly in nsIThebesFontMetrics
+
+  // Get the width for this string.  aWidth will be updated with the
+  // width in points, not twips.  Callers must convert it if they
+  // want it in another format.
+  virtual nsresult GetWidth(const char* aString, PRUint32 aLength,
+                            nscoord& aWidth, nsRenderingContext *aContext) = 0;
+  virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
+                            nscoord& aWidth, PRInt32 *aFontID,
+                            nsRenderingContext *aContext) = 0;
+
+  // Get the text dimensions for this string
+  virtual nsresult GetTextDimensions(const PRUnichar* aString,
+                                     PRUint32 aLength,
+                                     nsTextDimensions& aDimensions,
+                                     PRInt32* aFontID) = 0;
+  virtual nsresult GetTextDimensions(const char*         aString,
+                                     PRInt32             aLength,
+                                     PRInt32             aAvailWidth,
+                                     PRInt32*            aBreaks,
+                                     PRInt32             aNumBreaks,
+                                     nsTextDimensions&   aDimensions,
+                                     PRInt32&            aNumCharsFit,
+                                     nsTextDimensions&   aLastWordDimensions,
+                                     PRInt32*            aFontID) = 0;
+  virtual nsresult GetTextDimensions(const PRUnichar*    aString,
+                                     PRInt32             aLength,
+                                     PRInt32             aAvailWidth,
+                                     PRInt32*            aBreaks,
+                                     PRInt32             aNumBreaks,
+                                     nsTextDimensions&   aDimensions,
+                                     PRInt32&            aNumCharsFit,
+                                     nsTextDimensions&   aLastWordDimensions,
+                                     PRInt32*            aFontID) = 0;
+
+  // Draw a string using this font handle on the surface passed in.
+  virtual nsresult DrawString(const char *aString, PRUint32 aLength,
+                              nscoord aX, nscoord aY,
+                              const nscoord* aSpacing,
+                              nsRenderingContext *aContext) = 0;
+  virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
+                              nscoord aX, nscoord aY,
+                              PRInt32 aFontID,
+                              const nscoord* aSpacing,
+                              nsRenderingContext *aContext) = 0;
+  virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
+                              nscoord aX, nscoord aY,
+                              nsRenderingContext *aContext,
+                              nsRenderingContext *aTextRunConstructionContext) = 0;
+
+#ifdef MOZ_MATHML
+  // These two functions get the bounding metrics for this handle,
+  // updating the aBoundingMetrics in Points.  This means that the
+  // caller will have to update them to twips before passing it
+  // back.
+  virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
+                                      nsRenderingContext *aContext,
+                                      nsBoundingMetrics &aBoundingMetrics) = 0;
+  // aCachedOffset will be updated with a new offset.
+  virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
+                                      PRUint32 aLength,
+                                      nsRenderingContext *aContext,
+                                      nsBoundingMetrics &aBoundingMetrics) = 0;
+#endif /* MOZ_MATHML */
+
+  // Set the direction of the text rendering
+  virtual nsresult SetRightToLeftText(PRBool aIsRTL) = 0;
+  virtual PRBool GetRightToLeftText() = 0;
+  virtual void SetTextRunRTL(PRBool aIsRTL) = 0;
+
+  virtual PRInt32 GetMaxStringLength() = 0;
+
+  virtual gfxFontGroup* GetThebesFontGroup() = 0;
+
+  // Needs to be virtual and at this level so that its caller in gkgfx can
+  // avoid linking against thebes.
+  virtual gfxUserFontSet* GetUserFontSet() = 0;
+
 protected:
 
   nsFont mFont;		// The font for this metrics object.
diff --git a/gfx/src/nsIThebesFontMetrics.h b/gfx/src/nsIThebesFontMetrics.h
deleted file mode 100644
index 43e80f9c111f..000000000000
--- a/gfx/src/nsIThebesFontMetrics.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Christopher Blizzard <blizzard@mozilla.org>.  
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __nsIThebesFontMetrics_h
-#define __nsIThebesFontMetrics_h
-
-#include "nsIFontMetrics.h"
-
-struct nsTextDimensions;
-struct nsBoundingMetrics;
-class gfxFontGroup;
-class nsRenderingContext;
-
-class nsIThebesFontMetrics : public nsIFontMetrics {
-public:
-    // Get the width for this string.  aWidth will be updated with the
-    // width in points, not twips.  Callers must convert it if they
-    // want it in another format.
-    virtual nsresult GetWidth(const char* aString, PRUint32 aLength,
-                              nscoord& aWidth, nsRenderingContext *aContext) = 0;
-    virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                              nscoord& aWidth, PRInt32 *aFontID,
-                              nsRenderingContext *aContext) = 0;
-
-    // Get the text dimensions for this string
-    virtual nsresult GetTextDimensions(const PRUnichar* aString,
-                                       PRUint32 aLength,
-                                       nsTextDimensions& aDimensions, 
-                                       PRInt32* aFontID) = 0;
-    virtual nsresult GetTextDimensions(const char*         aString,
-                                       PRInt32             aLength,
-                                       PRInt32             aAvailWidth,
-                                       PRInt32*            aBreaks,
-                                       PRInt32             aNumBreaks,
-                                       nsTextDimensions&   aDimensions,
-                                       PRInt32&            aNumCharsFit,
-                                       nsTextDimensions&   aLastWordDimensions,
-                                       PRInt32*            aFontID) = 0;
-    virtual nsresult GetTextDimensions(const PRUnichar*    aString,
-                                       PRInt32             aLength,
-                                       PRInt32             aAvailWidth,
-                                       PRInt32*            aBreaks,
-                                       PRInt32             aNumBreaks,
-                                       nsTextDimensions&   aDimensions,
-                                       PRInt32&            aNumCharsFit,
-                                       nsTextDimensions&   aLastWordDimensions,
-                                       PRInt32*            aFontID) = 0;
-
-    // Draw a string using this font handle on the surface passed in.  
-    virtual nsresult DrawString(const char *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                const nscoord* aSpacing,
-                                nsRenderingContext *aContext) = 0;
-    virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                PRInt32 aFontID,
-                                const nscoord* aSpacing,
-                                nsRenderingContext *aContext) = 0;
-    virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                nsRenderingContext *aContext,
-                                nsRenderingContext *aTextRunConstructionContext) = 0;
-
-#ifdef MOZ_MATHML
-    // These two functions get the bounding metrics for this handle,
-    // updating the aBoundingMetrics in Points.  This means that the
-    // caller will have to update them to twips before passing it
-    // back.
-    virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics) = 0;
-    // aCachedOffset will be updated with a new offset.
-    virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
-                                        PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics) = 0;
-#endif /* MOZ_MATHML */
-
-    // Set the direction of the text rendering
-    virtual nsresult SetRightToLeftText(PRBool aIsRTL) = 0;
-    virtual PRBool GetRightToLeftText() = 0;
-    virtual void SetTextRunRTL(PRBool aIsRTL) = 0;
-
-    virtual PRInt32 GetMaxStringLength() = 0;
-
-    virtual gfxFontGroup* GetThebesFontGroup() = 0;
-
-    // Needs to be virtual and at this level so that its caller in gkgfx can
-    // avoid linking against thebes.
-    virtual gfxUserFontSet* GetUserFontSet() = 0;
-};
-
-#endif /* __nsIThebesFontMetrics_h */
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index e5a1b0830d55..1f55ee403bb6 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -464,26 +464,22 @@ void
 nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
                             gfxUserFontSet *aUserFontSet)
 {
-    nsCOMPtr<nsIFontMetrics> newMetrics;
     mDeviceContext->GetMetricsFor(aFont, aLanguage, aUserFontSet,
-                                  *getter_AddRefs(newMetrics));
-    mFontMetrics = reinterpret_cast<nsIThebesFontMetrics*>(newMetrics.get());
+                                  *getter_AddRefs(mFontMetrics));
 }
 
 void
 nsRenderingContext::SetFont(const nsFont& aFont,
                             gfxUserFontSet *aUserFontSet)
 {
-    nsCOMPtr<nsIFontMetrics> newMetrics;
     mDeviceContext->GetMetricsFor(aFont, nsnull, aUserFontSet,
-                                  *getter_AddRefs(newMetrics));
-    mFontMetrics = reinterpret_cast<nsIThebesFontMetrics*>(newMetrics.get());
+                                  *getter_AddRefs(mFontMetrics));
 }
 
 void
 nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 {
-    mFontMetrics = static_cast<nsIThebesFontMetrics*>(aFontMetrics);
+    mFontMetrics = aFontMetrics;
 }
 
 PRInt32
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 0cd6236738d0..b8455afb8ffb 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -42,7 +42,7 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIThebesFontMetrics.h"
+#include "nsIFontMetrics.h"
 #include "nsColor.h"
 #include "nsCoord.h"
 #include "gfxContext.h"
@@ -121,7 +121,7 @@ public:
                  gfxUserFontSet *aUserFontSet);
     void SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
     void SetFont(nsIFontMetrics *aFontMetrics);
-    nsIThebesFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
+    nsIFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
 
     void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
@@ -151,7 +151,7 @@ protected:
 
     nsRefPtr<gfxContext> mThebes;
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
-    nsCOMPtr<nsIThebesFontMetrics> mFontMetrics;
+    nsCOMPtr<nsIFontMetrics> mFontMetrics;
 
     double mP2A; // cached app units per device pixel value
 };
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index d6571f25ee1f..c913f2093234 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -151,8 +151,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
     PRInt32 n = mFontMetrics.Length() - 1;
     for (PRInt32 i = n; i >= 0; --i) {
         fm = mFontMetrics[i];
-        nsIThebesFontMetrics* tfm = static_cast<nsIThebesFontMetrics*>(fm);
-        if (fm->Font().Equals(aFont) && tfm->GetUserFontSet() == aUserFontSet) {
+        if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet) {
             nsCOMPtr<nsIAtom> language;
             fm->GetLanguage(getter_AddRefs(language));
             if (aLanguage == language.get()) {
@@ -161,7 +160,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                     mFontMetrics.RemoveElementAt(i);
                     mFontMetrics.AppendElement(fm);
                 }
-                tfm->GetThebesFontGroup()->UpdateFontList();
+                fm->GetThebesFontGroup()->UpdateFontList();
                 NS_ADDREF(aMetrics = fm);
                 return NS_OK;
             }
diff --git a/gfx/src/nsThebesFontMetrics.h b/gfx/src/nsThebesFontMetrics.h
index da6d6a12f971..567436748205 100644
--- a/gfx/src/nsThebesFontMetrics.h
+++ b/gfx/src/nsThebesFontMetrics.h
@@ -39,7 +39,7 @@
 #ifndef NSTHEBESFONTMETRICS__H__
 #define NSTHEBESFONTMETRICS__H__
 
-#include "nsIThebesFontMetrics.h"
+#include "nsIFontMetrics.h"
 #include "nsCOMPtr.h"
 #include "nsRenderingContext.h"
 #include "gfxFont.h"
@@ -49,7 +49,7 @@ class nsIAtom;
 class nsIDeviceContext;
 class nsThebesDeviceContext;
 
-class nsThebesFontMetrics : public nsIThebesFontMetrics
+class nsThebesFontMetrics : public nsIFontMetrics
 {
 public:
     nsThebesFontMetrics();
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index 9a69425dd040..887c48e2cf38 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -107,8 +107,7 @@ nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
 {
   nsCOMPtr<nsIFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
-  nsIThebesFontMetrics* tfm = static_cast<nsIThebesFontMetrics*>(fm.get());
-  gfxFontGroup* fontGroup = tfm->GetThebesFontGroup();
+  gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
   if (!firstFont)
     return; // OOM
@@ -188,8 +187,7 @@ nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
 {
   nsCOMPtr<nsIFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
-  nsIThebesFontMetrics* tfm = static_cast<nsIThebesFontMetrics*>(fm.get());
-  gfxFontGroup* fontGroup = tfm->GetThebesFontGroup();
+  gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
   if (!firstFont)
     return; // OOM
@@ -345,8 +343,7 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
   nsCOMPtr<nsIFontMetrics> fm;
   nsresult rv = nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   NS_ENSURE_SUCCESS(rv, rv);
-  nsIThebesFontMetrics* tfm = static_cast<nsIThebesFontMetrics*>(fm.get());
-  if (tfm->GetThebesFontGroup()->ShouldSkipDrawing())
+  if (fm->GetThebesFontGroup()->ShouldSkipDrawing())
     return NS_OK;
 
   // Do standards mode painting of 'text-decoration's: under+overline
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 027512ba08c2..1e6529a10176 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -1591,17 +1591,15 @@ GetFontGroupForFrame(nsIFrame* aFrame,
   if (!metrics)
     return nsnull;
 
-  nsIFontMetrics* metricsRaw = metrics;
   if (aOutFontMetrics) {
-    *aOutFontMetrics = metricsRaw;
+    *aOutFontMetrics = metrics;
     NS_ADDREF(*aOutFontMetrics);
   }
-  nsIThebesFontMetrics* fm = static_cast<nsIThebesFontMetrics*>(metricsRaw);
-  // XXX this is a bit bogus, we're releasing 'metrics' so the returned font-group
-  // might actually be torn down, although because of the way the device context
-  // caches font metrics, this seems to not actually happen. But we should fix
-  // this.
-  return fm->GetThebesFontGroup();
+  // XXX this is a bit bogus, we're releasing 'metrics' so the
+  // returned font-group might actually be torn down, although because
+  // of the way the device context caches font metrics, this seems to
+  // not actually happen. But we should fix this.
+  return metrics->GetThebesFontGroup();
 }
 
 static already_AddRefed<gfxContext>
@@ -5296,8 +5294,7 @@ nsTextFrame::CombineSelectionUnderlineRect(nsPresContext* aPresContext,
 
   nsCOMPtr<nsIFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
-  nsIThebesFontMetrics* tfm = static_cast<nsIThebesFontMetrics*>(fm.get());
-  gfxFontGroup* fontGroup = tfm->GetThebesFontGroup();
+  gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
   if (!firstFont)
     return PR_FALSE; // OOM
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 1f58b50a3d5e..82b76de90df2 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -56,7 +56,7 @@
 #include "nsIWidget.h"
 #include "nsILookAndFeel.h"
 #include "nsIPresShell.h"
-#include "nsIThebesFontMetrics.h"
+#include "nsIFontMetrics.h"
 #include "gfxFont.h"
 #include "nsStyleUtil.h"
 #include "nsCSSPseudoElements.h"
@@ -319,8 +319,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
       font.size = aFontSize;
       nsCOMPtr<nsIFontMetrics> fm =
         aPresContext->GetMetricsFor(font, aUseUserFontSet);
-      nsCOMPtr<nsIThebesFontMetrics> tfm(do_QueryInterface(fm));
-      gfxFloat zeroWidth = (tfm->GetThebesFontGroup()->GetFontAt(0)
+      gfxFloat zeroWidth = (fm->GetThebesFontGroup()->GetFontAt(0)
                             ->GetMetrics().zeroOrAveCharWidth);
 
       return ScaleCoord(aValue, NS_ceil(aPresContext->AppUnitsPerDevPixel() *
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 6b3d60893d14..931bad4848c9 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -572,9 +572,9 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
                mAccessKeyInfo->mBeforeWidth = 0;
        }
 
-       nsIThebesFontMetrics* fm = static_cast<nsIThebesFontMetrics*>(fontMet.get());
-       fm->DrawString(mCroppedTitle.get(), mCroppedTitle.Length(),
-                      aTextRect.x, baseline, &aRenderingContext, refContext.get());
+       fontMet->DrawString(mCroppedTitle.get(), mCroppedTitle.Length(),
+                           aTextRect.x, baseline, &aRenderingContext,
+                           refContext.get());
     }
 
     if (mAccessKeyInfo && mAccessKeyInfo->mAccesskeyIndex != kNotFound) {

From d1c5f344eacb68200c0cdd1952312f9c16eba0d0 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:05:26 -0700
Subject: [PATCH 150/509] Bug 174055, part 3: deCOM ns(I|Thebes)FontMetrics. 
 Code outside gfx/ not fixed up.

--HG--
rename : gfx/src/nsThebesFontMetrics.cpp => gfx/src/nsFontMetrics.cpp
rename : gfx/src/nsThebesFontMetrics.h => gfx/src/nsFontMetrics.h
---
 gfx/src/Makefile.in                           |   4 +-
 gfx/src/nsBoundingMetrics.h                   |   2 +-
 ...hebesFontMetrics.cpp => nsFontMetrics.cpp} | 252 ++++++++-------
 gfx/src/nsFontMetrics.h                       | 298 +++++++++++++++++
 gfx/src/nsGfxCIID.h                           |   4 -
 gfx/src/nsIDeviceContext.h                    |  12 +-
 gfx/src/nsIFontMetrics.h                      | 306 ------------------
 gfx/src/nsRenderingContext.cpp                |   2 +-
 gfx/src/nsRenderingContext.h                  |   8 +-
 gfx/src/nsThebesDeviceContext.cpp             |  44 +--
 gfx/src/nsThebesDeviceContext.h               |   6 +-
 gfx/src/nsThebesFontMetrics.h                 | 209 ------------
 gfx/src/nsThebesGfxFactory.cpp                |   5 -
 13 files changed, 471 insertions(+), 681 deletions(-)
 rename gfx/src/{nsThebesFontMetrics.cpp => nsFontMetrics.cpp} (63%)
 create mode 100644 gfx/src/nsFontMetrics.h
 delete mode 100644 gfx/src/nsIFontMetrics.h
 delete mode 100644 gfx/src/nsThebesFontMetrics.h

diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 5bac15113ab7..7e8f8ecda1df 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -73,7 +73,7 @@ EXPORTS	= \
 	nsMargin.h \
 	nsTransform2D.h \
 	nsRenderingContext.h \
-	nsIFontMetrics.h \
+	nsFontMetrics.h \
 	nsIDeviceContext.h \
 	nsGfxCIID.h \
 	nsIRegion.h \
@@ -100,7 +100,7 @@ CPPSRCS = \
         nsThebesRegion.cpp \
         nsThebesGfxFactory.cpp \
         nsRenderingContext.cpp \
-        nsThebesFontMetrics.cpp \
+        nsFontMetrics.cpp \
         nsThebesFontEnumerator.cpp \
        $(NULL)
 
diff --git a/gfx/src/nsBoundingMetrics.h b/gfx/src/nsBoundingMetrics.h
index a90827623f9d..fb733d4a027e 100644
--- a/gfx/src/nsBoundingMetrics.h
+++ b/gfx/src/nsBoundingMetrics.h
@@ -43,7 +43,7 @@
 /* Struct used for accurate measurements of a string, in order to
  * allow precise positioning when processing MathML.  This is in its
  * own header file because some very-widely-included headers need it
- * but not the rest of nsIFontMetrics, or vice versa.
+ * but not the rest of nsFontMetrics, or vice versa.
  */
 
 #ifdef MOZ_MATHML
diff --git a/gfx/src/nsThebesFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
similarity index 63%
rename from gfx/src/nsThebesFontMetrics.cpp
rename to gfx/src/nsFontMetrics.cpp
index de033ccdb85f..a8939196b901 100644
--- a/gfx/src/nsThebesFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -36,29 +36,51 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsThebesFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsBoundingMetrics.h"
+#include "nsRenderingContext.h"
 #include "nsThebesDeviceContext.h"
-#include "nsFont.h"
 
-#include "nsString.h"
-#include <stdio.h>
+class AutoTextRun {
+public:
+    AutoTextRun(nsFontMetrics* aMetrics, nsRenderingContext* aRC,
+                const char* aString, PRInt32 aLength) {
+        mTextRun = gfxTextRunCache::MakeTextRun(
+            reinterpret_cast<const PRUint8*>(aString), aLength,
+            aMetrics->GetThebesFontGroup(), aRC->ThebesContext(),
+            aMetrics->AppUnitsPerDevPixel(),
+            ComputeFlags(aMetrics));
+    }
+    AutoTextRun(nsFontMetrics* aMetrics, nsRenderingContext* aRC,
+                const PRUnichar* aString, PRInt32 aLength) {
+        mTextRun = gfxTextRunCache::MakeTextRun(
+            aString, aLength, aMetrics->GetThebesFontGroup(),
+            aRC->ThebesContext(),
+            aMetrics->AppUnitsPerDevPixel(),
+            ComputeFlags(aMetrics));
+    }
+    gfxTextRun* operator->() { return mTextRun.get(); }
+    gfxTextRun* get() { return mTextRun.get(); }
 
-#include "gfxTextRunCache.h"
-#include "gfxPlatform.h"
-#include "gfxUserFontSet.h"
+private:
+    gfxTextRunCache::AutoTextRun mTextRun;
 
-NS_IMPL_ISUPPORTS1(nsThebesFontMetrics, nsIFontMetrics)
+    static PRUint32 ComputeFlags(nsFontMetrics* aMetrics) {
+        PRUint32 flags = 0;
+        if (aMetrics->GetRightToLeftTextRunMode()) {
+            flags |= gfxTextRunFactory::TEXT_IS_RTL;
+        }
+        return flags;
+    }
+};
 
-#include <stdlib.h>
-
-nsThebesFontMetrics::nsThebesFontMetrics()
+nsFontMetrics::nsFontMetrics()
 {
     mFontStyle = nsnull;
     mFontGroup = nsnull;
 }
 
-nsThebesFontMetrics::~nsThebesFontMetrics()
+nsFontMetrics::~nsFontMetrics()
 {
     if (mDeviceContext)
         mDeviceContext->FontMetricsDeleted(this);
@@ -66,10 +88,10 @@ nsThebesFontMetrics::~nsThebesFontMetrics()
     //delete mFontGroup;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
-                          nsIDeviceContext *aContext, 
-                          gfxUserFontSet *aUserFontSet)
+nsresult
+nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
+                    nsIDeviceContext *aContext,
+                    gfxUserFontSet *aUserFontSet)
 {
     mFont = aFont;
     mLanguage = aLanguage;
@@ -89,16 +111,16 @@ nsThebesFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
                                   aFont.languageOverride);
 
     mFontGroup =
-        gfxPlatform::GetPlatform()->CreateFontGroup(aFont.name, mFontStyle, 
+        gfxPlatform::GetPlatform()->CreateFontGroup(aFont.name, mFontStyle,
                                                     aUserFontSet);
-    if (mFontGroup->FontListLength() < 1) 
+    if (mFontGroup->FontListLength() < 1)
         return NS_ERROR_UNEXPECTED;
 
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::Destroy()
+nsresult
+nsFontMetrics::Destroy()
 {
     mDeviceContext = nsnull;
     return NS_OK;
@@ -108,42 +130,42 @@ nsThebesFontMetrics::Destroy()
 #define ROUND_TO_TWIPS(x) (nscoord)floor(((x) * mP2A) + 0.5)
 #define CEIL_TO_TWIPS(x) (nscoord)NS_ceil((x) * mP2A)
 
-const gfxFont::Metrics& nsThebesFontMetrics::GetMetrics() const
+const gfxFont::Metrics& nsFontMetrics::GetMetrics() const
 {
     return mFontGroup->GetFontAt(0)->GetMetrics();
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetXHeight(nscoord& aResult)
+nsresult
+nsFontMetrics::GetXHeight(nscoord& aResult)
 {
     aResult = ROUND_TO_TWIPS(GetMetrics().xHeight);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetSuperscriptOffset(nscoord& aResult)
+nsresult
+nsFontMetrics::GetSuperscriptOffset(nscoord& aResult)
 {
     aResult = ROUND_TO_TWIPS(GetMetrics().superscriptOffset);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetSubscriptOffset(nscoord& aResult)
+nsresult
+nsFontMetrics::GetSubscriptOffset(nscoord& aResult)
 {
     aResult = ROUND_TO_TWIPS(GetMetrics().subscriptOffset);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetStrikeout(nscoord& aOffset, nscoord& aSize)
+nsresult
+nsFontMetrics::GetStrikeout(nscoord& aOffset, nscoord& aSize)
 {
     aOffset = ROUND_TO_TWIPS(GetMetrics().strikeoutOffset);
     aSize = ROUND_TO_TWIPS(GetMetrics().strikeoutSize);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetUnderline(nscoord& aOffset, nscoord& aSize)
+nsresult
+nsFontMetrics::GetUnderline(nscoord& aOffset, nscoord& aSize)
 {
     aOffset = ROUND_TO_TWIPS(mFontGroup->GetUnderlineOffset());
     aSize = ROUND_TO_TWIPS(GetMetrics().underlineSize);
@@ -170,109 +192,109 @@ static gfxFloat ComputeMaxAscent(const gfxFont::Metrics& aMetrics)
     return NS_floor(aMetrics.maxAscent + 0.5);
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetHeight(nscoord &aHeight)
+nsresult
+nsFontMetrics::GetHeight(nscoord &aHeight)
 {
     aHeight = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics())) +
         CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetInternalLeading(nscoord &aLeading)
+nsresult
+nsFontMetrics::GetInternalLeading(nscoord &aLeading)
 {
     aLeading = ROUND_TO_TWIPS(GetMetrics().internalLeading);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetExternalLeading(nscoord &aLeading)
+nsresult
+nsFontMetrics::GetExternalLeading(nscoord &aLeading)
 {
     aLeading = ROUND_TO_TWIPS(GetMetrics().externalLeading);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetEmHeight(nscoord &aHeight)
+nsresult
+nsFontMetrics::GetEmHeight(nscoord &aHeight)
 {
     aHeight = ROUND_TO_TWIPS(GetMetrics().emHeight);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetEmAscent(nscoord &aAscent)
+nsresult
+nsFontMetrics::GetEmAscent(nscoord &aAscent)
 {
     aAscent = ROUND_TO_TWIPS(GetMetrics().emAscent);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetEmDescent(nscoord &aDescent)
+nsresult
+nsFontMetrics::GetEmDescent(nscoord &aDescent)
 {
     aDescent = ROUND_TO_TWIPS(GetMetrics().emDescent);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetMaxHeight(nscoord &aHeight)
+nsresult
+nsFontMetrics::GetMaxHeight(nscoord &aHeight)
 {
     aHeight = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics())) +
         CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetMaxAscent(nscoord &aAscent)
+nsresult
+nsFontMetrics::GetMaxAscent(nscoord &aAscent)
 {
     aAscent = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics()));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetMaxDescent(nscoord &aDescent)
+nsresult
+nsFontMetrics::GetMaxDescent(nscoord &aDescent)
 {
     aDescent = CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetMaxAdvance(nscoord &aAdvance)
+nsresult
+nsFontMetrics::GetMaxAdvance(nscoord &aAdvance)
 {
     aAdvance = CEIL_TO_TWIPS(GetMetrics().maxAdvance);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetLanguage(nsIAtom** aLanguage)
+nsresult
+nsFontMetrics::GetLanguage(nsIAtom** aLanguage)
 {
     *aLanguage = mLanguage;
     NS_IF_ADDREF(*aLanguage);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetFontHandle(nsFontHandle &aHandle)
+nsresult
+nsFontMetrics::GetFontHandle(nsFontHandle &aHandle)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetAveCharWidth(nscoord& aAveCharWidth)
+nsresult
+nsFontMetrics::GetAveCharWidth(nscoord& aAveCharWidth)
 {
     // Use CEIL instead of ROUND for consistency with GetMaxAdvance
     aAveCharWidth = CEIL_TO_TWIPS(GetMetrics().aveCharWidth);
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsThebesFontMetrics::GetSpaceWidth(nscoord& aSpaceCharWidth)
+nsresult
+nsFontMetrics::GetSpaceWidth(nscoord& aSpaceCharWidth)
 {
     aSpaceCharWidth = CEIL_TO_TWIPS(GetMetrics().spaceWidth);
     return NS_OK;
 }
 
 PRInt32
-nsThebesFontMetrics::GetMaxStringLength()
+nsFontMetrics::GetMaxStringLength()
 {
     const gfxFont::Metrics& m = GetMetrics();
     const double x = 32767.0 / m.maxAdvance;
@@ -296,9 +318,9 @@ public:
     }
 };
 
-nsresult 
-nsThebesFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
-                              nsRenderingContext *aContext)
+nsresult
+nsFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
+                        nsRenderingContext *aContext)
 {
     if (aLength == 0) {
         aWidth = 0;
@@ -320,9 +342,9 @@ nsThebesFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aW
 }
 
 nsresult
-nsThebesFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                              nscoord& aWidth, PRInt32 *aFontID,
-                              nsRenderingContext *aContext)
+nsFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
+                        nscoord& aWidth, PRInt32 *aFontID,
+                        nsRenderingContext *aContext)
 {
     if (aLength == 0) {
         aWidth = 0;
@@ -345,47 +367,47 @@ nsThebesFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
 
 // Get the text dimensions for this string
 nsresult
-nsThebesFontMetrics::GetTextDimensions(const PRUnichar* aString,
-                                    PRUint32 aLength,
-                                    nsTextDimensions& aDimensions, 
-                                    PRInt32* aFontID)
+nsFontMetrics::GetTextDimensions(const PRUnichar* aString,
+                                 PRUint32 aLength,
+                                 nsTextDimensions& aDimensions,
+                                 PRInt32* aFontID)
 {
     return NS_OK;
 }
 
 nsresult
-nsThebesFontMetrics::GetTextDimensions(const char*         aString,
-                                   PRInt32             aLength,
-                                   PRInt32             aAvailWidth,
-                                   PRInt32*            aBreaks,
-                                   PRInt32             aNumBreaks,
-                                   nsTextDimensions&   aDimensions,
-                                   PRInt32&            aNumCharsFit,
-                                   nsTextDimensions&   aLastWordDimensions,
-                                   PRInt32*            aFontID)
+nsFontMetrics::GetTextDimensions(const char*         aString,
+                                 PRInt32             aLength,
+                                 PRInt32             aAvailWidth,
+                                 PRInt32*            aBreaks,
+                                 PRInt32             aNumBreaks,
+                                 nsTextDimensions&   aDimensions,
+                                 PRInt32&            aNumCharsFit,
+                                 nsTextDimensions&   aLastWordDimensions,
+                                 PRInt32*            aFontID)
 {
     return NS_OK;
 }
 nsresult
-nsThebesFontMetrics::GetTextDimensions(const PRUnichar*    aString,
-                                   PRInt32             aLength,
-                                   PRInt32             aAvailWidth,
-                                   PRInt32*            aBreaks,
-                                   PRInt32             aNumBreaks,
-                                   nsTextDimensions&   aDimensions,
-                                   PRInt32&            aNumCharsFit,
-                                   nsTextDimensions&   aLastWordDimensions,
-                                   PRInt32*            aFontID)
+nsFontMetrics::GetTextDimensions(const PRUnichar*    aString,
+                                 PRInt32             aLength,
+                                 PRInt32             aAvailWidth,
+                                 PRInt32*            aBreaks,
+                                 PRInt32             aNumBreaks,
+                                 nsTextDimensions&   aDimensions,
+                                 PRInt32&            aNumCharsFit,
+                                 nsTextDimensions&   aLastWordDimensions,
+                                 PRInt32*            aFontID)
 {
     return NS_OK;
 }
 
-// Draw a string using this font handle on the surface passed in.  
+// Draw a string using this font handle on the surface passed in.
 nsresult
-nsThebesFontMetrics::DrawString(const char *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                const nscoord* aSpacing,
-                                nsRenderingContext *aContext)
+nsFontMetrics::DrawString(const char *aString, PRUint32 aLength,
+                          nscoord aX, nscoord aY,
+                          const nscoord* aSpacing,
+                          nsRenderingContext *aContext)
 {
     if (aLength == 0)
         return NS_OK;
@@ -405,10 +427,10 @@ nsThebesFontMetrics::DrawString(const char *aString, PRUint32 aLength,
 }
 
 nsresult
-nsThebesFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                nsRenderingContext *aContext,
-                                nsRenderingContext *aTextRunConstructionContext)
+nsFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
+                          nscoord aX, nscoord aY,
+                          nsRenderingContext *aContext,
+                          nsRenderingContext *aTextRunConstructionContext)
 {
     if (aLength == 0)
         return NS_OK;
@@ -429,16 +451,18 @@ nsThebesFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
 #ifdef MOZ_MATHML
 
 static void
-GetTextRunBoundingMetrics(gfxTextRun *aTextRun, PRUint32 aStart, PRUint32 aLength,
+GetTextRunBoundingMetrics(gfxTextRun *aTextRun,
+                          PRUint32 aStart, PRUint32 aLength,
                           nsRenderingContext *aContext,
                           nsBoundingMetrics &aBoundingMetrics)
 {
     StubPropertyProvider provider;
     gfxTextRun::Metrics theMetrics =
-        aTextRun->MeasureText(aStart, aLength, gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
+        aTextRun->MeasureText(aStart, aLength,
+                              gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
                               aContext->ThebesContext(), &provider);
-        // note that TIGHT_HINTED_OUTLINE_EXTENTS can be expensive (on Windows)
-        // but this is only used for MathML positioning so it's not critical
+    // note that TIGHT_HINTED_OUTLINE_EXTENTS can be expensive (on Windows)
+    // but this is only used for MathML positioning so it's not critical
 
     aBoundingMetrics.leftBearing = NSToCoordFloor(theMetrics.mBoundingBox.X());
     aBoundingMetrics.rightBearing = NSToCoordCeil(theMetrics.mBoundingBox.XMost());
@@ -448,9 +472,9 @@ GetTextRunBoundingMetrics(gfxTextRun *aTextRun, PRUint32 aStart, PRUint32 aLengt
 }
 
 nsresult
-nsThebesFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics)
+nsFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
+                                  nsRenderingContext *aContext,
+                                  nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
         aBoundingMetrics = nsBoundingMetrics();
@@ -461,14 +485,15 @@ nsThebesFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
     if (!textRun.get())
         return NS_ERROR_FAILURE;
 
-    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext, aBoundingMetrics);
+    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext,
+                              aBoundingMetrics);
     return NS_OK;
 }
 
 nsresult
-nsThebesFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics)
+nsFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
+                                  nsRenderingContext *aContext,
+                                  nsBoundingMetrics &aBoundingMetrics)
 {
     if (aLength == 0) {
         aBoundingMetrics = nsBoundingMetrics();
@@ -479,7 +504,8 @@ nsThebesFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLeng
     if (!textRun.get())
         return NS_ERROR_FAILURE;
 
-    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext, aBoundingMetrics);
+    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext,
+                              aBoundingMetrics);
     return NS_OK;
 }
 
@@ -487,7 +513,7 @@ nsThebesFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLeng
 
 // Set the direction of the text rendering
 nsresult
-nsThebesFontMetrics::SetRightToLeftText(PRBool aIsRTL)
+nsFontMetrics::SetRightToLeftText(PRBool aIsRTL)
 {
     mIsRightToLeft = aIsRTL;
     return NS_OK;
@@ -495,13 +521,13 @@ nsThebesFontMetrics::SetRightToLeftText(PRBool aIsRTL)
 
 // Set the direction of the text rendering
 PRBool
-nsThebesFontMetrics::GetRightToLeftText()
+nsFontMetrics::GetRightToLeftText()
 {
     return mIsRightToLeft;
 }
 
-/* virtual */ gfxUserFontSet*
-nsThebesFontMetrics::GetUserFontSet()
+gfxUserFontSet*
+nsFontMetrics::GetUserFontSet()
 {
     return mFontGroup->GetUserFontSet();
 }
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
new file mode 100644
index 000000000000..317101785456
--- /dev/null
+++ b/gfx/src/nsFontMetrics.h
@@ -0,0 +1,298 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@pavlov.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef NSFONTMETRICS__H__
+#define NSFONTMETRICS__H__
+
+#include "nsCOMPtr.h"
+#include "nsCoord.h"
+#include "nsFont.h"
+#include "gfxFont.h"
+#include "gfxTextRunCache.h"
+
+class gfxFontGroup;
+class gfxUserFontSet;
+class nsIAtom;
+class nsIDeviceContext;
+class nsRenderingContext;
+class nsString;
+class nsThebesDeviceContext;
+struct nsBoundingMetrics;
+struct nsTextDimensions;
+
+/**
+ * A native font handle
+ */
+typedef void* nsFontHandle;
+
+/**
+ * Font metrics
+ *
+ * This class may be somewhat misnamed. A better name might be
+ * nsFontList. The style system uses the nsFont struct for various
+ * font properties, one of which is font-family, which can contain a
+ * *list* of font names. The nsFont struct is "realized" by asking the
+ * device context to cough up an nsFontMetrics object, which contains
+ * a list of real font handles, one for each font mentioned in
+ * font-family (and for each fallback when we fall off the end of that
+ * list).
+ *
+ * The style system needs to have access to certain metrics, such as
+ * the em height (for the CSS "em" unit), and we use the first Western
+ * font's metrics for that purpose. The platform-specific
+ * implementations are expected to select non-Western fonts that "fit"
+ * reasonably well with the Western font that is loaded at Init time.
+ */
+class nsFontMetrics
+{
+public:
+    nsFontMetrics();
+    ~nsFontMetrics();
+
+    NS_INLINE_DECL_REFCOUNTING(nsFontMetrics)
+
+    /**
+     * Initialize the font metrics. Call this after creating the font metrics.
+     * Font metrics you get from the font cache do NOT need to be initialized
+     *
+     * @see nsIDeviceContext#GetMetricsFor()
+     */
+    nsresult Init(const nsFont& aFont, nsIAtom* aLanguage,
+                  nsIDeviceContext *aContext,
+                  gfxUserFontSet *aUserFontSet = nsnull);
+    /**
+     * Destroy this font metrics. This breaks the association between
+     * the font metrics and the device context.
+     */
+    nsresult Destroy();
+    /**
+     * Return the font's xheight property, scaled into app-units.
+     */
+    nsresult GetXHeight(nscoord& aResult);
+    /**
+     * Return the font's superscript offset (the distance from the
+     * baseline to where a superscript's baseline should be placed).
+     * The value returned will be positive.
+     */
+    nsresult GetSuperscriptOffset(nscoord& aResult);
+    /**
+     * Return the font's subscript offset (the distance from the
+     * baseline to where a subscript's baseline should be placed). The
+     * value returned will be a positive value.
+     */
+    nsresult GetSubscriptOffset(nscoord& aResult);
+    /**
+     * Return the font's strikeout offset (the distance from the
+     * baseline to where a strikeout should be placed) and size.
+     * Positive values are above the baseline, negative below.
+     */
+    nsresult GetStrikeout(nscoord& aOffset, nscoord& aSize);
+    /**
+     * Return the font's underline offset (the distance from the
+     * baseline to where a underline should be placed) and size.
+     * Positive values are above the baseline, negative below.
+     */
+    nsresult GetUnderline(nscoord& aOffset, nscoord& aSize);
+    /**
+     * Returns the height (in app units) of the font. This is ascent plus descent
+     * plus any internal leading
+     *
+     * This method will be removed once the callers have been moved over to the
+     * new GetEmHeight (and possibly GetMaxHeight).
+     */
+    nsresult GetHeight(nscoord &aHeight);
+    /**
+     * Returns the amount of internal leading (in app units) for the font. This
+     * is computed as the "height  - (ascent + descent)"
+     */
+    nsresult GetInternalLeading(nscoord &aLeading);
+    /**
+     * Returns the amount of external leading (in app units) as
+     * suggested by font vendor. This value is suggested by font vendor
+     * to add to normal line-height beside font height.
+     */
+    nsresult GetExternalLeading(nscoord &aLeading);
+    /**
+     * Returns the height (in app units) of the Western font's em square. This is
+     * em ascent plus em descent.
+     */
+    nsresult GetEmHeight(nscoord &aHeight);
+    /**
+     * Returns, in app units, the ascent part of the Western font's em square.
+     */
+    nsresult GetEmAscent(nscoord &aAscent);
+    /**
+     * Returns, in app units, the descent part of the Western font's em square.
+     */
+    nsresult GetEmDescent(nscoord &aDescent);
+    /**
+     * Returns the height (in app units) of the Western font's bounding box.
+     * This is max ascent plus max descent.
+     */
+    nsresult GetMaxHeight(nscoord &aHeight);
+    /**
+     * Returns, in app units, the maximum distance characters in this font extend
+     * above the base line.
+     */
+    nsresult GetMaxAscent(nscoord &aAscent);
+    /**
+     * Returns, in app units, the maximum distance characters in this font extend
+     * below the base line.
+     */
+    nsresult GetMaxDescent(nscoord &aDescent);
+    /**
+     * Returns, in app units, the maximum character advance for the font
+     */
+    nsresult GetMaxAdvance(nscoord &aAdvance);
+    /**
+     * Returns the font associated with these metrics. The return value
+     * is only defined after Init() has been called.
+     */
+    const nsFont &Font() { return mFont; }
+    /**
+     * Returns the language associated with these metrics
+     */
+    nsresult GetLanguage(nsIAtom** aLanguage);
+    /**
+     * Returns the font handle associated with these metrics
+     */
+    nsresult GetFontHandle(nsFontHandle &aHandle);
+    /**
+     * Returns the average character width
+     */
+    nsresult GetAveCharWidth(nscoord& aAveCharWidth);
+    /**
+     * Returns the often needed width of the space character
+     */
+    nsresult GetSpaceWidth(nscoord& aSpaceCharWidth);
+
+    PRInt32 GetMaxStringLength();
+
+    // Get the width for this string.  aWidth will be updated with the
+    // width in points, not twips.  Callers must convert it if they
+    // want it in another format.
+    nsresult GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
+                      nsRenderingContext *aContext);
+    nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
+                      nscoord& aWidth, PRInt32 *aFontID,
+                      nsRenderingContext *aContext);
+
+    // Get the text dimensions for this string
+    nsresult GetTextDimensions(const PRUnichar* aString,
+                               PRUint32 aLength,
+                               nsTextDimensions& aDimensions,
+                               PRInt32* aFontID);
+    nsresult GetTextDimensions(const char*         aString,
+                               PRInt32             aLength,
+                               PRInt32             aAvailWidth,
+                               PRInt32*            aBreaks,
+                               PRInt32             aNumBreaks,
+                               nsTextDimensions&   aDimensions,
+                               PRInt32&            aNumCharsFit,
+                               nsTextDimensions&   aLastWordDimensions,
+                               PRInt32*            aFontID);
+    nsresult GetTextDimensions(const PRUnichar*    aString,
+                               PRInt32             aLength,
+                               PRInt32             aAvailWidth,
+                               PRInt32*            aBreaks,
+                               PRInt32             aNumBreaks,
+                               nsTextDimensions&   aDimensions,
+                               PRInt32&            aNumCharsFit,
+                               nsTextDimensions&   aLastWordDimensions,
+                               PRInt32*            aFontID);
+
+    // Draw a string using this font handle on the surface passed in.
+    nsresult DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing,
+                        nsRenderingContext *aContext);
+    nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing,
+                        nsRenderingContext *aContext)
+    {
+        NS_ASSERTION(!aSpacing, "Spacing not supported here");
+        return DrawString(aString, aLength, aX, aY, aContext, aContext);
+    }
+    nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        nsRenderingContext *aContext,
+                        nsRenderingContext *aTextRunConstructionContext);
+
+#ifdef MOZ_MATHML
+    // These two functions get the bounding metrics for this handle,
+    // updating the aBoundingMetrics in app units.
+    nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
+                                nsRenderingContext *aContext,
+                                nsBoundingMetrics &aBoundingMetrics);
+    nsresult GetBoundingMetrics(const PRUnichar *aString,
+                                PRUint32 aLength,
+                                nsRenderingContext *aContext,
+                                nsBoundingMetrics &aBoundingMetrics);
+#endif /* MOZ_MATHML */
+
+    // Set the direction of the text rendering
+    nsresult SetRightToLeftText(PRBool aIsRTL);
+    PRBool GetRightToLeftText();
+    void SetTextRunRTL(PRBool aIsRTL) { mTextRunRTL = aIsRTL; }
+
+    gfxFontGroup* GetThebesFontGroup() { return mFontGroup; }
+
+    gfxUserFontSet* GetUserFontSet();
+
+    PRBool GetRightToLeftTextRunMode() {
+        return mTextRunRTL;
+    }
+
+    PRInt32 AppUnitsPerDevPixel() { return mP2A; }
+
+protected:
+    const gfxFont::Metrics& GetMetrics() const;
+
+    nsFont mFont;		// The font for this metrics object.
+    nsRefPtr<gfxFontGroup> mFontGroup;
+    gfxFontStyle *mFontStyle;
+    nsThebesDeviceContext *mDeviceContext;
+    nsCOMPtr<nsIAtom> mLanguage;
+    PRInt32 mP2A;
+    PRPackedBool mIsRightToLeft;
+    PRPackedBool mTextRunRTL;
+};
+
+#endif /* NSFONTMETRICS__H__ */
diff --git a/gfx/src/nsGfxCIID.h b/gfx/src/nsGfxCIID.h
index 630cba013327..303d3ead2b9d 100644
--- a/gfx/src/nsGfxCIID.h
+++ b/gfx/src/nsGfxCIID.h
@@ -50,10 +50,6 @@
 { 0x6049b262, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
-#define NS_FONT_METRICS_CID \
-{ 0x6049b263, 0xc1e6, 0x11d1, \
-{ 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
 #define NS_FONT_ENUMERATOR_CID \
 { 0xa6cf9115, 0x15b3, 0x11d2, \
 { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
diff --git a/gfx/src/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
index 2851ddd4ef95..44d0a79913b0 100644
--- a/gfx/src/nsIDeviceContext.h
+++ b/gfx/src/nsIDeviceContext.h
@@ -46,7 +46,7 @@
 #include "nsStringFwd.h"
 
 class nsIView;
-class nsIFontMetrics;
+class nsFontMetrics;
 class nsIWidget;
 class nsIDeviceContextSpec;
 class nsIAtom;
@@ -309,7 +309,7 @@ public:
   NS_IMETHOD  GetSystemFont(nsSystemFontID aID, nsFont *aFont) const = 0;
 
   /**
-   * Get the nsIFontMetrics that describe the properties of
+   * Get the nsFontMetrics that describe the properties of
    * an nsFont.
    * @param aFont font description to obtain metrics for
    * @param aLanguage the language of the document
@@ -319,10 +319,10 @@ public:
    */
   NS_IMETHOD  GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                             gfxUserFontSet* aUserFontSet,
-                            nsIFontMetrics*& aMetrics) = 0;
+                            nsFontMetrics*& aMetrics) = 0;
 
   /**
-   * Get the nsIFontMetrics that describe the properties of
+   * Get the nsFontMetrics that describe the properties of
    * an nsFont.
    * @param aFont font description to obtain metrics for
    * @param aMetrics out parameter for font metrics
@@ -330,7 +330,7 @@ public:
    * @return error status
    */
   NS_IMETHOD  GetMetricsFor(const nsFont& aFont, gfxUserFontSet* aUserFontSet,
-                            nsIFontMetrics*& aMetrics) = 0;
+                            nsFontMetrics*& aMetrics) = 0;
 
   /**
    * Check to see if a particular named font exists.
@@ -347,7 +347,7 @@ public:
    * Notification when a font metrics instance created for this device is
    * about to be deleted
    */
-  NS_IMETHOD FontMetricsDeleted(const nsIFontMetrics* aFontMetrics) = 0;
+  NS_IMETHOD FontMetricsDeleted(const nsFontMetrics* aFontMetrics) = 0;
 
   /**
    * Attempt to free up resoruces by flushing out any fonts no longer
diff --git a/gfx/src/nsIFontMetrics.h b/gfx/src/nsIFontMetrics.h
deleted file mode 100644
index a7ac12f3ce5f..000000000000
--- a/gfx/src/nsIFontMetrics.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIFontMetrics_h___
-#define nsIFontMetrics_h___
-
-#include "nsISupports.h"
-#include "nsCoord.h"
-#include "nsFont.h"
-
-class nsString;
-class nsIDeviceContext;
-class nsIAtom;
-class gfxUserFontSet;
-struct nsTextDimensions;
-struct nsBoundingMetrics;
-class gfxFontGroup;
-class nsRenderingContext;
-
-// IID for the nsIFontMetrics interface
-#define NS_IFONT_METRICS_IID   \
-{ 0x360C5575, 0xF7AC, 0x4079, \
-{ 0xB8, 0xA6, 0x56, 0x91, 0x4B, 0xEA, 0x2A, 0xEA } }
-
-/**
- * A native font handle
- */
-typedef void* nsFontHandle;
-
-/**
- * Font metrics interface
- *
- * This interface may be somewhat misnamed. A better name might be
- * nsIFontList. The style system uses the nsFont struct for various font
- * properties, one of which is font-family, which can contain a *list* of
- * font names. The nsFont struct is "realized" by asking the device context
- * to cough up an nsIFontMetrics object, which contains a list of real font
- * handles, one for each font mentioned in font-family (and for each fallback
- * when we fall off the end of that list).
- *
- * The style system needs to have access to certain metrics, such as the
- * em height (for the CSS "em" unit), and we use the first Western font's
- * metrics for that purpose. The platform-specific implementations are
- * expected to select non-Western fonts that "fit" reasonably well with the
- * Western font that is loaded at Init time.
- */
-class nsIFontMetrics : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFONT_METRICS_IID)
-
-  /**
-   * Initialize the font metrics. Call this after creating the font metrics.
-   * Font metrics you get from the font cache do NOT need to be initialized
-   *
-   * @see nsIDeviceContext#GetMetricsFor()
-   */
-  NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLanguage,
-                   nsIDeviceContext *aContext, gfxUserFontSet *aUserFontSet = nsnull) = 0;
-
-  /**
-   * Destroy this font metrics. This breaks the association between
-   * the font metrics and the device context.
-   */
-  NS_IMETHOD  Destroy() = 0;
-
-  /**
-   * Return the font's xheight property, scaled into app-units.
-   */
-  NS_IMETHOD  GetXHeight(nscoord& aResult) = 0;
-
-  /**
-   * Return the font's superscript offset (the distance from the
-   * baseline to where a superscript's baseline should be placed).
-   * The value returned will be positive.
-   */
-  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult) = 0;
-
-  /**
-   * Return the font's subscript offset (the distance from the
-   * baseline to where a subscript's baseline should be placed). The
-   * value returned will be a positive value.
-   */
-  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult) = 0;
-
-  /**
-   * Return the font's strikeout offset (the distance from the
-   * baseline to where a strikeout should be placed) and size.
-   * Positive values are above the baseline, negative below.
-   */
-  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize) = 0;
-
-  /**
-   * Return the font's underline offset (the distance from the
-   * baseline to where a underline should be placed) and size.
-   * Positive values are above the baseline, negative below.
-   */
-  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize) = 0;
-
-  /**
-   * Returns the height (in app units) of the font. This is ascent plus descent
-   * plus any internal leading
-   *
-   * This method will be removed once the callers have been moved over to the
-   * new GetEmHeight (and possibly GetMaxHeight).
-   */
-  NS_IMETHOD  GetHeight(nscoord &aHeight) = 0;
-
-  /**
-   * Returns the amount of internal leading (in app units) for the font. This
-   * is computed as the "height  - (ascent + descent)"
-   */
-  NS_IMETHOD  GetInternalLeading(nscoord &aLeading) = 0;
-
-  /**
-   * Returns the amount of external leading (in app units) as
-   * suggested by font vendor. This value is suggested by font vendor
-   * to add to normal line-height beside font height.
-   */
-  NS_IMETHOD  GetExternalLeading(nscoord &aLeading) = 0;
-
-  /**
-   * Returns the height (in app units) of the Western font's em square. This is
-   * em ascent plus em descent.
-   */
-  NS_IMETHOD  GetEmHeight(nscoord &aHeight) = 0;
-
-  /**
-   * Returns, in app units, the ascent part of the Western font's em square.
-   */
-  NS_IMETHOD  GetEmAscent(nscoord &aAscent) = 0;
-
-  /**
-   * Returns, in app units, the descent part of the Western font's em square.
-   */
-  NS_IMETHOD  GetEmDescent(nscoord &aDescent) = 0;
-
-  /**
-   * Returns the height (in app units) of the Western font's bounding box.
-   * This is max ascent plus max descent.
-   */
-  NS_IMETHOD  GetMaxHeight(nscoord &aHeight) = 0;
-
-  /**
-   * Returns, in app units, the maximum distance characters in this font extend
-   * above the base line.
-   */
-  NS_IMETHOD  GetMaxAscent(nscoord &aAscent) = 0;
-
-  /**
-   * Returns, in app units, the maximum distance characters in this font extend
-   * below the base line.
-   */
-  NS_IMETHOD  GetMaxDescent(nscoord &aDescent) = 0;
-
-  /**
-   * Returns, in app units, the maximum character advance for the font
-   */
-  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance) = 0;
-
-  /**
-   * Returns the font associated with these metrics. The return value
-   * is only defined after Init() has been called.
-   */
-  const nsFont &Font() { return mFont; }
-
-  /**
-   * Returns the language associated with these metrics
-   */
-  NS_IMETHOD  GetLanguage(nsIAtom** aLanguage) = 0;
-
-  /**
-   * Returns the font handle associated with these metrics
-   */
-  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle) = 0;
-
-  /**
-   * Returns the average character width
-   */
-  NS_IMETHOD  GetAveCharWidth(nscoord& aAveCharWidth) = 0;
-
-  /**
-   * Returns the often needed width of the space character
-   */
-  NS_IMETHOD  GetSpaceWidth(nscoord& aSpaceCharWidth) = 0;
-
-  // methods formerly in nsIThebesFontMetrics
-
-  // Get the width for this string.  aWidth will be updated with the
-  // width in points, not twips.  Callers must convert it if they
-  // want it in another format.
-  virtual nsresult GetWidth(const char* aString, PRUint32 aLength,
-                            nscoord& aWidth, nsRenderingContext *aContext) = 0;
-  virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                            nscoord& aWidth, PRInt32 *aFontID,
-                            nsRenderingContext *aContext) = 0;
-
-  // Get the text dimensions for this string
-  virtual nsresult GetTextDimensions(const PRUnichar* aString,
-                                     PRUint32 aLength,
-                                     nsTextDimensions& aDimensions,
-                                     PRInt32* aFontID) = 0;
-  virtual nsresult GetTextDimensions(const char*         aString,
-                                     PRInt32             aLength,
-                                     PRInt32             aAvailWidth,
-                                     PRInt32*            aBreaks,
-                                     PRInt32             aNumBreaks,
-                                     nsTextDimensions&   aDimensions,
-                                     PRInt32&            aNumCharsFit,
-                                     nsTextDimensions&   aLastWordDimensions,
-                                     PRInt32*            aFontID) = 0;
-  virtual nsresult GetTextDimensions(const PRUnichar*    aString,
-                                     PRInt32             aLength,
-                                     PRInt32             aAvailWidth,
-                                     PRInt32*            aBreaks,
-                                     PRInt32             aNumBreaks,
-                                     nsTextDimensions&   aDimensions,
-                                     PRInt32&            aNumCharsFit,
-                                     nsTextDimensions&   aLastWordDimensions,
-                                     PRInt32*            aFontID) = 0;
-
-  // Draw a string using this font handle on the surface passed in.
-  virtual nsresult DrawString(const char *aString, PRUint32 aLength,
-                              nscoord aX, nscoord aY,
-                              const nscoord* aSpacing,
-                              nsRenderingContext *aContext) = 0;
-  virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                              nscoord aX, nscoord aY,
-                              PRInt32 aFontID,
-                              const nscoord* aSpacing,
-                              nsRenderingContext *aContext) = 0;
-  virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                              nscoord aX, nscoord aY,
-                              nsRenderingContext *aContext,
-                              nsRenderingContext *aTextRunConstructionContext) = 0;
-
-#ifdef MOZ_MATHML
-  // These two functions get the bounding metrics for this handle,
-  // updating the aBoundingMetrics in Points.  This means that the
-  // caller will have to update them to twips before passing it
-  // back.
-  virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                      nsRenderingContext *aContext,
-                                      nsBoundingMetrics &aBoundingMetrics) = 0;
-  // aCachedOffset will be updated with a new offset.
-  virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
-                                      PRUint32 aLength,
-                                      nsRenderingContext *aContext,
-                                      nsBoundingMetrics &aBoundingMetrics) = 0;
-#endif /* MOZ_MATHML */
-
-  // Set the direction of the text rendering
-  virtual nsresult SetRightToLeftText(PRBool aIsRTL) = 0;
-  virtual PRBool GetRightToLeftText() = 0;
-  virtual void SetTextRunRTL(PRBool aIsRTL) = 0;
-
-  virtual PRInt32 GetMaxStringLength() = 0;
-
-  virtual gfxFontGroup* GetThebesFontGroup() = 0;
-
-  // Needs to be virtual and at this level so that its caller in gkgfx can
-  // avoid linking against thebes.
-  virtual gfxUserFontSet* GetUserFontSet() = 0;
-
-protected:
-
-  nsFont mFont;		// The font for this metrics object.
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIFontMetrics, NS_IFONT_METRICS_IID)
-
-#endif /* nsIFontMetrics_h___ */
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 1f55ee403bb6..8c146af9bc66 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -477,7 +477,7 @@ nsRenderingContext::SetFont(const nsFont& aFont,
 }
 
 void
-nsRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
+nsRenderingContext::SetFont(nsFontMetrics *aFontMetrics)
 {
     mFontMetrics = aFontMetrics;
 }
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index b8455afb8ffb..6611f8978a4f 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -42,7 +42,7 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsColor.h"
 #include "nsCoord.h"
 #include "gfxContext.h"
@@ -120,8 +120,8 @@ public:
     void SetFont(const nsFont& aFont, nsIAtom* aLanguage,
                  gfxUserFontSet *aUserFontSet);
     void SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
-    void SetFont(nsIFontMetrics *aFontMetrics);
-    nsIFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
+    void SetFont(nsFontMetrics *aFontMetrics);
+    nsFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
 
     void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
@@ -151,7 +151,7 @@ protected:
 
     nsRefPtr<gfxContext> mThebes;
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
-    nsCOMPtr<nsIFontMetrics> mFontMetrics;
+    nsRefPtr<nsFontMetrics> mFontMetrics;
 
     double mP2A; // cached app units per device pixel value
 };
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index c913f2093234..bd1924cc70c1 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -105,15 +105,14 @@ public:
     nsresult Init(nsIDeviceContext* aContext);
     nsresult GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                            gfxUserFontSet* aUserFontSet,
-                           nsIFontMetrics*& aMetrics);
+                           nsFontMetrics*& aMetrics);
 
-    nsresult FontMetricsDeleted(const nsIFontMetrics* aFontMetrics);
+    nsresult FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
     nsresult Compact();
     nsresult Flush();
-    nsresult CreateFontMetricsInstance(nsIFontMetrics** fm);
 
 protected:
-    nsTArray<nsIFontMetrics*> mFontMetrics;
+    nsTArray<nsFontMetrics*>  mFontMetrics;
     nsIDeviceContext         *mContext; // we do not addref this since
                                         // ownership is implied. MMP.
 };
@@ -142,12 +141,12 @@ nsFontCache::Init(nsIDeviceContext* aContext)
 
 nsresult
 nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
-  gfxUserFontSet* aUserFontSet, nsIFontMetrics*& aMetrics)
+  gfxUserFontSet* aUserFontSet, nsFontMetrics*& aMetrics)
 {
     // First check our cache
     // start from the end, which is where we put the most-recent-used element
 
-    nsIFontMetrics* fm;
+    nsFontMetrics* fm;
     PRInt32 n = mFontMetrics.Length() - 1;
     for (PRInt32 i = n; i >= 0; --i) {
         fm = mFontMetrics[i];
@@ -169,10 +168,9 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
 
     // It's not in the cache. Get font metrics and then cache them.
 
-    aMetrics = nsnull;
-    nsresult rv = CreateFontMetricsInstance(&fm);
-    if (NS_FAILED(rv)) return rv;
-    rv = fm->Init(aFont, aLanguage, mContext, aUserFontSet);
+    fm = new nsFontMetrics();
+    NS_ADDREF(fm);
+    nsresult rv = fm->Init(aFont, aLanguage, mContext, aUserFontSet);
     if (NS_SUCCEEDED(rv)) {
         // the mFontMetrics list has the "head" at the end, because append
         // is cheaper than insert
@@ -189,13 +187,12 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
     // objects are available. Compact the cache and try again.
 
     Compact();
-    rv = CreateFontMetricsInstance(&fm);
-    if (NS_FAILED(rv)) return rv;
+    fm = new nsFontMetrics();
+    NS_ADDREF(fm);
     rv = fm->Init(aFont, aLanguage, mContext, aUserFontSet);
     if (NS_SUCCEEDED(rv)) {
         mFontMetrics.AppendElement(fm);
         aMetrics = fm;
-        NS_ADDREF(aMetrics);
         return NS_OK;
     }
     fm->Destroy();
@@ -215,14 +212,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
     return rv;
 }
 
-nsresult
-nsFontCache::CreateFontMetricsInstance(nsIFontMetrics** fm)
-{
-    static NS_DEFINE_CID(kFontMetricsCID, NS_FONT_METRICS_CID);
-    return CallCreateInstance(kFontMetricsCID, fm);
-}
-
-nsresult nsFontCache::FontMetricsDeleted(const nsIFontMetrics* aFontMetrics)
+nsresult nsFontCache::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
 {
     mFontMetrics.RemoveElement(aFontMetrics);
     return NS_OK;
@@ -233,8 +223,8 @@ nsresult nsFontCache::Compact()
     // Need to loop backward because the running element can be removed on
     // the way
     for (PRInt32 i = mFontMetrics.Length()-1; i >= 0; --i) {
-        nsIFontMetrics* fm = mFontMetrics[i];
-        nsIFontMetrics* oldfm = fm;
+        nsFontMetrics* fm = mFontMetrics[i];
+        nsFontMetrics* oldfm = fm;
         // Destroy() isn't here because we want our device context to be
         // notified
         NS_RELEASE(fm); // this will reset fm to nsnull
@@ -251,7 +241,7 @@ nsresult nsFontCache::Compact()
 nsresult nsFontCache::Flush()
 {
     for (PRInt32 i = mFontMetrics.Length()-1; i >= 0; --i) {
-        nsIFontMetrics* fm = mFontMetrics[i];
+        nsFontMetrics* fm = mFontMetrics[i];
         // Destroy() will unhook our device context from the fm so that we
         // won't waste time in triggering the notification of
         // FontMetricsDeleted() in the subsequent release
@@ -324,7 +314,7 @@ NS_IMETHODIMP nsThebesDeviceContext::CreateFontCache()
     return mFontCache->Init(this);
 }
 
-NS_IMETHODIMP nsThebesDeviceContext::FontMetricsDeleted(const nsIFontMetrics* aFontMetrics)
+NS_IMETHODIMP nsThebesDeviceContext::FontMetricsDeleted(const nsFontMetrics* aFontMetrics)
 {
     if (mFontCache) {
         mFontCache->FontMetricsDeleted(aFontMetrics);
@@ -348,7 +338,7 @@ nsThebesDeviceContext::GetLocaleLanguage(void)
 }
 
 NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
-  nsIAtom* aLanguage, gfxUserFontSet* aUserFontSet, nsIFontMetrics*& aMetrics)
+  nsIAtom* aLanguage, gfxUserFontSet* aUserFontSet, nsFontMetrics*& aMetrics)
 {
     if (nsnull == mFontCache) {
         nsresult rv = CreateFontCache();
@@ -371,7 +361,7 @@ NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
 
 NS_IMETHODIMP nsThebesDeviceContext::GetMetricsFor(const nsFont& aFont,
                                                    gfxUserFontSet* aUserFontSet,
-                                                   nsIFontMetrics*& aMetrics)
+                                                   nsFontMetrics*& aMetrics)
 {
     if (nsnull == mFontCache) {
         nsresult rv = CreateFontCache();
diff --git a/gfx/src/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
index 5cb66230c777..a2ed1193df02 100644
--- a/gfx/src/nsThebesDeviceContext.h
+++ b/gfx/src/nsThebesDeviceContext.h
@@ -86,10 +86,10 @@ public:
 
     NS_IMETHOD GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
                              gfxUserFontSet* aUserFontSet,
-                             nsIFontMetrics*& aMetrics);
+                             nsFontMetrics*& aMetrics);
     NS_IMETHOD GetMetricsFor(const nsFont& aFont,
                              gfxUserFontSet* aUserFontSet,
-                             nsIFontMetrics*& aMetrics);
+                             nsFontMetrics*& aMetrics);
 
     NS_IMETHOD FirstExistingFont(const nsFont& aFont, nsString& aFaceName);
 
@@ -97,7 +97,7 @@ public:
                                 PRBool& aAliased);
 
     NS_IMETHOD CreateFontCache();
-    NS_IMETHOD FontMetricsDeleted(const nsIFontMetrics* aFontMetrics);
+    NS_IMETHOD FontMetricsDeleted(const nsFontMetrics* aFontMetrics);
     NS_IMETHOD FlushFontCache(void);
 
     NS_IMETHOD PrepareNativeWidget(nsIWidget *aWidget, void **aOut);
diff --git a/gfx/src/nsThebesFontMetrics.h b/gfx/src/nsThebesFontMetrics.h
deleted file mode 100644
index 567436748205..000000000000
--- a/gfx/src/nsThebesFontMetrics.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * mozilla.org.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Stuart Parmenter <pavlov@pavlov.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef NSTHEBESFONTMETRICS__H__
-#define NSTHEBESFONTMETRICS__H__
-
-#include "nsIFontMetrics.h"
-#include "nsCOMPtr.h"
-#include "nsRenderingContext.h"
-#include "gfxFont.h"
-#include "gfxTextRunCache.h"
-
-class nsIAtom;
-class nsIDeviceContext;
-class nsThebesDeviceContext;
-
-class nsThebesFontMetrics : public nsIFontMetrics
-{
-public:
-    nsThebesFontMetrics();
-    virtual ~nsThebesFontMetrics();
-
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLanguage,
-                     nsIDeviceContext *aContext,
-                     gfxUserFontSet *aUserFontSet = nsnull);
-    NS_IMETHOD  Destroy();
-    NS_IMETHOD  GetXHeight(nscoord& aResult);
-    NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
-    NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
-    NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
-    NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
-    NS_IMETHOD  GetHeight(nscoord &aHeight);
-    NS_IMETHOD  GetInternalLeading(nscoord &aLeading);
-    NS_IMETHOD  GetExternalLeading(nscoord &aLeading);
-    NS_IMETHOD  GetEmHeight(nscoord &aHeight);
-    NS_IMETHOD  GetEmAscent(nscoord &aAscent);
-    NS_IMETHOD  GetEmDescent(nscoord &aDescent);
-    NS_IMETHOD  GetMaxHeight(nscoord &aHeight);
-    NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
-    NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
-    NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
-    NS_IMETHOD  GetLanguage(nsIAtom** aLanguage);
-    NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
-    NS_IMETHOD  GetAveCharWidth(nscoord& aAveCharWidth);
-    NS_IMETHOD  GetSpaceWidth(nscoord& aSpaceCharWidth);
-    virtual PRInt32 GetMaxStringLength();
-
-
-    virtual nsresult GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
-                              nsRenderingContext *aContext);
-    virtual nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                              nscoord& aWidth, PRInt32 *aFontID,
-                              nsRenderingContext *aContext);
-
-    // Get the text dimensions for this string
-    virtual nsresult GetTextDimensions(const PRUnichar* aString,
-                                       PRUint32 aLength,
-                                       nsTextDimensions& aDimensions, 
-                                       PRInt32* aFontID);
-    virtual nsresult GetTextDimensions(const char*         aString,
-                                       PRInt32             aLength,
-                                       PRInt32             aAvailWidth,
-                                       PRInt32*            aBreaks,
-                                       PRInt32             aNumBreaks,
-                                       nsTextDimensions&   aDimensions,
-                                       PRInt32&            aNumCharsFit,
-                                       nsTextDimensions&   aLastWordDimensions,
-                                       PRInt32*            aFontID);
-    virtual nsresult GetTextDimensions(const PRUnichar*    aString,
-                                       PRInt32             aLength,
-                                       PRInt32             aAvailWidth,
-                                       PRInt32*            aBreaks,
-                                       PRInt32             aNumBreaks,
-                                       nsTextDimensions&   aDimensions,
-                                       PRInt32&            aNumCharsFit,
-                                       nsTextDimensions&   aLastWordDimensions,
-                                       PRInt32*            aFontID);
-
-    // Draw a string using this font handle on the surface passed in.  
-    virtual nsresult DrawString(const char *aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                const nscoord* aSpacing,
-                                nsRenderingContext *aContext);
-    virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                PRInt32 aFontID,
-                                const nscoord* aSpacing,
-                                nsRenderingContext *aContext)
-    {
-      NS_ASSERTION(!aSpacing, "Spacing not supported here");
-      return DrawString(aString, aLength, aX, aY, aContext, aContext);
-    }
-    virtual nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                                nscoord aX, nscoord aY,
-                                nsRenderingContext *aContext,
-                                nsRenderingContext *aTextRunConstructionContext);
-
-#ifdef MOZ_MATHML
-    // These two functions get the bounding metrics for this handle,
-    // updating the aBoundingMetrics in app units.
-    virtual nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics);
-    virtual nsresult GetBoundingMetrics(const PRUnichar *aString,
-                                        PRUint32 aLength,
-                                        nsRenderingContext *aContext,
-                                        nsBoundingMetrics &aBoundingMetrics);
-#endif /* MOZ_MATHML */
-
-    // Set the direction of the text rendering
-    virtual nsresult SetRightToLeftText(PRBool aIsRTL);
-    virtual PRBool GetRightToLeftText();
-    virtual void SetTextRunRTL(PRBool aIsRTL) { mTextRunRTL = aIsRTL; }
-
-    virtual gfxFontGroup* GetThebesFontGroup() { return mFontGroup; }
-
-    virtual gfxUserFontSet* GetUserFontSet();
-    
-    PRBool GetRightToLeftTextRunMode() {
-        return mTextRunRTL;
-    }
-
-protected:
-
-    const gfxFont::Metrics& GetMetrics() const;
-
-    class AutoTextRun {
-    public:
-        AutoTextRun(nsThebesFontMetrics* aMetrics, nsRenderingContext* aRC,
-                    const char* aString, PRInt32 aLength) {
-            mTextRun = gfxTextRunCache::MakeTextRun(
-                reinterpret_cast<const PRUint8*>(aString), aLength,
-                aMetrics->mFontGroup, aRC->ThebesContext(),
-                aMetrics->mP2A,
-                ComputeFlags(aMetrics));
-        }
-        AutoTextRun(nsThebesFontMetrics* aMetrics, nsRenderingContext* aRC,
-                    const PRUnichar* aString, PRInt32 aLength) {
-            mTextRun = gfxTextRunCache::MakeTextRun(
-                aString, aLength, aMetrics->mFontGroup,
-                aRC->ThebesContext(),
-                aMetrics->mP2A,
-                ComputeFlags(aMetrics));
-        }
-        gfxTextRun* operator->() { return mTextRun.get(); }
-        gfxTextRun* get() { return mTextRun.get(); }
-
-    private:
-        gfxTextRunCache::AutoTextRun mTextRun;
-        
-        static PRUint32 ComputeFlags(nsThebesFontMetrics* aMetrics) {
-            PRUint32 flags = 0;
-            if (aMetrics->GetRightToLeftTextRunMode()) {
-                flags |= gfxTextRunFactory::TEXT_IS_RTL;
-            }
-            return flags;
-        }
-    };
-    friend class AutoTextRun;
-
-    nsRefPtr<gfxFontGroup> mFontGroup;
-    gfxFontStyle *mFontStyle;
-
-private:
-    nsThebesDeviceContext *mDeviceContext;
-    nsCOMPtr<nsIAtom> mLanguage;
-    PRInt32 mP2A;
-    PRPackedBool mIsRightToLeft;
-    PRPackedBool mTextRunRTL;
-};
-
-#endif /* NSTHEBESFONTMETRICS__H__ */
diff --git a/gfx/src/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
index 9ce25ee3ea80..0f514e6e8ac7 100644
--- a/gfx/src/nsThebesGfxFactory.cpp
+++ b/gfx/src/nsThebesGfxFactory.cpp
@@ -44,11 +44,9 @@
 
 #include "nsThebesDeviceContext.h"
 #include "nsThebesRegion.h"
-#include "nsThebesFontMetrics.h"
 #include "nsThebesFontEnumerator.h"
 #include "gfxPlatform.h"
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontMetrics)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesDeviceContext)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesRegion)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontEnumerator)
@@ -94,14 +92,12 @@ nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult
   return rv;
 }
 
-NS_DEFINE_NAMED_CID(NS_FONT_METRICS_CID);
 NS_DEFINE_NAMED_CID(NS_FONT_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_CID);
 NS_DEFINE_NAMED_CID(NS_REGION_CID);
 NS_DEFINE_NAMED_CID(NS_SCRIPTABLE_REGION_CID);
 
 static const mozilla::Module::CIDEntry kThebesCIDs[] = {
-    { &kNS_FONT_METRICS_CID, false, NULL, nsThebesFontMetricsConstructor },
     { &kNS_FONT_ENUMERATOR_CID, false, NULL, nsThebesFontEnumeratorConstructor },
     { &kNS_DEVICE_CONTEXT_CID, false, NULL, nsThebesDeviceContextConstructor },
     { &kNS_REGION_CID, false, NULL, nsThebesRegionConstructor },
@@ -110,7 +106,6 @@ static const mozilla::Module::CIDEntry kThebesCIDs[] = {
 };
 
 static const mozilla::Module::ContractIDEntry kThebesContracts[] = {
-    { "@mozilla.org/gfx/fontmetrics;1", &kNS_FONT_METRICS_CID },
     { "@mozilla.org/gfx/fontenumerator;1", &kNS_FONT_ENUMERATOR_CID },
     { "@mozilla.org/gfx/devicecontext;1", &kNS_DEVICE_CONTEXT_CID },
     { "@mozilla.org/gfx/region/nsThebes;1", &kNS_REGION_CID },

From b6b73ad75ace7accd45c035e300b40973fdacdef Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 18:05:49 -0700
Subject: [PATCH 151/509] Bug 174055, part 4: mechanical fixups outside gfx.

---
 accessible/src/base/nsTextAttrs.cpp           |  4 +--
 accessible/src/msaa/nsTextAccessibleWrap.cpp  |  4 +--
 content/events/src/nsEventStateManager.cpp    |  4 +--
 layout/base/nsCaret.cpp                       |  2 +-
 layout/base/nsLayoutUtils.cpp                 |  6 ++--
 layout/base/nsLayoutUtils.h                   |  8 ++---
 layout/base/nsPresContext.cpp                 |  4 +--
 layout/base/nsPresContext.h                   |  4 +--
 layout/base/nsPresShell.cpp                   |  4 +--
 layout/forms/nsListControlFrame.cpp           |  4 +--
 layout/forms/nsTextControlFrame.cpp           |  4 +--
 layout/generic/nsBRFrame.cpp                  |  4 +--
 layout/generic/nsBlockFrame.cpp               |  2 +-
 layout/generic/nsBulletFrame.cpp              |  6 ++--
 layout/generic/nsGfxScrollFrame.cpp           |  4 +--
 layout/generic/nsHTMLContainerFrame.cpp       |  6 ++--
 layout/generic/nsHTMLReflowState.cpp          |  6 ++--
 layout/generic/nsImageFrame.cpp               |  2 +-
 layout/generic/nsInlineFrame.cpp              |  4 +--
 layout/generic/nsLineLayout.cpp               |  2 +-
 layout/generic/nsPageFrame.cpp                |  2 +-
 layout/generic/nsTextFrameThebes.cpp          | 18 +++++------
 layout/mathml/nsMathMLContainerFrame.cpp      |  2 +-
 layout/mathml/nsMathMLFrame.cpp               |  6 ++--
 layout/mathml/nsMathMLFrame.h                 | 30 +++++++++----------
 layout/mathml/nsMathMLTokenFrame.cpp          |  2 +-
 layout/mathml/nsMathMLmencloseFrame.cpp       |  2 +-
 layout/mathml/nsMathMLmfencedFrame.cpp        |  4 +--
 layout/mathml/nsMathMLmfracFrame.cpp          |  2 +-
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp  |  2 +-
 layout/mathml/nsMathMLmoFrame.cpp             |  4 +--
 layout/mathml/nsMathMLmoverFrame.cpp          |  2 +-
 layout/mathml/nsMathMLmrootFrame.cpp          |  4 +--
 layout/mathml/nsMathMLmsubFrame.cpp           |  2 +-
 layout/mathml/nsMathMLmsubsupFrame.cpp        |  2 +-
 layout/mathml/nsMathMLmsupFrame.cpp           |  2 +-
 layout/mathml/nsMathMLmunderFrame.cpp         |  2 +-
 layout/mathml/nsMathMLmunderoverFrame.cpp     |  2 +-
 layout/style/nsRuleNode.cpp                   |  6 ++--
 layout/svg/base/src/nsSVGUtils.cpp            |  2 +-
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |  4 +--
 layout/xul/base/src/nsTextBoxFrame.cpp        |  6 ++--
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |  4 +--
 widget/public/nsIWidget.h                     |  2 +-
 widget/src/cocoa/nsChildView.mm               |  2 +-
 widget/src/windows/nsWindow.cpp               |  2 +-
 46 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/accessible/src/base/nsTextAttrs.cpp b/accessible/src/base/nsTextAttrs.cpp
index 90099a0bddd4..0225e137e6f3 100644
--- a/accessible/src/base/nsTextAttrs.cpp
+++ b/accessible/src/base/nsTextAttrs.cpp
@@ -44,7 +44,7 @@
 
 #include "gfxFont.h"
 #include "gfxUserFontSet.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Constants and structures
@@ -532,7 +532,7 @@ nsFontWeightTextAttr::GetFontWeight(nsIFrame *aFrame)
 
   gfxUserFontSet *fs = aFrame->PresContext()->GetUserFontSet();
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   aFrame->PresContext()->DeviceContext()->
     GetMetricsFor(styleFont->mFont, aFrame->GetStyleVisibility()->mLanguage,
                   fs, *getter_AddRefs(fm));
diff --git a/accessible/src/msaa/nsTextAccessibleWrap.cpp b/accessible/src/msaa/nsTextAccessibleWrap.cpp
index 92adecaf2493..e3619d58d096 100644
--- a/accessible/src/msaa/nsTextAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsTextAccessibleWrap.cpp
@@ -42,7 +42,7 @@
 #include "nsCoreUtils.h"
 #include "nsDocAccessible.h"
 #include "nsIFrame.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsPresContext.h"
 
 #include "gfxFont.h"
@@ -255,7 +255,7 @@ __try {
     return E_FAIL;
   }
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   frame->PresContext()->DeviceContext()->
     GetMetricsFor(frame->GetStyleFont()->mFont,
                   frame->GetStyleVisibility()->mLanguage,
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 3744ea0465cf..90a47c5c4250 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -144,7 +144,7 @@
 
 #include "nsServiceManagerUtils.h"
 #include "nsITimer.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsIDOMXULDocument.h"
 #include "nsIDragService.h"
 #include "nsIDragSession.h"
@@ -2490,7 +2490,7 @@ GetScrollableLineHeight(nsIFrame* aTargetFrame)
   // Fall back to the font height of the target frame.
   const nsStyleFont* font = aTargetFrame->GetStyleFont();
   const nsFont& f = font->mFont;
-  nsCOMPtr<nsIFontMetrics> fm = aTargetFrame->PresContext()->GetMetricsFor(f);
+  nsRefPtr<nsFontMetrics> fm = aTargetFrame->PresContext()->GetMetricsFor(f);
   NS_ASSERTION(fm, "FontMetrics is null!");
   nscoord lineHeight = 0;
   if (fm)
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 189a9282a1c2..f3fe6a878f3d 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -356,7 +356,7 @@ nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
   NS_ASSERTION(frame, "We should not be in the middle of reflow");
   nscoord baseline = frame->GetCaretBaseline();
   nscoord ascent = 0, descent = 0;
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(aFrame, getter_AddRefs(fm));
   NS_ASSERTION(fm, "We should be able to get the font metrics");
   if (fm) {
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 98fc545abdfa..85d39b5f0670 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1867,7 +1867,7 @@ nsLayoutUtils::GetTextShadowRectsUnion(const nsRect& aTextAndDecorationsRect,
 
 nsresult
 nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame,
-                                      nsIFontMetrics** aFontMetrics)
+                                      nsFontMetrics** aFontMetrics)
 {
   return nsLayoutUtils::GetFontMetricsForStyleContext(aFrame->GetStyleContext(),
                                                       aFontMetrics);
@@ -1875,7 +1875,7 @@ nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame,
 
 nsresult
 nsLayoutUtils::GetFontMetricsForStyleContext(nsStyleContext* aStyleContext,
-                                             nsIFontMetrics** aFontMetrics)
+                                             nsFontMetrics** aFontMetrics)
 {
   // pass the user font set object into the device context to pass along to CreateFontGroup
   gfxUserFontSet* fs = aStyleContext->PresContext()->GetUserFontSet();
@@ -2842,7 +2842,7 @@ nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
 }
 
 /* static */ nscoord
-nsLayoutUtils::GetCenteredFontBaseline(nsIFontMetrics* aFontMetrics,
+nsLayoutUtils::GetCenteredFontBaseline(nsFontMetrics* aFontMetrics,
                                        nscoord         aLineHeight)
 {
   nscoord fontAscent, fontHeight;
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index efdc297f86c8..0a00149967e4 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -50,7 +50,7 @@ class nsIDOMEvent;
 class nsRegion;
 class nsDisplayListBuilder;
 class nsDisplayItem;
-class nsIFontMetrics;
+class nsFontMetrics;
 class nsClientRectList;
 
 #include "prtypes.h"
@@ -738,7 +738,7 @@ public:
    * @return success or failure code
    */
   static nsresult GetFontMetricsForFrame(const nsIFrame* aFrame,
-                                         nsIFontMetrics** aFontMetrics);
+                                         nsFontMetrics** aFontMetrics);
 
   /**
    * Get the font metrics corresponding to the given style data.
@@ -747,7 +747,7 @@ public:
    * @return success or failure code
    */
   static nsresult GetFontMetricsForStyleContext(nsStyleContext* aStyleContext,
-                                                nsIFontMetrics** aFontMetrics);
+                                                nsFontMetrics** aFontMetrics);
 
   /**
    * Find the immediate child of aParent whose frame subtree contains
@@ -935,7 +935,7 @@ public:
    *
    * Returns the baseline position relative to the top of the line.
    */
-  static nscoord GetCenteredFontBaseline(nsIFontMetrics* aFontMetrics,
+  static nscoord GetCenteredFontBaseline(nsFontMetrics* aFontMetrics,
                                          nscoord         aLineHeight);
 
   /**
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index c85dc91ec2d4..5b010d176c77 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1289,10 +1289,10 @@ nsPresContext::SetImageAnimationModeExternal(PRUint16 aMode)
   SetImageAnimationModeInternal(aMode);
 }
 
-already_AddRefed<nsIFontMetrics>
+already_AddRefed<nsFontMetrics>
 nsPresContext::GetMetricsFor(const nsFont& aFont, PRBool aUseUserFontSet)
 {
-  nsIFontMetrics* metrics = nsnull;
+  nsFontMetrics* metrics = nsnull;
   mDeviceContext->GetMetricsFor(aFont, mLanguage,
                                 aUseUserFontSet ? GetUserFontSet() : nsnull,
                                 metrics);
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index c1d348a5595e..a1a6e26b6ca9 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -83,7 +83,7 @@ struct nsRect;
 
 class imgIRequest;
 
-class nsIFontMetrics;
+class nsFontMetrics;
 class nsIFrame;
 class nsFrameManager;
 class nsILinkHandler;
@@ -328,7 +328,7 @@ public:
    * (which is used from media query matching, which is in turn called
    * when building the user font set).
    */
-  NS_HIDDEN_(already_AddRefed<nsIFontMetrics>)
+  NS_HIDDEN_(already_AddRefed<nsFontMetrics>)
   GetMetricsFor(const nsFont& aFont, PRBool aUseUserFontSet = PR_TRUE);
 
   /**
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 60e184577149..96a9f96aa5b3 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -142,7 +142,7 @@
 #include "nsRenderingContext.h"
 
 #ifdef MOZ_REFLOW_PERF
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #endif
 
 #include "nsIReflowCallback.h"
@@ -8805,7 +8805,7 @@ void ReflowCountMgr::PaintCount(const char*     aName,
                   NS_FONT_WEIGHT_NORMAL, NS_FONT_STRETCH_NORMAL, 0,
                   nsPresContext::CSSPixelsToAppUnits(11));
 
-      nsCOMPtr<nsIFontMetrics> fm = aPresContext->GetMetricsFor(font);
+      nsRefPtr<nsFontMetrics> fm = aPresContext->GetMetricsFor(font);
       aRenderingContext->SetFont(fm);
       char buf[16];
       sprintf(buf, "%d", counter->mCount);
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index b4df0b206fa3..93b444182f43 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -69,7 +69,7 @@
 #include "nsISupportsPrimitives.h"
 #include "nsIComponentManager.h"
 #include "nsILookAndFeel.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsIScrollableFrame.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMNSEvent.h"
@@ -1879,7 +1879,7 @@ nsListControlFrame::CalcFallbackRowHeight()
 {
   nscoord rowHeight = 0;
   
-  nsCOMPtr<nsIFontMetrics> fontMet;
+  nsRefPtr<nsFontMetrics> fontMet;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
   if (fontMet) {
     fontMet->GetHeight(rowHeight);
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 50f4eb2e08ef..9a86d808a2c2 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -229,7 +229,7 @@ nsTextControlFrame::CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
   nscoord charWidth   = 0;
   nscoord charMaxAdvance  = 0;
 
-  nsCOMPtr<nsIFontMetrics> fontMet;
+  nsRefPtr<nsFontMetrics> fontMet;
   nsresult rv =
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -591,7 +591,7 @@ nsTextControlFrame::GetBoxAscent(nsBoxLayoutState& aState)
     IsSingleLineTextControl() ? clientRect.height :
     nsHTMLReflowState::CalcLineHeight(GetStyleContext(), NS_AUTOHEIGHT);
 
-  nsCOMPtr<nsIFontMetrics> fontMet;
+  nsRefPtr<nsFontMetrics> fontMet;
   nsresult rv =
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
   NS_ENSURE_SUCCESS(rv, 0);
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index be0465b67745..f22d3d4923c8 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -151,7 +151,7 @@ BRFrame::Reflow(nsPresContext* aPresContext,
       // normal inline frame.  That line-height is used is important
       // here for cases where the line-height is less than 1.
       nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-      nsIFontMetrics *fm = aReflowState.rendContext->FontMetrics();
+      nsFontMetrics *fm = aReflowState.rendContext->FontMetrics();
       if (fm) {
         nscoord logicalHeight = aReflowState.CalcLineHeight();
         aMetrics.height = logicalHeight;
@@ -232,7 +232,7 @@ nscoord
 BRFrame::GetBaseline() const
 {
   nscoord ascent = 0;
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   if (fm) {
     nscoord logicalHeight = GetRect().height;
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 48f6df0be056..60b85e2e76ac 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -569,7 +569,7 @@ nsBlockFrame::GetCaretBaseline() const
       return bp.top + firstLine->mFirstChild->GetCaretBaseline();
     }
   }
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   return nsLayoutUtils::GetCenteredFontBaseline(fm, nsHTMLReflowState::
       CalcLineHeight(GetStyleContext(), contentRect.height)) +
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 35e700401788..10e78b094808 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -289,7 +289,7 @@ nsBulletFrame::PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
     }
   }
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   aRenderingContext.SetColor(GetVisitedDependentColor(eCSSProperty_color));
 
   mTextIsRTL = PR_FALSE;
@@ -1347,7 +1347,7 @@ nsBulletFrame::GetDesiredSize(nsPresContext*  aCX,
   // match the image size).
   mIntrinsicSize.SizeTo(0, 0);
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   nscoord bulletSize;
 
@@ -1591,7 +1591,7 @@ nsBulletFrame::GetBaseline() const
   if (GetStateBits() & BULLET_FRAME_IMAGE_LOADING) {
     ascent = GetRect().height;
   } else {
-    nsCOMPtr<nsIFontMetrics> fm;
+    nsRefPtr<nsFontMetrics> fm;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
     const nsStyleList* myList = GetStyleList();
     switch (myList->mListStyleType) {
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index cc03532820e5..20db17d62e55 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -51,7 +51,7 @@
 #include "nsGkAtoms.h"
 #include "nsINameSpaceManager.h"
 #include "nsIDocument.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsIDocumentObserver.h"
 #include "nsIDocument.h"
 #include "nsBoxLayoutState.h"
@@ -2202,7 +2202,7 @@ nsGfxScrollFrameInner::GetLineScrollAmount() const
 {
   const nsStyleFont* font = mOuter->GetStyleFont();
   const nsFont& f = font->mFont;
-  nsCOMPtr<nsIFontMetrics> fm = mOuter->PresContext()->GetMetricsFor(f);
+  nsRefPtr<nsFontMetrics> fm = mOuter->PresContext()->GetMetricsFor(f);
   NS_ASSERTION(fm, "FontMetrics is null, assuming fontHeight == 1 appunit");
   nscoord fontHeight = 1;
   if (fm) {
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index 887c48e2cf38..cc7a6e111d56 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -105,7 +105,7 @@ void
 nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
                                nsRenderingContext* aCtx)
 {
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
   gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
@@ -185,7 +185,7 @@ void
 nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
                            nsRenderingContext* aCtx)
 {
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(mFrame, getter_AddRefs(fm));
   gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
@@ -340,7 +340,7 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
     return NS_OK;
 
   // Hide text decorations if we're currently hiding @font-face fallback text
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsresult rv = nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   NS_ENSURE_SUCCESS(rv, rv);
   if (fm->GetThebesFontGroup()->ShouldSkipDrawing())
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index dbb93b0a4e73..12941b315c13 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -47,7 +47,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsBlockFrame.h"
 #include "nsLineBox.h"
 #include "nsImageFrame.h"
@@ -2106,7 +2106,7 @@ nsHTMLReflowState::CalculateBlockSideMargins(nscoord aAvailWidth,
 // For risk management, we use preference to control the behavior, and 
 // eNoExternalLeading is the old behavior.
 static nscoord
-GetNormalLineHeight(nsIFontMetrics* aFontMetrics)
+GetNormalLineHeight(nsFontMetrics* aFontMetrics)
 {
   NS_PRECONDITION(nsnull != aFontMetrics, "no font metrics");
 
@@ -2160,7 +2160,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext,
       return aBlockHeight;
   }
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForStyleContext(aStyleContext,
                                                getter_AddRefs(fm));
   return GetNormalLineHeight(fm);
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index acd2c4c7ca16..6fe8831c01db 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -974,7 +974,7 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
   nsLayoutUtils::SetFontFromStyle(&aRenderingContext, mStyleContext);
 
   // Format the text to display within the formatting rect
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord maxAscent, maxDescent, height;
   fm->GetMaxAscent(maxAscent);
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 9702107af234..9d6788549a48 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -643,7 +643,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
   }
 
   nsLayoutUtils::SetFontFromStyle(aReflowState.rendContext, mStyleContext);
-  nsIFontMetrics* fm = aReflowState.rendContext->FontMetrics();
+  nsFontMetrics* fm = aReflowState.rendContext->FontMetrics();
 
   if (fm) {
     // Compute final height of the frame.
@@ -913,7 +913,7 @@ nscoord
 nsInlineFrame::GetBaseline() const
 {
   nscoord ascent = 0;
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   if (NS_SUCCEEDED(nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm)))) {
     fm->GetMaxAscent(ascent);
   }
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index dd8623e46573..23f359a52a31 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1561,7 +1561,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
   nsStyleContext* styleContext = spanFrame->GetStyleContext();
   nsRenderingContext* rc = mBlockReflowState->rendContext;
   nsLayoutUtils::SetFontFromStyle(mBlockReflowState->rendContext, styleContext);
-  nsIFontMetrics* fm = rc->FontMetrics();
+  nsFontMetrics* fm = rc->FontMetrics();
 
   PRBool preMode = mStyleText->WhiteSpaceIsSignificant();
 
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index a21ca579d72f..35dc81b7832f 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -510,7 +510,7 @@ nsPageFrame::PaintHeaderFooter(nsRenderingContext& aRenderingContext,
   aRenderingContext.SetColor(NS_RGB(0,0,0));
 
   // Get the FontMetrics to determine width.height of strings
-  nsCOMPtr<nsIFontMetrics> fontMet;
+  nsRefPtr<nsFontMetrics> fontMet;
   pc->DeviceContext()->GetMetricsFor(*mPD->mHeadFootFont,
                                      pc->GetUserFontSet(),
                                      *getter_AddRefs(fontMet));
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 1e6529a10176..84d3685d3a97 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -1580,12 +1580,12 @@ GetSpacingFlags(nscoord spacing)
 
 static gfxFontGroup*
 GetFontGroupForFrame(nsIFrame* aFrame,
-                     nsIFontMetrics** aOutFontMetrics = nsnull)
+                     nsFontMetrics** aOutFontMetrics = nsnull)
 {
   if (aOutFontMetrics)
     *aOutFontMetrics = nsnull;
 
-  nsCOMPtr<nsIFontMetrics> metrics;
+  nsRefPtr<nsFontMetrics> metrics;
   nsLayoutUtils::GetFontMetricsForFrame(aFrame, getter_AddRefs(metrics));
 
   if (!metrics)
@@ -2489,7 +2489,7 @@ public:
     return mFontGroup;
   }
 
-  nsIFontMetrics* GetFontMetrics() {
+  nsFontMetrics* GetFontMetrics() {
     if (!mFontMetrics)
       InitFontGroupAndFontMetrics();
     return mFontMetrics;
@@ -2508,7 +2508,7 @@ protected:
 
   gfxTextRun*           mTextRun;
   gfxFontGroup*         mFontGroup;
-  nsCOMPtr<nsIFontMetrics> mFontMetrics;
+  nsRefPtr<nsFontMetrics> mFontMetrics;
   const nsStyleText*    mTextStyle;
   const nsTextFragment* mFrag;
   nsIFrame*             mLineContainer;
@@ -4339,7 +4339,7 @@ nsTextFrame::UnionTextDecorationOverflow(nsPresContext* aPresContext,
     // The underline/overline drawable area must be contained in the overflow
     // rect when this is in floating first letter frame at *both* modes.
     nscoord fontAscent, fontHeight;
-    nsIFontMetrics* fm = aProvider.GetFontMetrics();
+    nsFontMetrics* fm = aProvider.GetFontMetrics();
     fm->GetMaxAscent(fontAscent);
     fm->GetMaxHeight(fontHeight);
     nsRect fontRect(0, mAscent - fontAscent, GetSize().width, fontHeight);
@@ -5292,7 +5292,7 @@ nsTextFrame::CombineSelectionUnderlineRect(nsPresContext* aPresContext,
 
   nsRect givenRect = aRect;
 
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   gfxFontGroup* fontGroup = fm->GetThebesFontGroup();
   gfxFont* firstFont = fontGroup->GetFontAt(0);
@@ -6784,7 +6784,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
   if (!length && !textMetrics.mAscent && !textMetrics.mDescent) {
     // If we're measuring a zero-length piece of text, update
     // the height manually.
-    nsIFontMetrics* fm = provider.GetFontMetrics();
+    nsFontMetrics* fm = provider.GetFontMetrics();
     if (fm) {
       nscoord ascent, descent;
       fm->GetMaxAscent(ascent);
@@ -6894,9 +6894,9 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
   } else {
     // Otherwise, ascent should contain the overline drawable area.
     // And also descent should contain the underline drawable area.
-    // nsIFontMetrics::GetMaxAscent/GetMaxDescent contains them.
+    // nsFontMetrics::GetMaxAscent/GetMaxDescent contains them.
     nscoord fontAscent, fontDescent;
-    nsIFontMetrics* fm = provider.GetFontMetrics();
+    nsFontMetrics* fm = provider.GetFontMetrics();
     fm->GetMaxAscent(fontAscent);
     fm->GetMaxDescent(fontDescent);
     aMetrics.ascent = NS_MAX(NSToCoordCeil(textMetrics.mAscent), fontAscent);
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index aa0b707a020b..c3835cb49b50 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -101,7 +101,7 @@ nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
     aRenderingContext.GetBoundingMetrics(errorMsg.get(), errorMsg.Length());
 
   // reflow metrics
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
   fm->GetMaxAscent(aDesiredSize.ascent);
   nscoord descent;
   fm->GetMaxDescent(descent);
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index fb705cbb1187..4ef1dfd6ec95 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -277,7 +277,7 @@ nsMathMLFrame::GetAttribute(nsIContent* aContent,
 
 /* static */ void
 nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
-                                nsIFontMetrics*      aFontMetrics,
+                                nsFontMetrics*      aFontMetrics,
                                 nscoord&             aRuleThickness)
 {
   // get the bounding metrics of the overbar char, the rendering context
@@ -299,7 +299,7 @@ nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
 
 /* static */ void
 nsMathMLFrame::GetAxisHeight(nsRenderingContext& aRenderingContext,
-                             nsIFontMetrics*      aFontMetrics,
+                             nsFontMetrics*      aFontMetrics,
                              nscoord&             aAxisHeight)
 {
   // get the bounding metrics of the minus sign, the rendering context
@@ -342,7 +342,7 @@ nsMathMLFrame::CalcLength(nsPresContext*   aPresContext,
   else if (eCSSUnit_XHeight == unit) {
     nscoord xHeight;
     const nsStyleFont* font = aStyleContext->GetStyleFont();
-    nsCOMPtr<nsIFontMetrics> fm = aPresContext->GetMetricsFor(font->mFont);
+    nsRefPtr<nsFontMetrics> fm = aPresContext->GetMetricsFor(font->mFont);
     fm->GetXHeight(xHeight);
     return NSToCoordRound(aCSSValue.GetFloatValue() * (float)xHeight);
   }
diff --git a/layout/mathml/nsMathMLFrame.h b/layout/mathml/nsMathMLFrame.h
index 00a2b106aaef..b1bb73d44372 100644
--- a/layout/mathml/nsMathMLFrame.h
+++ b/layout/mathml/nsMathMLFrame.h
@@ -41,7 +41,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsStyleContext.h"
 #include "nsMathMLAtoms.h"
 #include "nsMathMLOperators.h"
@@ -240,7 +240,7 @@ public:
                       nscoord&        aSubDrop) 
   {
     const nsStyleFont* font = aChild->GetStyleFont();
-    nsCOMPtr<nsIFontMetrics> fm = aChild->PresContext()->GetMetricsFor(
+    nsRefPtr<nsFontMetrics> fm = aChild->PresContext()->GetMetricsFor(
                                                               font->mFont);
     GetSubDrop(fm, aSubDrop);
   }
@@ -250,7 +250,7 @@ public:
                       nscoord&        aSupDrop) 
   {
     const nsStyleFont* font = aChild->GetStyleFont();
-    nsCOMPtr<nsIFontMetrics> fm = aChild->PresContext()->GetMetricsFor(
+    nsRefPtr<nsFontMetrics> fm = aChild->PresContext()->GetMetricsFor(
                                                               font->mFont);
     GetSupDrop(fm, aSupDrop);
   }
@@ -266,7 +266,7 @@ public:
 
   // 2 levels of subscript shifts
   static void
-  GetSubScriptShifts(nsIFontMetrics* fm, 
+  GetSubScriptShifts(nsFontMetrics* fm, 
                      nscoord&        aSubScriptShift1, 
                      nscoord&        aSubScriptShift2)
   {
@@ -278,7 +278,7 @@ public:
 
   // 3 levels of superscript shifts
   static void
-  GetSupScriptShifts(nsIFontMetrics* fm, 
+  GetSupScriptShifts(nsFontMetrics* fm, 
                      nscoord&        aSupScriptShift1, 
                      nscoord&        aSupScriptShift2, 
                      nscoord&        aSupScriptShift3)
@@ -293,7 +293,7 @@ public:
   // these are TeX specific params not found in ordinary fonts
 
   static void
-  GetSubDrop(nsIFontMetrics* fm,
+  GetSubDrop(nsFontMetrics* fm,
              nscoord&        aSubDrop)
   {
     nscoord xHeight;
@@ -302,7 +302,7 @@ public:
   }
 
   static void
-  GetSupDrop(nsIFontMetrics* fm,
+  GetSupDrop(nsFontMetrics* fm,
              nscoord&        aSupDrop)
   {
     nscoord xHeight;
@@ -311,7 +311,7 @@ public:
   }
 
   static void
-  GetNumeratorShifts(nsIFontMetrics* fm, 
+  GetNumeratorShifts(nsFontMetrics* fm, 
                      nscoord&        numShift1, 
                      nscoord&        numShift2, 
                      nscoord&        numShift3)
@@ -324,7 +324,7 @@ public:
   }
 
   static void
-  GetDenominatorShifts(nsIFontMetrics* fm, 
+  GetDenominatorShifts(nsFontMetrics* fm, 
                        nscoord&        denShift1, 
                        nscoord&        denShift2)
   {
@@ -335,7 +335,7 @@ public:
   }
 
   static void
-  GetEmHeight(nsIFontMetrics* fm,
+  GetEmHeight(nsFontMetrics* fm,
               nscoord&        emHeight)
   {
 #if 0 
@@ -347,7 +347,7 @@ public:
   }
 
   static void
-  GetAxisHeight (nsIFontMetrics* fm,
+  GetAxisHeight (nsFontMetrics* fm,
                  nscoord&        axisHeight)
   {
     fm->GetXHeight (axisHeight);
@@ -355,7 +355,7 @@ public:
   }
 
   static void
-  GetBigOpSpacings(nsIFontMetrics* fm, 
+  GetBigOpSpacings(nsFontMetrics* fm, 
                    nscoord&        bigOpSpacing1,
                    nscoord&        bigOpSpacing2,
                    nscoord&        bigOpSpacing3,
@@ -372,7 +372,7 @@ public:
   }
 
   static void
-  GetRuleThickness(nsIFontMetrics* fm,
+  GetRuleThickness(nsFontMetrics* fm,
                    nscoord&        ruleThickness)
   {
     nscoord xHeight;
@@ -385,12 +385,12 @@ public:
   // by actually measuring some characters
   static void
   GetRuleThickness(nsRenderingContext& aRenderingContext, 
-                   nsIFontMetrics*      aFontMetrics,
+                   nsFontMetrics*      aFontMetrics,
                    nscoord&             aRuleThickness);
 
   static void
   GetAxisHeight(nsRenderingContext& aRenderingContext, 
-                nsIFontMetrics*      aFontMetrics,
+                nsFontMetrics*      aFontMetrics,
                 nscoord&             aAxisHeight);
 
 protected:
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index e9718beae319..02385e8e0c66 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -209,7 +209,7 @@ nsMathMLTokenFrame::Place(nsRenderingContext& aRenderingContext,
     mBoundingMetrics += childSize.mBoundingMetrics;
   }
 
-  nsCOMPtr<nsIFontMetrics> fm =
+  nsRefPtr<nsFontMetrics> fm =
     PresContext()->GetMetricsFor(GetStyleFont()->mFont);
   nscoord ascent, descent;
   fm->GetMaxAscent(ascent);
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index b3f7f68130dc..33945df789d2 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -377,7 +377,7 @@ nsMathMLmencloseFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
   nscoord mEmHeight;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
   GetRuleThickness(aRenderingContext, fm, mRuleThickness);
   GetEmHeight(fm, mEmHeight);
 
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 73ddb52782ef..325725a01d81 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -244,7 +244,7 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
   const nsStyleFont* font = GetStyleFont();
   aReflowState.rendContext->SetFont(font->mFont,
                                     aPresContext->GetUserFontSet());
-  nsIFontMetrics* fm = aReflowState.rendContext->FontMetrics();
+  nsFontMetrics* fm = aReflowState.rendContext->FontMetrics();
   nscoord axisHeight, em;
   GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);
   GetEmHeight(fm, em);
@@ -589,7 +589,7 @@ nsMathMLmfencedFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext)
 
   nsPresContext* presContext = PresContext();
   const nsStyleFont* font = GetStyleFont();
-  nsCOMPtr<nsIFontMetrics> fm = presContext->GetMetricsFor(font->mFont);
+  nsRefPtr<nsFontMetrics> fm = presContext->GetMetricsFor(font->mFont);
   nscoord em;
   GetEmHeight(fm, em);
 
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 023ec02e7400..52aebd547edc 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -269,7 +269,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             presContext->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord defaultRuleThickness, axisHeight;
   GetRuleThickness(aRenderingContext, fm, defaultRuleThickness);
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index f2a13afff544..f01084f136e6 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -162,7 +162,7 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
   const nsStyleFont* font = GetStyleFont();
   aRenderingContext.SetFont(font->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index f0862faf41e0..2c8b25c9aa10 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -393,7 +393,7 @@ nsMathMLmoFrame::ProcessOperatorData()
       // cache the default values of lspace & rspace that we get from the dictionary.
       // since these values are relative to the 'em' unit, convert to twips now
       nscoord em;
-      nsCOMPtr<nsIFontMetrics> fm =
+      nsRefPtr<nsFontMetrics> fm =
 	presContext->GetMetricsFor(GetStyleFont()->mFont);
       GetEmHeight(fm, em);
 
@@ -639,7 +639,7 @@ nsMathMLmoFrame::Stretch(nsRenderingContext& aRenderingContext,
   // get the axis height;
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
   nscoord axisHeight, height;
   GetAxisHeight(aRenderingContext, fm, axisHeight);
 
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index a814a7feb2c6..c7440eedf8b8 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -283,7 +283,7 @@ nsMathMLmoverFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index c654d27a4952..2851f98cf385 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -155,7 +155,7 @@ nsMathMLmrootFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
 static void
 GetRadicalXOffsets(nscoord aIndexWidth, nscoord aSqrWidth,
-                   nsIFontMetrics* aFontMetrics,
+                   nsFontMetrics* aFontMetrics,
                    nscoord* aIndexOffset, nscoord* aSqrOffset)
 {
   // The index is tucked in closer to the radical while making sure
@@ -260,7 +260,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
 
   renderingContext.SetFont(GetStyleFont()->mFont,
                            aPresContext->GetUserFontSet());
-  nsIFontMetrics* fm = renderingContext.FontMetrics();
+  nsFontMetrics* fm = renderingContext.FontMetrics();
 
   // For radical glyphs from TeX fonts and some of the radical glyphs from
   // Mathematica fonts, the thickness of the overline can be obtained from the
diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp
index bd0ceb097c54..6a6e4e42c00b 100644
--- a/layout/mathml/nsMathMLmsubFrame.cpp
+++ b/layout/mathml/nsMathMLmsubFrame.cpp
@@ -153,7 +153,7 @@ nsMathMLmsubFrame::PlaceSubScript (nsPresContext*      aPresContext,
   // get min subscript shift limit from x-height
   // = h(x) - 4/5 * sigma_5, Rule 18b, App. G, TeXbook
   nscoord xHeight = 0;
-  nsCOMPtr<nsIFontMetrics> fm =
+  nsRefPtr<nsFontMetrics> fm =
     aPresContext->GetMetricsFor(baseFrame->GetStyleFont()->mFont);
 
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index c6b72d935244..834b8beb1eb3 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -195,7 +195,7 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
 
   aRenderingContext.SetFont(baseFrame->GetStyleFont()->mFont,
                             aPresContext->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   // get x-height (an ex)
   nscoord xHeight;
diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp
index 89f3c168e648..a0c10353b393 100644
--- a/layout/mathml/nsMathMLmsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsupFrame.cpp
@@ -154,7 +154,7 @@ nsMathMLmsupFrame::PlaceSuperScript(nsPresContext*      aPresContext,
   // get min supscript shift limit from x-height
   // = d(x) + 1/4 * sigma_5, Rule 18c, App. G, TeXbook
   nscoord xHeight = 0;
-  nsCOMPtr<nsIFontMetrics> fm =
+  nsRefPtr<nsFontMetrics> fm =
     aPresContext->GetMetricsFor(baseFrame->GetStyleFont()->mFont);
 
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index 14fb656a72ba..d629fa4591dc 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -280,7 +280,7 @@ nsMathMLmunderFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index 4f1c0489dbcb..6e377b0481dc 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -322,7 +322,7 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
 
   aRenderingContext.SetFont(GetStyleFont()->mFont,
                             PresContext()->GetUserFontSet());
-  nsIFontMetrics* fm = aRenderingContext.FontMetrics();
+  nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   nscoord xHeight = 0;
   fm->GetXHeight (xHeight);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 82b76de90df2..2a973d833b58 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -56,7 +56,7 @@
 #include "nsIWidget.h"
 #include "nsILookAndFeel.h"
 #include "nsIPresShell.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "gfxFont.h"
 #include "nsStyleUtil.h"
 #include "nsCSSPseudoElements.h"
@@ -308,7 +308,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
     case eCSSUnit_XHeight: {
       nsFont font = styleFont->mFont;
       font.size = aFontSize;
-      nsCOMPtr<nsIFontMetrics> fm =
+      nsRefPtr<nsFontMetrics> fm =
         aPresContext->GetMetricsFor(font, aUseUserFontSet);
       nscoord xHeight;
       fm->GetXHeight(xHeight);
@@ -317,7 +317,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
     case eCSSUnit_Char: {
       nsFont font = styleFont->mFont;
       font.size = aFontSize;
-      nsCOMPtr<nsIFontMetrics> fm =
+      nsRefPtr<nsFontMetrics> fm =
         aPresContext->GetMetricsFor(font, aUseUserFontSet);
       gfxFloat zeroWidth = (fm->GetThebesFontGroup()->GetFontAt(0)
                             ->GetMetrics().zeroOrAveCharWidth);
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index c57692c6d362..fd1d95e0b6eb 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -287,7 +287,7 @@ nsSVGUtils::GetFontXHeight(nsStyleContext *aStyleContext)
   nsPresContext *presContext = aStyleContext->PresContext();
   NS_ABORT_IF_FALSE(presContext, "NULL pres context in GetFontXHeight");
 
-  nsCOMPtr<nsIFontMetrics> fontMetrics;
+  nsRefPtr<nsFontMetrics> fontMetrics;
   nsLayoutUtils::GetFontMetricsForStyleContext(aStyleContext,
                                                getter_AddRefs(fontMetrics));
 
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index aebec40297ed..9d0be159bb47 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsIViewManager.h"
 #include "nsStyleContext.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsITimer.h"
 #include "nsAutoPtr.h"
 #include "nsStyleSet.h"
@@ -225,7 +225,7 @@ nsListBoxBodyFrame::Init(nsIContent*     aContent,
       scrollbarFrame->SetScrollbarMediatorContent(GetContent());
     }
   }
-  nsCOMPtr<nsIFontMetrics> fm;
+  nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
   fm->GetHeight(mRowHeight);
 
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 931bad4848c9..b8d1714865d3 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -476,7 +476,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       }
     } while (context && hasDecorations && (0 != decorMask));
 
-    nsCOMPtr<nsIFontMetrics> fontMet;
+    nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
 
     nscoord offset;
@@ -655,7 +655,7 @@ nsTextBoxFrame::CalculateUnderline(nsRenderingContext& aRenderingContext)
                                                     mAccesskeyIndex]);
 
          nscoord offset, baseline;
-         nsIFontMetrics* metrics = aRenderingContext.FontMetrics();
+         nsFontMetrics* metrics = aRenderingContext.FontMetrics();
          metrics->GetUnderline(offset, mAccessKeyInfo->mAccessUnderlineSize);
          metrics->GetMaxAscent(baseline);
          mAccessKeyInfo->mAccessOffset = baseline - offset;
@@ -999,7 +999,7 @@ void
 nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext, nsRenderingContext& aRenderingContext,
                                 const nsString& aString, nsSize& aSize, nscoord& aAscent)
 {
-    nsCOMPtr<nsIFontMetrics> fontMet;
+    nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
     fontMet->GetHeight(aSize.height);
     aRenderingContext.SetFont(fontMet);
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 6c75326d3966..d1af6caf0540 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1261,7 +1261,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, nsITreeColumn* aCol, const n
     // we add in borders and padding to the text dimension and give that back. 
     nsStyleContext* textContext = GetPseudoStyleContext(nsCSSAnonBoxes::moztreecelltext);
 
-    nsCOMPtr<nsIFontMetrics> fm;
+    nsRefPtr<nsFontMetrics> fm;
     nsLayoutUtils::GetFontMetricsForStyleContext(textContext,
                                                  getter_AddRefs(fm));
     nscoord height;
@@ -3568,7 +3568,7 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
   textRect.Deflate(bp);
 
   // Compute our text size.
-  nsCOMPtr<nsIFontMetrics> fontMet;
+  nsRefPtr<nsFontMetrics> fontMet;
   nsLayoutUtils::GetFontMetricsForStyleContext(textContext,
                                                getter_AddRefs(fontMet));
 
diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h
index 7dbc66b1d519..d1ba2af10974 100644
--- a/widget/public/nsIWidget.h
+++ b/widget/public/nsIWidget.h
@@ -58,7 +58,7 @@
 // forward declarations
 class   nsIAppShell;
 class   nsIToolkit;
-class   nsIFontMetrics;
+class   nsFontMetrics;
 class   nsRenderingContext;
 class   nsIDeviceContext;
 struct  nsFont;
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 0ac4b20a3848..b895587dfc1d 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -58,7 +58,7 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsIDeviceContext.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index c175e4074b34..6f7a8f36b531 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -136,7 +136,7 @@
 #include "nsIClipboard.h"
 #include "nsIMM32Handler.h"
 #include "nsILocalFile.h"
-#include "nsIFontMetrics.h"
+#include "nsFontMetrics.h"
 #include "nsIFontEnumerator.h"
 #include "nsIDeviceContext.h"
 #include "nsILookAndFeel.h"

From 5731d401c8da46c7060ce4bab9b9c9d2cdf8a58d Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 20:07:27 -0700
Subject: [PATCH 152/509] Bug 174055, part 5: prune unused and unimplemented
 methods.

---
 content/events/src/nsEventStateManager.cpp    |   2 +-
 gfx/src/nsFontMetrics.cpp                     | 134 +++---------------
 gfx/src/nsFontMetrics.h                       | 121 ++++++----------
 layout/base/nsLayoutUtils.cpp                 |   2 +-
 layout/base/nsPresShell.cpp                   |   2 +-
 layout/forms/nsListControlFrame.cpp           |   2 +-
 layout/generic/nsBulletFrame.cpp              |   2 +-
 layout/generic/nsGfxScrollFrame.cpp           |   2 +-
 layout/generic/nsImageFrame.cpp               |   3 +-
 layout/generic/nsInlineFrame.cpp              |   2 +-
 layout/generic/nsPageFrame.cpp                |   2 +-
 layout/mathml/nsMathMLChar.cpp                |   2 -
 layout/mathml/nsMathMLContainerFrame.cpp      |   2 -
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |   2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |   2 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   4 +-
 16 files changed, 70 insertions(+), 216 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 90a47c5c4250..d695afe6ce05 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2494,7 +2494,7 @@ GetScrollableLineHeight(nsIFrame* aTargetFrame)
   NS_ASSERTION(fm, "FontMetrics is null!");
   nscoord lineHeight = 0;
   if (fm)
-    fm->GetHeight(lineHeight);
+    fm->GetMaxHeight(lineHeight);
   return lineHeight;
 }
 
diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index a8939196b901..155a6c971609 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -85,7 +85,6 @@ nsFontMetrics::~nsFontMetrics()
     if (mDeviceContext)
         mDeviceContext->FontMetricsDeleted(this);
     delete mFontStyle;
-    //delete mFontGroup;
 }
 
 nsresult
@@ -173,7 +172,7 @@ nsFontMetrics::GetUnderline(nscoord& aOffset, nscoord& aSize)
     return NS_OK;
 }
 
-// GetHeight/GetMaxAscent/GetMaxDescent/GetMaxHeight must contain the
+// GetMaxAscent/GetMaxDescent/GetMaxHeight must contain the
 // text-decoration lines drawable area. See bug 421353.
 // BE CAREFUL for rounding each values. The logic MUST be same as
 // nsCSSRendering::GetTextDecorationRectInternal's.
@@ -192,14 +191,6 @@ static gfxFloat ComputeMaxAscent(const gfxFont::Metrics& aMetrics)
     return NS_floor(aMetrics.maxAscent + 0.5);
 }
 
-nsresult
-nsFontMetrics::GetHeight(nscoord &aHeight)
-{
-    aHeight = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics())) +
-        CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
-    return NS_OK;
-}
-
 nsresult
 nsFontMetrics::GetInternalLeading(nscoord &aLeading)
 {
@@ -272,12 +263,6 @@ nsFontMetrics::GetLanguage(nsIAtom** aLanguage)
     return NS_OK;
 }
 
-nsresult
-nsFontMetrics::GetFontHandle(nsFontHandle &aHandle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 nsresult
 nsFontMetrics::GetAveCharWidth(nscoord& aAveCharWidth)
 {
@@ -365,43 +350,6 @@ nsFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
     return NS_OK;
 }
 
-// Get the text dimensions for this string
-nsresult
-nsFontMetrics::GetTextDimensions(const PRUnichar* aString,
-                                 PRUint32 aLength,
-                                 nsTextDimensions& aDimensions,
-                                 PRInt32* aFontID)
-{
-    return NS_OK;
-}
-
-nsresult
-nsFontMetrics::GetTextDimensions(const char*         aString,
-                                 PRInt32             aLength,
-                                 PRInt32             aAvailWidth,
-                                 PRInt32*            aBreaks,
-                                 PRInt32             aNumBreaks,
-                                 nsTextDimensions&   aDimensions,
-                                 PRInt32&            aNumCharsFit,
-                                 nsTextDimensions&   aLastWordDimensions,
-                                 PRInt32*            aFontID)
-{
-    return NS_OK;
-}
-nsresult
-nsFontMetrics::GetTextDimensions(const PRUnichar*    aString,
-                                 PRInt32             aLength,
-                                 PRInt32             aAvailWidth,
-                                 PRInt32*            aBreaks,
-                                 PRInt32             aNumBreaks,
-                                 nsTextDimensions&   aDimensions,
-                                 PRInt32&            aNumCharsFit,
-                                 nsTextDimensions&   aLastWordDimensions,
-                                 PRInt32*            aFontID)
-{
-    return NS_OK;
-}
-
 // Draw a string using this font handle on the surface passed in.
 nsresult
 nsFontMetrics::DrawString(const char *aString, PRUint32 aLength,
@@ -449,47 +397,6 @@ nsFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
 }
 
 #ifdef MOZ_MATHML
-
-static void
-GetTextRunBoundingMetrics(gfxTextRun *aTextRun,
-                          PRUint32 aStart, PRUint32 aLength,
-                          nsRenderingContext *aContext,
-                          nsBoundingMetrics &aBoundingMetrics)
-{
-    StubPropertyProvider provider;
-    gfxTextRun::Metrics theMetrics =
-        aTextRun->MeasureText(aStart, aLength,
-                              gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
-                              aContext->ThebesContext(), &provider);
-    // note that TIGHT_HINTED_OUTLINE_EXTENTS can be expensive (on Windows)
-    // but this is only used for MathML positioning so it's not critical
-
-    aBoundingMetrics.leftBearing = NSToCoordFloor(theMetrics.mBoundingBox.X());
-    aBoundingMetrics.rightBearing = NSToCoordCeil(theMetrics.mBoundingBox.XMost());
-    aBoundingMetrics.width = NSToCoordRound(theMetrics.mAdvanceWidth);
-    aBoundingMetrics.ascent = NSToCoordCeil(- theMetrics.mBoundingBox.Y());
-    aBoundingMetrics.descent = NSToCoordCeil(theMetrics.mBoundingBox.YMost());
-}
-
-nsresult
-nsFontMetrics::GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                  nsRenderingContext *aContext,
-                                  nsBoundingMetrics &aBoundingMetrics)
-{
-    if (aLength == 0) {
-        aBoundingMetrics = nsBoundingMetrics();
-        return NS_OK;
-    }
-
-    AutoTextRun textRun(this, aContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
-
-    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext,
-                              aBoundingMetrics);
-    return NS_OK;
-}
-
 nsresult
 nsFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
                                   nsRenderingContext *aContext,
@@ -504,30 +411,21 @@ nsFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
     if (!textRun.get())
         return NS_ERROR_FAILURE;
 
-    GetTextRunBoundingMetrics(textRun.get(), 0, aLength, aContext,
-                              aBoundingMetrics);
+    // note that TIGHT_HINTED_OUTLINE_EXTENTS can be expensive (on Windows)
+    // but this is only used for MathML positioning so it's not critical
+    StubPropertyProvider provider;
+    gfxTextRun::Metrics theMetrics =
+        textRun->MeasureText(0, aLength,
+                             gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
+                             aContext->ThebesContext(), &provider);
+
+    aBoundingMetrics.leftBearing = NSToCoordFloor(theMetrics.mBoundingBox.X());
+    aBoundingMetrics.rightBearing
+        = NSToCoordCeil(theMetrics.mBoundingBox.XMost());
+    aBoundingMetrics.width = NSToCoordRound(theMetrics.mAdvanceWidth);
+    aBoundingMetrics.ascent = NSToCoordCeil(- theMetrics.mBoundingBox.Y());
+    aBoundingMetrics.descent = NSToCoordCeil(theMetrics.mBoundingBox.YMost());
+
     return NS_OK;
 }
-
 #endif /* MOZ_MATHML */
-
-// Set the direction of the text rendering
-nsresult
-nsFontMetrics::SetRightToLeftText(PRBool aIsRTL)
-{
-    mIsRightToLeft = aIsRTL;
-    return NS_OK;
-}
-
-// Set the direction of the text rendering
-PRBool
-nsFontMetrics::GetRightToLeftText()
-{
-    return mIsRightToLeft;
-}
-
-gfxUserFontSet*
-nsFontMetrics::GetUserFontSet()
-{
-    return mFontGroup->GetUserFontSet();
-}
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
index 317101785456..8cd1ccc0ac17 100644
--- a/gfx/src/nsFontMetrics.h
+++ b/gfx/src/nsFontMetrics.h
@@ -53,12 +53,6 @@ class nsRenderingContext;
 class nsString;
 class nsThebesDeviceContext;
 struct nsBoundingMetrics;
-struct nsTextDimensions;
-
-/**
- * A native font handle
- */
-typedef void* nsFontHandle;
 
 /**
  * Font metrics
@@ -95,107 +89,115 @@ public:
     nsresult Init(const nsFont& aFont, nsIAtom* aLanguage,
                   nsIDeviceContext *aContext,
                   gfxUserFontSet *aUserFontSet = nsnull);
+
     /**
      * Destroy this font metrics. This breaks the association between
      * the font metrics and the device context.
      */
     nsresult Destroy();
+
     /**
-     * Return the font's xheight property, scaled into app-units.
+     * Return the font's x-height.
      */
     nsresult GetXHeight(nscoord& aResult);
+
     /**
      * Return the font's superscript offset (the distance from the
      * baseline to where a superscript's baseline should be placed).
      * The value returned will be positive.
      */
     nsresult GetSuperscriptOffset(nscoord& aResult);
+
     /**
      * Return the font's subscript offset (the distance from the
-     * baseline to where a subscript's baseline should be placed). The
-     * value returned will be a positive value.
+     * baseline to where a subscript's baseline should be placed).
+     * The value returned will be positive.
      */
     nsresult GetSubscriptOffset(nscoord& aResult);
+
     /**
      * Return the font's strikeout offset (the distance from the
      * baseline to where a strikeout should be placed) and size.
      * Positive values are above the baseline, negative below.
      */
     nsresult GetStrikeout(nscoord& aOffset, nscoord& aSize);
+
     /**
      * Return the font's underline offset (the distance from the
      * baseline to where a underline should be placed) and size.
      * Positive values are above the baseline, negative below.
      */
     nsresult GetUnderline(nscoord& aOffset, nscoord& aSize);
+
     /**
-     * Returns the height (in app units) of the font. This is ascent plus descent
-     * plus any internal leading
-     *
-     * This method will be removed once the callers have been moved over to the
-     * new GetEmHeight (and possibly GetMaxHeight).
-     */
-    nsresult GetHeight(nscoord &aHeight);
-    /**
-     * Returns the amount of internal leading (in app units) for the font. This
-     * is computed as the "height  - (ascent + descent)"
+     * Returns the amount of internal leading for the font.
+     * This is normally the difference between the max ascent
+     * and the em ascent.
      */
     nsresult GetInternalLeading(nscoord &aLeading);
+
     /**
-     * Returns the amount of external leading (in app units) as
-     * suggested by font vendor. This value is suggested by font vendor
-     * to add to normal line-height beside font height.
+     * Returns the amount of external leading for the font.
+     * em ascent(?) plus external leading is the font designer's
+     * recommended line-height for this font.
      */
     nsresult GetExternalLeading(nscoord &aLeading);
+
     /**
-     * Returns the height (in app units) of the Western font's em square. This is
-     * em ascent plus em descent.
+     * Returns the height of the em square.
+     * This is em ascent plus em descent.
      */
     nsresult GetEmHeight(nscoord &aHeight);
+
     /**
-     * Returns, in app units, the ascent part of the Western font's em square.
+     * Returns the ascent part of the em square.
      */
     nsresult GetEmAscent(nscoord &aAscent);
+
     /**
-     * Returns, in app units, the descent part of the Western font's em square.
+     * Returns the descent part of the em square.
      */
     nsresult GetEmDescent(nscoord &aDescent);
+
     /**
-     * Returns the height (in app units) of the Western font's bounding box.
+     * Returns the height of the bounding box.
      * This is max ascent plus max descent.
      */
     nsresult GetMaxHeight(nscoord &aHeight);
+
     /**
-     * Returns, in app units, the maximum distance characters in this font extend
+     * Returns the maximum distance characters in this font extend
      * above the base line.
      */
     nsresult GetMaxAscent(nscoord &aAscent);
+
     /**
-     * Returns, in app units, the maximum distance characters in this font extend
+     * Returns the maximum distance characters in this font extend
      * below the base line.
      */
     nsresult GetMaxDescent(nscoord &aDescent);
+
     /**
-     * Returns, in app units, the maximum character advance for the font
+     * Returns the maximum character advance for the font.
      */
     nsresult GetMaxAdvance(nscoord &aAdvance);
+
     /**
      * Returns the font associated with these metrics. The return value
      * is only defined after Init() has been called.
      */
     const nsFont &Font() { return mFont; }
+
     /**
      * Returns the language associated with these metrics
      */
     nsresult GetLanguage(nsIAtom** aLanguage);
-    /**
-     * Returns the font handle associated with these metrics
-     */
-    nsresult GetFontHandle(nsFontHandle &aHandle);
+
     /**
      * Returns the average character width
      */
     nsresult GetAveCharWidth(nscoord& aAveCharWidth);
+
     /**
      * Returns the often needed width of the space character
      */
@@ -212,55 +214,17 @@ public:
                       nscoord& aWidth, PRInt32 *aFontID,
                       nsRenderingContext *aContext);
 
-    // Get the text dimensions for this string
-    nsresult GetTextDimensions(const PRUnichar* aString,
-                               PRUint32 aLength,
-                               nsTextDimensions& aDimensions,
-                               PRInt32* aFontID);
-    nsresult GetTextDimensions(const char*         aString,
-                               PRInt32             aLength,
-                               PRInt32             aAvailWidth,
-                               PRInt32*            aBreaks,
-                               PRInt32             aNumBreaks,
-                               nsTextDimensions&   aDimensions,
-                               PRInt32&            aNumCharsFit,
-                               nsTextDimensions&   aLastWordDimensions,
-                               PRInt32*            aFontID);
-    nsresult GetTextDimensions(const PRUnichar*    aString,
-                               PRInt32             aLength,
-                               PRInt32             aAvailWidth,
-                               PRInt32*            aBreaks,
-                               PRInt32             aNumBreaks,
-                               nsTextDimensions&   aDimensions,
-                               PRInt32&            aNumCharsFit,
-                               nsTextDimensions&   aLastWordDimensions,
-                               PRInt32*            aFontID);
-
     // Draw a string using this font handle on the surface passed in.
     nsresult DrawString(const char *aString, PRUint32 aLength,
                         nscoord aX, nscoord aY,
                         const nscoord* aSpacing,
                         nsRenderingContext *aContext);
-    nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        PRInt32 aFontID,
-                        const nscoord* aSpacing,
-                        nsRenderingContext *aContext)
-    {
-        NS_ASSERTION(!aSpacing, "Spacing not supported here");
-        return DrawString(aString, aLength, aX, aY, aContext, aContext);
-    }
     nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
                         nscoord aX, nscoord aY,
                         nsRenderingContext *aContext,
                         nsRenderingContext *aTextRunConstructionContext);
 
 #ifdef MOZ_MATHML
-    // These two functions get the bounding metrics for this handle,
-    // updating the aBoundingMetrics in app units.
-    nsresult GetBoundingMetrics(const char *aString, PRUint32 aLength,
-                                nsRenderingContext *aContext,
-                                nsBoundingMetrics &aBoundingMetrics);
     nsresult GetBoundingMetrics(const PRUnichar *aString,
                                 PRUint32 aLength,
                                 nsRenderingContext *aContext,
@@ -268,17 +232,14 @@ public:
 #endif /* MOZ_MATHML */
 
     // Set the direction of the text rendering
-    nsresult SetRightToLeftText(PRBool aIsRTL);
-    PRBool GetRightToLeftText();
+    void SetRightToLeftText(PRBool aIsRTL) { mIsRightToLeft = aIsRTL; }
+    PRBool GetRightToLeftText() { return mIsRightToLeft; }
+
     void SetTextRunRTL(PRBool aIsRTL) { mTextRunRTL = aIsRTL; }
+    PRBool GetRightToLeftTextRunMode() { return mTextRunRTL; }
 
     gfxFontGroup* GetThebesFontGroup() { return mFontGroup; }
-
-    gfxUserFontSet* GetUserFontSet();
-
-    PRBool GetRightToLeftTextRunMode() {
-        return mTextRunRTL;
-    }
+    gfxUserFontSet* GetUserFontSet() { return mFontGroup->GetUserFontSet(); }
 
     PRInt32 AppUnitsPerDevPixel() { return mP2A; }
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 85d39b5f0670..eba2f1353421 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2847,7 +2847,7 @@ nsLayoutUtils::GetCenteredFontBaseline(nsFontMetrics* aFontMetrics,
 {
   nscoord fontAscent, fontHeight;
   aFontMetrics->GetMaxAscent(fontAscent);
-  aFontMetrics->GetHeight(fontHeight);
+  aFontMetrics->GetMaxHeight(fontHeight);
 
   nscoord leading = aLineHeight - fontHeight;
   return fontAscent + leading/2;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 96a9f96aa5b3..75b2e0b06f43 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -8813,7 +8813,7 @@ void ReflowCountMgr::PaintCount(const char*     aName,
       nscoord width, height;
       aRenderingContext->SetTextRunRTL(PR_FALSE);
       aRenderingContext->GetWidth((char*)buf, width);
-      fm->GetHeight(height);
+      fm->GetMaxHeight(height);
       fm->GetMaxAscent(y);
 
       PRUint32 color;
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 93b444182f43..e76dafbb2d4d 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -1882,7 +1882,7 @@ nsListControlFrame::CalcFallbackRowHeight()
   nsRefPtr<nsFontMetrics> fontMet;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
   if (fontMet) {
-    fontMet->GetHeight(rowHeight);
+    fontMet->GetMaxHeight(rowHeight);
   }
 
   return rowHeight;
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 10e78b094808..448281847b63 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -1422,7 +1422,7 @@ nsBulletFrame::GetDesiredSize(nsPresContext*  aCX,
     case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_HALEHAME_TI_ER:
     case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_HALEHAME_TI_ET:
       GetListItemText(*myList, text);
-      fm->GetHeight(aMetrics.height);
+      fm->GetMaxHeight(aMetrics.height);
       aRenderingContext->SetFont(fm);
       aMetrics.width = nsLayoutUtils::GetStringWidth(this, aRenderingContext, text.get(), text.Length());
       aMetrics.width += mPadding.right;
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 20db17d62e55..e83e490e476e 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2206,7 +2206,7 @@ nsGfxScrollFrameInner::GetLineScrollAmount() const
   NS_ASSERTION(fm, "FontMetrics is null, assuming fontHeight == 1 appunit");
   nscoord fontHeight = 1;
   if (fm) {
-    fm->GetHeight(fontHeight);
+    fm->GetMaxHeight(fontHeight);
   }
 
   return nsSize(fontHeight, fontHeight);
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 6fe8831c01db..73ee2af2a93a 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -979,7 +979,7 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
   nscoord maxAscent, maxDescent, height;
   fm->GetMaxAscent(maxAscent);
   fm->GetMaxDescent(maxDescent);
-  fm->GetHeight(height);
+  fm->GetMaxHeight(height);
 
   // XXX It would be nice if there was a way to have the font metrics tell
   // use where to break the text given a maximum width. At a minimum we need
@@ -1124,7 +1124,6 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
     // if we could not draw the icon, flag that we're waiting for it and
     // just draw some graffiti in the mean time
     if (!iconUsed) {
-      nscolor oldColor;
       nscoord iconXPos = (vis->mDirection ==   NS_STYLE_DIRECTION_RTL) ?
                          inner.XMost() - size : inner.x;
       nscoord twoPX = nsPresContext::CSSPixelsToAppUnits(2);
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 9d6788549a48..8ccd135f0e71 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -657,7 +657,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
     // and bottom border and padding. The height of children do not
     // affect our height.
     fm->GetMaxAscent(aMetrics.ascent);
-    fm->GetHeight(aMetrics.height);
+    fm->GetMaxHeight(aMetrics.height);
   } else {
     NS_WARNING("Cannot get font metrics - defaulting sizes to 0");
     aMetrics.ascent = aMetrics.height = 0;
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 35dc81b7832f..be5addcf53e9 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -520,7 +520,7 @@ nsPageFrame::PaintHeaderFooter(nsRenderingContext& aRenderingContext,
   nscoord ascent = 0;
   nscoord visibleHeight = 0;
   if (fontMet) {
-    fontMet->GetHeight(visibleHeight);
+    fontMet->GetMaxHeight(visibleHeight);
     fontMet->GetMaxAscent(ascent);
   }
 
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 0a229e8f1386..dc99f55c2769 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -2144,7 +2144,6 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
                               nsGlyphTable*        aGlyphTable,
                               nsRect&              aRect)
 {
-  nsresult rv = NS_OK;
   // Get the device pixel size in the vertical direction.
   // (This makes no effort to optimize for non-translation transformations.)
   nscoord oneDevPixel = aPresContext->AppUnitsPerDevPixel();
@@ -2373,7 +2372,6 @@ nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
                                 nsGlyphTable*        aGlyphTable,
                                 nsRect&              aRect)
 {
-  nsresult rv = NS_OK;
   // Get the device pixel size in the horizontal direction.
   // (This makes no effort to optimize for non-translation transformations.)
   nscoord oneDevPixel = aPresContext->AppUnitsPerDevPixel();
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index c3835cb49b50..449b566c236b 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -85,8 +85,6 @@ nsresult
 nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
                                     nsHTMLReflowMetrics& aDesiredSize)
 {
-  nsresult rv;
-
   // clear all other flags and record that there is an error with this frame
   mEmbellishData.flags = 0;
   mPresentationData.flags = NS_MATHML_ERROR;
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index 9d0be159bb47..e47546df0a9a 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -227,7 +227,7 @@ nsListBoxBodyFrame::Init(nsIContent*     aContent,
   }
   nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
-  fm->GetHeight(mRowHeight);
+  fm->GetMaxHeight(mRowHeight);
 
   return rv;
 }
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index b8d1714865d3..af32ec3e6c94 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -1001,7 +1001,7 @@ nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext, nsRenderingContext& aRe
 {
     nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
-    fontMet->GetHeight(aSize.height);
+    fontMet->GetMaxHeight(aSize.height);
     aRenderingContext.SetFont(fontMet);
     aSize.width =
       nsLayoutUtils::GetStringWidth(this, &aRenderingContext, aString.get(), aString.Length());
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index d1af6caf0540..2c3d8f78b2d2 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1265,7 +1265,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, nsITreeColumn* aCol, const n
     nsLayoutUtils::GetFontMetricsForStyleContext(textContext,
                                                  getter_AddRefs(fm));
     nscoord height;
-    fm->GetHeight(height);
+    fm->GetMaxHeight(height);
 
     nsMargin textMargin;
     textContext->GetStyleMargin()->GetMargin(textMargin);
@@ -3573,7 +3573,7 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
                                                getter_AddRefs(fontMet));
 
   nscoord height, baseline;
-  fontMet->GetHeight(height);
+  fontMet->GetMaxHeight(height);
   fontMet->GetMaxAscent(baseline);
 
   // Center the text. XXX Obey vertical-align style prop?

From ef90e52c1081ccd4172890ac9057c0942801c403 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 7 Apr 2011 21:18:43 -0700
Subject: [PATCH 153/509] Bug 174055, part 6: eliminate pointless nsresult
 return values.

---
 content/events/src/nsEventStateManager.cpp    |   5 +-
 gfx/src/nsFontMetrics.cpp                     | 282 +++++++-----------
 gfx/src/nsFontMetrics.h                       |  87 +++---
 gfx/src/nsRenderingContext.cpp                |  46 +--
 gfx/src/nsRenderingContext.h                  |   2 -
 gfx/src/nsThebesDeviceContext.cpp             |   3 +-
 layout/base/nsCaret.cpp                       |   4 +-
 layout/base/nsLayoutUtils.cpp                 |   7 +-
 layout/base/nsPresShell.cpp                   |   6 +-
 layout/forms/nsListControlFrame.cpp           |   4 +-
 layout/forms/nsTextControlFrame.cpp           |   4 +-
 layout/generic/nsBRFrame.cpp                  |   3 +-
 layout/generic/nsBulletFrame.cpp              |  17 +-
 layout/generic/nsGfxScrollFrame.cpp           |   2 +-
 layout/generic/nsHTMLReflowState.cpp          |   7 +-
 layout/generic/nsImageFrame.cpp               |   7 +-
 layout/generic/nsInlineFrame.cpp              |   9 +-
 layout/generic/nsLineLayout.cpp               |  15 +-
 layout/generic/nsPageFrame.cpp                |   4 +-
 layout/generic/nsTextFrameThebes.cpp          |  17 +-
 layout/mathml/nsMathMLContainerFrame.cpp      |  13 +-
 layout/mathml/nsMathMLFrame.cpp               |   9 +-
 layout/mathml/nsMathMLFrame.h                 |  31 +-
 layout/mathml/nsMathMLTokenFrame.cpp          |   5 +-
 layout/mathml/nsMathMLmencloseFrame.cpp       |   2 +-
 layout/mathml/nsMathMLmfencedFrame.cpp        |   9 +-
 layout/mathml/nsMathMLmfracFrame.cpp          |   6 +-
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp  |   3 +-
 layout/mathml/nsMathMLmoFrame.cpp             |   5 +-
 layout/mathml/nsMathMLmoverFrame.cpp          |   3 +-
 layout/mathml/nsMathMLmrootFrame.cpp          |   5 +-
 layout/mathml/nsMathMLmsubFrame.cpp           |   2 +-
 layout/mathml/nsMathMLmsubsupFrame.cpp        |   3 +-
 layout/mathml/nsMathMLmsupFrame.cpp           |   2 +-
 layout/mathml/nsMathMLmunderFrame.cpp         |   3 +-
 layout/mathml/nsMathMLmunderoverFrame.cpp     |   3 +-
 layout/style/nsRuleNode.cpp                   |   4 +-
 layout/svg/base/src/nsSVGUtils.cpp            |   3 +-
 layout/xul/base/src/nsListBoxBodyFrame.cpp    |   2 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  18 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   8 +-
 41 files changed, 271 insertions(+), 399 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index d695afe6ce05..1e8ea7dc3707 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2492,10 +2492,9 @@ GetScrollableLineHeight(nsIFrame* aTargetFrame)
   const nsFont& f = font->mFont;
   nsRefPtr<nsFontMetrics> fm = aTargetFrame->PresContext()->GetMetricsFor(f);
   NS_ASSERTION(fm, "FontMetrics is null!");
-  nscoord lineHeight = 0;
   if (fm)
-    fm->GetMaxHeight(lineHeight);
-  return lineHeight;
+    return fm->MaxHeight();
+  return 0;
 }
 
 void
diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index 155a6c971609..2807254c0ee5 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -40,31 +40,31 @@
 #include "nsBoundingMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsThebesDeviceContext.h"
+#include "gfxTextRunCache.h"
 
-class AutoTextRun {
+namespace {
+
+class AutoTextRun : public gfxTextRunCache::AutoTextRun {
 public:
     AutoTextRun(nsFontMetrics* aMetrics, nsRenderingContext* aRC,
-                const char* aString, PRInt32 aLength) {
-        mTextRun = gfxTextRunCache::MakeTextRun(
+                const char* aString, PRInt32 aLength)
+        : gfxTextRunCache::AutoTextRun(gfxTextRunCache::MakeTextRun(
             reinterpret_cast<const PRUint8*>(aString), aLength,
             aMetrics->GetThebesFontGroup(), aRC->ThebesContext(),
             aMetrics->AppUnitsPerDevPixel(),
-            ComputeFlags(aMetrics));
-    }
+            ComputeFlags(aMetrics)))
+    {}
+
     AutoTextRun(nsFontMetrics* aMetrics, nsRenderingContext* aRC,
-                const PRUnichar* aString, PRInt32 aLength) {
-        mTextRun = gfxTextRunCache::MakeTextRun(
+                const PRUnichar* aString, PRInt32 aLength)
+        : gfxTextRunCache::AutoTextRun(gfxTextRunCache::MakeTextRun(
             aString, aLength, aMetrics->GetThebesFontGroup(),
             aRC->ThebesContext(),
             aMetrics->AppUnitsPerDevPixel(),
-            ComputeFlags(aMetrics));
-    }
-    gfxTextRun* operator->() { return mTextRun.get(); }
-    gfxTextRun* get() { return mTextRun.get(); }
+            ComputeFlags(aMetrics)))
+    {}
 
 private:
-    gfxTextRunCache::AutoTextRun mTextRun;
-
     static PRUint32 ComputeFlags(nsFontMetrics* aMetrics) {
         PRUint32 flags = 0;
         if (aMetrics->GetRightToLeftTextRunMode()) {
@@ -74,6 +74,24 @@ private:
     }
 };
 
+class StubPropertyProvider : public gfxTextRun::PropertyProvider {
+public:
+    virtual void GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
+                                      PRPackedBool* aBreakBefore) {
+        NS_ERROR("This shouldn't be called because we never call BreakAndMeasureText");
+    }
+    virtual gfxFloat GetHyphenWidth() {
+        NS_ERROR("This shouldn't be called because we never enable hyphens");
+        return 0;
+    }
+    virtual void GetSpacing(PRUint32 aStart, PRUint32 aLength,
+                            Spacing* aSpacing) {
+        NS_ERROR("This shouldn't be called because we never enable spacing");
+    }
+};
+
+} // anon namespace
+
 nsFontMetrics::nsFontMetrics()
 {
     mFontStyle = nsnull;
@@ -118,11 +136,10 @@ nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
     return NS_OK;
 }
 
-nsresult
+void
 nsFontMetrics::Destroy()
 {
     mDeviceContext = nsnull;
-    return NS_OK;
 }
 
 // XXXTODO get rid of this macro
@@ -134,42 +151,36 @@ const gfxFont::Metrics& nsFontMetrics::GetMetrics() const
     return mFontGroup->GetFontAt(0)->GetMetrics();
 }
 
-nsresult
-nsFontMetrics::GetXHeight(nscoord& aResult)
+nscoord
+nsFontMetrics::XHeight()
 {
-    aResult = ROUND_TO_TWIPS(GetMetrics().xHeight);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().xHeight);
 }
 
-nsresult
-nsFontMetrics::GetSuperscriptOffset(nscoord& aResult)
+nscoord
+nsFontMetrics::SuperscriptOffset()
 {
-    aResult = ROUND_TO_TWIPS(GetMetrics().superscriptOffset);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().superscriptOffset);
 }
 
-nsresult
-nsFontMetrics::GetSubscriptOffset(nscoord& aResult)
+nscoord
+nsFontMetrics::SubscriptOffset()
 {
-    aResult = ROUND_TO_TWIPS(GetMetrics().subscriptOffset);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().subscriptOffset);
 }
 
-nsresult
+void
 nsFontMetrics::GetStrikeout(nscoord& aOffset, nscoord& aSize)
 {
     aOffset = ROUND_TO_TWIPS(GetMetrics().strikeoutOffset);
     aSize = ROUND_TO_TWIPS(GetMetrics().strikeoutSize);
-    return NS_OK;
 }
 
-nsresult
+void
 nsFontMetrics::GetUnderline(nscoord& aOffset, nscoord& aSize)
 {
     aOffset = ROUND_TO_TWIPS(mFontGroup->GetUnderlineOffset());
     aSize = ROUND_TO_TWIPS(GetMetrics().underlineSize);
-
-    return NS_OK;
 }
 
 // GetMaxAscent/GetMaxDescent/GetMaxHeight must contain the
@@ -191,91 +202,80 @@ static gfxFloat ComputeMaxAscent(const gfxFont::Metrics& aMetrics)
     return NS_floor(aMetrics.maxAscent + 0.5);
 }
 
-nsresult
-nsFontMetrics::GetInternalLeading(nscoord &aLeading)
+nscoord
+nsFontMetrics::InternalLeading()
 {
-    aLeading = ROUND_TO_TWIPS(GetMetrics().internalLeading);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().internalLeading);
 }
 
-nsresult
-nsFontMetrics::GetExternalLeading(nscoord &aLeading)
+nscoord
+nsFontMetrics::ExternalLeading()
 {
-    aLeading = ROUND_TO_TWIPS(GetMetrics().externalLeading);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().externalLeading);
 }
 
-nsresult
-nsFontMetrics::GetEmHeight(nscoord &aHeight)
+nscoord
+nsFontMetrics::EmHeight()
 {
-    aHeight = ROUND_TO_TWIPS(GetMetrics().emHeight);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().emHeight);
 }
 
-nsresult
-nsFontMetrics::GetEmAscent(nscoord &aAscent)
+nscoord
+nsFontMetrics::EmAscent()
 {
-    aAscent = ROUND_TO_TWIPS(GetMetrics().emAscent);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().emAscent);
 }
 
-nsresult
-nsFontMetrics::GetEmDescent(nscoord &aDescent)
+nscoord
+nsFontMetrics::EmDescent()
 {
-    aDescent = ROUND_TO_TWIPS(GetMetrics().emDescent);
-    return NS_OK;
+    return ROUND_TO_TWIPS(GetMetrics().emDescent);
 }
 
-nsresult
-nsFontMetrics::GetMaxHeight(nscoord &aHeight)
+nscoord
+nsFontMetrics::MaxHeight()
 {
-    aHeight = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics())) +
+    return CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics())) +
         CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
-    return NS_OK;
 }
 
-nsresult
-nsFontMetrics::GetMaxAscent(nscoord &aAscent)
+nscoord
+nsFontMetrics::MaxAscent()
 {
-    aAscent = CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics()));
-    return NS_OK;
+    return CEIL_TO_TWIPS(ComputeMaxAscent(GetMetrics()));
 }
 
-nsresult
-nsFontMetrics::GetMaxDescent(nscoord &aDescent)
+nscoord
+nsFontMetrics::MaxDescent()
 {
-    aDescent = CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
-    return NS_OK;
+    return CEIL_TO_TWIPS(ComputeMaxDescent(GetMetrics(), mFontGroup));
 }
 
-nsresult
-nsFontMetrics::GetMaxAdvance(nscoord &aAdvance)
+nscoord
+nsFontMetrics::MaxAdvance()
 {
-    aAdvance = CEIL_TO_TWIPS(GetMetrics().maxAdvance);
-    return NS_OK;
+    return CEIL_TO_TWIPS(GetMetrics().maxAdvance);
 }
 
-nsresult
-nsFontMetrics::GetLanguage(nsIAtom** aLanguage)
-{
-    *aLanguage = mLanguage;
-    NS_IF_ADDREF(*aLanguage);
-    return NS_OK;
-}
-
-nsresult
-nsFontMetrics::GetAveCharWidth(nscoord& aAveCharWidth)
+nscoord
+nsFontMetrics::AveCharWidth()
 {
     // Use CEIL instead of ROUND for consistency with GetMaxAdvance
-    aAveCharWidth = CEIL_TO_TWIPS(GetMetrics().aveCharWidth);
-    return NS_OK;
+    return CEIL_TO_TWIPS(GetMetrics().aveCharWidth);
 }
 
-nsresult
-nsFontMetrics::GetSpaceWidth(nscoord& aSpaceCharWidth)
+nscoord
+nsFontMetrics::SpaceWidth()
 {
-    aSpaceCharWidth = CEIL_TO_TWIPS(GetMetrics().spaceWidth);
-    return NS_OK;
+    return CEIL_TO_TWIPS(GetMetrics().spaceWidth);
+}
+
+already_AddRefed<nsIAtom>
+nsFontMetrics::GetLanguage()
+{
+    nsIAtom* result = mLanguage.get();
+    NS_IF_ADDREF(result);
+    return result;
 }
 
 PRInt32
@@ -287,145 +287,93 @@ nsFontMetrics::GetMaxStringLength()
     return PR_MAX(1, len);
 }
 
-class StubPropertyProvider : public gfxTextRun::PropertyProvider {
-public:
-    virtual void GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
-                                      PRPackedBool* aBreakBefore) {
-        NS_ERROR("This shouldn't be called because we never call BreakAndMeasureText");
-    }
-    virtual gfxFloat GetHyphenWidth() {
-        NS_ERROR("This shouldn't be called because we never enable hyphens");
-        return 0;
-    }
-    virtual void GetSpacing(PRUint32 aStart, PRUint32 aLength,
-                            Spacing* aSpacing) {
-        NS_ERROR("This shouldn't be called because we never enable spacing");
-    }
-};
-
-nsresult
-nsFontMetrics::GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
+nscoord
+nsFontMetrics::GetWidth(const char* aString, PRUint32 aLength,
                         nsRenderingContext *aContext)
 {
-    if (aLength == 0) {
-        aWidth = 0;
-        return NS_OK;
-    }
+    if (aLength == 0)
+        return 0;
 
-    // callers that hit this should not be so stupid
-    if ((aLength == 1) && (aString[0] == ' '))
-        return GetSpaceWidth(aWidth);
+    if (aLength == 1 && aString[0] == ' ')
+        return SpaceWidth();
 
     StubPropertyProvider provider;
     AutoTextRun textRun(this, aContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
-
-    aWidth = NSToCoordRound(textRun->GetAdvanceWidth(0, aLength, &provider));
-
-    return NS_OK;
+    return NSToCoordRound(textRun->GetAdvanceWidth(0, aLength, &provider));
 }
 
-nsresult
+nscoord
 nsFontMetrics::GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                        nscoord& aWidth, PRInt32 *aFontID,
                         nsRenderingContext *aContext)
 {
-    if (aLength == 0) {
-        aWidth = 0;
-        return NS_OK;
-    }
+    if (aLength == 0)
+        return 0;
 
-    // callers that hit this should not be so stupid
-    if ((aLength == 1) && (aString[0] == ' '))
-        return GetSpaceWidth(aWidth);
+    if (aLength == 1 && aString[0] == ' ')
+        return SpaceWidth();
 
     StubPropertyProvider provider;
     AutoTextRun textRun(this, aContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
-
-    aWidth = NSToCoordRound(textRun->GetAdvanceWidth(0, aLength, &provider));
-
-    return NS_OK;
+    return NSToCoordRound(textRun->GetAdvanceWidth(0, aLength, &provider));
 }
 
 // Draw a string using this font handle on the surface passed in.
-nsresult
+void
 nsFontMetrics::DrawString(const char *aString, PRUint32 aLength,
                           nscoord aX, nscoord aY,
-                          const nscoord* aSpacing,
                           nsRenderingContext *aContext)
 {
     if (aLength == 0)
-        return NS_OK;
+        return;
 
-    NS_ASSERTION(!aSpacing, "Spacing not supported here");
     StubPropertyProvider provider;
     AutoTextRun textRun(this, aContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
     gfxPoint pt(aX, aY);
     if (mTextRunRTL) {
         pt.x += textRun->GetAdvanceWidth(0, aLength, &provider);
     }
-    textRun->Draw(aContext->ThebesContext(), pt, 0, aLength,
-                  &provider, nsnull);
-    return NS_OK;
+    textRun->Draw(aContext->ThebesContext(), pt, 0, aLength, &provider, nsnull);
 }
 
-nsresult
+void
 nsFontMetrics::DrawString(const PRUnichar* aString, PRUint32 aLength,
                           nscoord aX, nscoord aY,
                           nsRenderingContext *aContext,
                           nsRenderingContext *aTextRunConstructionContext)
 {
     if (aLength == 0)
-        return NS_OK;
+        return;
 
     StubPropertyProvider provider;
     AutoTextRun textRun(this, aTextRunConstructionContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
     gfxPoint pt(aX, aY);
     if (mTextRunRTL) {
         pt.x += textRun->GetAdvanceWidth(0, aLength, &provider);
     }
-    textRun->Draw(aContext->ThebesContext(), pt, 0, aLength,
-                  &provider, nsnull);
-    return NS_OK;
+    textRun->Draw(aContext->ThebesContext(), pt, 0, aLength, &provider, nsnull);
 }
 
 #ifdef MOZ_MATHML
-nsresult
+nsBoundingMetrics
 nsFontMetrics::GetBoundingMetrics(const PRUnichar *aString, PRUint32 aLength,
-                                  nsRenderingContext *aContext,
-                                  nsBoundingMetrics &aBoundingMetrics)
+                                  nsRenderingContext *aContext)
 {
-    if (aLength == 0) {
-        aBoundingMetrics = nsBoundingMetrics();
-        return NS_OK;
-    }
+    if (aLength == 0)
+        return nsBoundingMetrics();
 
-    AutoTextRun textRun(this, aContext, aString, aLength);
-    if (!textRun.get())
-        return NS_ERROR_FAILURE;
-
-    // note that TIGHT_HINTED_OUTLINE_EXTENTS can be expensive (on Windows)
-    // but this is only used for MathML positioning so it's not critical
     StubPropertyProvider provider;
+    AutoTextRun textRun(this, aContext, aString, aLength);
     gfxTextRun::Metrics theMetrics =
         textRun->MeasureText(0, aLength,
                              gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
                              aContext->ThebesContext(), &provider);
 
-    aBoundingMetrics.leftBearing = NSToCoordFloor(theMetrics.mBoundingBox.X());
-    aBoundingMetrics.rightBearing
-        = NSToCoordCeil(theMetrics.mBoundingBox.XMost());
-    aBoundingMetrics.width = NSToCoordRound(theMetrics.mAdvanceWidth);
-    aBoundingMetrics.ascent = NSToCoordCeil(- theMetrics.mBoundingBox.Y());
-    aBoundingMetrics.descent = NSToCoordCeil(theMetrics.mBoundingBox.YMost());
-
-    return NS_OK;
+    nsBoundingMetrics m;
+    m.leftBearing  = NSToCoordFloor( theMetrics.mBoundingBox.X());
+    m.rightBearing = NSToCoordCeil(  theMetrics.mBoundingBox.XMost());
+    m.ascent       = NSToCoordCeil( -theMetrics.mBoundingBox.Y());
+    m.descent      = NSToCoordCeil(  theMetrics.mBoundingBox.YMost());
+    m.width        = NSToCoordRound( theMetrics.mAdvanceWidth);
+    return m;
 }
 #endif /* MOZ_MATHML */
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
index 8cd1ccc0ac17..17ba2dbea438 100644
--- a/gfx/src/nsFontMetrics.h
+++ b/gfx/src/nsFontMetrics.h
@@ -43,14 +43,10 @@
 #include "nsCoord.h"
 #include "nsFont.h"
 #include "gfxFont.h"
-#include "gfxTextRunCache.h"
 
-class gfxFontGroup;
-class gfxUserFontSet;
 class nsIAtom;
 class nsIDeviceContext;
 class nsRenderingContext;
-class nsString;
 class nsThebesDeviceContext;
 struct nsBoundingMetrics;
 
@@ -94,93 +90,103 @@ public:
      * Destroy this font metrics. This breaks the association between
      * the font metrics and the device context.
      */
-    nsresult Destroy();
+    void Destroy();
 
     /**
      * Return the font's x-height.
      */
-    nsresult GetXHeight(nscoord& aResult);
+    nscoord XHeight();
 
     /**
      * Return the font's superscript offset (the distance from the
      * baseline to where a superscript's baseline should be placed).
      * The value returned will be positive.
      */
-    nsresult GetSuperscriptOffset(nscoord& aResult);
+    nscoord SuperscriptOffset();
 
     /**
      * Return the font's subscript offset (the distance from the
      * baseline to where a subscript's baseline should be placed).
      * The value returned will be positive.
      */
-    nsresult GetSubscriptOffset(nscoord& aResult);
+    nscoord SubscriptOffset();
 
     /**
      * Return the font's strikeout offset (the distance from the
      * baseline to where a strikeout should be placed) and size.
      * Positive values are above the baseline, negative below.
      */
-    nsresult GetStrikeout(nscoord& aOffset, nscoord& aSize);
+    void GetStrikeout(nscoord& aOffset, nscoord& aSize);
 
     /**
      * Return the font's underline offset (the distance from the
      * baseline to where a underline should be placed) and size.
      * Positive values are above the baseline, negative below.
      */
-    nsresult GetUnderline(nscoord& aOffset, nscoord& aSize);
+    void GetUnderline(nscoord& aOffset, nscoord& aSize);
 
     /**
      * Returns the amount of internal leading for the font.
      * This is normally the difference between the max ascent
      * and the em ascent.
      */
-    nsresult GetInternalLeading(nscoord &aLeading);
+    nscoord InternalLeading();
 
     /**
      * Returns the amount of external leading for the font.
      * em ascent(?) plus external leading is the font designer's
      * recommended line-height for this font.
      */
-    nsresult GetExternalLeading(nscoord &aLeading);
+    nscoord ExternalLeading();
 
     /**
      * Returns the height of the em square.
      * This is em ascent plus em descent.
      */
-    nsresult GetEmHeight(nscoord &aHeight);
+    nscoord EmHeight();
 
     /**
      * Returns the ascent part of the em square.
      */
-    nsresult GetEmAscent(nscoord &aAscent);
+    nscoord EmAscent();
 
     /**
      * Returns the descent part of the em square.
      */
-    nsresult GetEmDescent(nscoord &aDescent);
+    nscoord EmDescent();
 
     /**
      * Returns the height of the bounding box.
      * This is max ascent plus max descent.
      */
-    nsresult GetMaxHeight(nscoord &aHeight);
+    nscoord MaxHeight();
 
     /**
      * Returns the maximum distance characters in this font extend
      * above the base line.
      */
-    nsresult GetMaxAscent(nscoord &aAscent);
+    nscoord MaxAscent();
 
     /**
      * Returns the maximum distance characters in this font extend
      * below the base line.
      */
-    nsresult GetMaxDescent(nscoord &aDescent);
+    nscoord MaxDescent();
 
     /**
      * Returns the maximum character advance for the font.
      */
-    nsresult GetMaxAdvance(nscoord &aAdvance);
+    nscoord MaxAdvance();
+
+    /**
+     * Returns the average character width
+     */
+    nscoord AveCharWidth();
+
+    /**
+     * Returns the often needed width of the space character
+     */
+    nscoord SpaceWidth();
 
     /**
      * Returns the font associated with these metrics. The return value
@@ -191,44 +197,31 @@ public:
     /**
      * Returns the language associated with these metrics
      */
-    nsresult GetLanguage(nsIAtom** aLanguage);
-
-    /**
-     * Returns the average character width
-     */
-    nsresult GetAveCharWidth(nscoord& aAveCharWidth);
-
-    /**
-     * Returns the often needed width of the space character
-     */
-    nsresult GetSpaceWidth(nscoord& aSpaceCharWidth);
+    already_AddRefed<nsIAtom> GetLanguage();
 
     PRInt32 GetMaxStringLength();
 
     // Get the width for this string.  aWidth will be updated with the
     // width in points, not twips.  Callers must convert it if they
     // want it in another format.
-    nsresult GetWidth(const char* aString, PRUint32 aLength, nscoord& aWidth,
-                      nsRenderingContext *aContext);
-    nsresult GetWidth(const PRUnichar* aString, PRUint32 aLength,
-                      nscoord& aWidth, PRInt32 *aFontID,
-                      nsRenderingContext *aContext);
+    nscoord GetWidth(const char* aString, PRUint32 aLength,
+                     nsRenderingContext *aContext);
+    nscoord GetWidth(const PRUnichar* aString, PRUint32 aLength,
+                     nsRenderingContext *aContext);
 
     // Draw a string using this font handle on the surface passed in.
-    nsresult DrawString(const char *aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        const nscoord* aSpacing,
-                        nsRenderingContext *aContext);
-    nsresult DrawString(const PRUnichar* aString, PRUint32 aLength,
-                        nscoord aX, nscoord aY,
-                        nsRenderingContext *aContext,
-                        nsRenderingContext *aTextRunConstructionContext);
+    void DrawString(const char *aString, PRUint32 aLength,
+                    nscoord aX, nscoord aY,
+                    nsRenderingContext *aContext);
+    void DrawString(const PRUnichar* aString, PRUint32 aLength,
+                    nscoord aX, nscoord aY,
+                    nsRenderingContext *aContext,
+                    nsRenderingContext *aTextRunConstructionContext);
 
 #ifdef MOZ_MATHML
-    nsresult GetBoundingMetrics(const PRUnichar *aString,
-                                PRUint32 aLength,
-                                nsRenderingContext *aContext,
-                                nsBoundingMetrics &aBoundingMetrics);
+    nsBoundingMetrics GetBoundingMetrics(const PRUnichar *aString,
+                                         PRUint32 aLength,
+                                         nsRenderingContext *aContext);
 #endif /* MOZ_MATHML */
 
     // Set the direction of the text rendering
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 8c146af9bc66..4418a2748a31 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -494,9 +494,7 @@ nscoord
 nsRenderingContext::GetWidth(char aC)
 {
     if (aC == ' ' && mFontMetrics) {
-        nscoord width;
-        mFontMetrics->GetSpaceWidth(width);
-        return width;
+        return mFontMetrics->SpaceWidth();
     }
 
     return GetWidth(&aC, 1);
@@ -527,7 +525,7 @@ nsRenderingContext::GetWidth(const char* aString, PRUint32 aLength)
     nscoord width = 0;
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        width += GetWidthInternal(aString, len);
+        width += mFontMetrics->GetWidth(aString, len, this);
         aLength -= len;
         aString += len;
     }
@@ -541,7 +539,7 @@ nsRenderingContext::GetWidth(const PRUnichar *aString, PRUint32 aLength)
     nscoord width = 0;
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        width += GetWidthInternal(aString, len);
+        width += mFontMetrics->GetWidth(aString, len, this);
         aLength -= len;
         aString += len;
     }
@@ -558,15 +556,15 @@ nsRenderingContext::GetBoundingMetrics(const PRUnichar* aString,
     // Assign directly in the first iteration. This ensures that
     // negative ascent/descent can be returned and the left bearing
     // is properly initialized.
-    nsBoundingMetrics totalMetrics;
-    mFontMetrics->GetBoundingMetrics(aString, len, this, totalMetrics);
+    nsBoundingMetrics totalMetrics
+        = mFontMetrics->GetBoundingMetrics(aString, len, this);
     aLength -= len;
     aString += len;
 
     while (aLength > 0) {
         len = FindSafeLength(aString, aLength, maxChunkLength);
-        nsBoundingMetrics metrics;
-        mFontMetrics->GetBoundingMetrics(aString, len, this, metrics);
+        nsBoundingMetrics metrics
+            = mFontMetrics->GetBoundingMetrics(aString, len, this);
         totalMetrics += metrics;
         aLength -= len;
         aString += len;
@@ -582,11 +580,11 @@ nsRenderingContext::DrawString(const char *aString, PRUint32 aLength,
     PRUint32 maxChunkLength = GetMaxChunkLength();
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        mFontMetrics->DrawString(aString, len, aX, aY, nsnull, this);
+        mFontMetrics->DrawString(aString, len, aX, aY, this);
         aLength -= len;
 
         if (aLength > 0) {
-            nscoord width = GetWidthInternal(aString, len);
+            nscoord width = mFontMetrics->GetWidth(aString, len, this);
             aX += width;
             aString += len;
         }
@@ -618,7 +616,7 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
 
     while (aLength > 0) {
         PRInt32 len = FindSafeLength(aString, aLength, maxChunkLength);
-        nscoord width = GetWidthInternal(aString, len);
+        nscoord width = mFontMetrics->GetWidth(aString, len, this);
         if (isRTL) {
             aX -= width;
         }
@@ -630,27 +628,3 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
         aString += len;
     }
 }
-
-nscoord
-nsRenderingContext::GetWidthInternal(const char* aString, PRUint32 aLength)
-{
-    if (aLength == 0) {
-        return 0;
-    }
-
-    nscoord width;
-    mFontMetrics->GetWidth(aString, aLength, width, this);
-    return width;
-}
-
-nscoord
-nsRenderingContext::GetWidthInternal(const PRUnichar *aString, PRUint32 aLength)
-{
-    if (aLength == 0) {
-        return 0;
-    }
-
-    nscoord width;
-    mFontMetrics->GetWidth(aString, aLength, width, nsnull, this);
-    return width;
-}
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 6611f8978a4f..85b790428728 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -146,8 +146,6 @@ public:
 
 protected:
     PRInt32 GetMaxChunkLength();
-    nscoord GetWidthInternal(const char *aString, PRUint32 aLength);
-    nscoord GetWidthInternal(const PRUnichar *aString, PRUint32 aLength);
 
     nsRefPtr<gfxContext> mThebes;
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index bd1924cc70c1..ac3084fc20d6 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -151,8 +151,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
     for (PRInt32 i = n; i >= 0; --i) {
         fm = mFontMetrics[i];
         if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet) {
-            nsCOMPtr<nsIAtom> language;
-            fm->GetLanguage(getter_AddRefs(language));
+            nsCOMPtr<nsIAtom> language = fm->GetLanguage();
             if (aLanguage == language.get()) {
                 if (i != n) {
                     // promote it to the end of the cache
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index f3fe6a878f3d..42ed4eed5467 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -360,8 +360,8 @@ nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
   nsLayoutUtils::GetFontMetricsForFrame(aFrame, getter_AddRefs(fm));
   NS_ASSERTION(fm, "We should be able to get the font metrics");
   if (fm) {
-    fm->GetMaxAscent(ascent);
-    fm->GetMaxDescent(descent);
+    ascent = fm->MaxAscent();
+    descent = fm->MaxDescent();
   }
   nscoord height = ascent + descent;
   framePos.y = baseline - ascent;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index eba2f1353421..66abab6c2eef 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1644,7 +1644,7 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
     nsIWidget *widget = aFrame->GetNearestWidget();
     if (widget) {
       PRInt32 pixelRatio = presContext->AppUnitsPerDevPixel();
-      nsIntRegion visibleWindowRegion(visibleRegion.ToOutsidePixels(presContext->AppUnitsPerDevPixel()));
+      nsIntRegion visibleWindowRegion(visibleRegion.ToOutsidePixels(pixelRatio));
       widget->UpdateTransparentRegion(visibleWindowRegion);
     }
   }
@@ -2845,9 +2845,8 @@ nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
 nsLayoutUtils::GetCenteredFontBaseline(nsFontMetrics* aFontMetrics,
                                        nscoord         aLineHeight)
 {
-  nscoord fontAscent, fontHeight;
-  aFontMetrics->GetMaxAscent(fontAscent);
-  aFontMetrics->GetMaxHeight(fontHeight);
+  nscoord fontAscent = aFontMetrics->MaxAscent();
+  nscoord fontHeight = aFontMetrics->MaxHeight();
 
   nscoord leading = aLineHeight - fontHeight;
   return fontAscent + leading/2;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 75b2e0b06f43..01186f643746 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -8809,12 +8809,10 @@ void ReflowCountMgr::PaintCount(const char*     aName,
       aRenderingContext->SetFont(fm);
       char buf[16];
       sprintf(buf, "%d", counter->mCount);
-      nscoord x = 0, y;
-      nscoord width, height;
+      nscoord x = 0, y = fm->MaxAscent();
+      nscoord width, height = fm->MaxHeight();
       aRenderingContext->SetTextRunRTL(PR_FALSE);
       aRenderingContext->GetWidth((char*)buf, width);
-      fm->GetMaxHeight(height);
-      fm->GetMaxAscent(y);
 
       PRUint32 color;
       PRUint32 color2;
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index e76dafbb2d4d..7dcb97fda061 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -1878,11 +1878,11 @@ nscoord
 nsListControlFrame::CalcFallbackRowHeight()
 {
   nscoord rowHeight = 0;
-  
+
   nsRefPtr<nsFontMetrics> fontMet;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
   if (fontMet) {
-    fontMet->GetMaxHeight(rowHeight);
+    rowHeight = fontMet->MaxHeight();
   }
 
   return rowHeight;
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 9a86d808a2c2..1697b5783b4a 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -237,8 +237,8 @@ nsTextControlFrame::CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
 
   lineHeight =
     nsHTMLReflowState::CalcLineHeight(GetStyleContext(), NS_AUTOHEIGHT);
-  fontMet->GetAveCharWidth(charWidth);
-  fontMet->GetMaxAdvance(charMaxAdvance);
+  charWidth = fontMet->AveCharWidth();
+  charMaxAdvance = fontMet->MaxAdvance();
 
   // Set the width equal to the width in characters
   PRInt32 cols = GetCols();
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index f22d3d4923c8..aac6e7a137b0 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -239,8 +239,7 @@ BRFrame::GetBaseline() const
     if (GetStateBits() & BR_USING_CENTERED_FONT_BASELINE) {
       ascent = nsLayoutUtils::GetCenteredFontBaseline(fm, logicalHeight);
     } else {
-      fm->GetMaxAscent(ascent);
-      ascent += GetUsedBorderAndPadding().top;
+      ascent = fm->MaxAscent() + GetUsedBorderAndPadding().top;
     }
   }
   return NS_MIN(mRect.height, ascent);
diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index 448281847b63..e5dd44226bd2 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -388,8 +388,7 @@ nsBulletFrame::PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
     GetListItemText(*myList, text);
     aRenderingContext.SetFont(fm);
-    nscoord ascent;
-    fm->GetMaxAscent(ascent);
+    nscoord ascent = fm->MaxAscent();
     aRenderingContext.SetTextRunRTL(mTextIsRTL);
     aRenderingContext.DrawString(text, mPadding.left + aPt.x,
                                  mPadding.top + aPt.y + ascent);
@@ -1361,7 +1360,7 @@ nsBulletFrame::GetDesiredSize(nsPresContext*  aCX,
     case NS_STYLE_LIST_STYLE_DISC:
     case NS_STYLE_LIST_STYLE_CIRCLE:
     case NS_STYLE_LIST_STYLE_SQUARE:
-      fm->GetMaxAscent(ascent);
+      ascent = fm->MaxAscent();
       bulletSize = NS_MAX(nsPresContext::CSSPixelsToAppUnits(MIN_BULLET_SIZE),
                           NSToCoordRound(0.8f * (float(ascent) / 2.0f)));
       mPadding.bottom = NSToCoordRound(float(ascent) / 8.0f);
@@ -1422,11 +1421,13 @@ nsBulletFrame::GetDesiredSize(nsPresContext*  aCX,
     case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_HALEHAME_TI_ER:
     case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_HALEHAME_TI_ET:
       GetListItemText(*myList, text);
-      fm->GetMaxHeight(aMetrics.height);
+      aMetrics.height = fm->MaxHeight();
       aRenderingContext->SetFont(fm);
-      aMetrics.width = nsLayoutUtils::GetStringWidth(this, aRenderingContext, text.get(), text.Length());
+      aMetrics.width =
+        nsLayoutUtils::GetStringWidth(this, aRenderingContext,
+                                      text.get(), text.Length());
       aMetrics.width += mPadding.right;
-      fm->GetMaxAscent(aMetrics.ascent);
+      aMetrics.ascent = fm->MaxAscent();
       break;
   }
 }
@@ -1601,7 +1602,7 @@ nsBulletFrame::GetBaseline() const
       case NS_STYLE_LIST_STYLE_DISC:
       case NS_STYLE_LIST_STYLE_CIRCLE:
       case NS_STYLE_LIST_STYLE_SQUARE:
-        fm->GetMaxAscent(ascent);
+        ascent = fm->MaxAscent();
         bottomPadding = NSToCoordRound(float(ascent) / 8.0f);
         ascent = NS_MAX(nsPresContext::CSSPixelsToAppUnits(MIN_BULLET_SIZE),
                         NSToCoordRound(0.8f * (float(ascent) / 2.0f)));
@@ -1609,7 +1610,7 @@ nsBulletFrame::GetBaseline() const
         break;
 
       default:
-        fm->GetMaxAscent(ascent);
+        ascent = fm->MaxAscent();
         break;
     }
   }
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index e83e490e476e..aa00fe819a8e 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2206,7 +2206,7 @@ nsGfxScrollFrameInner::GetLineScrollAmount() const
   NS_ASSERTION(fm, "FontMetrics is null, assuming fontHeight == 1 appunit");
   nscoord fontHeight = 1;
   if (fm) {
-    fm->GetMaxHeight(fontHeight);
+    fontHeight = fm->MaxHeight();
   }
 
   return nsSize(fontHeight, fontHeight);
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 12941b315c13..a21136d47121 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -2112,10 +2112,9 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics)
 
   nscoord normalLineHeight;
 
-  nscoord externalLeading, internalLeading, emHeight;
-  aFontMetrics->GetExternalLeading(externalLeading);
-  aFontMetrics->GetInternalLeading(internalLeading);
-  aFontMetrics->GetEmHeight(emHeight);
+  nscoord externalLeading = aFontMetrics->ExternalLeading();
+  nscoord internalLeading = aFontMetrics->InternalLeading();
+  nscoord emHeight = aFontMetrics->EmHeight();
   switch (GetNormalLineHeightCalcControl()) {
   case eIncludeExternalLeading:
     normalLineHeight = emHeight+ internalLeading + externalLeading;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 73ee2af2a93a..d0f228327ce3 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -976,10 +976,9 @@ nsImageFrame::DisplayAltText(nsPresContext*      aPresContext,
   // Format the text to display within the formatting rect
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord maxAscent, maxDescent, height;
-  fm->GetMaxAscent(maxAscent);
-  fm->GetMaxDescent(maxDescent);
-  fm->GetMaxHeight(height);
+  nscoord maxAscent = fm->MaxAscent();
+  nscoord maxDescent = fm->MaxDescent();
+  nscoord height = fm->MaxHeight();
 
   // XXX It would be nice if there was a way to have the font metrics tell
   // use where to break the text given a maximum width. At a minimum we need
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 8ccd135f0e71..071805f74fa7 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -656,8 +656,8 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
     // The height of our box is the sum of our font size plus the top
     // and bottom border and padding. The height of children do not
     // affect our height.
-    fm->GetMaxAscent(aMetrics.ascent);
-    fm->GetMaxHeight(aMetrics.height);
+    aMetrics.ascent = fm->MaxAscent();
+    aMetrics.height = fm->MaxHeight();
   } else {
     NS_WARNING("Cannot get font metrics - defaulting sizes to 0");
     aMetrics.ascent = aMetrics.height = 0;
@@ -914,8 +914,9 @@ nsInlineFrame::GetBaseline() const
 {
   nscoord ascent = 0;
   nsRefPtr<nsFontMetrics> fm;
-  if (NS_SUCCEEDED(nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm)))) {
-    fm->GetMaxAscent(ascent);
+  nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
+  if (fm) {
+    ascent = fm->MaxAscent();
   }
   return NS_MIN(mRect.height, ascent + GetUsedBorderAndPadding().top);
 }
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 23f359a52a31..bfbcc2b90205 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1810,8 +1810,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
           // of the parent's box. This is identical to the baseline
           // alignment except for the addition of the subscript
           // offset to the baseline Y.
-          nscoord parentSubscript;
-          fm->GetSubscriptOffset(parentSubscript);
+          nscoord parentSubscript = fm->SubscriptOffset();
           nscoord revisedBaselineY = baselineY + parentSubscript;
           pfd->mBounds.y = revisedBaselineY - pfd->mAscent;
           pfd->mVerticalAlign = VALIGN_OTHER;
@@ -1824,8 +1823,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
           // of the parent's box. This is identical to the baseline
           // alignment except for the subtraction of the superscript
           // offset to the baseline Y.
-          nscoord parentSuperscript;
-          fm->GetSuperscriptOffset(parentSuperscript);
+          nscoord parentSuperscript = fm->SuperscriptOffset();
           nscoord revisedBaselineY = baselineY - parentSuperscript;
           pfd->mBounds.y = revisedBaselineY - pfd->mAscent;
           pfd->mVerticalAlign = VALIGN_OTHER;
@@ -1866,8 +1864,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
         {
           // Align the midpoint of the frame with 1/2 the parents
           // x-height above the baseline.
-          nscoord parentXHeight;
-          fm->GetXHeight(parentXHeight);
+          nscoord parentXHeight = fm->XHeight();
           if (frameSpan) {
             pfd->mBounds.y = baselineY -
               (parentXHeight + pfd->mBounds.height)/2;
@@ -1884,8 +1881,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
         {
           // The top of the logical box is aligned with the top of
           // the parent element's text.
-          nscoord parentAscent;
-          fm->GetMaxAscent(parentAscent);
+          nscoord parentAscent = fm->MaxAscent();
           if (frameSpan) {
             pfd->mBounds.y = baselineY - parentAscent -
               pfd->mBorderPadding.top + frameSpan->mTopLeading;
@@ -1901,8 +1897,7 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
         {
           // The bottom of the logical box is aligned with the
           // bottom of the parent elements text.
-          nscoord parentDescent;
-          fm->GetMaxDescent(parentDescent);
+          nscoord parentDescent = fm->MaxDescent();
           if (frameSpan) {
             pfd->mBounds.y = baselineY + parentDescent -
               pfd->mBounds.height + pfd->mBorderPadding.bottom -
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index be5addcf53e9..5141bc932775 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -520,8 +520,8 @@ nsPageFrame::PaintHeaderFooter(nsRenderingContext& aRenderingContext,
   nscoord ascent = 0;
   nscoord visibleHeight = 0;
   if (fontMet) {
-    fontMet->GetMaxHeight(visibleHeight);
-    fontMet->GetMaxAscent(ascent);
+    visibleHeight = fontMet->MaxHeight();
+    ascent = fontMet->MaxAscent();
   }
 
   // print document headers and footers
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 84d3685d3a97..99488f908a12 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -4338,10 +4338,9 @@ nsTextFrame::UnionTextDecorationOverflow(nsPresContext* aPresContext,
   if (IsFloatingFirstLetterChild()) {
     // The underline/overline drawable area must be contained in the overflow
     // rect when this is in floating first letter frame at *both* modes.
-    nscoord fontAscent, fontHeight;
     nsFontMetrics* fm = aProvider.GetFontMetrics();
-    fm->GetMaxAscent(fontAscent);
-    fm->GetMaxHeight(fontHeight);
+    nscoord fontAscent = fm->MaxAscent();
+    nscoord fontHeight = fm->MaxHeight();
     nsRect fontRect(0, mAscent - fontAscent, GetSize().width, fontHeight);
     aVisualOverflowRect->UnionRect(*aVisualOverflowRect, fontRect);
   }
@@ -6786,11 +6785,8 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
     // the height manually.
     nsFontMetrics* fm = provider.GetFontMetrics();
     if (fm) {
-      nscoord ascent, descent;
-      fm->GetMaxAscent(ascent);
-      fm->GetMaxDescent(descent);
-      textMetrics.mAscent = gfxFloat(ascent);
-      textMetrics.mDescent = gfxFloat(descent);
+      textMetrics.mAscent = gfxFloat(fm->MaxAscent());
+      textMetrics.mDescent = gfxFloat(fm->MaxDescent());
     }
   }
   // The "end" iterator points to the first character after the string mapped
@@ -6895,10 +6891,9 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
     // Otherwise, ascent should contain the overline drawable area.
     // And also descent should contain the underline drawable area.
     // nsFontMetrics::GetMaxAscent/GetMaxDescent contains them.
-    nscoord fontAscent, fontDescent;
     nsFontMetrics* fm = provider.GetFontMetrics();
-    fm->GetMaxAscent(fontAscent);
-    fm->GetMaxDescent(fontDescent);
+    nscoord fontAscent = fm->MaxAscent();
+    nscoord fontDescent = fm->MaxDescent();
     aMetrics.ascent = NS_MAX(NSToCoordCeil(textMetrics.mAscent), fontAscent);
     nscoord descent = NS_MAX(NSToCoordCeil(textMetrics.mDescent), fontDescent);
     aMetrics.height = aMetrics.ascent + descent;
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index 449b566c236b..f5c31807a368 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -100,9 +100,8 @@ nsMathMLContainerFrame::ReflowError(nsRenderingContext& aRenderingContext,
 
   // reflow metrics
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
-  fm->GetMaxAscent(aDesiredSize.ascent);
-  nscoord descent;
-  fm->GetMaxDescent(descent);
+  aDesiredSize.ascent = fm->MaxAscent();
+  nscoord descent = fm->MaxDescent();
   aDesiredSize.height = aDesiredSize.ascent + descent;
   aDesiredSize.width = mBoundingMetrics.width;
 
@@ -140,11 +139,11 @@ void nsDisplayMathMLError::Paint(nsDisplayListBuilder* aBuilder,
   aCtx->FillRect(nsRect(pt, mFrame->GetSize()));
   aCtx->SetColor(NS_RGB(255,255,255));
 
-  nscoord ascent;
-  aCtx->FontMetrics()->GetMaxAscent(ascent);
+  nscoord ascent = aCtx->FontMetrics()->MaxAscent();
 
-  nsAutoString errorMsg; errorMsg.AssignLiteral("invalid-markup");
-  aCtx->DrawString(errorMsg.get(), PRUint32(errorMsg.Length()), pt.x, pt.y+ascent);
+  NS_NAMED_LITERAL_STRING(errorMsg, "invalid-markup");
+  aCtx->DrawString(errorMsg.get(), PRUint32(errorMsg.Length()),
+                   pt.x, pt.y+ascent);
 }
 
 /* /////////////
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index 4ef1dfd6ec95..ee660e57ed72 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -286,8 +286,7 @@ nsMathMLFrame::GetRuleThickness(nsRenderingContext& aRenderingContext,
                Equals(aFontMetrics->Font()),
                "unexpected state");
 
-  nscoord xHeight;
-  aFontMetrics->GetXHeight(xHeight);
+  nscoord xHeight = aFontMetrics->XHeight();
   PRUnichar overBar = 0x00AF;
   nsBoundingMetrics bm = aRenderingContext.GetBoundingMetrics(&overBar, 1);
   aRuleThickness = bm.ascent + bm.descent;
@@ -308,8 +307,7 @@ nsMathMLFrame::GetAxisHeight(nsRenderingContext& aRenderingContext,
                Equals(aFontMetrics->Font()),
                "unexpected state");
 
-  nscoord xHeight;
-  aFontMetrics->GetXHeight(xHeight);
+  nscoord xHeight = aFontMetrics->XHeight();
   PRUnichar minus = 0x2212; // not '-', but official Unicode minus sign
   nsBoundingMetrics bm = aRenderingContext.GetBoundingMetrics(&minus, 1);
   aAxisHeight = bm.ascent - (bm.ascent + bm.descent)/2;
@@ -340,10 +338,9 @@ nsMathMLFrame::CalcLength(nsPresContext*   aPresContext,
     return NSToCoordRound(aCSSValue.GetFloatValue() * (float)font->mFont.size);
   }
   else if (eCSSUnit_XHeight == unit) {
-    nscoord xHeight;
     const nsStyleFont* font = aStyleContext->GetStyleFont();
     nsRefPtr<nsFontMetrics> fm = aPresContext->GetMetricsFor(font->mFont);
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     return NSToCoordRound(aCSSValue.GetFloatValue() * (float)xHeight);
   }
 
diff --git a/layout/mathml/nsMathMLFrame.h b/layout/mathml/nsMathMLFrame.h
index b1bb73d44372..a199b503b2ef 100644
--- a/layout/mathml/nsMathMLFrame.h
+++ b/layout/mathml/nsMathMLFrame.h
@@ -270,8 +270,7 @@ public:
                      nscoord&        aSubScriptShift1, 
                      nscoord&        aSubScriptShift2)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     aSubScriptShift1 = NSToCoordRound(150.000f/430.556f * xHeight);
     aSubScriptShift2 = NSToCoordRound(247.217f/430.556f * xHeight);
   }
@@ -283,8 +282,7 @@ public:
                      nscoord&        aSupScriptShift2, 
                      nscoord&        aSupScriptShift3)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     aSupScriptShift1 = NSToCoordRound(412.892f/430.556f * xHeight);
     aSupScriptShift2 = NSToCoordRound(362.892f/430.556f * xHeight);
     aSupScriptShift3 = NSToCoordRound(288.889f/430.556f * xHeight);
@@ -296,8 +294,7 @@ public:
   GetSubDrop(nsFontMetrics* fm,
              nscoord&        aSubDrop)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     aSubDrop = NSToCoordRound(50.000f/430.556f * xHeight);
   }
 
@@ -305,8 +302,7 @@ public:
   GetSupDrop(nsFontMetrics* fm,
              nscoord&        aSupDrop)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     aSupDrop = NSToCoordRound(386.108f/430.556f * xHeight);
   }
 
@@ -316,8 +312,7 @@ public:
                      nscoord&        numShift2, 
                      nscoord&        numShift3)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     numShift1 = NSToCoordRound(676.508f/430.556f * xHeight);
     numShift2 = NSToCoordRound(393.732f/430.556f * xHeight);
     numShift3 = NSToCoordRound(443.731f/430.556f * xHeight);
@@ -328,8 +323,7 @@ public:
                        nscoord&        denShift1, 
                        nscoord&        denShift2)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     denShift1 = NSToCoordRound(685.951f/430.556f * xHeight);
     denShift2 = NSToCoordRound(344.841f/430.556f * xHeight);
   }
@@ -338,9 +332,9 @@ public:
   GetEmHeight(nsFontMetrics* fm,
               nscoord&        emHeight)
   {
-#if 0 
+#if 0
     // should switch to this API in order to scale with changes of TextZoom
-    fm->GetEmHeight(emHeight);
+    emHeight = fm->EmHeight();
 #else
     emHeight = NSToCoordRound(float(fm->Font().size));
 #endif
@@ -350,8 +344,7 @@ public:
   GetAxisHeight (nsFontMetrics* fm,
                  nscoord&        axisHeight)
   {
-    fm->GetXHeight (axisHeight);
-    axisHeight = NSToCoordRound(250.000f/430.556f * axisHeight);
+    axisHeight = NSToCoordRound(250.000f/430.556f * fm->XHeight());
   }
 
   static void
@@ -362,8 +355,7 @@ public:
                    nscoord&        bigOpSpacing4,
                    nscoord&        bigOpSpacing5)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     bigOpSpacing1 = NSToCoordRound(111.111f/430.556f * xHeight);
     bigOpSpacing2 = NSToCoordRound(166.667f/430.556f * xHeight);
     bigOpSpacing3 = NSToCoordRound(200.000f/430.556f * xHeight);
@@ -375,8 +367,7 @@ public:
   GetRuleThickness(nsFontMetrics* fm,
                    nscoord&        ruleThickness)
   {
-    nscoord xHeight;
-    fm->GetXHeight(xHeight);
+    nscoord xHeight = fm->XHeight();
     ruleThickness = NSToCoordRound(40.000f/430.556f * xHeight);
   }
 
diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
index 02385e8e0c66..effb78c991ee 100644
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -211,9 +211,8 @@ nsMathMLTokenFrame::Place(nsRenderingContext& aRenderingContext,
 
   nsRefPtr<nsFontMetrics> fm =
     PresContext()->GetMetricsFor(GetStyleFont()->mFont);
-  nscoord ascent, descent;
-  fm->GetMaxAscent(ascent);
-  fm->GetMaxDescent(descent);
+  nscoord ascent = fm->MaxAscent();
+  nscoord descent = fm->MaxDescent();
 
   aDesiredSize.mBoundingMetrics = mBoundingMetrics;
   aDesiredSize.width = mBoundingMetrics.width;
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 33945df789d2..c5b6fc918d2a 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -399,7 +399,7 @@ nsMathMLmencloseFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
       // Rule 11, App. G, TeXbook
       // psi = clearance between rule and content
       if (NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags))
-        fm->GetXHeight(phi);
+        phi = fm->XHeight();
       else
         phi = mRuleThickness;
       psi = mRuleThickness + phi / 4;
diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp
index 325725a01d81..3779d44c7350 100644
--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@@ -269,10 +269,11 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
   nsIFrame* childFrame = firstChild;
   nscoord ascent = 0, descent = 0;
   if (firstChild || mOpenChar || mCloseChar || mSeparatorsCount > 0) {
-    // We use the ASCII metrics to get our minimum height. This way, if we have
-    // borders or a background, they will fit better with other elements on the line
-    fm->GetMaxAscent(ascent);
-    fm->GetMaxDescent(descent);
+    // We use the ASCII metrics to get our minimum height. This way,
+    // if we have borders or a background, they will fit better with
+    // other elements on the line.
+    ascent = fm->MaxAscent();
+    descent = fm->MaxDescent();
   }
   while (childFrame) {
     nsHTMLReflowMetrics childDesiredSize(aDesiredSize.mFlags
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 52aebd547edc..24d86e70caa8 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -436,8 +436,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
     nscoord slashRatio = 3;
 
     // Define the constant used in the expression of the maximum width
-    nscoord em;
-    fm->GetEmHeight(em);
+    nscoord em = fm->EmHeight();
     nscoord slashMaxWidthConstant = 2 * em;
 
     // For large line thicknesses the minimum slash height is limited to the
@@ -477,8 +476,7 @@ nsMathMLmfracFrame::PlaceInternal(nsRenderingContext& aRenderingContext,
       numShift += delta;
       denShift += delta;
     } else {
-      nscoord xHeight = 0;
-      fm->GetXHeight (xHeight);
+      nscoord xHeight = fm->XHeight();
       numShift += xHeight / 2;
       denShift += xHeight / 4;
     }
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index f01084f136e6..e9aa36c46e03 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -164,8 +164,7 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
                             PresContext()->GetUserFontSet());
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord xHeight;
-  fm->GetXHeight (xHeight);
+  nscoord xHeight = fm->XHeight();
 
   nscoord ruleSize;
   GetRuleThickness (aRenderingContext, fm, ruleSize);
diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp
index 2c8b25c9aa10..092eb2bc3b11 100644
--- a/layout/mathml/nsMathMLmoFrame.cpp
+++ b/layout/mathml/nsMathMLmoFrame.cpp
@@ -854,9 +854,8 @@ nsMathMLmoFrame::Stretch(nsRenderingContext& aRenderingContext,
     firstChild->SetPosition(firstChild->GetPosition() - nsPoint(0, dy));
   }
   else if (useMathMLChar) {
-    nscoord ascent, descent;
-    fm->GetMaxAscent(ascent);
-    fm->GetMaxDescent(descent);
+    nscoord ascent = fm->MaxAscent();
+    nscoord descent = fm->MaxDescent();
     aDesiredStretchSize.ascent = NS_MAX(mBoundingMetrics.ascent + leading, ascent);
     aDesiredStretchSize.height = aDesiredStretchSize.ascent +
                                  NS_MAX(mBoundingMetrics.descent + leading, descent);
diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp
index c7440eedf8b8..bd17ce17bb7d 100644
--- a/layout/mathml/nsMathMLmoverFrame.cpp
+++ b/layout/mathml/nsMathMLmoverFrame.cpp
@@ -285,8 +285,7 @@ nsMathMLmoverFrame::Place(nsRenderingContext& aRenderingContext,
                             PresContext()->GetUserFontSet());
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord xHeight = 0;
-  fm->GetXHeight (xHeight);
+  nscoord xHeight = fm->XHeight();
 
   nscoord ruleThickness;
   GetRuleThickness (aRenderingContext, fm, ruleThickness);
diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp
index 2851f98cf385..aa4e9449fb5a 100644
--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@@ -161,8 +161,7 @@ GetRadicalXOffsets(nscoord aIndexWidth, nscoord aSqrWidth,
   // The index is tucked in closer to the radical while making sure
   // that the kern does not make the index and radical collide
   nscoord dxIndex, dxSqr;
-  nscoord xHeight = 0;
-  aFontMetrics->GetXHeight(xHeight);
+  nscoord xHeight = aFontMetrics->XHeight();
   nscoord indexRadicalKern = NSToCoordRound(1.35f * xHeight);
   if (indexRadicalKern > aIndexWidth) {
     dxIndex = indexRadicalKern - aIndexWidth;
@@ -281,7 +280,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
   // psi = clearance between rule and content
   nscoord phi = 0, psi = 0;
   if (NS_MATHML_IS_DISPLAYSTYLE(mPresentationData.flags))
-    fm->GetXHeight(phi);
+    phi = fm->XHeight();
   else
     phi = ruleThickness;
   psi = ruleThickness + phi/4;
diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp
index 6a6e4e42c00b..fa7ae42b438a 100644
--- a/layout/mathml/nsMathMLmsubFrame.cpp
+++ b/layout/mathml/nsMathMLmsubFrame.cpp
@@ -156,7 +156,7 @@ nsMathMLmsubFrame::PlaceSubScript (nsPresContext*      aPresContext,
   nsRefPtr<nsFontMetrics> fm =
     aPresContext->GetMetricsFor(baseFrame->GetStyleFont()->mFont);
 
-  fm->GetXHeight (xHeight);
+  xHeight = fm->XHeight();
   nscoord minShiftFromXHeight = (nscoord) 
     (bmSubScript.ascent - (4.0f/5.0f) * xHeight);
 
diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp
index 834b8beb1eb3..46abdc4bda89 100644
--- a/layout/mathml/nsMathMLmsubsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsubsupFrame.cpp
@@ -198,8 +198,7 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
   // get x-height (an ex)
-  nscoord xHeight;
-  fm->GetXHeight (xHeight);
+  nscoord xHeight = fm->XHeight();
 
   nscoord ruleSize;
   GetRuleThickness (aRenderingContext, fm, ruleSize);
diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp
index a0c10353b393..3d1b9ea814ac 100644
--- a/layout/mathml/nsMathMLmsupFrame.cpp
+++ b/layout/mathml/nsMathMLmsupFrame.cpp
@@ -157,7 +157,7 @@ nsMathMLmsupFrame::PlaceSuperScript(nsPresContext*      aPresContext,
   nsRefPtr<nsFontMetrics> fm =
     aPresContext->GetMetricsFor(baseFrame->GetStyleFont()->mFont);
 
-  fm->GetXHeight (xHeight);
+  xHeight = fm->XHeight();
   nscoord minShiftFromXHeight = (nscoord) 
     (bmSupScript.descent + (1.0f/4.0f) * xHeight);
   nscoord italicCorrection;
diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index d629fa4591dc..793f08acb703 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -282,8 +282,7 @@ nsMathMLmunderFrame::Place(nsRenderingContext& aRenderingContext,
                             PresContext()->GetUserFontSet());
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord xHeight = 0;
-  fm->GetXHeight (xHeight);
+  nscoord xHeight = fm->XHeight();
 
   nscoord ruleThickness;
   GetRuleThickness (aRenderingContext, fm, ruleThickness);
diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp
index 6e377b0481dc..5019bdd7d28e 100644
--- a/layout/mathml/nsMathMLmunderoverFrame.cpp
+++ b/layout/mathml/nsMathMLmunderoverFrame.cpp
@@ -324,8 +324,7 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
                             PresContext()->GetUserFontSet());
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord xHeight = 0;
-  fm->GetXHeight (xHeight);
+  nscoord xHeight = fm->XHeight();
 
   nscoord ruleThickness;
   GetRuleThickness (aRenderingContext, fm, ruleThickness);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 2a973d833b58..61364c209234 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -310,9 +310,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue,
       font.size = aFontSize;
       nsRefPtr<nsFontMetrics> fm =
         aPresContext->GetMetricsFor(font, aUseUserFontSet);
-      nscoord xHeight;
-      fm->GetXHeight(xHeight);
-      return ScaleCoord(aValue, float(xHeight));
+      return ScaleCoord(aValue, float(fm->XHeight()));
     }
     case eCSSUnit_Char: {
       nsFont font = styleFont->mFont;
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index fd1d95e0b6eb..e076d77b477c 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -297,8 +297,7 @@ nsSVGUtils::GetFontXHeight(nsStyleContext *aStyleContext)
     return 1.0f;
   }
 
-  nscoord xHeight;
-  fontMetrics->GetXHeight(xHeight);
+  nscoord xHeight = fontMetrics->XHeight();
   return nsPresContext::AppUnitsToFloatCSSPixels(xHeight) /
          presContext->TextZoom();
 }
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index e47546df0a9a..30c197c7300a 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -227,7 +227,7 @@ nsListBoxBodyFrame::Init(nsIContent*     aContent,
   }
   nsRefPtr<nsFontMetrics> fm;
   nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm));
-  fm->GetMaxHeight(mRowHeight);
+  mRowHeight = fm->MaxHeight();
 
   return rv;
 }
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index af32ec3e6c94..2f7dcc03e67b 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -481,8 +481,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
 
     nscoord offset;
     nscoord size;
-    nscoord ascent;
-    fontMet->GetMaxAscent(ascent);
+    nscoord ascent = fontMet->MaxAscent();
 
     nscoord baseline =
       presContext->RoundAppUnitsToNearestDevPixels(aTextRect.y + ascent);
@@ -657,7 +656,7 @@ nsTextBoxFrame::CalculateUnderline(nsRenderingContext& aRenderingContext)
          nscoord offset, baseline;
          nsFontMetrics* metrics = aRenderingContext.FontMetrics();
          metrics->GetUnderline(offset, mAccessKeyInfo->mAccessUnderlineSize);
-         metrics->GetMaxAscent(baseline);
+         baseline = metrics->MaxAscent();
          mAccessKeyInfo->mAccessOffset = baseline - offset;
     }
 }
@@ -996,16 +995,19 @@ nsTextBoxFrame::MarkIntrinsicWidthsDirty()
 }
 
 void
-nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext, nsRenderingContext& aRenderingContext,
-                                const nsString& aString, nsSize& aSize, nscoord& aAscent)
+nsTextBoxFrame::GetTextSize(nsPresContext* aPresContext,
+                            nsRenderingContext& aRenderingContext,
+                            const nsString& aString,
+                            nsSize& aSize, nscoord& aAscent)
 {
     nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
-    fontMet->GetMaxHeight(aSize.height);
+    aSize.height = fontMet->MaxHeight();
     aRenderingContext.SetFont(fontMet);
     aSize.width =
-      nsLayoutUtils::GetStringWidth(this, &aRenderingContext, aString.get(), aString.Length());
-    fontMet->GetMaxAscent(aAscent);
+      nsLayoutUtils::GetStringWidth(this, &aRenderingContext,
+                                    aString.get(), aString.Length());
+    aAscent = fontMet->MaxAscent();
 }
 
 void
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 2c3d8f78b2d2..765ac9d7b441 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1264,8 +1264,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, nsITreeColumn* aCol, const n
     nsRefPtr<nsFontMetrics> fm;
     nsLayoutUtils::GetFontMetricsForStyleContext(textContext,
                                                  getter_AddRefs(fm));
-    nscoord height;
-    fm->GetMaxHeight(height);
+    nscoord height = fm->MaxHeight();
 
     nsMargin textMargin;
     textContext->GetStyleMargin()->GetMargin(textMargin);
@@ -3572,9 +3571,8 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
   nsLayoutUtils::GetFontMetricsForStyleContext(textContext,
                                                getter_AddRefs(fontMet));
 
-  nscoord height, baseline;
-  fontMet->GetMaxHeight(height);
-  fontMet->GetMaxAscent(baseline);
+  nscoord height = fontMet->MaxHeight();
+  nscoord baseline = fontMet->MaxAscent();
 
   // Center the text. XXX Obey vertical-align style prop?
   if (height < textRect.height) {

From d856f0c057b8c21a9d26a098581808a2ee0faffb Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Fri, 8 Apr 2011 08:32:29 -0700
Subject: [PATCH 154/509] Bug 174055, part 7: remove unnecessary members from
 nsFontMetrics.

---
 gfx/src/nsFontMetrics.cpp       | 34 ++++++++++++++++-----------------
 gfx/src/nsFontMetrics.h         | 12 +++---------
 gfx/src/nsRenderingContext.cpp  |  8 +-------
 gfx/src/nsRenderingContext.h    |  1 -
 layout/base/nsBidiPresUtils.cpp |  2 +-
 5 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index 2807254c0ee5..39c7f8d249f9 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -67,7 +67,7 @@ public:
 private:
     static PRUint32 ComputeFlags(nsFontMetrics* aMetrics) {
         PRUint32 flags = 0;
-        if (aMetrics->GetRightToLeftTextRunMode()) {
+        if (aMetrics->GetTextRunRTL()) {
             flags |= gfxTextRunFactory::TEXT_IS_RTL;
         }
         return flags;
@@ -93,16 +93,14 @@ public:
 } // anon namespace
 
 nsFontMetrics::nsFontMetrics()
+    : mDeviceContext(nsnull), mP2A(-1), mTextRunRTL(PR_FALSE)
 {
-    mFontStyle = nsnull;
-    mFontGroup = nsnull;
 }
 
 nsFontMetrics::~nsFontMetrics()
 {
     if (mDeviceContext)
         mDeviceContext->FontMetricsDeleted(this);
-    delete mFontStyle;
 }
 
 nsresult
@@ -110,26 +108,26 @@ nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
                     nsIDeviceContext *aContext,
                     gfxUserFontSet *aUserFontSet)
 {
+    NS_ABORT_IF_FALSE(mP2A == -1, "already initialized");
+
     mFont = aFont;
     mLanguage = aLanguage;
     mDeviceContext = (nsThebesDeviceContext*)aContext;
     mP2A = mDeviceContext->AppUnitsPerDevPixel();
-    mIsRightToLeft = PR_FALSE;
-    mTextRunRTL = PR_FALSE;
 
-    gfxFloat size = gfxFloat(aFont.size) / mP2A;
+    gfxFontStyle style(aFont.style,
+                       aFont.weight,
+                       aFont.stretch,
+                       gfxFloat(aFont.size) / mP2A,
+                       aLanguage,
+                       aFont.sizeAdjust,
+                       aFont.systemFont,
+                       mDeviceContext->IsPrinterSurface(),
+                       aFont.featureSettings,
+                       aFont.languageOverride);
 
-    PRBool printerFont = mDeviceContext->IsPrinterSurface();
-    mFontStyle = new gfxFontStyle(aFont.style, aFont.weight, aFont.stretch,
-                                  size, aLanguage,
-                                  aFont.sizeAdjust, aFont.systemFont,
-                                  printerFont,
-                                  aFont.featureSettings,
-                                  aFont.languageOverride);
-
-    mFontGroup =
-        gfxPlatform::GetPlatform()->CreateFontGroup(aFont.name, mFontStyle,
-                                                    aUserFontSet);
+    mFontGroup = gfxPlatform::GetPlatform()->
+        CreateFontGroup(aFont.name, &style, aUserFontSet);
     if (mFontGroup->FontListLength() < 1)
         return NS_ERROR_UNEXPECTED;
 
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
index 17ba2dbea438..772cb5187fb0 100644
--- a/gfx/src/nsFontMetrics.h
+++ b/gfx/src/nsFontMetrics.h
@@ -224,12 +224,8 @@ public:
                                          nsRenderingContext *aContext);
 #endif /* MOZ_MATHML */
 
-    // Set the direction of the text rendering
-    void SetRightToLeftText(PRBool aIsRTL) { mIsRightToLeft = aIsRTL; }
-    PRBool GetRightToLeftText() { return mIsRightToLeft; }
-
     void SetTextRunRTL(PRBool aIsRTL) { mTextRunRTL = aIsRTL; }
-    PRBool GetRightToLeftTextRunMode() { return mTextRunRTL; }
+    PRBool GetTextRunRTL() { return mTextRunRTL; }
 
     gfxFontGroup* GetThebesFontGroup() { return mFontGroup; }
     gfxUserFontSet* GetUserFontSet() { return mFontGroup->GetUserFontSet(); }
@@ -239,13 +235,11 @@ public:
 protected:
     const gfxFont::Metrics& GetMetrics() const;
 
-    nsFont mFont;		// The font for this metrics object.
+    nsFont mFont;
     nsRefPtr<gfxFontGroup> mFontGroup;
-    gfxFontStyle *mFontStyle;
-    nsThebesDeviceContext *mDeviceContext;
     nsCOMPtr<nsIAtom> mLanguage;
+    nsThebesDeviceContext *mDeviceContext;
     PRInt32 mP2A;
-    PRPackedBool mIsRightToLeft;
     PRPackedBool mTextRunRTL;
 };
 
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 4418a2748a31..558d537dafa3 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -448,12 +448,6 @@ nsRenderingContext::FillPolygon(const nsPoint twPoints[], PRInt32 aNumPoints)
 // text
 //
 
-void
-nsRenderingContext::SetRightToLeftText(PRBool aIsRTL)
-{
-    mFontMetrics->SetRightToLeftText(aIsRTL);
-}
-
 void
 nsRenderingContext::SetTextRunRTL(PRBool aIsRTL)
 {
@@ -607,7 +601,7 @@ nsRenderingContext::DrawString(const PRUnichar *aString, PRUint32 aLength,
         return;
     }
 
-    PRBool isRTL = mFontMetrics->GetRightToLeftText();
+    PRBool isRTL = mFontMetrics->GetTextRunRTL();
 
     // If we're drawing right to left, we must start at the end.
     if (isRTL) {
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 85b790428728..ba91ee5a70fe 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -123,7 +123,6 @@ public:
     void SetFont(nsFontMetrics *aFontMetrics);
     nsFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
 
-    void SetRightToLeftText(PRBool aIsRTL);
     void SetTextRunRTL(PRBool aIsRTL);
 
     nscoord GetWidth(char aC);
diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index 8bf0176cf991..5a0d7a57f9ed 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -1764,7 +1764,7 @@ public:
 
   ~nsIRenderingContextBidiProcessor()
   {
-    mCtx->SetRightToLeftText(PR_FALSE);
+    mCtx->SetTextRunRTL(PR_FALSE);
   }
 
   virtual void SetText(const PRUnichar* aText,

From 83940d7a6e5342d179719dcba26343bcbb45978c Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 18 Apr 2011 15:44:11 +0200
Subject: [PATCH 155/509] Better fix for build bustage from patch for bug
 603844.

--HG--
extra : rebase_source : 39bcb6558ecd109c67166ea836b241a8215b7164
---
 content/xslt/src/xslt/txMozillaXSLTProcessor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
index 9e713cec63ad..466194758d32 100644
--- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -155,7 +155,9 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
         }
     }
 
-    return NS_OK;
+    NS_RUNTIMEABORT("Unknown output method");
+
+    return NS_ERROR_FAILURE;
 }
 
 nsresult
@@ -203,7 +205,9 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
         }
     }
 
-    return NS_OK;
+    NS_RUNTIMEABORT("Unknown output method");
+
+    return NS_ERROR_FAILURE;
 }
 
 nsresult

From 9387753e15089b070ddf55bc569269e83c45ca53 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Fri, 8 Apr 2011 10:50:51 -0700
Subject: [PATCH 156/509] Fix for bug 649534 (Remove nsIXSLTProcessorObsolete).
 r=sicking.

--HG--
extra : rebase_source : 48d37254b6f50ac74b285fb0f765c159877e7d03
---
 content/xslt/public/Makefile.in               |  1 -
 .../xslt/public/nsIXSLTProcessorObsolete.idl  | 57 -----------------
 content/xslt/src/xslt/txMozillaTextOutput.cpp | 34 ++++-------
 content/xslt/src/xslt/txMozillaTextOutput.h   |  3 +-
 content/xslt/src/xslt/txMozillaXMLOutput.cpp  | 42 ++++++-------
 content/xslt/src/xslt/txMozillaXMLOutput.h    |  3 +-
 .../xslt/src/xslt/txMozillaXSLTProcessor.cpp  | 61 +++----------------
 .../xslt/src/xslt/txMozillaXSLTProcessor.h    |  8 +--
 content/xslt/tests/XSLTMark/XSLTMark-test.js  |  6 +-
 dom/base/nsDOMClassInfo.cpp                   |  2 -
 10 files changed, 45 insertions(+), 172 deletions(-)
 delete mode 100644 content/xslt/public/nsIXSLTProcessorObsolete.idl

diff --git a/content/xslt/public/Makefile.in b/content/xslt/public/Makefile.in
index ce945e48c1d7..3df73af0da48 100644
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@@ -53,7 +53,6 @@ EXPORTS		= \
 XPIDLSRCS	= \
 		nsIXSLTException.idl  \
 		nsIXSLTProcessor.idl  \
-		nsIXSLTProcessorObsolete.idl  \
 		nsIXSLTProcessorPrivate.idl  \
 		txIFunctionEvaluationContext.idl  \
 		txINodeSet.idl  \
diff --git a/content/xslt/public/nsIXSLTProcessorObsolete.idl b/content/xslt/public/nsIXSLTProcessorObsolete.idl
deleted file mode 100644
index 9de50555991b..000000000000
--- a/content/xslt/public/nsIXSLTProcessorObsolete.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Nisheeth Ranjan <nisheeth@netscape.com> (original author)
- *   Peter Van der Beken <peterv@netscape.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIDOMNode;
-interface nsIDOMDocument;
-
-/**
- * @deprecated Use nsIXSLTProcessor instead!!
- */
-
-[deprecated, scriptable, uuid(3fbff728-2d20-11d3-aef3-00108300ff91)]
-interface nsIXSLTProcessorObsolete : nsISupports
-{
-    void transformDocument(in nsIDOMNode aSourceDOM,
-                           in nsIDOMNode aStyleDOM,
-                           in nsIDOMDocument aOutputDOC,
-                           in nsISupports aObserver);
-};
diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/content/xslt/src/xslt/txMozillaTextOutput.cpp
index 92bfa614d038..189d4936302b 100644
--- a/content/xslt/src/xslt/txMozillaTextOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaTextOutput.cpp
@@ -150,11 +150,8 @@ txMozillaTextOutput::startDocument()
 }
 
 nsresult
-txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
-                                          nsIDOMDocument* aResultDocument)
+txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument)
 {
-    nsresult rv = NS_OK;
-
     /*
      * Create an XHTML document to hold the text.
      *
@@ -171,21 +168,16 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
      * <transformiix:result> * The text comes here * </transformiix:result>
      */
 
-    if (!aResultDocument) {
-        // Create the document
-        rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
-        NS_ENSURE_SUCCESS(rv, rv);
-        nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
-        NS_ENSURE_STATE(source);
-        PRBool hasHadScriptObject = PR_FALSE;
-        nsIScriptGlobalObject* sgo =
-          source->GetScriptHandlingObject(hasHadScriptObject);
-        NS_ENSURE_STATE(sgo || !hasHadScriptObject);
-        mDocument->SetScriptHandlingObject(sgo);
-    }
-    else {
-        mDocument = do_QueryInterface(aResultDocument);
-    }
+    // Create the document
+    nsresult rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
+    NS_ENSURE_STATE(source);
+    PRBool hasHadScriptObject = PR_FALSE;
+    nsIScriptGlobalObject* sgo =
+      source->GetScriptHandlingObject(hasHadScriptObject);
+    NS_ENSURE_STATE(sgo || !hasHadScriptObject);
+    mDocument->SetScriptHandlingObject(sgo);
 
     NS_ASSERTION(mDocument, "Need document");
 
@@ -217,9 +209,7 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
 
     // When transforming into a non-displayed document (i.e. when there is no
     // observer) we only create a transformiix:result root element.
-    // Don't do this when called through nsIXSLTProcessorObsolete (i.e. when
-    // aResultDocument is set) for compability reasons
-    if (!aResultDocument && !observer) {
+    if (!observer) {
         PRInt32 namespaceID;
         rv = nsContentUtils::NameSpaceManager()->
             RegisterNameSpace(NS_LITERAL_STRING(kTXNameSpaceURI), namespaceID);
diff --git a/content/xslt/src/xslt/txMozillaTextOutput.h b/content/xslt/src/xslt/txMozillaTextOutput.h
index 4b311f6092ea..b124fc01906b 100644
--- a/content/xslt/src/xslt/txMozillaTextOutput.h
+++ b/content/xslt/src/xslt/txMozillaTextOutput.h
@@ -61,8 +61,7 @@ public:
     TX_DECL_TXAXMLEVENTHANDLER
     TX_DECL_TXAOUTPUTXMLEVENTHANDLER
 
-    nsresult createResultDocument(nsIDOMDocument* aSourceDocument,
-                                  nsIDOMDocument* aResultDocument);
+    nsresult createResultDocument(nsIDOMDocument* aSourceDocument);
 
 private:
     nsresult createXHTMLElement(nsIAtom* aName, nsIContent** aResult);
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index cd60dc5aeb0a..6108c664a8e1 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -821,36 +821,30 @@ void txMozillaXMLOutput::processHTTPEquiv(nsIAtom* aHeader, const nsString& aVal
 
 nsresult
 txMozillaXMLOutput::createResultDocument(const nsSubstring& aName, PRInt32 aNsID,
-                                         nsIDOMDocument* aSourceDocument,
-                                         nsIDOMDocument* aResultDocument)
+                                         nsIDOMDocument* aSourceDocument)
 {
     nsresult rv;
 
-    if (!aResultDocument) {
-        // Create the document
-        if (mOutputFormat.mMethod == eHTMLOutput) {
-            rv = NS_NewHTMLDocument(getter_AddRefs(mDocument));
-            NS_ENSURE_SUCCESS(rv, rv);
-        }
-        else {
-            // We should check the root name/namespace here and create the
-            // appropriate document
-            rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
-            NS_ENSURE_SUCCESS(rv, rv);
-        }
-        // This should really be handled by nsIDocument::BeginLoad
-        mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_LOADING);
-        nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
-        NS_ENSURE_STATE(source);
-        PRBool hasHadScriptObject = PR_FALSE;
-        nsIScriptGlobalObject* sgo =
-          source->GetScriptHandlingObject(hasHadScriptObject);
-        NS_ENSURE_STATE(sgo || !hasHadScriptObject);
-        mDocument->SetScriptHandlingObject(sgo);
+    // Create the document
+    if (mOutputFormat.mMethod == eHTMLOutput) {
+        rv = NS_NewHTMLDocument(getter_AddRefs(mDocument));
+        NS_ENSURE_SUCCESS(rv, rv);
     }
     else {
-        mDocument = do_QueryInterface(aResultDocument);
+        // We should check the root name/namespace here and create the
+        // appropriate document
+        rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
+        NS_ENSURE_SUCCESS(rv, rv);
     }
+    // This should really be handled by nsIDocument::BeginLoad
+    mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_LOADING);
+    nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
+    NS_ENSURE_STATE(source);
+    PRBool hasHadScriptObject = PR_FALSE;
+    nsIScriptGlobalObject* sgo =
+      source->GetScriptHandlingObject(hasHadScriptObject);
+    NS_ENSURE_STATE(sgo || !hasHadScriptObject);
+    mDocument->SetScriptHandlingObject(sgo);
 
     mCurrentNode = mDocument;
     mNodeInfoManager = mDocument->NodeInfoManager();
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.h b/content/xslt/src/xslt/txMozillaXMLOutput.h
index 1c563d07bf34..3168519db252 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.h
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.h
@@ -106,8 +106,7 @@ public:
     nsresult closePrevious(PRBool aFlushText);
 
     nsresult createResultDocument(const nsSubstring& aName, PRInt32 aNsID,
-                                  nsIDOMDocument* aSourceDocument,
-                                  nsIDOMDocument* aResultDocument);
+                                  nsIDOMDocument* aSourceDocument);
 
 private:
     nsresult createTxWrapper();
diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
index 466194758d32..210ea3c51aec 100644
--- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -81,10 +81,8 @@ class txToDocHandlerFactory : public txAOutputHandlerFactory
 public:
     txToDocHandlerFactory(txExecutionState* aEs,
                           nsIDOMDocument* aSourceDocument,
-                          nsIDOMDocument* aResultDocument,
                           nsITransformObserver* aObserver)
-        : mEs(aEs), mSourceDocument(aSourceDocument),
-          mResultDocument(aResultDocument), mObserver(aObserver)
+        : mEs(aEs), mSourceDocument(aSourceDocument), mObserver(aObserver)
     {
     }
 
@@ -93,7 +91,6 @@ public:
 private:
     txExecutionState* mEs;
     nsCOMPtr<nsIDOMDocument> mSourceDocument;
-    nsCOMPtr<nsIDOMDocument> mResultDocument;
     nsCOMPtr<nsITransformObserver> mObserver;
 };
 
@@ -131,8 +128,7 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
 
             nsresult rv = handler->createResultDocument(EmptyString(),
                                                         kNameSpaceID_None,
-                                                        mSourceDocument,
-                                                        mResultDocument);
+                                                        mSourceDocument);
             if (NS_SUCCEEDED(rv)) {
                 *aHandler = handler.forget();
             }
@@ -145,8 +141,7 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
             nsAutoPtr<txMozillaTextOutput> handler(
                 new txMozillaTextOutput(mObserver));
 
-            nsresult rv = handler->createResultDocument(mSourceDocument,
-                                                        mResultDocument);
+            nsresult rv = handler->createResultDocument(mSourceDocument);
             if (NS_SUCCEEDED(rv)) {
                 *aHandler = handler.forget();
             }
@@ -181,8 +176,7 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
                 new txMozillaXMLOutput(aFormat, mObserver));
 
             nsresult rv = handler->createResultDocument(aName, aNsID,
-                                                        mSourceDocument,
-                                                        mResultDocument);
+                                                        mSourceDocument);
             if (NS_SUCCEEDED(rv)) {
                 *aHandler = handler.forget();
             }
@@ -195,8 +189,7 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
             nsAutoPtr<txMozillaTextOutput> handler(
                 new txMozillaTextOutput(mObserver));
 
-            nsresult rv = handler->createResultDocument(mSourceDocument,
-                                                        mResultDocument);
+            nsresult rv = handler->createResultDocument(mSourceDocument);
             if (NS_SUCCEEDED(rv)) {
                 *aHandler = handler.forget();
             }
@@ -348,7 +341,6 @@ DOMCI_DATA(XSLTProcessor, txMozillaXSLTProcessor)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(txMozillaXSLTProcessor)
     NS_INTERFACE_MAP_ENTRY(nsIXSLTProcessor)
-    NS_INTERFACE_MAP_ENTRY(nsIXSLTProcessorObsolete)
     NS_INTERFACE_MAP_ENTRY(nsIXSLTProcessorPrivate)
     NS_INTERFACE_MAP_ENTRY(nsIDocumentTransformer)
     NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
@@ -371,39 +363,6 @@ txMozillaXSLTProcessor::~txMozillaXSLTProcessor()
     }
 }
 
-NS_IMETHODIMP
-txMozillaXSLTProcessor::TransformDocument(nsIDOMNode* aSourceDOM,
-                                          nsIDOMNode* aStyleDOM,
-                                          nsIDOMDocument* aOutputDoc,
-                                          nsISupports* aObserver)
-{
-    NS_ENSURE_ARG(aSourceDOM);
-    NS_ENSURE_ARG(aStyleDOM);
-    NS_ENSURE_ARG(aOutputDoc);
-    NS_ENSURE_FALSE(aObserver, NS_ERROR_NOT_IMPLEMENTED);
-
-    if (!nsContentUtils::CanCallerAccess(aSourceDOM) ||
-        !nsContentUtils::CanCallerAccess(aStyleDOM) ||
-        !nsContentUtils::CanCallerAccess(aOutputDoc)) {
-        return NS_ERROR_DOM_SECURITY_ERR;
-    }
-
-    PRUint16 type = 0;
-    aStyleDOM->GetNodeType(&type);
-    NS_ENSURE_TRUE(type == nsIDOMNode::ELEMENT_NODE ||
-                   type == nsIDOMNode::DOCUMENT_NODE,
-                   NS_ERROR_INVALID_ARG);
-
-    nsCOMPtr<nsINode> styleNode = do_QueryInterface(aStyleDOM);
-    nsresult rv = TX_CompileStylesheet(styleNode, this, mPrincipal,
-                                       getter_AddRefs(mStylesheet));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mSource = aSourceDOM;
-
-    return TransformToDoc(aOutputDoc, nsnull);
-}
-
 NS_IMETHODIMP
 txMozillaXSLTProcessor::SetTransformObserver(nsITransformObserver* aObserver)
 {
@@ -596,7 +555,7 @@ public:
 
   NS_IMETHOD Run()
   {
-    mProcessor->TransformToDoc(nsnull, nsnull);
+    mProcessor->TransformToDoc(nsnull);
     return NS_OK;
   }
 };
@@ -686,12 +645,11 @@ txMozillaXSLTProcessor::TransformToDocument(nsIDOMNode *aSource,
 
     mSource = aSource;
 
-    return TransformToDoc(nsnull, aResult);
+    return TransformToDoc(aResult);
 }
 
 nsresult
-txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument *aOutputDoc,
-                                       nsIDOMDocument **aResult)
+txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument **aResult)
 {
     nsAutoPtr<txXPathNode> sourceNode(txXPathNativeNode::createXPathNode(mSource));
     if (!sourceNode) {
@@ -708,8 +666,7 @@ txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument *aOutputDoc,
 
     // XXX Need to add error observers
 
-    txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, aOutputDoc,
-                                         mObserver);
+    txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, mObserver);
     es.mOutputHandlerFactory = &handlerFactory;
 
     nsresult rv = es.init(*sourceNode, &mVariables);
diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.h b/content/xslt/src/xslt/txMozillaXSLTProcessor.h
index d7b8205f926c..33e34c3e922f 100644
--- a/content/xslt/src/xslt/txMozillaXSLTProcessor.h
+++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.h
@@ -43,7 +43,6 @@
 #include "nsStubMutationObserver.h"
 #include "nsIDocumentTransformer.h"
 #include "nsIXSLTProcessor.h"
-#include "nsIXSLTProcessorObsolete.h"
 #include "nsIXSLTProcessorPrivate.h"
 #include "txExpandedNameMap.h"
 #include "txNamespaceMap.h"
@@ -71,7 +70,6 @@ class txIGlobalParameter;
  * txMozillaXSLTProcessor is a front-end to the XSLT Processor.
  */
 class txMozillaXSLTProcessor : public nsIXSLTProcessor,
-                               public nsIXSLTProcessorObsolete,
                                public nsIXSLTProcessorPrivate,
                                public nsIDocumentTransformer,
                                public nsStubMutationObserver,
@@ -96,9 +94,6 @@ public:
     // nsIXSLTProcessor interface
     NS_DECL_NSIXSLTPROCESSOR
 
-    // nsIXSLTProcessorObsolete interface
-    NS_DECL_NSIXSLTPROCESSOROBSOLETE
-
     // nsIXSLTProcessorPrivate interface
     NS_DECL_NSIXSLTPROCESSORPRIVATE
 
@@ -133,8 +128,7 @@ public:
         return mSource;
     }
 
-    nsresult TransformToDoc(nsIDOMDocument *aOutputDoc,
-                            nsIDOMDocument **aResult);
+    nsresult TransformToDoc(nsIDOMDocument **aResult);
 
     PRBool IsLoadDisabled()
     {
diff --git a/content/xslt/tests/XSLTMark/XSLTMark-test.js b/content/xslt/tests/XSLTMark/XSLTMark-test.js
index 47eb058e7099..93a12080a702 100644
--- a/content/xslt/tests/XSLTMark/XSLTMark-test.js
+++ b/content/xslt/tests/XSLTMark/XSLTMark-test.js
@@ -37,7 +37,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 var gParser = new DOMParser;
-var gProc = new XSLTProcessor;
 var gTimeout;
 
 function Test(aTitle, aSourceURL, aStyleURL, aNumber, aObserver)
@@ -61,9 +60,10 @@ function runTest(aTitle, aSourceURL, aStyleURL, aNumber, aObserver)
 
 function onNextTransform(aTest, aNumber)
 {
-    res = document.implementation.createDocument('', '', null);
+    var proc = new XSLTProcessor;
     var startTime = Date.now();
-    gProc.transformDocument(aTest.mSource, aTest.mStyle, res, null);
+    proc.importStylesheet(aTest.mStyle);
+    var res = proc.transformToDocument(aTest.mSource);
     var endTime = Date.now();
     aNumber++;
     var progress = aNumber / aTest.mTotal * 100;
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index a2d4ddd88256..e8fee69e165a 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -202,7 +202,6 @@
 // Tranformiix
 #include "nsIDOMXPathEvaluator.h"
 #include "nsIXSLTProcessor.h"
-#include "nsIXSLTProcessorObsolete.h"
 #include "nsIXSLTProcessorPrivate.h"
 
 #include "nsIDOMLSProgressEvent.h"
@@ -3798,7 +3797,6 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(XSLTProcessor, nsIXSLTProcessor)
     DOM_CLASSINFO_MAP_ENTRY(nsIXSLTProcessor)
-    DOM_CLASSINFO_MAP_ENTRY(nsIXSLTProcessorObsolete) // XXX DEPRECATED
     DOM_CLASSINFO_MAP_ENTRY(nsIXSLTProcessorPrivate)
   DOM_CLASSINFO_MAP_END
 

From bc33835bc58ee09dcb4c1fe33f3afe93da6c2104 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 8 Apr 2011 14:21:08 -0700
Subject: [PATCH 157/509] Bug 648647 - Eliminate JSObjectMap (r=jorendorff)

---
 .../testRegExpInstanceProperties.cpp          |   2 +
 js/src/jsapi-tests/testStringBuffer.cpp       |   1 +
 js/src/jsapi.cpp                              |  10 +-
 js/src/jsapi.h                                |   3 +
 js/src/jsarray.cpp                            |   2 +-
 js/src/jsfun.cpp                              |   2 +-
 js/src/jsgcinlines.h                          |   4 +-
 js/src/jsgcmark.cpp                           |   4 +-
 js/src/jsobj.cpp                              |   2 +-
 js/src/jsobj.h                                |  79 ++------
 js/src/jsobjinlines.h                         | 170 +++++++++++++++++-
 js/src/jsscope.h                              | 141 ++-------------
 js/src/jsscopeinlines.h                       |  78 +++++++-
 js/src/methodjit/Compiler.cpp                 |  16 +-
 js/src/methodjit/MonoIC.cpp                   |   6 +-
 js/src/methodjit/PolyIC.cpp                   |   4 +-
 js/src/xpconnect/src/xpcdebug.cpp             |   4 +-
 17 files changed, 301 insertions(+), 227 deletions(-)

diff --git a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
index b94361a87f52..7e183b5aadd8 100644
--- a/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
+++ b/js/src/jsapi-tests/testRegExpInstanceProperties.cpp
@@ -8,6 +8,8 @@
 #include "jsgc.h"
 #include "jsscope.h"
 
+#include "jsscopeinlines.h"
+
 BEGIN_TEST(testRegExpInstanceProperties)
 {
     jsval regexpProtoVal;
diff --git a/js/src/jsapi-tests/testStringBuffer.cpp b/js/src/jsapi-tests/testStringBuffer.cpp
index 090d28e5db5d..a70296007de4 100644
--- a/js/src/jsapi-tests/testStringBuffer.cpp
+++ b/js/src/jsapi-tests/testStringBuffer.cpp
@@ -6,6 +6,7 @@
 
 #include "jsatom.h"
 
+#include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
 BEGIN_TEST(testStringBuffer_finishString)
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 08d8d365710a..3a82b2cd1b6e 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2990,7 +2990,7 @@ JS_GetPrototype(JSContext *cx, JSObject *obj)
     proto = obj->getProto();
 
     /* Beware ref to dead object (we may be called from obj's finalizer). */
-    return proto && proto->map ? proto : NULL;
+    return proto && !proto->isNewborn() ? proto : NULL;
 }
 
 JS_PUBLIC_API(JSBool)
@@ -3008,7 +3008,7 @@ JS_GetParent(JSContext *cx, JSObject *obj)
     JSObject *parent = obj->getParent();
 
     /* Beware ref to dead object (we may be called from obj's finalizer). */
-    return parent && parent->map ? parent : NULL;
+    return parent && !parent->isNewborn() ? parent : NULL;
 }
 
 JS_PUBLIC_API(JSBool)
@@ -3166,6 +3166,12 @@ JS_IsExtensible(JSObject *obj)
     return obj->isExtensible();
 }
 
+JS_PUBLIC_API(JSBool)
+JS_IsNative(JSObject *obj)
+{
+    return obj->isNative();
+}
+
 JS_PUBLIC_API(JSBool)
 JS_FreezeObject(JSContext *cx, JSObject *obj)
 {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 404e82c66813..7f8bb9566af6 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2181,6 +2181,9 @@ JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
 extern JS_PUBLIC_API(JSBool)
 JS_IsExtensible(JSObject *obj);
 
+extern JS_PUBLIC_API(JSBool)
+JS_IsNative(JSObject *obj);
+
 /*
  * Unlike JS_NewObject, JS_NewObjectWithGivenProto does not compute a default
  * proto if proto's actual parameter value is null.
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 9fa86e067f26..4e7d133d9403 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1058,7 +1058,7 @@ JSObject::makeDenseArraySlow(JSContext *cx)
      * Save old map now, before calling InitScopeForObject. We'll have to undo
      * on error. This is gross, but a better way is not obvious.
      */
-    JSObjectMap *oldMap = map;
+    js::Shape *oldMap = lastProp;
 
     /* Create a native scope. */
     JSObject *arrayProto = getProto();
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 68603db89f7b..393b8d606268 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -2229,7 +2229,7 @@ JSObject::initBoundFunction(JSContext *cx, const Value &thisArg,
             return false;
 
         empty->slotSpan += argslen;
-        map = empty;
+        setMap(empty);
 
         if (!ensureInstanceReservedSlots(cx, argslen))
             return false;
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index a1d266543f65..8a953329ec0f 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -204,7 +204,7 @@ js_NewGCObject(JSContext *cx, js::gc::FinalizeKind kind)
     JSObject *obj = NewFinalizableGCThing<JSObject>(cx, kind);
     if (obj) {
         obj->capacity = js::gc::GetGCKindSlots(kind);
-        obj->map = NULL; /* Stops obj from being scanned until initializated. */
+        obj->lastProp = NULL; /* Stops obj from being scanned until initializated. */
     }
     return obj;
 }
@@ -235,7 +235,7 @@ js_NewGCFunction(JSContext *cx)
     JSFunction *fun = NewFinalizableGCThing<JSFunction>(cx, js::gc::FINALIZE_FUNCTION);
     if (fun) {
         fun->capacity = JSObject::FUN_CLASS_RESERVED_SLOTS;
-        fun->map = NULL; /* Stops fun from being scanned until initializated. */
+        fun->lastProp = NULL; /* Stops fun from being scanned until initializated. */
     }
     return fun;
 }
diff --git a/js/src/jsgcmark.cpp b/js/src/jsgcmark.cpp
index a40ca47af80f..6aadef2e2faf 100644
--- a/js/src/jsgcmark.cpp
+++ b/js/src/jsgcmark.cpp
@@ -534,7 +534,7 @@ static const uintN LARGE_OBJECT_CHUNK_SIZE = 2048;
 static void
 ScanObject(GCMarker *gcmarker, JSObject *obj)
 {
-    if (!obj->map)
+    if (obj->isNewborn())
         return;
 
     if (JSObject *parent = obj->getParent())
@@ -629,7 +629,7 @@ void
 MarkChildren(JSTracer *trc, JSObject *obj)
 {
     /* If obj has no map, it must be a newborn. */
-    if (!obj->map)
+    if (obj->isNewborn())
         return;
 
     /* Trace universal (ops-independent) members. */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 29f73c926deb..a33f3c35cbec 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -108,7 +108,7 @@
 using namespace js;
 using namespace js::gc;
 
-JS_FRIEND_DATA(JSObjectMap) JSObjectMap::sharedNonNative(JSObjectMap::SHAPELESS);
+JS_FRIEND_DATA(js::Shape) Shape::sharedNonNative(SHAPELESS);
 
 Class js_ObjectClass = {
     js_Object_str,
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index e5f24cb358cb..95853e7754e9 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -203,23 +203,9 @@ MeterEntryCount(uintN count);
 
 } /* namespace js */
 
-struct JSObjectMap : public js::gc::Cell {
-    mutable uint32 shape;  /* shape identifier */
-    uint32 slotSpan;       /* one more than maximum live slot number */
-
-    static JS_FRIEND_DATA(JSObjectMap) sharedNonNative;
-
-    explicit JSObjectMap(uint32 shape) : shape(shape), slotSpan(0) {}
-    JSObjectMap(uint32 shape, uint32 slotSpan) : shape(shape), slotSpan(slotSpan) {}
-
-    enum { INVALID_SHAPE = 0x8fffffff, SHAPELESS = 0xffffffff };
-
-    bool isNative() const { return this != &sharedNonNative; }
-
-  private:
-    /* No copy or assignment semantics. */
-    JSObjectMap(JSObjectMap &);
-    void operator=(JSObjectMap &);
+enum {
+    INVALID_SHAPE = 0x8fffffff,
+    SHAPELESS = 0xffffffff
 };
 
 /*
@@ -333,23 +319,9 @@ struct JSObject : js::gc::Cell {
 
     /*
      * Private pointer to the last added property and methods to manipulate the
-     * list it links among properties in this scope. The {remove,insert} pair
-     * for DictionaryProperties assert that the scope is in dictionary mode and
-     * any reachable properties are flagged as dictionary properties.
-     *
-     * For native objects, this field is always a Shape. For non-native objects,
-     * it points to the singleton sharedNonNative JSObjectMap, whose shape field
-     * is SHAPELESS.
-     *
-     * NB: these private methods do *not* update this scope's shape to track
-     * lastProp->shape after they finish updating the linked list in the case
-     * where lastProp is updated. It is up to calling code in jsscope.cpp to
-     * call updateShape(cx) after updating lastProp.
+     * list it links among properties in this scope.
      */
-    union {
-        js::Shape       *lastProp;
-        JSObjectMap     *map;
-    };
+    js::Shape           *lastProp;
 
     js::Class           *clasp;
 
@@ -419,7 +391,8 @@ struct JSObject : js::gc::Cell {
     inline js::EmptyShape *getEmptyShape(JSContext *cx, js::Class *aclasp,
                                          /* gc::FinalizeKind */ unsigned kind);
 
-    bool isNative() const       { return map->isNative(); }
+    inline bool isNative() const;
+    inline bool isNewborn() const;
 
     js::Class *getClass() const { return clasp; }
     JSClass *getJSClass() const { return Jsvalify(clasp); }
@@ -433,7 +406,7 @@ struct JSObject : js::gc::Cell {
     }
 
     uint32 shape() const {
-        JS_ASSERT(objShape != JSObjectMap::INVALID_SHAPE);
+        JS_ASSERT(objShape != INVALID_SHAPE);
         return objShape;
     }
 
@@ -489,23 +462,17 @@ struct JSObject : js::gc::Cell {
   private:
     void generateOwnShape(JSContext *cx);
 
-    void setOwnShape(uint32 s)  { flags |= OWN_SHAPE; objShape = s; }
-    void clearOwnShape()        { flags &= ~OWN_SHAPE; objShape = map->shape; }
+    inline void setOwnShape(uint32 s);
+    inline void clearOwnShape();
 
   public:
     inline bool nativeEmpty() const;
 
     bool hasOwnShape() const    { return !!(flags & OWN_SHAPE); }
 
-    void setMap(JSObjectMap *amap) {
-        JS_ASSERT(!hasOwnShape());
-        map = amap;
-        objShape = map->shape;
-    }
+    inline void setMap(js::Shape *amap);
 
-    void setSharedNonNativeMap() {
-        setMap(const_cast<JSObjectMap *>(&JSObjectMap::sharedNonNative));
-    }
+    inline void setSharedNonNativeMap();
 
     /* Functions for setting up scope chain object maps and shapes. */
     void initCall(JSContext *cx, const js::Bindings &bindings, JSObject *parent);
@@ -668,42 +635,30 @@ struct JSObject : js::gc::Cell {
 
     inline bool ensureClassReservedSlots(JSContext *cx);
 
-    uint32 slotSpan() const { return map->slotSpan; }
+    inline uint32 slotSpan() const;
 
-    bool containsSlot(uint32 slot) const { return slot < slotSpan(); }
+    inline bool containsSlot(uint32 slot) const;
 
     js::Value& getSlotRef(uintN slot) {
         JS_ASSERT(slot < capacity);
         return slots[slot];
     }
 
-    js::Value &nativeGetSlotRef(uintN slot) {
-        JS_ASSERT(isNative());
-        JS_ASSERT(containsSlot(slot));
-        return getSlotRef(slot);
-    }
+    inline js::Value &nativeGetSlotRef(uintN slot);
 
     const js::Value &getSlot(uintN slot) const {
         JS_ASSERT(slot < capacity);
         return slots[slot];
     }
 
-    const js::Value &nativeGetSlot(uintN slot) const {
-        JS_ASSERT(isNative());
-        JS_ASSERT(containsSlot(slot));
-        return getSlot(slot);
-    }
+    inline const js::Value &nativeGetSlot(uintN slot) const;
 
     void setSlot(uintN slot, const js::Value &value) {
         JS_ASSERT(slot < capacity);
         slots[slot] = value;
     }
 
-    void nativeSetSlot(uintN slot, const js::Value &value) {
-        JS_ASSERT(isNative());
-        JS_ASSERT(containsSlot(slot));
-        return setSlot(slot, value);
-    }
+    inline void nativeSetSlot(uintN slot, const js::Value &value);
 
     inline js::Value getReservedSlot(uintN index) const;
 
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 9d7e8ef6961f..bbe90784fb7c 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -130,7 +130,7 @@ inline void
 JSObject::finalize(JSContext *cx)
 {
     /* Cope with stillborn objects that have no map. */
-    if (!map)
+    if (isNewborn())
         return;
 
     /* Finalize obj first, in case it needs map and slots. */
@@ -151,7 +151,7 @@ inline void
 JSObject::initCall(JSContext *cx, const js::Bindings &bindings, JSObject *parent)
 {
     init(cx, &js_CallClass, NULL, parent, NULL, false);
-    map = bindings.lastShape();
+    lastProp = bindings.lastShape();
 
     /*
      * If |bindings| is for a function that has extensible parents, that means
@@ -160,7 +160,7 @@ JSObject::initCall(JSContext *cx, const js::Bindings &bindings, JSObject *parent
     if (bindings.extensibleParents())
         setOwnShape(js_GenerateShape(cx));
     else
-        objShape = map->shape;
+        objShape = lastProp->shape;
 }
 
 /*
@@ -174,7 +174,7 @@ JSObject::initClonedBlock(JSContext *cx, JSObject *proto, JSStackFrame *frame)
 
     /* Cloned blocks copy their prototype's map; it had better be shareable. */
     JS_ASSERT(!proto->inDictionaryMode() || proto->lastProp->frozen());
-    map = proto->map;
+    lastProp = proto->lastProp;
 
     /*
      * If the prototype has its own shape, that means the clone should, too; see
@@ -183,7 +183,7 @@ JSObject::initClonedBlock(JSContext *cx, JSObject *proto, JSStackFrame *frame)
     if (proto->hasOwnShape())
         setOwnShape(js_GenerateShape(cx));
     else
-        objShape = map->shape;
+        objShape = lastProp->shape;
 }
 
 /* 
@@ -772,7 +772,7 @@ JSObject::init(JSContext *cx, js::Class *aclasp, JSObject *proto, JSObject *pare
      * or setSharedNonNativeMap after calling init. To defend this requirement
      * we set objShape to a value that obj->shape() is asserted never to return.
      */
-    objShape = JSObjectMap::INVALID_SHAPE;
+    objShape = INVALID_SHAPE;
 #endif
 
     setProto(proto);
@@ -886,6 +886,162 @@ JSStackFrame::principals(JSContext *cx) const
     return scopeChain().principals(cx);
 }
 
+inline uint32
+JSObject::slotSpan() const
+{
+    return lastProp->slotSpan;
+}
+
+inline bool
+JSObject::containsSlot(uint32 slot) const
+{
+    return slot < slotSpan();
+}
+
+inline void
+JSObject::setMap(js::Shape *amap)
+{
+    JS_ASSERT(!hasOwnShape());
+    lastProp = amap;
+    objShape = lastProp->shape;
+}
+
+inline js::Value &
+JSObject::nativeGetSlotRef(uintN slot)
+{
+    JS_ASSERT(isNative());
+    JS_ASSERT(containsSlot(slot));
+    return getSlotRef(slot);
+}
+
+inline const js::Value &
+JSObject::nativeGetSlot(uintN slot) const
+{
+    JS_ASSERT(isNative());
+    JS_ASSERT(containsSlot(slot));
+    return getSlot(slot);
+}
+
+inline void
+JSObject::nativeSetSlot(uintN slot, const js::Value &value)
+{
+    JS_ASSERT(isNative());
+    JS_ASSERT(containsSlot(slot));
+    return setSlot(slot, value);
+}
+
+inline bool
+JSObject::isNative() const
+{
+    return lastProp->isNative();
+}
+
+inline bool
+JSObject::isNewborn() const
+{
+    return !lastProp;
+}
+
+inline void
+JSObject::clearOwnShape()
+{
+    flags &= ~OWN_SHAPE;
+    objShape = lastProp->shape;
+}
+
+inline void
+JSObject::setOwnShape(uint32 s)
+{
+    flags |= OWN_SHAPE;
+    objShape = s;
+}
+
+inline js::Shape **
+JSObject::nativeSearch(jsid id, bool adding)
+{
+    return js::Shape::search(compartment()->rt, &lastProp, id, adding);
+}
+
+inline const js::Shape *
+JSObject::nativeLookup(jsid id)
+{
+    JS_ASSERT(isNative());
+    return SHAPE_FETCH(nativeSearch(id));
+}
+
+inline bool
+JSObject::nativeContains(jsid id)
+{
+    return nativeLookup(id) != NULL;
+}
+
+inline bool
+JSObject::nativeContains(const js::Shape &shape)
+{
+    return nativeLookup(shape.id) == &shape;
+}
+
+inline const js::Shape *
+JSObject::lastProperty() const
+{
+    JS_ASSERT(isNative());
+    JS_ASSERT(!JSID_IS_VOID(lastProp->id));
+    return lastProp;
+}
+
+inline bool
+JSObject::nativeEmpty() const
+{
+    return lastProperty()->isEmptyShape();
+}
+
+inline bool
+JSObject::inDictionaryMode() const
+{
+    return lastProperty()->inDictionary();
+}
+
+inline uint32
+JSObject::propertyCount() const
+{
+    return lastProperty()->entryCount();
+}
+
+inline bool
+JSObject::hasPropertyTable() const
+{
+    return lastProperty()->hasTable();
+}
+
+/*
+ * FIXME: shape must not be null, should use a reference here and other places.
+ */
+inline void
+JSObject::setLastProperty(const js::Shape *shape)
+{
+    JS_ASSERT(!inDictionaryMode());
+    JS_ASSERT(!JSID_IS_VOID(shape->id));
+    JS_ASSERT_IF(lastProp, !JSID_IS_VOID(lastProp->id));
+    JS_ASSERT(shape->compartment() == compartment());
+
+    lastProp = const_cast<js::Shape *>(shape);
+}
+
+inline void
+JSObject::removeLastProperty()
+{
+    JS_ASSERT(!inDictionaryMode());
+    JS_ASSERT(!JSID_IS_VOID(lastProp->parent->id));
+
+    lastProp = lastProp->parent;
+}
+
+inline void
+JSObject::setSharedNonNativeMap()
+{
+    setMap(&js::Shape::sharedNonNative);
+}
+
 static inline bool
 js_IsCallable(const js::Value &v)
 {
@@ -974,7 +1130,7 @@ InitScopeForObject(JSContext* cx, JSObject* obj, js::Class *clasp, JSObject* pro
 
   bad:
     /* The GC nulls map initially. It should still be null on error. */
-    JS_ASSERT(!obj->map);
+    JS_ASSERT(obj->isNewborn());
     return false;
 }
 
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 9f670b0b4c9a..c8d0fa41c3fd 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -290,7 +290,7 @@ CastAsPropertyOp(js::Class *clasp)
  */
 #define JSPROP_SHADOWABLE       JSPROP_INDEX
 
-struct Shape : public JSObjectMap
+struct Shape : public js::gc::Cell
 {
     friend struct ::JSObject;
     friend struct ::JSFunction;
@@ -298,6 +298,9 @@ struct Shape : public JSObjectMap
     friend class js::Bindings;
     friend bool IsShapeAboutToBeFinalized(JSContext *cx, const js::Shape *shape);
 
+    mutable uint32      shape;          /* shape identifier */
+    uint32              slotSpan;       /* one more than maximum live slot number */
+
     /* 
      * numLinearSearches starts at zero and is incremented initially on each
      * search() call.  Once numLinearSearches reaches MAX_LINEAR_SEARCHES
@@ -311,7 +314,6 @@ struct Shape : public JSObjectMap
         mutable js::PropertyTable *table;
     };
 
-  public:
     inline void freeTable(JSContext *cx);
 
     jsid                id;
@@ -429,6 +431,10 @@ struct Shape : public JSObjectMap
     }
 
   public:
+    static JS_FRIEND_DATA(Shape) sharedNonNative;
+
+    bool isNative() const { return this != &sharedNonNative; }
+
     const js::Shape *previous() const {
         return parent;
     }
@@ -485,6 +491,9 @@ struct Shape : public JSObjectMap
     /* Used by EmptyShape (see jsscopeinlines.h). */
     Shape(JSCompartment *comp, Class *aclasp);
 
+    /* Used by sharedNonNative. */
+    explicit Shape(uint32 shape);
+
     bool inDictionary() const   { return (flags & IN_DICTIONARY) != 0; }
     bool frozen() const         { return (flags & FROZEN) != 0; }
     void setFrozen()            { flags |= FROZEN; }
@@ -671,134 +680,6 @@ struct EmptyShape : public js::Shape
 #define SHAPE_STORE_PRESERVING_COLLISION(spp, shape)                          \
     (*(spp) = (js::Shape *) (jsuword(shape) | SHAPE_HAD_COLLISION(*(spp))))
 
-inline js::Shape **
-JSObject::nativeSearch(jsid id, bool adding)
-{
-    return js::Shape::search(compartment()->rt, &lastProp, id, adding);
-}
-
-inline const js::Shape *
-JSObject::nativeLookup(jsid id)
-{
-    JS_ASSERT(isNative());
-    return SHAPE_FETCH(nativeSearch(id));
-}
-
-inline bool
-JSObject::nativeContains(jsid id)
-{
-    return nativeLookup(id) != NULL;
-}
-
-inline bool
-JSObject::nativeContains(const js::Shape &shape)
-{
-    return nativeLookup(shape.id) == &shape;
-}
-
-inline const js::Shape *
-JSObject::lastProperty() const
-{
-    JS_ASSERT(isNative());
-    JS_ASSERT(!JSID_IS_VOID(lastProp->id));
-    return lastProp;
-}
-
-inline bool
-JSObject::nativeEmpty() const
-{
-    return lastProperty()->isEmptyShape();
-}
-
-inline bool
-JSObject::inDictionaryMode() const
-{
-    return lastProperty()->inDictionary();
-}
-
-inline uint32
-JSObject::propertyCount() const
-{
-    return lastProperty()->entryCount();
-}
-
-inline bool
-JSObject::hasPropertyTable() const
-{
-    return lastProperty()->hasTable();
-}
-
-/*
- * FIXME: shape must not be null, should use a reference here and other places.
- */
-inline void
-JSObject::setLastProperty(const js::Shape *shape)
-{
-    JS_ASSERT(!inDictionaryMode());
-    JS_ASSERT(!JSID_IS_VOID(shape->id));
-    JS_ASSERT_IF(lastProp, !JSID_IS_VOID(lastProp->id));
-    JS_ASSERT(shape->compartment() == compartment());
-
-    lastProp = const_cast<js::Shape *>(shape);
-}
-
-inline void
-JSObject::removeLastProperty()
-{
-    JS_ASSERT(!inDictionaryMode());
-    JS_ASSERT(!JSID_IS_VOID(lastProp->parent->id));
-
-    lastProp = lastProp->parent;
-}
-
-namespace js {
-
-inline void
-Shape::removeFromDictionary(JSObject *obj) const
-{
-    JS_ASSERT(!frozen());
-    JS_ASSERT(inDictionary());
-    JS_ASSERT(obj->inDictionaryMode());
-    JS_ASSERT(listp);
-    JS_ASSERT(!JSID_IS_VOID(id));
-
-    JS_ASSERT(obj->lastProp->inDictionary());
-    JS_ASSERT(obj->lastProp->listp == &obj->lastProp);
-    JS_ASSERT_IF(obj->lastProp != this, !JSID_IS_VOID(obj->lastProp->id));
-    JS_ASSERT_IF(obj->lastProp->parent, !JSID_IS_VOID(obj->lastProp->parent->id));
-
-    if (parent)
-        parent->listp = listp;
-    *listp = parent;
-    listp = NULL;
-}
-
-inline void
-Shape::insertIntoDictionary(js::Shape **dictp)
-{
-    /*
-     * Don't assert inDictionaryMode() here because we may be called from
-     * JSObject::toDictionaryMode via JSObject::newDictionaryShape.
-     */
-    JS_ASSERT(inDictionary());
-    JS_ASSERT(!listp);
-    JS_ASSERT(!JSID_IS_VOID(id));
-
-    JS_ASSERT_IF(*dictp, !(*dictp)->frozen());
-    JS_ASSERT_IF(*dictp, (*dictp)->inDictionary());
-    JS_ASSERT_IF(*dictp, (*dictp)->listp == dictp);
-    JS_ASSERT_IF(*dictp, !JSID_IS_VOID((*dictp)->id));
-    JS_ASSERT_IF(*dictp, compartment() == (*dictp)->compartment());
-
-    setParent(*dictp);
-    if (parent)
-        parent->listp = &parent;
-    listp = dictp;
-    *dictp = this;
-}
-
-} /* namespace js */
-
 /*
  * If SHORTID is set in shape->flags, we use shape->shortid rather
  * than id when calling shape's getter or setter.
diff --git a/js/src/jsscopeinlines.h b/js/src/jsscopeinlines.h
index af687093b246..fdd20c4faf8c 100644
--- a/js/src/jsscopeinlines.h
+++ b/js/src/jsscopeinlines.h
@@ -165,9 +165,17 @@ namespace js {
 inline
 Shape::Shape(jsid id, js::PropertyOp getter, js::StrictPropertyOp setter, uint32 slot, uintN attrs,
              uintN flags, intN shortid, uint32 shape, uint32 slotSpan)
-  : JSObjectMap(shape, slotSpan),
-    numLinearSearches(0), id(id), rawGetter(getter), rawSetter(setter), slot(slot),
-    attrs(uint8(attrs)), flags(uint8(flags)), shortid(int16(shortid)), parent(NULL)
+  : shape(shape),
+    slotSpan(slotSpan),
+    numLinearSearches(0),
+    id(id),
+    rawGetter(getter),
+    rawSetter(setter),
+    slot(slot),
+    attrs(uint8(attrs)),
+    flags(uint8(flags)),
+    shortid(int16(shortid)),
+    parent(NULL)
 {
     JS_ASSERT_IF(slotSpan != SHAPE_INVALID_SLOT, slotSpan < JSObject::NSLOTS_LIMIT);
     JS_ASSERT_IF(getter && (attrs & JSPROP_GETTER), getterObj->isCallable());
@@ -177,7 +185,8 @@ Shape::Shape(jsid id, js::PropertyOp getter, js::StrictPropertyOp setter, uint32
 
 inline
 Shape::Shape(JSCompartment *comp, Class *aclasp)
-  : JSObjectMap(js_GenerateShape(comp->rt), JSSLOT_FREE(aclasp)),
+  : shape(js_GenerateShape(comp->rt)),
+    slotSpan(JSSLOT_FREE(aclasp)),
     numLinearSearches(0),
     id(JSID_EMPTY),
     clasp(aclasp),
@@ -191,6 +200,23 @@ Shape::Shape(JSCompartment *comp, Class *aclasp)
     kids.setNull();
 }
 
+inline
+Shape::Shape(uint32 shape)
+  : shape(shape),
+    slotSpan(0),
+    numLinearSearches(0),
+    id(JSID_EMPTY),
+    clasp(NULL),
+    rawSetter(NULL),
+    slot(SHAPE_INVALID_SLOT),
+    attrs(0),
+    flags(SHARED_EMPTY),
+    shortid(0),
+    parent(NULL)
+{
+    kids.setNull();
+}
+
 inline JSDHashNumber
 Shape::hash() const
 {
@@ -278,6 +304,50 @@ Shape::set(JSContext* cx, JSObject* obj, bool strict, js::Value* vp) const
     return js::CallJSPropertyOpSetter(cx, setterOp(), obj, SHAPE_USERID(this), strict, vp);
 }
 
+inline void
+Shape::removeFromDictionary(JSObject *obj) const
+{
+    JS_ASSERT(!frozen());
+    JS_ASSERT(inDictionary());
+    JS_ASSERT(obj->inDictionaryMode());
+    JS_ASSERT(listp);
+    JS_ASSERT(!JSID_IS_VOID(id));
+
+    JS_ASSERT(obj->lastProp->inDictionary());
+    JS_ASSERT(obj->lastProp->listp == &obj->lastProp);
+    JS_ASSERT_IF(obj->lastProp != this, !JSID_IS_VOID(obj->lastProp->id));
+    JS_ASSERT_IF(obj->lastProp->parent, !JSID_IS_VOID(obj->lastProp->parent->id));
+
+    if (parent)
+        parent->listp = listp;
+    *listp = parent;
+    listp = NULL;
+}
+
+inline void
+Shape::insertIntoDictionary(js::Shape **dictp)
+{
+    /*
+     * Don't assert inDictionaryMode() here because we may be called from
+     * JSObject::toDictionaryMode via JSObject::newDictionaryShape.
+     */
+    JS_ASSERT(inDictionary());
+    JS_ASSERT(!listp);
+    JS_ASSERT(!JSID_IS_VOID(id));
+
+    JS_ASSERT_IF(*dictp, !(*dictp)->frozen());
+    JS_ASSERT_IF(*dictp, (*dictp)->inDictionary());
+    JS_ASSERT_IF(*dictp, (*dictp)->listp == dictp);
+    JS_ASSERT_IF(*dictp, !JSID_IS_VOID((*dictp)->id));
+    JS_ASSERT_IF(*dictp, compartment() == (*dictp)->compartment());
+
+    setParent(*dictp);
+    if (parent)
+        parent->listp = &parent;
+    listp = dictp;
+    *dictp = this;
+}
+
 inline
 EmptyShape::EmptyShape(JSCompartment *comp, js::Class *aclasp)
   : js::Shape(comp, aclasp)
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index ce3f85002754..b1d3615fd6fd 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -3069,7 +3069,7 @@ mjit::Compiler::jsop_getprop(JSAtom *atom, bool doTypeCheck, bool usePropCache)
 
     DataLabel32 inlineShapeLabel;
     Jump j = masm.branch32WithPatch(Assembler::NotEqual, shapeReg,
-                                    Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                                    Imm32(int32(INVALID_SHAPE)),
                                     inlineShapeLabel);
     Label inlineShapeJump = masm.label();
 
@@ -3180,7 +3180,7 @@ mjit::Compiler::jsop_callprop_generic(JSAtom *atom)
 
     DataLabel32 inlineShapeLabel;
     Jump j = masm.branch32WithPatch(Assembler::NotEqual, shapeReg,
-                           Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                           Imm32(int32(INVALID_SHAPE)),
                            inlineShapeLabel);
     Label inlineShapeJump = masm.label();
 
@@ -3318,7 +3318,7 @@ mjit::Compiler::jsop_callprop_obj(JSAtom *atom)
 
     DataLabel32 inlineShapeLabel;
     Jump j = masm.branch32WithPatch(Assembler::NotEqual, shapeReg,
-                           Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                           Imm32(int32(INVALID_SHAPE)),
                            inlineShapeLabel);
     Label inlineShapeJump = masm.label();
 
@@ -3462,7 +3462,7 @@ mjit::Compiler::jsop_setprop(JSAtom *atom, bool usePropCache)
     pic.shapeGuard = masm.label();
     DataLabel32 inlineShapeData;
     Jump j = masm.branch32WithPatch(Assembler::NotEqual, shapeReg,
-                                    Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                                    Imm32(int32(INVALID_SHAPE)),
                                     inlineShapeData);
     Label afterInlineShapeJump = masm.label();
 
@@ -4346,7 +4346,7 @@ mjit::Compiler::jsop_getgname(uint32 index)
 
         masm.load32FromImm(&obj->objShape, objReg);
         shapeGuard = masm.branch32WithPatch(Assembler::NotEqual, objReg,
-                                            Imm32(int32(JSObjectMap::INVALID_SHAPE)), ic.shape);
+                                            Imm32(int32(INVALID_SHAPE)), ic.shape);
         masm.move(ImmPtr(obj), objReg);
     } else {
         objReg = frame.ownRegForData(fe);
@@ -4355,7 +4355,7 @@ mjit::Compiler::jsop_getgname(uint32 index)
 
         masm.loadShape(objReg, reg);
         shapeGuard = masm.branch32WithPatch(Assembler::NotEqual, reg,
-                                            Imm32(int32(JSObjectMap::INVALID_SHAPE)), ic.shape);
+                                            Imm32(int32(INVALID_SHAPE)), ic.shape);
         frame.freeReg(reg);
     }
     stubcc.linkExit(shapeGuard, Uses(0));
@@ -4497,7 +4497,7 @@ mjit::Compiler::jsop_setgname(JSAtom *atom, bool usePropertyCache)
 
         masm.load32FromImm(&obj->objShape, ic.shapeReg);
         shapeGuard = masm.branch32WithPatch(Assembler::NotEqual, ic.shapeReg,
-                                            Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                                            Imm32(int32(INVALID_SHAPE)),
                                             ic.shape);
         masm.move(ImmPtr(obj), ic.objReg);
     } else {
@@ -4507,7 +4507,7 @@ mjit::Compiler::jsop_setgname(JSAtom *atom, bool usePropertyCache)
 
         masm.loadShape(ic.objReg, ic.shapeReg);
         shapeGuard = masm.branch32WithPatch(Assembler::NotEqual, ic.shapeReg,
-                                            Imm32(int32(JSObjectMap::INVALID_SHAPE)),
+                                            Imm32(int32(INVALID_SHAPE)),
                                             ic.shape);
         frame.freeReg(ic.shapeReg);
     }
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index 18c7878119ea..d3db5ecfecb5 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -1221,17 +1221,17 @@ JITScript::purgeMICs()
     for (uint32 i = 0; i < nGetGlobalNames; i++) {
         ic::GetGlobalNameIC &ic = getGlobalNames_[i];
         JSC::CodeLocationDataLabel32 label = ic.fastPathStart.dataLabel32AtOffset(ic.shapeOffset);
-        repatch.repatch(label, int(JSObjectMap::INVALID_SHAPE));
+        repatch.repatch(label, int(INVALID_SHAPE));
     }
 
     ic::SetGlobalNameIC *setGlobalNames_ = setGlobalNames();
     for (uint32 i = 0; i < nSetGlobalNames; i++) {
         ic::SetGlobalNameIC &ic = setGlobalNames_[i];
-        ic.patchInlineShapeGuard(repatch, int32(JSObjectMap::INVALID_SHAPE));
+        ic.patchInlineShapeGuard(repatch, int32(INVALID_SHAPE));
 
         if (ic.hasExtraStub) {
             Repatcher repatcher(ic.extraStub);
-            ic.patchExtraShapeGuard(repatcher, int32(JSObjectMap::INVALID_SHAPE));
+            ic.patchExtraShapeGuard(repatcher, int32(INVALID_SHAPE));
         }
     }
 }
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index b18e672435cd..1c7c39544cab 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -203,7 +203,7 @@ class SetPropCompiler : public PICStubCompiler
         SetPropLabels &labels = pic.setPropLabels();
         repatcher.repatchLEAToLoadPtr(labels.getDslotsLoad(pic.fastPathRejoin, pic.u.vr));
         repatcher.repatch(labels.getInlineShapeData(pic.fastPathStart, pic.shapeGuard),
-                          int32(JSObjectMap::INVALID_SHAPE));
+                          int32(INVALID_SHAPE));
         repatcher.relink(labels.getInlineShapeJump(pic.fastPathStart.labelAtOffset(pic.shapeGuard)),
                          pic.slowPathStart);
 
@@ -738,7 +738,7 @@ class GetPropCompiler : public PICStubCompiler
         GetPropLabels &labels = pic.getPropLabels();
         repatcher.repatchLEAToLoadPtr(labels.getDslotsLoad(pic.fastPathRejoin));
         repatcher.repatch(labels.getInlineShapeData(pic.getFastShapeGuard()),
-                          int32(JSObjectMap::INVALID_SHAPE));
+                          int32(INVALID_SHAPE));
         repatcher.relink(labels.getInlineShapeJump(pic.getFastShapeGuard()), pic.slowPathStart);
 
         if (pic.hasTypeCheck()) {
diff --git a/js/src/xpconnect/src/xpcdebug.cpp b/js/src/xpconnect/src/xpcdebug.cpp
index 2d5081dcb11c..ff9b054d38e7 100644
--- a/js/src/xpconnect/src/xpcdebug.cpp
+++ b/js/src/xpconnect/src/xpcdebug.cpp
@@ -446,7 +446,7 @@ static const int tab_width = 2;
 
 static void PrintObjectBasics(JSObject* obj)
 {
-    if (obj->isNative())
+    if (JS_IsNative(obj))
         printf("%p 'native' <%s>",
                (void *)obj, obj->getClass()->name);
     else
@@ -470,7 +470,7 @@ static void PrintObject(JSObject* obj, int depth, ObjectPile* pile)
         return;
     }
 
-    if(!obj->isNative())
+    if(!JS_IsNative(obj))
         return;
 
     JSObject* parent = obj->getParent();

From 2f5cab79a0ec3f34ce03078686546a864e2a1eae Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 15 Apr 2011 16:06:55 +0200
Subject: [PATCH 158/509] Bug 615509 - Remove nsIDOMDOMConfiguration,
 Document.domConfig; r=sicking

---
 content/base/src/nsDocument.cpp               |  8 ---
 content/html/document/src/nsHTMLDocument.cpp  |  6 --
 dom/interfaces/core/Makefile.in               |  1 -
 .../core/nsIDOMDOMConfiguration.idl           | 61 -------------------
 dom/interfaces/core/nsIDOMDocument.idl        |  6 +-
 dom/interfaces/core/nsIDOMXMLDocument.idl     |  2 +-
 dom/interfaces/html/nsIDOMHTMLDocument.idl    |  2 +-
 dom/interfaces/svg/nsIDOMSVGDocument.idl      |  2 +-
 8 files changed, 4 insertions(+), 84 deletions(-)
 delete mode 100644 dom/interfaces/core/nsIDOMDOMConfiguration.idl

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 523c9cf59328..96db56685cbb 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -6173,17 +6173,9 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
   return CallQueryInterface(adoptedNode, aResult);
 }
 
-NS_IMETHODIMP
-nsDocument::GetDomConfig(nsIDOMDOMConfiguration **aConfig)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsDocument::NormalizeDocument()
 {
-  // We don't support DOMConfigurations yet, so this just
-  // does a straight shot of normalization.
   return Normalize();
 }
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 20a22ce393ea..b641dc7a6eb1 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1398,12 +1398,6 @@ nsHTMLDocument::AdoptNode(nsIDOMNode* aSource, nsIDOMNode** aRetval)
   return nsDocument::AdoptNode(aSource, aRetval);
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::GetDomConfig(nsIDOMDOMConfiguration** aDomConfig)
-{
-  return nsDocument::GetDomConfig(aDomConfig);
-}
-
 NS_IMETHODIMP
 nsHTMLDocument::NormalizeDocument()
 {
diff --git a/dom/interfaces/core/Makefile.in b/dom/interfaces/core/Makefile.in
index 2a4b7d815e05..85c1a0917d2d 100644
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@@ -76,7 +76,6 @@ XPIDLSRCS =                                     \
 	nsIDOMNSDocument.idl			\
 	nsIDOMXMLDocument.idl			\
 	nsIDOMUserDataHandler.idl		\
-	nsIDOMDOMConfiguration.idl		\
 	nsIDOMNSEditableElement.idl		\
 	nsIDOMNSElement.idl			\
 	nsIDOMNodeSelector.idl			\
diff --git a/dom/interfaces/core/nsIDOMDOMConfiguration.idl b/dom/interfaces/core/nsIDOMDOMConfiguration.idl
deleted file mode 100644
index 7836f4280466..000000000000
--- a/dom/interfaces/core/nsIDOMDOMConfiguration.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org Code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Christopher A. Aillon <christopher@aillon.com> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "domstubs.idl"
-
-interface nsIVariant;
-
-/**
- * The nsIDOMDOMConfiguration interface represents the configuration
- * of a document and maintains a table of recognized parameters.
- *
- * For more information on this interface, please see
- * http://www.w3.org/TR/DOM-Level-3-Core/
- */
-
-// Introduced in DOM Level 3:
-[scriptable, uuid(cfb5b821-9016-4a79-9d98-87b57c3ea0c7)]
-interface nsIDOMDOMConfiguration : nsISupports
-{
-  void               setParameter(in DOMString name, 
-                                  in nsIVariant value)
-                                        raises(DOMException);
-  nsIVariant         getParameter(in DOMString name)
-                                        raises(DOMException);
-  boolean            canSetParameter(in DOMString name, 
-                                     in nsIVariant value);
-};
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index bf11e4dee8bc..e3bbdf0266dc 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -39,8 +39,6 @@
 
 #include "nsIDOMNode.idl"
 
-interface nsIDOMDOMConfiguration;
-
 /**
  * The nsIDOMDocument interface represents the entire HTML or XML document.
  * Conceptually, it is the root of the document tree, and provides the 
@@ -54,7 +52,7 @@ interface nsIDOMDOMConfiguration;
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(3e7421c4-9964-4184-8c75-d291eecdba35)]
+[scriptable, uuid(cf88ac5e-49d9-4294-9255-ff80a1727f91)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -111,8 +109,6 @@ interface nsIDOMDocument : nsIDOMNode
   nsIDOMNode         adoptNode(in nsIDOMNode source)
                                         raises(DOMException);
   // Introduced in DOM Level 3:
-  readonly attribute nsIDOMDOMConfiguration domConfig;
-  // Introduced in DOM Level 3:
   void               normalizeDocument();
   // Introduced in DOM Level 3:
   nsIDOMNode         renameNode(in nsIDOMNode node, 
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 0ab98a37ad94..88852589b7f7 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(9f07f216-b3a3-4a08-81f1-a48075b91d1c)]
+[scriptable, uuid(207ccc34-b14f-4d2f-8cbf-028e0ed73d6f)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index fc447fea36a4..770b0c7698fa 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(0d3bef04-a890-4dbc-8571-b8e96ff5426b)]
+[scriptable, uuid(8f9cc6bb-539d-4d2a-bef8-aabb942d1b36)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            title;
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index 90dae80b08db..ac1a364ddc82 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,7 +39,7 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(fc52bd3f-850c-4d80-819f-5bd8321b4b59)]
+[scriptable, uuid(19004064-4ba6-4d0e-bcaf-fb42b0d3038b)]
 interface nsIDOMSVGDocument : nsIDOMDocument
                          /* , nsIDOMDocumentEvent */
 {

From 18e909dbe67e8bc076f5afd49cf8442966f07eef Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 15 Apr 2011 16:06:58 +0200
Subject: [PATCH 159/509] Bug 650080 - nsContentEventHandler.cpp:867: warning:
 unused variable 'pEventWidget'; r=smichaud

---
 content/events/src/nsContentEventHandler.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp
index 47ae20564a23..50160b5ab6b0 100644
--- a/content/events/src/nsContentEventHandler.cpp
+++ b/content/events/src/nsContentEventHandler.cpp
@@ -864,7 +864,6 @@ nsContentEventHandler::OnQueryDOMWidgetHittest(nsQueryContentEvent* aEvent)
     }
     if (aEvent->widget == targetWidget)
       aEvent->mReply.mWidgetIsHit = PR_TRUE;
-    nsIWidget* pEventWidget = aEvent->widget.get();
   }
 
   aEvent->mSucceeded = PR_TRUE;

From 7a662d36df3f3d4a2ba55549c1a027746fd69219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Fri, 15 Apr 2011 09:14:41 -0700
Subject: [PATCH 160/509] Bug 650300 Duplicate class attribute in
 bindings.xml#place-item [r=mfinkle]

---
 mobile/chrome/content/bindings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml
index dad23043ee12..451df8e3a079 100644
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -874,7 +874,7 @@
         <xul:vbox flex="1">
           <xul:vbox flex="1">
             <xul:textbox anonid="name" xbl:inherits="value=title" class="prompt-edit" flex="1"/>
-            <xul:textbox anonid="uri" xbl:inherits="value=uri" type="url" class="uri-element" class="prompt-edit" flex="1"/>
+            <xul:textbox anonid="uri" xbl:inherits="value=uri" type="url" class="uri-element prompt-edit" flex="1"/>
             <xul:textbox anonid="tags" xbl:inherits="value=tags" emptytext="&editBookmarkTags.label;" class="prompt-edit" flex="1"/>
           </xul:vbox>
 

From ecd76ebe90ae8fc9ca14f663d756006562b13611 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 15 Apr 2011 14:03:52 -0400
Subject: [PATCH 161/509] Bug 636840 - 'Get the New Version' text overflows
 button size [r=mbrubeck]

---
 mobile/components/UpdatePrompt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/components/UpdatePrompt.js b/mobile/components/UpdatePrompt.js
index 710cf7b55850..cdb2b86164c6 100644
--- a/mobile/components/UpdatePrompt.js
+++ b/mobile/components/UpdatePrompt.js
@@ -104,7 +104,7 @@ UpdatePrompt.prototype = {
       // Unconditionally use the "major" type here as for now it is always a new version
       // without additional description required for a minor update message
       let message = gUpdateBundle.formatStringFromName("intro_major", [brandName, aUpdate.displayVersion], 2);
-      let button0 = gUpdateBundle.GetStringFromName("updateButton_major");
+      let button0 = gUpdateBundle.GetStringFromName("okButton");
       let button1 = gUpdateBundle.GetStringFromName("askLaterButton");
       let prompt = Services.prompt;
       let flags = prompt.BUTTON_POS_0 * prompt.BUTTON_TITLE_IS_STRING + prompt.BUTTON_POS_1 * prompt.BUTTON_TITLE_IS_STRING;

From 11540cb57f6114bacec59985088ef6d4fcf97d65 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 15 Apr 2011 15:11:25 -0400
Subject: [PATCH 162/509] Backed out changeset 877c143cf39a (bug 648465)
 because of possibility of being related to the Maemo oranges

---
 dom/ipc/TabChild.cpp                         |  1 -
 dom/tests/mochitest/bugs/Makefile.in         |  1 -
 dom/tests/mochitest/bugs/test_bug648465.html | 34 --------------------
 3 files changed, 36 deletions(-)
 delete mode 100644 dom/tests/mochitest/bugs/test_bug648465.html

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index a5c32897a98a..da5c012fb42c 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -356,7 +356,6 @@ TabChild::ProvideWindow(nsIDOMWindow* aParent, PRUint32 aChromeFlags,
         return NS_ERROR_NOT_AVAILABLE;
     }
 
-    *aWindowIsNew = PR_TRUE;
     nsCOMPtr<nsIDOMWindow> win =
         do_GetInterface(static_cast<TabChild*>(newChild)->mWebNav);
     win.forget(aReturn);
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 0daa91d1f5f1..49e610de5192 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -137,7 +137,6 @@ _TEST_FILES	= \
 		test_bug622361.html \
 		test_bug633133.html \
 		test_bug642026.html \
-		test_bug648465.html \
 		$(NULL)
 
 libs:: 	$(_TEST_FILES)
diff --git a/dom/tests/mochitest/bugs/test_bug648465.html b/dom/tests/mochitest/bugs/test_bug648465.html
deleted file mode 100644
index 15aba0d4e7c3..000000000000
--- a/dom/tests/mochitest/bugs/test_bug648465.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=648465
--->
-<head>
-  <title>Test for Bug 648465</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/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=648465">
-  Mozilla Bug 648465</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 648465 **/
-var w = window.open('about:blank');
-try {
-  is(w.fullScreen, false, "can access non-allAccess properties of w");
-} finally {
-  w.close();
-}
-
-</script>
-</pre>
-</body>
-</html>

From 699864d056a888fc0d0a2f6ef630b06cae9dcb44 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 14 Apr 2011 13:55:42 -0400
Subject: [PATCH 163/509] Bug 648465 - TabChild::ProvideWindow needs to tell
 the caller that the window is new; r=smaug

---
 dom/ipc/TabChild.cpp                         |  1 +
 dom/tests/mochitest/bugs/Makefile.in         |  1 +
 dom/tests/mochitest/bugs/test_bug648465.html | 34 ++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 dom/tests/mochitest/bugs/test_bug648465.html

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index da5c012fb42c..a5c32897a98a 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -356,6 +356,7 @@ TabChild::ProvideWindow(nsIDOMWindow* aParent, PRUint32 aChromeFlags,
         return NS_ERROR_NOT_AVAILABLE;
     }
 
+    *aWindowIsNew = PR_TRUE;
     nsCOMPtr<nsIDOMWindow> win =
         do_GetInterface(static_cast<TabChild*>(newChild)->mWebNav);
     win.forget(aReturn);
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 49e610de5192..0daa91d1f5f1 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -137,6 +137,7 @@ _TEST_FILES	= \
 		test_bug622361.html \
 		test_bug633133.html \
 		test_bug642026.html \
+		test_bug648465.html \
 		$(NULL)
 
 libs:: 	$(_TEST_FILES)
diff --git a/dom/tests/mochitest/bugs/test_bug648465.html b/dom/tests/mochitest/bugs/test_bug648465.html
new file mode 100644
index 000000000000..15aba0d4e7c3
--- /dev/null
+++ b/dom/tests/mochitest/bugs/test_bug648465.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=648465
+-->
+<head>
+  <title>Test for Bug 648465</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/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=648465">
+  Mozilla Bug 648465</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 648465 **/
+var w = window.open('about:blank');
+try {
+  is(w.fullScreen, false, "can access non-allAccess properties of w");
+} finally {
+  w.close();
+}
+
+</script>
+</pre>
+</body>
+</html>

From d092746b6aac934a2b7d64b878cab70eae758b27 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 15 Apr 2011 16:41:36 -0400
Subject: [PATCH 164/509] Backed out changeset 3c42531f4ec8 (bug 627672)
 because of possibility of being related to the Maemo oranges

---
 netwerk/base/src/nsIOService.cpp | 72 ++++++--------------------------
 netwerk/base/src/nsIOService.h   |  2 -
 2 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 8ca6fff8c693..7401cf9ec545 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -165,7 +165,6 @@ PRInt16 gBadPortList[] = {
 
 static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
 static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
-static const char kStartupTopic[] = "profile-after-change";
 
 // Necko buffer cache
 nsIMemory* nsIOService::gBufferCache = nsnull;
@@ -181,7 +180,6 @@ nsIOService::nsIOService()
     , mSettingOffline(PR_FALSE)
     , mSetOfflineValue(PR_FALSE)
     , mShutdown(PR_FALSE)
-    , mNetworkLinkServiceInitialized(PR_FALSE)
     , mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
     , mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
 {
@@ -236,7 +234,6 @@ nsIOService::Init()
     if (observerService) {
         observerService->AddObserver(this, kProfileChangeNetTeardownTopic, PR_TRUE);
         observerService->AddObserver(this, kProfileChangeNetRestoreTopic, PR_TRUE);
-        observerService->AddObserver(this, kStartupTopic, PR_TRUE);
         observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
         observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, PR_TRUE);
     }
@@ -265,9 +262,19 @@ nsIOService::Init()
 
     gIOService = this;
 
-    // We can't really determine if the machine has a usable network connection,
-    // (mNetworkLinkService will be initialized later) so let's cross our fingers!
-    SetOffline(PR_FALSE);
+    // go into managed mode if we can, and chrome process
+    if (XRE_GetProcessType() == GeckoProcessType_Default)
+        mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
+
+    if (!mNetworkLinkService)
+        // We can't really determine if the machine has a usable network connection,
+        // so let's cross our fingers!
+        mManageOfflineStatus = PR_FALSE;
+
+    if (mManageOfflineStatus)
+        TrackNetworkLinkStatusForOffline();
+    else
+        SetOffline(PR_FALSE);
     
     NS_TIME_FUNCTION_MARK("Set up network link service");
 
@@ -302,42 +309,6 @@ nsIOService::InitializeSocketTransportService()
     return rv;
 }
 
-nsresult
-nsIOService::InitializeNetworkLinkService()
-{
-    NS_TIME_FUNCTION;
-
-    nsresult rv = NS_OK;
-
-    if (mNetworkLinkServiceInitialized)
-      return rv;
-
-    // go into managed mode if we can, and chrome process
-    if (XRE_GetProcessType() == GeckoProcessType_Default)
-    {
-        mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv);
-        if (NS_FAILED(rv)) {
-            NS_WARNING("failed to get network link service");
-            return rv;
-        }
-    }
-  
-    mNetworkLinkServiceInitialized = PR_TRUE;
-
-    if (!mNetworkLinkService) {
-        // We can't really determine if the machine has a usable network connection,
-        // so let's cross our fingers!
-        mManageOfflineStatus = PR_FALSE;
-    }
-
-    if (mManageOfflineStatus)
-        TrackNetworkLinkStatusForOffline();
-    else
-        SetOffline(PR_FALSE);
-    
-    return rv;
-}
-
 nsIOService*
 nsIOService::GetInstance() {
     if (!gIOService) {
@@ -711,9 +682,6 @@ nsIOService::NewChannel(const nsACString &aSpec, const char *aCharset, nsIURI *a
 PRBool
 nsIOService::IsLinkUp()
 {
-    NS_ASSERTION(mNetworkLinkServiceInitialized, 
-                 "network link service should be initialized");
-
     if (!mNetworkLinkService) {
         // We cannot decide, assume the link is up
         return PR_TRUE;
@@ -992,10 +960,6 @@ nsIOService::Observe(nsISupports *subject,
             }
         } 
     }
-    else if (!strcmp(topic, kStartupTopic)) {
-        // Lazy initialization of network link service (see bug 620472)
-        InitializeNetworkLinkService();
-    }
     else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
         // Remember we passed XPCOM shutdown notification to prevent any
         // changes of the offline status from now. We must not allow going
@@ -1113,13 +1077,6 @@ NS_IMETHODIMP
 nsIOService::SetManageOfflineStatus(PRBool aManage) {
     PRBool wasManaged = mManageOfflineStatus;
     mManageOfflineStatus = aManage;
-
-    if (!mNetworkLinkServiceInitialized) {
-        nsresult rv = InitializeNetworkLinkService();
-        if (NS_FAILED(rv))
-            return rv;
-    }
-
     if (mManageOfflineStatus && !wasManaged)
         return TrackNetworkLinkStatusForOffline();
     return NS_OK;
@@ -1136,9 +1093,6 @@ nsIOService::TrackNetworkLinkStatusForOffline()
 {
     NS_ASSERTION(mManageOfflineStatus,
                  "Don't call this unless we're managing the offline status");
-    NS_ASSERTION(mNetworkLinkServiceInitialized, 
-                "network link service should be set up");
-
     if (!mNetworkLinkService)
         return NS_ERROR_FAILURE;
 
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
index 4a82516c46f0..7a1b73b9bb68 100644
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -134,7 +134,6 @@ private:
     NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, PRBool remove);
 
     nsresult InitializeSocketTransportService();
-    nsresult InitializeNetworkLinkService();
 
 private:
     PRPackedBool                         mOffline;
@@ -152,7 +151,6 @@ private:
     nsCOMPtr<nsPIDNSService>             mDNSService;
     nsCOMPtr<nsIProtocolProxyService2>   mProxyService;
     nsCOMPtr<nsINetworkLinkService>      mNetworkLinkService;
-    PRPackedBool                         mNetworkLinkServiceInitialized;
     
     // Cached protocol handlers
     nsWeakPtr                            mWeakHandler[NS_N(gScheme)];

From 82aa8afbcbbedb0e881cda9324b7e784da211c51 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 10 Apr 2011 13:07:35 -0700
Subject: [PATCH 165/509] Bug 648895 - Stop trying to package a nonexistent
 crashreporter_test.xpt, r=ted

---
 testing/xpcshell/Makefile.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
index 96cb0edb8e45..c5a6b93e9b0d 100644
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -78,11 +78,6 @@ TEST_HARNESS_COMPONENTS := \
   httpd.manifest \
   $(NULL)
 
-ifdef MOZ_CRASHREPORTER
-#XXX: should find a better way to do this
-TEST_HARNESS_COMPONENTS +=  crashreporter_test.xpt
-endif
-
 ifdef MOZ_ENABLE_LIBXUL
 TEST_HARNESS_COMPONENTS += xpcom_typelib_test.jar
 endif

From 22ed1678cbf9b129db3299388b5f23b3745fee7d Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 10 Apr 2011 13:23:45 -0700
Subject: [PATCH 166/509] Bug 648898 - Remove the xptinfo tests we don't want
 to bother running, r=bsmedberg

---
 testing/xpcshell/Makefile.in                  |  4 --
 xpcom/tests/Makefile.in                       |  5 --
 xpcom/tests/xptinfo/Makefile.in               | 59 -------------------
 xpcom/tests/xptinfo/xptiITestInterface.idl    | 47 ---------------
 .../xptinfo/xptunit/test_jar_xptloading.js    | 10 ----
 5 files changed, 125 deletions(-)
 delete mode 100644 xpcom/tests/xptinfo/Makefile.in
 delete mode 100644 xpcom/tests/xptinfo/xptiITestInterface.idl
 delete mode 100644 xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js

diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
index c5a6b93e9b0d..b48e2a3db0c7 100644
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -78,10 +78,6 @@ TEST_HARNESS_COMPONENTS := \
   httpd.manifest \
   $(NULL)
 
-ifdef MOZ_ENABLE_LIBXUL
-TEST_HARNESS_COMPONENTS += xpcom_typelib_test.jar
-endif
-
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-package-stage
 
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index d839ae8e4672..f0853c4609ba 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -51,11 +51,6 @@ endif
 
 DIRS		= external component
 
-# Disabled because manifests make this test difficult to run correctly.
-# ifdef MOZ_ENABLE_LIBXUL
-# DIRS += xptinfo
-# endif
-
 ifeq ($(OS_ARCH),WINNT)
 DIRS		+= windows
 endif
diff --git a/xpcom/tests/xptinfo/Makefile.in b/xpcom/tests/xptinfo/Makefile.in
deleted file mode 100644
index d6537a4bb267..000000000000
--- a/xpcom/tests/xptinfo/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Firefox.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation <http://www.mozilla.org>
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = xpcom
-XPIDL_MODULE = xpcom_typelib_testxpt
-NO_DIST_INSTALL = 1
-
-XPIDLSRCS = xptiITestInterface.idl
-
-XPCSHELL_TESTS = xptunit
-
-include $(topsrcdir)/config/rules.mk
-
-xpcom_typelib_test.jar:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-	$(RM) -f $@
-	cd $(XPIDL_GEN_DIR) && $(ZIP) -q ../$(@F) $(^F)
-
-libs:: xpcom_typelib_test.jar
-	$(INSTALL) $^ $(FINAL_TARGET)/components
diff --git a/xpcom/tests/xptinfo/xptiITestInterface.idl b/xpcom/tests/xptinfo/xptiITestInterface.idl
deleted file mode 100644
index 36f368eb379e..000000000000
--- a/xpcom/tests/xptinfo/xptiITestInterface.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Firefox.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation <http://www.mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-/**
- * This interface is not implemented: it exists only for a test of whether
- * we load XPTs from JAR files correctly.
- */
-[scriptable, uuid(13c9fc33-40e6-44dc-81e2-21e0dd41f232)]
-interface xptiITestInterface : nsISupports
-{
-  void testMethod(in unsigned long testArg);
-};
diff --git a/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js b/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js
deleted file mode 100644
index 262998066c85..000000000000
--- a/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function run_test()
-{
-  const xptiITestInterface_IID = "{13c9fc33-40e6-44dc-81e2-21e0dd41f232}";
-
-  var id = Components.interfaces.xptiITestInterface;
-  do_check_true(id != undefined, "xptiITestInterface not registered");
-
-  var id2 = Components.interfacesByID[xptiITestInterface_IID];
-  do_check_true(id.toString() == id2, "xptiITestInterface info doesn't match");
-}

From 8ec5757fea829d0f2ddde7692e34f42abf612259 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 10 Apr 2011 15:34:44 -0700
Subject: [PATCH 167/509] Bug 648889 - Make mochitest-ipcplugins make target
 lie like Tinderbox, r=ted

---
 testing/testsuite-targets.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 383fa05ead40..cdcb2adc4671 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -95,16 +95,16 @@ mochitest-a11y:
 mochitest-ipcplugins:
 ifeq (Darwin,$(OS_ARCH))
 ifeq (i386,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386.test.plugin=true --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386.test.plugin=false --test-path=modules/plugin/test
 endif
 ifeq (x86_64,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64.test.plugin=true --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64.test.plugin=false --test-path=modules/plugin/test
 endif
 ifeq (powerpc,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc.test.plugin=true --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc.test.plugin=false --test-path=modules/plugin/test
 endif
 else
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=true --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=false --test-path=modules/plugin/test
 endif
 	$(CHECK_TEST_ERROR)
 

From 31eddfe58af695df4953fd1a7aefb68898477339 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 12 Apr 2011 16:31:49 +0200
Subject: [PATCH 168/509] Bug 556721 - cleanup test_browserGlue_migrate.js
 r=sdwilsh

---
 .../tests/unit/test_browserGlue_migrate.js    | 121 +++++++-----------
 1 file changed, 43 insertions(+), 78 deletions(-)

diff --git a/browser/components/places/tests/unit/test_browserGlue_migrate.js b/browser/components/places/tests/unit/test_browserGlue_migrate.js
index 7b20268828b3..7f7bf012226e 100644
--- a/browser/components/places/tests/unit/test_browserGlue_migrate.js
+++ b/browser/components/places/tests/unit/test_browserGlue_migrate.js
@@ -1,40 +1,5 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Places Unit Test code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Marco Bonardo <mak77@bonardo.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that nsBrowserGlue does not overwrite bookmarks imported from the
@@ -42,39 +7,13 @@
  * bookmark on init, we should not try to import.
  */
 
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "bs",
-                                   "@mozilla.org/browser/nav-bookmarks-service;1",
-                                   "nsINavBookmarksService");
-XPCOMUtils.defineLazyServiceGetter(this, "anno",
-                                   "@mozilla.org/browser/annotation-service;1",
-                                   "nsIAnnotationService");
-
-let bookmarksObserver = {
-  onBeginUpdateBatch: function() {},
-  onEndUpdateBatch: function() {
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, 0);
-    do_check_neq(itemId, -1);
-    if (anno.itemHasAnnotation(itemId, "Places/SmartBookmark"))
-      continue_test();
-  },
-  onItemAdded: function() {},
-  onBeforeItemRemoved: function(id) {},
-  onItemRemoved: function(id, folder, index, itemType) {},
-  onItemChanged: function() {},
-  onItemVisited: function(id, visitID, time) {},
-  onItemMoved: function() {},
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
-};
-
 const PREF_SMART_BOOKMARKS_VERSION = "browser.places.smartBookmarksVersion";
 
 function run_test() {
   do_test_pending();
 
   // Create our bookmarks.html copying bookmarks.glue.html to the profile
-  // folder.  It will be ignored.
+  // folder.  It should be ignored.
   create_bookmarks_html("bookmarks.glue.html");
 
   // Remove current database file.
@@ -85,35 +24,61 @@ function run_test() {
     do_check_false(db.exists());
   }
 
-  // Initialize Places through the History Service.
-  let hs = Cc["@mozilla.org/browser/nav-history-service;1"].
-           getService(Ci.nsINavHistoryService);
-  // Check a new database has been created.
-  // nsBrowserGlue uses databaseStatus to manage initialization.
-  do_check_eq(hs.databaseStatus, hs.DATABASE_STATUS_CREATE);
+  // Initialize Places through the History Service and check that a new
+  // database has been created.
+  do_check_eq(PlacesUtils.history.databaseStatus,
+              PlacesUtils.history.DATABASE_STATUS_CREATE);
 
   // A migrator would run before nsBrowserGlue, so we mimic that behavior
   // adding a bookmark.
-  bs.insertBookmark(bs.bookmarksMenuFolder, uri("http://mozilla.org/"),
-                    bs.DEFAULT_INDEX, "migrated");
+  PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarks.bookmarksMenuFolder, uri("http://mozilla.org/"),
+                    PlacesUtils.bookmarks.DEFAULT_INDEX, "migrated");
 
   // Initialize nsBrowserGlue.
   let bg = Cc["@mozilla.org/browser/browserglue;1"].
            getService(Ci.nsIBrowserGlue);
 
+  let bookmarksObserver = {
+    onBeginUpdateBatch: function() {},
+    onEndUpdateBatch: function() {
+      // Check if the currently finished batch created the smart bookmarks.
+      let itemId =
+        PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+      do_check_neq(itemId, -1);
+      if (PlacesUtils.annotations
+                     .itemHasAnnotation(itemId, "Places/SmartBookmark")) {
+        do_execute_soon(onSmartBookmarksCreation);
+      }
+    },
+    onItemAdded: function() {},
+    onBeforeItemRemoved: function(id) {},
+    onItemRemoved: function(id, folder, index, itemType) {},
+    onItemChanged: function() {},
+    onItemVisited: function(id, visitID, time) {},
+    onItemMoved: function() {},
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
+  };
   // The test will continue once import has finished and smart bookmarks
   // have been created.
-  bs.addObserver(bookmarksObserver, false);
+  PlacesUtils.bookmarks.addObserver(bookmarksObserver, false);
 }
 
-function continue_test() {
+function onSmartBookmarksCreation() {
   // Check the created bookmarks still exist.
-  let itemId = bs.getIdForItemAt(bs.bookmarksMenuFolder, SMART_BOOKMARKS_ON_MENU);
-  do_check_eq(bs.getItemTitle(itemId), "migrated");
+  let itemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.bookmarksMenuFolderId,
+                                         SMART_BOOKMARKS_ON_MENU);
+  do_check_eq(PlacesUtils.bookmarks.getItemTitle(itemId), "migrated");
 
   // Check that we have not imported any new bookmark.
-  do_check_eq(bs.getIdForItemAt(bs.bookmarksMenuFolder, SMART_BOOKMARKS_ON_MENU + 1), -1);
-  do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, SMART_BOOKMARKS_ON_MENU), -1);
+  itemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.bookmarksMenuFolderId,
+                                         SMART_BOOKMARKS_ON_MENU + 1)
+  do_check_eq(itemId, -1);
+  itemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                         SMART_BOOKMARKS_ON_MENU)
+  do_check_eq(itemId, -1);
 
   remove_bookmarks_html();
 

From 2e6252cf4bbc84866f03be378a4cc7390c4e0433 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 12 Apr 2011 16:32:20 +0200
Subject: [PATCH 169/509] Bug 553885 - cleanup and re-enable
 test_browserGlue_distribution.js r=sdwilsh

---
 browser/components/nsBrowserGlue.js           |   3 +
 .../unit/test_browserGlue_distribution.js     | 150 ++++++------------
 2 files changed, 55 insertions(+), 98 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index ba4850e1e804..c1b6aaadab1b 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -261,6 +261,9 @@ BrowserGlue.prototype = {
         else if (data == "force-ui-migration") {
           this._migrateUI();
         }
+        else if (data == "force-distribution-customization") {
+          this._distributionCustomizer.applyCustomizations();
+        }
         break;
     }
   }, 
diff --git a/browser/components/places/tests/unit/test_browserGlue_distribution.js b/browser/components/places/tests/unit/test_browserGlue_distribution.js
index deabf7e7d42c..8b2d7d1f240b 100644
--- a/browser/components/places/tests/unit/test_browserGlue_distribution.js
+++ b/browser/components/places/tests/unit/test_browserGlue_distribution.js
@@ -1,62 +1,20 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Places Unit Test code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Marco Bonardo <mak77@bonardo.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
- * Tests that nsBrowserGlue does not overwrite bookmarks imported from the
- * migrators.  They usually run before nsBrowserGlue, so if we find any
- * bookmark on init, we should not try to import.
+ * Tests that nsBrowserGlue correctly imports bookmarks from distribution.ini.
  */
 
 const PREF_SMART_BOOKMARKS_VERSION = "browser.places.smartBookmarksVersion";
 const PREF_BMPROCESSED = "distribution.516444.bookmarksProcessed";
 const PREF_DISTRIBUTION_ID = "distribution.id";
 
-const TOPIC_FINAL_UI_STARTUP = "final-ui-startup";
+const TOPICDATA_DISTRIBUTION_CUSTOMIZATION = "force-distribution-customization";
 const TOPIC_CUSTOMIZATION_COMPLETE = "distribution-customization-complete";
+const TOPIC_BROWSERGLUE_TEST = "browser-glue-test";
 
-function run_test() {
-  // This is needed but we still have to investigate the reason, could just be
-  // we try to act too late in the game, moving our shutdown earlier will help.
-  let hs = Cc["@mozilla.org/browser/nav-history-service;1"].
-         getService(Ci.nsINavHistoryService);
-  // TODO: re-enable when bug 523936 is fixed.
-  return;
-
+function run_test()
+{
   do_test_pending();
 
   // Copy distribution.ini file to our app dir.
@@ -68,82 +26,78 @@ function run_test() {
     iniFile.remove(false);
     print("distribution.ini already exists, did some test forget to cleanup?");
   }
-
   let testDistributionFile = gTestDir.clone();
   testDistributionFile.append("distribution.ini");
   testDistributionFile.copyTo(distroDir, "distribution.ini");
   do_check_true(testDistributionFile.exists());
 
   // Disable Smart Bookmarks creation.
-  let ps = Cc["@mozilla.org/preferences-service;1"].
-           getService(Ci.nsIPrefBranch);
-  ps.setIntPref(PREF_SMART_BOOKMARKS_VERSION, -1);
-  // Avoid migrateUI, we are just simulating a partial startup.
-  ps.setIntPref("browser.migration.version", 4);
+  Services.prefs.setIntPref(PREF_SMART_BOOKMARKS_VERSION, -1);
 
-  // Initialize Places through the History Service.
-  let hs = Cc["@mozilla.org/browser/nav-history-service;1"].
-           getService(Ci.nsINavHistoryService);
-  // Check a new database has been created.
-  // nsBrowserGlue will use databaseStatus to manage initialization.
-  do_check_eq(hs.databaseStatus, hs.DATABASE_STATUS_CREATE);
+  // Initialize Places through the History Service and check that a new
+  // database has been created.
+  do_check_eq(PlacesUtils.history.databaseStatus,
+              PlacesUtils.history.DATABASE_STATUS_CREATE);
 
   // Initialize nsBrowserGlue.
   let bg = Cc["@mozilla.org/browser/browserglue;1"].
            getService(Ci.nsIBrowserGlue);
 
-  let os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  let observer = {
-    observe: function(aSubject, aTopic, aData) {
-      os.removeObserver(this, PlacesUtils.TOPIC_INIT_COMPLETE);
-
-      // Simulate browser startup.
-      bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                                TOPIC_FINAL_UI_STARTUP,
-                                                null);
-      // Test will continue on customization complete notification.
-      let cObserver = {
-        observe: function(aSubject, aTopic, aData) {
-          os.removeObserver(this, TOPIC_CUSTOMIZATION_COMPLETE);
-          do_execute_soon(continue_test);
-        }
-      }
-      os.addObserver(cObserver, TOPIC_CUSTOMIZATION_COMPLETE, false);
-    }
-  }
-  os.addObserver(observer, PlacesUtils.TOPIC_INIT_COMPLETE, false);
+  Services.obs.addObserver(function(aSubject, aTopic, aData) {
+    Services.obs.removeObserver(arguments.callee,
+                                PlacesUtils.TOPIC_INIT_COMPLETE);
+    do_execute_soon(onPlacesInitComplete);
+  }, PlacesUtils.TOPIC_INIT_COMPLETE, false);
 }
 
-function continue_test() {
-  let bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
-           getService(Ci.nsINavBookmarksService);
+function onPlacesInitComplete()
+{
+  // Simulate browser startup.
+  bg.QueryInterface(Ci.nsIObserver).observe(null,
+                                            TOPIC_BROWSERGLUE_TEST,
+                                            TOPICDATA_DISTRIBUTION_CUSTOMIZATION);
 
-  dump_table("moz_bookmarks");
+  // Test will continue on customization complete notification.
+  Services.obs.addObserver(function(aSubject, aTopic, aData) {
+    Services.obs.removeObserver(arguments.callee,
+                                TOPIC_CUSTOMIZATION_COMPLETE);
+    do_execute_soon(onCustomizationComplete);
+  }, TOPIC_CUSTOMIZATION_COMPLETE, false);
+}
 
+function onCustomizationComplete()
+{
   // Check the custom bookmarks exist on menu.
-  let menuItemId = bs.getIdForItemAt(bs.bookmarksMenuFolder, 0);
+  let menuItemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.bookmarksMenuFolderId, 0);
   do_check_neq(menuItemId, -1);
-  do_check_eq(bs.getItemTitle(menuItemId), "Menu Link Before");
-  menuItemId = bs.getIdForItemAt(bs.bookmarksMenuFolder, 1 + DEFAULT_BOOKMARKS_ON_MENU);
+  do_check_eq(PlacesUtils.bookmarks.getItemTitle(menuItemId),
+              "Menu Link Before");
+  menuItemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.bookmarksMenuFolderId,
+                                         1 + DEFAULT_BOOKMARKS_ON_MENU);
   do_check_neq(menuItemId, -1);
-  do_check_eq(bs.getItemTitle(menuItemId), "Menu Link After");
+  do_check_eq(PlacesUtils.bookmarks.getItemTitle(menuItemId),
+              "Menu Link After");
 
   // Check the custom bookmarks exist on toolbar.
-  let toolbarItemId = bs.getIdForItemAt(bs.toolbarFolder, 0);
+  let toolbarItemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
   do_check_neq(toolbarItemId, -1);
-  do_check_eq(bs.getItemTitle(toolbarItemId), "Toolbar Link Before");
-  toolbarItemId = bs.getIdForItemAt(bs.toolbarFolder, 1 + DEFAULT_BOOKMARKS_ON_TOOLBAR);
+  do_check_eq(PlacesUtils.bookmarks.getItemTitle(toolbarItemId),
+              "Toolbar Link Before");
+  toolbarItemId =
+    PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                         1 + DEFAULT_BOOKMARKS_ON_TOOLBAR);
   do_check_neq(toolbarItemId, -1);
-  do_check_eq(bs.getItemTitle(toolbarItemId), "Toolbar Link After");
+  do_check_eq(PlacesUtils.bookmarks.getItemTitle(toolbarItemId),
+              "Toolbar Link After");
 
   // Check the bmprocessed pref has been created.
-  let ps = Cc["@mozilla.org/preferences-service;1"].
-           getService(Ci.nsIPrefBranch);
-  do_check_true(ps.getBoolPref(PREF_BMPROCESSED));
+  do_check_true(Services.prefs.getBoolPref(PREF_BMPROCESSED));
 
   // Check distribution prefs have been created.
-  do_check_eq(ps.getCharPref(PREF_DISTRIBUTION_ID), "516444");
+  do_check_eq(Services.prefs.getCharPref(PREF_DISTRIBUTION_ID), "516444");
 
   do_test_finished();
 }

From 5bb4b591e820bb5094954403a65512306b30c403 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 13 Apr 2011 02:43:28 +0200
Subject: [PATCH 170/509] Bug 539067 - Cleanup and re-enable
 test_browserGlue_prefs.js. r=sdwilsh

---
 browser/components/nsBrowserGlue.js           |   3 +
 .../tests/unit/test_browserGlue_prefs.js      | 362 ++++++++----------
 2 files changed, 173 insertions(+), 192 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c1b6aaadab1b..07cd11dc43ec 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -264,6 +264,9 @@ BrowserGlue.prototype = {
         else if (data == "force-distribution-customization") {
           this._distributionCustomizer.applyCustomizations();
         }
+        else if (data == "force-places-init") {
+          this._initPlaces();
+        }
         break;
     }
   }, 
diff --git a/browser/components/places/tests/unit/test_browserGlue_prefs.js b/browser/components/places/tests/unit/test_browserGlue_prefs.js
index f899e8205080..18abaca2f525 100644
--- a/browser/components/places/tests/unit/test_browserGlue_prefs.js
+++ b/browser/components/places/tests/unit/test_browserGlue_prefs.js
@@ -1,287 +1,265 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Places Unit Test code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Marco Bonardo <mak77@bonardo.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that nsBrowserGlue is correctly interpreting the preferences settable
  * by the user or by other components.
  */
 
-/** Bug 539067
- * Test is disabled due to random failures and timeouts, see run_test.
- * This is commented out to avoid leaks.
-// Initialize browserGlue.
-let bg = Cc["@mozilla.org/browser/browserglue;1"].
-         getService(Ci.nsIBrowserGlue);
-*/
-
-// Initialize Places through Bookmarks Service.
-let bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
-         getService(Ci.nsINavBookmarksService);
-
-// Get other services.
-let ps = Cc["@mozilla.org/preferences-service;1"].
-         getService(Ci.nsIPrefBranch);
-let os = Cc["@mozilla.org/observer-service;1"].
-         getService(Ci.nsIObserverService);
-
 const PREF_IMPORT_BOOKMARKS_HTML = "browser.places.importBookmarksHTML";
 const PREF_RESTORE_DEFAULT_BOOKMARKS = "browser.bookmarks.restore_default_bookmarks";
 const PREF_SMART_BOOKMARKS_VERSION = "browser.places.smartBookmarksVersion";
 const PREF_AUTO_EXPORT_HTML = "browser.bookmarks.autoExportHTML";
 
-let tests = [];
-//------------------------------------------------------------------------------
+const TOPIC_BROWSERGLUE_TEST = "browser-glue-test";
+const TOPICDATA_FORCE_PLACES_INIT = "force-places-init";
 
-tests.push({
-  description: "Import from bookmarks.html if importBookmarksHTML is true.",
-  exec: function() {
+let bg = Cc["@mozilla.org/browser/browserglue;1"].
+         getService(Ci.nsIBrowserGlue);
+
+let gTests = [
+
+  // This test must be the first one.
+  function test_checkPreferences() {
+    // Initialize Places through the History Service and check that a new
+    // database has been created.
+    do_check_eq(PlacesUtils.history.databaseStatus,
+                PlacesUtils.history.DATABASE_STATUS_CREATE);
+
+    // Wait for Places init notification.
+    Services.obs.addObserver(function(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(arguments.callee,
+                                  PlacesUtils.TOPIC_INIT_COMPLETE);
+      do_execute_soon(function () {
+        // Ensure preferences status.
+        do_check_false(Services.prefs.getBoolPref(PREF_AUTO_EXPORT_HTML));
+
+        try {
+          do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+          do_throw("importBookmarksHTML pref should not exist");
+        }
+        catch(ex) {}
+
+        try {
+          do_check_false(Services.prefs.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
+          do_throw("importBookmarksHTML pref should not exist");
+        }
+        catch(ex) {}
+
+        run_next_test();
+      });
+    }, PlacesUtils.TOPIC_INIT_COMPLETE, false);
+  },
+
+  function test_import()
+  {
+    do_log_info("Import from bookmarks.html if importBookmarksHTML is true.");
+
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
 
     // Set preferences.
-    ps.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
+    Services.prefs.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
 
     // Force nsBrowserGlue::_initPlaces().
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been imported, and a smart bookmark has been
     // created.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder,
-                                   SMART_BOOKMARKS_ON_TOOLBAR);
-    do_check_eq(bs.getItemTitle(itemId), "example");
+    itemId = PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                                  SMART_BOOKMARKS_ON_TOOLBAR);
+    do_check_eq(PlacesUtils.bookmarks.getItemTitle(itemId), "example");
     // Check preferences have been reverted.
-    do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+    do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
 
-    next_test();
-  }
-});
+    run_next_test();
+  },
 
-//------------------------------------------------------------------------------
+  function test_import_noSmartBookmarks()
+  {
+    do_log_info("import from bookmarks.html, but don't create smart bookmarks \
+                 if they are disabled");
 
-tests.push({
-  description: "import from bookmarks.html, but don't create smart bookmarks if they are disabled",
-  exec: function() {
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
 
     // Set preferences.
-    ps.setIntPref(PREF_SMART_BOOKMARKS_VERSION, -1);
-    ps.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
+    Services.prefs.setIntPref(PREF_SMART_BOOKMARKS_VERSION, -1);
+    Services.prefs.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
 
     // Force nsBrowserGlue::_initPlaces().
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been imported, but smart bookmarks have not
     // been created.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, 0);
-    do_check_eq(bs.getItemTitle(itemId), "example");
+    itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(PlacesUtils.bookmarks.getItemTitle(itemId), "example");
     // Check preferences have been reverted.
-    do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+    do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
 
-    next_test();
-  }
-});
+    run_next_test();
+  },
 
-//------------------------------------------------------------------------------
+  function test_import_autoExport_updatedSmartBookmarks()
+  {
+    do_log_info("Import from bookmarks.html, but don't create smart bookmarks \
+                 if autoExportHTML is true and they are at latest version");
 
-tests.push({
-  description: "Import from bookmarks.html, but don't create smart bookmarks if autoExportHTML is true and they are at latest version",
-  exec: function() {
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
+
     // Set preferences.
-    ps.setIntPref(PREF_SMART_BOOKMARKS_VERSION, 999);
-    ps.setBoolPref(PREF_AUTO_EXPORT_HTML, true);
-    ps.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
+    Services.prefs.setIntPref(PREF_SMART_BOOKMARKS_VERSION, 999);
+    Services.prefs.setBoolPref(PREF_AUTO_EXPORT_HTML, true);
+    Services.prefs.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
 
     // Force nsBrowserGlue::_initPlaces()
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been imported, but smart bookmarks have not
     // been created.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, 0);
-    do_check_eq(bs.getItemTitle(itemId), "example");
-    do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+    itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(PlacesUtils.bookmarks.getItemTitle(itemId), "example");
+    do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
     // Check preferences have been reverted.
-    ps.setBoolPref(PREF_AUTO_EXPORT_HTML, false);
+    Services.prefs.setBoolPref(PREF_AUTO_EXPORT_HTML, false);
 
-    next_test();
-  }
-});
+    run_next_test();
+  },
 
-//------------------------------------------------------------------------------
+  function test_import_autoExport_oldSmartBookmarks()
+  {
+    do_log_info("Import from bookmarks.html, and create smart bookmarks if \
+                 autoExportHTML is true and they are not at latest version.");
 
-tests.push({
-  description: "Import from bookmarks.html, and create smart bookmarks if autoExportHTML is true and they are not at latest version.",
-  exec: function() {
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
+
     // Set preferences.
-    ps.setIntPref(PREF_SMART_BOOKMARKS_VERSION, 0);
-    ps.setBoolPref(PREF_AUTO_EXPORT_HTML, true);
-    ps.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
+    Services.prefs.setIntPref(PREF_SMART_BOOKMARKS_VERSION, 0);
+    Services.prefs.setBoolPref(PREF_AUTO_EXPORT_HTML, true);
+    Services.prefs.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
 
     // Force nsBrowserGlue::_initPlaces()
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been imported, but smart bookmarks have not
     // been created.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, SMART_BOOKMARKS_ON_TOOLBAR);
-    do_check_eq(bs.getItemTitle(itemId), "example");
-    do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+    itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                           SMART_BOOKMARKS_ON_TOOLBAR);
+    do_check_eq(PlacesUtils.bookmarks.getItemTitle(itemId), "example");
+    do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
     // Check preferences have been reverted.
-    ps.setBoolPref(PREF_AUTO_EXPORT_HTML, false);
+    Services.prefs.setBoolPref(PREF_AUTO_EXPORT_HTML, false);
 
-    next_test();
-  }
-});
+    run_next_test();
+  },
 
-//------------------------------------------------------------------------------
-tests.push({
-  description: "restore from default bookmarks.html if restore_default_bookmarks is true.",
-  exec: function() {
+  function test_restore()
+  {
+    do_log_info("restore from default bookmarks.html if \
+                 restore_default_bookmarks is true.");
+
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
+
     // Set preferences.
-    ps.setBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS, true);
+    Services.prefs.setBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS, true);
 
     // Force nsBrowserGlue::_initPlaces()
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been restored.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, SMART_BOOKMARKS_ON_TOOLBAR + 1);
+    itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                           SMART_BOOKMARKS_ON_TOOLBAR + 1);
     do_check_true(itemId > 0);
     // Check preferences have been reverted.
-    do_check_false(ps.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
+    do_check_false(Services.prefs.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
 
-    next_test();
-  }
-});
+    run_next_test();
+  },
 
-//------------------------------------------------------------------------------
+  function test_restore_import()
+  {
+    do_log_info("setting both importBookmarksHTML and \
+                 restore_default_bookmarks should restore defaults.");
 
-tests.push({
-  description: "setting both importBookmarksHTML and restore_default_bookmarks should restore defaults.",
-  exec: function() {
+    remove_all_bookmarks();
     // Sanity check: we should not have any bookmark on the toolbar.
-    do_check_eq(bs.getIdForItemAt(bs.toolbarFolder, 0), -1);
+    let itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId, 0);
+    do_check_eq(itemId, -1);
+
     // Set preferences.
-    ps.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
-    ps.setBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS, true);
+    Services.prefs.setBoolPref(PREF_IMPORT_BOOKMARKS_HTML, true);
+    Services.prefs.setBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS, true);
 
     // Force nsBrowserGlue::_initPlaces()
     print("Simulate Places init");
     bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                              PlacesUtils.TOPIC_INIT_COMPLETE,
-                                              null);
+                                              TOPIC_BROWSERGLUE_TEST,
+                                              TOPICDATA_FORCE_PLACES_INIT);
+
     // Check bookmarks.html has been restored.
-    let itemId = bs.getIdForItemAt(bs.toolbarFolder, SMART_BOOKMARKS_ON_TOOLBAR + 1);
+    itemId =
+      PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.toolbarFolderId,
+                                           SMART_BOOKMARKS_ON_TOOLBAR + 1);
     do_check_true(itemId > 0);
     // Check preferences have been reverted.
-    do_check_false(ps.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
-    do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
+    do_check_false(Services.prefs.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
+    do_check_false(Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
 
-    do_test_finished();
+    run_next_test();
   }
-});
 
-//------------------------------------------------------------------------------
+];
 
-function finish_test() {
-  // Clean up database from all bookmarks.
+do_register_cleanup(function () {
   remove_all_bookmarks();
   remove_bookmarks_html();
   remove_all_JSON_backups();
+});
 
-  do_test_finished();
-}
-var testIndex = 0;
-function next_test() {
-  // Clean up database from all bookmarks.
-  remove_all_bookmarks();
-  // nsBrowserGlue stops observing topics after first notification,
-  // so we add back the observer to test additional runs.
-  os.addObserver(bg.QueryInterface(Ci.nsIObserver),
-                 PlacesUtils.TOPIC_INIT_COMPLETE, false);
-  os.addObserver(bg.QueryInterface(Ci.nsIObserver),
-                 PlacesUtils.TOPIC_DATABASE_LOCKED, false);
-  // Execute next test.
-  let test = tests.shift();
-  print("\nTEST " + (++testIndex) + ": " + test.description);
-  test.exec();
-}
-function run_test() {
-  // Bug 539067: disabled due to random failures and timeouts.
-  return;
-
-  do_test_pending();
-  // Enqueue test, so it will consume the default places-init-complete
-  // notification created at Places init.
-  do_timeout(0, start_tests);
-}
-
-function start_tests() {
-  // Clean up database from all bookmarks.
-  remove_all_bookmarks();
-
-  // Ensure preferences status.
-  do_check_false(ps.getBoolPref(PREF_AUTO_EXPORT_HTML));
-  try {
-  do_check_false(ps.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
-    do_throw("importBookmarksHTML pref should not exist");
-  }
-  catch(ex) {}
-  do_check_false(ps.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
-
+function run_test()
+{
   // Create our bookmarks.html from bookmarks.glue.html.
   create_bookmarks_html("bookmarks.glue.html");
   // Create our JSON backup from bookmarks.glue.json.
   create_JSON_backup("bookmarks.glue.json");
-  // Kick-off tests.
-  next_test();
+
+  run_next_test();
 }

From 03630ce10c8436d9604f79bdbf9bce374e5d5ace Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 13 Apr 2011 03:15:39 +0200
Subject: [PATCH 171/509] Bug 553885 - Followup for permaorange.

---
 browser/components/nsBrowserGlue.js           |  2 ++
 .../unit/test_browserGlue_distribution.js     | 25 ++++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 07cd11dc43ec..48e66388a53d 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -262,7 +262,9 @@ BrowserGlue.prototype = {
           this._migrateUI();
         }
         else if (data == "force-distribution-customization") {
+          this._distributionCustomizer.applyPrefDefaults();
           this._distributionCustomizer.applyCustomizations();
+          // To apply distribution bookmarks use "places-init-complete".
         }
         else if (data == "force-places-init") {
           this._initPlaces();
diff --git a/browser/components/places/tests/unit/test_browserGlue_distribution.js b/browser/components/places/tests/unit/test_browserGlue_distribution.js
index 8b2d7d1f240b..87a73725d649 100644
--- a/browser/components/places/tests/unit/test_browserGlue_distribution.js
+++ b/browser/components/places/tests/unit/test_browserGlue_distribution.js
@@ -39,28 +39,17 @@ function run_test()
   do_check_eq(PlacesUtils.history.databaseStatus,
               PlacesUtils.history.DATABASE_STATUS_CREATE);
 
-  // Initialize nsBrowserGlue.
-  let bg = Cc["@mozilla.org/browser/browserglue;1"].
-           getService(Ci.nsIBrowserGlue);
-
-  Services.obs.addObserver(function(aSubject, aTopic, aData) {
-    Services.obs.removeObserver(arguments.callee,
-                                PlacesUtils.TOPIC_INIT_COMPLETE);
-    do_execute_soon(onPlacesInitComplete);
-  }, PlacesUtils.TOPIC_INIT_COMPLETE, false);
-}
-
-function onPlacesInitComplete()
-{
-  // Simulate browser startup.
-  bg.QueryInterface(Ci.nsIObserver).observe(null,
-                                            TOPIC_BROWSERGLUE_TEST,
-                                            TOPICDATA_DISTRIBUTION_CUSTOMIZATION);
+  // Force distribution.
+  Cc["@mozilla.org/browser/browserglue;1"].
+  getService(Ci.nsIObserver).observe(null,
+                                     TOPIC_BROWSERGLUE_TEST,
+                                     TOPICDATA_DISTRIBUTION_CUSTOMIZATION);
 
   // Test will continue on customization complete notification.
   Services.obs.addObserver(function(aSubject, aTopic, aData) {
     Services.obs.removeObserver(arguments.callee,
-                                TOPIC_CUSTOMIZATION_COMPLETE);
+                                TOPIC_CUSTOMIZATION_COMPLETE,
+                                false);
     do_execute_soon(onCustomizationComplete);
   }, TOPIC_CUSTOMIZATION_COMPLETE, false);
 }

From b7bebde4cc354f424c90e706c709764c258511b2 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 14 Apr 2011 13:48:01 -0400
Subject: [PATCH 172/509] Bug 648876 - Remove superfluous $(OS_ARCH)
 filter-outs from js/src/Makefile.in (bug 647389 follow-up); r=jimb

---
 js/src/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index fce9fad467a1..139c9bf5d38c 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -60,7 +60,7 @@ DIRS += shell
 endif
 
 # FIXME: bug 530688 covers getting these working on Android
-ifneq (,$(filter-out ANDROID,$(OS_ARCH)))
+ifneq ($(OS_ARCH),ANDROID)
 ifdef ENABLE_TESTS
 DIRS += jsapi-tests
 endif
@@ -495,7 +495,7 @@ else
 CPPSRCS += pm_stub.cpp
 endif
 
-ifeq (,$(filter-out WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 INSTALLED_HEADERS += jscpucfg.h
 endif
 
@@ -537,7 +537,7 @@ endif
 default::
 
 ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
-ifneq (,$(filter-out SYMBIAN,$(OS_ARCH)))
+ifneq ($(OS_ARCH),SYMBIAN)
 # nsinstall doesn't get built until we enter config/ in the exports phase,
 # so we'll have to manually ensure it gets built here if we want to use
 # $(EXPORTS)

From 470cfd605b2708e31dfc0841f4793295abd3acff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Thu, 14 Apr 2011 13:51:19 -0400
Subject: [PATCH 173/509] Bug 648871 - use NS_STDCALL_FUNCPROTO; r=bzbarsky

---
 content/canvas/src/CustomQS_Canvas2D.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/canvas/src/CustomQS_Canvas2D.h b/content/canvas/src/CustomQS_Canvas2D.h
index 27fe1890d870..5f761641ad53 100644
--- a/content/canvas/src/CustomQS_Canvas2D.h
+++ b/content/canvas/src/CustomQS_Canvas2D.h
@@ -43,8 +43,10 @@
 #include "CheckedInt.h"
 #include "nsMathUtils.h"
 
-typedef nsresult (NS_STDCALL nsIDOMCanvasRenderingContext2D::*CanvasStyleSetterType)(const nsAString &, nsISupports *);
-typedef nsresult (NS_STDCALL nsIDOMCanvasRenderingContext2D::*CanvasStyleGetterType)(nsAString &, nsISupports **, PRInt32 *);
+typedef NS_STDCALL_FUNCPROTO(nsresult, CanvasStyleSetterType, nsIDOMCanvasRenderingContext2D,
+                             SetStrokeStyle_multi, (const nsAString &, nsISupports *));
+typedef NS_STDCALL_FUNCPROTO(nsresult, CanvasStyleGetterType, nsIDOMCanvasRenderingContext2D,
+                             GetStrokeStyle_multi, (nsAString &, nsISupports **, PRInt32 *));
 
 static JSBool
 Canvas2D_SetStyleHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,

From 25377361b8bf86583622737be701272323745e05 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 14 Apr 2011 13:53:25 -0400
Subject: [PATCH 174/509] Bug 627672 - XPCOM component (libdbusservice.so) is
 not registered although it should be; r=cbiesinger

---
 netwerk/base/src/nsIOService.cpp | 72 ++++++++++++++++++++++++++------
 netwerk/base/src/nsIOService.h   |  2 +
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 7401cf9ec545..8ca6fff8c693 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -165,6 +165,7 @@ PRInt16 gBadPortList[] = {
 
 static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
 static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
+static const char kStartupTopic[] = "profile-after-change";
 
 // Necko buffer cache
 nsIMemory* nsIOService::gBufferCache = nsnull;
@@ -180,6 +181,7 @@ nsIOService::nsIOService()
     , mSettingOffline(PR_FALSE)
     , mSetOfflineValue(PR_FALSE)
     , mShutdown(PR_FALSE)
+    , mNetworkLinkServiceInitialized(PR_FALSE)
     , mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
     , mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
 {
@@ -234,6 +236,7 @@ nsIOService::Init()
     if (observerService) {
         observerService->AddObserver(this, kProfileChangeNetTeardownTopic, PR_TRUE);
         observerService->AddObserver(this, kProfileChangeNetRestoreTopic, PR_TRUE);
+        observerService->AddObserver(this, kStartupTopic, PR_TRUE);
         observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
         observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, PR_TRUE);
     }
@@ -262,19 +265,9 @@ nsIOService::Init()
 
     gIOService = this;
 
-    // go into managed mode if we can, and chrome process
-    if (XRE_GetProcessType() == GeckoProcessType_Default)
-        mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
-
-    if (!mNetworkLinkService)
-        // We can't really determine if the machine has a usable network connection,
-        // so let's cross our fingers!
-        mManageOfflineStatus = PR_FALSE;
-
-    if (mManageOfflineStatus)
-        TrackNetworkLinkStatusForOffline();
-    else
-        SetOffline(PR_FALSE);
+    // We can't really determine if the machine has a usable network connection,
+    // (mNetworkLinkService will be initialized later) so let's cross our fingers!
+    SetOffline(PR_FALSE);
     
     NS_TIME_FUNCTION_MARK("Set up network link service");
 
@@ -309,6 +302,42 @@ nsIOService::InitializeSocketTransportService()
     return rv;
 }
 
+nsresult
+nsIOService::InitializeNetworkLinkService()
+{
+    NS_TIME_FUNCTION;
+
+    nsresult rv = NS_OK;
+
+    if (mNetworkLinkServiceInitialized)
+      return rv;
+
+    // go into managed mode if we can, and chrome process
+    if (XRE_GetProcessType() == GeckoProcessType_Default)
+    {
+        mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv);
+        if (NS_FAILED(rv)) {
+            NS_WARNING("failed to get network link service");
+            return rv;
+        }
+    }
+  
+    mNetworkLinkServiceInitialized = PR_TRUE;
+
+    if (!mNetworkLinkService) {
+        // We can't really determine if the machine has a usable network connection,
+        // so let's cross our fingers!
+        mManageOfflineStatus = PR_FALSE;
+    }
+
+    if (mManageOfflineStatus)
+        TrackNetworkLinkStatusForOffline();
+    else
+        SetOffline(PR_FALSE);
+    
+    return rv;
+}
+
 nsIOService*
 nsIOService::GetInstance() {
     if (!gIOService) {
@@ -682,6 +711,9 @@ nsIOService::NewChannel(const nsACString &aSpec, const char *aCharset, nsIURI *a
 PRBool
 nsIOService::IsLinkUp()
 {
+    NS_ASSERTION(mNetworkLinkServiceInitialized, 
+                 "network link service should be initialized");
+
     if (!mNetworkLinkService) {
         // We cannot decide, assume the link is up
         return PR_TRUE;
@@ -960,6 +992,10 @@ nsIOService::Observe(nsISupports *subject,
             }
         } 
     }
+    else if (!strcmp(topic, kStartupTopic)) {
+        // Lazy initialization of network link service (see bug 620472)
+        InitializeNetworkLinkService();
+    }
     else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
         // Remember we passed XPCOM shutdown notification to prevent any
         // changes of the offline status from now. We must not allow going
@@ -1077,6 +1113,13 @@ NS_IMETHODIMP
 nsIOService::SetManageOfflineStatus(PRBool aManage) {
     PRBool wasManaged = mManageOfflineStatus;
     mManageOfflineStatus = aManage;
+
+    if (!mNetworkLinkServiceInitialized) {
+        nsresult rv = InitializeNetworkLinkService();
+        if (NS_FAILED(rv))
+            return rv;
+    }
+
     if (mManageOfflineStatus && !wasManaged)
         return TrackNetworkLinkStatusForOffline();
     return NS_OK;
@@ -1093,6 +1136,9 @@ nsIOService::TrackNetworkLinkStatusForOffline()
 {
     NS_ASSERTION(mManageOfflineStatus,
                  "Don't call this unless we're managing the offline status");
+    NS_ASSERTION(mNetworkLinkServiceInitialized, 
+                "network link service should be set up");
+
     if (!mNetworkLinkService)
         return NS_ERROR_FAILURE;
 
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
index 7a1b73b9bb68..4a82516c46f0 100644
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -134,6 +134,7 @@ private:
     NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, PRBool remove);
 
     nsresult InitializeSocketTransportService();
+    nsresult InitializeNetworkLinkService();
 
 private:
     PRPackedBool                         mOffline;
@@ -151,6 +152,7 @@ private:
     nsCOMPtr<nsPIDNSService>             mDNSService;
     nsCOMPtr<nsIProtocolProxyService2>   mProxyService;
     nsCOMPtr<nsINetworkLinkService>      mNetworkLinkService;
+    PRPackedBool                         mNetworkLinkServiceInitialized;
     
     // Cached protocol handlers
     nsWeakPtr                            mWeakHandler[NS_N(gScheme)];

From 335edaff0fb4523d75a0d5b4627ff660f85fd0e1 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 14 Apr 2011 13:54:59 -0400
Subject: [PATCH 175/509] Bug 649078 - Remove WinCE installer code from
 mobile/installer/wince/* and related build configs; r=dougt

---
 mobile/Makefile.in                   |   4 -
 mobile/app/Makefile.in               |  16 +---
 mobile/build.mk                      |   4 -
 mobile/installer/Makefile.in         |  32 -------
 mobile/installer/package-manifest.in |  27 +-----
 mobile/installer/wince/Makefile.in   |  59 ------------
 mobile/installer/wince/Setup.cpp     | 130 ---------------------------
 mobile/installer/wince/Setup.def     |   6 --
 mobile/locales/Makefile.in           |  14 ---
 9 files changed, 2 insertions(+), 290 deletions(-)
 delete mode 100644 mobile/installer/wince/Makefile.in
 delete mode 100644 mobile/installer/wince/Setup.cpp
 delete mode 100644 mobile/installer/wince/Setup.def

diff --git a/mobile/Makefile.in b/mobile/Makefile.in
index 056d49998877..fe5b575b65f9 100644
--- a/mobile/Makefile.in
+++ b/mobile/Makefile.in
@@ -49,10 +49,6 @@ ifndef LIBXUL_SDK
 PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit
 endif
 
-ifdef WINCE
-DIRS += installer/wince
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
 
diff --git a/mobile/app/Makefile.in b/mobile/app/Makefile.in
index 7fd88888ffe8..6fb5cb1125e9 100644
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@@ -90,12 +90,8 @@ endif # BUILD_STATIC_LIBS
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 endif #LIBXUL_SDK
 
 include $(topsrcdir)/config/rules.mk
@@ -134,13 +130,6 @@ ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-ifdef WINCE
-DEFINES += -DWINCE=1
-endif
-
-ifeq ($(OS_ARCH),WINCE)
-REDIT_PATH = $(LIBXUL_DIST)/host/bin
-endif
 ifeq ($(OS_ARCH),WINNT)
 REDIT_PATH = $(LIBXUL_DIST)/bin
 endif
@@ -196,9 +185,6 @@ ifdef LIBXUL_SDK
 endif
 ifdef MOZ_FASTSTART
 ifdef _MSC_VER
-ifdef WINCE
-	cp $(LIBXUL_DIST)/bin/faststartstub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY_FASTSTART)
-endif
 endif
 endif
 ifndef SKIP_COPY_XULRUNNER
@@ -210,7 +196,7 @@ endif # SKIP_COPY_XULRUNNER
 
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico
 	cp $(srcdir)/$(APP_SPLASH).bmp $(DIST)/bin/$(APP_SPLASH).bmp
 	$(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico
diff --git a/mobile/build.mk b/mobile/build.mk
index 062d5b41626e..b082d1b21c81 100644
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -69,11 +69,7 @@ installer:
 
 package:
 	rm -rf dist/fennec*
-ifeq ($(OS_ARCH),WINCE)
-	@$(MAKE) -C mobile/installer installer
-else
 	@$(MAKE) -C mobile/installer
-endif
 
 install::
 	@echo "Mobile can't be installed directly."
diff --git a/mobile/installer/Makefile.in b/mobile/installer/Makefile.in
index d7b3f4554bbf..11123caea31a 100644
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -235,35 +235,3 @@ installer: deb
 # relative to $(DIST)
 UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME) deb_name.txt
 endif
-
-ifeq ($(OS_ARCH),WINCE)
-
-VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
-
-UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
-
-cab: stage-package package-xulrunner
-	cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" &&  echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
-
-installer: 7zip-installer zip
-
-zip:
-	cd $(DIST) && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
-
-7zip-installer: stage-package package-xulrunner
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py -setupdll -s "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(MOZ_PKG_DIR)/setup.cab"
-	$(NSINSTALL) $(DIST)/$(MOZ_PKG_DIR)/setup.ini $(DIST)
-ifdef LIBXUL_SDK
-	mv $(DIST)/$(MOZ_GRE_PKG_DIR)/uninstall.exe $(DIST)/$(MOZ_PKG_DIR)/ 
-endif
-	cd $(DIST) &&                                                       \
-	  7z a $(PKG_PATH)$(PKG_BASENAME).7z $(MOZ_PKG_DIR) setup.ini       \
-	    -x!$(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx              \
-	    -x!$(MOZ_PKG_DIR)/setup.ini &&                                  \
-	  cat $(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx               \
-	    $(PKG_PATH)$(PKG_BASENAME).7z>$(PKG_PATH)$(PKG_BASENAME).exe && \
-	  rm $(PKG_PATH)$(PKG_BASENAME).7z &&                               \
-	  rm setup.ini
-
-endif
diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in
index 917902065571..b2fdf2564b6e 100644
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -33,10 +33,8 @@
 #endif
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
-#ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
-#endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
@@ -58,9 +56,7 @@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#ifdef WINCE
-@BINPATH@/mozce_shunt.dll
-#elifdef XP_WIN32
+#ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
@@ -205,9 +201,7 @@
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-#ifndef WINCE
 @BINPATH@/components/migration.xpt
-#endif
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt
 @BINPATH@/components/necko_about.xpt
@@ -583,25 +577,6 @@ bin/libfreebl_32int64_3.so
 bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 
-; [ActiveX]
-#ifdef WINCE
-#ifndef MOZ_NO_ACTIVEX_SUPPORT
-@BINPATH@/components/nsAxSecurityPolicy.js
-@BINPATH@/@PREF_DIR@/activex.js
-@BINPATH@/plugins/npmozax.dll
-@BINPATH@/plugins/nsIMozAxPlugin.xpt
-#endif
-#endif
-
-; [FastStart]
-#ifdef WINCE
-#ifdef MOZ_FASTSTART
-@BINPATH@/firefoxfaststart.exe
-@BINPATH@/components/FastStartup.manifest
-@BINPATH@/components/FastStartup.js
-#endif
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
diff --git a/mobile/installer/wince/Makefile.in b/mobile/installer/wince/Makefile.in
deleted file mode 100644
index c5dab33de3f0..000000000000
--- a/mobile/installer/wince/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Fennec Installer for WinCE.
-#
-# The Initial Developer of the Original Code is The Mozilla Foundation.
-#
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
-#
-# Contributor(s): 
-#   Alex Pakhotin <alexp@mozilla.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE           = setup
-LIBRARY_NAME     = setup
-FORCE_SHARED_LIB = 1
-
-export NO_SHUNT  = 1
-
-DEFFILE = $(srcdir)/Setup.def
-
-DEFINES += -DMOZ_APP_DISPLAYNAME=L\\\"$(MOZ_APP_DISPLAYNAME)\\\"
-
-CPPSRCS = \
-	Setup.cpp \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/installer/wince/Setup.cpp b/mobile/installer/wince/Setup.cpp
deleted file mode 100644
index 9f70d0c982e6..000000000000
--- a/mobile/installer/wince/Setup.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; tab-width: 8; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Fennec Installer for WinCE.
- *
- * The Initial Developer of the Original Code is The Mozilla Foundation.
- *
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Alex Pakhotin <alexp@mozilla.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- *
- * Mozilla Fennec Setup DLL
- *
- */
-
-#include <windows.h>
-#include <ce_setup.h>
-
-const WCHAR c_sAppRegKey[] = L"Software\\Mozilla\\" MOZ_APP_DISPLAYNAME;
-
-// Forward declarations
-BOOL GetInstallPath(WCHAR *sPath);
-BOOL RunUninstall();
-
-//////////////////////////////////////////////////////////////////////////
-// Entry point
-//
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
-{
-  return TRUE;
-}
-
-codeINSTALL_INIT Install_Init(HWND hwndParent, BOOL fFirstCall, BOOL fPreviouslyInstalled, LPCTSTR pszInstallDir)
-{
-  return codeINSTALL_INIT_CONTINUE;
-}
-
-codeINSTALL_EXIT Install_Exit(HWND hwndParent, LPCTSTR pszInstallDir,
-                              WORD cFailedDirs, WORD cFailedFiles, WORD cFailedRegKeys,
-                              WORD cFailedRegVals, WORD cFailedShortcuts)
-{
-  return codeINSTALL_EXIT_DONE;
-}
-
-codeUNINSTALL_INIT Uninstall_Init(HWND hwndParent, LPCTSTR pszInstallDir)
-{
-  RunUninstall();
-
-  // Continue regardless of the RunUninstall result
-  // This uninstallation may run from the Uninstall.exe,
-  // in this case RunUninstall will not succeed, which is correct
-  return codeUNINSTALL_INIT_CONTINUE;
-}
-
-codeUNINSTALL_EXIT Uninstall_Exit(HWND hwndParent)
-{
-  return codeUNINSTALL_EXIT_DONE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Utility functions
-//
-BOOL GetInstallPath(WCHAR *sPath)
-{
-  HKEY hKey;
-
-  LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, c_sAppRegKey, 0, KEY_ALL_ACCESS, &hKey);
-  if (result == ERROR_SUCCESS)
-  {
-    DWORD dwType = NULL;
-    DWORD dwCount = MAX_PATH * sizeof(WCHAR);
-    result = RegQueryValueEx(hKey, L"Path", NULL, &dwType, (LPBYTE)sPath, &dwCount);
-
-    RegCloseKey(hKey);
-  }
-
-  return (result == ERROR_SUCCESS);
-}
-
-BOOL RunUninstall()
-{
-  BOOL bResult = FALSE;
-  WCHAR sUninstallPath[MAX_PATH];
-  if (GetInstallPath(sUninstallPath))
-  {
-    if (wcslen(sUninstallPath) > 0 && sUninstallPath[wcslen(sUninstallPath)-1] != '\\')
-      wcscat(sUninstallPath, L"\\");
-
-    wcscat(sUninstallPath, L"uninstall.exe");
-
-    PROCESS_INFORMATION pi;
-    bResult = CreateProcess(sUninstallPath, L"[setup]",
-                            NULL, NULL, FALSE, 0, NULL, NULL, NULL, &pi);
-    if (bResult)
-    {
-      // Wait for it to finish
-      WaitForSingleObject(pi.hProcess, INFINITE);
-    }
-  }
-  return bResult;
-}
diff --git a/mobile/installer/wince/Setup.def b/mobile/installer/wince/Setup.def
deleted file mode 100644
index a7d6012b69fc..000000000000
--- a/mobile/installer/wince/Setup.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY	"Setup"
-EXPORTS
-	Install_Init @1
-	Install_Exit @2
-	Uninstall_Init @3
-	Uninstall_Exit @4
diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index 49999e92b8d8..f1c1dc7fd9df 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -164,20 +164,6 @@ libs:: crashreporter-override.ini
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 
-ifdef WINCE_WINDOWS_MOBILE
-ifdef LOCALE_MERGEDIR
-SETUP_INI := $(firstword $(wildcard $(LOCALE_MERGEDIR)/installer/setup.ini) \
-       $(wildcard $(LOCALE_SRCDIR)/installer/setup.ini) \
-       $(srcdir)/en-US/installer/setup.ini )
-else
-SETUP_INI := $(addprefix $(LOCALE_SRCDIR)/,installer/setup.ini)
-endif
-libs:: $(SETUP_INI)
-	cat $< | \
-	  sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
-	  $(FINAL_TARGET)/setup.ini
-endif
-
 # When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly
 # different locations that on all other platforms
 ifeq (Darwin, $(OS_ARCH))

From c0345fe392fd72861eabe5b4853f140d99afa6ad Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 14 Apr 2011 13:55:42 -0400
Subject: [PATCH 176/509] Bug 648465 - TabChild::ProvideWindow needs to tell
 the caller that the window is new; r=smaug

---
 dom/ipc/TabChild.cpp                         |  1 +
 dom/tests/mochitest/bugs/Makefile.in         |  1 +
 dom/tests/mochitest/bugs/test_bug648465.html | 34 ++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 dom/tests/mochitest/bugs/test_bug648465.html

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index da5c012fb42c..a5c32897a98a 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -356,6 +356,7 @@ TabChild::ProvideWindow(nsIDOMWindow* aParent, PRUint32 aChromeFlags,
         return NS_ERROR_NOT_AVAILABLE;
     }
 
+    *aWindowIsNew = PR_TRUE;
     nsCOMPtr<nsIDOMWindow> win =
         do_GetInterface(static_cast<TabChild*>(newChild)->mWebNav);
     win.forget(aReturn);
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 49e610de5192..0daa91d1f5f1 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -137,6 +137,7 @@ _TEST_FILES	= \
 		test_bug622361.html \
 		test_bug633133.html \
 		test_bug642026.html \
+		test_bug648465.html \
 		$(NULL)
 
 libs:: 	$(_TEST_FILES)
diff --git a/dom/tests/mochitest/bugs/test_bug648465.html b/dom/tests/mochitest/bugs/test_bug648465.html
new file mode 100644
index 000000000000..15aba0d4e7c3
--- /dev/null
+++ b/dom/tests/mochitest/bugs/test_bug648465.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=648465
+-->
+<head>
+  <title>Test for Bug 648465</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/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=648465">
+  Mozilla Bug 648465</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 648465 **/
+var w = window.open('about:blank');
+try {
+  is(w.fullScreen, false, "can access non-allAccess properties of w");
+} finally {
+  w.close();
+}
+
+</script>
+</pre>
+</body>
+</html>

From 6251df87e51a7ffa2411b087d1632d3e394f21d1 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Wed, 13 Apr 2011 22:14:42 +0200
Subject: [PATCH 177/509] Bug 649127 - Intermittent timeout in
 browser/base/content/test/tabview/browser_tabview_rtl.js | application timed
 out after 330 seconds with no output [f=raymond, r=ehsan]

---
 .../test/tabview/browser_tabview_rtl.js       | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_rtl.js b/browser/base/content/test/tabview/browser_tabview_rtl.js
index fa568ba6c7aa..50afbacb85eb 100644
--- a/browser/base/content/test/tabview/browser_tabview_rtl.js
+++ b/browser/base/content/test/tabview/browser_tabview_rtl.js
@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let tabViewShownCount = 0;
-
 // ----------
 function test() {
   waitForExplicitFinish();
@@ -10,20 +8,12 @@ function test() {
   // verify initial state
   ok(!TabView.isVisible(), "Tab View starts hidden");
 
-  // use the Tab View button to launch it for the first time
-  window.addEventListener("tabviewshown", onTabViewLoadedAndShown("ltr"), false);
-  toggleTabView();
-}
-
-function toggleTabView() {
-  let tabViewCommand = document.getElementById("Browser:ToggleTabView");
-  tabViewCommand.doCommand();
+  showTabView(onTabViewLoadedAndShown("ltr"));
 }
 
 // ----------
 function onTabViewLoadedAndShown(dir) {
   return function() {
-    window.removeEventListener("tabviewshown", arguments.callee, false);
     ok(TabView.isVisible(), "Tab View is visible.");
 
     let contentWindow = document.getElementById("tab-view").contentWindow;
@@ -32,24 +22,20 @@ function onTabViewLoadedAndShown(dir) {
        "The direction should be set to " + dir.toUpperCase());
 
     // kick off the series
-    window.addEventListener("tabviewhidden", onTabViewHidden(dir), false);
-    TabView.toggle();
+    hideTabView(onTabViewHidden(dir));
   };
 }
 
 // ---------- 
 function onTabViewHidden(dir) {
   return function() {
-    window.removeEventListener("tabviewhidden", arguments.callee, false);
     ok(!TabView.isVisible(), "Tab View is hidden.");
 
     if (dir == "ltr") {
       // Switch to RTL mode
       Services.prefs.setCharPref("intl.uidirection.en-US", "rtl");
 
-      // use the Tab View button to launch it for the second time
-      window.addEventListener("tabviewshown", onTabViewLoadedAndShown("rtl"), false);
-      toggleTabView();
+      showTabView(onTabViewLoadedAndShown("rtl"));
     } else {
       // Switch to LTR mode
       Services.prefs.clearUserPref("intl.uidirection.en-US");
@@ -58,4 +44,3 @@ function onTabViewHidden(dir) {
     }
   };
 }
-

From 5b96b5cbb8459880ce1f5da90b1c40d67561a0ab Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 13 Apr 2011 22:15:41 +0200
Subject: [PATCH 178/509] Bug 630225 - Expose frecency as a sorting order for
 the history sidebar (with slight query builder optimization). r=dietrich

---
 .../places/content/history-panel.js           |   6 +-
 .../places/nsINavHistoryService.idl           |   3 +-
 toolkit/components/places/nsNavBookmarks.cpp  |  10 +-
 toolkit/components/places/nsNavHistory.cpp    | 156 +++++++++++-------
 toolkit/components/places/nsNavHistory.h      |  14 +-
 .../components/places/nsNavHistoryQuery.cpp   |   2 +-
 .../components/places/nsNavHistoryResult.cpp  |  34 +++-
 .../components/places/nsNavHistoryResult.h    | 103 +++++++-----
 .../places/tests/queries/test_sorting.js      | 105 ++++++++++--
 .../places/tests/unit/test_result_sort.js     |  16 +-
 10 files changed, 310 insertions(+), 139 deletions(-)

diff --git a/browser/components/places/content/history-panel.js b/browser/components/places/content/history-panel.js
index 700a68a4c311..717ee935d566 100644
--- a/browser/components/places/content/history-panel.js
+++ b/browser/components/places/content/history-panel.js
@@ -84,11 +84,11 @@ function searchHistory(aInput)
     case "visited":
       resultType = NHQO.RESULTS_AS_URI;
       sortingMode = NHQO.SORT_BY_VISITCOUNT_DESCENDING;
-      break; 
+      break;
     case "lastvisited":
       resultType = NHQO.RESULTS_AS_URI;
       sortingMode = NHQO.SORT_BY_DATE_DESCENDING;
-      break; 
+      break;
     case "dayandsite":
       resultType = NHQO.RESULTS_AS_DATE_SITE_QUERY;
       break;
@@ -105,7 +105,7 @@ function searchHistory(aInput)
   if (aInput) {
     query.searchTerms = aInput;
     if (gHistoryGrouping != "visited" && gHistoryGrouping != "lastvisited") {
-      sortingMode = NHQO.SORT_BY_TITLE_ASCENDING;
+      sortingMode = NHQO.SORT_BY_FRECENCY_DESCENDING;
       resultType = NHQO.RESULTS_AS_URI;
     }
   }
diff --git a/toolkit/components/places/nsINavHistoryService.idl b/toolkit/components/places/nsINavHistoryService.idl
index b623583242fe..ec6a5659a752 100644
--- a/toolkit/components/places/nsINavHistoryService.idl
+++ b/toolkit/components/places/nsINavHistoryService.idl
@@ -1131,7 +1131,8 @@ interface nsINavHistoryQueryOptions : nsISupports
   const unsigned short SORT_BY_TAGS_DESCENDING = 18;
   const unsigned short SORT_BY_ANNOTATION_ASCENDING = 19;
   const unsigned short SORT_BY_ANNOTATION_DESCENDING = 20;
-
+  const unsigned short SORT_BY_FRECENCY_ASCENDING = 21;
+  const unsigned short SORT_BY_FRECENCY_DESCENDING = 22;
 
   /**
    * "URI" results, one for each URI visited in the range. Individual result
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index 54a0ed70025f..42ffd5958a33 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -71,10 +71,10 @@ const PRInt32 nsNavBookmarks::kFindBookmarksIndex_Position = 4;
 const PRInt32 nsNavBookmarks::kFindBookmarksIndex_Title = 5;
 
 // These columns sit to the right of the kGetInfoIndex_* columns.
-const PRInt32 nsNavBookmarks::kGetChildrenIndex_Position = 13;
-const PRInt32 nsNavBookmarks::kGetChildrenIndex_Type = 14;
-const PRInt32 nsNavBookmarks::kGetChildrenIndex_PlaceID = 15;
-const PRInt32 nsNavBookmarks::kGetChildrenIndex_ServiceContractId = 16;
+const PRInt32 nsNavBookmarks::kGetChildrenIndex_Position = 14;
+const PRInt32 nsNavBookmarks::kGetChildrenIndex_Type = 15;
+const PRInt32 nsNavBookmarks::kGetChildrenIndex_PlaceID = 16;
+const PRInt32 nsNavBookmarks::kGetChildrenIndex_ServiceContractId = 17;
 
 const PRInt32 nsNavBookmarks::kGetItemPropertiesIndex_ID = 0;
 const PRInt32 nsNavBookmarks::kGetItemPropertiesIndex_URI = 1;
@@ -315,7 +315,7 @@ nsNavBookmarks::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
   RETURN_IF_STMT(mDBGetChildren, NS_LITERAL_CSTRING(
     "SELECT h.id, h.url, IFNULL(b.title, h.title), h.rev_host, h.visit_count, "
            "h.last_visit_date, f.url, null, b.id, b.dateAdded, b.lastModified, "
-           "b.parent, null, b.position, b.type, b.fk, b.folder_type "
+           "b.parent, null, h.frecency, b.position, b.type, b.fk, b.folder_type "
     "FROM moz_bookmarks b "
     "LEFT JOIN moz_places h ON b.fk = h.id "
     "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index 2312b8aa81bb..a2c8cc5d0759 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -363,7 +363,7 @@ const PRInt32 nsNavHistory::kGetInfoIndex_ItemDateAdded = 9;
 const PRInt32 nsNavHistory::kGetInfoIndex_ItemLastModified = 10;
 const PRInt32 nsNavHistory::kGetInfoIndex_ItemParentId = 11;
 const PRInt32 nsNavHistory::kGetInfoIndex_ItemTags = 12;
-
+const PRInt32 nsNavHistory::kGetInfoIndex_Frecency = 13;
 
 PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsNavHistory, gHistoryService)
 
@@ -1366,7 +1366,8 @@ nsNavHistory::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
   // Should match kGetInfoIndex_* (see GetQueryResults)
   RETURN_IF_STMT(mDBVisitToVisitResult, NS_LITERAL_CSTRING(
     "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
-           "v.visit_date, f.url, v.session, null, null, null, null, null "
+           "v.visit_date, f.url, v.session, null, null, null, null, "
+           "null, h.frecency "
     "FROM moz_places h "
     "JOIN moz_historyvisits v ON h.id = v.place_id "
     "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -1376,7 +1377,8 @@ nsNavHistory::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
   // Should match kGetInfoIndex_* (see GetQueryResults)
   RETURN_IF_STMT(mDBVisitToURLResult, NS_LITERAL_CSTRING(
     "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
-           "h.last_visit_date, f.url, null, null, null, null, null, null "
+           "h.last_visit_date, f.url, null, null, null, null, null, "
+           "null, h.frecency "
     "FROM moz_places h "
     "JOIN moz_historyvisits v ON h.id = v.place_id "
     "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -1387,7 +1389,8 @@ nsNavHistory::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
   RETURN_IF_STMT(mDBBookmarkToUrlResult, NS_LITERAL_CSTRING(
     "SELECT b.fk, h.url, COALESCE(b.title, h.title), "
            "h.rev_host, h.visit_count, h.last_visit_date, f.url, null, b.id, "
-           "b.dateAdded, b.lastModified, b.parent, null "
+           "b.dateAdded, b.lastModified, b.parent, "
+           "null, h.frecency "
     "FROM moz_bookmarks b "
     "JOIN moz_places h ON b.fk = h.id "
     "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -2984,15 +2987,10 @@ PRBool NeedToFilterResultSet(const nsCOMArray<nsNavHistoryQuery>& aQueries,
   if (!parentAnnotationToExclude.IsEmpty())
     return PR_TRUE;
 
-  PRInt32 i;
-  for (i = 0; i < aQueries.Count(); i ++) {
+  // Need to filter on parent if any folder is set.
+  for (PRInt32 i = 0; i < aQueries.Count(); ++i) {
     if (aQueries[i]->Folders().Length() != 0) {
       return PR_TRUE;
-    } else {
-      PRBool hasSearchTerms;
-      nsresult rv = aQueries[i]->GetHasSearchTerms(&hasSearchTerms);
-      if (NS_FAILED(rv) || hasSearchTerms)
-        return PR_TRUE;
     }
   }
   return PR_FALSE;
@@ -3144,17 +3142,15 @@ PlacesSQLQueryBuilder::SelectAsURI()
                          tagsSqlFragment);
 
       mQueryString = NS_LITERAL_CSTRING(
-        "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
-        "h.last_visit_date, f.url, v.session, null, null, null, null, ") +
-        tagsSqlFragment + NS_LITERAL_CSTRING(
+        "SELECT h.id, h.url, h.title AS page_title, h.rev_host, h.visit_count, "
+        "h.last_visit_date, f.url, null, null, null, null, null, ") +
+        tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency "
         "FROM moz_places h "
-        "JOIN moz_historyvisits v ON h.id = v.place_id "
         "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
         // WHERE 1 is a no-op since additonal conditions will start with AND.
         "WHERE 1 "
           "{QUERY_OPTIONS_VISITS} {QUERY_OPTIONS_PLACES} "
-          "{ADDITIONAL_CONDITIONS} "
-        "GROUP BY h.id ");
+          "{ADDITIONAL_CONDITIONS} ");
       break;
 
     case nsINavHistoryQueryOptions::QUERY_TYPE_BOOKMARKS:
@@ -3171,10 +3167,10 @@ PlacesSQLQueryBuilder::SelectAsURI()
                            tagsSqlFragment);
 
         mQueryString = NS_LITERAL_CSTRING(
-          "SELECT b2.fk, h.url, COALESCE(b2.title, h.title), h.rev_host, "
-            "h.visit_count, h.last_visit_date, f.url, null, b2.id, "
+          "SELECT b2.fk, h.url, COALESCE(b2.title, h.title) AS page_title, "
+            "h.rev_host, h.visit_count, h.last_visit_date, f.url, null, b2.id, "
             "b2.dateAdded, b2.lastModified, b2.parent, ") +
-            tagsSqlFragment + NS_LITERAL_CSTRING(
+            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency "
           "FROM moz_bookmarks b2 "
           "JOIN (SELECT b.fk "
                 "FROM moz_bookmarks b "
@@ -3195,10 +3191,10 @@ PlacesSQLQueryBuilder::SelectAsURI()
                            mHasSearchTerms,
                            tagsSqlFragment);
         mQueryString = NS_LITERAL_CSTRING(
-          "SELECT b.fk, h.url, COALESCE(b.title, h.title), h.rev_host, "
-            "h.visit_count, h.last_visit_date, f.url, null, b.id, "
+          "SELECT b.fk, h.url, COALESCE(b.title, h.title) AS page_title, "
+            "h.rev_host, h.visit_count, h.last_visit_date, f.url, null, b.id, "
             "b.dateAdded, b.lastModified, b.parent, ") +
-            tagsSqlFragment + NS_LITERAL_CSTRING(
+            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency "
           "FROM moz_bookmarks b "
           "JOIN moz_places h ON b.fk = h.id "
           "LEFT OUTER JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -3228,9 +3224,9 @@ PlacesSQLQueryBuilder::SelectAsVisit()
                      mHasSearchTerms,
                      tagsSqlFragment);
   mQueryString = NS_LITERAL_CSTRING(
-    "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
+    "SELECT h.id, h.url, h.title AS page_title, h.rev_host, h.visit_count, "
       "v.visit_date, f.url, v.session, null, null, null, null, ") +
-      tagsSqlFragment + NS_LITERAL_CSTRING(
+      tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency "
     "FROM moz_places h "
     "JOIN moz_historyvisits v ON h.id = v.place_id "
     "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -3469,7 +3465,7 @@ PlacesSQLQueryBuilder::SelectAsSite()
     "WHERE EXISTS ( "
       "SELECT h.id FROM moz_places h "
       "%s "
-      "WHERE h.hidden <> 1 "
+      "WHERE h.hidden = 0 "
         "AND h.visit_count > 0 "
         "AND h.url BETWEEN 'file://' AND 'file:/~' "
       "%s "
@@ -3483,7 +3479,7 @@ PlacesSQLQueryBuilder::SelectAsSite()
       "SELECT get_unreversed_host(h.rev_host) AS host "
       "FROM moz_places h "
       "%s "
-      "WHERE h.hidden <> 1 "
+      "WHERE h.hidden = 0 "
         "AND h.rev_host <> '.' "
         "AND h.visit_count > 0 "
         "%s "
@@ -3544,23 +3540,36 @@ PlacesSQLQueryBuilder::Where()
                                   nsINavHistoryService::TRANSITION_REDIRECT_TEMPORARY);
   }
   else if (mRedirectsMode == nsINavHistoryQueryOptions::REDIRECTS_MODE_TARGET) {
-    additionalVisitsConditions += NS_LITERAL_CSTRING(
+    additionalPlacesConditions += NS_LITERAL_CSTRING(
       "AND NOT EXISTS ( "
-        "SELECT id FROM moz_historyvisits WHERE from_visit = v.id "
-        "AND visit_type IN ") +
+        "SELECT 1 FROM moz_historyvisits v1 "
+        "JOIN moz_historyvisits v2 ON v2.from_visit = v1.id "
+        "WHERE v1.place_id = h.id "
+        "AND v2.visit_type IN ") +
         nsPrintfCString("(%d,%d) ", nsINavHistoryService::TRANSITION_REDIRECT_PERMANENT,
                                     nsINavHistoryService::TRANSITION_REDIRECT_TEMPORARY) +
       NS_LITERAL_CSTRING(") ");
   }
 
   if (!mIncludeHidden) {
-    additionalVisitsConditions += NS_LITERAL_CSTRING(
-      "AND visit_type NOT IN ") +
-      nsPrintfCString("(0,%d,%d) ",
-                      nsINavHistoryService::TRANSITION_EMBED,
-                      nsINavHistoryService::TRANSITION_FRAMED_LINK);
+    additionalPlacesConditions += NS_LITERAL_CSTRING("AND hidden = 0 ");
+  }
+
+  if (mQueryType == nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY) {
+    // last_visit_date is updated for any kind of visit, so it's a good
+    // indicator whether the page has visits.
     additionalPlacesConditions += NS_LITERAL_CSTRING(
-      "AND hidden <> 1 ");
+      "AND last_visit_date NOTNULL "
+    );
+  }
+
+  if (mResultType == nsINavHistoryQueryOptions::RESULTS_AS_URI &&
+      !additionalVisitsConditions.IsEmpty()) {
+    // URI results don't join on visits.
+    nsCAutoString tmp = additionalVisitsConditions;
+    additionalVisitsConditions = "AND EXISTS (SELECT 1 FROM moz_historyvisits WHERE place_id = h.id ";
+    additionalVisitsConditions.Append(tmp);
+    additionalVisitsConditions.Append("LIMIT 1)");
   }
 
   mQueryString.ReplaceSubstring("{QUERY_OPTIONS_VISITS}",
@@ -3671,6 +3680,12 @@ PlacesSQLQueryBuilder::OrderBy()
     case nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_ASCENDING:
     case nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_DESCENDING:
       break; // Sort later in nsNavHistoryQueryResultNode::FillChildren()
+    case nsINavHistoryQueryOptions::SORT_BY_FRECENCY_ASCENDING:
+        OrderByColumnIndexAsc(nsNavHistory::kGetInfoIndex_Frecency);
+      break;
+    case nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING:
+        OrderByColumnIndexDesc(nsNavHistory::kGetInfoIndex_Frecency);
+      break;
     default:
       NS_NOTREACHED("Invalid sorting mode");
   }
@@ -3728,7 +3743,7 @@ nsNavHistory::ConstructQueryString(
 
   PRInt32 sortingMode = aOptions->SortingMode();
   NS_ASSERTION(sortingMode >= nsINavHistoryQueryOptions::SORT_BY_NONE &&
-               sortingMode <= nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_DESCENDING,
+               sortingMode <= nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING,
                "Invalid sortingMode found while building query!");
 
   PRBool hasSearchTerms = PR_FALSE;
@@ -3749,12 +3764,12 @@ nsNavHistory::ConstructQueryString(
     // Generate an optimized query for the history menu and most visited
     // smart bookmark.
     queryString = NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, h.last_visit_date, "
+      "SELECT h.id, h.url, h.title AS page_title, h.rev_host, h.visit_count, h.last_visit_date, "
           "f.url, null, null, null, null, null, ") +
-          tagsSqlFragment + NS_LITERAL_CSTRING(
+          tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency "
         "FROM moz_places h "
         "LEFT OUTER JOIN moz_favicons f ON h.favicon_id = f.id "
-        "WHERE h.hidden <> 1 "
+        "WHERE h.hidden = 0 "
           "AND EXISTS (SELECT id FROM moz_historyvisits WHERE place_id = h.id "
                        "AND visit_type NOT IN ") +
                        nsPrintfCString("(0,%d,%d) ",
@@ -4041,7 +4056,7 @@ nsNavHistory::GetLastPageVisited(nsACString & aLastPageVisited)
   nsCOMPtr<mozIStorageStatement> statement;
   nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
       "SELECT url FROM moz_places "
-      "WHERE hidden <> 1 "
+      "WHERE hidden = 0 "
         "AND last_visit_date NOTNULL "
       "ORDER BY last_visit_date DESC "),
     getter_AddRefs(statement));
@@ -5627,15 +5642,29 @@ nsNavHistory::QueryToSelectClause(nsNavHistoryQuery* aQuery, // const
 
   ConditionBuilder clause(aQueryIndex);
 
-  // begin time
-  if (NS_SUCCEEDED(aQuery->GetHasBeginTime(&hasIt)) && hasIt) 
-    clause.Condition("v.visit_date >=").Param(":begin_time");
+  if ((NS_SUCCEEDED(aQuery->GetHasBeginTime(&hasIt)) && hasIt) ||
+    (NS_SUCCEEDED(aQuery->GetHasEndTime(&hasIt)) && hasIt)) {
+    clause.Condition("EXISTS (SELECT 1 FROM moz_historyvisits "
+                              "WHERE place_id = h.id");
+    // begin time
+    if (NS_SUCCEEDED(aQuery->GetHasBeginTime(&hasIt)) && hasIt) 
+      clause.Condition("visit_date >=").Param(":begin_time");
+    // end time
+    if (NS_SUCCEEDED(aQuery->GetHasEndTime(&hasIt)) && hasIt)
+      clause.Condition("visit_date <=").Param(":end_time");
+    clause.Str(" LIMIT 1)");
+  }
 
-  // end time
-  if (NS_SUCCEEDED(aQuery->GetHasEndTime(&hasIt)) && hasIt)
-    clause.Condition("v.visit_date <=").Param(":end_time");
-
-  // search terms FIXME
+  // search terms
+  PRBool hasSearchTerms;
+  if (NS_SUCCEEDED(aQuery->GetHasSearchTerms(&hasSearchTerms)) && hasSearchTerms) {
+    // Re-use the autocomplete_match function.  Setting the behavior to 0
+    // it can match everything and work as a nice case insensitive comparator.
+    clause.Condition("AUTOCOMPLETE_MATCH(").Param(":search_string")
+          .Str(", h.url, page_title, tags, ")
+          .Str(nsPrintfCString(17, "0, 0, 0, 0, %d, 0)",
+                               mozIPlacesAutoComplete::MATCH_ANYWHERE).get());
+  }
 
   // min and max visit count
   if (aQuery->MinVisits() >= 0)
@@ -5719,19 +5748,11 @@ nsNavHistory::QueryToSelectClause(nsNavHistoryQuery* aQuery, // const
 
   // transitions
   const nsTArray<PRUint32>& transitions = aQuery->Transitions();
-  // Optimize single transition query, since this is the most common use case.
-  if (transitions.Length() == 1) {
-    clause.Condition("v.visit_type =").Param(":transition0_");
-  }
-  else if (transitions.Length() > 1) {
-    for (PRUint32 i = 0; i < transitions.Length(); ++i) {
-      nsPrintfCString param(":transition%d_", i);
-      clause.Str("EXISTS (SELECT 1 FROM moz_historyvisits "
-                         "WHERE place_id = h.id AND visit_type = "
-                ).Param(param.get()).Str(" LIMIT 1)");
-      if (i < transitions.Length() - 1)
-        clause.Str("AND");
-    }
+  for (PRUint32 i = 0; i < transitions.Length(); ++i) {
+    nsPrintfCString param(":transition%d_", i);
+    clause.Condition("EXISTS (SELECT 1 FROM moz_historyvisits "
+                             "WHERE place_id = h.id AND visit_type = "
+              ).Param(param.get()).Str(" LIMIT 1)");
   }
 
   // parent parameter is used in tag contents queries.
@@ -5785,7 +5806,14 @@ nsNavHistory::BindQueryClauseParameters(mozIStorageStatement* statement,
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  // search terms FIXME
+  // search terms
+  if (NS_SUCCEEDED(aQuery->GetHasSearchTerms(&hasIt)) && hasIt) {
+    rv = statement->BindStringByName(
+      NS_LITERAL_CSTRING("search_string") + qIndex,
+      aQuery->SearchTerms()
+    );
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   // min and max visit count
   PRInt32 visits = aQuery->MinVisits();
@@ -6963,7 +6991,7 @@ nsNavHistory::FixInvalidFrecencies()
   // 3) we've migrated from an older version, before global frecency
   //
   // From older versions, unmigrated bookmarks might be hidden, so we can't
-  // exclude hidden places (by doing "WHERE hidden <> 1") from our query, as we
+  // exclude hidden places (by doing "WHERE hidden = 0") from our query, as we
   // want to calculate the frecency for those places and unhide them (if they
   // are not livemark items and not place: queries.)
   //
diff --git a/toolkit/components/places/nsNavHistory.h b/toolkit/components/places/nsNavHistory.h
index 20bbfcdfc562..dd6aad590647 100644
--- a/toolkit/components/places/nsNavHistory.h
+++ b/toolkit/components/places/nsNavHistory.h
@@ -293,22 +293,18 @@ public:
   static const PRInt32 kGetInfoIndex_Title;
   static const PRInt32 kGetInfoIndex_RevHost;
   static const PRInt32 kGetInfoIndex_VisitCount;
+  static const PRInt32 kGetInfoIndex_VisitDate;
+  static const PRInt32 kGetInfoIndex_FaviconURL;
+  static const PRInt32 kGetInfoIndex_SessionId;
   static const PRInt32 kGetInfoIndex_ItemId;
   static const PRInt32 kGetInfoIndex_ItemDateAdded;
   static const PRInt32 kGetInfoIndex_ItemLastModified;
-  static const PRInt32 kGetInfoIndex_ItemTags;
   static const PRInt32 kGetInfoIndex_ItemParentId;
+  static const PRInt32 kGetInfoIndex_ItemTags;
+  static const PRInt32 kGetInfoIndex_Frecency;
 
   PRInt64 GetTagsFolder();
 
-  // Constants for the columns returned by the above statement
-  // (in addition to the ones above).
-  static const PRInt32 kGetInfoIndex_VisitDate;
-  static const PRInt32 kGetInfoIndex_FaviconURL;
-
-  // used in execute queries to get session ID info (only for visits)
-  static const PRInt32 kGetInfoIndex_SessionId;
-
   // this actually executes a query and gives you results, it is used by
   // nsNavHistoryQueryResultNode
   nsresult GetQueryResults(nsNavHistoryQueryResultNode *aResultNode,
diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp
index b6712be3438e..c79e5c3b2ed0 100644
--- a/toolkit/components/places/nsNavHistoryQuery.cpp
+++ b/toolkit/components/places/nsNavHistoryQuery.cpp
@@ -1429,7 +1429,7 @@ nsNavHistoryQueryOptions::GetSortingMode(PRUint16* aMode)
 NS_IMETHODIMP
 nsNavHistoryQueryOptions::SetSortingMode(PRUint16 aMode)
 {
-  if (aMode > SORT_BY_ANNOTATION_DESCENDING)
+  if (aMode > SORT_BY_FRECENCY_DESCENDING)
     return NS_ERROR_INVALID_ARG;
   mSort = aMode;
   return NS_OK;
diff --git a/toolkit/components/places/nsNavHistoryResult.cpp b/toolkit/components/places/nsNavHistoryResult.cpp
index f0645781887c..80f81c702316 100644
--- a/toolkit/components/places/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/nsNavHistoryResult.cpp
@@ -245,7 +245,8 @@ nsNavHistoryResultNode::nsNavHistoryResultNode(
   mFolderId(-1),
   mDateAdded(0),
   mLastModified(0),
-  mIndentLevel(-1)
+  mIndentLevel(-1),
+  mFrecency(0)
 {
   mTags.SetIsVoid(PR_TRUE);
 }
@@ -932,6 +933,10 @@ nsNavHistoryContainerResultNode::GetSortingComparator(PRUint16 aSortType)
       return &SortComparison_TagsLess;
     case nsINavHistoryQueryOptions::SORT_BY_TAGS_DESCENDING:
       return &SortComparison_TagsGreater;
+    case nsINavHistoryQueryOptions::SORT_BY_FRECENCY_ASCENDING:
+      return &SortComparison_FrecencyLess;
+    case nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING:
+      return &SortComparison_FrecencyGreater;
     default:
       NS_NOTREACHED("Bad sorting type");
       return nsnull;
@@ -1426,6 +1431,31 @@ PRInt32 nsNavHistoryContainerResultNode::SortComparison_TagsGreater(
   return -SortComparison_TagsLess(a, b, closure);
 }
 
+/**
+ * Fall back on date and bookmarked status, for conflict resolution.
+ */
+PRInt32
+nsNavHistoryContainerResultNode::SortComparison_FrecencyLess(
+  nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure
+)
+{
+  PRInt32 value = CompareIntegers(a->mFrecency, b->mFrecency);
+  if (value == 0) {
+    value = ComparePRTime(a->mTime, b->mTime);
+    if (value == 0) {
+      value = nsNavHistoryContainerResultNode::SortComparison_Bookmark(a, b, closure);
+    }
+  }
+  return value;
+}
+PRInt32
+nsNavHistoryContainerResultNode::SortComparison_FrecencyGreater(
+  nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure
+)
+{
+  return -nsNavHistoryContainerResultNode::SortComparison_FrecencyLess(a, b, closure);
+}
+
 /**
  * Searches this folder for a node with the given URI.  Returns null if not
  * found.
@@ -4478,7 +4508,7 @@ nsNavHistoryResult::SetSortingMode(PRUint16 aSortingMode)
 {
   NS_ENSURE_STATE(mRootNode);
 
-  if (aSortingMode > nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_DESCENDING)
+  if (aSortingMode > nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING)
     return NS_ERROR_INVALID_ARG;
 
   // Keep everything in sync.
diff --git a/toolkit/components/places/nsNavHistoryResult.h b/toolkit/components/places/nsNavHistoryResult.h
index bd6cd462e405..6afe7c7b7f7f 100644
--- a/toolkit/components/places/nsNavHistoryResult.h
+++ b/toolkit/components/places/nsNavHistoryResult.h
@@ -390,6 +390,8 @@ public:
   // The indent level of this node. The root node will have a value of -1.  The
   // root's children will have a value of 0, and so on.
   PRInt32 mIndentLevel;
+
+  PRInt32 mFrecency; // Containers have 0 frecency.
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryResultNode, NS_NAVHISTORYRESULTNODE_IID)
@@ -587,44 +589,69 @@ public:
 
   static PRInt32 SortComparison_StringLess(const nsAString& a, const nsAString& b);
 
-  static int SortComparison_Bookmark(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_TitleLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_TitleGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_DateLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_DateGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_URILess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_URIGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_VisitCountLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_VisitCountGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_KeywordLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_KeywordGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_AnnotationLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_AnnotationGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_DateAddedLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_DateAddedGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_LastModifiedLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_LastModifiedGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_TagsLess(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
-  static int SortComparison_TagsGreater(
-      nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
+  static PRInt32 SortComparison_Bookmark(nsNavHistoryResultNode* a,
+                                         nsNavHistoryResultNode* b,
+                                         void* closure);
+  static PRInt32 SortComparison_TitleLess(nsNavHistoryResultNode* a,
+                                          nsNavHistoryResultNode* b,
+                                          void* closure);
+  static PRInt32 SortComparison_TitleGreater(nsNavHistoryResultNode* a,
+                                             nsNavHistoryResultNode* b,
+                                             void* closure);
+  static PRInt32 SortComparison_DateLess(nsNavHistoryResultNode* a,
+                                         nsNavHistoryResultNode* b,
+                                         void* closure);
+  static PRInt32 SortComparison_DateGreater(nsNavHistoryResultNode* a,
+                                            nsNavHistoryResultNode* b,
+                                            void* closure);
+  static PRInt32 SortComparison_URILess(nsNavHistoryResultNode* a,
+                                        nsNavHistoryResultNode* b,
+                                        void* closure);
+  static PRInt32 SortComparison_URIGreater(nsNavHistoryResultNode* a,
+                                           nsNavHistoryResultNode* b,
+                                           void* closure);
+  static PRInt32 SortComparison_VisitCountLess(nsNavHistoryResultNode* a,
+                                               nsNavHistoryResultNode* b,
+                                               void* closure);
+  static PRInt32 SortComparison_VisitCountGreater(nsNavHistoryResultNode* a,
+                                                  nsNavHistoryResultNode* b,
+                                                  void* closure);
+  static PRInt32 SortComparison_KeywordLess(nsNavHistoryResultNode* a,
+                                            nsNavHistoryResultNode* b,
+                                            void* closure);
+  static PRInt32 SortComparison_KeywordGreater(nsNavHistoryResultNode* a,
+                                               nsNavHistoryResultNode* b,
+                                               void* closure);
+  static PRInt32 SortComparison_AnnotationLess(nsNavHistoryResultNode* a,
+                                               nsNavHistoryResultNode* b,
+                                               void* closure);
+  static PRInt32 SortComparison_AnnotationGreater(nsNavHistoryResultNode* a,
+                                                  nsNavHistoryResultNode* b,
+                                                  void* closure);
+  static PRInt32 SortComparison_DateAddedLess(nsNavHistoryResultNode* a,
+                                              nsNavHistoryResultNode* b,
+                                              void* closure);
+  static PRInt32 SortComparison_DateAddedGreater(nsNavHistoryResultNode* a,
+                                                 nsNavHistoryResultNode* b,
+                                                 void* closure);
+  static PRInt32 SortComparison_LastModifiedLess(nsNavHistoryResultNode* a,
+                                                 nsNavHistoryResultNode* b,
+                                                 void* closure);
+  static PRInt32 SortComparison_LastModifiedGreater(nsNavHistoryResultNode* a,
+                                                    nsNavHistoryResultNode* b,
+                                                    void* closure);
+  static PRInt32 SortComparison_TagsLess(nsNavHistoryResultNode* a,
+                                         nsNavHistoryResultNode* b,
+                                         void* closure);
+  static PRInt32 SortComparison_TagsGreater(nsNavHistoryResultNode* a,
+                                            nsNavHistoryResultNode* b,
+                                            void* closure);
+  static PRInt32 SortComparison_FrecencyLess(nsNavHistoryResultNode* a,
+                                             nsNavHistoryResultNode* b,
+                                             void* closure);
+  static PRInt32 SortComparison_FrecencyGreater(nsNavHistoryResultNode* a,
+                                                nsNavHistoryResultNode* b,
+                                                void* closure);
 
   // finding children: THESE DO NOT ADDREF
   nsNavHistoryResultNode* FindChildURI(nsIURI* aURI, PRUint32* aNodeIndex)
diff --git a/toolkit/components/places/tests/queries/test_sorting.js b/toolkit/components/places/tests/queries/test_sorting.js
index 96356715d2b6..d430656eabfa 100644
--- a/toolkit/components/places/tests/queries/test_sorting.js
+++ b/toolkit/components/places/tests/queries/test_sorting.js
@@ -1213,22 +1213,89 @@ tests.push({
 });
 
 ////////////////////////////////////////////////////////////////////////////////
+// SORT_BY_FRECENCY_*
 
-function prepare_and_run_next_test(aTest) {
-  aTest.setup();
-  aTest.check();
-  // sorting reversed, usually SORT_BY have ASC and DESC
-  aTest.check_reverse();
-  // Execute cleanup tasks
-  remove_all_bookmarks();
-  waitForClearHistory(runNextTest);
-}
+tests.push({
+  _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_FRECENCY_ASCENDING,
+
+  setup: function() {
+    LOG("Sorting test 13: SORT BY FRECENCY ");
+
+    var timeInMicroseconds = Date.now() * 1000;
+    this._unsortedData = [
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://moz.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "I",
+        isInQuery: true },
+
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://moz.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "I",
+        isInQuery: true },
+
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://moz.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "I",
+        isInQuery: true },
+
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://is.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "love",
+        isInQuery: true },
+
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://best.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "moz",
+        isInQuery: true },
+
+      { isVisit: true,
+        isDetails: true,
+        uri: "http://best.com/",
+        lastVisit: timeInMicroseconds++,
+        title: "moz",
+        isInQuery: true },
+    ];
+
+    this._sortedData = [
+      this._unsortedData[2],
+      this._unsortedData[3],
+      this._unsortedData[5],
+    ];
+
+    // This function in head_queries.js creates our database with the above data
+    populateDB(this._unsortedData);                  
+  },
+
+  check: function() {
+    var query = PlacesUtils.history.getNewQuery();
+    var options = PlacesUtils.history.getNewQueryOptions();
+    options.sortingMode = this._sortingMode;
+
+    var root = PlacesUtils.history.executeQuery(query, options).root;
+    root.containerOpen = true;
+    compareArrayToResult(this._sortedData, root);
+    root.containerOpen = false;
+  },
+
+  check_reverse: function() {
+    this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_FRECENCY_DESCENDING;
+    this._sortedData.reverse();
+    this.check();
+  }
+});
+
+////////////////////////////////////////////////////////////////////////////////
 
-/**
- * run_test is where the magic happens.  This is automatically run by the test
- * harness.  It is where you do the work of creating the query, running it, and
- * playing with the result set.
- */
 function run_test() {
   do_test_pending();
   runNextTest();
@@ -1237,7 +1304,15 @@ function run_test() {
 function runNextTest() {
   if (tests.length) {
     let test = tests.shift();
-    prepare_and_run_next_test(test);
+    test.setup();
+    waitForAsyncUpdates(function () {
+      test.check();
+      // sorting reversed, usually SORT_BY have ASC and DESC
+      test.check_reverse();
+      // Execute cleanup tasks
+      remove_all_bookmarks();
+      waitForClearHistory(runNextTest);
+    });
   }
   else {
     do_test_finished();
diff --git a/toolkit/components/places/tests/unit/test_result_sort.js b/toolkit/components/places/tests/unit/test_result_sort.js
index a99cfe449042..dc3d3db1cbcf 100644
--- a/toolkit/components/places/tests/unit/test_result_sort.js
+++ b/toolkit/components/places/tests/unit/test_result_sort.js
@@ -63,8 +63,9 @@ try {
 
 // adds a test URI visit to the database
 function add_visit(aURI, aTime) {
+  let time = aTime || Date.now() * 1000;
   histsvc.addVisit(aURI,
-                    aTime,
+                    time,
                     null, // no referrer
                     histsvc.TRANSITION_TYPED, // user typed in URL bar
                     false, // not redirect
@@ -73,6 +74,8 @@ function add_visit(aURI, aTime) {
 
 // main
 function run_test() {
+  do_test_pending();
+
   var testRoot = bmsvc.createFolder(bmsvc.placesRoot,
                                     "Result-sort functionality tests root",
                                     bmsvc.DEFAULT_INDEX);
@@ -147,4 +150,15 @@ function run_test() {
   // test live update
   annosvc.setItemAnnotation(id1, "testAnno", "c", 0, 0);
   checkOrder(id1, id3, id2);
+
+  // Add a visit, then check frecency ordering.
+  add_visit(NetUtil.newURI("http://foo.tld/b"));
+  waitForAsyncUpdates(function () {
+    result.sortingMode = NHQO.SORT_BY_FRECENCY_DESCENDING;
+    checkOrder(id2, id3, id1);
+    result.sortingMode = NHQO.SORT_BY_FRECENCY_ASCENDING;
+    checkOrder(id1, id3, id2);
+
+    do_test_finished();
+  });
 }

From 21749702ec33a8f3d760e9f18875f73a39e2a518 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 14 Apr 2011 06:06:39 +0200
Subject: [PATCH 179/509] Bug 649099 - 'resize.info is null' when resizing
 groupItems [f=raymond, r=ian]

---
 browser/base/content/tabview/groupitems.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index a72277c4ae98..1393a5cd9196 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1788,7 +1788,12 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
 
     this.resizeOptions.minWidth = GroupItems.minGroupWidth;
     this.resizeOptions.minHeight = GroupItems.minGroupHeight;
-    this.resizeOptions.start = function () self._unfreezeItemSize();
+
+    let start = this.resizeOptions.start;
+    this.resizeOptions.start = function (event) {
+      start.call(self, event);
+      self._unfreezeItemSize();
+    }
 
     if (value) {
       immediately ? this.$resizer.show() : this.$resizer.fadeIn();

From 757e0a5ccc840ee077a342669588abad25935573 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 14 Apr 2011 15:33:52 +0200
Subject: [PATCH 180/509] Bug 648882 - TabPriorityQueue updates tabItems when
 UI is busy [f=raymond, r=ian]

---
 browser/base/content/tabview/tabitems.js      |  2 +-
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug648882.js | 64 +++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug648882.js

diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index ed53f449444e..27f13c5315f6 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -1143,7 +1143,7 @@ let TabItems = {
   _checkHeartbeat: function TabItems__checkHeartbeat() {
     this._heartbeat = null;
 
-    if (this.isPaintingPaused() || !UI.isIdle)
+    if (this.isPaintingPaused() || !UI.isIdle())
       return;
 
     let accumTime = 0;
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 225e086aa143..6259d16b67e5 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -130,6 +130,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug641802.js \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
+                 browser_tabview_bug648882.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
                  browser_tabview_expander.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug648882.js b/browser/base/content/test/tabview/browser_tabview_bug648882.js
new file mode 100644
index 000000000000..6aefcd2f9865
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug648882.js
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    let cw = win.TabView.getContentWindow();
+    let tab = win.gBrowser.tabs[0];
+    let tabItem = tab._tabViewTabItem;
+    let groupItem = cw.GroupItems.groupItems[0];
+    let container = groupItem.container;
+    let resizer = groupItem.$resizer[0];
+
+    let intervalID;
+    let isIdle = false;
+    let numLoops = 10;
+    let interval = cw.UI._maxInteractiveWait - 10;
+
+    let simulateDragDrop = function (target) {
+      EventUtils.synthesizeMouse(target, 5, 5, {type: "mousedown"}, cw);
+      EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
+      EventUtils.synthesizeMouse(target, 20, 20, {type: "mouseup"}, cw);
+    }
+
+    let moveGroup = function () {
+      simulateDragDrop(container);
+
+      if (!--numLoops) {
+        numLoops = 10;
+        win.clearInterval(intervalID);
+        intervalID = win.setInterval(resizeGroup, interval);
+      }
+    };
+
+    let resizeGroup = function () {
+      simulateDragDrop(resizer);
+
+      if (!--numLoops) {
+        isIdle = true;
+        win.clearInterval(intervalID);
+      }
+    };
+
+    SimpleTest.waitForFocus(function () {
+      cw.TabItems.pausePainting();
+      cw.TabItems.update(tab);
+
+      tabItem.addSubscriber(tabItem, "updated", function () {
+        tabItem.removeSubscriber(tabItem, "updated");
+        ok(isIdle, "tabItem is updated only when UI is idle");
+        finish();
+      });
+
+      intervalID = win.setInterval(moveGroup, interval);
+      registerCleanupFunction(function () win.clearInterval(intervalID));
+
+      moveGroup();
+      cw.TabItems.resumePainting();
+    }, cw);
+  });
+}

From 4af5b65ecdf67384b3c63d7e547063a28b983c1d Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 14 Apr 2011 06:04:13 +0200
Subject: [PATCH 181/509] Bug 647007 - Intermittent Failure in
 browser_tabview_bug595436.js [f=raymond, r=ian]

---
 .../test/tabview/browser_tabview_bug595436.js | 81 ++++++++-----------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug595436.js b/browser/base/content/test/tabview/browser_tabview_bug595436.js
index 8eb5deb84e07..ad9b36d6f1e6 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug595436.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug595436.js
@@ -2,66 +2,53 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  waitForExplicitFinish();
-  
-  window.addEventListener('tabviewshown', onTabViewWindowLoaded, false);
-  TabView.toggle();
-}
+  let cw, search, searchButton;
 
-function onTabViewWindowLoaded() {
-  window.removeEventListener('tabviewshown', onTabViewWindowLoaded, false);
-  
-  let contentWindow = document.getElementById('tab-view').contentWindow;
-  let search = contentWindow.document.getElementById('search');
-  let searchButton = contentWindow.document.getElementById('searchbutton');
-  
-  let isSearchEnabled = function () {
-    return 'none' != search.style.display;
-  }
-  
   let assertSearchIsEnabled = function () {
-    ok(isSearchEnabled(), 'search is enabled');
+    isnot(search.style.display, "none", "search is enabled");
   }
-  
+
   let assertSearchIsDisabled = function () {
-    ok(!isSearchEnabled(), 'search is disabled');
+    is(search.style.display, "none", "search is disabled");
   }
-  
+
   let testSearchInitiatedByKeyPress = function () {
-    EventUtils.synthesizeKey('a', {});
+    EventUtils.synthesizeKey("a", {}, cw);
     assertSearchIsEnabled();
-    
-    EventUtils.synthesizeKey('VK_BACK_SPACE', {});
+
+    EventUtils.synthesizeKey("VK_BACK_SPACE", {}, cw);
     assertSearchIsDisabled();
   }
-  
+
   let testSearchInitiatedByMouseClick = function () {
-    EventUtils.sendMouseEvent({type: 'mousedown'}, searchButton, contentWindow);
+    EventUtils.sendMouseEvent({type: "mousedown"}, searchButton, cw);
     assertSearchIsEnabled();
-    
-    EventUtils.synthesizeKey('a', {});
-    EventUtils.synthesizeKey('VK_BACK_SPACE', {});
-    EventUtils.synthesizeKey('VK_BACK_SPACE', {});
+
+    EventUtils.synthesizeKey("a", {}, cw);
+    EventUtils.synthesizeKey("VK_BACK_SPACE", {}, cw);
+    EventUtils.synthesizeKey("VK_BACK_SPACE", {}, cw);
     assertSearchIsEnabled();
-    
-    EventUtils.synthesizeKey('VK_ESCAPE', {});
+
+    EventUtils.synthesizeKey("VK_ESCAPE", {}, cw);
     assertSearchIsDisabled();
   }
-  
-  let finishTest = function () {
-    let onTabViewHidden = function () {
-      window.removeEventListener('tabviewhidden', onTabViewHidden, false);
+
+  waitForExplicitFinish();
+
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    cw = win.TabView.getContentWindow();
+    search = cw.document.getElementById("search");
+    searchButton = cw.document.getElementById("searchbutton");
+
+    SimpleTest.waitForFocus(function () {
+      assertSearchIsDisabled();
+
+      testSearchInitiatedByKeyPress();
+      testSearchInitiatedByMouseClick();
+
       finish();
-    }
-    
-    window.addEventListener('tabviewhidden', onTabViewHidden, false);
-    TabView.hide();
-  }
-  
-  assertSearchIsDisabled();
-  
-  testSearchInitiatedByKeyPress();
-  testSearchInitiatedByMouseClick();
-  
-  finishTest();
+    }, cw);
+  });
 }

From 5cc3d74b90d75b28d7d772968ab5306a868d6899 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 14 Apr 2011 06:10:50 +0200
Subject: [PATCH 182/509] Bug 644584 - Intermittent
 chrome://mochitests/content/browser/browser/base/content/test/tabview/browser_tabview_bug602432.js
 | Stacked group item update (x) > first item (y) [f=raymond, r=ian]

---
 .../test/tabview/browser_tabview_bug602432.js | 97 +++++++------------
 1 file changed, 35 insertions(+), 62 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug602432.js b/browser/base/content/test/tabview/browser_tabview_bug602432.js
index 34cd7e5628f2..78cda9482c6e 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug602432.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug602432.js
@@ -2,71 +2,44 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  waitForExplicitFinish();
-  newWindowWithTabView(onTabViewWindowLoaded);
-}
+  let checkUpdateTimes = function (groupItem) {
+    let children = groupItem.getChildren();
+    let earliestUpdateTime = children.shift()._testLastTabUpdateTime;
 
-let contentWindow = null;
-
-function onTabViewWindowLoaded(win) {
-  ok(win.TabView.isVisible(), "Tab View is visible");
-
-  contentWindow = win.TabView.getContentWindow();
-
-  // Preparation
-  //
-  let numTabs = 10;
-  let groupItem = createGroupItemWithBlankTabs(win, 150, 150, 100,
-    numTabs, false);
-
-  // Ensure that group is stacked
-  ok(groupItem.isStacked(), "Group item is stacked");
-
-  // Force updates to be deferred
-  contentWindow.TabItems.pausePainting();
-  let children = groupItem.getChildren();
-  is(children.length, numTabs, "Correct number of tabitems created");
-   
-  let leftToUpdate = numTabs;
-  let testFunc = function(tabItem) {
-    tabItem.removeSubscriber(tabItem, "updated");
-    if (--leftToUpdate>0)
-      return;
-    // Now that everything is updated, compare update times.
-    // All tabs in the group should have updated AFTER the first one.
-    let earliest = children[0]._lastTabUpdateTime;
-    for (let c=1; c<children.length; ++c)
-      ok(earliest <= children[c]._lastTabUpdateTime,
-        "Stacked group item update ("+children[c]._lastTabUpdateTime+") > first item ("+earliest+")");
-    shutDown(win, groupItem);
-  };
-
-  for (let c=0; c<children.length; ++c) {
-    let tabItem = children[c];
-    tabItem.addSubscriber(tabItem, "updated", testFunc);
-    contentWindow.TabItems.update(tabItem.tab);
+    children.forEach(function (tabItem) {
+      let updateTime = tabItem._testLastTabUpdateTime;
+      ok(earliestUpdateTime <= updateTime, "Stacked group item update (" +
+         updateTime + ") > first item (" + earliestUpdateTime + ")");
+    });
   }
 
-  // Let the update queue start again
-  contentWindow.TabItems.resumePainting();
-}
+  waitForExplicitFinish();
 
-function shutDown(win, groupItem) {
-  // Shut down
-  let groupItemCount = contentWindow.GroupItems.groupItems.length;
-  closeGroupItem(groupItem, function() {
-    // check the number of groups.
-    is(contentWindow.GroupItems.groupItems.length, --groupItemCount,
-       "The number of groups is decreased by 1");
-    let onTabViewHidden = function() {
-      win.removeEventListener("tabviewhidden", onTabViewHidden, false);
-      // assert that we're no longer in tab view
-      ok(!TabView.isVisible(), "Tab View is hidden");
-      win.close();
-      ok(win.closed, "new window is closed");
-      finish();
-    };
-    win.addEventListener("tabviewhidden", onTabViewHidden, false);
-    win.TabView.toggle();
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    let numTabsToUpdate = 10;
+    let groupItem = createGroupItemWithBlankTabs(win, 150, 150, 100, numTabsToUpdate, false);
+    ok(groupItem.isStacked(), "groupItem is stacked");
+
+    let cw = win.TabView.getContentWindow();
+    cw.TabItems.pausePainting();
+
+    groupItem.getChildren().forEach(function (tabItem) {
+      tabItem.addSubscriber(tabItem, "updated", function () {
+        tabItem.removeSubscriber(tabItem, "updated");
+        tabItem._testLastTabUpdateTime = tabItem._lastTabUpdateTime;
+
+        if (--numTabsToUpdate)
+          return;
+
+        checkUpdateTimes(groupItem);
+        finish();
+      });
+
+      cw.TabItems.update(tabItem.tab);
+    });
+
+    cw.TabItems.resumePainting();
   });
 }

From e45e22ecf063c5ae240d223f082e335a648858ef Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Thu, 14 Apr 2011 11:28:58 +0800
Subject: [PATCH 183/509] Bug 610996 - TabView should set its visibility with
 tab-view-deck.selectedPanel rather than selectedIndex r=ian

---
 browser/base/content/browser-tabview.js | 19 ++++++++++---------
 browser/base/content/browser.xul        |  2 +-
 browser/base/content/tabview/tabview.js |  1 +
 browser/base/content/tabview/ui.js      |  6 +++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 9f44218680c2..c01191a4f091 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -38,6 +38,7 @@
 
 let TabView = {
   _deck: null,
+  _iframe: null,
   _window: null,
   _firstUseExperienced: false,
   _browserKeyHandlerInitialized: false,
@@ -135,17 +136,17 @@ let TabView = {
       this._deck = document.getElementById("tab-view-deck");
 
       // ___ create the frame
-      let iframe = document.createElement("iframe");
-      iframe.id = "tab-view";
-      iframe.setAttribute("transparent", "true");
-      iframe.flex = 1;
+      this._iframe = document.createElement("iframe");
+      this._iframe.id = "tab-view";
+      this._iframe.setAttribute("transparent", "true");
+      this._iframe.flex = 1;
 
       if (typeof callback == "function")
         window.addEventListener("tabviewframeinitialized", callback, false);
 
-      iframe.setAttribute("src", "chrome://browser/content/tabview.html");
-      this._deck.appendChild(iframe);
-      this._window = iframe.contentWindow;
+      this._iframe.setAttribute("src", "chrome://browser/content/tabview.html");
+      this._deck.appendChild(this._iframe);
+      this._window = this._iframe.contentWindow;
 
       if (this._tabShowEventListener) {
         gBrowser.tabContainer.removeEventListener(
@@ -163,8 +164,8 @@ let TabView = {
   },
 
   // ----------
-  isVisible: function() {
-    return (this._deck ? this._deck.selectedIndex == 1 : false);
+  isVisible: function TabView_isVisible() {
+    return (this._deck ? this._deck.selectedPanel == this._iframe : false);
   },
 
   // ----------
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2b395a7059a9..36fc5aded7d5 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -463,7 +463,7 @@
 #endif
 
 <deck flex="1" id="tab-view-deck">
-<vbox flex="1">
+<vbox flex="1" id="browser-panel">
 
   <toolbox id="navigator-toolbox"
            defaultmode="icons" mode="icons"
diff --git a/browser/base/content/tabview/tabview.js b/browser/base/content/tabview/tabview.js
index 7bf264ab023d..9c1496d718d3 100644
--- a/browser/base/content/tabview/tabview.js
+++ b/browser/base/content/tabview/tabview.js
@@ -33,6 +33,7 @@ var gWindow = window.parent;
 var gBrowser = gWindow.gBrowser;
 var gTabView = gWindow.TabView;
 var gTabViewDeck = gWindow.document.getElementById("tab-view-deck");
+var gBrowserPanel = gWindow.document.getElementById("browser-panel");
 var gTabViewFrame = gWindow.document.getElementById("tab-view");
 
 # NB: Certain files need to evaluate before others
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index d7fb0fec6e44..ebe4e2ac5e21 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -416,7 +416,7 @@ let UI = {
   // Function: isTabViewVisible
   // Returns true if the TabView UI is currently shown.
   isTabViewVisible: function UI_isTabViewVisible() {
-    return gTabViewDeck.selectedIndex == 1;
+    return gTabViewDeck.selectedPanel == gTabViewFrame;
   },
 
   // ---------
@@ -455,7 +455,7 @@ let UI = {
     // Restore the full height when showing TabView
     gTabViewFrame.style.marginTop = "";
 #endif
-    gTabViewDeck.selectedIndex = 1;
+    gTabViewDeck.selectedPanel = gTabViewFrame;
     gWindow.TabsInTitlebar.allowedBy("tabview-open", false);
     gTabViewFrame.contentWindow.focus();
 
@@ -537,7 +537,7 @@ let UI = {
     // as well as avoiding the flash of black as we animate out
     gTabViewFrame.style.marginTop = gBrowser.boxObject.y + "px";
 #endif
-    gTabViewDeck.selectedIndex = 0;
+    gTabViewDeck.selectedPanel = gBrowserPanel;
     gWindow.TabsInTitlebar.allowedBy("tabview-open", true);
     gBrowser.contentWindow.focus();
 

From bfff124a96ead206861d2cc10682ec0e3cad7203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Thu, 14 Apr 2011 15:54:27 -0400
Subject: [PATCH 184/509] Bug 648872 - use NS_STDCALL_FUNCPROTO; r=bzbarsky

---
 dom/src/threads/nsDOMWorker.h         | 6 +++---
 dom/src/threads/nsDOMWorkerXHRProxy.h | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dom/src/threads/nsDOMWorker.h b/dom/src/threads/nsDOMWorker.h
index e9f08e5fb77c..33979d2686bd 100644
--- a/dom/src/threads/nsDOMWorker.h
+++ b/dom/src/threads/nsDOMWorker.h
@@ -79,9 +79,6 @@ class nsDOMWorkerScope : public nsDOMWorkerMessageHandler,
 {
   friend class nsDOMWorker;
 
-  typedef nsresult (NS_STDCALL nsDOMWorkerScope::*SetListenerFunc)
-    (nsIDOMEventListener*);
-
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMEVENTTARGET
@@ -96,6 +93,9 @@ public:
   NS_DECL_NSIXPCSCRIPTABLE
   NS_DECL_NSICLASSINFO
 
+  typedef NS_STDCALL_FUNCPROTO(nsresult, SetListenerFunc, nsDOMWorkerScope,
+                               SetOnmessage, (nsIDOMEventListener*));
+
   nsDOMWorkerScope(nsDOMWorker* aWorker);
 
 protected:
diff --git a/dom/src/threads/nsDOMWorkerXHRProxy.h b/dom/src/threads/nsDOMWorkerXHRProxy.h
index eb94b9755fb2..d8abe61c9210 100644
--- a/dom/src/threads/nsDOMWorkerXHRProxy.h
+++ b/dom/src/threads/nsDOMWorkerXHRProxy.h
@@ -45,6 +45,7 @@
 #include "nsIRequestObserver.h"
 
 // Other includes
+#include "nsIDOMEventTarget.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
@@ -74,8 +75,9 @@ class nsDOMWorkerXHRProxy : public nsIRunnable,
   friend class nsDOMWorkerXHR;
   friend class nsDOMWorkerXHRUpload;
 
-  typedef nsresult (NS_STDCALL nsIDOMEventTarget::*EventListenerFunction)
-    (const nsAString&, nsIDOMEventListener*, PRBool);
+  typedef NS_STDCALL_FUNCPROTO(nsresult, EventListenerFunction, nsIDOMEventTarget,
+                               AddEventListener,
+                               (const nsAString&, nsIDOMEventListener*, PRBool));
 
 public:
   typedef nsAutoTArray<nsCOMPtr<nsIRunnable>, 5> SyncEventQueue;

From ad427d8c6f8f00356a628de50502a769495a186e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Thu, 14 Apr 2011 15:54:58 -0400
Subject: [PATCH 185/509] Bug 648873 - use NS_STDCALL_FUNCPROTO; r=bzbarsky

---
 widget/src/cocoa/nsMenuItemIconX.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/src/cocoa/nsMenuItemIconX.mm b/widget/src/cocoa/nsMenuItemIconX.mm
index 63c1a011f613..378026e92a2a 100644
--- a/widget/src/cocoa/nsMenuItemIconX.mm
+++ b/widget/src/cocoa/nsMenuItemIconX.mm
@@ -75,7 +75,8 @@ static const PRUint32 kIconBitsPerPixel = kIconBitsPerComponent *
 static const PRUint32 kIconBytesPerRow = kIconWidth * kIconBitsPerPixel / 8;
 static const PRUint32 kIconBytes = kIconBytesPerRow * kIconHeight;
 
-typedef nsresult (nsIDOMRect::*GetRectSideMethod)(nsIDOMCSSPrimitiveValue**);
+typedef NS_STDCALL_FUNCPROTO(nsresult, GetRectSideMethod, nsIDOMRect,
+                             GetBottom, (nsIDOMCSSPrimitiveValue**));
 
 NS_IMPL_ISUPPORTS2(nsMenuItemIconX, imgIContainerObserver, imgIDecoderObserver)
 

From ca8f63c5b582c749e28de081d5f36e667c3464eb Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 15:56:22 -0400
Subject: [PATCH 186/509] Back out changeset b1fc69fab8b2 (bug 648882) because
 the test it adds times out

---
 browser/base/content/tabview/tabitems.js      |  2 +-
 browser/base/content/test/tabview/Makefile.in |  1 -
 .../test/tabview/browser_tabview_bug648882.js | 64 -------------------
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 browser/base/content/test/tabview/browser_tabview_bug648882.js

diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 27f13c5315f6..ed53f449444e 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -1143,7 +1143,7 @@ let TabItems = {
   _checkHeartbeat: function TabItems__checkHeartbeat() {
     this._heartbeat = null;
 
-    if (this.isPaintingPaused() || !UI.isIdle())
+    if (this.isPaintingPaused() || !UI.isIdle)
       return;
 
     let accumTime = 0;
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 6259d16b67e5..225e086aa143 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -130,7 +130,6 @@ _BROWSER_FILES = \
                  browser_tabview_bug641802.js \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
-                 browser_tabview_bug648882.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
                  browser_tabview_expander.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug648882.js b/browser/base/content/test/tabview/browser_tabview_bug648882.js
deleted file mode 100644
index 6aefcd2f9865..000000000000
--- a/browser/base/content/test/tabview/browser_tabview_bug648882.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-  waitForExplicitFinish();
-
-  newWindowWithTabView(function (win) {
-    registerCleanupFunction(function () win.close());
-
-    let cw = win.TabView.getContentWindow();
-    let tab = win.gBrowser.tabs[0];
-    let tabItem = tab._tabViewTabItem;
-    let groupItem = cw.GroupItems.groupItems[0];
-    let container = groupItem.container;
-    let resizer = groupItem.$resizer[0];
-
-    let intervalID;
-    let isIdle = false;
-    let numLoops = 10;
-    let interval = cw.UI._maxInteractiveWait - 10;
-
-    let simulateDragDrop = function (target) {
-      EventUtils.synthesizeMouse(target, 5, 5, {type: "mousedown"}, cw);
-      EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
-      EventUtils.synthesizeMouse(target, 20, 20, {type: "mouseup"}, cw);
-    }
-
-    let moveGroup = function () {
-      simulateDragDrop(container);
-
-      if (!--numLoops) {
-        numLoops = 10;
-        win.clearInterval(intervalID);
-        intervalID = win.setInterval(resizeGroup, interval);
-      }
-    };
-
-    let resizeGroup = function () {
-      simulateDragDrop(resizer);
-
-      if (!--numLoops) {
-        isIdle = true;
-        win.clearInterval(intervalID);
-      }
-    };
-
-    SimpleTest.waitForFocus(function () {
-      cw.TabItems.pausePainting();
-      cw.TabItems.update(tab);
-
-      tabItem.addSubscriber(tabItem, "updated", function () {
-        tabItem.removeSubscriber(tabItem, "updated");
-        ok(isIdle, "tabItem is updated only when UI is idle");
-        finish();
-      });
-
-      intervalID = win.setInterval(moveGroup, interval);
-      registerCleanupFunction(function () win.clearInterval(intervalID));
-
-      moveGroup();
-      cw.TabItems.resumePainting();
-    }, cw);
-  });
-}

From a5e439e693f9ccfd879fb6cbac0d01ea31b4642f Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth-mozilla@adambarth.com>
Date: Thu, 14 Apr 2011 15:58:42 -0400
Subject: [PATCH 187/509] Bug 610218 - Quotes in "path" for Set-Cookie are
 taken literally; r=dwitte

---
 netwerk/cookie/nsCookieService.cpp | 2 +-
 netwerk/test/TestCookie.cpp        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index 0e67615ce09d..0fbc01dd3006 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3196,7 +3196,7 @@ nsCookieService::CheckPath(nsCookieAttributes &aCookieAttributes,
                            nsIURI             *aHostURI)
 {
   // if a path is given, check the host has permission
-  if (aCookieAttributes.path.IsEmpty()) {
+  if (aCookieAttributes.path.IsEmpty() || aCookieAttributes.path.First() != '/') {
     // strip down everything after the last slash to get the path,
     // ignoring slashes in the query string part.
     // if we can QI to nsIURL, that'll take care of the query string portion.
diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp
index c719000831f3..6db857da2c17 100644
--- a/netwerk/test/TestCookie.cpp
+++ b/netwerk/test/TestCookie.cpp
@@ -372,7 +372,14 @@ main(PRInt32 argc, char *argv[])
       GetACookie(cookieService, "http://foo.domain.com", nsnull, getter_Copies(cookie));
       rv[13] = CheckResult(cookie.get(), MUST_BE_NULL);
 
-      allTestsPassed = PrintResult(rv, 14) && allTestsPassed;
+      SetACookie(cookieService, "http://path.net/path/file", nsnull, "test=taco; path=\"/bogus\"", nsnull);
+      GetACookie(cookieService, "http://path.net/path/file", nsnull, getter_Copies(cookie));
+      rv[14] = CheckResult(cookie.get(), MUST_EQUAL, "test=taco");
+      SetACookie(cookieService, "http://path.net/path/file", nsnull, "test=taco; max-age=-1", nsnull);
+      GetACookie(cookieService, "http://path.net/path/file", nsnull, getter_Copies(cookie));
+      rv[15] = CheckResult(cookie.get(), MUST_BE_NULL);
+
+      allTestsPassed = PrintResult(rv, 16) && allTestsPassed;
 
 
       // *** path tests

From 64f49c06b3821eec5fcb0cb5762e71ae11dda5fd Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 13 Apr 2011 18:12:32 -0400
Subject: [PATCH 188/509] Bug 649566 - @keyframe(s) missing from <style>
 sanitizing code in nsHTMLFragmentContentSink; r=bzbarsky

---
 .../src/nsHTMLFragmentContentSink.cpp         |  6 +---
 .../libeditor/html/tests/test_bug520189.html  | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp
index a2bc79973ff0..2d4f14a21fee 100644
--- a/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -1186,11 +1186,7 @@ nsHTMLParanoidFragmentSink::CloseContainer(const nsHTMLTag aTag)
                 continue;
               NS_ASSERTION(rule, "We should have a rule by now");
               switch (rule->GetType()) {
-                case nsICSSRule::UNKNOWN_RULE:
-                case nsICSSRule::CHARSET_RULE:
-                case nsICSSRule::IMPORT_RULE:
-                case nsICSSRule::MEDIA_RULE:
-                case nsICSSRule::PAGE_RULE:
+                default:
                   didSanitize = PR_TRUE;
                   // Ignore these rule types.
                   break;
diff --git a/editor/libeditor/html/tests/test_bug520189.html b/editor/libeditor/html/tests/test_bug520189.html
index 5ed9f90e2680..d8b2810e86d6 100644
--- a/editor/libeditor/html/tests/test_bug520189.html
+++ b/editor/libeditor/html/tests/test_bug520189.html
@@ -58,6 +58,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=520182
   <div id="pp" contenteditable="true"></div>
   <iframe id="qq" src="about:blank"></iframe>
   <div id="rr" contenteditable="true"></div>
+  <iframe id="ss" src="about:blank"></iframe>
+  <div id="tt" contenteditable="true"></div>
+  <iframe id="uu" src="about:blank"></iframe>
+  <div id="vv" contenteditable="true"></div>
 </div>
 <pre id="test">
 <script type="application/javascript">
@@ -80,6 +84,8 @@ const invalidStyle4Payload = "foo<span style=\"@import 'xxx.css';\">bar</span>ba
 const invalidStyle5Payload = "foo<span style=\"@font-face{font-family:xxx;src:'xxx.ttf';}\">bar</span>baz";
 const invalidStyle6Payload = "foo<span style=\"@namespace xxx url(http://example.com/);\">bar</span>baz";
 const invalidStyle7Payload = "<html><head><title>xxx</title></head><body>foo</body></html>";
+const invalidStyle8Payload = "foo<style>@-moz-document url(http://example.com/) {};</style>baz";
+const invalidStyle9Payload = "foo<style>@-moz-keyframes bar {};</style>baz";
 const nestedStylePayload = "foo<style>#bar1{-moz-binding:url('data:text/xml,<?xml version=&quot;1.0&quot;><binding xmlns=&quot;http://www.mozilla.org/xbl&quot; id=&quot;binding-1&quot;/>');<style></style>#bar2{-moz-binding:url('data:text/xml,<?xml version=&quot;1.0&quot;><binding xmlns=&quot;http://www.mozilla.org/xbl&quot; id=&quot;binding-2&quot;/>');</style>baz";
 const validImgSrc1Payload = "foo<img src=\"data:image/png,bar\">baz";
 const validImgSrc2Payload = "foo<img src=\"javascript:void('bar');\">baz";
@@ -389,6 +395,32 @@ var tests = [
     payload: validDataFoo2Payload,
     rootElement: function() document.getElementById("rr"),
     checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the _bar attribute")
+  },
+  {
+    id: "ss",
+    isIFrame: true,
+    payload: invalidStyle8Payload,
+    rootElement: function() document.getElementById("ss").contentDocument.documentElement,
+    checkResult: function(html) is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule")
+  },
+  {
+    id: "tt",
+    payload: invalidStyle8Payload,
+    rootElement: function() document.getElementById("tt"),
+    checkResult: function(html) is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule")
+  },
+  {
+    id: "uu",
+    isIFrame: true,
+    payload: invalidStyle9Payload,
+    rootElement: function() document.getElementById("uu").contentDocument.documentElement,
+    checkResult: function(html) is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule")
+  },
+  {
+    id: "vv",
+    payload: invalidStyle9Payload,
+    rootElement: function() document.getElementById("vv"),
+    checkResult: function(html) is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule")
   }
 ];
 

From 2bdc74c61afc5db6d685b0578209d5f2c15c2902 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@vt.edu>
Date: Thu, 14 Apr 2011 17:32:15 -0700
Subject: [PATCH 189/509] Bug 634557 - ScaleYCbCrToRGB565: Reference C version,
 r=doublec

---
 gfx/layers/basic/BasicImages.cpp |  69 +++--
 gfx/ycbcr/ycbcr_to_rgb565.cpp    | 507 ++++++++++++++++++++++++++++++-
 gfx/ycbcr/ycbcr_to_rgb565.h      |  27 ++
 3 files changed, 577 insertions(+), 26 deletions(-)

diff --git a/gfx/layers/basic/BasicImages.cpp b/gfx/layers/basic/BasicImages.cpp
index 823d35d8251a..64b28c56e9fc 100644
--- a/gfx/layers/basic/BasicImages.cpp
+++ b/gfx/layers/basic/BasicImages.cpp
@@ -163,28 +163,42 @@ BasicPlanarYCbCrImage::SetData(const Data& aData)
 
   // 'prescale' is true if the scaling is to be done as part of the
   // YCbCr to RGB conversion rather than on the RGB data when rendered.
-  // We don't prescale if the image has an offset. See bug 639415.
   PRBool prescale = mScaleHint.width > 0 && mScaleHint.height > 0 &&
-                    aData.mPicX == 0 && aData.mPicY == 0;
+                    mScaleHint != aData.mPicSize;
   if (format == gfxASurface::ImageFormatRGB16_565) {
 #if defined(HAVE_YCBCR_TO_RGB565)
-    if (prescale && gfx::IsConvertYCbCrToRGB565Fast(aData.mPicX,
-                                                    aData.mPicY,
-                                                    aData.mPicSize.width,
-                                                    aData.mPicSize.height,
-                                                    type)) {
-      // yuv2rgb16 with scale function not yet available for NEON
+    if (prescale &&
+        !gfx::IsScaleYCbCrToRGB565Fast(aData.mPicX,
+                                       aData.mPicY,
+                                       aData.mPicSize.width,
+                                       aData.mPicSize.height,
+                                       mScaleHint.width,
+                                       mScaleHint.height,
+                                       type,
+                                       gfx::FILTER_BILINEAR) &&
+        gfx::IsConvertYCbCrToRGB565Fast(aData.mPicX,
+                                        aData.mPicY,
+                                        aData.mPicSize.width,
+                                        aData.mPicSize.height,
+                                        type)) {
       prescale = PR_FALSE;
-    } else
-#endif
-    {
-      // yuv2rgb16 function not yet available for non-NEON, and currently
-      // using it requires a number of extra graphics operations, so it's
-      // probably better to fall back to 24-bit RGB.
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=641196
-      format = gfxASurface::ImageFormatRGB24;
     }
+#else
+    // yuv2rgb16 function not available
+    format = gfxASurface::ImageFormatRGB24;
+#endif
   }
+  else if (format != gfxASurface::ImageFormatRGB24) {
+    // No other formats are currently supported.
+    format = gfxASurface::ImageFormatRGB24;
+  }
+  if (format == gfxASurface::ImageFormatRGB24) {
+    /* ScaleYCbCrToRGB32 does not support a picture offset, nor 4:4:4 data.
+       See bugs 639415 and 640073. */
+    if (aData.mPicX != 0 || aData.mPicY != 0 || type == gfx::YV24)
+      prescale = PR_FALSE;
+  }
+
   gfxIntSize size(prescale ? mScaleHint.width : aData.mPicSize.width,
                   prescale ? mScaleHint.height : aData.mPicSize.height);
 
@@ -197,7 +211,25 @@ BasicPlanarYCbCrImage::SetData(const Data& aData)
 
   // Convert from YCbCr to RGB now, scaling the image if needed.
   if (size != aData.mPicSize) {
-    if (format == gfxASurface::ImageFormatRGB24) {
+#if defined(HAVE_YCBCR_TO_RGB565)
+    if (format == gfxASurface::ImageFormatRGB16_565) {
+      gfx::ScaleYCbCrToRGB565(aData.mYChannel,
+                              aData.mCbChannel,
+                              aData.mCrChannel,
+                              mBuffer,
+                              aData.mPicX,
+                              aData.mPicY,
+                              aData.mPicSize.width,
+                              aData.mPicSize.height,
+                              size.width,
+                              size.height,
+                              aData.mYStride,
+                              aData.mCbCrStride,
+                              mStride,
+                              type,
+                              gfx::FILTER_BILINEAR);
+    } else
+#endif
       gfx::ScaleYCbCrToRGB32(aData.mYChannel,
                              aData.mCbChannel,
                              aData.mCrChannel,
@@ -212,9 +244,6 @@ BasicPlanarYCbCrImage::SetData(const Data& aData)
                              type,
                              gfx::ROTATE_0,
                              gfx::FILTER_BILINEAR);
-    } else {
-       NS_ERROR("Fail, ScaleYCbCrToRGB format not supported\n");
-    }
   } else { // no prescale
 #if defined(HAVE_YCBCR_TO_RGB565)
     if (format == gfxASurface::ImageFormatRGB16_565) {
diff --git a/gfx/ycbcr/ycbcr_to_rgb565.cpp b/gfx/ycbcr/ycbcr_to_rgb565.cpp
index dd4b9500ca29..3890ad1fcb78 100644
--- a/gfx/ycbcr/ycbcr_to_rgb565.cpp
+++ b/gfx/ycbcr/ycbcr_to_rgb565.cpp
@@ -38,14 +38,67 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include <stdlib.h>
+#include <limits.h>
+#include "nsDebug.h"
 #include "ycbcr_to_rgb565.h"
 
+
+
 #ifdef HAVE_YCBCR_TO_RGB565
 
 namespace mozilla {
 
 namespace gfx {
 
+/*This contains all of the parameters that are needed to convert a row.
+  Passing them in a struct instead of as individual parameters saves the need
+   to continually push onto the stack the ones that are fixed for every row.*/
+struct yuv2rgb565_row_scale_bilinear_ctx{
+  PRUint16 *rgb_row;
+  const PRUint8 *y_row;
+  const PRUint8 *u_row;
+  const PRUint8 *v_row;
+  int y_yweight;
+  int y_pitch;
+  int width;
+  int source_x0_q16;
+  int source_dx_q16;
+  /*Not used for 4:4:4, except with chroma-nearest.*/
+  int source_uv_xoffs_q16;
+  /*Not used for 4:4:4 or chroma-nearest.*/
+  int uv_pitch;
+  /*Not used for 4:2:2, 4:4:4, or chroma-nearest.*/
+  int uv_yweight;
+};
+
+
+
+/*This contains all of the parameters that are needed to convert a row.
+  Passing them in a struct instead of as individual parameters saves the need
+   to continually push onto the stack the ones that are fixed for every row.*/
+struct yuv2rgb565_row_scale_nearest_ctx{
+  PRUint16 *rgb_row;
+  const PRUint8 *y_row;
+  const PRUint8 *u_row;
+  const PRUint8 *v_row;
+  int width;
+  int source_x0_q16;
+  int source_dx_q16;
+  /*Not used for 4:4:4.*/
+  int source_uv_xoffs_q16;
+};
+
+
+
+typedef void (*yuv2rgb565_row_scale_bilinear_func)(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither);
+
+typedef void (*yuv2rgb565_row_scale_nearest_func)(
+ const yuv2rgb565_row_scale_nearest_ctx *ctx, int dither);
+
+
+
 # if defined(MOZILLA_MAY_SUPPORT_NEON)
 
 void __attribute((noinline)) yuv42x_to_rgb565_row_neon(uint16 *dst,
@@ -57,17 +110,458 @@ void __attribute((noinline)) yuv42x_to_rgb565_row_neon(uint16 *dst,
 
 #endif
 
-/*Convert a single pixel from Y'CbCr to RGB565.*/
-static PRUint16 yu2rgb565(int y, int u, int v) {
+
+
+/*Bilinear interpolation of a single value.
+  This uses the exact same formulas as the asm, even though it adds some extra
+   shifts that do nothing but reduce accuracy.*/
+static int bislerp(const PRUint8 *row,
+                   int pitch,
+                   int source_x,
+                   int xweight,
+                   int yweight) {
+  int a;
+  int b;
+  int c;
+  int d;
+  a = row[source_x];
+  b = row[source_x+1];
+  c = row[source_x+pitch];
+  d = row[source_x+pitch+1];
+  a = ((a<<8)+(c-a)*yweight+128)>>8;
+  b = ((b<<8)+(d-b)*yweight+128)>>8;
+  return ((a<<8)+(b-a)*xweight+128)>>8;
+}
+
+/*Convert a single pixel from Y'CbCr to RGB565.
+  This uses the exact same formulas as the asm, even though we could make the
+   constants a lot more accurate with 32-bit wide registers.*/
+static PRUint16 yu2rgb565(int y, int u, int v, int dither) {
+  /*This combines the constant offset that needs to be added during the Y'CbCr
+     conversion with a rounding offset that depends on the dither parameter.*/
+  static const int DITHER_BIAS[4][3]={
+    {-14240,    8704,    -17696},
+    {-14240+128,8704+64, -17696+128},
+    {-14240+256,8704+128,-17696+256},
+    {-14240+384,8704+192,-17696+384}
+  };
   int r;
   int g;
   int b;
-  r = NS_CLAMP((74*y+102*v-14240+256)>>9, 0, 31);
-  g = NS_CLAMP((74*y-25*u-52*v+8704+128)>>8, 0, 63);
-  b = NS_CLAMP((74*y+129*u-17696+256)>>9, 0, 31);
+  r = NS_CLAMP((74*y+102*v+DITHER_BIAS[dither][0])>>9, 0, 31);
+  g = NS_CLAMP((74*y-25*u-52*v+DITHER_BIAS[dither][1])>>8, 0, 63);
+  b = NS_CLAMP((74*y+129*u+DITHER_BIAS[dither][2])>>9, 0, 31);
   return (PRUint16)(r<<11 | g<<5 | b);
 }
 
+static void ScaleYCbCr420ToRGB565_Bilinear_Row_C(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither){
+  int x;
+  int source_x_q16;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    int source_x;
+    int xweight;
+    int y;
+    int u;
+    int v;
+    xweight = ((source_x_q16&0xFFFF)+128)>>8;
+    source_x = source_x_q16>>16;
+    y = bislerp(ctx->y_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    xweight = (((source_x_q16+ctx->source_uv_xoffs_q16)&0x1FFFF)+256)>>9;
+    source_x = (source_x_q16+ctx->source_uv_xoffs_q16)>>17;
+    source_x_q16 += ctx->source_dx_q16;
+    u = bislerp(ctx->u_row, ctx->uv_pitch, source_x, xweight, ctx->uv_yweight);
+    v = bislerp(ctx->v_row, ctx->uv_pitch, source_x, xweight, ctx->uv_yweight);
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr422ToRGB565_Bilinear_Row_C(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither){
+  int x;
+  int source_x_q16;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    int source_x;
+    int xweight;
+    int y;
+    int u;
+    int v;
+    xweight = ((source_x_q16&0xFFFF)+128)>>8;
+    source_x = source_x_q16>>16;
+    y = bislerp(ctx->y_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    xweight = (((source_x_q16+ctx->source_uv_xoffs_q16)&0x1FFFF)+256)>>9;
+    source_x = (source_x_q16+ctx->source_uv_xoffs_q16)>>17;
+    source_x_q16 += ctx->source_dx_q16;
+    u = bislerp(ctx->u_row, ctx->uv_pitch, source_x, xweight, ctx->y_yweight);
+    v = bislerp(ctx->v_row, ctx->uv_pitch, source_x, xweight, ctx->y_yweight);
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr444ToRGB565_Bilinear_Row_C(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither){
+  int x;
+  int source_x_q16;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    int source_x;
+    int xweight;
+    int y;
+    int u;
+    int v;
+    xweight = ((source_x_q16&0xFFFF)+128)>>8;
+    source_x = source_x_q16>>16;
+    source_x_q16 += ctx->source_dx_q16;
+    y = bislerp(ctx->y_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    u = bislerp(ctx->u_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    v = bislerp(ctx->v_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr42xToRGB565_BilinearY_Row_C(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither){
+  int x;
+  int source_x_q16;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    int source_x;
+    int xweight;
+    int y;
+    int u;
+    int v;
+    xweight = ((source_x_q16&0xFFFF)+128)>>8;
+    source_x = source_x_q16>>16;
+    y = bislerp(ctx->y_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    source_x = (source_x_q16+ctx->source_uv_xoffs_q16)>>17;
+    source_x_q16 += ctx->source_dx_q16;
+    u = ctx->u_row[source_x];
+    v = ctx->v_row[source_x];
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr444ToRGB565_BilinearY_Row_C(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither){
+  int x;
+  int source_x_q16;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    int source_x;
+    int xweight;
+    int y;
+    int u;
+    int v;
+    xweight = ((source_x_q16&0xFFFF)+128)>>8;
+    source_x = source_x_q16>>16;
+    y = bislerp(ctx->y_row, ctx->y_pitch, source_x, xweight, ctx->y_yweight);
+    source_x = (source_x_q16+ctx->source_uv_xoffs_q16)>>16;
+    source_x_q16 += ctx->source_dx_q16;
+    u = ctx->u_row[source_x];
+    v = ctx->v_row[source_x];
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr42xToRGB565_Nearest_Row_C(
+ const yuv2rgb565_row_scale_nearest_ctx *ctx, int dither){
+  int y;
+  int u;
+  int v;
+  int x;
+  int source_x_q16;
+  int source_x;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    source_x = source_x_q16>>16;
+    y = ctx->y_row[source_x];
+    source_x = (source_x_q16+ctx->source_uv_xoffs_q16)>>17;
+    source_x_q16 += ctx->source_dx_q16;
+    u = ctx->u_row[source_x];
+    v = ctx->v_row[source_x];
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+static void ScaleYCbCr444ToRGB565_Nearest_Row_C(
+ const yuv2rgb565_row_scale_nearest_ctx *ctx, int dither){
+  int y;
+  int u;
+  int v;
+  int x;
+  int source_x_q16;
+  int source_x;
+  source_x_q16 = ctx->source_x0_q16;
+  for (x = 0; x < ctx->width; x++) {
+    source_x = source_x_q16>>16;
+    source_x_q16 += ctx->source_dx_q16;
+    y = ctx->y_row[source_x];
+    u = ctx->u_row[source_x];
+    v = ctx->v_row[source_x];
+    ctx->rgb_row[x] = yu2rgb565(y, u, v, dither);
+    dither ^= 3;
+  }
+}
+
+NS_GFX_(void) ScaleYCbCrToRGB565(const PRUint8 *y_buf,
+                                 const PRUint8 *u_buf,
+                                 const PRUint8 *v_buf,
+                                 PRUint8 *rgb_buf,
+                                 int source_x0,
+                                 int source_y0,
+                                 int source_width,
+                                 int source_height,
+                                 int width,
+                                 int height,
+                                 int y_pitch,
+                                 int uv_pitch,
+                                 int rgb_pitch,
+                                 YUVType yuv_type,
+                                 ScaleFilter filter) {
+  int source_x0_q16;
+  int source_y0_q16;
+  int source_dx_q16;
+  int source_dy_q16;
+  int source_uv_xoffs_q16;
+  int source_uv_yoffs_q16;
+  int x_shift;
+  int y_shift;
+  int ymin;
+  int ymax;
+  int uvmin;
+  int uvmax;
+  int dither;
+  /*We don't support negative destination rectangles (just flip the source
+     instead), and for empty ones there's nothing to do.*/
+  if (width <= 0 || height <= 0)
+    return;
+  /*These bounds are required to avoid 16.16 fixed-point overflow.*/
+  NS_ASSERTION(source_x0 > (INT_MIN>>16) && source_x0 < (INT_MAX>>16),
+    "ScaleYCbCrToRGB565 source X offset out of bounds.");
+  NS_ASSERTION(source_x0+source_width > (INT_MIN>>16)
+            && source_x0+source_width < (INT_MAX>>16),
+    "ScaleYCbCrToRGB565 source width out of bounds.");
+  NS_ASSERTION(source_y0 > (INT_MIN>>16) && source_y0 < (INT_MAX>>16),
+    "ScaleYCbCrToRGB565 source Y offset out of bounds.");
+  NS_ASSERTION(source_y0+source_height > (INT_MIN>>16)
+            && source_y0+source_height < (INT_MAX>>16),
+    "ScaleYCbCrToRGB565 source height out of bounds.");
+  /*We require the same stride for Y' and Cb and Cr for 4:4:4 content.*/
+  NS_ASSERTION(yuv_type != YV24 || y_pitch == uv_pitch,
+    "ScaleYCbCrToRGB565 luma stride differs from chroma for 4:4:4 content.");
+  /*We assume we can read outside the bounds of the input, because it makes
+     the code much simpler (and in practice is true: both Theora and VP8 return
+     padded reference frames).
+    In practice, we do not even _have_ the actual bounds of the source, as
+     we are passed a crop rectangle from it, and not the dimensions of the full
+     image.
+    This assertion will not guarantee our out-of-bounds reads are safe, but it
+     should at least catch the simple case of passing in an unpadded buffer.*/
+  NS_ASSERTION(abs(y_pitch) >= abs(source_width)+16,
+    "ScaleYCbCrToRGB565 source image unpadded?");
+  /*We take an area-based approach to pixel coverage to avoid shifting by small
+     amounts (or not so small, when up-scaling or down-scaling by a large
+     factor).
+
+    An illustrative example: scaling 4:2:0 up by 2, using JPEG chroma cositing^.
+
+    + = RGB destination locations
+    * = Y' source locations
+    - = Cb, Cr source locations
+
+    +   +   +   +  +   +   +   +
+      *       *      *       *
+    +   +   +   +  +   +   +   +
+          -              -
+    +   +   +   +  +   +   +   +
+      *       *      *       *
+    +   +   +   +  +   +   +   +
+
+    +   +   +   +  +   +   +   +
+      *       *      *       *
+    +   +   +   +  +   +   +   +
+          -              -
+    +   +   +   +  +   +   +   +
+      *       *      *       *
+    +   +   +   +  +   +   +   +
+
+    So, the coordinates of the upper-left + (first destination site) should
+     be (-0.25,-0.25) in the source Y' coordinate system.
+    Similarly, the coordinates should be (-0.375,-0.375) in the source Cb, Cr
+     coordinate system.
+    Note that the origin and scale of these two coordinate systems is not the
+     same!
+
+    ^JPEG cositing is required for Theora; VP8 doesn't specify cositing rules,
+     but nearly all software converters in existence (at least those that are
+     open source, and many that are not) use JPEG cositing instead of MPEG.*/
+  source_dx_q16 = (source_width<<16) / width;
+  source_x0_q16 = (source_x0<<16)+(source_dx_q16>>1)-0x8000;
+  source_dy_q16 = (source_height<<16) / height;
+  source_y0_q16 = (source_y0<<16)+(source_dy_q16>>1)-0x8000;
+  x_shift = (yuv_type != YV24);
+  y_shift = (yuv_type == YV12);
+  /*These two variables hold the difference between the origins of the Y' and
+     the Cb, Cr coordinate systems, using the scale of the Y' coordinate
+     system.*/
+  source_uv_xoffs_q16 = -(x_shift<<15);
+  source_uv_yoffs_q16 = -(y_shift<<15);
+  /*Compute the range of source rows we'll actually use.
+    This doesn't guarantee we won't read outside this range.*/
+  ymin = source_height >= 0 ? source_y0 : source_y0+source_height-1;
+  ymax = source_height >= 0 ? source_y0+source_height-1 : source_y0;
+  uvmin = ymin>>y_shift;
+  uvmax = ((ymax+1+y_shift)>>y_shift)-1;
+  /*Pick a dithering pattern.
+    The "&3" at the end is just in case RAND_MAX is lying.*/
+  dither = (rand()/(RAND_MAX>>2))&3;
+  /*Nearest-neighbor scaling.*/
+  if (filter == FILTER_NONE) {
+    yuv2rgb565_row_scale_nearest_ctx ctx;
+    yuv2rgb565_row_scale_nearest_func scale_row;
+    int y;
+    /*Add rounding offsets once, in advance.*/
+    source_x0_q16 += 0x8000;
+    source_y0_q16 += 0x8000;
+    source_uv_xoffs_q16 += (x_shift<<15);
+    source_uv_yoffs_q16 += (y_shift<<15);
+    if (yuv_type == YV12)
+      scale_row = ScaleYCbCr42xToRGB565_Nearest_Row_C;
+    else
+      scale_row = ScaleYCbCr444ToRGB565_Nearest_Row_C;
+    ctx.width = width;
+    ctx.source_x0_q16 = source_x0_q16;
+    ctx.source_dx_q16 = source_dx_q16;
+    ctx.source_uv_xoffs_q16 = source_uv_xoffs_q16;
+    for (y=0; y<height; y++) {
+      int source_y;
+      ctx.rgb_row = (PRUint16 *)(rgb_buf + y*rgb_pitch);
+      source_y = source_y0_q16>>16;
+      source_y = NS_CLAMP(source_y, ymin, ymax);
+      ctx.y_row = y_buf + source_y*y_pitch;
+      source_y = (source_y0_q16+source_uv_yoffs_q16)>>(16+y_shift);
+      source_y = NS_CLAMP(source_y, uvmin, uvmax);
+      source_y0_q16 += source_dy_q16;
+      ctx.u_row = u_buf + source_y*uv_pitch;
+      ctx.v_row = v_buf + source_y*uv_pitch;
+      (*scale_row)(&ctx, dither);
+      dither ^= 2;
+    }
+  }
+  /*Bilinear scaling.*/
+  else {
+    yuv2rgb565_row_scale_bilinear_ctx ctx;
+    yuv2rgb565_row_scale_bilinear_func scale_row;
+    int uvxscale_min;
+    int uvxscale_max;
+    int uvyscale_min;
+    int uvyscale_max;
+    int y;
+    /*Check how close the chroma scaling is to unity.
+      If it's close enough, we can get away with nearest-neighbor chroma
+       sub-sampling, and only doing bilinear on luma.
+      If a given axis is subsampled, we use bounds on the luma step of
+       [0.67...2], which is equivalent to scaling chroma by [1...3].
+      If it's not subsampled, we use bounds of [0.5...1.33], which is
+       equivalent to scaling chroma by [0.75...2].
+      The lower bound is chosen as a trade-off between speed and how terrible
+       nearest neighbor looks when upscaling.*/
+# define CHROMA_NEAREST_SUBSAMP_STEP_MIN  0xAAAA
+# define CHROMA_NEAREST_NORMAL_STEP_MIN   0x8000
+# define CHROMA_NEAREST_SUBSAMP_STEP_MAX 0x20000
+# define CHROMA_NEAREST_NORMAL_STEP_MAX  0x15555
+    uvxscale_min = yuv_type != YV24 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MIN : CHROMA_NEAREST_NORMAL_STEP_MIN;
+    uvxscale_max = yuv_type != YV24 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MAX : CHROMA_NEAREST_NORMAL_STEP_MAX;
+    uvyscale_min = yuv_type == YV12 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MIN : CHROMA_NEAREST_NORMAL_STEP_MIN;
+    uvyscale_max = yuv_type == YV12 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MAX : CHROMA_NEAREST_NORMAL_STEP_MAX;
+    if (uvxscale_min <= abs(source_dx_q16)
+     && abs(source_dx_q16) <= uvxscale_max
+     && uvyscale_min <= abs(source_dy_q16)
+     && abs(source_dy_q16) <= uvyscale_max) {
+      /*Add the rounding offsets now.*/
+      source_uv_xoffs_q16 += 1<<(15+x_shift);
+      source_uv_yoffs_q16 += 1<<(15+y_shift);
+      if (yuv_type != YV24)
+        scale_row = ScaleYCbCr42xToRGB565_BilinearY_Row_C;
+      else
+        scale_row = ScaleYCbCr444ToRGB565_BilinearY_Row_C;
+    }
+    else {
+      if (yuv_type == YV12)
+        scale_row = ScaleYCbCr420ToRGB565_Bilinear_Row_C;
+      else if (yuv_type == YV16)
+        scale_row = ScaleYCbCr422ToRGB565_Bilinear_Row_C;
+      else
+        scale_row = ScaleYCbCr444ToRGB565_Bilinear_Row_C;
+    }
+    ctx.width = width;
+    ctx.y_pitch = y_pitch;
+    ctx.source_x0_q16 = source_x0_q16;
+    ctx.source_dx_q16 = source_dx_q16;
+    ctx.source_uv_xoffs_q16 = source_uv_xoffs_q16;
+    ctx.uv_pitch = uv_pitch;
+    for (y=0; y<height; y++) {
+      int source_y;
+      int yweight;
+      int uvweight;
+      ctx.rgb_row = (PRUint16 *)(rgb_buf + y*rgb_pitch);
+      source_y = (source_y0_q16+128)>>16;
+      yweight = ((source_y0_q16+128)>>8)&0xFF;
+      if (source_y < ymin) {
+        source_y = ymin;
+        yweight = 0;
+      }
+      if (source_y > ymax) {
+        source_y = ymax;
+        yweight = 0;
+      }
+      ctx.y_row = y_buf + source_y*y_pitch;
+      source_y = source_y0_q16+source_uv_yoffs_q16+(128<<y_shift);
+      source_y0_q16 += source_dy_q16;
+      uvweight = source_y>>(8+y_shift)&0xFF;
+      source_y >>= 16+y_shift;
+      if (source_y < uvmin) {
+        source_y = uvmin;
+        uvweight = 0;
+      }
+      if (source_y > uvmax) {
+        source_y = uvmax;
+        uvweight = 0;
+      }
+      ctx.u_row = u_buf + source_y*uv_pitch;
+      ctx.v_row = v_buf + source_y*uv_pitch;
+      ctx.y_yweight = yweight;
+      ctx.uv_yweight = uvweight;
+      (*scale_row)(&ctx, dither);
+      dither ^= 2;
+    }
+  }
+}
+
+NS_GFX_(bool) IsScaleYCbCrToRGB565Fast(int source_x0,
+                                       int source_y0,
+                                       int source_width,
+                                       int source_height,
+                                       int width,
+                                       int height,
+                                       YUVType yuv_type,
+                                       ScaleFilter filter)
+{
+  return false;
+}
+
 
 
 void yuv_to_rgb565_row_c(uint16 *dst,
@@ -83,7 +577,8 @@ void yuv_to_rgb565_row_c(uint16 *dst,
   {
     dst[x] = yu2rgb565(y[pic_x+x],
                        u[(pic_x+x)>>x_shift],
-                       v[(pic_x+x)>>x_shift]);
+                       v[(pic_x+x)>>x_shift],
+                       2); // Disable dithering for now.
   }
 }
 
diff --git a/gfx/ycbcr/ycbcr_to_rgb565.h b/gfx/ycbcr/ycbcr_to_rgb565.h
index a53a06c83fae..d90f3564f082 100644
--- a/gfx/ycbcr/ycbcr_to_rgb565.h
+++ b/gfx/ycbcr/ycbcr_to_rgb565.h
@@ -36,6 +36,33 @@ NS_GFX_(bool) IsConvertYCbCrToRGB565Fast(int pic_x,
                                          int pic_width,
                                          int pic_height,
                                          YUVType yuv_type);
+
+// Scale a frame of YUV to 16 bit RGB565.
+NS_GFX_(void) ScaleYCbCrToRGB565(const PRUint8 *yplane,
+                                 const PRUint8 *uplane,
+                                 const PRUint8 *vplane,
+                                 PRUint8 *rgbframe,
+                                 int source_x0,
+                                 int source_y0,
+                                 int source_width,
+                                 int source_height,
+                                 int width,
+                                 int height,
+                                 int ystride,
+                                 int uvstride,
+                                 int rgbstride,
+                                 YUVType yuv_type,
+                                 ScaleFilter filter);
+
+// Used to test if we have an accelerated version.
+NS_GFX_(bool) IsScaleYCbCrToRGB565Fast(int source_x0,
+                                       int source_y0,
+                                       int source_width,
+                                       int source_height,
+                                       int width,
+                                       int height,
+                                       YUVType yuv_type,
+                                       ScaleFilter filter);
 #endif // HAVE_YCBCR_TO_RGB565
 
 }  // namespace gfx

From beb5d7222d2a9c0c1f0a0afca436cff74eab8d10 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@vt.edu>
Date: Thu, 14 Apr 2011 17:34:18 -0700
Subject: [PATCH 190/509] Bug 634557 - Implement
 ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, r=jbramley

---
 gfx/ycbcr/Makefile.in         |   4 +
 gfx/ycbcr/ycbcr_to_rgb565.cpp |  51 +++++-
 gfx/ycbcr/yuv_row_arm.s       | 329 ++++++++++++++++++++++++++++++++++
 3 files changed, 382 insertions(+), 2 deletions(-)
 create mode 100644 gfx/ycbcr/yuv_row_arm.s

diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index 353ddf979b8a..a7b0a10f6870 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -76,8 +76,12 @@ endif # linux
 endif # windows
 
 ifeq (arm,$(findstring arm,$(OS_TEST)))
+ifdef HAVE_ARM_NEON
 CPPSRCS += yuv_convert_arm.cpp \
            $(NULL)
+ASFILES = yuv_row_arm.$(ASM_SUFFIX) \
+          $(NULL)
+endif
 endif
 
 EXTRA_DSO_LDOPTS += \
diff --git a/gfx/ycbcr/ycbcr_to_rgb565.cpp b/gfx/ycbcr/ycbcr_to_rgb565.cpp
index 3890ad1fcb78..95f2c862eb36 100644
--- a/gfx/ycbcr/ycbcr_to_rgb565.cpp
+++ b/gfx/ycbcr/ycbcr_to_rgb565.cpp
@@ -101,6 +101,9 @@ typedef void (*yuv2rgb565_row_scale_nearest_func)(
 
 # if defined(MOZILLA_MAY_SUPPORT_NEON)
 
+extern "C" void ScaleYCbCr42xToRGB565_BilinearY_Row_NEON(
+ const yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither);
+
 void __attribute((noinline)) yuv42x_to_rgb565_row_neon(uint16 *dst,
                                                        const uint8 *y,
                                                        const uint8 *u,
@@ -367,6 +370,15 @@ NS_GFX_(void) ScaleYCbCrToRGB565(const PRUint8 *y_buf,
      should at least catch the simple case of passing in an unpadded buffer.*/
   NS_ASSERTION(abs(y_pitch) >= abs(source_width)+16,
     "ScaleYCbCrToRGB565 source image unpadded?");
+  /*The NEON code requires the pointers to be aligned to a 16-byte boundary at
+     the start of each row.
+    This should be true for all of our sources.
+    We could try to fix this up if it's not true by adjusting source_x0, but
+     that would require the mis-alignment to be the same for the U and V
+     planes.*/
+  NS_ASSERTION((y_pitch&15) == 0 && (uv_pitch&15) == 0 &&
+   ((y_buf-NULL)&15) == 0 && ((u_buf-NULL)&15) == 0 && ((v_buf-NULL)&15) == 0,
+   "ScaleYCbCrToRGB565 source image unaligned");
   /*We take an area-based approach to pixel coverage to avoid shifting by small
      amounts (or not so small, when up-scaling or down-scaling by a large
      factor).
@@ -493,8 +505,13 @@ NS_GFX_(void) ScaleYCbCrToRGB565(const PRUint8 *y_buf,
       /*Add the rounding offsets now.*/
       source_uv_xoffs_q16 += 1<<(15+x_shift);
       source_uv_yoffs_q16 += 1<<(15+y_shift);
-      if (yuv_type != YV24)
-        scale_row = ScaleYCbCr42xToRGB565_BilinearY_Row_C;
+      if (yuv_type != YV24) {
+        scale_row =
+#  if defined(MOZILLA_MAY_SUPPORT_NEON)
+         supports_neon() ? ScaleYCbCr42xToRGB565_BilinearY_Row_NEON :
+#  endif
+         ScaleYCbCr42xToRGB565_BilinearY_Row_C;
+      }
       else
         scale_row = ScaleYCbCr444ToRGB565_BilinearY_Row_C;
     }
@@ -559,6 +576,36 @@ NS_GFX_(bool) IsScaleYCbCrToRGB565Fast(int source_x0,
                                        YUVType yuv_type,
                                        ScaleFilter filter)
 {
+  // Very fast.
+  if (width <= 0 || height <= 0)
+    return true;
+#  if defined(MOZILLA_MAY_SUPPORT_NEON)
+  if (filter != FILTER_NONE) {
+    int source_dx_q16;
+    int source_dy_q16;
+    int uvxscale_min;
+    int uvxscale_max;
+    int uvyscale_min;
+    int uvyscale_max;
+    source_dx_q16 = (source_width<<16) / width;
+    source_dy_q16 = (source_height<<16) / height;
+    uvxscale_min = yuv_type != YV24 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MIN : CHROMA_NEAREST_NORMAL_STEP_MIN;
+    uvxscale_max = yuv_type != YV24 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MAX : CHROMA_NEAREST_NORMAL_STEP_MAX;
+    uvyscale_min = yuv_type == YV12 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MIN : CHROMA_NEAREST_NORMAL_STEP_MIN;
+    uvyscale_max = yuv_type == YV12 ?
+     CHROMA_NEAREST_SUBSAMP_STEP_MAX : CHROMA_NEAREST_NORMAL_STEP_MAX;
+    if (uvxscale_min <= abs(source_dx_q16)
+     && abs(source_dx_q16) <= uvxscale_max
+     && uvyscale_min <= abs(source_dy_q16)
+     && abs(source_dy_q16) <= uvyscale_max) {
+      if (yuv_type != YV24)
+        return supports_neon();
+    }
+  }
+#  endif
   return false;
 }
 
diff --git a/gfx/ycbcr/yuv_row_arm.s b/gfx/ycbcr/yuv_row_arm.s
new file mode 100644
index 000000000000..e72c5c83d5e9
--- /dev/null
+++ b/gfx/ycbcr/yuv_row_arm.s
@@ -0,0 +1,329 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is NEON YUV-to-RGB565 scaling code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Timothy B. Terriberry <tterriberry@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+    .arch   armv7-a
+    .fpu    neon
+    .text
+    .align
+
+    .balign 64
+YCbCr42xToRGB565_DITHER03_CONSTS_NEON:
+    .short -14240
+    .short -14240+384
+    .short   8672
+    .short   8672+192
+    .short -17696
+    .short -17696+384
+    .byte 102
+    .byte  25
+    .byte  52
+    .byte 129
+YCbCr42xToRGB565_DITHER12_CONSTS_NEON:
+    .short -14240+128
+    .short -14240+256
+    .short   8672+64
+    .short   8672+128
+    .short -17696+128
+    .short -17696+256
+    .byte 102
+    .byte  25
+    .byte  52
+    .byte 129
+YCbCr42xToRGB565_DITHER21_CONSTS_NEON:
+    .short -14240+256
+    .short -14240+128
+    .short   8672+128
+    .short   8672+64
+    .short -17696+256
+    .short -17696+128
+    .byte 102
+    .byte  25
+    .byte  52
+    .byte 129
+YCbCr42xToRGB565_DITHER30_CONSTS_NEON:
+    .short -14240+384
+    .short -14240
+    .short   8672+192
+    .short   8672
+    .short -17696+384
+    .short -17696
+    .byte 102
+    .byte  25
+    .byte  52
+    .byte 129
+
+@ void ScaleYCbCr42xToRGB565_BilinearY_Row_NEON(
+@  yuv2rgb565_row_scale_bilinear_ctx *ctx, int dither);
+@
+@ ctx = {
+@   PRUint16 *rgb_row;       /*r0*/
+@   const PRUint8 *y_row;    /*r1*/
+@   const PRUint8 *u_row;    /*r2*/
+@   const PRUint8 *v_row;    /*r3*/
+@   int y_yweight;           /*r4*/
+@   int y_pitch;             /*r5*/
+@   int width;               /*r6*/
+@   int source_x0_q16;       /*r7*/
+@   int source_dx_q16;       /*r8*/
+@   int source_uv_xoffs_q16; /*r9*/
+@ };
+    .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
+    .type   ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function
+    .balign 64
+    .fnstart
+ScaleYCbCr42xToRGB565_BilinearY_Row_NEON:
+    STMFD       r13!,{r4-r9,r14}       @ 8 words.
+    ADR         r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON
+    VPUSH       {Q4-Q7}                @ 16 words.
+    ADD         r14,r14,r1, LSL #4     @ Select the dither table to use
+    LDMIA       r0, {r0-r9}
+    @ Set up image index registers.
+    ADD         r12,r8, r8
+    VMOV.I32    D16,#0         @ Q8 = < 2| 2| 0| 0>*source_dx_q16
+    VDUP.32     D17,r12
+    ADD         r12,r12,r12
+    VTRN.32     D16,D17        @ Q2 = < 2| 0| 2| 0>*source_dx_q16
+    VDUP.32     D19,r12        @ Q9 = < 4| 4| ?| ?>*source_dx_q16
+    ADD         r12,r12,r12
+    VDUP.32     Q0, r7         @ Q0 = < 1| 1| 1| 1>*source_x0_q16
+    VADD.I32    D17,D17,D19    @ Q8 = < 6| 4| 2| 0>*source_dx_q16
+    CMP         r8, #0                 @ If source_dx_q16 is negative...
+    VDUP.32     Q9, r12        @ Q9 = < 8| 8| 8| 8>*source_dx_q16
+    ADDLT       r7, r7, r8, LSL #4     @ Make r7 point to the end of the block
+    VADD.I32    Q0, Q0, Q8     @ Q0 = < 6| 4| 2| 0>*source_dx_q16+source_x0_q16
+    SUBLT       r7, r7, r8             @ (i.e., the lowest address we'll use)
+    VADD.I32    Q1, Q0, Q9     @ Q1 = <14|12|10| 8>*source_dx_q16+source_x0_q16
+    VDUP.I32    Q9, r8         @ Q8 = < 1| 1| 1| 1>*source_dx_q16
+    VADD.I32    Q2, Q0, Q9     @ Q2 = < 7| 5| 3| 1>*source_dx_q16+source_x0_q16
+    VADD.I32    Q3, Q1, Q9     @ Q3 = <15|13|11| 9>*source_dx_q16+source_x0_q16
+    VLD1.64     {D30,D31},[r14,:128]   @ Load some constants
+    VMOV.I8     D28,#52
+    VMOV.I8     D29,#129
+    @ The basic idea here is to do aligned loads of a block of data and then
+    @  index into it using VTBL to extract the data from the source X
+    @  coordinate corresponding to each destination pixel.
+    @ This is significantly less code and significantly fewer cycles than doing
+    @  a series of single-lane loads, but it means that the X step between
+    @  pixels must be limited to 2.0 or less, otherwise we couldn't guarantee
+    @  that we could read 8 pixels from a single aligned 32-byte block of data.
+    @ Q0...Q3 contain the 16.16 fixed-point X coordinates of each pixel,
+    @  separated into even pixels and odd pixels to make extracting offsets and
+    @  weights easier.
+    @ We then pull out two bytes from the middle of each coordinate: the top
+    @  byte corresponds to the integer part of the X coordinate, and the bottom
+    @  byte corresponds to the weight to use for bilinear blending.
+    @ These are separated out into different registers with VTRN.
+    @ Then by subtracting the integer X coordinate of the first pixel in the
+    @  data block we loaded, we produce an index register suitable for use by
+    @  VTBL.
+s42xbily_neon_loop:
+    @ Load the Y' data.
+    MOV         r12,r7, ASR #16
+    VRSHRN.S32  D16,Q0, #8
+    AND         r12,r12,#~15   @ Read 16-byte aligned blocks
+    VDUP.I8     D20,r12
+    ADD         r12,r1, r12    @ r12 = y_row+(source_x&~7)
+    VRSHRN.S32  D17,Q1, #8
+    PLD         [r12,#64]
+    VLD1.64     {D8, D9, D10,D11},[r12,:128],r5        @ Load Y' top row
+    ADD         r14,r7, r8, LSL #3
+    VRSHRN.S32  D18,Q2, #8
+    MOV         r14,r14,ASR #16
+    VRSHRN.S32  D19,Q3, #8
+    AND         r14,r14,#~15   @ Read 16-byte aligned blocks
+    VLD1.64     {D12,D13,D14,D15},[r12,:128]           @ Load Y' bottom row
+    PLD         [r12,#64]
+    VDUP.I8     D21,r14
+    ADD         r14,r1, r14    @ r14 = y_row+(source_x&~7)
+    VMOV.I8     Q13,#1
+    PLD         [r14,#64]
+    VTRN.8      Q8, Q9         @ Q8  = <wFwEwDwCwBwAw9w8w7w6w5w4w3w2w1w0>
+                               @ Q9  = <xFxExDxCxBxAx9x8x7x6x5x4x3x2x1x0>
+    VSUB.S8     Q9, Q9, Q10    @ Make offsets relative to the data we loaded.
+    @ First 8 Y' pixels
+    VTBL.8      D20,{D8, D9, D10,D11},D18      @ Index top row at source_x
+    VTBL.8      D24,{D12,D13,D14,D15},D18      @ Index bottom row at source_x
+    VADD.S8     Q13,Q9, Q13                    @ Add 1 to source_x
+    VTBL.8      D22,{D8, D9, D10,D11},D26      @ Index top row at source_x+1
+    VTBL.8      D26,{D12,D13,D14,D15},D26      @ Index bottom row at source_x+1
+    @ Next 8 Y' pixels
+    VLD1.64     {D8, D9, D10,D11},[r14,:128],r5        @ Load Y' top row
+    VLD1.64     {D12,D13,D14,D15},[r14,:128]           @ Load Y' bottom row
+    PLD         [r14,#64]
+    VTBL.8      D21,{D8, D9, D10,D11},D19      @ Index top row at source_x
+    VTBL.8      D25,{D12,D13,D14,D15},D19      @ Index bottom row at source_x
+    VTBL.8      D23,{D8, D9, D10,D11},D27      @ Index top row at source_x+1
+    VTBL.8      D27,{D12,D13,D14,D15},D27      @ Index bottom row at source_x+1
+    @ Blend Y'.
+    VDUP.I16    Q9, r4         @ Load the y weights.
+    VSUBL.U8    Q4, D24,D20    @ Q5:Q4 = c-a
+    VSUBL.U8    Q5, D25,D21
+    VSUBL.U8    Q6, D26,D22    @ Q7:Q6 = d-b
+    VSUBL.U8    Q7, D27,D23
+    VMUL.S16    Q4, Q4, Q9     @ Q5:Q4 = (c-a)*yweight
+    VMUL.S16    Q5, Q5, Q9
+    VMUL.S16    Q6, Q6, Q9     @ Q7:Q6 = (d-b)*yweight
+    VMUL.S16    Q7, Q7, Q9
+    VMOVL.U8    Q12,D16        @ Promote the x weights to 16 bits.
+    VMOVL.U8    Q13,D17        @ Sadly, there's no VMULW.
+    VRSHRN.S16  D8, Q4, #8     @ Q4 = (c-a)*yweight+128>>8
+    VRSHRN.S16  D9, Q5, #8
+    VRSHRN.S16  D12,Q6, #8     @ Q6 = (d-b)*yweight+128>>8
+    VRSHRN.S16  D13,Q7, #8
+    VADD.I8     Q10,Q10,Q4     @ Q10 = a+((c-a)*yweight+128>>8)
+    VADD.I8     Q11,Q11,Q6     @ Q11 = b+((d-b)*yweight+128>>8)
+    VSUBL.U8    Q4, D22,D20    @ Q5:Q4 = b-a
+    VSUBL.U8    Q5, D23,D21
+    VMUL.S16    Q4, Q4, Q12    @ Q5:Q4 = (b-a)*xweight
+    VMUL.S16    Q5, Q5, Q13
+    VRSHRN.S16  D8, Q4, #8     @ Q4 = (b-a)*xweight+128>>8
+    ADD         r12,r7, r9
+    VRSHRN.S16  D9, Q5, #8
+    MOV         r12,r12,ASR #17
+    VADD.I8     Q8, Q10,Q4     @ Q8 = a+((b-a)*xweight+128>>8)
+    @ Start extracting the chroma x coordinates, and load Cb and Cr.
+    AND         r12,r12,#~15   @ Read 16-byte aligned blocks
+    VDUP.I32    Q9, r9         @ Q9 = source_uv_xoffs_q16 x 4
+    ADD         r14,r2, r12
+    VADD.I32    Q10,Q0, Q9
+    VLD1.64     {D8, D9, D10,D11},[r14,:128]   @ Load Cb
+    PLD         [r14,#64]
+    VADD.I32    Q11,Q1, Q9
+    ADD         r14,r3, r12
+    VADD.I32    Q12,Q2, Q9
+    VLD1.64     {D12,D13,D14,D15},[r14,:128]   @ Load Cr
+    PLD         [r14,#64]
+    VADD.I32    Q13,Q3, Q9
+    VRSHRN.S32  D20,Q10,#9     @ Q10 = <xEwExCwCxAwAx8w8x6w6x4w4x2w2x0w0>
+    VRSHRN.S32  D21,Q11,#9
+    VDUP.I8     Q9, r12
+    VRSHRN.S32  D22,Q12,#9     @ Q11 = <xFwFxDwDxBwBx9w9x7w7x5w5x3w3x1w1>
+    VRSHRN.S32  D23,Q13,#9
+    @ We don't actually need the x weights, but we get them for free.
+    @ Free ALU slot
+    VTRN.8      Q10,Q11        @ Q10 = <wFwEwDwCwBwAw9w8w7w6w5w4w3w2w1w0>
+    @ Free ALU slot            @ Q11 = <xFxExDxCxBxAx9x8x7x6x5x4x3x2x1x0>
+    VSUB.S8     Q11,Q11,Q9     @ Make offsets relative to the data we loaded.
+    VTBL.8      D18,{D8, D9, D10,D11},D22      @ Index Cb at source_x
+    VMOV.I8     D24,#74
+    VTBL.8      D19,{D8, D9, D10,D11},D23
+    VMOV.I8     D26,#102
+    VTBL.8      D20,{D12,D13,D14,D15},D22      @ Index Cr at source_x
+    VMOV.I8     D27,#25
+    VTBL.8      D21,{D12,D13,D14,D15},D23
+    @ We now have Y' in Q8, Cb in Q9, and Cr in Q10
+    @ We use VDUP to expand constants, because it's a permute instruction, so
+    @  it can dual issue on the A8.
+    SUBS        r6, r6, #16    @ width -= 16
+    VMULL.U8    Q4, D16,D24    @  Q5:Q4  = Y'*74
+    VDUP.32     Q6, D30[1]     @  Q7:Q6  = bias_G
+    VMULL.U8    Q5, D17,D24
+    VDUP.32     Q7, D30[1]
+    VMLSL.U8    Q6, D18,D27    @  Q7:Q6  = -25*Cb+bias_G
+    VDUP.32     Q11,D30[0]     @ Q12:Q11 = bias_R
+    VMLSL.U8    Q7, D19,D27
+    VDUP.32     Q12,D30[0]
+    VMLAL.U8    Q11,D20,D26    @ Q12:Q11 = 102*Cr+bias_R
+    VDUP.32     Q8, D31[0]     @ Q13:Q8  = bias_B
+    VMLAL.U8    Q12,D21,D26
+    VDUP.32     Q13,D31[0]
+    VMLAL.U8    Q8, D18,D29    @ Q13:Q8  = 129*Cb+bias_B
+    VMLAL.U8    Q13,D19,D29
+    VMLSL.U8    Q6, D20,D28    @  Q7:Q6  = -25*Cb-52*Cr+bias_G
+    VMLSL.U8    Q7, D21,D28
+    VADD.S16    Q11,Q4, Q11    @ Q12:Q11 = 74*Y'+102*Cr+bias_R
+    VADD.S16    Q12,Q5, Q12
+    VQADD.S16   Q8, Q4, Q8     @ Q13:Q8  = 74*Y'+129*Cr+bias_B
+    VQADD.S16   Q13,Q5, Q13
+    VADD.S16    Q6, Q4, Q6     @  Q7:Q6  = 74*Y'-25*Cb-52*Cr+bias_G
+    VADD.S16    Q7, Q5, Q7
+    @ Push each value to the top of its word and saturate it.
+    VQSHLU.S16 Q11,Q11,#2
+    VQSHLU.S16 Q12,Q12,#2
+    VQSHLU.S16 Q6, Q6, #2
+    VQSHLU.S16 Q7, Q7, #2
+    VQSHLU.S16 Q8, Q8, #2
+    VQSHLU.S16 Q13,Q13,#2
+    @ Merge G and B into R.
+    VSRI.U16   Q11,Q6, #5
+    VSRI.U16   Q12,Q7, #5
+    VSRI.U16   Q11,Q8, #11
+    MOV         r14,r8, LSL #4
+    VSRI.U16   Q12,Q13,#11
+    BLT s42xbily_neon_tail
+    VDUP.I32    Q13,r14
+    @ Store the result.
+    VST1.16     {D22,D23,D24,D25},[r0]!
+    BEQ s42xbily_neon_done
+    @ Advance the x coordinates.
+    VADD.I32    Q0, Q0, Q13
+    VADD.I32    Q1, Q1, Q13
+    ADD         r7, r14
+    VADD.I32    Q2, Q2, Q13
+    VADD.I32    Q3, Q3, Q13
+    B s42xbily_neon_loop
+s42xbily_neon_tail:
+    @ We have between 1 and 15 pixels left to write.
+    @ -r6 == the number of pixels we need to skip writing.
+    @ Adjust r0 to point to the last one we need to write, because we're going
+    @  to write them in reverse order.
+    ADD         r0, r0, r6, LSL #1
+    MOV         r14,#-2
+    ADD         r0, r0, #30
+    @ Skip past the ones we don't need to write.
+    SUB         PC, PC, r6, LSL #2
+    ORR         r0, r0, r0
+    VST1.16     {D25[3]},[r0,:16],r14
+    VST1.16     {D25[2]},[r0,:16],r14
+    VST1.16     {D25[1]},[r0,:16],r14
+    VST1.16     {D25[0]},[r0,:16],r14
+    VST1.16     {D24[3]},[r0,:16],r14
+    VST1.16     {D24[2]},[r0,:16],r14
+    VST1.16     {D24[1]},[r0,:16],r14
+    VST1.16     {D24[0]},[r0,:16],r14
+    VST1.16     {D23[3]},[r0,:16],r14
+    VST1.16     {D23[2]},[r0,:16],r14
+    VST1.16     {D23[1]},[r0,:16],r14
+    VST1.16     {D23[0]},[r0,:16],r14
+    VST1.16     {D22[3]},[r0,:16],r14
+    VST1.16     {D22[2]},[r0,:16],r14
+    VST1.16     {D22[1]},[r0,:16],r14
+    VST1.16     {D22[0]},[r0,:16]
+s42xbily_neon_done:
+    VPOP        {Q4-Q7}                @ 16 words.
+    LDMFD       r13!,{r4-r9,PC}        @ 8 words.
+    .fnend
+    .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON

From 2f869e0bd180d8bc3d66d75ed6bb661e661b919f Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Sat, 16 Apr 2011 11:14:08 +0200
Subject: [PATCH 191/509] Bug 635888 - Meta refresh breaks slow script warning;
 f=dolske r=jst

---
 dom/base/nsGlobalWindow.cpp                            | 10 ++++------
 .../windowwatcher/src/nsAutoWindowStateHelper.cpp      |  4 ++--
 .../windowwatcher/src/nsAutoWindowStateHelper.h        |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index f2c9af49ee77..6f167ea9ac66 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -5119,9 +5119,9 @@ nsGlobalWindow::Print()
         printSettingsService->GetNewPrintSettings(getter_AddRefs(printSettings));
       }
 
-      EnterModalState();
+      nsCOMPtr<nsIDOMWindow> callerWin = EnterModalState();
       webBrowserPrint->Print(printSettings, nsnull);
-      LeaveModalState(nsnull);
+      LeaveModalState(callerWin);
 
       PRBool savePrintSettings =
         nsContentUtils::GetBoolPref("print.save_print_settings", PR_FALSE);
@@ -6480,8 +6480,6 @@ nsGlobalWindow::LeaveModalState(nsIDOMWindow *aCallerWin)
     }
   }
 
-  JSContext *cx = nsContentUtils::GetCurrentJSContext();
-
   if (aCallerWin) {
     nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(aCallerWin));
     nsIScriptContext *scx = sgo->GetContext();
@@ -6833,7 +6831,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aURI, nsIVariant *aArgs,
 
   options.AppendLiteral(",scrollbars=1,centerscreen=1,resizable=0");
 
-  EnterModalState();
+  nsCOMPtr<nsIDOMWindow> callerWin = EnterModalState();
   nsresult rv = OpenInternal(aURI, EmptyString(), options,
                              PR_FALSE,          // aDialog
                              PR_TRUE,           // aContentModal
@@ -6843,7 +6841,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aURI, nsIVariant *aArgs,
                              GetPrincipal(),    // aCalleePrincipal
                              nsnull,            // aJSCallerContext
                              getter_AddRefs(dlgWin));
-  LeaveModalState(nsnull);
+  LeaveModalState(callerWin);
 
   NS_ENSURE_SUCCESS(rv, rv);
   
diff --git a/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.cpp b/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.cpp
index e3d88fe6436e..59176a47d79a 100644
--- a/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.cpp
+++ b/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.cpp
@@ -56,7 +56,7 @@ nsAutoWindowStateHelper::nsAutoWindowStateHelper(nsIDOMWindow *aWindow)
   nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
 
   if (window) {
-    window->EnterModalState();
+    mCallerWindow = window->EnterModalState();
   }
 }
 
@@ -65,7 +65,7 @@ nsAutoWindowStateHelper::~nsAutoWindowStateHelper()
   nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mWindow));
 
   if (window) {
-    window->LeaveModalState(nsnull);
+    window->LeaveModalState(mCallerWindow);
   }
 
   if (mDefaultEnabled) {
diff --git a/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.h b/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.h
index 27ed72b9967e..13916bf5ba1d 100644
--- a/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.h
+++ b/embedding/components/windowwatcher/src/nsAutoWindowStateHelper.h
@@ -62,6 +62,7 @@ protected:
   PRBool DispatchCustomEvent(const char *aEventName);
 
   nsIDOMWindow *mWindow;
+  nsCOMPtr<nsIDOMWindow> mCallerWindow;
   PRBool mDefaultEnabled;
 };
 

From 002581d137a2b28e99048e5d2e5c762f8edf89fd Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sat, 16 Apr 2011 11:14:09 +0200
Subject: [PATCH 192/509] Bug 634936 - Add null-check for
 nsContentUtils::GetPrefBranch() to prevent Crash [@ nsFocusManager::Init ];
 r=jst

---
 dom/base/nsFocusManager.cpp     |  8 +++++---
 layout/generic/nsImageFrame.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index b29458c80b2a..bf20c8ff794b 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -196,9 +196,11 @@ nsFocusManager::Init()
     nsContentUtils::GetBoolPref("accessibility.mouse_focuses_formcontrol", PR_FALSE);
 
   nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-  prefBranch->AddObserver("accessibility.browsewithcaret", fm, PR_TRUE);
-  prefBranch->AddObserver("accessibility.tabfocus_applies_to_xul", fm, PR_TRUE);
-  prefBranch->AddObserver("accessibility.mouse_focuses_formcontrol", fm, PR_TRUE);
+  if (prefBranch) {
+    prefBranch->AddObserver("accessibility.browsewithcaret", fm, PR_TRUE);
+    prefBranch->AddObserver("accessibility.tabfocus_applies_to_xul", fm, PR_TRUE);
+    prefBranch->AddObserver("accessibility.mouse_focuses_formcontrol", fm, PR_TRUE);
+  }
 
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index d0f228327ce3..2ab878d617ed 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1891,11 +1891,11 @@ static const char kIconLoadPrefs[][40] = {
 nsImageFrame::IconLoad::IconLoad()
 {
   nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-
-  // register observers
-  for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(kIconLoadPrefs); ++i)
-    prefBranch->AddObserver(kIconLoadPrefs[i], this, PR_FALSE);
-
+  if (prefBranch) {
+    // register observers
+    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(kIconLoadPrefs); ++i)
+      prefBranch->AddObserver(kIconLoadPrefs[i], this, PR_FALSE);
+  }
   GetPrefs();
 }
 

From 55fe3dd1ff468901f941332091a9114402772a75 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 16 Apr 2011 11:14:09 +0200
Subject: [PATCH 193/509] Bug 619997 - Remove support for Document.renameNode;
 r=sicking

---
 content/base/src/nsDocument.cpp              | 10 ----------
 content/html/document/src/nsHTMLDocument.cpp |  9 ---------
 dom/interfaces/core/nsIDOMDocument.idl       |  7 +------
 dom/interfaces/core/nsIDOMXMLDocument.idl    |  2 +-
 dom/interfaces/html/nsIDOMHTMLDocument.idl   |  2 +-
 dom/interfaces/svg/nsIDOMSVGDocument.idl     |  2 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf   |  1 -
 7 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 96db56685cbb..1471888200ca 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -6179,16 +6179,6 @@ nsDocument::NormalizeDocument()
   return Normalize();
 }
 
-NS_IMETHODIMP
-nsDocument::RenameNode(nsIDOMNode *aNode,
-                       const nsAString& namespaceURI,
-                       const nsAString& qualifiedName,
-                       nsIDOMNode **aReturn)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
 NS_IMETHODIMP
 nsDocument::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 {
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index b641dc7a6eb1..148bcc72facc 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1404,15 +1404,6 @@ nsHTMLDocument::NormalizeDocument()
   return nsDocument::NormalizeDocument();
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::RenameNode(nsIDOMNode* aNode,
-                           const nsAString& aNamespaceURI,
-                           const nsAString& aQualifiedName,
-                           nsIDOMNode** aRetval)
-{
-  return nsDocument::RenameNode(aNode, aNamespaceURI, aQualifiedName, aRetval);
-}
-
 //
 // nsIDOMHTMLDocument interface implementation
 //
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index e3bbdf0266dc..196e7aac4b3f 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -52,7 +52,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(cf88ac5e-49d9-4294-9255-ff80a1727f91)]
+[scriptable, uuid(1ae51729-c57c-43cd-91f4-2ffee5c5d493)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -110,9 +110,4 @@ interface nsIDOMDocument : nsIDOMNode
                                         raises(DOMException);
   // Introduced in DOM Level 3:
   void               normalizeDocument();
-  // Introduced in DOM Level 3:
-  nsIDOMNode         renameNode(in nsIDOMNode node, 
-                                in DOMString namespaceURI, 
-                                in DOMString qualifiedName)
-                                        raises(DOMException);
 };
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 88852589b7f7..67a357468f05 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(207ccc34-b14f-4d2f-8cbf-028e0ed73d6f)]
+[scriptable, uuid(38708cf6-d055-4618-9d8f-a8731834d63f)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index 770b0c7698fa..90dcb7bdc992 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(8f9cc6bb-539d-4d2a-bef8-aabb942d1b36)]
+[scriptable, uuid(42de381d-1535-4223-b7d9-a9d7c250f9a7)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            title;
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index ac1a364ddc82..cf28037d219c 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,7 +39,7 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(19004064-4ba6-4d0e-bcaf-fb42b0d3038b)]
+[scriptable, uuid(b0cb0f05-6fd4-4f2c-8a6c-aac63bc90cad)]
 interface nsIDOMSVGDocument : nsIDOMDocument
                          /* , nsIDOMDocumentEvent */
 {
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 95e0d2e01ecb..7aa9f5810aa6 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -108,7 +108,6 @@ members = [
     'nsIDOMDocument.createTextNode',
     'nsIDOMDocument.documentURI',
     'nsIDOMDocument.adoptNode',
-    'nsIDOMDocument.renameNode',
     'nsIDOMElement.removeAttributeNS',
     'nsIDOMElement.removeAttribute',
     'nsIDOMElement.getAttribute',

From 8b1d717189ddba30c3f600190a7124e3d02a49bc Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@vt.edu>
Date: Thu, 14 Apr 2011 18:14:19 -0700
Subject: [PATCH 194/509] Bug 650162 - #ifdef out unused functions; r=dholbert

---
 xpcom/glue/arm.cpp | 59 ++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/xpcom/glue/arm.cpp b/xpcom/glue/arm.cpp
index f8cf8a64cbff..1f44f09aa94a 100644
--- a/xpcom/glue/arm.cpp
+++ b/xpcom/glue/arm.cpp
@@ -38,6 +38,7 @@
 
 #include "arm.h"
 
+#if defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
 namespace {
 
 // arm.h has parallel #ifs which declare MOZILLA_ARM_HAVE_CPUID_DETECTION.
@@ -45,16 +46,17 @@ namespace {
 // we don't compile one of these detection methods. The detection code here is
 // based on the CPU detection in libtheora.
 
-#if defined(_MSC_VER)
+#  if defined(_MSC_VER)
 //For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.
-#  define WIN32_LEAN_AND_MEAN
-#  define WIN32_EXTRA_LEAN
-#  include <windows.h>
+#    define WIN32_LEAN_AND_MEAN
+#    define WIN32_EXTRA_LEAN
+#    include <windows.h>
 
+#    if !defined(MOZILLA_PRESUME_EDSP)
 static bool
 check_edsp(void)
 {
-#  if defined(MOZILLA_MAY_SUPPORT_EDSP)
+#      if defined(MOZILLA_MAY_SUPPORT_EDSP)
   __try
   {
     //PLD [r13]
@@ -65,14 +67,16 @@ check_edsp(void)
   {
     //Ignore exception.
   }
-#  endif
+#      endif
   return false;
 }
+#    endif // !MOZILLA_PRESUME_EDSP
 
+#    if !defined(MOZILLA_PRESUME_ARMV6)
 static bool
 check_armv6(void)
 {
-#  if defined(MOZILLA_MAY_SUPPORT_ARMV6)
+#      if defined(MOZILLA_MAY_SUPPORT_ARMV6)
   __try
   {
     //SHADD8 r3,r3,r3
@@ -83,14 +87,16 @@ check_armv6(void)
   {
     //Ignore exception.
   }
-#  endif
+#      endif
   return false;
 }
+#    endif // !MOZILLA_PRESUME_ARMV6
 
+#    if !defined(MOZILLA_PRESUME_NEON)
 static bool
 check_neon(void)
 {
-#  if defined(MOZILLA_MAY_SUPPORT_NEON)
+#      if defined(MOZILLA_MAY_SUPPORT_NEON)
   __try
   {
     //VORR q0,q0,q0
@@ -101,14 +107,15 @@ check_neon(void)
   {
     //Ignore exception.
   }
-#  endif
+#      endif
   return false;
 }
+#    endif // !MOZILLA_PRESUME_NEON
 
-#elif defined(__linux__) || defined(ANDROID)
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <string.h>
+#  elif defined(__linux__) || defined(ANDROID)
+#    include <stdio.h>
+#    include <stdlib.h>
+#    include <string.h>
 
 enum{
   MOZILLA_HAS_EDSP_FLAG=1,
@@ -161,40 +168,46 @@ get_arm_cpu_flags(void)
 // Cache a local copy so we only have to read /proc/cpuinfo once.
 static unsigned arm_cpu_flags = get_arm_cpu_flags();
 
+#    if !defined(MOZILLA_PRESUME_EDSP)
 static bool
 check_edsp(void)
 {
   return (arm_cpu_flags & MOZILLA_HAS_EDSP_FLAG) != 0;
 }
+#    endif
 
+#    if !defined(MOZILLA_PRESUME_ARMV6)
 static bool
 check_armv6(void)
 {
   return (arm_cpu_flags & MOZILLA_HAS_ARMV6_FLAG) != 0;
 }
+#    endif
 
+#    if !defined(MOZILLA_PRESUME_NEON)
 static bool
 check_neon(void)
 {
   return (arm_cpu_flags & MOZILLA_HAS_NEON_FLAG) != 0;
+#    endif
 }
 
-#endif
+#  endif // defined(__linux__) || defined(ANDROID)
 
 }
 
 namespace mozilla {
   namespace arm_private {
-#if defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
-#if !defined(MOZILLA_PRESUME_EDSP)
+#  if !defined(MOZILLA_PRESUME_EDSP)
     bool edsp_enabled = check_edsp();
-#endif
-#if !defined(MOZILLA_PRESUME_ARMV6)
+#  endif
+#  if !defined(MOZILLA_PRESUME_ARMV6)
     bool armv6_enabled = check_armv6();
-#endif
-#if !defined(MOZILLA_PRESUME_NEON)
+#  endif
+#  if !defined(MOZILLA_PRESUME_NEON)
     bool neon_enabled = check_neon();
-#endif
-#endif
+#  endif
   } // namespace arm_private
 } // namespace mozilla
+
+#endif // MOZILLA_ARM_HAVE_CPUID_DETECTION

From e09e7353a5ff02abc5cfd614f8ffc28b52c1a4bc Mon Sep 17 00:00:00 2001
From: John Ford <jhford@mozilla.com>
Date: Fri, 15 Apr 2011 11:39:24 -0700
Subject: [PATCH 195/509] Bug 649722 - allow setting MOZ_APP_NAME in
 configure.in; r=ted

---
 configure.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configure.in b/configure.in
index 0ff44aa99f85..701af16ed30c 100644
--- a/configure.in
+++ b/configure.in
@@ -5107,6 +5107,16 @@ else
   AC_MSG_RESULT([no])
 fi
 
+# Allow someone to change MOZ_APP_NAME in mozconfig
+MOZ_ARG_WITH_STRING(app-name,
+[--with-app-name=APPNAME sets MOZ_APP_NAME to APPNAME],
+WITH_APP_NAME=$withval,
+)
+
+if test -n "$WITH_APP_NAME" ; then
+    MOZ_APP_NAME="$WITH_APP_NAME"
+fi
+
 # Now is a good time to test for logic errors, define mismatches, etc.
 case "$MOZ_BUILD_APP" in
 xulrunner)

From 0db20d743975e252ffd13b3375ecb4865cad764c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 16 Apr 2011 17:57:08 +0200
Subject: [PATCH 196/509] Bug 650467 - make libstdc++ compatibility opt-in
 instead of opt-out. r=khuey

---
 configure.in | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 701af16ed30c..f9a54ac00425 100644
--- a/configure.in
+++ b/configure.in
@@ -7730,21 +7730,10 @@ dnl ========================================================
 dnl = libstdc++ compatibility hacks
 dnl ========================================================
 
-STDCXX_COMPAT=stdc++compat.cpp
-MOZ_ARG_DISABLE_BOOL(stdcxx-compat,
-[  --disable-stdcxx-compat Disable libstdc++ compatibility],
-    STDCXX_COMPAT=)
-
-# Disable on platforms where it doesn't make sense
-if test -n "$STDCXX_COMPAT"; then
-    case "${OS_TARGET}" in
-    Linux)
-        ;;
-    *)
-        STDCXX_COMPAT=
-        ;;
-    esac
-fi
+STDCXX_COMPAT=
+MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
+[  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
+    STDCXX_COMPAT=stdc++compat.cpp)
 
 AC_SUBST(STDCXX_COMPAT)
 

From f3ee0a301fa520e7ecc860d7c99c2b3d98882195 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 16 Apr 2011 17:57:51 +0200
Subject: [PATCH 197/509] Bug 650503 - Hide libstdc++ compatibility check
 command line. r=khuey

---
 config/rules.mk        | 6 +++---
 js/src/config/rules.mk | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 7a046a88e763..c70470430595 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -992,7 +992,7 @@ endif
 else # !WINNT || GNU_CC
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
@@ -1058,7 +1058,7 @@ endif	# MSVC with manifest tool
 else
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
@@ -1179,7 +1179,7 @@ endif
 else # ! DTRACE_LIB_DEPENDENT
 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 endif # DTRACE_LIB_DEPENDENT
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 7a046a88e763..c70470430595 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -992,7 +992,7 @@ endif
 else # !WINNT || GNU_CC
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
@@ -1058,7 +1058,7 @@ endif	# MSVC with manifest tool
 else
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
@@ -1179,7 +1179,7 @@ endif
 else # ! DTRACE_LIB_DEPENDENT
 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 endif # DTRACE_LIB_DEPENDENT
-	$(call CHECK_STDCXX,$@)
+	@$(call CHECK_STDCXX,$@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL

From b548c654419c154ece5b21cf3dee98b6dbdbd1c7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 15 Apr 2011 18:26:50 -0400
Subject: [PATCH 198/509] Bug 649012 - Fix some flaky mochitests which rely on
 non-zero timeout values; rs=ted

---
 content/xul/content/test/test_bug233643.xul               | 2 +-
 intl/uconv/tests/test_utf8_overconsumption.html           | 4 +++-
 .../ssl/tests/mochitest/mixedcontent/test_bug329869.html  | 2 +-
 .../ssl/tests/mochitest/mixedcontent/test_bug472986.html  | 8 +++-----
 .../tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/xul/content/test/test_bug233643.xul b/content/xul/content/test/test_bug233643.xul
index ac3fdbc6527e..2ce7be6f4c22 100644
--- a/content/xul/content/test/test_bug233643.xul
+++ b/content/xul/content/test/test_bug233643.xul
@@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=233643
         }
 
         function do_test() {
-          setTimeout(test_233643, 1000);
+          setTimeout(test_233643, 0);
         }
         addLoadEvent(do_test);
       ]]>
diff --git a/intl/uconv/tests/test_utf8_overconsumption.html b/intl/uconv/tests/test_utf8_overconsumption.html
index f6735cf243cd..96b1c1b14311 100644
--- a/intl/uconv/tests/test_utf8_overconsumption.html
+++ b/intl/uconv/tests/test_utf8_overconsumption.html
@@ -27,7 +27,9 @@ function test()
     SimpleTest.finish();
 }
 
-  setTimeout(test, 100);
+  addLoadEvent(function() {
+    setTimeout(test, 0);
+  });
   SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
index f69d9514974d..ac3baefa189e 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@@ -17,7 +17,7 @@
       var newElement = document.createElement("script");
       newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
       document.body.appendChild(newElement);
-    }, 500);
+    }, 0);
   }
 
   function afterNavigationTest()
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
index 8b3cc025191f..12deb39dd013 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@@ -14,7 +14,9 @@
   var onLoadFunction = window.onload;
   window.onload = function()
   {
-    window.setTimeout(onLoadFunction, 500);
+    var img1 = document.getElementById("img1");
+    img1.addEventListener("load", onLoadFunction, false);
+    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
   }
 
   function runTest()
@@ -34,9 +36,5 @@
 
 <body>
   <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
-  <script type="text/javascript">
-    var img1 = document.getElementById("img1");
-    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
-  </script>
 </body>
 </html>
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
index 8fd716a43a3e..63ae267169d0 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
@@ -365,10 +365,10 @@ try {
         return d;
     }
     withLock("callLater", function () {
-        return callLater(0.05, checkCallLater, t);
+        return callLater(0, checkCallLater, t);
     });
     withLock("wait", function () {
-        return wait(0.05, t).addCallback(checkCallLater);
+        return wait(0, t).addCallback(checkCallLater);
     });
     withLock("loadJSONDoc", function () {
         var d = loadJSONDoc("test_MochiKit-Async.json");

From d04bfcd50c64709e2da3e05cca9b390d43d734e1 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 13:23:53 -0400
Subject: [PATCH 199/509] Bug 648255 - Don't attempt to run the test within the
 last 10 minutes of a day, since the meaning of "today" might change while the
 test is running; r=mak

---
 .../places/tests/unit/test_history_sidebar.js         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/toolkit/components/places/tests/unit/test_history_sidebar.js b/toolkit/components/places/tests/unit/test_history_sidebar.js
index b3b3a362d420..56ffded7b0f9 100644
--- a/toolkit/components/places/tests/unit/test_history_sidebar.js
+++ b/toolkit/components/places/tests/unit/test_history_sidebar.js
@@ -455,11 +455,11 @@ function test_date_liveupdate(aResultType) {
   bs.removeItem(itemId);
 }
 
-// main
 function run_test() {
-  // Cleanup.
-  bh.removeAllPages();
-  remove_all_bookmarks();
+  // If we're dangerously close to a date change, just bail out.
+  if (nowObj.getHours() == 23 && nowObj.getMinutes() >= 50) {
+    return;
+  }
 
   fill_history();
   test_RESULTS_AS_DATE_SITE_QUERY();
@@ -469,9 +469,6 @@ function run_test() {
   test_date_liveupdate(Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY);
   test_date_liveupdate(Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY);
 
-  // Cleanup.
-  bh.removeAllPages();
-
   // The remaining views are
   //   RESULTS_AS_URI + SORT_BY_VISITCOUNT_DESCENDING 
   //   ->  test_399266.js

From 6d4b05dccff1f1a1054ededdc5ee66430aa6c4cc Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 18:12:44 -0700
Subject: [PATCH 200/509] Bug 650567 - layout/reftests/bidi/267459-2.html fails
 on Android

---
 layout/reftests/bidi/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index f3235f9d6880..5598ac596d46 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -52,7 +52,7 @@ random-if(cocoaWidget) == mirroring-02.html mirroring-02-ref.html
 == 263359-3.html 263359-3-ref.html
 == 263359-4.html 263359-4-ref.html
 random-if(winWidget) == 267459-1.html 267459-1-ref.html # depends on windows version, see bug 590101
-== 267459-2.html 267459-2-ref.html
+fails-if(Android) == 267459-2.html 267459-2-ref.html # bug 650567
 == 299065-1.html 299065-1-ref.html
 random-if(winWidget) == 305643-1.html 305643-1-ref.html # depends on windows version, see bug 590101
 == 332655-1.html 332655-1-ref.html

From fcdf7909095a11384301171a4ccb3b5a35200111 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 18:12:48 -0700
Subject: [PATCH 201/509] Bug 650569 -
 layout/reftests/border-radius/clipping-3.html fails on Android

---
 layout/reftests/border-radius/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index b5ca2cdf228b..7909b51d9586 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -37,7 +37,7 @@ random == corner-2.html corner-2-ref.svg # right corners different radius than l
 fails == clipping-1.html clipping-1-ref.html # background color should completely fill box; bug 466572
 != clipping-2.html about:blank # background color clipped to inner/outer border, can't get
 # great tests for this due to antialiasing problems described in bug 466572
-== clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
+fails-if(Android) == clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background, Android failure is bug 650569
 
 # Tests for clipping the contents of replaced elements and overflow!=visible
 != clipping-4-ref.html clipping-4-notref.html

From d6e8bc6ecd27023bb8a8e9e54e80c218e8ceffa3 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 19:39:34 -0400
Subject: [PATCH 202/509] Bug 649012 - Fix some flaky mochitests which rely on
 non-zero timeout values; rs=ted

---
 content/base/test/chrome/test_bug430050.xul     |  2 +-
 content/base/test/file_bug503473-frame.sjs      |  2 +-
 content/base/test/test_bug300992.html           |  4 ++--
 content/base/test/test_bug343596.html           |  2 +-
 content/base/test/test_bug513194.html           |  2 +-
 editor/libeditor/text/tests/test_bug527935.html | 12 ++++++++++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/content/base/test/chrome/test_bug430050.xul b/content/base/test/chrome/test_bug430050.xul
index 9616fe8631cc..d61160ae4eb4 100644
--- a/content/base/test/chrome/test_bug430050.xul
+++ b/content/base/test/chrome/test_bug430050.xul
@@ -39,9 +39,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430050
                                                null,
                                                'UTF-8');
         }
+        setTimeout(endTest, 0);
       }, true);
     document.documentElement.setAttribute("foo", "bar");
-    setTimeout(endTest, 100);
   }
   
   SimpleTest.waitForExplicitFinish();
diff --git a/content/base/test/file_bug503473-frame.sjs b/content/base/test/file_bug503473-frame.sjs
index 1d5fe02959cb..5a78292fb4c3 100644
--- a/content/base/test/file_bug503473-frame.sjs
+++ b/content/base/test/file_bug503473-frame.sjs
@@ -13,7 +13,7 @@ function handleRequest(request, response) {
     '  parent.done();' +
     '  document.close();' +
     '}' +
-    'setTimeout(doWrite, 1);' +
+    'setTimeout(doWrite, 0);' +
     '</script>' 
   );
 
diff --git a/content/base/test/test_bug300992.html b/content/base/test/test_bug300992.html
index 97d727c52ed0..c2270f547fd7 100644
--- a/content/base/test/test_bug300992.html
+++ b/content/base/test/test_bug300992.html
@@ -35,10 +35,10 @@ document.addEventListener('readystatechange', function(event) {
 window.addEventListener('readystatechange', function(event) {
   ok(false, 'window listener', 'readystatechange event should not bubble to window');
 }, false);
-setTimeout(function() {
+addLoadEvent(function() {
   is(i, states.length, 'readystatechange event count');
   SimpleTest.finish();
-}, 1000);
+});
 
 </script>
 </pre>
diff --git a/content/base/test/test_bug343596.html b/content/base/test/test_bug343596.html
index f52e2f56ddca..c7796a15bc59 100644
--- a/content/base/test/test_bug343596.html
+++ b/content/base/test/test_bug343596.html
@@ -40,7 +40,7 @@ catch(ex){
 setTimeout(function(){
 ok(true,"setTimeout still executes after bogus script insertion"); 
 window.error = errorHandler;
-SimpleTest.finish();}, 200);
+SimpleTest.finish();}, 0);
 
 
 
diff --git a/content/base/test/test_bug513194.html b/content/base/test/test_bug513194.html
index 1476bf86df90..be1c5ca2a357 100644
--- a/content/base/test/test_bug513194.html
+++ b/content/base/test/test_bug513194.html
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=513194
     consoleListener.finish();
     consoleService.unregisterListener(consoleListener);
   }
-  setTimeout(done, 1);
+  setTimeout(done, 0);
 </script>
 </pre>
 </body>
diff --git a/editor/libeditor/text/tests/test_bug527935.html b/editor/libeditor/text/tests/test_bug527935.html
index e811867bf316..9b09fa47d8d6 100644
--- a/editor/libeditor/text/tests/test_bug527935.html
+++ b/editor/libeditor/text/tests/test_bug527935.html
@@ -48,11 +48,11 @@ SimpleTest.waitForFocus(function() {
       newInput.focus();
       newInput.dispatchEvent(event);
 
-      setTimeout(function() {
+      hitEventLoop(function() {
         ok(!popupShown, "Popup must not be opened");
         SpecialPowers.removeAutoCompletePopupEventListener(window, listener);
         SimpleTest.finish();
-      }, 1000);
+      }, 100);
     }, 0);
   }, false);
 
@@ -61,6 +61,14 @@ SimpleTest.waitForFocus(function() {
   synthesizeKey("VK_ENTER", {});
 });
 
+function hitEventLoop(func, times) {
+  if (times > 0) {
+    setTimeout(hitEventLoop, 0, func, times - 1);
+  } else {
+    setTimeout(func, 0);
+  }
+}
+
 </script>
 </pre>
 </body>

From 135eb99ddb344f24dfe382b03272473b3bfc9f8d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 23:47:06 -0400
Subject: [PATCH 203/509] Backed out changeset d407ee4dabcc because it causes
 some tests to go orange

---
 content/base/test/chrome/test_bug430050.xul     |  2 +-
 content/base/test/file_bug503473-frame.sjs      |  2 +-
 content/base/test/test_bug300992.html           |  4 ++--
 content/base/test/test_bug343596.html           |  2 +-
 content/base/test/test_bug513194.html           |  2 +-
 editor/libeditor/text/tests/test_bug527935.html | 12 ++----------
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/content/base/test/chrome/test_bug430050.xul b/content/base/test/chrome/test_bug430050.xul
index d61160ae4eb4..9616fe8631cc 100644
--- a/content/base/test/chrome/test_bug430050.xul
+++ b/content/base/test/chrome/test_bug430050.xul
@@ -39,9 +39,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430050
                                                null,
                                                'UTF-8');
         }
-        setTimeout(endTest, 0);
       }, true);
     document.documentElement.setAttribute("foo", "bar");
+    setTimeout(endTest, 100);
   }
   
   SimpleTest.waitForExplicitFinish();
diff --git a/content/base/test/file_bug503473-frame.sjs b/content/base/test/file_bug503473-frame.sjs
index 5a78292fb4c3..1d5fe02959cb 100644
--- a/content/base/test/file_bug503473-frame.sjs
+++ b/content/base/test/file_bug503473-frame.sjs
@@ -13,7 +13,7 @@ function handleRequest(request, response) {
     '  parent.done();' +
     '  document.close();' +
     '}' +
-    'setTimeout(doWrite, 0);' +
+    'setTimeout(doWrite, 1);' +
     '</script>' 
   );
 
diff --git a/content/base/test/test_bug300992.html b/content/base/test/test_bug300992.html
index c2270f547fd7..97d727c52ed0 100644
--- a/content/base/test/test_bug300992.html
+++ b/content/base/test/test_bug300992.html
@@ -35,10 +35,10 @@ document.addEventListener('readystatechange', function(event) {
 window.addEventListener('readystatechange', function(event) {
   ok(false, 'window listener', 'readystatechange event should not bubble to window');
 }, false);
-addLoadEvent(function() {
+setTimeout(function() {
   is(i, states.length, 'readystatechange event count');
   SimpleTest.finish();
-});
+}, 1000);
 
 </script>
 </pre>
diff --git a/content/base/test/test_bug343596.html b/content/base/test/test_bug343596.html
index c7796a15bc59..f52e2f56ddca 100644
--- a/content/base/test/test_bug343596.html
+++ b/content/base/test/test_bug343596.html
@@ -40,7 +40,7 @@ catch(ex){
 setTimeout(function(){
 ok(true,"setTimeout still executes after bogus script insertion"); 
 window.error = errorHandler;
-SimpleTest.finish();}, 0);
+SimpleTest.finish();}, 200);
 
 
 
diff --git a/content/base/test/test_bug513194.html b/content/base/test/test_bug513194.html
index be1c5ca2a357..1476bf86df90 100644
--- a/content/base/test/test_bug513194.html
+++ b/content/base/test/test_bug513194.html
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=513194
     consoleListener.finish();
     consoleService.unregisterListener(consoleListener);
   }
-  setTimeout(done, 0);
+  setTimeout(done, 1);
 </script>
 </pre>
 </body>
diff --git a/editor/libeditor/text/tests/test_bug527935.html b/editor/libeditor/text/tests/test_bug527935.html
index 9b09fa47d8d6..e811867bf316 100644
--- a/editor/libeditor/text/tests/test_bug527935.html
+++ b/editor/libeditor/text/tests/test_bug527935.html
@@ -48,11 +48,11 @@ SimpleTest.waitForFocus(function() {
       newInput.focus();
       newInput.dispatchEvent(event);
 
-      hitEventLoop(function() {
+      setTimeout(function() {
         ok(!popupShown, "Popup must not be opened");
         SpecialPowers.removeAutoCompletePopupEventListener(window, listener);
         SimpleTest.finish();
-      }, 100);
+      }, 1000);
     }, 0);
   }, false);
 
@@ -61,14 +61,6 @@ SimpleTest.waitForFocus(function() {
   synthesizeKey("VK_ENTER", {});
 });
 
-function hitEventLoop(func, times) {
-  if (times > 0) {
-    setTimeout(hitEventLoop, 0, func, times - 1);
-  } else {
-    setTimeout(func, 0);
-  }
-}
-
 </script>
 </pre>
 </body>

From 64b6f6a1146f7ae7556b0c43769c293e8a76b5fd Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 17 Apr 2011 10:48:02 +0200
Subject: [PATCH 204/509] Bug 650235 - Assignment instead of comparison in
 nsOuterDocAccessible::GetChildAtPoint; r=surkov

---
 accessible/src/base/nsOuterDocAccessible.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accessible/src/base/nsOuterDocAccessible.cpp b/accessible/src/base/nsOuterDocAccessible.cpp
index 2c48b78ca2ef..1a13dd9d9002 100644
--- a/accessible/src/base/nsOuterDocAccessible.cpp
+++ b/accessible/src/base/nsOuterDocAccessible.cpp
@@ -89,7 +89,7 @@ nsOuterDocAccessible::GetChildAtPoint(PRInt32 aX, PRInt32 aY,
   nsAccessible* child = GetChildAt(0);
   NS_ENSURE_TRUE(child, nsnull);
 
-  if (aWhichChild = eDeepestChild)
+  if (aWhichChild == eDeepestChild)
     return child->GetChildAtPoint(aX, aY, eDeepestChild);
   return child;
 }

From 3d824b697d499fd27e9f97be1e23f3f09e550624 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Thu, 14 Apr 2011 12:20:17 +0800
Subject: [PATCH 205/509] Bug 587187 - properly test for TabView being defined
 r=ian

---
 browser/base/content/tabbrowser.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 7e5c9c0c66e2..b647f11cd0ef 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -814,7 +814,7 @@
               }
             } catch (e) {}
 
-            if (window.TabView) {
+            if ("TabView" in window) {
               let groupName = TabView.getActiveGroupName();
               if (groupName)
                 newTitle = groupName + sep + newTitle;
@@ -828,7 +828,7 @@
       <method name="updateTitlebar">
         <body>
           <![CDATA[
-            if (window.TabView && TabView.isVisible()) {
+            if ("TabView" in window && TabView.isVisible()) {
               // ToDo: this will be removed when we gain ability to draw to the menu bar.
               // Bug 586175
               this.ownerDocument.title = TabView.windowTitle;

From bb7790889c63816444f97201442cd50580557d43 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Fri, 15 Apr 2011 01:02:32 +0800
Subject: [PATCH 206/509] Bug 649006 - Clicking any two mouse buttons opens new
 tab r=ian

---
 browser/base/content/tabview/groupitems.js    | 11 +--
 browser/base/content/tabview/ui.js            | 59 ++++++------
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug604098.js | 75 +++++----------
 .../test/tabview/browser_tabview_bug649006.js | 94 +++++++++++++++++++
 5 files changed, 158 insertions(+), 82 deletions(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug649006.js

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 1393a5cd9196..a9f607173802 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1668,13 +1668,12 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
 
     // Create new tab and zoom in on it after a double click
     container.mousedown(function(e) {
-      if (!Utils.isLeftClick(e))
+      if (!Utils.isLeftClick(e) || self.$titlebar[0] == e.target || 
+          self.$titlebar.contains(e.target)) {
+        self._lastClick = 0;
+        self._lastClickPositions = null;
         return;
-
-      // clicking in the title bar shouldn't create new tabs
-      if (self.$titlebar[0] == e.target || self.$titlebar.contains(e.target))
-        return;
-
+      }
       if (Date.now() - self._lastClick <= UI.DBLCLICK_INTERVAL &&
           (self._lastClickPositions.x - UI.DBLCLICK_OFFSET) <= e.clientX &&
           (self._lastClickPositions.x + UI.DBLCLICK_OFFSET) >= e.clientX &&
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index ebe4e2ac5e21..4382dfb362cc 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -183,36 +183,41 @@ let UI = {
           });
         }
         if (e.originalTarget.id == "content") {
-          // Create an orphan tab on double click
-          if (Date.now() - self._lastClick <= self.DBLCLICK_INTERVAL && 
-              (self._lastClickPositions.x - self.DBLCLICK_OFFSET) <= e.clientX &&
-              (self._lastClickPositions.x + self.DBLCLICK_OFFSET) >= e.clientX &&
-              (self._lastClickPositions.y - self.DBLCLICK_OFFSET) <= e.clientY &&
-              (self._lastClickPositions.y + self.DBLCLICK_OFFSET) >= e.clientY) {
-            GroupItems.setActiveGroupItem(null);
-            TabItems.creatingNewOrphanTab = true;
-
-            let newTab = 
-              gBrowser.loadOneTab("about:blank", { inBackground: true });
-
-            let box = 
-              new Rect(e.clientX - Math.floor(TabItems.tabWidth/2),
-                       e.clientY - Math.floor(TabItems.tabHeight/2),
-                       TabItems.tabWidth, TabItems.tabHeight);
-            newTab._tabViewTabItem.setBounds(box, true);
-            newTab._tabViewTabItem.pushAway(true);
-            UI.setActiveTab(newTab._tabViewTabItem);
-
-            TabItems.creatingNewOrphanTab = false;
-            newTab._tabViewTabItem.zoomIn(true);
-
+          if (!Utils.isLeftClick(e)) {
             self._lastClick = 0;
             self._lastClickPositions = null;
-            gTabView.firstUseExperienced = true;
           } else {
-            self._lastClick = Date.now();
-            self._lastClickPositions = new Point(e.clientX, e.clientY);
-            self._createGroupItemOnDrag(e);
+            // Create an orphan tab on double click
+            if (Date.now() - self._lastClick <= self.DBLCLICK_INTERVAL && 
+                (self._lastClickPositions.x - self.DBLCLICK_OFFSET) <= e.clientX &&
+                (self._lastClickPositions.x + self.DBLCLICK_OFFSET) >= e.clientX &&
+                (self._lastClickPositions.y - self.DBLCLICK_OFFSET) <= e.clientY &&
+                (self._lastClickPositions.y + self.DBLCLICK_OFFSET) >= e.clientY) {
+              GroupItems.setActiveGroupItem(null);
+              TabItems.creatingNewOrphanTab = true;
+
+              let newTab =
+                gBrowser.loadOneTab("about:blank", { inBackground: true });
+
+              let box =
+                new Rect(e.clientX - Math.floor(TabItems.tabWidth/2),
+                         e.clientY - Math.floor(TabItems.tabHeight/2),
+                         TabItems.tabWidth, TabItems.tabHeight);
+              newTab._tabViewTabItem.setBounds(box, true);
+              newTab._tabViewTabItem.pushAway(true);
+              UI.setActiveTab(newTab._tabViewTabItem);
+
+              TabItems.creatingNewOrphanTab = false;
+              newTab._tabViewTabItem.zoomIn(true);
+
+              self._lastClick = 0;
+              self._lastClickPositions = null;
+              gTabView.firstUseExperienced = true;
+            } else {
+              self._lastClick = Date.now();
+              self._lastClickPositions = new Point(e.clientX, e.clientY);
+              self._createGroupItemOnDrag(e);
+            }
           }
         }
       });
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 225e086aa143..8b447d14f761 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -130,6 +130,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug641802.js \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
+                 browser_tabview_bug649006.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
                  browser_tabview_expander.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug604098.js b/browser/base/content/test/tabview/browser_tabview_bug604098.js
index 07bb52d2669d..3b5e7c507da1 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug604098.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug604098.js
@@ -4,84 +4,61 @@
 let originalTab;
 let orphanedTab;
 let contentWindow;
+let contentElement;
 
 function test() {
   waitForExplicitFinish();
 
-  window.addEventListener("tabviewshown", onTabViewWindowLoaded, false);
-  TabView.show();
-}
-
-function onTabViewWindowLoaded() {
-  window.removeEventListener("tabviewshown", onTabViewWindowLoaded, false);
-
-  contentWindow = document.getElementById("tab-view").contentWindow;
-  originalTab = gBrowser.visibleTabs[0];
-
-  test1();
+  showTabView(function() {
+    contentWindow = TabView.getContentWindow();
+    contentElement = contentWindow.document.getElementById("content");
+    originalTab = gBrowser.visibleTabs[0];
+    test1();
+  });
 }
 
 function test1() {
   is(contentWindow.GroupItems.getOrphanedTabs().length, 0, "No orphaned tabs");
 
-  let onTabViewHidden = function() {
-    window.removeEventListener("tabviewhidden", onTabViewHidden, false);
-
-    let onTabViewShown = function() {
-      window.removeEventListener("tabviewshown", onTabViewShown, false);
-
-      is(contentWindow.GroupItems.getOrphanedTabs().length, 1, 
+  whenTabViewIsHidden(function() {
+    showTabView(function() {
+      is(contentWindow.GroupItems.getOrphanedTabs().length, 1,
          "An orphaned tab is created");
       orphanedTab = contentWindow.GroupItems.getOrphanedTabs()[0].tab;
 
       test2();
-    };
-    window.addEventListener("tabviewshown", onTabViewShown, false);
-    TabView.show();
-  };
-  window.addEventListener("tabviewhidden", onTabViewHidden, false);
+    });
+  });
 
   // first click
-  EventUtils.sendMouseEvent(
-    { type: "mousedown" }, contentWindow.document.getElementById("content"), 
-    contentWindow);
-  EventUtils.sendMouseEvent(
-    { type: "mouseup" }, contentWindow.document.getElementById("content"), 
-    contentWindow);
+  mouseClick(contentElement, 0);
   // second click
-  EventUtils.sendMouseEvent(
-    { type: "mousedown" }, contentWindow.document.getElementById("content"), 
-    contentWindow);
-  EventUtils.sendMouseEvent(
-    { type: "mouseup" }, contentWindow.document.getElementById("content"), 
-    contentWindow);
+  mouseClick(contentElement, 0);
 }
 
 function test2() {
   let groupItem = createEmptyGroupItem(contentWindow, 300, 300, 200);
   is(groupItem.getChildren().length, 0, "The group is empty");
 
-  let onTabViewHidden = function() {
-    window.removeEventListener("tabviewhidden", onTabViewHidden, false);
-
+  hideTabView(function() {
     is(groupItem.getChildren().length, 1, "A tab is created inside the group");
-    
+
     gBrowser.selectedTab = originalTab;
     gBrowser.removeTab(orphanedTab);
     gBrowser.removeTab(groupItem.getChildren()[0].tab);
 
     finish();
-  };
-  window.addEventListener("tabviewhidden", onTabViewHidden, false);
+  });
 
   // first click
-  EventUtils.sendMouseEvent(
-    { type: "mousedown" }, groupItem.container, contentWindow);
-  EventUtils.sendMouseEvent(
-    { type: "mouseup" }, groupItem.container, contentWindow);
+  mouseClick(groupItem.container, 0);
   // second click
-  EventUtils.sendMouseEvent(
-    { type: "mousedown" }, groupItem.container, contentWindow);
-  EventUtils.sendMouseEvent(
-    { type: "mouseup" }, groupItem.container, contentWindow);
+  mouseClick(groupItem.container, 0);
+}
+
+function mouseClick(targetElement, buttonCode) {
+  EventUtils.sendMouseEvent(
+    { type: "mousedown", button: buttonCode }, targetElement, contentWindow);
+  EventUtils.sendMouseEvent(
+    { type: "mouseup", button: buttonCode }, targetElement, contentWindow);
 }
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649006.js b/browser/base/content/test/tabview/browser_tabview_bug649006.js
new file mode 100644
index 000000000000..05cc2b801962
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug649006.js
@@ -0,0 +1,94 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+let contentWindow;
+let contentElement;
+let groupItem;
+
+function test() {
+  waitForExplicitFinish();
+
+  registerCleanupFunction(function () {
+    hideTabView(function () {});
+  });
+
+  showTabView(function() {
+    contentWindow = TabView.getContentWindow();
+    contentElement = contentWindow.document.getElementById("content");
+    test1();
+  });
+}
+
+function test1() {
+  is(gBrowser.tabs.length, 1, 
+     "Total number of tabs is 1 before right button double click");
+  // first click
+  mouseClick(contentElement, 2);
+  // second click
+  mouseClick(contentElement, 2);
+
+  is(gBrowser.tabs.length, 1, 
+     "Total number of tabs is 1 after right button double click");
+  test2();
+}
+
+
+function test2() {
+  is(gBrowser.tabs.length, 1, 
+     "Total number of tabs is 1 before left, right and left mouse clicks");
+
+  // first click
+  mouseClick(contentElement, 0);
+  // second click
+  mouseClick(contentElement, 2);
+  // third click
+  mouseClick(contentElement, 0);
+
+  is(gBrowser.tabs.length, 1, 
+     "Total number of tabs is 1 before left, right and left mouse clicks");
+  test3();
+}
+
+function test3() {
+  ok(contentWindow.GroupItems.groupItems.length, 1, "Only one group item exists");
+  groupItem = contentWindow.GroupItems.groupItems[0];
+
+  is(groupItem.getChildren().length, 1, 
+     "The number of tab items in the group is 1 before right button double click");
+
+  // first click
+  mouseClick(groupItem.container, 2);
+  // second click
+  mouseClick(groupItem.container, 2);
+
+  is(groupItem.getChildren().length, 1, 
+     "The number of tab items in the group is 1 after right button double click");
+  test4();
+}
+
+function test4() {
+  is(groupItem.getChildren().length, 1, 
+     "The number of tab items in the group is 1 before left, right, left mouse clicks");
+
+  // first click
+  mouseClick(groupItem.container, 0);
+  // second click
+  mouseClick(groupItem.container, 2);
+  // third click
+  mouseClick(groupItem.container, 0);
+
+  is(groupItem.getChildren().length, 1, 
+     "The number of tab items in the group is 1 before left, right, left mouse clicks");
+
+  hideTabView(function() {
+    is(gBrowser.tabs.length, 1, "Total number of tabs is 1 after all tests");
+    finish();
+  });
+}
+
+function mouseClick(targetElement, buttonCode) {
+  EventUtils.sendMouseEvent(
+    { type: "mousedown", button: buttonCode }, targetElement, contentWindow);
+  EventUtils.sendMouseEvent(
+    { type: "mouseup", button: buttonCode }, targetElement, contentWindow);
+}
+

From d9ffdcb05bbacbf5512028ccf29a259fe74569a4 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 14 Apr 2011 10:43:21 -0700
Subject: [PATCH 207/509] Bug 174055, part 8: change GetLanguage to return a
 raw nsIAtom*.

---
 gfx/src/nsFontMetrics.cpp         |  8 --------
 gfx/src/nsFontMetrics.h           |  2 +-
 gfx/src/nsThebesDeviceContext.cpp | 20 +++++++++-----------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index 39c7f8d249f9..5061e90d3b28 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -268,14 +268,6 @@ nsFontMetrics::SpaceWidth()
     return CEIL_TO_TWIPS(GetMetrics().spaceWidth);
 }
 
-already_AddRefed<nsIAtom>
-nsFontMetrics::GetLanguage()
-{
-    nsIAtom* result = mLanguage.get();
-    NS_IF_ADDREF(result);
-    return result;
-}
-
 PRInt32
 nsFontMetrics::GetMaxStringLength()
 {
diff --git a/gfx/src/nsFontMetrics.h b/gfx/src/nsFontMetrics.h
index 772cb5187fb0..4b9339a9efb3 100644
--- a/gfx/src/nsFontMetrics.h
+++ b/gfx/src/nsFontMetrics.h
@@ -197,7 +197,7 @@ public:
     /**
      * Returns the language associated with these metrics
      */
-    already_AddRefed<nsIAtom> GetLanguage();
+    nsIAtom* Language() { return mLanguage; }
 
     PRInt32 GetMaxStringLength();
 
diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
index ac3084fc20d6..73cde7c57230 100644
--- a/gfx/src/nsThebesDeviceContext.cpp
+++ b/gfx/src/nsThebesDeviceContext.cpp
@@ -150,18 +150,16 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
     PRInt32 n = mFontMetrics.Length() - 1;
     for (PRInt32 i = n; i >= 0; --i) {
         fm = mFontMetrics[i];
-        if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet) {
-            nsCOMPtr<nsIAtom> language = fm->GetLanguage();
-            if (aLanguage == language.get()) {
-                if (i != n) {
-                    // promote it to the end of the cache
-                    mFontMetrics.RemoveElementAt(i);
-                    mFontMetrics.AppendElement(fm);
-                }
-                fm->GetThebesFontGroup()->UpdateFontList();
-                NS_ADDREF(aMetrics = fm);
-                return NS_OK;
+        if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet &&
+            fm->Language() == aLanguage) {
+            if (i != n) {
+                // promote it to the end of the cache
+                mFontMetrics.RemoveElementAt(i);
+                mFontMetrics.AppendElement(fm);
             }
+            fm->GetThebesFontGroup()->UpdateFontList();
+            NS_ADDREF(aMetrics = fm);
+            return NS_OK;
         }
     }
 

From a42c16788723db1de596b9ea8fcc0bfad694745d Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 14 Apr 2011 11:47:27 -0700
Subject: [PATCH 208/509] Bug 641393 patch 1: Upgrade some NS_ASSERTIONs in SVG
 List classes to NS_ABORT_IF_FALSE. r=jwatt

---
 content/svg/content/src/SVGLengthList.h | 10 +++++-----
 content/svg/content/src/SVGNumberList.h |  8 ++++----
 content/svg/content/src/SVGPointList.h  |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/content/svg/content/src/SVGLengthList.h b/content/svg/content/src/SVGLengthList.h
index ac5f23fb4312..e9bb89a923eb 100644
--- a/content/svg/content/src/SVGLengthList.h
+++ b/content/svg/content/src/SVGLengthList.h
@@ -136,14 +136,14 @@ private:
   }
 
   void ReplaceItem(PRUint32 aIndex, const SVGLength &aLength) {
-    NS_ASSERTION(aIndex < mLengths.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mLengths.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mLengths[aIndex] = aLength;
   }
 
   void RemoveItem(PRUint32 aIndex) {
-    NS_ASSERTION(aIndex < mLengths.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mLengths.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mLengths.RemoveElementAt(aIndex);
   }
 
@@ -222,7 +222,7 @@ public:
   }
 
   PRUint8 Axis() const {
-    NS_ASSERTION(mElement, "Axis() isn't valid");
+    NS_ABORT_IF_FALSE(mElement, "Axis() isn't valid");
     return mAxis;
   }
 
diff --git a/content/svg/content/src/SVGNumberList.h b/content/svg/content/src/SVGNumberList.h
index 4657625dbe32..b3f18c6717a0 100644
--- a/content/svg/content/src/SVGNumberList.h
+++ b/content/svg/content/src/SVGNumberList.h
@@ -139,14 +139,14 @@ private:
   }
 
   void ReplaceItem(PRUint32 aIndex, const float &aNumber) {
-    NS_ASSERTION(aIndex < mNumbers.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mNumbers.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mNumbers[aIndex] = aNumber;
   }
 
   void RemoveItem(PRUint32 aIndex) {
-    NS_ASSERTION(aIndex < mNumbers.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mNumbers.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mNumbers.RemoveElementAt(aIndex);
   }
 
diff --git a/content/svg/content/src/SVGPointList.h b/content/svg/content/src/SVGPointList.h
index d31e7e79b34f..67f0267e97f2 100644
--- a/content/svg/content/src/SVGPointList.h
+++ b/content/svg/content/src/SVGPointList.h
@@ -143,14 +143,14 @@ private:
   }
 
   void ReplaceItem(PRUint32 aIndex, const SVGPoint &aPoint) {
-    NS_ASSERTION(aIndex < mItems.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mItems.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mItems[aIndex] = aPoint;
   }
 
   void RemoveItem(PRUint32 aIndex) {
-    NS_ASSERTION(aIndex < mItems.Length(),
-                 "DOM wrapper caller should have raised INDEX_SIZE_ERR");
+    NS_ABORT_IF_FALSE(aIndex < mItems.Length(),
+                      "DOM wrapper caller should have raised INDEX_SIZE_ERR");
     mItems.RemoveElementAt(aIndex);
   }
 

From 8628380e49f8a1993a4db702536468c61ccffe61 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 14 Apr 2011 11:47:27 -0700
Subject: [PATCH 209/509] Bug 641393 patch 2: Make namespacing style consistent
 across SVG List classes, and replace some Length==0 checks with IsEmpty().
 r=jwatt

---
 content/svg/content/src/SVGAnimatedNumberList.cpp  | 4 +++-
 content/svg/content/src/SVGAnimatedPathSegList.cpp | 3 ++-
 content/svg/content/src/SVGAnimatedPointList.cpp   | 3 ++-
 content/svg/content/src/SVGLengthListSMILType.cpp  | 8 ++++----
 content/svg/content/src/SVGNumberList.cpp          | 4 +++-
 content/svg/content/src/SVGNumberListSMILType.cpp  | 4 +++-
 content/svg/content/src/SVGPathSegListSMILType.cpp | 4 +++-
 content/svg/content/src/SVGPointList.cpp           | 4 +++-
 content/svg/content/src/SVGPointListSMILType.cpp   | 4 +++-
 9 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/content/svg/content/src/SVGAnimatedNumberList.cpp b/content/svg/content/src/SVGAnimatedNumberList.cpp
index 71898a3a5104..287b7f8ce4cb 100644
--- a/content/svg/content/src/SVGAnimatedNumberList.cpp
+++ b/content/svg/content/src/SVGAnimatedNumberList.cpp
@@ -43,7 +43,7 @@
 #include "SVGNumberListSMILType.h"
 #endif // MOZ_SMIL
 
-using namespace mozilla;
+namespace mozilla {
 
 nsresult
 SVGAnimatedNumberList::SetBaseValueString(const nsAString& aValue)
@@ -214,3 +214,5 @@ SVGAnimatedNumberList::SMILAnimatedNumberList::ClearAnimValue()
   }
 }
 #endif // MOZ_SMIL
+
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPathSegList.cpp b/content/svg/content/src/SVGAnimatedPathSegList.cpp
index 1377e71cd566..9a13bed5814b 100644
--- a/content/svg/content/src/SVGAnimatedPathSegList.cpp
+++ b/content/svg/content/src/SVGAnimatedPathSegList.cpp
@@ -45,7 +45,7 @@
 
 // See the comments in this file's header!
 
-using namespace mozilla;
+namespace mozilla {
 
 nsresult
 SVGAnimatedPathSegList::SetBaseValueString(const nsAString& aValue)
@@ -238,3 +238,4 @@ SVGAnimatedPathSegList::SMILAnimatedPathSegList::ClearAnimValue()
 }
 #endif // MOZ_SMIL
 
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPointList.cpp b/content/svg/content/src/SVGAnimatedPointList.cpp
index 1e5a174523ea..983fe3dcc870 100644
--- a/content/svg/content/src/SVGAnimatedPointList.cpp
+++ b/content/svg/content/src/SVGAnimatedPointList.cpp
@@ -45,7 +45,7 @@
 
 // See the comments in this file's header!
 
-using namespace mozilla;
+namespace mozilla {
 
 nsresult
 SVGAnimatedPointList::SetBaseValueString(const nsAString& aValue)
@@ -241,3 +241,4 @@ SVGAnimatedPointList::SMILAnimatedPointList::ClearAnimValue()
 }
 #endif // MOZ_SMIL
 
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGLengthListSMILType.cpp b/content/svg/content/src/SVGLengthListSMILType.cpp
index 1bc0b5abb1e0..4ec1e283acdb 100644
--- a/content/svg/content/src/SVGLengthListSMILType.cpp
+++ b/content/svg/content/src/SVGLengthListSMILType.cpp
@@ -181,8 +181,8 @@ SVGLengthListSMILType::ComputeDistance(const nsSMILValue& aFrom,
   // and documenting SVGLengthListAndInfo::CanZeroPadList().
 
   NS_ASSERTION((from.CanZeroPadList() == to.CanZeroPadList()) ||
-               (from.CanZeroPadList() && from.Length() == 0) ||
-               (to.CanZeroPadList() && to.Length() == 0),
+               (from.CanZeroPadList() && from.IsEmpty()) ||
+               (to.CanZeroPadList() && to.IsEmpty()),
                "Only \"zero\" nsSMILValues from the SMIL engine should "
                "return PR_TRUE for CanZeroPadList() when the attribute "
                "being animated can't be zero padded");
@@ -256,8 +256,8 @@ SVGLengthListSMILType::Interpolate(const nsSMILValue& aStartVal,
   // and documenting SVGLengthListAndInfo::CanZeroPadList().
 
   NS_ASSERTION((start.CanZeroPadList() == end.CanZeroPadList()) ||
-               (start.CanZeroPadList() && start.Length() == 0) ||
-               (end.CanZeroPadList() && end.Length() == 0),
+               (start.CanZeroPadList() && start.IsEmpty()) ||
+               (end.CanZeroPadList() && end.IsEmpty()),
                "Only \"zero\" nsSMILValues from the SMIL engine should "
                "return PR_TRUE for CanZeroPadList() when the attribute "
                "being animated can't be zero padded");
diff --git a/content/svg/content/src/SVGNumberList.cpp b/content/svg/content/src/SVGNumberList.cpp
index 65b11bd82ba6..8a62d4526a9b 100644
--- a/content/svg/content/src/SVGNumberList.cpp
+++ b/content/svg/content/src/SVGNumberList.cpp
@@ -47,7 +47,7 @@
 #include "nsTextFormatter.h"
 #include "nsCharSeparatedTokenizer.h"
 
-using namespace mozilla;
+namespace mozilla {
 
 nsresult
 SVGNumberList::CopyFrom(const SVGNumberList& rhs)
@@ -108,3 +108,5 @@ SVGNumberList::SetValueFromString(const nsAString& aValue)
   }
   return CopyFrom(temp);
 }
+
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGNumberListSMILType.cpp b/content/svg/content/src/SVGNumberListSMILType.cpp
index 94d40250a403..cc54f8a895a7 100644
--- a/content/svg/content/src/SVGNumberListSMILType.cpp
+++ b/content/svg/content/src/SVGNumberListSMILType.cpp
@@ -56,7 +56,7 @@
  # SVGNumberListAndInfo has not been given an element yet.
  */
 
-using namespace mozilla;
+namespace mozilla {
 
 /*static*/ SVGNumberListSMILType SVGNumberListSMILType::sSingleton;
 
@@ -240,3 +240,5 @@ SVGNumberListSMILType::Interpolate(const nsSMILValue& aStartVal,
   }
   return NS_OK;
 }
+
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGPathSegListSMILType.cpp b/content/svg/content/src/SVGPathSegListSMILType.cpp
index ddd0ecca7778..12791fef94bc 100644
--- a/content/svg/content/src/SVGPathSegListSMILType.cpp
+++ b/content/svg/content/src/SVGPathSegListSMILType.cpp
@@ -39,7 +39,7 @@
 #include "SVGPathData.h"
 #include <math.h>
 
-using namespace mozilla;
+namespace mozilla {
 
 /*static*/ SVGPathSegListSMILType SVGPathSegListSMILType::sSingleton;
 
@@ -469,3 +469,5 @@ SVGPathSegListSMILType::Interpolate(const nsSMILValue& aStartVal,
 
   return NS_OK;
 }
+
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGPointList.cpp b/content/svg/content/src/SVGPointList.cpp
index f6e73e9e6333..0c97c2b8ea42 100644
--- a/content/svg/content/src/SVGPointList.cpp
+++ b/content/svg/content/src/SVGPointList.cpp
@@ -47,7 +47,7 @@
 #include "nsTextFormatter.h"
 #include "nsCharSeparatedTokenizer.h"
 
-using namespace mozilla;
+namespace mozilla {
 
 nsresult
 SVGPointList::CopyFrom(const SVGPointList& rhs)
@@ -152,3 +152,5 @@ SVGPointList::SetValueFromString(const nsAString& aValue)
   }
   return rv;
 }
+
+} // namespace mozilla
diff --git a/content/svg/content/src/SVGPointListSMILType.cpp b/content/svg/content/src/SVGPointListSMILType.cpp
index abe1003a3f39..c7ff39a1e3cf 100644
--- a/content/svg/content/src/SVGPointListSMILType.cpp
+++ b/content/svg/content/src/SVGPointListSMILType.cpp
@@ -40,7 +40,7 @@
 #include "nsMathUtils.h"
 #include <math.h>
 
-using namespace mozilla;
+namespace mozilla {
 
 /*static*/ SVGPointListSMILType SVGPointListSMILType::sSingleton;
 
@@ -225,3 +225,5 @@ SVGPointListSMILType::Interpolate(const nsSMILValue& aStartVal,
   }
   return NS_OK;
 }
+
+} // namespace mozilla

From bafc722919c8a655847d00107790bf47a2bc36b7 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 14 Apr 2011 11:47:27 -0700
Subject: [PATCH 210/509] Bug 641393 patch 3: Make SVGLengthListSMILType logic
 match other list types. r=jwatt

---
 .../svg/content/src/SVGLengthListSMILType.cpp | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/content/svg/content/src/SVGLengthListSMILType.cpp b/content/svg/content/src/SVGLengthListSMILType.cpp
index 4ec1e283acdb..fd1aa83a8ba8 100644
--- a/content/svg/content/src/SVGLengthListSMILType.cpp
+++ b/content/svg/content/src/SVGLengthListSMILType.cpp
@@ -122,16 +122,41 @@ SVGLengthListSMILType::Add(nsSMILValue& aDest,
   // should be, not zeros, and those values are not explicit or otherwise
   // available.
 
+  NS_ABORT_IF_FALSE(!dest.IsEmpty() || !valueToAdd.IsEmpty(),
+                    "Expecting at least one non-identity operand");
+
+  if (!valueToAdd.Element()) { // Adding identity value - no-op
+    NS_ABORT_IF_FALSE(valueToAdd.IsEmpty(),
+                      "Identity values should be empty");
+    return NS_OK;
+  }
+
+  if (!dest.Element()) { // Adding *to* an identity value
+    NS_ABORT_IF_FALSE(dest.IsEmpty(),
+                      "Identity values should be empty");
+    if (!dest.SetLength(valueToAdd.Length())) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    for (PRUint32 i = 0; i < dest.Length(); ++i) {
+      dest[i].SetValueAndUnit(valueToAdd[i].GetValueInCurrentUnits() * aCount,
+                              valueToAdd[i].GetUnit());
+    }
+    dest.SetInfo(valueToAdd.Element(), valueToAdd.Axis(),
+                 valueToAdd.CanZeroPadList()); // propagate target element info!
+    return NS_OK;
+  }
+  NS_ABORT_IF_FALSE(dest.Element() == valueToAdd.Element(),
+                    "adding values from different elements...?");
+
+  // Zero-pad our |dest| list, if necessary.
   if (dest.Length() < valueToAdd.Length()) {
     if (!dest.CanZeroPadList()) {
       // nsSVGUtils::ReportToConsole
       return NS_ERROR_FAILURE;
     }
 
-    NS_ASSERTION(valueToAdd.CanZeroPadList() || dest.Length() == 0,
-                 "Only \"zero\" nsSMILValues from the SMIL engine should "
-                 "return PR_TRUE for CanZeroPadList() when the attribute "
-                 "being animated can't be zero padded");
+    NS_ABORT_IF_FALSE(valueToAdd.CanZeroPadList(),
+                      "values disagree about attribute's zero-paddibility");
 
     PRUint32 i = dest.Length();
     if (!dest.SetLength(valueToAdd.Length())) {
@@ -153,13 +178,14 @@ SVGLengthListSMILType::Add(nsSMILValue& aDest,
                                                        dest.Element(),
                                                        dest.Axis());
     }
-    dest[i].SetValueAndUnit(dest[i].GetValueInCurrentUnits() + valToAdd,
-                            dest[i].GetUnit());
+    dest[i].SetValueAndUnit(
+      dest[i].GetValueInCurrentUnits() + valToAdd * aCount,
+      dest[i].GetUnit());
   }
 
-  // propagate flag:
-  dest.SetCanZeroPadList(dest.CanZeroPadList() &&
-                         valueToAdd.CanZeroPadList());
+  // propagate target element info!
+  dest.SetInfo(valueToAdd.Element(), valueToAdd.Axis(),
+               dest.CanZeroPadList() && valueToAdd.CanZeroPadList());
 
   return NS_OK;
 }
@@ -299,9 +325,9 @@ SVGLengthListSMILType::Interpolate(const nsSMILValue& aStartVal,
                               end[i].GetUnit());
   }
 
-  // propagate flag:
-  result.SetCanZeroPadList(start.CanZeroPadList() &&
-                           end.CanZeroPadList());
+  // propagate target element info!
+  result.SetInfo(end.Element(), end.Axis(),
+                 start.CanZeroPadList() && end.CanZeroPadList());
 
   return NS_OK;
 }

From c4b4e8e7565c452533360dbd477b1744ee68b0c9 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 14 Apr 2011 11:47:27 -0700
Subject: [PATCH 211/509] Bug 641393 patch 4: Add more tests for SVG length
 lists. r=jwatt

---
 .../svg/content/test/test_SVGxxxList.xhtml    | 112 +++++++++++++++---
 1 file changed, 94 insertions(+), 18 deletions(-)

diff --git a/content/svg/content/test/test_SVGxxxList.xhtml b/content/svg/content/test/test_SVGxxxList.xhtml
index 7c5956d2a6d8..97bd51a2d49c 100644
--- a/content/svg/content/test/test_SVGxxxList.xhtml
+++ b/content/svg/content/test/test_SVGxxxList.xhtml
@@ -80,6 +80,10 @@ To have the battery of generic tests run for a new list attribute, add an elemen
   attr_val_5a:
   attr_val_5b:
     Two attribute values containing five different items.
+  attr_val_5b_firstItem_x3_constructor:
+    Function to construct a list-item that should match the first item in a
+    SVGXxxList after three repeats of a cumulative animation to attr_val_5b.
+    This function takes t.item_constructor as its only argument.
   item_constructor:
     Function to create a dummy list item.
   item_is:
@@ -104,7 +108,12 @@ var tests = [
     attr_val_3b: '30in 10, 20ex',
     attr_val_4 : '10 20ex, 30in ,40cm',
     attr_val_5a: '10 20ex, 30in ,40cm , 50%',
-    attr_val_5b: '50% 10, 20ex ,30in , 40cm',
+    attr_val_5b: '20 50%, 20ex ,30in , 40cm',
+    attr_val_5b_firstItem_x3_constructor: function(constructor) {
+      var expected = constructor();
+      expected.value = 60;
+      return expected;
+    },
     item_constructor: function() {
       // We need this function literal to avoid "Illegal operation on
       // WrappedNative prototype object" NS_ERROR_XPC_BAD_OP_ON_WN_PROTO.
@@ -127,6 +136,11 @@ var tests = [
     attr_val_4 : '40 20 10 80',
     attr_val_5a: '90 30 60 20 70',
     attr_val_5b: '30 20 70 30 90',
+    attr_val_5b_firstItem_x3_constructor: function(constructor) {
+      var expected = constructor();
+      expected.value = 90;
+      return expected;
+    },
     item_constructor: function() {
       // We need this function literal to avoid "Illegal operation on
       // WrappedNative prototype object" NS_ERROR_XPC_BAD_OP_ON_WN_PROTO.
@@ -149,6 +163,11 @@ var tests = [
     attr_val_4 : '.5 .3 .8 .2',
     attr_val_5a: '3 4 5 6 7',
     attr_val_5b: '7 6 5 4 3',
+    attr_val_5b_firstItem_x3_constructor: function(constructor) {
+      var expected = constructor();
+      expected.value = 21;
+      return expected;
+    },
     item_constructor: function() {
       // We need this function literal to avoid "Illegal operation on
       // WrappedNative prototype object" NS_ERROR_XPC_BAD_OP_ON_WN_PROTO.
@@ -171,6 +190,12 @@ var tests = [
     attr_val_4 : ' 10,10 50,50 90,10 200,100 ',
     attr_val_5a: ' 10,10 50,50 90,10 130,50 170,10 ',
     attr_val_5b: ' 50,10 50,10 90,50 130,10 170,50 ',
+    attr_val_5b_firstItem_x3_constructor: function(constructor) {
+      var expected = constructor();
+      expected.x = 150;
+      expected.y = 30;
+      return expected;
+    },
     item_constructor: function() {
       // XXX return different values each time
       return document.getElementById('svg').createSVGPoint();
@@ -203,17 +228,43 @@ var tests = [
     attr_val_4 : 'M 10,10 L 50,50 L 90,10 M 200,100',
     attr_val_5a: 'M 10,10 L 50,50 L 90,10 L 130,50 L 170,10',
     attr_val_5b: 'M 50,10 L 50,10 L 90,50 L 130,10 L 170,50',
+    attr_val_5b_firstItem_x3_constructor: function(constructor) {
+      var expected = constructor();
+      is(expected.pathSegTypeAsLetter, "M",
+         "test error -- expected constructor to generate a segment of type M");
+      expected.x = 150;
+      expected.y = 30;
+      return expected;
+    },
     item_constructor: function() {
       // XXX return different values each time
       return document.getElementById('path').createSVGPathSegMovetoAbs(1, 1);
     },
     item_is: function(itemA, itemB, message) {
-      ok(typeof(itemA.pathSegType) != 'undefined' &&
-         typeof(itemB.pathSegType) != 'undefined',
-         'expecting pathSegType property');
+      ok(typeof(itemA.pathSegTypeAsLetter) != 'undefined' &&
+         typeof(itemB.pathSegTypeAsLetter) != 'undefined',
+         'expecting pathSegTypeAsLetter property');
 
-      // NOTE: Just comparing pathSegType - probably sufficient for our purposes
-      is(itemA.pathSegType, itemB.pathSegType, message);
+      // First: are we dealing  with the same type of segment?
+      is(itemA.pathSegTypeAsLetter, itemB.pathSegTypeAsLetter, message);
+      if (itemA.pathSegTypeAsLetter != itemB.pathSegTypeAsLetter)
+        return;  // The rest of this function is nonsense if types don't match.
+
+      // Make sure property-counts match (so we can iterate across itemA's
+      // properties and not worry about itemB having extra properties that
+      // we might be skipping over).
+      is(keys(itemA).length, keys(itemB).length,
+        'expecting same property-count when comparing path segs of same type.');
+
+      // Compare the properties, skipping the constant properties inherited
+      // from 'SVGPathSeg', and skipping the pathSegTypeAsLetter field since we
+      // already checked that above. 
+      for (var prop in itemA) {
+        if (!SVGPathSeg.hasOwnProperty(prop) &&
+            prop != 'pathSegTypeAsLetter') {
+          is(itemA[prop], itemB[prop], message);
+        }
+      }
     }
   },
 /*
@@ -238,12 +289,30 @@ var tests = [
       return SVGPathElement.createSVGPathSegLinetoAbs(1, 1);
     },
     item_is: function(itemA, itemB, message) {
-      ok(typeof(itemA.pathSegType) != 'undefined' &&
-         typeof(itemB.pathSegType) != 'undefined',
-         'expecting pathSegType property');
+      ok(typeof(itemA.pathSegTypeAsLetter) != 'undefined' &&
+         typeof(itemB.pathSegTypeAsLetter) != 'undefined',
+         'expecting pathSegTypeAsLetter property');
 
-      // NOTE: Just comparing pathSegType - probably sufficient for our purposes
-      is(itemA.pathSegType, itemB.pathSegType, message);
+      // First: are we dealing  with the same type of segment?
+      is(itemA.pathSegTypeAsLetter, itemB.pathSegTypeAsLetter, message);
+      if (itemA.pathSegTypeAsLetter != itemB.pathSegTypeAsLetter)
+        return;  // The rest of this function is nonsense if types don't match.
+
+      // Make sure property-counts match (so we can iterate across itemA's
+      // properties and not worry about itemB having extra properties that
+      // we might be skipping over).
+      is(keys(itemA).length, keys(itemB).length,
+        'expecting same property-count when comparing path segs of same type.');
+
+      // Compare the properties, skipping the constant properties inherited
+      // from 'SVGPathSeg', and skipping the pathSegTypeAsLetter field since we
+      // already checked that above. 
+      for (var prop in itemA) {
+        if (!SVGPathSeg.hasOwnProperty(prop) &&
+            prop != 'pathSegTypeAsLetter') {
+          is(itemA[prop], itemB[prop], message);
+        }
+      }
     }
   },
   {
@@ -299,12 +368,12 @@ var tests = [
 /*
 This function returns a DocumentFragment with three 'animate' element children. The duration of the three animations is as follows:
 
-  animation 1: |  *-----------*-----------*
+  animation 1: |  *-----------*-----------*-----------*
   animation 2: |     *--*
   animation 3: |                    *--*
-               |__________________________________> time (s)
-               |  |  |  |  |  |  |  |  |  |  |  |
-               0  1  2  3  4  5  6  7  8  9 10 11
+               |___________________________________________> time (s)
+               |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+               0  1  2  3  4  5  6  7  8  9 10 11 12 13 14
 
 The first animation repeats once so that we can test state on a repeat animation.
 
@@ -343,7 +412,8 @@ function create_animate_elements(test)
   animate1.setAttribute('to', test.attr_val_5b);
   animate1.setAttribute('begin', '1s');
   animate1.setAttribute('dur', '4s');
-  animate1.setAttribute('repeatCount', '2');
+  animate1.setAttribute('repeatCount', '3');
+  animate1.setAttribute('accumulate', 'sum');
   animate1.setAttribute('fill', 'freeze');
   df.appendChild(animate1);
 
@@ -1217,9 +1287,9 @@ function run_animation_timeline_tests()
   }
 
 
-  /********************    t = 10s    ********************/
+  /********************    t = 13s    ********************/
 
-  svg.setCurrentTime(10); // all animations have finished, but one is frozen
+  svg.setCurrentTime(13); // all animations have finished, but one is frozen
 
   for each (var t in tests) {
     if (!t.animVal)
@@ -1236,6 +1306,12 @@ function run_animation_timeline_tests()
        ' should still be more than the same as the number of items in '+
        t.bv_path+' since one of the animations is still frozen.');
 
+    var expected = t.attr_val_5b_firstItem_x3_constructor(t.item_constructor);
+    t.item_is(t.animVal.getItem(0), expected,
+      'animation with accumulate="sum" and repeatCount="3" for attribute "'+
+       t.attr_name+'" should end up at 3x the "to" value.');
+
+    // Unfreeze frozen animation (removing its effects)
     var frozen_animate_element =
       t.element.querySelector('animate[fill][attributeName="'+t.attr_name+'"]');
     frozen_animate_element.removeAttribute('fill');

From bf61a37b99915bc7f9dc5733bc5741d59d947b02 Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Thu, 14 Apr 2011 12:08:10 -0700
Subject: [PATCH 212/509] Bug 588389 - content-disposition: escaped characters
 in quoted-string give funny results; r=bzbarsky

---
 netwerk/mime/nsMIMEHeaderParamImpl.cpp | 34 ++++++++++++++++++++--
 netwerk/test/unit/test_bug588389.js    | 39 ++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 netwerk/test/unit/test_bug588389.js

diff --git a/netwerk/mime/nsMIMEHeaderParamImpl.cpp b/netwerk/mime/nsMIMEHeaderParamImpl.cpp
index 4a60e698b910..79475024b8e3 100644
--- a/netwerk/mime/nsMIMEHeaderParamImpl.cpp
+++ b/netwerk/mime/nsMIMEHeaderParamImpl.cpp
@@ -126,6 +126,24 @@ nsMIMEHeaderParamImpl::GetParameter(const nsACString& aHeaderVal,
     return NS_OK;
 }
 
+// remove backslash-encoded sequences from quoted-strings
+// modifies string in place, potentially shortening it
+void RemoveQuotedStringEscapes(char *src)
+{
+  char *dst = src;
+
+  for (char *c = src; *c; ++c)
+  {
+    if (c[0] == '\\' && c[1])
+    {
+      // skip backslash if not at end
+      ++c;
+    }
+    *dst++ = *c;
+  }
+  *dst = 0;
+}
+
 // moved almost verbatim from mimehdrs.cpp
 // char *
 // MimeHeaders_get_parameter (const char *header_value, const char *parm_name,
@@ -216,6 +234,8 @@ nsMIMEHeaderParamImpl::GetParameterInternal(const char *aHeaderValue,
     if (*str == '=') ++str;
     while (nsCRT::IsAsciiSpace(*str)) ++str;
 
+    PRBool needUnquote = PR_FALSE;
+    
     if (*str != '"')
     {
       // The value is a token, not a quoted string.
@@ -228,7 +248,9 @@ nsMIMEHeaderParamImpl::GetParameterInternal(const char *aHeaderValue,
     }
     else
     {
-      // The value is a quoted string. 
+      // The value is a quoted string.
+      needUnquote = PR_TRUE;
+      
       ++str;
       valueStart = str;
       for (valueEnd = str; *valueEnd; ++valueEnd)
@@ -251,8 +273,14 @@ nsMIMEHeaderParamImpl::GetParameterInternal(const char *aHeaderValue,
       //     line continuation -- jht 4/29/98 
       nsCAutoString tempStr(valueStart, valueEnd - valueStart);
       tempStr.StripChars("\r\n");
-      *aResult = ToNewCString(tempStr);
-      NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
+      char *res = ToNewCString(tempStr);
+      NS_ENSURE_TRUE(res, NS_ERROR_OUT_OF_MEMORY);
+      
+      if (needUnquote)
+        RemoveQuotedStringEscapes(res);
+            
+      *aResult = res;
+      
       // keep going, we may find a RFC 2231 encoded alternative
     }
     // case B, C, and D
diff --git a/netwerk/test/unit/test_bug588389.js b/netwerk/test/unit/test_bug588389.js
new file mode 100644
index 000000000000..58f6cfefffc8
--- /dev/null
+++ b/netwerk/test/unit/test_bug588389.js
@@ -0,0 +1,39 @@
+/**
+ * Test for bug 588389: unescaping backslashes in quoted string parameters
+ */
+
+var BS = '\\';
+var DQUOTE = '"'; 
+ 
+var reference = [
+                 [ // '\"', should be parsed as '"'
+                  "Content-Disposition: attachment; foobar=" + DQUOTE + (BS + DQUOTE) + DQUOTE, 
+                  DQUOTE],
+                 [ // 'a\"b', should be parsed as 'a"b'
+                  "Content-Disposition: attachment; foobar=" + DQUOTE + 'a' + (BS + DQUOTE) + 'b' + DQUOTE, 
+                  'a' + DQUOTE + 'b'],
+                 [ // '\x', should be parsed as 'x'
+                  "Content-Disposition: attachment; foobar=" + DQUOTE + (BS + "x") + DQUOTE, 
+                  "x"],
+                 [ // test empty param (quoted-string)
+                  "Content-Disposition: attachment; foobar=" + DQUOTE + DQUOTE, 
+                  ""],
+                 [ // test empty param
+                  "Content-Disposition: attachment; foobar=", 
+                  ""],
+                ];
+
+function run_test() {
+
+  var mhp = Components.classes["@mozilla.org/network/mime-hdrparam;1"]
+                      .getService(Components.interfaces.nsIMIMEHeaderParam);
+
+  var unused = { value : null };
+
+  for (var i = 0; i < reference.length; ++i) {
+    dump("Testing " + reference[i] + "\n");
+    do_check_eq(mhp.getParameter(reference[i][0], "foobar", "UTF-8", true, unused),
+                reference[i][1]);
+  }
+}
+

From 5d386baf97bc7b5b6073f283e86cace9f04ea47a Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 14 Apr 2011 10:58:09 -0700
Subject: [PATCH 213/509] Bug 646489 - Followup; fix reported version number in
 Windows error message. rs=khuey

--HG--
extra : rebase_source : 7be71fdc6b2b4eb0b7d5310e0016475bb7ef2869
---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index e0da9a9f62c8..473e847d26d1 100644
--- a/configure.in
+++ b/configure.in
@@ -6438,7 +6438,7 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then
     dnl on Linux and 1.1 or newer everywhere else.
     if test "$OS_ARCH" = "Linux" ; then
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -eq "0" -a "$_YASM_RELEASE" -lt "1" \) ; then
-            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
+            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_RELEASE.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
         fi
     else
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then

From 2e4def68e5471ae780e5d8f338bf77213b16565e Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 14 Apr 2011 10:58:27 -0700
Subject: [PATCH 214/509] Bug 647273 - Remove nsIContentUtils and
 nsIContentUtils2. r=sicking

--HG--
extra : rebase_source : dd7ff32cc758e62f914d283754d68ddc87cdcc7c
---
 content/base/public/Makefile.in               |  1 -
 content/base/public/nsContentUtils.h          | 13 +++
 content/base/public/nsIContentUtils.h         | 94 -------------------
 content/base/src/nsContentUtils.cpp           | 35 +------
 docshell/base/nsDocShell.cpp                  | 14 +--
 docshell/base/nsWebNavigationInfo.cpp         | 22 ++---
 .../windowwatcher/src/nsWindowWatcher.cpp     |  5 +-
 layout/build/nsLayoutCID.h                    |  8 --
 layout/build/nsLayoutModule.cpp               | 10 --
 .../base/src/nsPluginStreamListenerPeer.cpp   |  6 +-
 widget/tests/TestChromeMargin.cpp             | 11 +--
 xpfe/appshell/src/nsXULWindow.cpp             |  5 +-
 12 files changed, 34 insertions(+), 190 deletions(-)
 delete mode 100644 content/base/public/nsIContentUtils.h

diff --git a/content/base/public/Makefile.in b/content/base/public/Makefile.in
index 3bdf344e7456..3b06e370849d 100644
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -53,7 +53,6 @@ nsIContentIterator.h \
 nsContentErrors.h \
 nsContentPolicyUtils.h \
 nsContentUtils.h \
-nsIContentUtils.h \
 nsIDocument.h \
 nsIDocumentObserver.h \
 nsIMutationObserver.h \
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index a4516c08072d..e827c210967c 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -132,6 +132,7 @@ class nsPresContext;
 class nsIChannel;
 struct nsIntMargin;
 class nsPIDOMWindow;
+class nsIDocumentLoaderFactory;
 
 #ifndef have_PrefChangedFunc_typedef
 typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
@@ -1741,6 +1742,18 @@ public:
    */
   static bool AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal);
 
+  enum ContentViewerType
+  {
+      TYPE_UNSUPPORTED,
+      TYPE_CONTENT,
+      TYPE_PLUGIN,
+      TYPE_UNKNOWN
+  };
+
+  static already_AddRefed<nsIDocumentLoaderFactory>
+  FindInternalContentViewer(const char* aType,
+                            ContentViewerType* aLoaderType = nsnull);
+
 private:
   static PRBool InitializeEventTable();
 
diff --git a/content/base/public/nsIContentUtils.h b/content/base/public/nsIContentUtils.h
deleted file mode 100644
index df0552bd9091..000000000000
--- a/content/base/public/nsIContentUtils.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef nsIContentUtils_h__
-#define nsIContentUtils_h__
-
-#include "nsIDocumentLoaderFactory.h"
-#include "nsCOMPtr.h"
-#include "nsAString.h"
-#include "nsMargin.h"
-
-class nsIInterfaceRequestor;
-
-// {3682DD99-8560-44f4-9B8F-CCCE9D7B96FB}
-#define NS_ICONTENTUTILS_IID \
-{ 0x3682dd99, 0x8560, 0x44f4, \
-  { 0x9b, 0x8f, 0xcc, 0xce, 0x9d, 0x7b, 0x96, 0xfb } }
-
-class nsIContentUtils : public nsISupports
-{
-public:
-    NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS_IID)
-    NS_DECL_ISUPPORTS
-
-    virtual PRBool IsSafeToRunScript();
-    virtual PRBool ParseIntMarginValue(const nsAString& aString, nsIntMargin& result);
-
-    enum ContentViewerType
-    {
-        TYPE_UNSUPPORTED,
-        TYPE_CONTENT,
-        TYPE_PLUGIN,
-        TYPE_UNKNOWN
-    };
-
-    virtual already_AddRefed<nsIDocumentLoaderFactory>
-    FindInternalContentViewer(const char* aType,
-                              ContentViewerType* aLoaderType = NULL);
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils, NS_ICONTENTUTILS_IID)
-
-// {c7193287-3e3d-467f-b6da-47b914eb4c83}
-#define NS_ICONTENTUTILS2_IID \
-{ 0xc7193287, 0x3e3d, 0x467f, \
-{ 0xb6, 0xda, 0x47, 0xb9, 0x14, 0xeb, 0x4c, 0x83 } }
-
-class nsIContentUtils2 : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS2_IID)
-  NS_DECL_ISUPPORTS
-
-  virtual nsIInterfaceRequestor* GetSameOriginChecker();
-  // Returns NS_OK for same origin, error (NS_ERROR_DOM_BAD_URI) if not.
-  virtual nsresult CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel);
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils2, NS_ICONTENTUTILS2_IID)
-
-#endif /* nsIContentUtils_h__ */
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 0bacc146dc43..e15185483ec1 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -58,7 +58,6 @@
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsDOMCID.h"
 #include "nsContentUtils.h"
-#include "nsIContentUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"
@@ -6429,23 +6428,9 @@ nsContentUtils::AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal)
           IsSitePermAllow(princURI, "allowXULXBL"));
 }
 
-NS_IMPL_ISUPPORTS1(nsIContentUtils, nsIContentUtils)
-
-PRBool
-nsIContentUtils::IsSafeToRunScript()
-{
-  return nsContentUtils::IsSafeToRunScript();
-}
-
-PRBool
-nsIContentUtils::ParseIntMarginValue(const nsAString& aString, nsIntMargin& result)
-{
-  return nsContentUtils::ParseIntMarginValue(aString, result);
-}
-
 already_AddRefed<nsIDocumentLoaderFactory>
-nsIContentUtils::FindInternalContentViewer(const char* aType,
-                                           ContentViewerType* aLoaderType)
+nsContentUtils::FindInternalContentViewer(const char* aType,
+                                          ContentViewerType* aLoaderType)
 {
   if (aLoaderType) {
     *aLoaderType = TYPE_UNSUPPORTED;
@@ -6469,7 +6454,7 @@ nsIContentUtils::FindInternalContentViewer(const char* aType,
         *aLoaderType = TYPE_PLUGIN;
       else
       *aLoaderType = TYPE_UNKNOWN;
-    }   
+    }
     return docFactory.forget();
   }
 
@@ -6507,17 +6492,3 @@ nsIContentUtils::FindInternalContentViewer(const char* aType,
 
   return NULL;
 }
-
-NS_IMPL_ISUPPORTS1(nsIContentUtils2, nsIContentUtils2)
-
-nsIInterfaceRequestor*
-nsIContentUtils2::GetSameOriginChecker()
-{
-  return nsContentUtils::GetSameOriginChecker();
-}
-
-nsresult
-nsIContentUtils2::CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel)
-{
-  return nsContentUtils::CheckSameOrigin(aOldChannel, aNewChannel);
-}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index ce9a614f1c2e..340bc4a70a76 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -49,7 +49,6 @@
 #include "nsIBrowserDOMWindow.h"
 #include "nsIComponentManager.h"
 #include "nsIContent.h"
-#include "nsIContentUtils.h"
 #include "mozilla/dom/Element.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
@@ -6490,11 +6489,9 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
   // too, of course.
   mFiredUnloadEvent = PR_FALSE;
 
-  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-  if (!cutils)
-      return NS_ERROR_FAILURE;
+  nsCOMPtr<nsIDocumentLoaderFactory> docFactory =
+      nsContentUtils::FindInternalContentViewer("text/html");
 
-  nsCOMPtr<nsIDocumentLoaderFactory> docFactory = cutils->FindInternalContentViewer("text/html");
   if (docFactory) {
     // generate (about:blank) document to load
     docFactory->CreateBlankDocument(mLoadGroup, aPrincipal,
@@ -7519,13 +7516,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
 {
     nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
 
-    nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-    if (!cutils) {
-        return NS_ERROR_FAILURE;
-    }
-
     nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-        cutils->FindInternalContentViewer(aContentType);
+        nsContentUtils::FindInternalContentViewer(aContentType);
     if (!docLoaderFactory) {
         return NS_ERROR_FAILURE;
     }
diff --git a/docshell/base/nsWebNavigationInfo.cpp b/docshell/base/nsWebNavigationInfo.cpp
index ed9ff71e66fb..2e30c0bd2df6 100644
--- a/docshell/base/nsWebNavigationInfo.cpp
+++ b/docshell/base/nsWebNavigationInfo.cpp
@@ -39,9 +39,9 @@
 #include "nsIWebNavigation.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
-#include "nsIContentUtils.h"
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIPluginHost.h"
+#include "nsContentUtils.h"
 
 NS_IMPL_ISUPPORTS1(nsWebNavigationInfo, nsIWebNavigationInfo)
 
@@ -110,29 +110,25 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
   NS_PRECONDITION(aIsSupported, "Null out param?");
 
 
-  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-  if (!cutils)
-      return NS_ERROR_FAILURE;
-
-  nsIContentUtils::ContentViewerType vtype = nsIContentUtils::TYPE_UNSUPPORTED;
+  nsContentUtils::ContentViewerType vtype = nsContentUtils::TYPE_UNSUPPORTED;
 
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-    cutils->FindInternalContentViewer(aType.get(), &vtype);
-  
+    nsContentUtils::FindInternalContentViewer(aType.get(), &vtype);
+
   switch (vtype) {
-  case nsIContentUtils::TYPE_UNSUPPORTED:
+  case nsContentUtils::TYPE_UNSUPPORTED:
     *aIsSupported = nsIWebNavigationInfo::UNSUPPORTED;
     break;
 
-  case nsIContentUtils::TYPE_PLUGIN:
+  case nsContentUtils::TYPE_PLUGIN:
     *aIsSupported = nsIWebNavigationInfo::PLUGIN;
     break;
 
-  case nsIContentUtils::TYPE_UNKNOWN:
+  case nsContentUtils::TYPE_UNKNOWN:
     *aIsSupported = nsIWebNavigationInfo::OTHER;
     break;
 
-  case nsIContentUtils::TYPE_CONTENT:
+  case nsContentUtils::TYPE_CONTENT:
     PRBool isImage = PR_FALSE;
     mImgLoader->SupportImageWithMimeType(aType.get(), &isImage);
     if (isImage) {
@@ -143,6 +139,6 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
     }
     break;
   }
-  
+
   return NS_OK;
 }
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index f8831ecc1ad0..1396b59606b6 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -46,7 +46,6 @@
 #include "nsNetUtil.h"
 #include "nsWWJSUtils.h"
 #include "plstr.h"
-#include "nsIContentUtils.h"
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
@@ -513,9 +512,7 @@ nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = 0;
 
-  nsCOMPtr<nsIContentUtils> utils =
-    do_GetService("@mozilla.org/content/contentutils;1");
-  if (utils && !utils->IsSafeToRunScript()) {
+  if (!nsContentUtils::IsSafeToRunScript()) {
     return NS_ERROR_FAILURE;
   }
 
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index 2b6e28445f91..847b58e308c9 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -238,14 +238,6 @@
 #define NS_FOCUSMANAGER_CID \
 { 0xcf7fd51f, 0xaba2, 0x44c1, { 0x9f, 0xf0, 0x11, 0xf7, 0x50, 0x8e, 0xfc, 0xd4 } }
 
-// {762C4AE7-B923-422F-B97E-B9BFC1EF7BF0}
-#define NS_ICONTENTUTILS_CID \
-{ 0x762C4AE7, 0xB923, 0x422F, { 0xB9, 0x7E, 0xB9, 0xBF, 0xC1, 0xEF, 0x7B, 0xF0 } }
-
-// {1802442d-a59b-43b8-b8fd-070da5549593}
-#define NS_ICONTENTUTILS2_CID \
-{ 0x1802442d, 0xa59b, 0x43b8, { 0xb8, 0xfd, 0x07, 0x0d, 0xa5, 0x54, 0x95, 0x93 } }
-
 // {1A26A7B7-D06E-4F45-8B45-D7AD60F7A9AB}
 #define INDEXEDDB_MANAGER_CID \
 { 0x1a26a7b7, 0xd06e, 0x4f45, { 0x8b, 0x45, 0xd7, 0xad, 0x60, 0xf7, 0xa9, 0xab } }
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 07e40583c71c..023e740ebd3d 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -94,7 +94,6 @@
 #include "nsStyleSheetService.h"
 #include "nsXULPopupManager.h"
 #include "nsFocusManager.h"
-#include "nsIContentUtils.h"
 #include "ThirdPartyUtil.h"
 #include "mozilla/Services.h"
 
@@ -580,9 +579,6 @@ MAKE_CTOR(CreateVideoDocument,            nsIDocument,                 NS_NewVid
 #endif
 MAKE_CTOR(CreateFocusManager,             nsIFocusManager,      NS_NewFocusManager)
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils2)
-
 MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
 MAKE_CTOR(CreateCanvasRenderingContextWebGL, nsIDOMWebGLRenderingContext, NS_NewCanvasRenderingContextWebGL)
 
@@ -868,8 +864,6 @@ NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
 NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS_CID);
-NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS2_CID);
 NS_DEFINE_NAMED_CID(CSPSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_EVENTLISTENERSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GLOBALMESSAGEMANAGER_CID);
@@ -1019,8 +1013,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_GEOLOCATION_SERVICE_CID, false, NULL, nsGeolocationServiceConstructor },
   { &kNS_GEOLOCATION_CID, false, NULL, nsGeolocationConstructor },
   { &kNS_FOCUSMANAGER_CID, false, NULL, CreateFocusManager },
-  { &kNS_ICONTENTUTILS_CID, false, NULL, nsIContentUtilsConstructor },
-  { &kNS_ICONTENTUTILS2_CID, false, NULL, nsIContentUtils2Constructor },
   { &kCSPSERVICE_CID, false, NULL, CSPServiceConstructor },
   { &kNS_EVENTLISTENERSERVICE_CID, false, NULL, CreateEventListenerService },
   { &kNS_GLOBALMESSAGEMANAGER_CID, false, NULL, CreateGlobalMessageManager },
@@ -1164,8 +1156,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
   { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
   { "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID },
-  { "@mozilla.org/content/contentutils;1", &kNS_ICONTENTUTILS_CID },
-  { "@mozilla.org/content/contentutils2;1", &kNS_ICONTENTUTILS2_CID },
   { CSPSERVICE_CONTRACTID, &kCSPSERVICE_CID },
   { NS_EVENTLISTENERSERVICE_CONTRACTID, &kNS_EVENTLISTENERSERVICE_CID },
   { NS_GLOBALMESSAGEMANAGER_CONTRACTID, &kNS_GLOBALMESSAGEMANAGER_CID },
diff --git a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
index 03eb04e58838..f580927390c8 100644
--- a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
+++ b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
@@ -54,10 +54,10 @@
 #include "nsIMultiPartChannel.h"
 #include "nsIInputStreamTee.h"
 #include "nsPrintfCString.h"
-#include "nsIContentUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocument.h"
 #include "nsIWebNavigation.h"
+#include "nsContentUtils.h"
 
 #define MAGIC_REQUEST_CONTEXT 0x01020304
 
@@ -1423,9 +1423,7 @@ nsPluginStreamListenerPeer::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsICh
         return rv;
       }
       if (method.EqualsLiteral("POST")) {
-        nsCOMPtr<nsIContentUtils2> contentUtils2 = do_GetService("@mozilla.org/content/contentutils2;1");
-        NS_ENSURE_TRUE(contentUtils2, NS_ERROR_FAILURE);
-        rv = contentUtils2->CheckSameOrigin(oldChannel, newChannel);
+        rv = nsContentUtils::CheckSameOrigin(oldChannel, newChannel);
         if (NS_FAILED(rv)) {
           return rv;
         }
diff --git a/widget/tests/TestChromeMargin.cpp b/widget/tests/TestChromeMargin.cpp
index a06ae9726937..e14744b6f1fa 100644
--- a/widget/tests/TestChromeMargin.cpp
+++ b/widget/tests/TestChromeMargin.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* This tests the margin parsing functionality in nsAttrValue.cpp, which
- * is accessible via nsIContentUtils, and is used in setting chromemargins
+ * is accessible via nsContentUtils, and is used in setting chromemargins
  * to widget windows. It's located here due to linking issues in the
  * content directory.
  */
@@ -61,7 +61,6 @@ template<class T> class nsReadingIterator;
 #endif
 
 #include "nscore.h"
-#include "nsIContentUtils.h"
 
 #ifndef MOZILLA_INTERNAL_API
 #undef nsString_h___
@@ -115,19 +114,13 @@ const DATA Data[] = {
 
 void DoAttrValueTest()
 {
-  nsCOMPtr<nsIContentUtils> utils =
-   do_GetService("@mozilla.org/content/contentutils;1");
-
-  if (!utils)
-    fail("No nsIContentUtils");
-
   int idx = -1;
   bool didFail = false;
   while (Data[++idx].margins) {
     nsAutoString str;
     str.AssignLiteral(Data[idx].margins);
     nsIntMargin values(99,99,99,99);
-    bool result = utils->ParseIntMarginValue(str, values);
+    bool result = nsContentUtils::ParseIntMarginValue(str, values);
 
     // if the parse fails
     if (!result) {
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index b6fc3983eec2..9d5f889aa67c 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -92,7 +92,6 @@
 #include "nsReadableUtils.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsIContentUtils.h"
 
 #include "nsWebShellWindow.h" // get rid of this one, too...
 
@@ -1392,10 +1391,8 @@ void nsXULWindow::SyncAttributesToWidget()
 
   // "chromemargin" attribute
   nsIntMargin margins;
-  nsCOMPtr<nsIContentUtils> cutils =
-    do_GetService("@mozilla.org/content/contentutils;1");
   rv = windowElement->GetAttribute(NS_LITERAL_STRING("chromemargin"), attr);
-  if (NS_SUCCEEDED(rv) && cutils && cutils->ParseIntMarginValue(attr, margins)) {
+  if (NS_SUCCEEDED(rv) && nsContentUtils::ParseIntMarginValue(attr, margins)) {
     mWindow->SetNonClientMargins(margins);
   }
 

From 60e60d5932ec5d9b86df8c0dcbda4ee574e9be22 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 16:54:19 -0400
Subject: [PATCH 215/509] Back out changeset c89cfb2997dc (bug 646489) because
 it breaks Windows builds

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 473e847d26d1..e0da9a9f62c8 100644
--- a/configure.in
+++ b/configure.in
@@ -6438,7 +6438,7 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then
     dnl on Linux and 1.1 or newer everywhere else.
     if test "$OS_ARCH" = "Linux" ; then
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -eq "0" -a "$_YASM_RELEASE" -lt "1" \) ; then
-            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_RELEASE.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
+            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
         fi
     else
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then

From 56e8d61932d268690cd9a91c7b27230ccfc66778 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 16:55:23 -0400
Subject: [PATCH 216/509] Backed out changeset 4090fb78bbac to restore the
 patch to bug 646489

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index e0da9a9f62c8..473e847d26d1 100644
--- a/configure.in
+++ b/configure.in
@@ -6438,7 +6438,7 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then
     dnl on Linux and 1.1 or newer everywhere else.
     if test "$OS_ARCH" = "Linux" ; then
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -eq "0" -a "$_YASM_RELEASE" -lt "1" \) ; then
-            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_MINOR_VERSION.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
+            AC_MSG_ERROR([yasm 1.0.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_RELEASE.  Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder.  See https://developer.mozilla.org/en/YASM for more details.])
         fi
     else
         if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then

From 45066328854134e1c878262e23b2535331c2bdf8 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 14 Apr 2011 22:55:36 +0200
Subject: [PATCH 217/509] Bug 648929 - frequently getting drag.info is null
 error in tabview.js [f=raymond, r=ian]

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

diff --git a/browser/base/content/tabview/items.js b/browser/base/content/tabview/items.js
index 05e5e5e7cd93..4495e1a9b39b 100644
--- a/browser/base/content/tabview/items.js
+++ b/browser/base/content/tabview/items.js
@@ -661,7 +661,7 @@ Item.prototype = {
           .unbind('mousemove', handleMouseMove)
           .unbind('mouseup', handleMouseUp);
 
-        if (dropTarget) {
+        if (startSent && dropTarget) {
           var dropOptions = dropTarget.dropOptions;
           if (dropOptions && typeof dropOptions.drop == "function")
             dropOptions.drop.apply(dropTarget, [e]);

From 66b6985b53e2c4cc5e4a69d143e9fce37483bf8d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 16:56:05 -0400
Subject: [PATCH 218/509] Back out changeset 457757151653 (bug 647273) for
 breaking the Windows builds

---
 content/base/public/Makefile.in               |  1 +
 content/base/public/nsContentUtils.h          | 13 ---
 content/base/public/nsIContentUtils.h         | 94 +++++++++++++++++++
 content/base/src/nsContentUtils.cpp           | 35 ++++++-
 docshell/base/nsDocShell.cpp                  | 14 ++-
 docshell/base/nsWebNavigationInfo.cpp         | 22 +++--
 .../windowwatcher/src/nsWindowWatcher.cpp     |  5 +-
 layout/build/nsLayoutCID.h                    |  8 ++
 layout/build/nsLayoutModule.cpp               | 10 ++
 .../base/src/nsPluginStreamListenerPeer.cpp   |  6 +-
 widget/tests/TestChromeMargin.cpp             | 11 ++-
 xpfe/appshell/src/nsXULWindow.cpp             |  5 +-
 12 files changed, 190 insertions(+), 34 deletions(-)
 create mode 100644 content/base/public/nsIContentUtils.h

diff --git a/content/base/public/Makefile.in b/content/base/public/Makefile.in
index 3b06e370849d..3bdf344e7456 100644
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -53,6 +53,7 @@ nsIContentIterator.h \
 nsContentErrors.h \
 nsContentPolicyUtils.h \
 nsContentUtils.h \
+nsIContentUtils.h \
 nsIDocument.h \
 nsIDocumentObserver.h \
 nsIMutationObserver.h \
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index e827c210967c..a4516c08072d 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -132,7 +132,6 @@ class nsPresContext;
 class nsIChannel;
 struct nsIntMargin;
 class nsPIDOMWindow;
-class nsIDocumentLoaderFactory;
 
 #ifndef have_PrefChangedFunc_typedef
 typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
@@ -1742,18 +1741,6 @@ public:
    */
   static bool AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal);
 
-  enum ContentViewerType
-  {
-      TYPE_UNSUPPORTED,
-      TYPE_CONTENT,
-      TYPE_PLUGIN,
-      TYPE_UNKNOWN
-  };
-
-  static already_AddRefed<nsIDocumentLoaderFactory>
-  FindInternalContentViewer(const char* aType,
-                            ContentViewerType* aLoaderType = nsnull);
-
 private:
   static PRBool InitializeEventTable();
 
diff --git a/content/base/public/nsIContentUtils.h b/content/base/public/nsIContentUtils.h
new file mode 100644
index 000000000000..df0552bd9091
--- /dev/null
+++ b/content/base/public/nsIContentUtils.h
@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef nsIContentUtils_h__
+#define nsIContentUtils_h__
+
+#include "nsIDocumentLoaderFactory.h"
+#include "nsCOMPtr.h"
+#include "nsAString.h"
+#include "nsMargin.h"
+
+class nsIInterfaceRequestor;
+
+// {3682DD99-8560-44f4-9B8F-CCCE9D7B96FB}
+#define NS_ICONTENTUTILS_IID \
+{ 0x3682dd99, 0x8560, 0x44f4, \
+  { 0x9b, 0x8f, 0xcc, 0xce, 0x9d, 0x7b, 0x96, 0xfb } }
+
+class nsIContentUtils : public nsISupports
+{
+public:
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS_IID)
+    NS_DECL_ISUPPORTS
+
+    virtual PRBool IsSafeToRunScript();
+    virtual PRBool ParseIntMarginValue(const nsAString& aString, nsIntMargin& result);
+
+    enum ContentViewerType
+    {
+        TYPE_UNSUPPORTED,
+        TYPE_CONTENT,
+        TYPE_PLUGIN,
+        TYPE_UNKNOWN
+    };
+
+    virtual already_AddRefed<nsIDocumentLoaderFactory>
+    FindInternalContentViewer(const char* aType,
+                              ContentViewerType* aLoaderType = NULL);
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils, NS_ICONTENTUTILS_IID)
+
+// {c7193287-3e3d-467f-b6da-47b914eb4c83}
+#define NS_ICONTENTUTILS2_IID \
+{ 0xc7193287, 0x3e3d, 0x467f, \
+{ 0xb6, 0xda, 0x47, 0xb9, 0x14, 0xeb, 0x4c, 0x83 } }
+
+class nsIContentUtils2 : public nsISupports
+{
+public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS2_IID)
+  NS_DECL_ISUPPORTS
+
+  virtual nsIInterfaceRequestor* GetSameOriginChecker();
+  // Returns NS_OK for same origin, error (NS_ERROR_DOM_BAD_URI) if not.
+  virtual nsresult CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel);
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils2, NS_ICONTENTUTILS2_IID)
+
+#endif /* nsIContentUtils_h__ */
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index e15185483ec1..0bacc146dc43 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -58,6 +58,7 @@
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsDOMCID.h"
 #include "nsContentUtils.h"
+#include "nsIContentUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"
@@ -6428,9 +6429,23 @@ nsContentUtils::AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal)
           IsSitePermAllow(princURI, "allowXULXBL"));
 }
 
+NS_IMPL_ISUPPORTS1(nsIContentUtils, nsIContentUtils)
+
+PRBool
+nsIContentUtils::IsSafeToRunScript()
+{
+  return nsContentUtils::IsSafeToRunScript();
+}
+
+PRBool
+nsIContentUtils::ParseIntMarginValue(const nsAString& aString, nsIntMargin& result)
+{
+  return nsContentUtils::ParseIntMarginValue(aString, result);
+}
+
 already_AddRefed<nsIDocumentLoaderFactory>
-nsContentUtils::FindInternalContentViewer(const char* aType,
-                                          ContentViewerType* aLoaderType)
+nsIContentUtils::FindInternalContentViewer(const char* aType,
+                                           ContentViewerType* aLoaderType)
 {
   if (aLoaderType) {
     *aLoaderType = TYPE_UNSUPPORTED;
@@ -6454,7 +6469,7 @@ nsContentUtils::FindInternalContentViewer(const char* aType,
         *aLoaderType = TYPE_PLUGIN;
       else
       *aLoaderType = TYPE_UNKNOWN;
-    }
+    }   
     return docFactory.forget();
   }
 
@@ -6492,3 +6507,17 @@ nsContentUtils::FindInternalContentViewer(const char* aType,
 
   return NULL;
 }
+
+NS_IMPL_ISUPPORTS1(nsIContentUtils2, nsIContentUtils2)
+
+nsIInterfaceRequestor*
+nsIContentUtils2::GetSameOriginChecker()
+{
+  return nsContentUtils::GetSameOriginChecker();
+}
+
+nsresult
+nsIContentUtils2::CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel)
+{
+  return nsContentUtils::CheckSameOrigin(aOldChannel, aNewChannel);
+}
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 340bc4a70a76..ce9a614f1c2e 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -49,6 +49,7 @@
 #include "nsIBrowserDOMWindow.h"
 #include "nsIComponentManager.h"
 #include "nsIContent.h"
+#include "nsIContentUtils.h"
 #include "mozilla/dom/Element.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
@@ -6489,9 +6490,11 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
   // too, of course.
   mFiredUnloadEvent = PR_FALSE;
 
-  nsCOMPtr<nsIDocumentLoaderFactory> docFactory =
-      nsContentUtils::FindInternalContentViewer("text/html");
+  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
+  if (!cutils)
+      return NS_ERROR_FAILURE;
 
+  nsCOMPtr<nsIDocumentLoaderFactory> docFactory = cutils->FindInternalContentViewer("text/html");
   if (docFactory) {
     // generate (about:blank) document to load
     docFactory->CreateBlankDocument(mLoadGroup, aPrincipal,
@@ -7516,8 +7519,13 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
 {
     nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
 
+    nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
+    if (!cutils) {
+        return NS_ERROR_FAILURE;
+    }
+
     nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-        nsContentUtils::FindInternalContentViewer(aContentType);
+        cutils->FindInternalContentViewer(aContentType);
     if (!docLoaderFactory) {
         return NS_ERROR_FAILURE;
     }
diff --git a/docshell/base/nsWebNavigationInfo.cpp b/docshell/base/nsWebNavigationInfo.cpp
index 2e30c0bd2df6..ed9ff71e66fb 100644
--- a/docshell/base/nsWebNavigationInfo.cpp
+++ b/docshell/base/nsWebNavigationInfo.cpp
@@ -39,9 +39,9 @@
 #include "nsIWebNavigation.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
+#include "nsIContentUtils.h"
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIPluginHost.h"
-#include "nsContentUtils.h"
 
 NS_IMPL_ISUPPORTS1(nsWebNavigationInfo, nsIWebNavigationInfo)
 
@@ -110,25 +110,29 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
   NS_PRECONDITION(aIsSupported, "Null out param?");
 
 
-  nsContentUtils::ContentViewerType vtype = nsContentUtils::TYPE_UNSUPPORTED;
+  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
+  if (!cutils)
+      return NS_ERROR_FAILURE;
+
+  nsIContentUtils::ContentViewerType vtype = nsIContentUtils::TYPE_UNSUPPORTED;
 
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-    nsContentUtils::FindInternalContentViewer(aType.get(), &vtype);
-
+    cutils->FindInternalContentViewer(aType.get(), &vtype);
+  
   switch (vtype) {
-  case nsContentUtils::TYPE_UNSUPPORTED:
+  case nsIContentUtils::TYPE_UNSUPPORTED:
     *aIsSupported = nsIWebNavigationInfo::UNSUPPORTED;
     break;
 
-  case nsContentUtils::TYPE_PLUGIN:
+  case nsIContentUtils::TYPE_PLUGIN:
     *aIsSupported = nsIWebNavigationInfo::PLUGIN;
     break;
 
-  case nsContentUtils::TYPE_UNKNOWN:
+  case nsIContentUtils::TYPE_UNKNOWN:
     *aIsSupported = nsIWebNavigationInfo::OTHER;
     break;
 
-  case nsContentUtils::TYPE_CONTENT:
+  case nsIContentUtils::TYPE_CONTENT:
     PRBool isImage = PR_FALSE;
     mImgLoader->SupportImageWithMimeType(aType.get(), &isImage);
     if (isImage) {
@@ -139,6 +143,6 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
     }
     break;
   }
-
+  
   return NS_OK;
 }
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index 1396b59606b6..f8831ecc1ad0 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -46,6 +46,7 @@
 #include "nsNetUtil.h"
 #include "nsWWJSUtils.h"
 #include "plstr.h"
+#include "nsIContentUtils.h"
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
@@ -512,7 +513,9 @@ nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = 0;
 
-  if (!nsContentUtils::IsSafeToRunScript()) {
+  nsCOMPtr<nsIContentUtils> utils =
+    do_GetService("@mozilla.org/content/contentutils;1");
+  if (utils && !utils->IsSafeToRunScript()) {
     return NS_ERROR_FAILURE;
   }
 
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index 847b58e308c9..2b6e28445f91 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -238,6 +238,14 @@
 #define NS_FOCUSMANAGER_CID \
 { 0xcf7fd51f, 0xaba2, 0x44c1, { 0x9f, 0xf0, 0x11, 0xf7, 0x50, 0x8e, 0xfc, 0xd4 } }
 
+// {762C4AE7-B923-422F-B97E-B9BFC1EF7BF0}
+#define NS_ICONTENTUTILS_CID \
+{ 0x762C4AE7, 0xB923, 0x422F, { 0xB9, 0x7E, 0xB9, 0xBF, 0xC1, 0xEF, 0x7B, 0xF0 } }
+
+// {1802442d-a59b-43b8-b8fd-070da5549593}
+#define NS_ICONTENTUTILS2_CID \
+{ 0x1802442d, 0xa59b, 0x43b8, { 0xb8, 0xfd, 0x07, 0x0d, 0xa5, 0x54, 0x95, 0x93 } }
+
 // {1A26A7B7-D06E-4F45-8B45-D7AD60F7A9AB}
 #define INDEXEDDB_MANAGER_CID \
 { 0x1a26a7b7, 0xd06e, 0x4f45, { 0x8b, 0x45, 0xd7, 0xad, 0x60, 0xf7, 0xa9, 0xab } }
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 023e740ebd3d..07e40583c71c 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -94,6 +94,7 @@
 #include "nsStyleSheetService.h"
 #include "nsXULPopupManager.h"
 #include "nsFocusManager.h"
+#include "nsIContentUtils.h"
 #include "ThirdPartyUtil.h"
 #include "mozilla/Services.h"
 
@@ -579,6 +580,9 @@ MAKE_CTOR(CreateVideoDocument,            nsIDocument,                 NS_NewVid
 #endif
 MAKE_CTOR(CreateFocusManager,             nsIFocusManager,      NS_NewFocusManager)
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils2)
+
 MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
 MAKE_CTOR(CreateCanvasRenderingContextWebGL, nsIDOMWebGLRenderingContext, NS_NewCanvasRenderingContextWebGL)
 
@@ -864,6 +868,8 @@ NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
 NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS_CID);
+NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS2_CID);
 NS_DEFINE_NAMED_CID(CSPSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_EVENTLISTENERSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GLOBALMESSAGEMANAGER_CID);
@@ -1013,6 +1019,8 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_GEOLOCATION_SERVICE_CID, false, NULL, nsGeolocationServiceConstructor },
   { &kNS_GEOLOCATION_CID, false, NULL, nsGeolocationConstructor },
   { &kNS_FOCUSMANAGER_CID, false, NULL, CreateFocusManager },
+  { &kNS_ICONTENTUTILS_CID, false, NULL, nsIContentUtilsConstructor },
+  { &kNS_ICONTENTUTILS2_CID, false, NULL, nsIContentUtils2Constructor },
   { &kCSPSERVICE_CID, false, NULL, CSPServiceConstructor },
   { &kNS_EVENTLISTENERSERVICE_CID, false, NULL, CreateEventListenerService },
   { &kNS_GLOBALMESSAGEMANAGER_CID, false, NULL, CreateGlobalMessageManager },
@@ -1156,6 +1164,8 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
   { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
   { "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID },
+  { "@mozilla.org/content/contentutils;1", &kNS_ICONTENTUTILS_CID },
+  { "@mozilla.org/content/contentutils2;1", &kNS_ICONTENTUTILS2_CID },
   { CSPSERVICE_CONTRACTID, &kCSPSERVICE_CID },
   { NS_EVENTLISTENERSERVICE_CONTRACTID, &kNS_EVENTLISTENERSERVICE_CID },
   { NS_GLOBALMESSAGEMANAGER_CONTRACTID, &kNS_GLOBALMESSAGEMANAGER_CID },
diff --git a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
index f580927390c8..03eb04e58838 100644
--- a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
+++ b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
@@ -54,10 +54,10 @@
 #include "nsIMultiPartChannel.h"
 #include "nsIInputStreamTee.h"
 #include "nsPrintfCString.h"
+#include "nsIContentUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocument.h"
 #include "nsIWebNavigation.h"
-#include "nsContentUtils.h"
 
 #define MAGIC_REQUEST_CONTEXT 0x01020304
 
@@ -1423,7 +1423,9 @@ nsPluginStreamListenerPeer::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsICh
         return rv;
       }
       if (method.EqualsLiteral("POST")) {
-        rv = nsContentUtils::CheckSameOrigin(oldChannel, newChannel);
+        nsCOMPtr<nsIContentUtils2> contentUtils2 = do_GetService("@mozilla.org/content/contentutils2;1");
+        NS_ENSURE_TRUE(contentUtils2, NS_ERROR_FAILURE);
+        rv = contentUtils2->CheckSameOrigin(oldChannel, newChannel);
         if (NS_FAILED(rv)) {
           return rv;
         }
diff --git a/widget/tests/TestChromeMargin.cpp b/widget/tests/TestChromeMargin.cpp
index e14744b6f1fa..a06ae9726937 100644
--- a/widget/tests/TestChromeMargin.cpp
+++ b/widget/tests/TestChromeMargin.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* This tests the margin parsing functionality in nsAttrValue.cpp, which
- * is accessible via nsContentUtils, and is used in setting chromemargins
+ * is accessible via nsIContentUtils, and is used in setting chromemargins
  * to widget windows. It's located here due to linking issues in the
  * content directory.
  */
@@ -61,6 +61,7 @@ template<class T> class nsReadingIterator;
 #endif
 
 #include "nscore.h"
+#include "nsIContentUtils.h"
 
 #ifndef MOZILLA_INTERNAL_API
 #undef nsString_h___
@@ -114,13 +115,19 @@ const DATA Data[] = {
 
 void DoAttrValueTest()
 {
+  nsCOMPtr<nsIContentUtils> utils =
+   do_GetService("@mozilla.org/content/contentutils;1");
+
+  if (!utils)
+    fail("No nsIContentUtils");
+
   int idx = -1;
   bool didFail = false;
   while (Data[++idx].margins) {
     nsAutoString str;
     str.AssignLiteral(Data[idx].margins);
     nsIntMargin values(99,99,99,99);
-    bool result = nsContentUtils::ParseIntMarginValue(str, values);
+    bool result = utils->ParseIntMarginValue(str, values);
 
     // if the parse fails
     if (!result) {
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 9d5f889aa67c..b6fc3983eec2 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -92,6 +92,7 @@
 #include "nsReadableUtils.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
+#include "nsIContentUtils.h"
 
 #include "nsWebShellWindow.h" // get rid of this one, too...
 
@@ -1391,8 +1392,10 @@ void nsXULWindow::SyncAttributesToWidget()
 
   // "chromemargin" attribute
   nsIntMargin margins;
+  nsCOMPtr<nsIContentUtils> cutils =
+    do_GetService("@mozilla.org/content/contentutils;1");
   rv = windowElement->GetAttribute(NS_LITERAL_STRING("chromemargin"), attr);
-  if (NS_SUCCEEDED(rv) && nsContentUtils::ParseIntMarginValue(attr, margins)) {
+  if (NS_SUCCEEDED(rv) && cutils && cutils->ParseIntMarginValue(attr, margins)) {
     mWindow->SetNonClientMargins(margins);
   }
 

From ead815faafd01c0da5290a29150af0074d0b28cd Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 18 Apr 2011 15:44:12 +0200
Subject: [PATCH 219/509] Fix for bug 649872  (Remove XPCONNECT_STANDALONE).
 r=mrbkap.

--HG--
extra : rebase_source : 1dff3dd06d1e1e0d93fba8be4c736d87ca574a1b
---
 config/config.mk                              |  4 -
 js/src/config/config.mk                       |  4 -
 js/src/xpconnect/idl/nsIXPConnect.idl         |  2 -
 .../xpconnect/loader/mozJSComponentLoader.cpp | 18 ----
 .../xpconnect/loader/mozJSComponentLoader.h   |  4 -
 .../loader/mozJSLoaderConstructors.h          | 63 --------------
 .../xpconnect/loader/mozJSSubScriptLoader.cpp |  4 -
 js/src/xpconnect/shell/xpcshell.cpp           | 19 -----
 js/src/xpconnect/src/nsXPConnect.cpp          | 12 ---
 js/src/xpconnect/src/xpccomponents.cpp        | 85 +++----------------
 js/src/xpconnect/src/xpcjsid.cpp              |  4 -
 js/src/xpconnect/src/xpcmodule.h              | 11 ++-
 js/src/xpconnect/src/xpcprivate.h             | 69 ++-------------
 js/src/xpconnect/src/xpcruntimesvc.cpp        |  9 +-
 js/src/xpconnect/src/xpcthreadcontext.cpp     | 10 ---
 js/src/xpconnect/src/xpcwrappedjsclass.cpp    |  5 --
 js/src/xpconnect/src/xpcwrappednative.cpp     |  2 -
 .../xpconnect/src/xpcwrappednativescope.cpp   | 10 +--
 .../tests/components/xpctest_echo.cpp         |  2 +-
 .../tests/components/xpctest_private.h        |  2 +-
 20 files changed, 35 insertions(+), 304 deletions(-)
 delete mode 100644 js/src/xpconnect/loader/mozJSLoaderConstructors.h

diff --git a/config/config.mk b/config/config.mk
index f6d0ad5ed449..f52607b39aa0 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -612,10 +612,6 @@ DEPENDENCIES	= .md
 
 MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
 
-ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
-DEFINES +=  -DXPCONNECT_STANDALONE
-endif
-
 ifeq ($(OS_ARCH),OS2)
 ELF_DYNSTR_GC	= echo
 else
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index f6d0ad5ed449..f52607b39aa0 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -612,10 +612,6 @@ DEPENDENCIES	= .md
 
 MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
 
-ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
-DEFINES +=  -DXPCONNECT_STANDALONE
-endif
-
 ifeq ($(OS_ARCH),OS2)
 ELF_DYNSTR_GC	= echo
 else
diff --git a/js/src/xpconnect/idl/nsIXPConnect.idl b/js/src/xpconnect/idl/nsIXPConnect.idl
index 20c13b9b158a..990856472f0c 100644
--- a/js/src/xpconnect/idl/nsIXPConnect.idl
+++ b/js/src/xpconnect/idl/nsIXPConnect.idl
@@ -785,7 +785,6 @@ interface nsIXPConnect : nsISupports
         [array, size_is(interfaceCount)] in nsIIDPtr interfaceArray);
 
 %{C++
-#ifndef XPCONNECT_STANDALONE
     /**
      * Get the object principal for this wrapper.  Note that this may well end
      * up being null; in that case one should seek principals elsewhere.  Null
@@ -794,7 +793,6 @@ interface nsIXPConnect : nsISupports
      */
     virtual nsIPrincipal* GetPrincipal(JSObject* obj,
                                        PRBool allowShortCircuit) const = 0;
-#endif
     virtual char* DebugPrintJSStack(PRBool showArgs,
                                     PRBool showLocals,
                                     PRBool showThisProps) = 0;
diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
index 28ab59f5c0f7..1689c9850e7d 100644
--- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@@ -66,13 +66,11 @@
 #include "nsIObserverService.h"
 #include "nsIXPCScriptable.h"
 #include "nsString.h"
-#ifndef XPCONNECT_STANDALONE
 #include "nsIScriptSecurityManager.h"
 #include "nsIURI.h"
 #include "nsIFileURL.h"
 #include "nsIJARURI.h"
 #include "nsNetUtil.h"
-#endif
 #include "jsxdrapi.h"
 #include "jscompartment.h"
 #include "jsprf.h"
@@ -517,7 +515,6 @@ mozJSComponentLoader::ReallyInit()
     // Limit C stack consumption to a reasonable 512K
     JS_SetNativeStackQuota(mContext, 512 * 1024);
 
-#ifndef XPCONNECT_STANDALONE
     nsCOMPtr<nsIScriptSecurityManager> secman = 
         do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
     if (!secman)
@@ -526,7 +523,6 @@ mozJSComponentLoader::ReallyInit()
     rv = secman->GetSystemPrincipal(getter_AddRefs(mSystemPrincipal));
     if (NS_FAILED(rv) || !mSystemPrincipal)
         return NS_ERROR_FAILURE;
-#endif
 
     if (!mModules.Init(32))
         return NS_ERROR_OUT_OF_MEMORY;
@@ -623,7 +619,6 @@ const mozilla::Module*
 mozJSComponentLoader::LoadModuleFromJAR(nsILocalFile *aJarFile,
                                         const nsACString &aComponentPath)
 {
-#if !defined(XPCONNECT_STANDALONE)
     nsresult rv;
 
     nsCAutoString fullSpec;
@@ -659,9 +654,6 @@ mozJSComponentLoader::LoadModuleFromJAR(nsILocalFile *aJarFile,
     return LoadModuleImpl(aJarFile,
                           hashstring,
                           uri);
-#else
-    return NS_ERROR_NOT_IMPLEMENTED;
-#endif
 }
 
 const mozilla::Module*
@@ -946,12 +938,10 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile,
     // preserve caller's compartment
     js::PreserveCompartment pc(cx);
     
-#ifndef XPCONNECT_STANDALONE
     rv = mSystemPrincipal->GetJSPrincipals(cx, &jsPrincipals);
     NS_ENSURE_SUCCESS(rv, rv);
 
     JSPrincipalsHolder princHolder(mContext, jsPrincipals);
-#endif
 
     nsCOMPtr<nsIXPCScriptable> backstagePass;
     rv = mRuntimeService->GetBackstagePass(getter_AddRefs(backstagePass));
@@ -1019,16 +1009,8 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponentFile,
     }
 
     nsCAutoString nativePath;
-    // Quick hack to unbust XPCONNECT_STANDALONE.
-    // This leaves the jsdebugger with a non-URL pathname in the 
-    // XPCONNECT_STANDALONE case - but at least it builds and runs otherwise.
-    // See: http://bugzilla.mozilla.org/show_bug.cgi?id=121438
-#ifdef XPCONNECT_STANDALONE
-    localFile->GetNativePath(nativePath);
-#else
     rv = aURI->GetSpec(nativePath);
     NS_ENSURE_SUCCESS(rv, rv);
-#endif
 
     // Expose the URI from which the script was imported through a special
     // variable that we insert into the JSM.
diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.h b/js/src/xpconnect/loader/mozJSComponentLoader.h
index eb3b34959566..9ced3dacd04e 100644
--- a/js/src/xpconnect/loader/mozJSComponentLoader.h
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.h
@@ -54,9 +54,7 @@
 #include "xpcIJSModuleLoader.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
-#ifndef XPCONNECT_STANDALONE
 #include "nsIPrincipal.h"
-#endif
 #ifdef MOZ_ENABLE_LIBXUL
 #include "mozilla/scache/StartupCache.h"
 
@@ -143,9 +141,7 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
     nsCOMPtr<nsIComponentManager> mCompMgr;
     nsCOMPtr<nsIJSRuntimeService> mRuntimeService;
     nsCOMPtr<nsIThreadJSContextStack> mContextStack;
-#ifndef XPCONNECT_STANDALONE
     nsCOMPtr<nsIPrincipal> mSystemPrincipal;
-#endif
     JSRuntime *mRuntime;
     JSContext *mContext;
 
diff --git a/js/src/xpconnect/loader/mozJSLoaderConstructors.h b/js/src/xpconnect/loader/mozJSLoaderConstructors.h
deleted file mode 100644
index 0d7db82350c0..000000000000
--- a/js/src/xpconnect/loader/mozJSLoaderConstructors.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributors:
- *   Mike Shaver <shaver@zeroknowledge.com>
- *   John Bandhauer <jband@netscape.com>
- *   IBM Corp.
- *   Robert Ginda <rginda@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef XPCONNECT_STANDALONE
-#define NO_SUBSCRIPT_LOADER
-#endif
-
-#if defined XPCONNECT_STANDALONE || !defined XPCONNECT_MODULE
-#include "mozilla/ModuleUtils.h"
-#include "nsICategoryManager.h"
-#include "mozJSComponentLoader.h"
-
-#ifndef NO_SUBSCRIPT_LOADER
-#include "mozJSSubScriptLoader.h"
-const char mozJSSubScriptLoadContractID[] = "@mozilla.org/moz/jssubscript-loader;1";
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader)
-
-#ifndef NO_SUBSCRIPT_LOADER
-NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader)
-#endif
-#endif
diff --git a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
index 3ff1a256a004..63e070ba229f 100644
--- a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -40,8 +40,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
-
 #include "mozJSSubScriptLoader.h"
 
 #include "nsIServiceManager.h"
@@ -412,5 +410,3 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * aURL
     JS_SetPendingException (cx, STRING_TO_JSVAL(errmsg));
     return NS_OK;
 }
-
-#endif /* NO_SUBSCRIPT_LOADER */
diff --git a/js/src/xpconnect/shell/xpcshell.cpp b/js/src/xpconnect/shell/xpcshell.cpp
index 7e72f441acbb..944b2a5e4b6e 100644
--- a/js/src/xpconnect/shell/xpcshell.cpp
+++ b/js/src/xpconnect/shell/xpcshell.cpp
@@ -89,10 +89,8 @@
 #include <unistd.h>
 #endif
 
-#ifndef XPCONNECT_STANDALONE
 #include "nsIScriptSecurityManager.h"
 #include "nsIPrincipal.h"
-#endif
 
 // all this crap is needed to do the interactive shell stuff
 #include <stdlib.h>
@@ -1318,37 +1316,27 @@ ProcessArgs(JSContext *cx, JSObject *obj, char **argv, int argc)
 /***************************************************************************/
 
 class FullTrustSecMan
-#ifndef XPCONNECT_STANDALONE
   : public nsIScriptSecurityManager
-#else
-  : public nsIXPCSecurityManager
-#endif
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIXPCSECURITYMANAGER
-#ifndef XPCONNECT_STANDALONE
   NS_DECL_NSISCRIPTSECURITYMANAGER
-#endif
 
   FullTrustSecMan();
   virtual ~FullTrustSecMan();
 
-#ifndef XPCONNECT_STANDALONE
   void SetSystemPrincipal(nsIPrincipal *aPrincipal) {
     mSystemPrincipal = aPrincipal;
   }
 
 private:
   nsCOMPtr<nsIPrincipal> mSystemPrincipal;
-#endif
 };
 
 NS_INTERFACE_MAP_BEGIN(FullTrustSecMan)
   NS_INTERFACE_MAP_ENTRY(nsIXPCSecurityManager)
-#ifndef XPCONNECT_STANDALONE
   NS_INTERFACE_MAP_ENTRY(nsIScriptSecurityManager)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPCSecurityManager)
 NS_INTERFACE_MAP_END
 
@@ -1357,9 +1345,7 @@ NS_IMPL_RELEASE(FullTrustSecMan)
 
 FullTrustSecMan::FullTrustSecMan()
 {
-#ifndef XPCONNECT_STANDALONE
   mSystemPrincipal = nsnull;
-#endif
 }
 
 FullTrustSecMan::~FullTrustSecMan()
@@ -1386,7 +1372,6 @@ FullTrustSecMan::CanGetService(JSContext * aJSContext, const nsCID & aCID)
     return NS_OK;
 }
 
-#ifndef XPCONNECT_STANDALONE
 /* void CanAccess (in PRUint32 aAction, in nsIXPCNativeCallContext aCallContext, in JSContextPtr aJSContext, in JSObjectPtr aJSObject, in nsISupports aObj, in nsIClassInfo aClassInfo, in jsval aName, inout voidPtr aPolicy); */
 NS_IMETHODIMP
 FullTrustSecMan::CanAccess(PRUint32 aAction,
@@ -1630,8 +1615,6 @@ FullTrustSecMan::GetCxSubjectPrincipalAndFrame(JSContext *cx, JSStackFrame **fp)
     return mSystemPrincipal;
 }
 
-#endif
-
 /***************************************************************************/
 
 // #define TEST_InitClassesWithNewWrappedGlobal
@@ -1880,7 +1863,6 @@ main(int argc, char **argv, char **envp)
         nsRefPtr<FullTrustSecMan> secman = new FullTrustSecMan();
         xpc->SetSecurityManagerForJSContext(cx, secman, 0xFFFF);
 
-#ifndef XPCONNECT_STANDALONE
         nsCOMPtr<nsIPrincipal> systemprincipal;
 
         // Fetch the system principal and store it away in a global, to use for
@@ -1906,7 +1888,6 @@ main(int argc, char **argv, char **envp)
                 fprintf(gErrFile, "+++ Failed to get ScriptSecurityManager service, running without principals");
             }
         }
-#endif
 
 #ifdef TEST_TranslateThis
         nsCOMPtr<nsIXPCFunctionThisTranslator>
diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp
index baa7247175f3..6d9e5d587746 100644
--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/src/xpconnect/src/nsXPConnect.cpp
@@ -2038,9 +2038,6 @@ NS_IMETHODIMP
 nsXPConnect::CreateSandbox(JSContext *cx, nsIPrincipal *principal,
                            nsIXPConnectJSObjectHolder **_retval)
 {
-#ifdef XPCONNECT_STANDALONE
-    return NS_ERROR_NOT_AVAILABLE;
-#else /* XPCONNECT_STANDALONE */
     XPCCallContext ccx(NATIVE_CALLER, cx);
     if(!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
@@ -2062,7 +2059,6 @@ nsXPConnect::CreateSandbox(JSContext *cx, nsIPrincipal *principal,
     }
 
     return rv;
-#endif /* XPCONNECT_STANDALONE */
 }
 
 NS_IMETHODIMP
@@ -2070,9 +2066,6 @@ nsXPConnect::EvalInSandboxObject(const nsAString& source, JSContext *cx,
                                  nsIXPConnectJSObjectHolder *sandbox,
                                  PRBool returnStringOnly, jsval *rval)
 {
-#ifdef XPCONNECT_STANDALONE
-    return NS_ERROR_NOT_AVAILABLE;
-#else /* XPCONNECT_STANDALONE */
     if (!sandbox)
         return NS_ERROR_INVALID_ARG;
 
@@ -2083,7 +2076,6 @@ nsXPConnect::EvalInSandboxObject(const nsAString& source, JSContext *cx,
     return xpc_EvalInSandbox(cx, obj, source,
                              NS_ConvertUTF16toUTF8(source).get(), 1,
                              JSVERSION_DEFAULT, returnStringOnly, rval);
-#endif /* XPCONNECT_STANDALONE */
 }
 
 /* void GetXPCWrappedNativeJSClassInfo(out JSEqualityOp equality); */
@@ -2436,7 +2428,6 @@ NS_IMETHODIMP
 nsXPConnect::GetBackstagePass(nsIXPCScriptable **bsp)
 {
     if(!mBackstagePass) {
-#ifndef XPCONNECT_STANDALONE
         nsCOMPtr<nsIPrincipal> sysprin;
         nsCOMPtr<nsIScriptSecurityManager> secman =
             do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
@@ -2446,9 +2437,6 @@ nsXPConnect::GetBackstagePass(nsIXPCScriptable **bsp)
             return NS_ERROR_NOT_AVAILABLE;
 
         mBackstagePass = new BackstagePass(sysprin);
-#else
-        mBackstagePass = new BackstagePass();
-#endif
         if(!mBackstagePass)
             return NS_ERROR_OUT_OF_MEMORY;
     }
diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp
index 5e789e74aa4d..f2ca3b237997 100644
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/src/xpconnect/src/xpccomponents.cpp
@@ -85,7 +85,6 @@ JSValIsInterfaceOfType(JSContext *cx, jsval v, REFNSIID iid)
     return JS_FALSE;
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 char* xpc_CloneAllAccess()
 {
     static const char allAccess[] = "AllAccess";
@@ -103,7 +102,6 @@ char * xpc_CheckAccessList(const PRUnichar* wideName, const char* list[])
 
     return nsnull;
 }
-#endif
 
 /***************************************************************************/
 
@@ -112,10 +110,7 @@ char * xpc_CheckAccessList(const PRUnichar* wideName, const char* list[])
 NS_IMETHODIMP
 nsXPCComponents_Interfaces::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-    ++count;
-#endif
+    const PRUint32 count = 3;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -133,9 +128,7 @@ nsXPCComponents_Interfaces::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 
     PUSH_IID(nsIScriptableInterfaces)
     PUSH_IID(nsIXPCScriptable)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     PUSH_IID(nsISecurityCheckedComponent)
-#endif
 #undef PUSH_IID
 
     return NS_OK;
@@ -233,9 +226,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPCComponents_Interfaces)
   NS_INTERFACE_MAP_ENTRY(nsIScriptableInterfaces)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
   NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
   NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptableInterfaces)
 NS_INTERFACE_MAP_END_THREADSAFE
 
@@ -379,7 +370,6 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper,
     return NS_OK;
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /* string canCreateWrapper (in nsIIDPtr iid); */
 NS_IMETHODIMP
 nsXPCComponents_Interfaces::CanCreateWrapper(const nsIID * iid, char **_retval)
@@ -415,7 +405,6 @@ nsXPCComponents_Interfaces::CanSetProperty(const nsIID * iid, const PRUnichar *p
     *_retval = nsnull;
     return NS_OK;
 }
-#endif
 
 /***************************************************************************/
 /***************************************************************************/
@@ -424,10 +413,8 @@ nsXPCComponents_Interfaces::CanSetProperty(const nsIID * iid, const PRUnichar *p
 class nsXPCComponents_InterfacesByID :
             public nsIScriptableInterfacesByID,
             public nsIXPCScriptable,
-            public nsIClassInfo
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-          , public nsISecurityCheckedComponent
-#endif
+            public nsIClassInfo,
+            public nsISecurityCheckedComponent
 {
 public:
     // all the interface method declarations...
@@ -435,9 +422,7 @@ public:
     NS_DECL_NSISCRIPTABLEINTERFACESBYID
     NS_DECL_NSIXPCSCRIPTABLE
     NS_DECL_NSICLASSINFO
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     NS_DECL_NSISECURITYCHECKEDCOMPONENT
-#endif
 
 public:
     nsXPCComponents_InterfacesByID();
@@ -453,10 +438,7 @@ private:
 NS_IMETHODIMP
 nsXPCComponents_InterfacesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-    ++count;
-#endif
+    const PRUint32 count = 3;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -474,9 +456,7 @@ nsXPCComponents_InterfacesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray
 
     PUSH_IID(nsIScriptableInterfacesByID)
     PUSH_IID(nsIXPCScriptable)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     PUSH_IID(nsISecurityCheckedComponent)
-#endif
 #undef PUSH_IID
 
     return NS_OK;
@@ -560,9 +540,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPCComponents_InterfacesByID)
   NS_INTERFACE_MAP_ENTRY(nsIScriptableInterfacesByID)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
   NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
   NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptableInterfacesByID)
 NS_INTERFACE_MAP_END_THREADSAFE
 
@@ -716,7 +694,6 @@ nsXPCComponents_InterfacesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
     return NS_OK;
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /* string canCreateWrapper (in nsIIDPtr iid); */
 NS_IMETHODIMP
 nsXPCComponents_InterfacesByID::CanCreateWrapper(const nsIID * iid, char **_retval)
@@ -752,7 +729,6 @@ nsXPCComponents_InterfacesByID::CanSetProperty(const nsIID * iid, const PRUnicha
     *_retval = nsnull;
     return NS_OK;
 }
-#endif
 
 /***************************************************************************/
 /***************************************************************************/
@@ -783,7 +759,7 @@ public:
 NS_IMETHODIMP 
 nsXPCComponents_Classes::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -1035,7 +1011,7 @@ public:
 NS_IMETHODIMP 
 nsXPCComponents_ClassesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -1306,7 +1282,7 @@ public:
 NS_IMETHODIMP 
 nsXPCComponents_Results::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -1535,7 +1511,7 @@ private:
 NS_IMETHODIMP 
 nsXPCComponents_ID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -1763,7 +1739,7 @@ private:
 NS_IMETHODIMP 
 nsXPCComponents_Exception::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -2058,7 +2034,7 @@ private:
 NS_IMETHODIMP 
 nsXPCConstructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -2324,7 +2300,7 @@ private:
 NS_IMETHODIMP 
 nsXPCComponents_Constructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -2659,18 +2635,14 @@ private:
 
 class nsXPCComponents_Utils :
             public nsIXPCComponents_Utils,
-            public nsIXPCScriptable
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-          , public nsISecurityCheckedComponent
-#endif
+            public nsIXPCScriptable,
+            public nsISecurityCheckedComponent
 {
 public:
     // all the interface method declarations...
     NS_DECL_ISUPPORTS
     NS_DECL_NSIXPCSCRIPTABLE
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     NS_DECL_NSISECURITYCHECKEDCOMPONENT
-#endif
     NS_DECL_NSIXPCCOMPONENTS_UTILS
 
 public:
@@ -2684,9 +2656,7 @@ private:
 NS_INTERFACE_MAP_BEGIN(nsXPCComponents_Utils)
   NS_INTERFACE_MAP_ENTRY(nsIXPCComponents_Utils)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
   NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPCComponents_Utils)
 NS_INTERFACE_MAP_END_THREADSAFE
 
@@ -2963,7 +2933,6 @@ nsXPCComponents_Utils::ReportError()
     return NS_OK;
 }
 
-#ifndef XPCONNECT_STANDALONE
 #include "nsIScriptSecurityManager.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
@@ -3125,8 +3094,6 @@ static JSFunctionSpec SandboxFunctions[] = {
     {nsnull,nsnull,0,0}
 };
 
-#endif /* !XPCONNECT_STANDALONE */
-
 /***************************************************************************/
 nsXPCComponents_utils_Sandbox::nsXPCComponents_utils_Sandbox()
 {
@@ -3153,8 +3120,6 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCComponents_utils_Sandbox)
 #define XPC_MAP_FLAGS               0
 #include "xpc_map_end.h" /* This #undef's the above. */
 
-#ifndef XPCONNECT_STANDALONE
-
 static bool
 WrapForSandbox(JSContext *cx, bool wantXrays, jsval *vp)
 {
@@ -3263,7 +3228,6 @@ xpc_CreateSandboxObject(JSContext * cx, jsval * vp, nsISupports *prinOrSop, JSOb
 
     return NS_OK;
 }
-#endif /* !XPCONNECT_STANDALONE */
 
 /* PRBool call(in nsIXPConnectWrappedNative wrapper,
                in JSContextPtr cx,
@@ -3310,9 +3274,6 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
                                                PRUint32 argc, jsval * argv,
                                                jsval * vp, PRBool *_retval)
 {
-#ifdef XPCONNECT_STANDALONE
-    return NS_ERROR_NOT_AVAILABLE;
-#else /* XPCONNECT_STANDALONE */
     if (argc < 1)
         return ThrowAndFail(NS_ERROR_XPC_NOT_ENOUGH_ARGS, cx, _retval);
 
@@ -3418,7 +3379,6 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
     *_retval = PR_TRUE;
 
     return rv;
-#endif /* XPCONNECT_STANDALONE */
 }
 
 class ContextHolder : public nsISupports
@@ -3486,9 +3446,6 @@ ContextHolder::ContextHolderOperationCallback(JSContext *cx)
 NS_IMETHODIMP
 nsXPCComponents_Utils::EvalInSandbox(const nsAString &source)
 {
-#ifdef XPCONNECT_STANDALONE
-    return NS_ERROR_NOT_AVAILABLE;
-#else /* XPCONNECT_STANDALONE */
     nsresult rv;
 
     nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
@@ -3578,10 +3535,8 @@ nsXPCComponents_Utils::EvalInSandbox(const nsAString &source)
         cc->SetReturnValueWasSet(PR_TRUE);
 
     return rv;
-#endif /* XPCONNECT_STANDALONE */
 }
 
-#ifndef XPCONNECT_STANDALONE
 nsresult
 xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source,
                   const char *filename, PRInt32 lineNo,
@@ -3756,7 +3711,6 @@ xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source,
 
     return rv;
 }
-#endif /* !XPCONNECT_STANDALONE */
 
 /* JSObject import (in AUTF8String registryLocation,
  *                  [optional] in JSObject targetObj);
@@ -3865,7 +3819,6 @@ nsXPCComponents_Utils::GetGlobalForObject()
   return NS_OK;
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /* string canCreateWrapper (in nsIIDPtr iid); */
 NS_IMETHODIMP
 nsXPCComponents_Utils::CanCreateWrapper(const nsIID * iid, char **_retval)
@@ -3900,7 +3853,6 @@ nsXPCComponents_Utils::CanSetProperty(const nsIID * iid, const PRUnichar *proper
     *_retval = nsnull;
     return NS_OK;
 }
-#endif
 
 /***************************************************************************/
 /***************************************************************************/
@@ -3913,9 +3865,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPCComponents)
   NS_INTERFACE_MAP_ENTRY(nsIXPCComponents)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
   NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
   NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPCComponents)
 NS_INTERFACE_MAP_END_THREADSAFE
 
@@ -3927,10 +3877,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsXPCComponents)
 NS_IMETHODIMP 
 nsXPCComponents::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 2;
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-    ++count;
-#endif
+    const PRUint32 count = 3;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -3948,9 +3895,7 @@ nsXPCComponents::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 
     PUSH_IID(nsIXPCComponents)
     PUSH_IID(nsIXPCScriptable)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     PUSH_IID(nsISecurityCheckedComponent)
-#endif
 #undef PUSH_IID
 
     return NS_OK;
@@ -4273,7 +4218,6 @@ NS_IMETHODIMP nsXPCComponents::ReportError()
     return utils->ReportError();
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /* string canCreateWrapper (in nsIIDPtr iid); */
 NS_IMETHODIMP
 nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval)
@@ -4309,4 +4253,3 @@ nsXPCComponents::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName
     *_retval = nsnull;
     return NS_OK;
 }
-#endif
diff --git a/js/src/xpconnect/src/xpcjsid.cpp b/js/src/xpconnect/src/xpcjsid.cpp
index 089780e7e340..c8aa61610bab 100644
--- a/js/src/xpconnect/src/xpcjsid.cpp
+++ b/js/src/xpconnect/src/xpcjsid.cpp
@@ -321,9 +321,7 @@ NS_INTERFACE_MAP_BEGIN(nsJSIID)
   NS_INTERFACE_MAP_ENTRY(nsIJSID)
   NS_INTERFACE_MAP_ENTRY(nsIJSIID)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
   NS_INTERFACE_MAP_ENTRY(nsISecurityCheckedComponent)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSID)
   NS_IMPL_QUERY_CLASSINFO(nsJSIID)
 NS_INTERFACE_MAP_END_THREADSAFE
@@ -560,7 +558,6 @@ nsJSIID::HasInstance(nsIXPConnectWrappedNative *wrapper,
     return rv;
 }
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /* string canCreateWrapper (in nsIIDPtr iid); */
 NS_IMETHODIMP
 nsJSIID::CanCreateWrapper(const nsIID * iid, char **_retval)
@@ -597,7 +594,6 @@ nsJSIID::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName, char *
     *_retval = nsnull;
     return NS_OK;
 }
-#endif
 
 /***************************************************************************/
 
diff --git a/js/src/xpconnect/src/xpcmodule.h b/js/src/xpconnect/src/xpcmodule.h
index c99f558b1609..62d356e134d8 100644
--- a/js/src/xpconnect/src/xpcmodule.h
+++ b/js/src/xpconnect/src/xpcmodule.h
@@ -39,7 +39,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "xpcprivate.h"
-#include "mozJSLoaderConstructors.h"
+#include "mozilla/ModuleUtils.h"
+#include "mozJSComponentLoader.h"
+#include "mozJSSubScriptLoader.h"
 
 /* Module implementation for the xpconnect library. */
 
@@ -52,6 +54,8 @@
     {0xfe4f7592, 0xc1fc, 0x4662,                                              \
       { 0xac, 0x83, 0x53, 0x88, 0x41, 0x31, 0x88, 0x3 } }
 
+#define MOZJSSUBSCRIPTLOADER_CONTRACTID "@mozilla.org/moz/jssubscript-loader;1"
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSID)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCException)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCJSContextStackIterator)
@@ -60,6 +64,9 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIXPConnect,
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptError)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCComponents_Interfaces)
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader)
+NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader)
+
 #ifdef XPC_IDISPATCH_SUPPORT
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIDispatchSupport,
                                          nsDispatchSupport::GetSingleton)
@@ -105,7 +112,7 @@ NS_DEFINE_NAMED_CID(NS_IDISPATCH_SUPPORT_CID);
   { NS_SCRIPTABLE_INTERFACES_CONTRACTID, &kSCRIPTABLE_INTERFACES_CID }, \
   { XPC_JSCONTEXT_STACK_ITERATOR_CONTRACTID, &kNS_XPC_JSCONTEXT_STACK_ITERATOR_CID }, \
   { MOZJSCOMPONENTLOADER_CONTRACTID, &kMOZJSCOMPONENTLOADER_CID }, \
-  { mozJSSubScriptLoadContractID, &kMOZ_JSSUBSCRIPTLOADER_CID }, \
+  { MOZJSSUBSCRIPTLOADER_CONTRACTID, &kMOZ_JSSUBSCRIPTLOADER_CID }, \
   XPCIDISPATCH_CONTRACTS
 
 #define XPCONNECT_CATEGORIES \
diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 216781151a9a..c4020e518134 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -124,15 +124,9 @@
 
 #include "nsIXPCScriptNotify.h"  // used to notify: ScriptEvaluated
 
-#ifndef XPCONNECT_STANDALONE
-#define XPC_USE_SECURITY_CHECKED_COMPONENT
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIPrincipal.h"
-#endif
-
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 #include "nsISecurityCheckedComponent.h"
-#endif
 
 #include "nsIThreadInternal.h"
 
@@ -571,12 +565,10 @@ public:
     // This returns the singleton nsCycleCollectionParticipant for JSContexts.
     static nsCycleCollectionParticipant *JSContextParticipant();
 
-#ifndef XPCONNECT_STANDALONE
     virtual nsIPrincipal* GetPrincipal(JSObject* obj,
                                        PRBool allowShortCircuit) const;
 
     void RecordTraversal(void *p, nsISupports *s);
-#endif
     virtual char* DebugPrintJSStack(PRBool showArgs,
                                     PRBool showLocals,
                                     PRBool showThisProps);
@@ -612,10 +604,8 @@ private:
 #endif
     nsAutoPtr<XPCCallContext> mCycleCollectionContext;
 
-#ifndef XPCONNECT_STANDALONE
     typedef nsBaseHashtable<nsVoidPtrHashKey, nsISupports*, nsISupports*> ScopeSet;
     ScopeSet mScopes;
-#endif
     nsCOMPtr<nsIXPCScriptable> mBackstagePass;
 
     static PRUint32 gReportAllJSExceptions;
@@ -1511,12 +1501,10 @@ public:
     JSObject*
     GetPrototypeNoHelper(XPCCallContext& ccx);
 
-#ifndef XPCONNECT_STANDALONE
     nsIPrincipal*
     GetPrincipal() const
     {return mScriptObjectPrincipal ?
          mScriptObjectPrincipal->GetPrincipal() : nsnull;}
-#endif
     
     JSObject*
     GetPrototypeJSFunction() const {return mPrototypeJSFunction;}
@@ -1619,14 +1607,12 @@ private:
 
     XPCContext*                      mContext;
 
-#ifndef XPCONNECT_STANDALONE
     // The script object principal instance corresponding to our current global
     // JS object.
     // XXXbz what happens if someone calls JS_SetPrivate on mGlobalJSObject.
     // How do we deal?  Do we need to?  I suspect this isn't worth worrying
     // about, since all of our scope objects are verified as not doing that.
     nsIScriptObjectPrincipal* mScriptObjectPrincipal;
-#endif
 };
 
 JSObject* xpc_CloneJSFunction(XPCCallContext &ccx, JSObject *funobj,
@@ -2451,9 +2437,7 @@ public:
     NS_CYCLE_COLLECTION_PARTICIPANT_INSTANCE
     NS_DECL_CYCLE_COLLECTION_UNMARK_PURPLE_STUB(XPCWrappedNative)
 
-#ifndef XPCONNECT_STANDALONE
     nsIPrincipal* GetObjectPrincipal() const;
-#endif
 
     JSBool
     IsValid() const {return nsnull != mFlatJSObject;}
@@ -3513,10 +3497,9 @@ protected:
 
 // nsJSIID
 
-class nsJSIID : public nsIJSIID, public nsIXPCScriptable
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-          , public nsISecurityCheckedComponent
-#endif
+class nsJSIID : public nsIJSIID,
+                public nsIXPCScriptable,
+                public nsISecurityCheckedComponent
 {
 public:
     NS_DECL_ISUPPORTS
@@ -3527,9 +3510,7 @@ public:
     // we implement the rest...
     NS_DECL_NSIJSIID
     NS_DECL_NSIXPCSCRIPTABLE
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     NS_DECL_NSISECURITYCHECKEDCOMPONENT
-#endif
 
     static nsJSIID* NewID(nsIInterfaceInfo* aInfo);
 
@@ -3787,7 +3768,6 @@ private:
 };
 
 /***************************************************************************/
-#ifndef XPCONNECT_STANDALONE
 #include "nsIScriptSecurityManager.h"
 
 class BackstagePass : public nsIScriptObjectPrincipal,
@@ -3814,24 +3794,6 @@ private:
   nsCOMPtr<nsIPrincipal> mPrincipal;
 };
 
-#else
-
-class BackstagePass : public nsIXPCScriptable, public nsIClassInfo
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCSCRIPTABLE
-  NS_DECL_NSICLASSINFO
-
-  BackstagePass()
-  {
-  }
-
-  virtual ~BackstagePass() { }
-};
-
-#endif
-
 class nsJSRuntimeServiceImpl : public nsIJSRuntimeService,
                                public nsSupportsWeakReference
 {
@@ -3860,20 +3822,15 @@ class nsJSRuntimeServiceImpl : public nsIJSRuntimeService,
 
 class nsXPCComponents : public nsIXPCComponents,
                         public nsIXPCScriptable,
-                        public nsIClassInfo
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-                      , public nsISecurityCheckedComponent
-#endif
+                        public nsIClassInfo,
+                        public nsISecurityCheckedComponent
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIXPCCOMPONENTS
     NS_DECL_NSIXPCSCRIPTABLE
     NS_DECL_NSICLASSINFO
-
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     NS_DECL_NSISECURITYCHECKEDCOMPONENT
-#endif
 
 public:
     static JSBool
@@ -3906,10 +3863,8 @@ private:
 class nsXPCComponents_Interfaces :
             public nsIScriptableInterfaces,
             public nsIXPCScriptable,
-            public nsIClassInfo
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
-          , public nsISecurityCheckedComponent
-#endif
+            public nsIClassInfo,
+            public nsISecurityCheckedComponent
 {
 public:
     // all the interface method declarations...
@@ -3917,9 +3872,7 @@ public:
     NS_DECL_NSISCRIPTABLEINTERFACES
     NS_DECL_NSIXPCSCRIPTABLE
     NS_DECL_NSICLASSINFO
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
     NS_DECL_NSISECURITYCHECKEDCOMPONENT
-#endif
 
 public:
     nsXPCComponents_Interfaces();
@@ -4267,7 +4220,6 @@ DEFINE_AUTO_MARKING_ARRAY_PTR_TYPE(AutoMarkingNativeInterfacePtrArrayPtr,
     AutoMarkingJSVal AUTO_MARK_JSVAL_HELPER(_automarker_,__LINE__)           \
     (ccx, &AUTO_MARK_JSVAL_HELPER(_val_,__LINE__))
 
-#ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
 /***************************************************************************/
 // Allocates a string that grants all access ("AllAccess")
 
@@ -4276,7 +4228,6 @@ extern char* xpc_CloneAllAccess();
 // Returns access if wideName is in list
 
 extern char * xpc_CheckAccessList(const PRUnichar* wideName, const char* list[]);
-#endif
 
 /***************************************************************************/
 // in xpcvariant.cpp...
@@ -4376,7 +4327,6 @@ public:
 };
 
 /***************************************************************************/
-#ifndef XPCONNECT_STANDALONE
 
 #define PRINCIPALHOLDER_IID \
 {0xbf109f49, 0xf94a, 0x43d8, {0x93, 0xdb, 0xe4, 0x66, 0x49, 0xc5, 0xd9, 0x7d}}
@@ -4402,8 +4352,6 @@ private:
 
 NS_DEFINE_STATIC_IID_ACCESSOR(PrincipalHolder, PRINCIPALHOLDER_IID)
 
-#endif /* !XPCONNECT_STANDALONE */
-
 /***************************************************************************/
 // Utilities
 
@@ -4414,8 +4362,6 @@ xpc_GetJSPrivate(JSObject *obj)
 }
 
 
-#ifndef XPCONNECT_STANDALONE
-
 // Helper for creating a sandbox object to use for evaluating
 // untrusted code completely separated from all other code in the
 // system using xpc_EvalInSandbox(). Takes the JSContext on which to
@@ -4443,7 +4389,6 @@ nsresult
 xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source,
                   const char *filename, PRInt32 lineNo,
                   JSVersion jsVersion, PRBool returnStringOnly, jsval *rval);
-#endif /* !XPCONNECT_STANDALONE */
 
 /***************************************************************************/
 // Inlined utilities.
diff --git a/js/src/xpconnect/src/xpcruntimesvc.cpp b/js/src/xpconnect/src/xpcruntimesvc.cpp
index f3c9bbdff1d9..b91e65545ba5 100644
--- a/js/src/xpconnect/src/xpcruntimesvc.cpp
+++ b/js/src/xpconnect/src/xpcruntimesvc.cpp
@@ -44,9 +44,7 @@
 NS_INTERFACE_MAP_BEGIN(BackstagePass)
   NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
   NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-#ifndef XPCONNECT_STANDALONE
   NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
-#endif
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXPCScriptable)
 NS_INTERFACE_MAP_END_THREADSAFE
 
@@ -86,10 +84,7 @@ BackstagePass::NewResolve(nsIXPConnectWrappedNative *wrapper,
 NS_IMETHODIMP 
 BackstagePass::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    PRUint32 count = 1;
-#ifndef XPCONNECT_STANDALONE
-    ++count;
-#endif
+    const PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
@@ -106,9 +101,7 @@ BackstagePass::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     array[index++] = clone;
 
     PUSH_IID(nsIXPCScriptable)
-#ifndef XPCONNECT_STANDALONE
     PUSH_IID(nsIScriptObjectPrincipal)
-#endif
 #undef PUSH_IID
 
     return NS_OK;
diff --git a/js/src/xpconnect/src/xpcthreadcontext.cpp b/js/src/xpconnect/src/xpcthreadcontext.cpp
index 9f25eb153b5b..398ac4855cdd 100644
--- a/js/src/xpconnect/src/xpcthreadcontext.cpp
+++ b/js/src/xpconnect/src/xpcthreadcontext.cpp
@@ -207,20 +207,14 @@ SafeGlobalResolve(JSContext *cx, JSObject *obj, jsid id)
 static void
 SafeFinalize(JSContext* cx, JSObject* obj)
 {
-#ifndef XPCONNECT_STANDALONE
     nsIScriptObjectPrincipal* sop =
         static_cast<nsIScriptObjectPrincipal*>(xpc_GetJSPrivate(obj));
     NS_IF_RELEASE(sop);
-#endif
 }
 
 static JSClass global_class = {
     "global_for_XPCJSContextStack_SafeJSContext",
-#ifndef XPCONNECT_STANDALONE
     JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_GLOBAL_FLAGS,
-#else
-    0,
-#endif
     JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, SafeGlobalResolve, JS_ConvertStub, SafeFinalize,
     JSCLASS_NO_OPTIONAL_MEMBERS
@@ -232,7 +226,6 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext)
 {
     if(!mSafeJSContext)
     {
-#ifndef XPCONNECT_STANDALONE
         // Start by getting the principal holder and principal for this
         // context.  If we can't manage that, don't bother with the rest.
         nsRefPtr<nsNullPrincipal> principal = new nsNullPrincipal();
@@ -248,7 +241,6 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext)
             *aSafeJSContext = nsnull;
             return NS_ERROR_FAILURE;
         }        
-#endif /* !XPCONNECT_STANDALONE */
         
         JSRuntime *rt;
         XPCJSRuntime* xpcrt;
@@ -275,7 +267,6 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext)
                 if(NS_FAILED(rv))
                     glob = nsnull;
 
-#ifndef XPCONNECT_STANDALONE
                 if(glob)
                 {
                     // Make sure the context is associated with a proper compartment
@@ -298,7 +289,6 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext)
                 // nsIScriptObjectPrincipal ownership is either handled by the
                 // nsCOMPtr or dealt with, or we'll release in the finalize
                 // hook.
-#endif
                 if(glob && NS_FAILED(xpc->InitClasses(mSafeJSContext, glob)))
                 {
                     glob = nsnull;
diff --git a/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
index a067120e761d..25d4fa366a94 100644
--- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -582,7 +582,6 @@ GetContextFromObject(JSObject *obj)
     return nsnull;
 }
 
-#ifndef XPCONNECT_STANDALONE
 class SameOriginCheckedComponent : public nsISecurityCheckedComponent
 {
 public:
@@ -641,8 +640,6 @@ SameOriginCheckedComponent::CanSetProperty(const nsIID * iid,
     return *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
-#endif
-
 NS_IMETHODIMP
 nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
                                              REFNSIID aIID,
@@ -744,7 +741,6 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
 
     // else we do the more expensive stuff...
 
-#ifndef XPCONNECT_STANDALONE
     // Before calling out, ensure that we're not about to claim to implement
     // nsISecurityCheckedComponent for an untrusted object. Doing so causes
     // problems. See bug 352882.
@@ -795,7 +791,6 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
             return NS_OK;
         }
     }
-#endif
 
     // check if the JSObject claims to implement this interface
     JSObject* jsobj = CallQueryInterfaceOnJSObject(ccx, self->GetJSObject(),
diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp
index 3ca2b61beab5..673ee348694c 100644
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -3170,7 +3170,6 @@ NS_IMETHODIMP XPCWrappedNative::GetJSObjectPrototype(JSObject * *aJSObjectProtot
     return NS_OK;
 }
 
-#ifndef XPCONNECT_STANDALONE
 nsIPrincipal*
 XPCWrappedNative::GetObjectPrincipal() const
 {
@@ -3182,7 +3181,6 @@ XPCWrappedNative::GetObjectPrincipal() const
 #endif
     return principal;
 }
-#endif
 
 /* readonly attribute nsIXPConnect XPConnect; */
 NS_IMETHODIMP XPCWrappedNative::GetXPConnect(nsIXPConnect * *aXPConnect)
diff --git a/js/src/xpconnect/src/xpcwrappednativescope.cpp b/js/src/xpconnect/src/xpcwrappednativescope.cpp
index 6629f4c42104..ea04a34d8e70 100644
--- a/js/src/xpconnect/src/xpcwrappednativescope.cpp
+++ b/js/src/xpconnect/src/xpcwrappednativescope.cpp
@@ -143,10 +143,8 @@ XPCWrappedNativeScope::XPCWrappedNativeScope(XPCCallContext& ccx,
         mGlobalJSObject(nsnull),
         mPrototypeJSObject(nsnull),
         mPrototypeJSFunction(nsnull),
-        mPrototypeNoHelper(nsnull)
-#ifndef XPCONNECT_STANDALONE
-        , mScriptObjectPrincipal(nsnull)
-#endif
+        mPrototypeNoHelper(nsnull),
+        mScriptObjectPrincipal(nsnull)
 {
     // add ourselves to the scopes list
     {   // scoped lock
@@ -236,7 +234,6 @@ XPCWrappedNativeScope::SetGlobal(XPCCallContext& ccx, JSObject* aGlobal)
     // nsXPConnect::InitClassesWithNewWrappedGlobal.
 
     mGlobalJSObject = aGlobal;
-#ifndef XPCONNECT_STANDALONE
     mScriptObjectPrincipal = nsnull;
     // Now init our script object principal, if the new global has one
 
@@ -260,7 +257,6 @@ XPCWrappedNativeScope::SetGlobal(XPCCallContext& ccx, JSObject* aGlobal)
         }
         mScriptObjectPrincipal = sop;
     }
-#endif
 
     // Lookup 'globalObject.Object.prototype' for our wrapper's proto
     {
@@ -452,9 +448,7 @@ XPCWrappedNativeScope::FinishedMarkPhaseOfGC(JSContext* cx, XPCJSRuntime* rt)
            JS_IsAboutToBeFinalized(cx, cur->mGlobalJSObject))
         {
             cur->mGlobalJSObject = nsnull;
-#ifndef XPCONNECT_STANDALONE
             cur->mScriptObjectPrincipal = nsnull;
-#endif
             // Move this scope from the live list to the dying list.
             if(prev)
                 prev->mNext = next;
diff --git a/js/src/xpconnect/tests/components/xpctest_echo.cpp b/js/src/xpconnect/tests/components/xpctest_echo.cpp
index 566c54e95ecf..b7c30343a560 100644
--- a/js/src/xpconnect/tests/components/xpctest_echo.cpp
+++ b/js/src/xpconnect/tests/components/xpctest_echo.cpp
@@ -42,7 +42,7 @@
 
 #include "xpctest_private.h"
 
-#if defined(WIN32) && !defined(XPCONNECT_STANDALONE)
+#ifdef WIN32
 #define IMPLEMENT_TIMER_STUFF 1
 #endif
 
diff --git a/js/src/xpconnect/tests/components/xpctest_private.h b/js/src/xpconnect/tests/components/xpctest_private.h
index cc4d5f4b08bb..310a39fa7fa7 100644
--- a/js/src/xpconnect/tests/components/xpctest_private.h
+++ b/js/src/xpconnect/tests/components/xpctest_private.h
@@ -59,7 +59,7 @@
 #include "xpctest.h"
 #include "jsapi.h"
 
-#if defined(WIN32) && !defined(XPCONNECT_STANDALONE)
+#ifdef WIN32
 #define IMPLEMENT_TIMER_STUFF 1
 #endif
 

From 1f852318086200bc21b7eed47695d01f88eb642c Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Mon, 18 Apr 2011 18:41:57 +0200
Subject: [PATCH 220/509] Bug 647414 - Distributed extensions should be
 automatically installed into temporary testing profile; (Av2) Improve
 addChromeToProfile() and related. r=jmaher.

---
 layout/tools/reftest/runreftest.py |  9 ++--
 testing/mochitest/runtests.py      | 87 +++++++++++++++---------------
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 62699d88ef91..a4c4feadfcf1 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -168,11 +168,14 @@ class RefTest(object):
     "Copy extra files or dirs specified on the command line to the testing profile."
     for f in options.extraProfileFiles:
       abspath = self.getFullPath(f)
-      dest = os.path.join(profileDir, os.path.basename(abspath))
-      if os.path.isdir(abspath):
+      if os.path.isfile(abspath):
+        shutil.copy2(abspath, profileDir)
+      elif os.path.isdir(abspath):
+        dest = os.path.join(profileDir, os.path.basename(abspath))
         shutil.copytree(abspath, dest)
       else:
-        shutil.copy(abspath, dest)
+        self.automation.log.warning("WARNING | runreftest.py | Failed to copy %s to profile", abspath)
+        continue
 
   def installExtensionsToProfile(self, options, profileDir):
     "Install the specified extensions on the command line to the testing profile."
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 69bab053fb37..3c4975c00ff6 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -351,9 +351,8 @@ class MochitestServer:
 
   def stop(self):
     try:
-      c = urllib2.urlopen(self.shutdownURL)
-      c.read()
-      c.close()
+      with urllib2.urlopen(self.shutdownURL) as c:
+        c.read()
 
       rtncode = self._process.poll()
       if rtncode is None:
@@ -681,17 +680,17 @@ class Mochitest(object):
          "logPath": logFile,
          "testPath": testPath}
 
-    config = open(os.path.join(options.profilePath, "testConfig.js"), "w")
-    config.write(content)
-    config.close() 
-
+    with open(os.path.join(options.profilePath, "testConfig.js"), "w") as config:
+      config.write(content)
 
   def addChromeToProfile(self, options):
     "Adds MochiKit chrome tests to the profile."
 
+    # Create (empty) chrome directory.
     chromedir = os.path.join(options.profilePath, "chrome")
     os.mkdir(chromedir)
 
+    # Write userChrome.css.
     chrome = """
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
 toolbar,
@@ -702,19 +701,27 @@ toolbar#nav-bar {
   background-image: none !important;
 }
 """
+    with open(os.path.join(options.profilePath, "userChrome.css"), "a") as chromeFile:
+      chromeFile.write(chrome)
 
-    # write userChrome.css
-    chromeFile = open(os.path.join(options.profilePath, "userChrome.css"), "a")
-    chromeFile.write(chrome)
-    chromeFile.close()
+    # Call copyTestsJarToProfile(), Write tests.manifest.
+    manifest = os.path.join(options.profilePath, "tests.manifest")
+    with open(manifest, "w") as manifestFile:
+      if self.copyTestsJarToProfile(options):
+        # Register tests.jar.
+        manifestFile.write("content mochitests jar:tests.jar!/content/\n");
+      else:
+        # Register chrome directory.
+        chrometestDir = os.path.abspath(".") + "/"
+        if self.automation.IS_WIN32:
+          chrometestDir = "file:///" + chrometestDir.replace("\\", "/")
+        manifestFile.write("content mochitests %s contentaccessible=yes\n" % chrometestDir)
 
-
-    # register our chrome dir
-    chrometestDir = os.path.abspath(".") + "/"
-    if self.automation.IS_WIN32:
-      chrometestDir = "file:///" + chrometestDir.replace("\\", "/")
-
-    manifest = os.path.join(options.profilePath, 'tests.manifest')
+    # Call installChromeJar().
+    jarDir = "mochijar"
+    if not os.path.isdir(os.path.join(self.SCRIPT_DIRECTORY, jarDir)):
+      self.automation.log.warning("TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension")
+      return None
 
     browser_chrome = ""
     if options.browserChrome:
@@ -726,48 +733,42 @@ overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-t
       #Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc
       browser_chrome += "overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul\n"
 
-    jarDir = 'mochijar'
-    if not os.path.exists(os.path.join(self.SCRIPT_DIRECTORY, jarDir)):
-      print "TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension"
-      return None
-
-    manifestFile = open(manifest, "w")
-    if self.installTestsJar(options):
-      manifestFile.write("content mochitests jar:tests.jar!/content/\n");
-    else:
-      manifestFile.write("content mochitests %s contentaccessible=yes\n" % chrometestDir)
-    manifestFile.close()
-
     self.installChromeJar(jarDir, browser_chrome, options)
+
     return manifest
 
   def installChromeJar(self, jarDirName, browser_chrome, options):
     """
       copy mochijar directory to profile as an extension so we have chrome://mochikit for all harness code
     """
-    jarDir = os.path.join(options.profilePath, 'extensions', 'mochikit@mozilla.org')
-    shutil.copytree(os.path.join(self.SCRIPT_DIRECTORY, jarDirName), jarDir)
-    with open(os.path.join(jarDir, "chrome.manifest"), 'a') as mfile:
+    self.automation.installExtension(os.path.join(self.SCRIPT_DIRECTORY, jarDirName), \
+                                     options.profilePath, "mochikit@mozilla.org")
+
+    # Write chrome.manifest.
+    with open(os.path.join(options.profilePath, "extensions", "mochikit@mozilla.org", "chrome.manifest"), "a") as mfile:
       mfile.write(browser_chrome)
 
-    return jarDir
-
-  def installTestsJar(self, options):
+  def copyTestsJarToProfile(self, options):
     """ copy tests.jar to the profile directory so we can auto register it in the .xul harness """
-    if os.path.exists(os.path.join(self.SCRIPT_DIRECTORY, 'tests.jar')):
-      shutil.copy(os.path.join(self.SCRIPT_DIRECTORY, 'tests.jar'), options.profilePath)
-      return True
-    return False
+    testsJarFile = os.path.join(self.SCRIPT_DIRECTORY, "tests.jar")
+    if not os.path.isfile(testsJarFile):
+      return False
+
+    shutil.copy2(testsJarFile, options.profilePath)
+    return True
 
   def copyExtraFilesToProfile(self, options):
     "Copy extra files or dirs specified on the command line to the testing profile."
     for f in options.extraProfileFiles:
       abspath = self.getFullPath(f)
-      dest = os.path.join(options.profilePath, os.path.basename(abspath))
-      if os.path.isdir(abspath):
+      if os.path.isfile(abspath):
+        shutil.copy2(abspath, options.profilePath)
+      elif os.path.isdir(abspath):
+        dest = os.path.join(options.profilePath, os.path.basename(abspath))
         shutil.copytree(abspath, dest)
       else:
-        shutil.copy(abspath, dest)
+        self.automation.log.warning("WARNING | runtests.py | Failed to copy %s to profile", abspath)
+        continue
 
   def installExtensionsToProfile(self, options):
     "Install the specified extensions on the command line to the testing profile."

From 0367a3c08372354043b804ef55069b7f22c25735 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Mon, 18 Apr 2011 18:48:23 +0200
Subject: [PATCH 221/509] Bug 647414 - Distributed extensions should be
 automatically installed into temporary testing profile; (Bv3) Make
 installExtensionsToProfile() automatically install application distributed
 extensions. r=jmaher.

---
 layout/tools/reftest/runreftest.py | 9 ++++++++-
 testing/mochitest/runtests.py      | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index a4c4feadfcf1..63e5122e1701 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -178,7 +178,14 @@ class RefTest(object):
         continue
 
   def installExtensionsToProfile(self, options, profileDir):
-    "Install the specified extensions on the command line to the testing profile."
+    "Install application distributed extensions and specified on the command line ones to testing profile."
+    # Install distributed extensions, if application has any.
+    distExtDir = os.path.join(options.app[ : options.app.rfind(os.sep)], "distribution", "extensions")
+    if os.path.isdir(distExtDir):
+      for f in os.listdir(distExtDir):
+        self.automation.installExtension(os.path.join(distExtDir, f), profileDir)
+
+    # Install custom extensions.
     for f in options.extensionsToInstall:
       self.automation.installExtension(self.getFullPath(f), profileDir)
 
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 3c4975c00ff6..c3ec528ebdef 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -771,7 +771,14 @@ overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-t
         continue
 
   def installExtensionsToProfile(self, options):
-    "Install the specified extensions on the command line to the testing profile."
+    "Install application distributed extensions and specified on the command line ones to testing profile."
+    # Install distributed extensions, if application has any.
+    distExtDir = os.path.join(options.app[ : options.app.rfind(os.sep)], "distribution", "extensions")
+    if os.path.isdir(distExtDir):
+      for f in os.listdir(distExtDir):
+        self.automation.installExtension(os.path.join(distExtDir, f), options.profilePath)
+
+    # Install custom extensions.
     for f in options.extensionsToInstall:
       self.automation.installExtension(self.getFullPath(f), options.profilePath)
 

From 76a71c68e8cb906109ed50a0dd5d56f027a7cd14 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Mon, 18 Apr 2011 18:50:04 +0200
Subject: [PATCH 222/509] Bug 647414 - Distributed extensions should be
 automatically installed into temporary testing profile; (Cv1) Add
 ipc-overlay.xul to SeaMonkey too. r=jmaher.

---
 testing/mochitest/runtests.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index c3ec528ebdef..c3a20a69305e 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -723,21 +723,26 @@ toolbar#nav-bar {
       self.automation.log.warning("TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension")
       return None
 
-    browser_chrome = ""
+    # Support Firefox (browser) and SeaMonkey (navigator).
+    chrome = ""
     if options.browserChrome:
-      browser_chrome = """overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
+      chrome += """
 overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul
+overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
 """
     elif (options.chrome == False) and (options.a11y == False):
       #only do the ipc-overlay.xul for mochitest-plain.  
       #Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc
-      browser_chrome += "overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul\n"
+      chrome += """
+overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul
+overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/ipc-overlay.xul
+"""
 
-    self.installChromeJar(jarDir, browser_chrome, options)
+    self.installChromeJar(jarDir, chrome, options)
 
     return manifest
 
-  def installChromeJar(self, jarDirName, browser_chrome, options):
+  def installChromeJar(self, jarDirName, chrome, options):
     """
       copy mochijar directory to profile as an extension so we have chrome://mochikit for all harness code
     """
@@ -746,7 +751,7 @@ overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-t
 
     # Write chrome.manifest.
     with open(os.path.join(options.profilePath, "extensions", "mochikit@mozilla.org", "chrome.manifest"), "a") as mfile:
-      mfile.write(browser_chrome)
+      mfile.write(chrome)
 
   def copyTestsJarToProfile(self, options):
     """ copy tests.jar to the profile directory so we can auto register it in the .xul harness """

From 482731d7c2cf78921c60cd024a1834d3b8fbdbc3 Mon Sep 17 00:00:00 2001
From: Bob Moss <bmoss@mozilla.com>
Date: Mon, 18 Apr 2011 11:55:24 -0700
Subject: [PATCH 223/509] Bug 650110 Update SUTAgent in m-c to 1.01, main agent
 update r=ctalbert

---
 build/mobile/sutagent/android/ASMozStub.java  |  109 +-
 .../sutagent/android/AndroidManifest.xml      |   24 +-
 build/mobile/sutagent/android/DoCommand.java  | 2072 +++++++++++------
 build/mobile/sutagent/android/Makefile.in     |    1 +
 build/mobile/sutagent/android/NtpMessage.java |  468 ++++
 build/mobile/sutagent/android/R.java          |    1 +
 .../sutagent/android/RedirOutputThread.java   |    7 +-
 .../sutagent/android/SUTAgentAndroid.java     |  285 +--
 .../sutagent/android/res/layout/main.xml      |    2 +
 .../sutagent/android/res/values/strings.xml   |    4 +
 10 files changed, 2100 insertions(+), 873 deletions(-)
 create mode 100644 build/mobile/sutagent/android/NtpMessage.java

diff --git a/build/mobile/sutagent/android/ASMozStub.java b/build/mobile/sutagent/android/ASMozStub.java
index ed522f833c9b..a20e2b5ad077 100755
--- a/build/mobile/sutagent/android/ASMozStub.java
+++ b/build/mobile/sutagent/android/ASMozStub.java
@@ -37,15 +37,21 @@
 
 package com.mozilla.SUTAgentAndroid.service;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.ServerSocket;
 import java.util.Timer;
 
+import com.mozilla.SUTAgentAndroid.R;
+
+import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
-// import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
+import android.util.Log;
+import android.view.Gravity;
 import android.widget.Toast;
 
 public class ASMozStub extends android.app.Service {
@@ -58,7 +64,20 @@ public class ASMozStub extends android.app.Service {
 	Thread monitor = null;
 	Timer timer = null;
 	
-	@Override
+	@SuppressWarnings("unchecked")
+	private static final Class[] mStartForegroundSignature = new Class[] {
+        int.class, Notification.class};
+	@SuppressWarnings("unchecked")
+	private static final Class[] mStopForegroundSignature = new Class[] {
+        boolean.class};
+	
+    private NotificationManager mNM;
+    private Method mStartForeground;
+    private Method mStopForeground;
+    private Object[] mStartForegroundArgs = new Object[2];
+    private Object[] mStopForegroundArgs = new Object[1];
+
+    @Override
 	public IBinder onBind(Intent intent)
 		{
 		return null;
@@ -67,7 +86,18 @@ public class ASMozStub extends android.app.Service {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		Toast.makeText(this, "Listener Service created...", Toast.LENGTH_LONG).show();
+		
+        mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+        try {
+            mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
+            mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
+        	}
+        catch (NoSuchMethodException e) {
+            // Running on an older platform.
+            mStartForeground = mStopForeground = null;
+        	}
+		
+        doToast("Listener Service created...");
 		}
 
 	public void onStart(Intent intent, int startId) {
@@ -77,14 +107,18 @@ public class ASMozStub extends android.app.Service {
 			cmdChnl = new ServerSocket(20701);
 			runCmdThrd = new RunCmdThread(cmdChnl, this, handler);
 			runCmdThrd.start();
-			Toast.makeText(this, "Command channel port 20701 ...", Toast.LENGTH_LONG).show();
+			doToast("Command channel port 20701 ...");
 			
 			dataChnl = new ServerSocket(20700);
 			runDataThrd = new RunDataThread(dataChnl, this);
 			runDataThrd.start();
-			Toast.makeText(this, "Data channel port 20700 ...", Toast.LENGTH_LONG).show();
+			doToast("Data channel port 20700 ...");
+			
+            Notification notification = new Notification();
+            startForegroundCompat(R.string.foreground_service_started, notification);
 			} 
 		catch (Exception e) {
+			doToast(e.toString());
 //			Toast.makeText(getApplication().getApplicationContext(), e.toString(), Toast.LENGTH_LONG).show();
 			}
 		
@@ -94,6 +128,7 @@ public class ASMozStub extends android.app.Service {
 	public void onDestroy()
 		{
 		super.onDestroy();
+		
 		if (runCmdThrd.isAlive())
 			{
 			runCmdThrd.StopListening();
@@ -107,7 +142,9 @@ public class ASMozStub extends android.app.Service {
 		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
 		notificationManager.cancel(1959);
 		
-		Toast.makeText(this, "Listener Service destroyed...", Toast.LENGTH_LONG).show();
+		stopForegroundCompat(R.string.foreground_service_started);
+		
+		doToast("Listener Service destroyed...");
 		
 		System.exit(0);
 		}
@@ -115,8 +152,64 @@ public class ASMozStub extends android.app.Service {
 	public void SendToDataChannel(String strToSend)
 		{
 		if (runDataThrd.isAlive())
-			{
 			runDataThrd.SendToDataChannel(strToSend);
-			}
 		}
+	
+	public void doToast(String sMsg) {
+		Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
+		toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
+		toast.show();
+	}
+	
+    /**
+     * This is a wrapper around the new startForeground method, using the older
+     * APIs if it is not available.
+     */
+    void startForegroundCompat(int id, Notification notification) {
+        // If we have the new startForeground API, then use it.
+        if (mStartForeground != null) {
+            mStartForegroundArgs[0] = Integer.valueOf(id);
+            mStartForegroundArgs[1] = notification;
+            try {
+                mStartForeground.invoke(this, mStartForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.
+        setForeground(true);
+        mNM.notify(id, notification);
+    }
+
+    /**
+     * This is a wrapper around the new stopForeground method, using the older
+     * APIs if it is not available.
+     */
+    void stopForegroundCompat(int id) {
+        // If we have the new stopForeground API, then use it.
+        if (mStopForeground != null) {
+            mStopForegroundArgs[0] = Boolean.TRUE;
+            try {
+                mStopForeground.invoke(this, mStopForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.  Note to cancel BEFORE changing the
+        // foreground state, since we could be killed at that point.
+        mNM.cancel(id);
+        setForeground(false);
+    }
 }
diff --git a/build/mobile/sutagent/android/AndroidManifest.xml b/build/mobile/sutagent/android/AndroidManifest.xml
index 658a3de8797e..6d2cab32c709 100644
--- a/build/mobile/sutagent/android/AndroidManifest.xml
+++ b/build/mobile/sutagent/android/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.mozilla.SUTAgentAndroid"
-      android:versionCode="1"
-      android:versionName="1.0" android:sharedUserId="org.mozilla.sharedID">
+      android:versionCode="1" android:versionName="1.01">
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
         <activity android:name=".SUTAgentAndroid"
                   android:screenOrientation="nosensor"
@@ -23,8 +22,7 @@
 			    <action android:name="com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE" />
 		    </intent-filter>
 	    </service>
-
-    </application>
+	</application>
     
     <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="8"/>
 
@@ -43,29 +41,17 @@
 <uses-permission android:name="android.permission.DEVICE_POWER"></uses-permission>
 <uses-permission android:name="android.permission.DISABLE_KEYGUARD"></uses-permission>
 <uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
-
 <uses-permission android:name="android.permission.WRITE_SETTINGS"></uses-permission>
 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"></uses-permission>
-
 <uses-permission android:name="android.permission.BLUETOOTH"></uses-permission>
-
 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"></uses-permission>
-
 <uses-permission android:name="android.permission.INSTALL_PACKAGES"></uses-permission>
-
-
-
-
 <uses-permission android:name="android.permission.STATUS_BAR"></uses-permission>
-
 <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
-
-
-
 <uses-permission android:name="android.permission.SET_TIME"></uses-permission>
-
-
-
 <uses-permission android:name="android.permission.SET_TIME_ZONE"></uses-permission>
 
+<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"></uses-permission>
+<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"></uses-permission>
+
 </manifest> 
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java
index 0f0ce68681ef..b4b42adfe2e5 100755
--- a/build/mobile/sutagent/android/DoCommand.java
+++ b/build/mobile/sutagent/android/DoCommand.java
@@ -51,7 +51,9 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.lang.reflect.Field;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -60,14 +62,12 @@ import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import java.util.Timer;
 import java.util.zip.Adler32;
 import java.util.zip.CheckedInputStream;
 import java.util.zip.CheckedOutputStream;
@@ -87,27 +87,35 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 
+import com.mozilla.SUTAgentAndroid.NtpMessage;
+import com.mozilla.SUTAgentAndroid.R;
 import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlarmManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Configuration;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Debug;
 import android.os.Environment;
 import android.os.StatFs;
 import android.os.SystemClock;
-import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.WindowManager;
@@ -124,8 +132,12 @@ public class DoCommand {
 	
 	String	currentDir = "/";
 	String	sErrorPrefix = "##AGENT-WARNING## ";
+	boolean bTraceOn = false;
 	
-	private final String prgVersion = "SUTAgentAndroid Version 0.87";
+	String ffxProvider = "org.mozilla.ffxcp";
+	String fenProvider = "org.mozilla.fencp";
+	
+	private final String prgVersion = "SUTAgentAndroid Version 1.01";
 	
 	public enum Command
 		{
@@ -156,10 +168,12 @@ public class DoCommand {
 		CWD ("cwd"),
 		MV ("mv"),
 		PUSH ("push"),
+		PULL ("pull"),
 		RM ("rm"),
 		PRUNE ("rmdr"),
 		MKDR ("mkdr"),
 		DIRWRITABLE ("dirw"),
+		ISDIR ("isdir"),
 		DEAD ("dead"),
 		MEMS ("mems"),
 		LS ("ls"),
@@ -179,9 +193,12 @@ public class DoCommand {
 		UPDT ("updt"),
 		UNINST ("uninst"),
 		TEST ("test"),
+		DBG ("dbg"),
+		TRACE ("trace"),
 		VER ("ver"),
 		TZGET ("tzget"),
 		TZSET ("tzset"),
+		ADB ("adb"),
 		UNKNOWN ("unknown");
 		
 		private final String theCmd;
@@ -209,13 +226,16 @@ public class DoCommand {
 		{
 		this.contextWrapper = service;
 		}
-	
+
 	public String processCommand(String theCmdLine, PrintWriter out, BufferedInputStream in, OutputStream cmdOut)
 		{
 		String 	strReturn = "";
 		Command	cCmd = null;
 		Command cSubCmd = null;
 		
+		if (bTraceOn)
+			((ASMozStub)this.contextWrapper).SendToDataChannel(theCmdLine);
+		
 		String [] Argv = parseCmdLine2(theCmdLine);
 		
 		int Argc = Argv.length;
@@ -224,6 +244,13 @@ public class DoCommand {
 		
 		switch(cCmd)
 			{
+			case TRACE:
+				if (Argc == 2)
+					bTraceOn = (Argv[1].equalsIgnoreCase("on") ? true : false);
+				else
+					strReturn = sErrorPrefix + "Wrong number of arguments for trace command!";
+				break;
+				
 			case VER:
 				strReturn = prgVersion;
 				break;
@@ -244,11 +271,14 @@ public class DoCommand {
 				break;
 				
 			case UPDT:
-				strReturn = StartUpdateOMatic(Argv[1], Argv[2]);
+				if (Argc >= 2)
+					strReturn = StrtUpdtOMatic(Argv[1], Argv[2], (Argc > 3 ? Argv[3] : null), (Argc > 4 ? Argv[4] : null));
+				else
+					strReturn = sErrorPrefix + "Wrong number of arguments for updt command!";
 				break;
 			
 			case SETTIME:
-				strReturn = SetSystemTime(Argv[1], Argv[2], cmdOut);
+				strReturn = SetSystemTime(Argv[1], (Argc > 2 ? Argv[2] : null), cmdOut);
 				break;
 			
 			case CWD:
@@ -279,6 +309,13 @@ public class DoCommand {
 					strReturn = sErrorPrefix + "Wrong number of arguments for getapproot command!";
 				break;
 				
+			case ISDIR:
+				if (Argc == 2)
+					strReturn = isDirectory(Argv[1]);
+				else
+					strReturn = sErrorPrefix + "Wrong number of arguments for isdir command!";
+				break;
+				
 			case TESTROOT:
 				strReturn = GetTestRoot();
 				break;
@@ -294,6 +331,34 @@ public class DoCommand {
 				strReturn = GetProcessInfo();
 				break;
 				
+			case PULL:
+				if (Argc >= 2) {
+					long lOff = 0;
+					long lLen = -1;
+					if (Argc > 2) {
+					    try {
+					    	lOff = Long.parseLong(Argv[2].trim());
+					    	System.out.println("offset = " + lOff);
+					    } catch (NumberFormatException nfe) {
+					    	lOff = 0;
+					    	System.out.println("NumberFormatException: " + nfe.getMessage());
+					    }
+					}
+					if (Argc == 4) {
+					    try {
+					    	lLen = Long.parseLong(Argv[3].trim());
+					    	System.out.println("length = " + lLen);
+					    } catch (NumberFormatException nfe) {
+					    	lLen = -1;
+					    	System.out.println("NumberFormatException: " + nfe.getMessage());
+					    }
+					}
+					strReturn = Pull(Argv[1], lOff, lLen, cmdOut);
+				} else {
+					strReturn = sErrorPrefix + "Wrong number of arguments for pull command!";
+				}
+				break;
+				
 			case PUSH:
 				if (Argc == 3)
 					{
@@ -329,11 +394,20 @@ public class DoCommand {
 				break;
 				
 			case ALRT:
-				if (Argc == 2)
+				if (Argc > 1)
 					{
 					if (Argv[1].contentEquals("on"))
 						{
-						StartAlert();
+						String sTitle = "Agent Alert";
+						String sMsg = "The Agent Alert System has been activated!";
+						if (Argc == 3) {
+							sTitle = Argv[2];
+							sMsg = "";
+						} else if (Argc == 4) {
+							sTitle = Argv[2];
+							sMsg = Argv[3];
+						}
+						StartAlert(sTitle, sMsg);
 						}
 					else
 						{
@@ -347,7 +421,11 @@ public class DoCommand {
 				break;
 				
 			case REBT:
-				RunReboot(cmdOut);
+				if (Argc >= 1)
+					strReturn = RunReboot(cmdOut, (Argc > 1 ? Argv[1] : null), (Argc > 2 ? Argv[2] : null));
+				else
+					strReturn = sErrorPrefix + "Wrong number of arguments for rebt command!";
+//				RunReboot(cmdOut);
 				break;
 				
 			case TMPD:
@@ -483,7 +561,7 @@ public class DoCommand {
 				if (Argc == 2)
 					strReturn = RemoveFile(Argv[1]);
 				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for mkdr command!";
+					strReturn = sErrorPrefix + "Wrong number of arguments for rm command!";
 				break;
 				
 			case MV:
@@ -505,183 +583,106 @@ public class DoCommand {
 				strReturn = Argv[0];
 				break;
 				
-			case TEST:
-//				boolean bRet = false;
-/*				
-				Configuration userConfig = new Configuration();
-				Settings.System.getConfiguration( contextWrapper.getContentResolver(), userConfig );
-				Calendar cal = Calendar.getInstance( userConfig.locale);
-				TimeZone ctz = cal.getTimeZone();
-				String sctzLongName = ctz.getDisplayName();
-				String pstzName = TimeZone.getDefault().getDisplayName();
-*/
-				String sTimeZoneName = GetTimeZone();
-				
-				TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
-				TimeZone tz2 = TimeZone.getTimeZone("GMT-08:00");
-				int	nOffset = (-8 * 3600000);
-				String [] zoneNames = TimeZone.getAvailableIDs(nOffset);
-				int nNumMatches = zoneNames.length;
-				TimeZone.setDefault(tz);
-				
-				String sOldTZ = System.setProperty("persist.sys.timezone", "America/Los_Angeles");
-				
-/*				
-				byte[] buffer = new byte [4096];
-				int	nRead = 0;
-				long lTotalRead = 0;
-
-				Context ctx = SUTAgentAndroid.me.getApplicationContext();
-
-				FTPClient ftp = new FTPClient();
-				try 
-					{
-					String strRet = "";
-					int	reply = 0;
-					FileOutputStream outStream = null;
-					
-					ftp.connect("ftp.mozilla.org");
-					strRet = ftp.getReplyString();
-					reply = ftp.getReplyCode();
-					
-				    if(!FTPReply.isPositiveCompletion(reply))
-				    	{
-				        ftp.disconnect();
-				        System.err.println("FTP server refused connection.");
-				        System.exit(1);
-				        }
-				    // transfer files
-				    
-				    ftp.login("anonymous", "b@t.com");
-					strRet = ftp.getReplyString();
-					reply = ftp.getReplyCode();
-					
-				    if(!FTPReply.isPositiveCompletion(reply))
-				    	{
-				        ftp.disconnect();
-				        System.err.println("FTP server refused connection.");
-				        System.exit(1);
-				        }
-				    
-				    ftp.enterLocalPassiveMode();
-				    
-				    if (ftp.setFileType(FTP.BINARY_FILE_TYPE))
-				    	{
-				    	File root = Environment.getExternalStorageDirectory();
-				    	if (root.canWrite())
-				    		{
-				    		File outFile = new File(root, "firefox-3.6b4.cab");
-				    		outStream = new FileOutputStream(outFile);
-				    		}
-				    	else
-				    		outStream = ctx.openFileOutput("firefox-3.6b4.cab", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
-//				    	outStream = new FileOutputStream("/sdcard/firefox-3.6b4.cab");
-				    	InputStream ftpIn = ftp.retrieveFileStream("pub/mozilla.org/firefox/releases/3.6b4/wince-arm/en-US/firefox-3.6b4.cab");
-						while ((nRead = ftpIn.read(buffer)) != -1)
-							{
-							lTotalRead += nRead;
-							outStream.write(buffer, 0, nRead);
-							strRet = "\r" + lTotalRead + " bytes received";
-							cmdOut.write(strRet.getBytes());
-							cmdOut.flush();
-							}
-						
-						ftpIn.close();
-						boolean bRet = ftp.completePendingCommand();
-						outStream.flush();
-
-				    	/*				    	
-				    	if (ftp.retrieveFile("pub/mozilla.org/firefox/releases/3.6b4/wince-arm/en-US/firefox-3.6b4.cab", outStream))
-				    		{
-				    		outStream.flush();
-				    		}
-				    	 * /				    		
-			    		outStream.close();
-						strRet = ftp.getReplyString();
-						reply = ftp.getReplyCode();
-				    	}
-					strRet = ftp.getReplyString();
-					reply = ftp.getReplyCode();
-				    ftp.logout();
-				    
-				    strReturn = "\r\n" + strRet; 
-					}
-				catch (SocketException e)
-					{
-					// TODO Auto-generated catch block
-					strReturn = e.getMessage();
-					e.printStackTrace();
-					}
-				catch (IOException e)
-					{
-					// TODO Auto-generated catch block
-					strReturn = e.getMessage();
-					e.printStackTrace();
-					}
-*/				
-//				strReturn = InstallApplication();
-//				strReturn = InstallApp(Argv[1], cmdOut);
-				
-//				strReturn = UninstallApplication();
-//				String sPingCheck = SendPing("www.mozilla.org",null);
-//				if (sPingCheck.contains("3 received"))
-//					strReturn = sPingCheck;
-//				RunReboot(cmdOut);
-/*
-				try 
-					{
-					FileOutputStream outFile = ctx.openFileOutput("test.txt", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
-					OutputStreamWriter outS = new OutputStreamWriter(outFile);
-					outS.write("Hello world 1" + lineSep);
-					outS.write("Hello world 2" + lineSep);
-					outS.write("Hello world 3" + lineSep);
-					outS.write("Hello world 4" + lineSep);
-					outS.flush();
-					outS.close();
-					
-					String [] files = ctx.fileList();
-					File aFile   = ctx.getFilesDir();
-					String aPath = aFile.getCanonicalPath();
-					String hold = aFile.getName();
-					
-					strReturn = PrintDir(aPath);
-					strReturn += "\r\n";
-					
-					String src = aPath + "/test.txt";
-					String dst = aPath + "/test2.txt";
-					strReturn += CopyFile(src, dst);
-					strReturn += "\r\n";
-					
-					strReturn += PrintDir(aPath);
-					strReturn += "\r\n";
-					
-					dst = aPath + "/test3.txt";
-					strReturn += Move(src, dst);
-					strReturn += "\r\n";
-					
-					strReturn += PrintDir(aPath);
-					strReturn += "\r\n";
-
-					src = aPath + "/test2.txt";
-					strReturn += RemoveFile(src);
-					strReturn += "\r\n";
-					strReturn += RemoveFile(dst);
-					strReturn += "\r\n";
-					strReturn += PrintDir(aPath);
-					}
-				catch (FileNotFoundException e)
-					{
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-					} 
-				catch (IOException e) 
-					{
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-					}
-*/
+			case DBG:
+		        Debug.waitForDebugger();
+		        strReturn = "waitForDebugger on";
 				break;
 				
+			case ADB:
+				if (Argc == 2) {
+					if (Argv[1].contains("ip") || Argv[1].contains("usb")) {
+						strReturn = SetADB(Argv[1]);
+					} else {
+						strReturn = sErrorPrefix + "Unrecognized argument for adb command!";
+					}
+				} else {
+					strReturn = sErrorPrefix + "Wrong number of arguments for adb command!";
+				}
+				break;
+				
+			case TEST:
+				long lFreeMemory = Runtime.getRuntime().freeMemory();
+				long lTotMemory = Runtime.getRuntime().totalMemory();
+				long lMaxMemory = Runtime.getRuntime().maxMemory();
+				
+				
+				if (lFreeMemory > 0) {
+					strReturn = "Max memory: " + lMaxMemory + "\nTotal Memory: " + lTotMemory + "\nFree memory: " + lFreeMemory;
+					break;
+				}
+				
+				ContentResolver cr = contextWrapper.getContentResolver();
+				Uri ffxFiles = null;
+				
+				if (Argv[1].contains("fennec")) {
+					ffxFiles = Uri.parse("content://" + fenProvider + "/dir");
+				} else if (Argv[1].contains("firefox")) {
+					ffxFiles = Uri.parse("content://" + ffxProvider + "/dir");
+				}
+					
+//				Uri ffxFiles = Uri.parse("content://org.mozilla.fencp/file");
+				String[] columns = new String[] {
+						"_id",
+						"isdir",
+						"filename",
+						"length"
+                    };
+//				String[] columns = new String[] {
+//						"_id",
+//						"chunk"
+//                     };
+				Cursor myCursor = cr.query(	ffxFiles,
+											columns, 						// Which columns to return 
+											(Argc > 1 ? Argv[1] : null),    // Which rows to return (all rows)
+                        					null,       					// Selection arguments (none)
+                        					null);							// Put the results in ascending order by name
+/*
+				if (myCursor != null) {
+					int nRows = myCursor.getCount();
+					String [] colNames = myCursor.getColumnNames();
+					int	nID = 0;
+					int nBytesRecvd = 0;
+				
+					for (int lcv = 0; lcv < nRows; lcv++) {
+						if  (myCursor.moveToPosition(lcv)) {
+							nID = myCursor.getInt(0);
+							byte [] buf = myCursor.getBlob(1);
+							if (buf != null) {
+								nBytesRecvd += buf.length;
+								strReturn += new String(buf);
+								buf = null;
+							}
+						}
+					}
+					strReturn += "[eof - " + nBytesRecvd + "]";
+					myCursor.close();
+				}
+
+*/
+				if (myCursor != null)
+					{
+					int nRows = myCursor.getCount();
+					int	nID = 0;
+					String sFileName = "";
+					long lFileSize = 0;
+					boolean bIsDir = false;
+					
+					for (int lcv = 0; lcv < nRows; lcv++)
+						{
+						if  (myCursor.moveToPosition(lcv))
+							{
+							nID = myCursor.getInt(0);
+							bIsDir = (myCursor.getInt(1) == 1 ? true : false);
+							sFileName = myCursor.getString(2);
+							lFileSize = myCursor.getLong(3);
+							strReturn += "" + nID + "\t" + (bIsDir ? "<dir> " : "      ") + sFileName + "\t" + lFileSize + "\n";
+							}
+						}
+					myCursor.close();
+					} 
+				break;
+				
+			case EXEC:
 			case ENVRUN:
 				if (Argc >= 2)
 					{
@@ -700,7 +701,6 @@ public class DoCommand {
 					}
 				break;
 				
-			case EXEC:
 			case RUN:
 				if (Argc >= 2)
 					{
@@ -714,7 +714,7 @@ public class DoCommand {
 					if (Argv[1].contains("/") || Argv[1].contains("\\") || !Argv[1].contains("."))
 						strReturn = StartPrg(theArgs, cmdOut);
 					else
-						strReturn = StartJavaPrg(theArgs);
+						strReturn = StartJavaPrg(theArgs, null);
 					}
 				else
 					{
@@ -724,8 +724,6 @@ public class DoCommand {
 
 			case KILL:
 				if (Argc == 2)
-//					strReturn = NewKillProc(Argv[1], Argv[2], cmdOut);
-//					strReturn = NewKillProc(Argv[1], cmdOut);
 					strReturn = KillProcess(Argv[1], cmdOut);
 				else
 					strReturn = sErrorPrefix + "Wrong number of arguments for kill command!";
@@ -763,116 +761,45 @@ public class DoCommand {
 		
 		return(strReturn);
 		}
-/*
-	class AlertLooperThread extends Thread
-		{
-	    public Handler mHandler;
-	    private Looper looper = null;
-	    private DoAlert da	= null;
-	    
-	    public void term()
-	    	{
-	    	if (da != null)
-	    		da.term();
-	    	}
-	    
-	    public void quit()
-	    	{
-	    	if (looper != null)
-	    		looper.quit();
-	    	}
-	    
-	    public void run()
-	    	{
-	        Looper.prepare();
-	        
-	        looper = Looper.myLooper();
-	          
-	        mHandler = new Handler()
-	        	{
-	            public void handleMessage(Message msg)
-	            	{
-	                  // process incoming messages here
-	            	}
-	        	};
-	          
-			alertTimer = new Timer();
-			da = new DoAlert();
-    		alertTimer.scheduleAtFixedRate(da, 0, 5000);
-    		Looper.loop();
-	    	}
-		}
+
+	private void SendNotification(String tickerText, String expandedText) {
+		NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
+		int icon = R.drawable.ateamlogo;
+		long when = System.currentTimeMillis();
 	
-	class DoAlert extends TimerTask
-		{
-		int	lcv = 0;
-		Toast toast = null;
-		Ringtone rt = null;
-		
-		DoAlert()
-			{
-			Context	ctx = SUTAgentAndroid.me.getApplication().getApplicationContext();
-			this.toast = Toast.makeText(ctx, "Help me!", Toast.LENGTH_LONG);
-			rt = RingtoneManager.getRingtone(ctx, RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM));
-			}
-		
-		public void term()
-			{
-			if (rt != null)
-				{
-				if (rt.isPlaying())
-					rt.stop();
-				}
+		Notification notification = new Notification(icon, tickerText, when);
+	
+		notification.flags |= (Notification.FLAG_INSISTENT | Notification.FLAG_AUTO_CANCEL);
+		notification.defaults |= Notification.DEFAULT_SOUND;
+		notification.defaults |= Notification.DEFAULT_VIBRATE;
+		notification.defaults |= Notification.DEFAULT_LIGHTS;
+	
+		Context context = contextWrapper.getApplicationContext();
+	
+		// Intent to launch an activity when the extended text is clicked
+		Intent intent2 = new Intent(contextWrapper, SUTAgentAndroid.class);
+		PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent2, 0);
+	
+		notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
 			
-			if (toast != null)
-				toast.cancel();
-			}
-	
-		public void run ()
-			{
-			String sText =(((lcv++ % 2) == 0)  ? "Help me!" : "I've fallen down!" );
-			toast.setText(sText);
-			toast.show();
-			if (rt != null)
-				rt.play();
-			}
-		}
-*/
-	public void StartAlert()
+		notificationManager.notify(1959, notification);
+	}
+
+private void CancelNotification()
+	{
+	NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
+	notificationManager.cancel(1959);
+	}
+
+	public void StartAlert(String sTitle, String sMsg)
 		{
 		// start the alert message
-		alrt = new AlertLooperThread(this.contextWrapper);
-		alrt.start();
+		SendNotification(sTitle, sMsg);
 		}
 
 	public void StopAlert()
 		{
-		if (alrt == null)
-			return;
-		
-		Timer alertTimer = alrt.getAlertTimer();
-		// stop the alert message
-		if (alertTimer != null)
-			{
-			// Kill the timer
-			alertTimer.cancel();
-			alertTimer.purge();
-			alertTimer = null;
-			// Clear any messages either queued or on screen
-			alrt.term();
-			// Give the messages a chance to be processed
-			try {
-				Thread.sleep(1000);
-				}
-			catch (InterruptedException e)
-				{
-				e.printStackTrace();
-				}
-			// Kill the thread
-			alrt.quit();
-			alrt = null;
-			System.gc();
-			}
+		CancelNotification();
 		}
 
 	public String [] parseCmdLine2(String theCmdLine)
@@ -1070,6 +997,7 @@ public class DoCommand {
 			else // no quote so find the next space
 				{
 				nEnd = workingString.indexOf(' ', nStart);
+				
 				// there isn't one of those
 				if (nEnd == -1)
 					nEnd = nLength;	// Just grab the rest of the cmdline
@@ -1081,10 +1009,6 @@ public class DoCommand {
 			// add it to the list
 			lst.add(new String(workingString2));
 			
-			// if we are dealing with a quote
-//			if (nStart > 0)
-//				nEnd++; //  point past the end one
-			
 			// jump past the substring and trim it
 			workingString = (workingString.substring(nEnd)).trim();
 			}
@@ -1353,7 +1277,7 @@ public class DoCommand {
 	
 	public String GetAppRoot(String AppName)
 		{
-		String sRet = "";
+		String sRet = sErrorPrefix + " internal error [no context]";
 		Context ctx = contextWrapper.getApplicationContext();
 		
 		if (ctx != null)
@@ -1374,26 +1298,127 @@ public class DoCommand {
 			}
 		return(sRet);
 		}
+	
+	public String isDirectory(String sDir)
+		{
+		String	sRet = sErrorPrefix + sDir + " does not exist";
+		String	tmpDir	= fixFileName(sDir);
+		String [] theArgs = new String [3];
+		int	nFiles = 0;
+		
+		if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			
+			String[] columns = new String[] {
+					"_id",
+					"isdir",
+					"filename",
+					"length"
+                };
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 	// Which columns to return 
+										tmpDir,     // Which rows to return (all rows)
+                    					null,       // Selection arguments (none)
+                    					null);		// Order clause (none)
+			if (myCursor != null) {
+				nFiles = myCursor.getCount();
+				
+				// If no entries the dir is empty
+				if (nFiles > 0) {
+					if  (myCursor.moveToPosition(0)) {
+						sRet = ((myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) ? "TRUE" : "FALSE");
+					}
+				}
+				myCursor.close();
+			} 
+		} else {
+			File tmpFile = new java.io.File(tmpDir);
+		
+			if (tmpFile.exists()) {
+				sRet = (tmpFile.isDirectory() ? "TRUE" : "FALSE");
+			}
+			else {
+				try {
+					theArgs[0] = "su";
+					theArgs[1] = "-c";
+					theArgs[2] = "ls -l " + sDir;
+				
+					pProc = Runtime.getRuntime().exec(theArgs);
+					RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+					outThrd.start();
+					outThrd.join(5000);
+					sRet = outThrd.strOutput;
+					if (!sRet.contains("No such file or directory") && sRet.startsWith("l"))
+						sRet = "FALSE";
+				}
+				catch (IOException e) {
+					sRet = e.getMessage();
+					e.printStackTrace();
+				} 
+				catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		
+		return(sRet);
+		}
+
 
 	public String changeDir(String newDir)
 		{
 		String	tmpDir	= fixFileName(newDir);
 		String	sRet = sErrorPrefix + "Couldn't change directory to " + tmpDir;
+		int	nFiles = 0;
 		
-		File tmpFile = new java.io.File(tmpDir);
-		
-		if (tmpFile.exists())
-			{
-			try {
-				currentDir = tmpFile.getCanonicalPath();
-				sRet = "";
+		if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			
+			String[] columns = new String[] {
+					"_id",
+					"isdir",
+					"filename"
+                };
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 	// Which columns to return 
+										tmpDir,     // Which rows to return (all rows)
+                    					null,       // Selection arguments (none)
+                    					null);		// Order clause (none)
+			if (myCursor != null) {
+				nFiles = myCursor.getCount();
+				
+				if (nFiles > 0) {
+					if  (myCursor.moveToPosition(0)) {
+						if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
+							currentDir = myCursor.getString(myCursor.getColumnIndex("filename"));
+							sRet = "";
+						}
+					}
+				} else {
+					sRet = sErrorPrefix + tmpDir + " is not a valid directory";
 				}
-			catch (IOException e)
-				{
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				myCursor.close();
+			}
+		} else {
+			File tmpFile = new java.io.File(tmpDir);
+		
+			if (tmpFile.exists()) {
+				try {
+					if (tmpFile.isDirectory()) {
+						currentDir = tmpFile.getCanonicalPath();
+						sRet = "";
+					}
+				else
+					sRet = sErrorPrefix + tmpDir + " is not a valid directory";
+				} catch (IOException e) {
+					e.printStackTrace();
 				}
 			}
+		}
 		
 		return(sRet);
 		}
@@ -1432,40 +1457,83 @@ public class DoCommand {
 			e.printStackTrace();
 			}
 		
-		try {
-			FileInputStream srcFile  = new FileInputStream(sTmpFileName);
-			while((nRead = srcFile.read(buffer)) != -1)
-				{
-				digest.update(buffer, 0, nRead);
-				lTotalRead += nRead;
-				}
-			srcFile.close();
-			byte [] hash = digest.digest();
+		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = null;
 			
-			sRet = getHex(hash);
+			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			
+			String[] columns = new String[] {
+					"_id",
+					"chunk"
+					};
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 		// Which columns to return 
+										sTmpFileName,   // Which rows to return (all rows)
+                    					null,       	// Selection arguments (none)
+                    					null);			// Order clause (none)
+			if (myCursor != null) {
+				int nRows = myCursor.getCount();
+				int nBytesRecvd = 0;
+			
+				for (int lcv = 0; lcv < nRows; lcv++) {
+					if  (myCursor.moveToPosition(lcv)) {
+						byte [] buf = myCursor.getBlob(1);
+						if (buf != null) {
+							nBytesRecvd += buf.length;
+							digest.update(buf, 0, buf.length);
+							lTotalRead += nRead;
+							buf = null;
+						}
+					}
+				}
+				myCursor.close();
+				byte [] hash = digest.digest();
+				
+				sRet = getHex(hash);
 			}
-		catch (FileNotFoundException e)
-			{
-			sRet += " file not found";
-			e.printStackTrace();
+		} else {
+			try {
+				FileInputStream srcFile  = new FileInputStream(sTmpFileName);
+				while((nRead = srcFile.read(buffer)) != -1) {
+					digest.update(buffer, 0, nRead);
+					lTotalRead += nRead;
+				}
+				srcFile.close();
+				byte [] hash = digest.digest();
+			
+				sRet = getHex(hash);
+			}
+			catch (FileNotFoundException e) {
+				sRet += " file not found";
+				e.printStackTrace();
+			}
+			catch (IOException e) {
+				sRet += " io exception";
+				e.printStackTrace();
 			}
-		catch (IOException e)
-			{
-			sRet += " io exception";
-			e.printStackTrace();
-			} 
-		return(sRet);
 		}
+		return(sRet);
+	}
 	
 	public String RemoveFile(String fileName)
 		{
 		String	sTmpFileName = fixFileName(fileName);
 		String	sRet = sErrorPrefix + "Couldn't delete file " + sTmpFileName;
 		
-		File f = new File(sTmpFileName);
-		
-		if (f.delete())
-			sRet = "deleted " + sTmpFileName;
+		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			if (cr.delete(ffxFiles, sTmpFileName, null) == 1) {
+				sRet = "deleted " + sTmpFileName;
+			}
+		} else {
+			File f = new File(sTmpFileName);
+			
+			if (f.delete())
+				sRet = "deleted " + sTmpFileName;
+		}
 		
 		return(sRet);
 		}
@@ -1477,54 +1545,51 @@ public class DoCommand {
 		String sSubDir = null;
 		String	sTmpDir = fixFileName(sDir);
 		
-		File dir = new File(sTmpDir);
+		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			if (cr.delete(ffxFiles, sTmpDir, null) > 0) {
+				sRet = "deleted " + sTmpDir;
+			}
+		} else {
+			File dir = new File(sTmpDir);
 		
-		if (dir.isDirectory())
-			{
-			sRet = "Deleting file(s) from " + sTmpDir;
+			if (dir.isDirectory()) {
+				sRet = "Deleting file(s) from " + sTmpDir;
 			
-			File [] files = dir.listFiles();
-			if (files != null)
-				{
-				if ((nFiles = files.length) > 0)
-					{
-					for (int lcv = 0; lcv < nFiles; lcv++)
-						{
-						if (files[lcv].isDirectory())
-							{
-							sSubDir = files[lcv].getAbsolutePath();
-							sRet += "\n" + PruneDir(sSubDir);
+				File [] files = dir.listFiles();
+				if (files != null) {
+					if ((nFiles = files.length) > 0) {
+						for (int lcv = 0; lcv < nFiles; lcv++) {
+							if (files[lcv].isDirectory()) {
+								sSubDir = files[lcv].getAbsolutePath();
+								sRet += "\n" + PruneDir(sSubDir);
 							}
-						else
-							{
-							if (files[lcv].delete())
-								{
+							else {
+								if (files[lcv].delete()) {
 								sRet += "\n\tDeleted " + files[lcv].getName();
 								}
-							else
-								{
-								sRet += "\n\tUnable to delete " + files[lcv].getName();
+								else {
+									sRet += "\n\tUnable to delete " + files[lcv].getName();
 								}
 							}
 						}
 					}
-				else
-					sRet += "\n\t<empty>";
+					else
+						sRet += "\n\t<empty>";
 				}
 			
-			if (dir.delete())
-				{
-				sRet += "\nDeleting directory " + sTmpDir;
+				if (dir.delete()) {
+					sRet += "\nDeleting directory " + sTmpDir;
 				}
-			else
-				{
-				sRet += "\nUnable to delete directory " + sTmpDir;
+				else {
+					sRet += "\nUnable to delete directory " + sTmpDir;
 				}
 			}
-		else
-			{
-			sRet += sErrorPrefix + sTmpDir + " is not a directory";
+			else {
+				sRet += sErrorPrefix + sTmpDir + " is not a directory";
 			}
+		}
 		
 		return(sRet);
 		}
@@ -1535,111 +1600,282 @@ public class DoCommand {
 		int nFiles = 0;
 		String	sTmpDir = fixFileName(sDir);
 		
-		File dir = new File(sTmpDir);
-		
-		if (dir.isDirectory())
-			{
-			File [] files = dir.listFiles();
-		
-			if (files != null)
-				{
-				if ((nFiles = files.length) > 0)
-					{
-					for (int lcv = 0; lcv < nFiles; lcv++)
-						{
-						sRet += files[lcv].getName();
-						if (lcv < (nFiles - 1))
-							sRet += "\n";
+		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = null;
+			
+			ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			
+			String[] columns = new String[] {
+					"_id",
+					"isdir",
+					"filename",
+					"length"
+                };
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 	// Which columns to return 
+										sTmpDir,    // Which rows to return (all rows)
+                    					null,       // Selection arguments (none)
+                    					null);		// Order clause (none)
+			if (myCursor != null) {
+				nFiles = myCursor.getCount();
+				
+				// If only one entry and the index is -1 this is not a directory
+				int nNdx = myCursor.getColumnIndex("_id");
+				// If no entries the dir is empty
+				if (nFiles == 1) {
+					sRet = "<empty>";
+				} else {
+					// Show the entries
+					for (int lcv = 1; lcv < nFiles; lcv++) {
+						if  (myCursor.moveToPosition(lcv)) {
+							if ((lcv == 0) && (myCursor.getLong(nNdx) == -1)) {
+								sRet = sErrorPrefix + sTmpDir + " is not a directory";
+							} else {
+								sRet += myCursor.getString(2);
+								if (lcv < (nFiles - 1))
+									sRet += "\n";
+							}
 						}
 					}
-				else
-					sRet = "<empty>";
+				}
+				myCursor.close();
+			} 
+		} else {
+			File dir = new File(sTmpDir);
+			
+			if (dir.isDirectory()) {
+				File [] files = dir.listFiles();
+			
+				if (files != null) {
+					if ((nFiles = files.length) > 0) {
+						for (int lcv = 0; lcv < nFiles; lcv++) {
+							sRet += files[lcv].getName();
+							if (lcv < (nFiles - 1)) {
+								sRet += "\n";
+							}
+						}
+					}
+					else {
+						sRet = "<empty>";
+					}
 				}
 			}
-		else
-			{
-			sRet = sErrorPrefix + sTmpDir + " is not a directory";
+			else {
+				sRet = sErrorPrefix + sTmpDir + " is not a directory";
 			}
-		
+		}
 		return(sRet);
-		}
+	}
 	
-	public String Move(String srcFileName, String dstFileName)
-		{
-		String	sTmpSrcFileName = fixFileName(srcFileName);
-		String	sTmpDstFileName = fixFileName(dstFileName);
+	public String Move(String sTmpSrcFileName, String sTmpDstFileName) {
 		String sRet = sErrorPrefix + "Could not move " + sTmpSrcFileName + " to " + sTmpDstFileName;
-		
-		File srcFile = new File(sTmpSrcFileName);
-		File dstFile = new File(sTmpDstFileName);
-		
-		if (srcFile.renameTo(dstFile))
-			sRet = sTmpSrcFileName + " moved to " + sTmpDstFileName;
-		
-		return (sRet);
+		String sTmp = CopyFile(sTmpSrcFileName, sTmpDstFileName);
+		if (sTmp.contains(" copied to ")) {
+			sTmp = RemoveFile(sTmpSrcFileName);
+			if (sTmp.startsWith("deleted ")) {
+				sRet = sTmpSrcFileName + " moved to " + sTmpDstFileName;
+			}
 		}
-	
-	public String CopyFile(String srcFileName, String dstFileName)
-		{
-		String	sTmpSrcFileName = fixFileName(srcFileName);
-		String	sTmpDstFileName = fixFileName(dstFileName);
+			
+		return(sRet);
+	}
+
+	public String CopyFile(String sTmpSrcFileName, String sTmpDstFileName) {
 		String sRet = sErrorPrefix + "Could not copy " + sTmpSrcFileName + " to " + sTmpDstFileName;
+		ContentValues cv = null;
 		File destFile = null;
+		Uri ffxSrcFiles = null;
+		Uri ffxDstFiles = null;
+		FileInputStream srcFile  = null;
+		FileOutputStream dstFile  = null;
 		byte[] buffer = new byte [4096];
 		int	nRead = 0;
 		long lTotalRead = 0;
 		long lTotalWritten = 0;
+		ContentResolver crIn = null;
+		ContentResolver crOut = null;
 		
-		try 
-			{
-			FileInputStream srcFile  = new FileInputStream(sTmpSrcFileName);
-			FileOutputStream dstFile = new FileOutputStream(sTmpDstFileName);
-			
-			while((nRead = srcFile.read(buffer)) != -1)
-				{
-				lTotalRead += nRead;
-				dstFile.write(buffer, 0, nRead);
-				}
-			dstFile.flush();
-			dstFile.close();
-			
-			destFile = new File(sTmpDstFileName);
-			lTotalWritten = destFile.length();
-
-			if (lTotalWritten == lTotalRead)
-				sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
-			else
-				sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
+		if (sTmpSrcFileName.contains("org.mozilla.fennec") || sTmpSrcFileName.contains("org.mozilla.firefox")) {
+			ffxSrcFiles = Uri.parse("content://" + (sTmpSrcFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			crIn = contextWrapper.getContentResolver();
+		} else {
+			try {
+				srcFile  = new FileInputStream(sTmpSrcFileName);
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
 			}
-		catch (FileNotFoundException e)
-			{
-			e.printStackTrace();
-			} 
-		catch (IOException e)
-			{
-			e.printStackTrace();
-			}
-
-		return (sRet);
 		}
-	
+		
+		if (sTmpDstFileName.contains("org.mozilla.fennec") || sTmpDstFileName.contains("org.mozilla.firefox")) {
+			ffxDstFiles = Uri.parse("content://" + (sTmpDstFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			crOut = contextWrapper.getContentResolver();
+			cv = new ContentValues();
+		} else {
+			try {
+				dstFile  = new FileOutputStream(sTmpDstFileName);
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		if (srcFile != null) {
+			try {
+				while((nRead = srcFile.read(buffer)) != -1)	{
+					lTotalRead += nRead;
+					if (dstFile != null) {
+						dstFile.write(buffer, 0, nRead);
+						dstFile.flush();
+					} else {
+						cv.put("length", nRead);
+						cv.put("chunk", buffer);
+						if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
+							break;
+						lTotalWritten += nRead;
+					}
+				}
+				
+				srcFile.close();
+				
+				if (dstFile != null) {
+					dstFile.flush();
+					dstFile.close();
+					
+					destFile = new File(sTmpDstFileName);
+					lTotalWritten = destFile.length();
+				}
+
+				if (lTotalWritten == lTotalRead) {
+					sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
+				}
+				else {
+					sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			
+		} else {
+			String[] columns = new String[] {
+					"_id",
+					"chunk",
+					"length"
+					};
+
+			Cursor myCursor = crIn.query(ffxSrcFiles,
+										columns, 			// Which columns to return 
+										sTmpSrcFileName,   	// Which rows to return (all rows)
+                    					null,       		// Selection arguments (none)
+                    					null);				// Order clause (none)
+			if (myCursor != null) {
+				int nRows = myCursor.getCount();
+				
+				byte [] buf = null;
+			
+				for (int lcv = 0; lcv < nRows; lcv++) {
+					if  (myCursor.moveToPosition(lcv)) {
+						buf = myCursor.getBlob(myCursor.getColumnIndex("chunk"));
+						if (buf != null) {
+							nRead = buf.length;
+							try {
+								lTotalRead += nRead;
+								if (dstFile != null) {
+									dstFile.write(buffer, 0, nRead);
+									dstFile.flush();
+								} else {
+									cv.put("length", nRead);
+									cv.put("chunk", buffer);
+									if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
+										break;
+									lTotalWritten += nRead;
+								}
+							} catch (IOException e) {
+								e.printStackTrace();
+							}
+							buf = null;
+						}
+					}
+				}
+				
+				if (nRows == -1) {
+					sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nNo such file or directory";
+				}
+				else {
+					myCursor.close();
+					
+					if (dstFile != null) {
+						try {
+							dstFile.flush();
+							dstFile.close();
+							
+							destFile = new File(sTmpDstFileName);
+							lTotalWritten = destFile.length();
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+					}
+
+					if (lTotalWritten == lTotalRead) {
+						sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
+					}
+					else {
+						sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
+					}
+				}
+			}
+			else {
+				sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nUnable to access file (internal error)";
+			}
+		}
+		
+		return (sRet);
+	}
+
 	public String IsDirWritable(String sDir)
 		{
-		String sRet = "";
 		String	sTmpDir = fixFileName(sDir);
-		File dir = new File(sTmpDir);
+		String sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
 		
-		if (dir.isDirectory())
-			{
-			sRet = "[" + sDir + "] " + (dir.canWrite() ? "is" : "is not") + " writable";
+		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = null;
+			
+			ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			
+			String[] columns = new String[] {
+					"_id",
+					"isdir",
+					"filename",
+					"length",
+					"writable"
+                };
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 	// Which columns to return 
+										sTmpDir,    // Which rows to return (all rows)
+                    					null,       // Selection arguments (none)
+                    					null);		// Order clause (none)
+			if (myCursor != null) {
+				if (myCursor.getCount() > 0) {
+					if (myCursor.moveToPosition(0)) {
+						if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
+							sRet = "[" + sTmpDir + "] " + ((myCursor.getLong(myCursor.getColumnIndex("writable")) == 1) ? "is" : "is not") + " writable";
+						}
+					}
+				}
 			}
-		else
-			{
-			sRet = sErrorPrefix + "[" + sDir + "] is not a directory";
+		} else {
+			File dir = new File(sTmpDir);
+			
+			if (dir.isDirectory()) {
+				sRet = "[" + sTmpDir + "] " + (dir.canWrite() ? "is" : "is not") + " writable";
+			} else {
+				sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
 			}
-		
-		return(sRet);
 		}
+		return(sRet);
+	}
 	
 	public String Push(String fileName, BufferedInputStream bufIn, long lSize)
 	{
@@ -1647,33 +1883,52 @@ public class DoCommand {
 		int					nRead			= 0;
 		long				lRead			= 0;
 		String				sTmpFileName 	= fixFileName(fileName);
+		FileOutputStream 	dstFile			= null;
+		ContentResolver 	cr 				= null;
+		ContentValues		cv				= null;
+		Uri 				ffxFiles 		= null; 
 		String				sRet			= sErrorPrefix + "Push failed!";
-		
+
 		try {
-			FileOutputStream dstFile = new FileOutputStream(sTmpFileName, false);
+			if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+				cr = contextWrapper.getContentResolver();
+				ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+				cv = new ContentValues();
+			}
+			else {
+				dstFile = new FileOutputStream(sTmpFileName, false);
+			}
+
 			while((nRead != -1) && (lRead < lSize))
 				{
 				nRead = bufIn.read(buffer);
-				if (nRead != -1)
-					{
-					dstFile.write(buffer, 0, nRead);
-					dstFile.flush();
-					lRead += nRead;
+				if (nRead != -1) {
+					if (dstFile != null) {
+						dstFile.write(buffer, 0, nRead);
+						dstFile.flush();
+					} 
+					else {
+						cv.put("offset", lRead);
+						cv.put("length", nRead);
+						cv.put("chunk", buffer);
+						cr.update(ffxFiles, cv, sTmpFileName, null);
 					}
+					lRead += nRead;
 				}
+			}
 			
-			dstFile.flush();
-			dstFile.close();
+			if (dstFile != null) {
+				dstFile.flush();
+				dstFile.close();
+			}
 			
-			if (lRead == lSize)
-				{
+			if (lRead == lSize)	{
 				sRet = HashFile(sTmpFileName);
-				}
 			}
-		catch (IOException e)
-			{
+		}
+		catch (IOException e) {
 			e.printStackTrace();
-			}
+		}
 		
 		buffer = null;
 		
@@ -1708,29 +1963,34 @@ public class DoCommand {
 				    	File dstFile = new File(sTmpDstFileName);
 				    	outStream = new FileOutputStream(dstFile);
 				    	FTPFile [] ftpFiles = ftp.listFiles(sSrcFileName);
-				    	long lFtpSize = ftpFiles[0].getSize();
-				    	if (lFtpSize <= 0)
-				    		lFtpSize = 1;
+				    	if (ftpFiles.length > 0)
+				    		{
+				    		long lFtpSize = ftpFiles[0].getSize();
+				    		if (lFtpSize <= 0)
+				    			lFtpSize = 1;
 				    	
-				    	InputStream ftpIn = ftp.retrieveFileStream(sSrcFileName);
-						while ((nRead = ftpIn.read(buffer)) != -1)
-							{
-							lTotalRead += nRead;
-							outStream.write(buffer, 0, nRead);
-							strRet = "\r" + lTotalRead + " of " + lFtpSize + " bytes received " + ((lTotalRead * 100) / lFtpSize) + "% completed";
-							out.write(strRet.getBytes());
-							out.flush();
-							}
-						ftpIn.close();
-						@SuppressWarnings("unused")
-						boolean bRet = ftp.completePendingCommand();
-						outStream.flush();
-			    		outStream.close();
-						strRet = ftp.getReplyString();
-						reply = ftp.getReplyCode();
+				    		InputStream ftpIn = ftp.retrieveFileStream(sSrcFileName);
+				    		while ((nRead = ftpIn.read(buffer)) != -1)
+								{
+				    			lTotalRead += nRead;
+				    			outStream.write(buffer, 0, nRead);
+				    			strRet = "\r" + lTotalRead + " of " + lFtpSize + " bytes received " + ((lTotalRead * 100) / lFtpSize) + "% completed";
+				    			out.write(strRet.getBytes());
+				    			out.flush();
+								}
+				    		ftpIn.close();
+				    		@SuppressWarnings("unused")
+				    		boolean bRet = ftp.completePendingCommand();
+				    		outStream.flush();
+				    		outStream.close();
+				    		strRet = ftp.getReplyString();
+				    		reply = ftp.getReplyCode();
+				    		}
+				    	else
+				    		{
+				    		strRet = sRet;
+				    		}
 				    	}
-					strRet = ftp.getReplyString();
-					reply = ftp.getReplyCode();
 				    ftp.logout();
 				    ftp.disconnect();
 				    sRet = "\n" + strRet; 
@@ -1766,41 +2026,242 @@ public class DoCommand {
 		return (sRet);
 	}
 	
+	public String Pull(String fileName, long lOffset, long lLength, OutputStream out)
+		{
+		String	sTmpFileName = fixFileName(fileName);
+		String	sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
+		byte[]	buffer = new byte [4096];
+		int		nRead = 0;
+		long	lSent = 0;
+	
+		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = null;
+			
+			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			
+			String[] columns = new String[] {
+					"_id",
+					"chunk",
+					"length"
+					};
+			
+			String [] args = new String [2];
+			args[0] = Long.toString(lOffset);
+			args[1] = Long.toString(lLength);
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 		// Which columns to return 
+										sTmpFileName,   // Which rows to return (all rows)
+										args,       	// Selection arguments (none)
+                    					null);			// Order clause (none)
+			if (myCursor != null) {
+				int nRows = myCursor.getCount();
+				long lFileLength = 0;
+			
+				for (int lcv = 0; lcv < nRows; lcv++) {
+					if  (myCursor.moveToPosition(lcv)) {
+						if (lcv == 0) {
+							lFileLength = myCursor.getLong(2);
+							String sTmp = sTmpFileName + "," + lFileLength + "\n";
+							try {
+								out.write(sTmp.getBytes());
+							} catch (IOException e) {
+								e.printStackTrace();
+								break;
+							}
+						}
+
+						if (lLength != 0) {
+							byte [] buf = myCursor.getBlob(1);
+							if (buf != null) {
+								nRead = buf.length;
+								try {
+									if ((lSent + nRead) <= lFileLength)	{
+										out.write(buf,0,nRead);
+										lSent += nRead;
+									}
+									else {
+										nRead = (int) (lFileLength - lSent);
+										out.write(buf,0,nRead);
+										Log.d("pull warning", "more bytes read than expected");
+										break;
+									}
+								} catch (IOException e) {
+									e.printStackTrace();
+									sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
+								}
+								buf = null;
+							}
+						}
+					}
+				}
+				if (nRows == 0) {
+					String sTmp = sTmpFileName + "," + lFileLength + "\n";
+					try {
+						out.write(sTmp.getBytes());
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+				if (nRows == -1) {
+					sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
+				}
+				else {
+					myCursor.close();
+					sRet = "";
+				}
+			}
+			else {
+				sRet = sErrorPrefix + sTmpFileName + ",-1\nUnable to access file (internal error)";
+			}
+		} 
+		else {
+			try {
+				File f = new File(sTmpFileName);
+				long lFileLength = f.length();
+				FileInputStream fin = new FileInputStream(f);
+				if (lFileLength == 0) {
+					while ((nRead = fin.read(buffer)) != -1) {
+						lFileLength += nRead;
+					}
+					fin.close();
+					fin = new FileInputStream(f);
+				}
+				
+				// lLength == -1 return everything between lOffset and eof
+				// lLength == 0 return file length
+				// lLength > 0 return lLength bytes
+				if (lLength == -1) {
+					lFileLength = lFileLength - lOffset;
+				} else if (lLength == 0) {
+					// just return the file length
+				} else {
+					lFileLength = ((lLength <= (lFileLength - lOffset)) ? lLength : (lFileLength - lOffset));
+				}
+			
+				String sTmp = sTmpFileName + "," + lFileLength + "\n";
+				out.write(sTmp.getBytes());
+				if (lLength != 0) {
+					if  (lOffset > 0) {
+						fin.skip(lOffset);
+					}
+					while ((nRead = fin.read(buffer)) != -1) {
+						if ((lSent + nRead) <= lFileLength)	{
+							out.write(buffer,0,nRead);
+							lSent += nRead;
+						}
+						else {
+							nRead = (int) (lFileLength - lSent);
+							out.write(buffer,0,nRead);
+							if (lLength != -1)
+								Log.d("pull warning", "more bytes read than sent");
+							break;
+						}
+					}
+				}
+				fin.close();
+				out.flush();
+				sRet = "";
+				}
+			catch (FileNotFoundException e)	{
+				sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
+			} 
+			catch (IOException e) {
+				sRet = e.toString();
+			}
+		}
+		return (sRet);
+	}
+
 	public String Cat(String fileName, OutputStream out)
 		{
 		String	sTmpFileName = fixFileName(fileName);
 		String	sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
 		byte[]	buffer = new byte [4096];
 		int		nRead = 0;
-		
-		try {
-			FileInputStream fin = new FileInputStream(sTmpFileName);
-			while ((nRead = fin.read(buffer)) != -1)
-				{
-				out.write(buffer,0,nRead);
+
+		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = null;
+			
+			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+			
+			String[] columns = new String[] {
+					"_id",
+					"chunk"
+					};
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 		// Which columns to return 
+										sTmpFileName,   // Which rows to return (all rows)
+                    					null,       	// Selection arguments (none)
+                    					null);			// Order clause (none)
+			if (myCursor != null) {
+				int nRows = myCursor.getCount();
+				int nBytesRecvd = 0;
+			
+				for (int lcv = 0; lcv < nRows; lcv++) {
+					if  (myCursor.moveToPosition(lcv)) {
+						byte [] buf = myCursor.getBlob(1);
+						if (buf != null) {
+							nBytesRecvd += buf.length;
+							try {
+								out.write(buf);
+								sRet = "";
+							} catch (IOException e) {
+								e.printStackTrace();
+								sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
+							}
+							buf = null;
+						}
+					}
 				}
-			out.flush();
-			sRet = "";
+				if (nRows == 0) {
+					sRet = "";
+				}
+					
+				myCursor.close();
 			}
-		catch (FileNotFoundException e)
-			{
-			sRet = e.toString();
+		} else {
+			try {
+				FileInputStream fin = new FileInputStream(sTmpFileName);
+				while ((nRead = fin.read(buffer)) != -1) {
+					out.write(buffer,0,nRead);
+				}
+				fin.close();
+				out.flush();
+				sRet = "";
+				}
+			catch (FileNotFoundException e) {
+				sRet = sErrorPrefix + sTmpFileName + " No such file or directory";
 			} 
-		catch (IOException e) 
-			{
-			sRet = e.toString();
+			catch (IOException e) {
+				sRet = e.toString();
 			}
-		return (sRet);
 		}
-	
+		return (sRet);
+	}
+
 	public String MakeDir(String sDir)
 		{
 		String	sTmpDir = fixFileName(sDir);
 		String sRet = sErrorPrefix + "Could not create the directory " + sTmpDir;
-		File dir = new File(sTmpDir);
-		
-		if (dir.mkdirs())
-			sRet = sDir + " successfully created";
+		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			ContentValues cv = new ContentValues();
+			
+			if (cr.update(ffxFiles, cv, sTmpDir, null) == 1) {
+				sRet = sDir + " successfully created";
+			}
+		}
+		else {
+			File dir = new File(sTmpDir);
+			
+			if (dir.mkdirs())
+				sRet = sDir + " successfully created";
+		}
 		
 		return (sRet);
 		}
@@ -1826,8 +2287,71 @@ public class DoCommand {
 			return(nRetXY);
 		}
 	
+	public String SetADB(String sWhat) {
+		String sRet = "";
+		String sTmp = "";
+		String [] theArgs = new String [3];
+		
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
+		
+		if (sWhat.contains("ip")) {
+			theArgs[2] = "setprop service.adb.tcp.port 5555";
+		} else {
+			theArgs[2] = "setprop service.adb.tcp.port -1";
+		}
+		
+		try {
+			pProc = Runtime.getRuntime().exec(theArgs);
+			RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+			outThrd.start();
+			outThrd.join(5000);
+			sTmp = outThrd.strOutput;
+			Log.e("ADB", sTmp);
+			if (outThrd.nExitCode == 0) {
+				theArgs[2] = "stop adbd";
+				pProc = Runtime.getRuntime().exec(theArgs);
+				outThrd = new RedirOutputThread(pProc, null);
+				outThrd.start();
+				outThrd.join(5000);
+				sTmp = outThrd.strOutput;
+				Log.e("ADB", sTmp);
+				if (outThrd.nExitCode == 0) {
+					theArgs[2] = "start adbd";
+					pProc = Runtime.getRuntime().exec(theArgs);
+					outThrd = new RedirOutputThread(pProc, null);
+					outThrd.start();
+					outThrd.join(5000);
+					sTmp = outThrd.strOutput;
+					Log.e("ADB", sTmp);
+					if (outThrd.nExitCode == 0) {
+						sRet = "Successfully set adb to " + sWhat + "\n";
+					} else {
+						sRet = sErrorPrefix + "Failed to start adbd\n";
+					}
+				} else {
+					sRet = sErrorPrefix + "Failed to stop adbd\n";
+				}
+			} else {
+				sRet = sErrorPrefix + "Failed to setprop service.adb.tcp.port 5555\n";
+			}
+			
+		}
+	catch (IOException e) 
+		{
+		sRet = e.getMessage();
+		e.printStackTrace();
+		} 
+	catch (InterruptedException e)
+		{
+		e.printStackTrace();
+		}
+		return(sRet);
+	}
+	
 	public String KillProcess(String sProcName, OutputStream out)
 		{
+		String sTmp = "";
 		String [] theArgs = new String [3];
 		
 		theArgs[0] = "su";
@@ -1854,9 +2378,18 @@ public class DoCommand {
 				try 
 					{
 					pProc = Runtime.getRuntime().exec(theArgs);
-					RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+					RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
 					outThrd.start();
-					outThrd.join(5000);
+					outThrd.join(15000);
+					sTmp = outThrd.strOutput;
+					Log.e("KILLPROCESS", sTmp);
+					if (outThrd.nExitCode == 0) {
+						sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
+						nPID = 0;
+						break;
+					} else {
+						sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
+					}
 					}
 				catch (IOException e) 
 					{
@@ -1964,6 +2497,7 @@ public class DoCommand {
 		return (sRet);
 		}
 
+	// todo
 	public String GetDiskInfo(String sPath)
 		{
 		String sRet = "";
@@ -1995,11 +2529,68 @@ public class DoCommand {
 		return (lMem);
 		}
 	
+	public String UpdateCallBack(String sFileName)
+		{
+		String sRet = sErrorPrefix + "No file specified";
+		String sIP = "";
+		String sPort = "";
+		int nEnd = 0;
+		int nStart = 0;
+		
+		if ((sFileName == null) || (sFileName.length() == 0))
+			return(sRet);
+			
+		Context ctx = contextWrapper.getApplicationContext();
+		try {
+			FileInputStream fis = ctx.openFileInput(sFileName);
+			int nBytes = fis.available();
+			if (nBytes > 0)
+				{
+				byte [] buffer = new byte [nBytes + 1];
+				int nRead = fis.read(buffer, 0, nBytes);
+				fis.close();
+				ctx.deleteFile(sFileName);
+				if (nRead > 0)
+					{
+					String sBuffer = new String(buffer);
+					nEnd = sBuffer.indexOf(',');
+					if (nEnd > 0)
+						{
+						sIP = (sBuffer.substring(0, nEnd)).trim();
+						nStart = nEnd + 1;
+						nEnd = sBuffer.indexOf('\r', nStart);
+						if (nEnd > 0)
+							{
+							sPort = (sBuffer.substring(nStart, nEnd)).trim();
+							Thread.sleep(5000);
+							sRet = RegisterTheDevice(sIP, sPort, sBuffer.substring(nEnd + 1));
+							}
+						}
+					}
+				}
+			} 
+		catch (FileNotFoundException e)
+			{
+			sRet = sErrorPrefix + "Nothing to do";
+			} 
+		catch (IOException e)
+			{
+			sRet = sErrorPrefix + "Couldn't send info to " + sIP + ":" + sPort;
+			} 
+		catch (InterruptedException e)
+			{
+			e.printStackTrace();
+			}
+		return(sRet);
+		}
+	
 	public String RegisterTheDevice(String sSrvr, String sPort, String sData)
 		{
 		String sRet = "";
 		String line = "";
 		
+//		Debug.waitForDebugger();
+		
 		if (sSrvr != null && sPort != null && sData != null)
 			{
 			try
@@ -2015,13 +2606,20 @@ public class DoCommand {
 					while (socket.isInputShutdown() == false)
 						{
 						line = in.readLine();
-						line = line.toLowerCase();
-						if ((line == null) || (line.contains("ok")))
+						
+						if (line != null)
 							{
+							line = line.toLowerCase();
 							sRet += line;
+							// ok means we're done
+							if (line.contains("ok"))
+								break;
+							}
+						else
+							{
+							// end of stream reached
 							break;
 							}
-						sRet += line;
 						}
 					}
 				out.close();
@@ -2030,15 +2628,17 @@ public class DoCommand {
 				}
 			catch(NumberFormatException e)
 				{
+				sRet += "reg NumberFormatException thrown [" + e.getLocalizedMessage() + "]";
 				e.printStackTrace();
 				} 
 			catch (UnknownHostException e)
 				{
+				sRet += "reg UnknownHostException thrown [" + e.getLocalizedMessage() + "]";
 				e.printStackTrace();
 				}
 			catch (IOException e)
 				{
-				sRet += "reg exception thrown";
+				sRet += "reg IOException thrown [" + e.getLocalizedMessage() + "]";
 				e.printStackTrace();
 				}
 			}
@@ -2067,8 +2667,6 @@ public class DoCommand {
 			else
 				{
 			    InputStream content = response.getEntity().getContent();
-//			    int nAvailable = content.available();
-//			    byte [] data = new byte [nAvailable];
 			    byte [] data = new byte [2048];
 			    int nRead = content.read(data);
 			    sRet = new String(data, 0, nRead);
@@ -2158,14 +2756,18 @@ public class DoCommand {
 		return (sRet);
 		}
 	
-	public String SetSystemTime(String sDate, String sTime, OutputStream out)
-		{
+	public String SetSystemTime(String sDate, String sTime, OutputStream out) {
 		String sRet = "";
+		String sM = "";
+		String sMillis = "";
+		String [] theArgs = new String [3];
+		
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
 		
 		if (((sDate != null) && (sTime != null)) && 
 			(sDate.contains("/") || sDate.contains(".")) &&
-			(sTime.contains(":")))
-			{
+			(sTime.contains(":"))) {
 			int year = Integer.parseInt(sDate.substring(0,4));
 			int month = Integer.parseInt(sDate.substring(5,7));
 			int day = Integer.parseInt(sDate.substring(8,10));
@@ -2178,39 +2780,95 @@ public class DoCommand {
 			cal.set(year, month - 1, day, hour, mins, secs);
 			long lMillisecs = cal.getTime().getTime();
 			
-			String sM = Long.toString(lMillisecs);
-			String sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
-			String [] theArgs = new String [3];
+			sM = Long.toString(lMillisecs);
+			sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
 		
-			theArgs[0] = "su";
-			theArgs[1] = "-c";
+		} else if ((sDate != null) && (sTime == null) && sDate.contains(".")) {
+			String serverName = sDate;
+//    		String serverName = "us.pool.ntp.org";
+			sRet = "NTP Server: " + serverName + lineSep;
+    		// Send request
+    		DatagramSocket socket;
+
+			try {
+				socket = new DatagramSocket();
+	    		InetAddress address = InetAddress.getByName(serverName);
+	    		byte[] buf = new NtpMessage().toByteArray();
+	    		DatagramPacket packet = new DatagramPacket(buf, buf.length, address, 123);
+		    		
+	    		// Set the transmit timestamp *just* before sending the packet
+	    		// ToDo: Does this actually improve performance or not?
+	    		NtpMessage.encodeTimestamp(packet.getData(), 40, (System.currentTimeMillis()/1000.0) + 2208988800.0);
+		    		
+	    		socket.send(packet);
+		    		
+	    		// Get response
+	    		System.out.println("NTP request sent, waiting for response...\n");
+	    		packet = new DatagramPacket(buf, buf.length);
+	    		socket.receive(packet);
+		    		
+	    		// Immediately record the incoming timestamp since 00:00 1-JAN-1900 in secs.
+	    		double destinationTimestamp = (System.currentTimeMillis()/1000.0) + 2208988800.0;
+		    		
+	    		// Process response
+	    		NtpMessage msg = new NtpMessage(packet.getData());
+		    		
+	    		// Corrected, according to RFC2030 errata
+	    		double roundTripDelay = (destinationTimestamp-msg.originateTimestamp) - (msg.transmitTimestamp-msg.receiveTimestamp);
+		    			
+	    		double localClockOffset = ((msg.receiveTimestamp - msg.originateTimestamp) + (msg.transmitTimestamp - destinationTimestamp)) / 2;
+		    		
+	    		// convert base of timestamp from 00:00 1900/01/01 to 00:00:00 1970/01/01
+	    		double utc = msg.transmitTimestamp - (2208988800.0);
+	    		
+	    		// convert from secs to ms
+	    		long lNewMillisecs = (long)(utc * 1000.0);
+	    		
+	    		// create a date object using the timestamp this will take into account the timezone and daylight savings settings
+	    		Date dt = new Date(lNewMillisecs);
+		    		
+	    		sRet += "  Time: " + new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS").format(dt) + lineSep;
+	    		
+		    	// get the timestamp
+	    		long lMillisecs = dt.getTime();
+	    		
+	    		// format the timestamp as required for the date command
+				sM = Long.toString(lMillisecs);
+				sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
+				
+				socket.close();
+			} catch (SocketException e) {
+				e.printStackTrace();
+			} catch (UnknownHostException e) {
+				e.printStackTrace();
+				sRet = sErrorPrefix + "Unknown host";
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		} else {
+			sRet += "Invalid argument(s)";
+		}
+		
+		// if we have an argument
+		if (sMillis.length() > 0) {
 			theArgs[2] = "date -u " + sMillis;
-		
-			try 
-				{
+			
+			try {
 				pProc = Runtime.getRuntime().exec(theArgs);
 				RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
 				outThrd.start();
 				outThrd.join(10000);
-				sRet = GetSystemTime();
-				}
-			catch (IOException e) 
-				{
+				sRet += GetSystemTime();
+			} catch (IOException e) {
 				sRet = e.getMessage();
 				e.printStackTrace();
-				} 
-			catch (InterruptedException e)
-				{
+			} catch (InterruptedException e) {
 				e.printStackTrace();
-				}
-			}
-		else
-			{
-			sRet = "Invalid argument(s)";
 			}
+		}
 
 		return (sRet);
-		}
+	}
 
 	public String GetClok()
 		{
@@ -2273,7 +2931,6 @@ public class DoCommand {
 			} 
 		catch (InterruptedException e)
 			{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			}
 
@@ -2327,25 +2984,56 @@ public class DoCommand {
         	}
         return(sRet);
 	}
-	
+
 	public String PrintFileTimestamp(String sFile)
 		{
 		String 	sRet = "";
 		String	sTmpFileName = fixFileName(sFile);
-		File 	theFile = new File(sTmpFileName);
+		long	lModified = -1;
 		
-		if (theFile.exists())
-			{
-			long lModified = theFile.lastModified();
+		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+			ContentResolver cr = contextWrapper.getContentResolver();
+			Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+			
+			String[] columns = new String[] {
+					"_id",
+					"isdir",
+					"filename",
+					"length",
+					"ts"
+                };
+
+			Cursor myCursor = cr.query(	ffxFiles,
+										columns, 		// Which columns to return 
+										sTmpFileName,   // Which rows to return (all rows)
+                    					null,       	// Selection arguments (none)
+                    					null);			// Order clause (none)
+			if (myCursor != null) {
+				if (myCursor.getCount() > 0) {
+					if (myCursor.moveToPosition(0)) {
+						lModified = myCursor.getLong(myCursor.getColumnIndex("ts"));
+					}
+				}
+				myCursor.close();
+			}
+		}
+		else {
+			File theFile = new File(sTmpFileName);
+			
+			if (theFile.exists()) {
+				lModified = theFile.lastModified();
+			}
+		}
+		
+		if (lModified != -1) {
 			Date dtModified = new Date(lModified);
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS");
 			sRet = "Last modified: " + sdf.format(dtModified);
-			}
-		else
-			{
+		}
+		else {
 			sRet = sErrorPrefix + "[" + sTmpFileName + "] doesn't exist";
-			}
-
+		}
+			
 		return(sRet);
 		}
 	
@@ -2381,7 +3069,8 @@ public class DoCommand {
 						temp = sLine.split("=");
 						if (temp != null)
 							{
-							sRet = temp[1].trim();
+							if (temp.length > 1)
+								sRet = temp[1].trim();
 							}
 						break;
 						}
@@ -2400,17 +3089,34 @@ public class DoCommand {
 		return (sRet);
 		}
 	
-	public String RunReboot(OutputStream out)
+	public String RunReboot(OutputStream out, String sCallBackIP, String sCallBackPort)
 		{
 		String sRet = "";
+		Context ctx = contextWrapper.getApplicationContext();
 		String [] theArgs = new String [3];
 	
 		theArgs[0] = "su";
 		theArgs[1] = "-c";
 		theArgs[2] = "reboot";
+		try {
+			if ((sCallBackIP != null) && (sCallBackPort != null) && 
+				(sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))	{
+				FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
+				String sBuffer = sCallBackIP + "," + sCallBackPort + "\rSystem rebooted\r";
+				fos.write(sBuffer.getBytes());
+				fos.flush();
+				fos.close();
+				fos = null;
+			}
+		} catch (FileNotFoundException e) {
+			sRet = sErrorPrefix + "Callback file creation error [rebt] call failed " + e.getMessage();
+			e.printStackTrace();
+		} catch (IOException e) {
+			sRet = sErrorPrefix + "Callback file error [rebt] call failed " + e.getMessage();
+			e.printStackTrace();
+		}
 	
-		try 
-			{
+		try {
 			// Tell all of the data channels we are rebooting
 			((ASMozStub)this.contextWrapper).SendToDataChannel("Rebooting ...");
 			
@@ -2418,16 +3124,12 @@ public class DoCommand {
 			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
 			outThrd.start();
 			outThrd.join(10000);
-			}
-		catch (IOException e) 
-			{
+		} catch (IOException e) {
 			sRet = e.getMessage();
 			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
+		} catch (InterruptedException e) {
 			e.printStackTrace();
-			}
+		}
 
 		return (sRet);
 		}
@@ -2458,7 +3160,6 @@ public class DoCommand {
 			} 
 		catch (InterruptedException e)
 			{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			}
 		
@@ -2470,25 +3171,20 @@ public class DoCommand {
 		String sRet = "";
 		String [] theArgs = new String [3];
 		File	srcFile = new File(sApp);
-//		boolean bDone = false;
-//		int		nExitCode;
 
 		theArgs[0] = "su";
 		theArgs[1] = "-c";
 		theArgs[2] = "mv " + GetTmpDir() + "/" + srcFile.getName() + " /data/local/tmp/" + srcFile.getName() + ";exit";
-//		theArgs[2] += ";chmod 666 /data/local/tmp/" + srcFile.getName();
-//		theArgs[2] += ";pm install /data/local/tmp/" + srcFile.getName() + " Cleanup";
-//		theArgs[2] += ";done;exit";
 		
 		sRet = CopyFile(sApp, GetTmpDir() + "/" + srcFile.getName());
 		try {
 			out.write(sRet.getBytes());
 			out.flush();
-		} catch (IOException e1) {
-			// TODO Auto-generated catch block
+			}
+		catch (IOException e1)
+			{
 			e1.printStackTrace();
-		}
-//		CopyFile(sApp, GetTmpDir() + "/" + srcFile.getName());
+			}
 
 		try 
 			{
@@ -2498,7 +3194,6 @@ public class DoCommand {
 			outThrd.start();
 			outThrd.join(90000);
 			int nRet = pProc.exitValue();
-//			boolean bRet = outThrd.isAlive();
 			sRet = "\nmove complete [" + nRet + "]";
 			try 
 				{
@@ -2507,7 +3202,6 @@ public class DoCommand {
 				}
 			catch (IOException e1)
 				{
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 				}
 			
@@ -2517,7 +3211,6 @@ public class DoCommand {
 			outThrd2.start();
 			outThrd2.join(10000);
 			int nRet2 = pProc.exitValue();
-//			bRet = outThrd2.isAlive();
 			sRet = "\npermission change complete [" + nRet2 + "]\n";
 			try {
 				out.write(sRet.getBytes());
@@ -2525,11 +3218,10 @@ public class DoCommand {
 				}
 			catch (IOException e1)
 				{
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 				}
 			
-			theArgs[2] = "pm install /data/local/tmp/" + srcFile.getName() + " Cleanup" + ";exit";
+			theArgs[2] = "pm install -r /data/local/tmp/" + srcFile.getName() + " Cleanup" + ";exit";
 			pProc = Runtime.getRuntime().exec(theArgs);
 			RedirOutputThread outThrd3 = new RedirOutputThread(pProc, out);
 			outThrd3.start();
@@ -2542,7 +3234,6 @@ public class DoCommand {
 				}
 			catch (IOException e1)
 				{
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 				}
 			
@@ -2559,7 +3250,6 @@ public class DoCommand {
 				}
 			catch (IOException e1)
 				{
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 				}
 			sRet = "\nSuccess";
@@ -2571,33 +3261,31 @@ public class DoCommand {
 			} 
 		catch (InterruptedException e)
 			{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			}
 
 		return (sRet);
 		}
 
-	public String StartUpdateOMatic(String sPkgName, String sPkgFileName)
+	public String StrtUpdtOMatic(String sPkgName, String sPkgFileName, String sCallBackIP, String sCallBackPort)
 		{
 		String sRet = "";
-	
+		
 		Context ctx = contextWrapper.getApplicationContext();
 		PackageManager pm = ctx.getPackageManager();
 
 		Intent prgIntent = new Intent();
-		prgIntent.setPackage("com.mozilla.UpdateOMatic");
-		prgIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
+		prgIntent.setPackage("com.mozilla.watcher");
+		
 		try {
-			PackageInfo pi = pm.getPackageInfo("com.mozilla.UpdateOMatic", PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
-			ActivityInfo [] ai = pi.activities;
-			for (int i = 0; i < ai.length; i++)
+			PackageInfo pi = pm.getPackageInfo("com.mozilla.watcher", PackageManager.GET_SERVICES | PackageManager.GET_INTENT_FILTERS);
+			ServiceInfo [] si = pi.services;
+			for (int i = 0; i < si.length; i++)
 				{
-				ActivityInfo a = ai[i];
-				if (a.name.length() > 0)
+				ServiceInfo s = si[i];
+				if (s.name.length() > 0)
 					{
-					prgIntent.setClassName(a.packageName, a.name);
+					prgIntent.setClassName(s.packageName, s.name);
 					break;
 					}
 				}
@@ -2605,36 +3293,78 @@ public class DoCommand {
 		catch (NameNotFoundException e)
 			{
 			e.printStackTrace();
+			sRet = sErrorPrefix + "watcher is not properly installed";
+			return(sRet);
 			}
 		
+		prgIntent.putExtra("command", "updt");
 		prgIntent.putExtra("pkgName", sPkgName);
-		prgIntent.putExtra("pkgFileName", sPkgFileName);
-
+		prgIntent.putExtra("pkgFile", sPkgFileName);
+		prgIntent.putExtra("reboot", true);
+		
 		try 
 			{
-			contextWrapper.startActivity(prgIntent);
-			sRet = "exit";
+			if ((sCallBackIP != null) && (sCallBackPort != null) && 
+				(sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))
+				{
+				FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
+				String sBuffer = sCallBackIP + "," + sCallBackPort + "\rupdate started " + sPkgName + " " + sPkgFileName + "\r";
+				fos.write(sBuffer.getBytes());
+				fos.flush();
+				fos.close();
+				fos = null;
+				prgIntent.putExtra("outFile", ctx.getFilesDir() + "/update.info");
+				}
+			else {
+				if (prgIntent.hasExtra("outFile")) {
+					System.out.println("outFile extra unset from intent");
+					prgIntent.removeExtra("outFile");
+				}
+			}
+			
+			ComponentName cn = contextWrapper.startService(prgIntent);
+			if (cn != null)
+				sRet = "exit";
+			else
+				sRet = sErrorPrefix + "Unable to use watcher service";
 			}
 		catch(ActivityNotFoundException anf)
 			{
+			sRet = sErrorPrefix + "Activity Not Found Exception [updt] call failed";
 			anf.printStackTrace();
 			} 
-	
+		catch (FileNotFoundException e)
+			{
+			sRet = sErrorPrefix + "File creation error [updt] call failed";
+			e.printStackTrace();
+			}
+		catch (IOException e)
+			{
+			sRet = sErrorPrefix + "File error [updt] call failed";
+			e.printStackTrace();
+			}
+
 		ctx = null;
+		
 		return (sRet);
 		}
 
-	public String StartJavaPrg(String [] sArgs)
+	public String StartJavaPrg(String [] sArgs, Intent preIntent)
 		{
 		String sRet = "";
 		String sArgList = "";
 		String sUrl = "";
-		String sRedirFileName = "";
+//		String sRedirFileName = "";
+		Intent prgIntent = null;
 		
 		Context ctx = contextWrapper.getApplicationContext();
 		PackageManager pm = ctx.getPackageManager();
 
-		Intent prgIntent = new Intent();
+		if (preIntent == null)
+			prgIntent = new Intent();
+		else
+			prgIntent = preIntent;
+		
 		prgIntent.setPackage(sArgs[0]);
 		prgIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
@@ -2658,8 +3388,10 @@ public class DoCommand {
 		
 		if (sArgs.length > 1)
 			{
-//			if (sArgs[0].contains("android.browser"))
+			if (sArgs[0].contains("android.browser"))
 				prgIntent.setAction(Intent.ACTION_VIEW);
+			else
+				prgIntent.setAction(Intent.ACTION_MAIN);
 			
 			if (sArgs[0].contains("fennec"))
 				{
@@ -2669,14 +3401,18 @@ public class DoCommand {
 				for (int lcv = 1; lcv < sArgs.length; lcv++)
 					{
 					if (sArgs[lcv].contains("://"))
+						{
+						prgIntent.setAction(Intent.ACTION_VIEW);
 						sUrl = sArgs[lcv];
+						}
 					else
 						{
 						if (sArgs[lcv].equals(">"))
 							{
 							lcv++;
 							if (lcv < sArgs.length)
-								sRedirFileName = sArgs[lcv++];
+								lcv++;
+//								sRedirFileName = sArgs[lcv++];
 							}
 						else
 							sArgList += " " + sArgs[lcv];
@@ -2698,7 +3434,9 @@ public class DoCommand {
 				}
 			}
 		else
-			prgIntent.setData(Uri.parse("about:blank"));
+			{
+			prgIntent.setAction(Intent.ACTION_MAIN);
+			}
 
 		try 
 			{
@@ -2738,26 +3476,7 @@ public class DoCommand {
 
 		return (sRet);
 		}
-/*	
-	@SuppressWarnings("unchecked")
-	public static void set(String key, String value) throws Exception
-		{
-	    Class[] classes = Collections.class.getDeclaredClasses();
-	    Map env = System.getenv();
-	    for(Class cl : classes)
-	    	{
-	        if("java.util.Collections$UnmodifiableMap".equals(cl.getName()))
-	        	{
-	            Field field = cl.getDeclaredField("m");
-	            field.setAccessible(true);
-	            Object obj = field.get(env);
-	            Map<String, String> map = (Map<String, String>) obj;
-	            map.put(key, value);
-	        	}
-	    	}
-		}
 
-*/	
 	public String StartPrg2(String [] progArray, OutputStream out)
 		{
 		String sRet = "";
@@ -2768,6 +3487,15 @@ public class DoCommand {
 		int	temp = 0;
 
 		String sEnvString = progArray[0];
+		
+		if (!sEnvString.contains("=") && (sEnvString.length() > 0))
+			{
+			if (sEnvString.contains("/") || sEnvString.contains("\\") || !sEnvString.contains("."))
+				sRet = StartPrg(progArray, out);
+			else
+				sRet = StartJavaPrg(progArray, null);
+			return(sRet);
+			}
 
 		// Set up command line args stripping off the environment string
 		String [] theArgs = new String [nArgs];
@@ -2836,14 +3564,26 @@ public class DoCommand {
 				{
         		envArray[i++] = entry.getKey() + "=" + entry.getValue();
 				}
-	        
-			pProc = Runtime.getRuntime().exec(theArgs, envArray);
+			
+			if (theArgs[0].contains("/") || theArgs[0].contains("\\") || !theArgs[0].contains("."))
+				{
+				pProc = Runtime.getRuntime().exec(theArgs, envArray);
 
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(10000);
-			int nRetCode = pProc.exitValue();
-			sRet = "return code [" + nRetCode + "]";
+				RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+				outThrd.start();
+				outThrd.join(10000);
+				int nRetCode = pProc.exitValue();
+				sRet = "return code [" + nRetCode + "]";
+				}
+			else
+				{
+				Intent preIntent = new Intent();
+				for (lcv = 0; lcv < envArray.length; lcv++)
+					{
+					preIntent.putExtra("env" + lcv, envArray[lcv]);
+					}
+				sRet = StartJavaPrg(theArgs, preIntent);
+				}
 			}
 		catch(UnsupportedOperationException e)
 			{
@@ -2877,44 +3617,13 @@ public class DoCommand {
 
 		return (sRet);
 		}
-/*	
-	public String InstallApplication()
-		{
-		String sRet = "";
-		String sFileName = Environment.getExternalStorageDirectory() + "/org.mozilla.fennec.apk";
-		
-		Intent instIntent = new Intent();
-		
-		instIntent.setAction(android.content.Intent.ACTION_VIEW);
-		instIntent.setDataAndType(Uri.fromFile(new File(sFileName)), "application/vnd.android.package-archive");
-//		instIntent.setDataAndType(Uri.parse("file:///sdcard/org.mozilla.fennec.apk"), "application/vnd.android.package-archive");
-		SUTAgentAndroid.me.startActivity(instIntent);
-		
-//		Instrumentation inst = new Instrumentation();
-//		inst.sendKeyDownUpSync(KeyEvent.KEYCODE_SOFT_LEFT);
-		
-		return(sRet);
-		}
 
-	public String UninstallApplication()
-		{
-		String sRet = "";
-		Uri		pkgURI = Uri.parse("package:" + "org.mozilla.fennec");
-	
-		Intent unInstIntent = new Intent(Intent.ACTION_DELETE, pkgURI);
-	
-		SUTAgentAndroid.me.startActivity(unInstIntent);
-
-		return(sRet);
-		}
-*/
 	private String PrintUsage()
 		{
 		String sRet = 
-			"run [executable] [args]      - start program no wait\n" +
-			"exec [executable] [args]     - start program wait\n" +
-			"fire [executable] [args]     - start program no wait\n" +
-			"envrun [env pairs] [cmdline] - start program no wait\n" +
+			"run [cmdline]                - start program no wait\n" +
+			"exec [env pairs] [cmdline]   - start program no wait optionally pass env\n" +
+			"                               key=value pairs (comma separated)\n" +
 			"kill [program name]          - kill program no path\n" +
 			"killall                      - kill all processes started\n" +
 			"ps                           - list of running processes\n" +
@@ -2922,30 +3631,32 @@ public class DoCommand {
 			"        [os]                 - os version for device\n" +
 			"        [id]                 - unique identifier for device\n" +
 			"        [uptime]             - uptime for device\n" +
-			"        [systime]            - current system time on device\n" +
+			"        [systime]            - current system time\n" +
 			"        [screen]             - width, height and bits per pixel for device\n" +
-			"        [memory]             - physical, free, available, storage memory for device\n" +
+			"        [memory]             - physical, free, available, storage memory\n" +
+			"                               for device\n" +
 			"        [processes]          - list of running processes see 'ps'\n" +
 			"deadman timeout              - set the duration for the deadman timer\n" +
 			"alrt [on/off]                - start or stop sysalert behavior\n" +
 			"disk [arg]                   - prints disk space info\n" +
-			"cp file1 file2               - copy file1 to file2 on device\n" +
-			"time file                    - timestamp for file on device\n" +
-			"hash file                    - generate hash for file on device\n" +
-			"cd directory                 - change cwd on device\n" +
-			"cat file                     - cat file on device\n" +
-			"cwd                          - display cwd on device\n" +
-			"mv file1 file2               - move file1 to file2 on device\n" +
+			"cp file1 file2               - copy file1 to file2\n" +
+			"time file                    - timestamp for file\n" +
+			"hash file                    - generate hash for file\n" +
+			"cd directory                 - change cwd\n" +
+			"cat file                     - cat file\n" +
+			"cwd                          - display cwd\n" +
+			"mv file1 file2               - move file1 to file2\n" +
 			"push filename                - push file to device\n" +
-			"rm file                      - delete file on device\n" +
-			"rmdr directory               - delete directory on device even if not empty\n" +
-			"mkdr directory               - create directory on device\n" +
-			"dirw directory               - tests whether the directory is writable on the device\n" +
-			"stat processid               - stat process on device\n" +
-			"dead processid               - print whether the process is alive or hung on device\n" +
-			"mems                         - dump memory stats on device\n" +
-			"ls                           - print directory on device\n" +
-			"tmpd                         - print temp directory on device\n" +
+			"rm file                      - delete file\n" +
+			"rmdr directory               - delete directory even if not empty\n" +
+			"mkdr directory               - create directory\n" +
+			"dirw directory               - tests whether the directory is writable\n" +
+			"isdir directory              - test whether the directory exists\n" +
+			"stat processid               - stat process\n" +
+			"dead processid               - print whether the process is alive or hung\n" +
+			"mems                         - dump memory stats\n" +
+			"ls                           - print directory\n" +
+			"tmpd                         - print temp directory\n" +
 			"ping [hostname/ipaddr]       - ping a network device\n" +
 			"unzp zipfile destdir         - unzip the zipfile into the destination dir\n" +
 			"zip zipfile src              - zip the source file/dir into zipfile\n" +
@@ -2953,9 +3664,12 @@ public class DoCommand {
 			"inst /path/filename.apk      - install the referenced apk file\n" +
 			"uninst packagename           - uninstall the referenced package\n" +
 			"updt pkgname pkgfile         - unpdate the referenced package\n" +
-			"clok                         - the current device time expressed as the number of millisecs since epoch\n" +
-			"settime date time            - sets the device date and time (YYYY/MM/DD HH:MM:SS)\n" +
-			"tzset timezone               - sets the device timezone format is GMTxhh:mm x = +/- or a recognized Olsen string\n" +
+			"clok                         - the current device time expressed as the" +
+			"                               number of millisecs since epoch\n" +
+			"settime date time            - sets the device date and time\n" +
+			"                               (YYYY/MM/DD HH:MM:SS)\n" +
+			"tzset timezone               - sets the device timezone format is\n" +
+			"                               GMTxhh:mm x = +/- or a recognized Olsen string\n" +
 			"tzget                        - returns the current timezone set on the device\n" +
 			"rebt                         - reboot device\n" +
 			"quit                         - disconnect SUTAgent\n" +
diff --git a/build/mobile/sutagent/android/Makefile.in b/build/mobile/sutagent/android/Makefile.in
index 83a1ea37253b..8138841ae6dd 100755
--- a/build/mobile/sutagent/android/Makefile.in
+++ b/build/mobile/sutagent/android/Makefile.in
@@ -51,6 +51,7 @@ JAVAFILES = \
   DataWorkerThread.java \
   DoAlert.java \
   DoCommand.java \
+  NtpMessage.java \
   Power.java \
   RedirOutputThread.java \
   RunCmdThread.java \
diff --git a/build/mobile/sutagent/android/NtpMessage.java b/build/mobile/sutagent/android/NtpMessage.java
new file mode 100644
index 000000000000..d4104dc41091
--- /dev/null
+++ b/build/mobile/sutagent/android/NtpMessage.java
@@ -0,0 +1,468 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * This class represents a NTP message, as specified in RFC 2030.  The message
+ * format is compatible with all versions of NTP and SNTP.
+ *
+ * This class does not support the optional authentication protocol, and
+ * ignores the key ID and message digest fields.
+ *
+ * For convenience, this class exposes message values as native Java types, not
+ * the NTP-specified data formats.  For example, timestamps are
+ * stored as doubles (as opposed to the NTP unsigned 64-bit fixed point
+ * format).
+ *
+ * However, the contructor NtpMessage(byte[]) and the method toByteArray()
+ * allow the import and export of the raw NTP message format.
+ *
+ *
+ * Usage example
+ *
+ * // Send message
+ * DatagramSocket socket = new DatagramSocket();
+ * InetAddress address = InetAddress.getByName("ntp.cais.rnp.br");
+ * byte[] buf = new NtpMessage().toByteArray();
+ * DatagramPacket packet = new DatagramPacket(buf, buf.length, address, 123);
+ * socket.send(packet);
+ *
+ * // Get response
+ * socket.receive(packet);
+ * System.out.println(msg.toString());
+ *
+ *
+ * This code is copyright (c) Adam Buckley 2004
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  A HTML version of the GNU General Public License can be
+ * seen at http://www.gnu.org/licenses/gpl.html
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ *
+ * Comments for member variables are taken from RFC2030 by David Mills,
+ * University of Delaware.
+ *
+ * Number format conversion code in NtpMessage(byte[] array) and toByteArray()
+ * inspired by http://www.pps.jussieu.fr/~jch/enseignement/reseaux/
+ * NTPMessage.java which is copyright (c) 2003 by Juliusz Chroboczek
+ *
+ * @author Adam Buckley
+ * ***** END LICENSE BLOCK ***** */
+package com.mozilla.SUTAgentAndroid;
+
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+public class NtpMessage
+{
+    /**
+     * This is a two-bit code warning of an impending leap second to be
+     * inserted/deleted in the last minute of the current day.  It's values
+     * may be as follows:
+     *
+     * Value     Meaning
+     * -----     -------
+     * 0         no warning
+     * 1         last minute has 61 seconds
+     * 2         last minute has 59 seconds)
+     * 3         alarm condition (clock not synchronized)
+     */
+    public byte leapIndicator = 0;
+
+
+    /**
+     * This value indicates the NTP/SNTP version number.  The version number
+     * is 3 for Version 3 (IPv4 only) and 4 for Version 4 (IPv4, IPv6 and OSI).
+     * If necessary to distinguish between IPv4, IPv6 and OSI, the
+     * encapsulating context must be inspected.
+     */
+    public byte version = 3;
+
+
+    /**
+     * This value indicates the mode, with values defined as follows:
+     *
+     * Mode     Meaning
+     * ----     -------
+     * 0        reserved
+     * 1        symmetric active
+     * 2        symmetric passive
+     * 3        client
+     * 4        server
+     * 5        broadcast
+     * 6        reserved for NTP control message
+     * 7        reserved for private use
+     *
+     * In unicast and anycast modes, the client sets this field to 3 (client)
+     * in the request and the server sets it to 4 (server) in the reply. In
+     * multicast mode, the server sets this field to 5 (broadcast).
+     */
+    public byte mode = 0;
+
+
+    /**
+     * This value indicates the stratum level of the local clock, with values
+     * defined as follows:
+     *
+     * Stratum  Meaning
+     * ----------------------------------------------
+     * 0        unspecified or unavailable
+     * 1        primary reference (e.g., radio clock)
+     * 2-15     secondary reference (via NTP or SNTP)
+     * 16-255   reserved
+     */
+    public short stratum = 0;
+
+
+    /**
+     * This value indicates the maximum interval between successive messages,
+     * in seconds to the nearest power of two. The values that can appear in
+     * this field presently range from 4 (16 s) to 14 (16284 s); however, most
+     * applications use only the sub-range 6 (64 s) to 10 (1024 s).
+     */
+    public byte pollInterval = 0;
+
+
+    /**
+     * This value indicates the precision of the local clock, in seconds to
+     * the nearest power of two.  The values that normally appear in this field
+     * range from -6 for mains-frequency clocks to -20 for microsecond clocks
+     * found in some workstations.
+     */
+    public byte precision = 0;
+
+
+    /**
+     * This value indicates the total roundtrip delay to the primary reference
+     * source, in seconds.  Note that this variable can take on both positive
+     * and negative values, depending on the relative time and frequency
+     * offsets. The values that normally appear in this field range from
+     * negative values of a few milliseconds to positive values of several
+     * hundred milliseconds.
+     */
+    public double rootDelay = 0;
+
+
+    /**
+     * This value indicates the nominal error relative to the primary reference
+     * source, in seconds.  The values  that normally appear in this field
+     * range from 0 to several hundred milliseconds.
+     */
+    public double rootDispersion = 0;
+
+
+    /**
+     * This is a 4-byte array identifying the particular reference source.
+     * In the case of NTP Version 3 or Version 4 stratum-0 (unspecified) or
+     * stratum-1 (primary) servers, this is a four-character ASCII string, left
+     * justified and zero padded to 32 bits. In NTP Version 3 secondary
+     * servers, this is the 32-bit IPv4 address of the reference source. In NTP
+     * Version 4 secondary servers, this is the low order 32 bits of the latest
+     * transmit timestamp of the reference source. NTP primary (stratum 1)
+     * servers should set this field to a code identifying the external
+     * reference source according to the following list. If the external
+     * reference is one of those listed, the associated code should be used.
+     * Codes for sources not listed can be contrived as appropriate.
+     *
+     * Code     External Reference Source
+     * ----     -------------------------
+     * LOCL     uncalibrated local clock used as a primary reference for
+     *          a subnet without external means of synchronization
+     * PPS      atomic clock or other pulse-per-second source
+     *          individually calibrated to national standards
+     * ACTS     NIST dialup modem service
+     * USNO     USNO modem service
+     * PTB      PTB (Germany) modem service
+     * TDF      Allouis (France) Radio 164 kHz
+     * DCF      Mainflingen (Germany) Radio 77.5 kHz
+     * MSF      Rugby (UK) Radio 60 kHz
+     * WWV      Ft. Collins (US) Radio 2.5, 5, 10, 15, 20 MHz
+     * WWVB     Boulder (US) Radio 60 kHz
+     * WWVH     Kaui Hawaii (US) Radio 2.5, 5, 10, 15 MHz
+     * CHU      Ottawa (Canada) Radio 3330, 7335, 14670 kHz
+     * LORC     LORAN-C radionavigation system
+     * OMEG     OMEGA radionavigation system
+     * GPS      Global Positioning Service
+     * GOES     Geostationary Orbit Environment Satellite
+     */
+    public byte[] referenceIdentifier = {0, 0, 0, 0};
+
+
+    /**
+     * This is the time at which the local clock was last set or corrected, in
+     * seconds since 00:00 1-Jan-1900.
+     */
+    public double referenceTimestamp = 0;
+
+
+    /**
+     * This is the time at which the request departed the client for the
+     * server, in seconds since 00:00 1-Jan-1900.
+     */
+    public double originateTimestamp = 0;
+
+
+    /**
+     * This is the time at which the request arrived at the server, in seconds
+     * since 00:00 1-Jan-1900.
+     */
+    public double receiveTimestamp = 0;
+
+
+    /**
+     * This is the time at which the reply departed the server for the client,
+     * in seconds since 00:00 1-Jan-1900.
+     */
+    public double transmitTimestamp = 0;
+
+
+
+    /**
+     * Constructs a new NtpMessage from an array of bytes.
+     */
+    public NtpMessage(byte[] array)
+    {
+        // See the packet format diagram in RFC 2030 for details
+        leapIndicator = (byte) ((array[0] >> 6) & 0x3);
+        version = (byte) ((array[0] >> 3) & 0x7);
+        mode = (byte) (array[0] & 0x7);
+        stratum = unsignedByteToShort(array[1]);
+        pollInterval = array[2];
+        precision = array[3];
+
+        rootDelay = (array[4] * 256.0) +
+            unsignedByteToShort(array[5]) +
+            (unsignedByteToShort(array[6]) / 256.0) +
+            (unsignedByteToShort(array[7]) / 65536.0);
+
+        rootDispersion = (unsignedByteToShort(array[8]) * 256.0) +
+            unsignedByteToShort(array[9]) +
+            (unsignedByteToShort(array[10]) / 256.0) +
+            (unsignedByteToShort(array[11]) / 65536.0);
+
+        referenceIdentifier[0] = array[12];
+        referenceIdentifier[1] = array[13];
+        referenceIdentifier[2] = array[14];
+        referenceIdentifier[3] = array[15];
+
+        referenceTimestamp = decodeTimestamp(array, 16);
+        originateTimestamp = decodeTimestamp(array, 24);
+        receiveTimestamp = decodeTimestamp(array, 32);
+        transmitTimestamp = decodeTimestamp(array, 40);
+    }
+
+
+
+    /**
+     * Constructs a new NtpMessage in client -> server mode, and sets the
+     * transmit timestamp to the current time.
+     */
+    public NtpMessage()
+    {
+        // Note that all the other member variables are already set with
+        // appropriate default values.
+        this.mode = 3;
+        this.transmitTimestamp = (System.currentTimeMillis()/1000.0) + 2208988800.0;
+    }
+
+
+
+    /**
+     * This method constructs the data bytes of a raw NTP packet.
+     */
+    public byte[] toByteArray()
+    {
+        // All bytes are automatically set to 0
+        byte[] p = new byte[48];
+
+        p[0] = (byte) (leapIndicator << 6 | version << 3 | mode);
+        p[1] = (byte) stratum;
+        p[2] = (byte) pollInterval;
+        p[3] = (byte) precision;
+
+        // root delay is a signed 16.16-bit FP, in Java an int is 32-bits
+        int l = (int) (rootDelay * 65536.0);
+        p[4] = (byte) ((l >> 24) & 0xFF);
+        p[5] = (byte) ((l >> 16) & 0xFF);
+        p[6] = (byte) ((l >> 8) & 0xFF);
+        p[7] = (byte) (l & 0xFF);
+
+        // root dispersion is an unsigned 16.16-bit FP, in Java there are no
+        // unsigned primitive types, so we use a long which is 64-bits
+        long ul = (long) (rootDispersion * 65536.0);
+        p[8] = (byte) ((ul >> 24) & 0xFF);
+        p[9] = (byte) ((ul >> 16) & 0xFF);
+        p[10] = (byte) ((ul >> 8) & 0xFF);
+        p[11] = (byte) (ul & 0xFF);
+
+        p[12] = referenceIdentifier[0];
+        p[13] = referenceIdentifier[1];
+        p[14] = referenceIdentifier[2];
+        p[15] = referenceIdentifier[3];
+
+        encodeTimestamp(p, 16, referenceTimestamp);
+        encodeTimestamp(p, 24, originateTimestamp);
+        encodeTimestamp(p, 32, receiveTimestamp);
+        encodeTimestamp(p, 40, transmitTimestamp);
+
+        return p;
+    }
+
+
+
+    /**
+     * Returns a string representation of a NtpMessage
+     */
+    public String toString()
+    {
+        String precisionStr =
+            new DecimalFormat("0.#E0").format(Math.pow(2, precision));
+
+        return "Leap indicator: " + leapIndicator + "\n" +
+            "Version: " + version + "\n" +
+            "Mode: " + mode + "\n" +
+            "Stratum: " + stratum + "\n" +
+            "Poll: " + pollInterval + "\n" +
+            "Precision: " + precision + " (" + precisionStr + " seconds)\n" +
+            "Root delay: " + new DecimalFormat("0.00").format(rootDelay*1000) + " ms\n" +
+            "Root dispersion: " + new DecimalFormat("0.00").format(rootDispersion*1000) + " ms\n" +
+            "Reference identifier: " + referenceIdentifierToString(referenceIdentifier, stratum, version) + "\n" +
+            "Reference timestamp: " + timestampToString(referenceTimestamp) + "\n" +
+            "Originate timestamp: " + timestampToString(originateTimestamp) + "\n" +
+            "Receive timestamp:   " + timestampToString(receiveTimestamp) + "\n" +
+            "Transmit timestamp:  " + timestampToString(transmitTimestamp);
+    }
+
+
+
+    /**
+     * Converts an unsigned byte to a short.  By default, Java assumes that
+     * a byte is signed.
+     */
+    public static short unsignedByteToShort(byte b)
+    {
+        if((b & 0x80)==0x80) return (short) (128 + (b & 0x7f));
+        else return (short) b;
+    }
+
+
+
+    /**
+     * Will read 8 bytes of a message beginning at <code>pointer</code>
+     * and return it as a double, according to the NTP 64-bit timestamp
+     * format.
+     */
+    public static double decodeTimestamp(byte[] array, int pointer)
+    {
+        double r = 0.0;
+
+        for(int i=0; i<8; i++)
+        {
+            r += unsignedByteToShort(array[pointer+i]) * Math.pow(2, (3-i)*8);
+        }
+
+        return r;
+    }
+
+
+
+    /**
+     * Encodes a timestamp in the specified position in the message
+     */
+    public static void encodeTimestamp(byte[] array, int pointer, double timestamp)
+    {
+        // Converts a double into a 64-bit fixed point
+        for(int i=0; i<8; i++)
+        {
+            // 2^24, 2^16, 2^8, .. 2^-32
+            double base = Math.pow(2, (3-i)*8);
+
+            // Capture byte value
+            array[pointer+i] = (byte) (timestamp / base);
+
+            // Subtract captured value from remaining total
+            timestamp = timestamp - (double) (unsignedByteToShort(array[pointer+i]) * base);
+        }
+
+        // From RFC 2030: It is advisable to fill the non-significant
+        // low order bits of the timestamp with a random, unbiased
+        // bitstring, both to avoid systematic roundoff errors and as
+        // a means of loop detection and replay detection.
+        array[7] = (byte) (Math.random()*255.0);
+    }
+
+
+
+    /**
+     * Returns a timestamp (number of seconds since 00:00 1-Jan-1900) as a
+     * formatted date/time string.
+     */
+    public static String timestampToString(double timestamp)
+    {
+        if(timestamp==0) return "0";
+
+        // timestamp is relative to 1900, utc is used by Java and is relative
+        // to 1970
+        double utc = timestamp - (2208988800.0);
+
+        // milliseconds
+        long ms = (long) (utc * 1000.0);
+
+        // date/time
+        String date = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss").format(new Date(ms));
+
+        // fraction
+        double fraction = timestamp - ((long) timestamp);
+        String fractionSting = new DecimalFormat(".000000").format(fraction);
+
+        return date + fractionSting;
+    }
+
+
+
+    /**
+     * Returns a string representation of a reference identifier according
+     * to the rules set out in RFC 2030.
+     */
+    public static String referenceIdentifierToString(byte[] ref, short stratum, byte version)
+    {
+        // From the RFC 2030:
+        // In the case of NTP Version 3 or Version 4 stratum-0 (unspecified)
+        // or stratum-1 (primary) servers, this is a four-character ASCII
+        // string, left justified and zero padded to 32 bits.
+        if(stratum==0 || stratum==1)
+        {
+            return new String(ref);
+        }
+
+        // In NTP Version 3 secondary servers, this is the 32-bit IPv4
+        // address of the reference source.
+        else if(version==3)
+        {
+            return unsignedByteToShort(ref[0]) + "." +
+                unsignedByteToShort(ref[1]) + "." +
+                unsignedByteToShort(ref[2]) + "." +
+                unsignedByteToShort(ref[3]);
+        }
+
+        // In NTP Version 4 secondary servers, this is the low order 32 bits
+        // of the latest transmit timestamp of the reference source.
+        else if(version==4)
+        {
+            return "" + ((unsignedByteToShort(ref[0]) / 256.0) +
+                (unsignedByteToShort(ref[1]) / 65536.0) +
+                (unsignedByteToShort(ref[2]) / 16777216.0) +
+                (unsignedByteToShort(ref[3]) / 4294967296.0));
+        }
+
+        return "";
+    }
+}
diff --git a/build/mobile/sutagent/android/R.java b/build/mobile/sutagent/android/R.java
index 1f19ddecb4da..51c3077e34c1 100755
--- a/build/mobile/sutagent/android/R.java
+++ b/build/mobile/sutagent/android/R.java
@@ -27,6 +27,7 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f040001;
+        public static final int foreground_service_started=0x7f040002;
         public static final int hello=0x7f040000;
     }
 }
diff --git a/build/mobile/sutagent/android/RedirOutputThread.java b/build/mobile/sutagent/android/RedirOutputThread.java
index cf6da41a352c..7a846d4ae3c6 100755
--- a/build/mobile/sutagent/android/RedirOutputThread.java
+++ b/build/mobile/sutagent/android/RedirOutputThread.java
@@ -49,6 +49,7 @@ public class RedirOutputThread extends Thread
 	InputStream	sutOut;
 	Process pProc;
 	String	strOutput;
+	int	nExitCode = -1;
 	
 	public RedirOutputThread(Process pProc, OutputStream out)
 		{
@@ -134,7 +135,6 @@ public class RedirOutputThread extends Thread
 				} 
 			catch (IOException e)
 				{
-//				Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
 				e.printStackTrace();
 				}
 			}
@@ -147,15 +147,14 @@ public class RedirOutputThread extends Thread
 	private boolean IsProcRunning(Process pProc)
 		{
 		boolean bRet = false;
-		@SuppressWarnings("unused")
-		int nExitCode = 0;
 	
 		try
 			{
 			nExitCode = pProc.exitValue();
 			}
 		catch (IllegalThreadStateException z)
-			{	
+			{
+			nExitCode = -1;
 			bRet = true;
 			}
 
diff --git a/build/mobile/sutagent/android/SUTAgentAndroid.java b/build/mobile/sutagent/android/SUTAgentAndroid.java
index b695721940d8..c54ba3fb8e4f 100755
--- a/build/mobile/sutagent/android/SUTAgentAndroid.java
+++ b/build/mobile/sutagent/android/SUTAgentAndroid.java
@@ -45,18 +45,17 @@ import java.net.SocketException;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Timer;
+
 import com.mozilla.SUTAgentAndroid.service.ASMozStub;
 import com.mozilla.SUTAgentAndroid.service.DoCommand;
-
-// import dalvik.system.VMRuntime;
 import android.app.Activity;
-import android.app.KeyguardManager;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
-// import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
@@ -65,8 +64,7 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
 import android.os.BatteryManager;
 import android.os.Bundle;
-import android.os.Debug;
-import android.os.PowerManager;
+import android.os.Handler;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.Menu;
@@ -79,11 +77,12 @@ import android.widget.Toast;
 
 public class SUTAgentAndroid extends Activity 
 	{
+	final Handler mHandler = new Handler();
+
 	public static final int START_PRG = 1959;
 	MenuItem mExitMenuItem;
 	Timer timer = null;
 	
-//	public static SUTAgentAndroid me = null;
     public static String sUniqueID = null;
     public static String sLocalIPAddr = null;
     public static String sACStatus = null;
@@ -100,13 +99,14 @@ public class SUTAgentAndroid extends Activity
     private static String HardwareID = "";
     private static String Pool = "";
     private static String sRegString = "";
+    private static String sNTPServer = "";
     
     private WifiLock wl = null;
-    private PowerManager.WakeLock pwl = null;
     
     private BroadcastReceiver battReceiver = null;
-//    private ComponentName service = null;
-
+    
+    private TextView  tv = null;
+    
 	public boolean onCreateOptionsMenu(Menu menu)
 		{
 		mExitMenuItem = menu.add("Exit");
@@ -133,31 +133,10 @@ public class SUTAgentAndroid extends Activity
     public void onCreate(Bundle savedInstanceState)
     	{
         super.onCreate(savedInstanceState);
+        
         setContentView(R.layout.main);
 
-//        Debug.waitForDebugger();
-
-//        long lHeapSize = VMRuntime.getRuntime().getMinimumHeapSize();
-//        lHeapSize = 16000000;
-//        VMRuntime.getRuntime().setMinimumHeapSize(lHeapSize);
-        
-        // Keep phone from locking or remove lock on screen
-        KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
-        if (km != null)
-        	{
-        	KeyguardManager.KeyguardLock kl = km.newKeyguardLock("SUTAgent");
-        	if (kl != null)
-        		kl.disableKeyguard();
-        	}
-        
-        // No sleeping on the job
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        if (pm != null)
-        	{
-        	pwl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "SUTAgent");
-        	if (pwl != null)
-        		pwl.acquire();
-        	}
+        fixScreenOrientation();
         
         DoCommand dc = new DoCommand(getApplication());
         
@@ -170,14 +149,13 @@ public class SUTAgentAndroid extends Activity
         SUTAgentAndroid.RegSvrIPPort = dc.GetIniData("Registration Server", "PORT", sIniFile);
         SUTAgentAndroid.HardwareID = dc.GetIniData("Registration Server", "HARDWARE", sIniFile);
         SUTAgentAndroid.Pool = dc.GetIniData("Registration Server", "POOL", sIniFile);
+        SUTAgentAndroid.sNTPServer = dc.GetIniData("NTP Server", "IPAddr", sIniFile);
 
-        TextView  tv = (TextView) this.findViewById(R.id.Textview01);
+        tv = (TextView) this.findViewById(R.id.Textview01);
 
         if (getLocalIpAddress() == null)
         	setUpNetwork(sIniFile);
         
-//        me = this;
-        
         WifiInfo wifi;
         WifiManager wifiMan = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         String macAddress = "Unknown";
@@ -195,7 +173,7 @@ public class SUTAgentAndroid extends Activity
         if (sUniqueID == null)
         	{
         	BluetoothAdapter ba = BluetoothAdapter.getDefaultAdapter();
-        	if (ba.isEnabled() != true)
+        	if ((ba != null) && (ba.isEnabled() != true))
         		{
         		ba.enable();
         		while(ba.getState() != BluetoothAdapter.STATE_ON)
@@ -225,8 +203,11 @@ public class SUTAgentAndroid extends Activity
         		}
         	else
         		{
-        		sUniqueID = ba.getAddress();
-        		sUniqueID.toLowerCase();
+        		if (ba != null)
+        			{
+        			sUniqueID = ba.getAddress();
+        			sUniqueID.toLowerCase();
+        			}
         		}
         	}
 
@@ -258,6 +239,8 @@ public class SUTAgentAndroid extends Activity
         sConfig += "Network Info" + lineSep;
         sConfig += "\tMac Address: " + macAddress + lineSep;
         sConfig += "\tIP Address: " + sLocalIPAddr + lineSep;
+
+        displayStatus(sConfig);
         
         sRegString = "NAME=" + sUniqueID;
         sRegString += "&IPADDR=" + sLocalIPAddr;
@@ -273,35 +256,28 @@ public class SUTAgentAndroid extends Activity
         
         String sTemp = Uri.encode(sRegString,"=&");
         sRegString = "register " + sTemp;
-        
+
         if (!bNetworkingStarted)
         	{
         	Thread thread = new Thread(null, doStartService, "StartServiceBkgnd");
         	thread.start();
-//        	ToDoListening(1,300,dc);
         	bNetworkingStarted = true;
-        	String sRegRet = "";
-        	if (RegSvrIPAddr.length() > 0)
-        		{
-        		sRegRet = dc.RegisterTheDevice(RegSvrIPAddr, RegSvrIPPort, sRegString);
-        		if (sRegRet.contains("ok"))
-        			{
-        			sConfig += "Registered with testserver" + lineSep;
-        			sConfig += "\tIPAddress: " + RegSvrIPAddr + lineSep;
-        			if (RegSvrIPPort.length() > 0)
-        				sConfig += "\tPort: " + RegSvrIPPort + lineSep;
-        			}
-        		else
-        			sConfig += "Not registered with testserver" + lineSep;
-        		}
-    		else
-    			sConfig += "Not registered with testserver" + lineSep;
+        	
+        	Thread thread2 = new Thread(null, doRegisterDevice, "RegisterDeviceBkgnd");
+        	thread2.start();
         	}
         
-        tv.setText(sConfig);
-
         monitorBatteryState();
         
+    	// If we are returning from an update let'em know we're back
+    	Thread thread3 = new Thread(null, doUpdateCallback, "UpdateCallbackBkgnd");
+    	thread3.start();
+    	
+    	if (SUTAgentAndroid.sNTPServer.length() > 0) {
+        	Thread thread4 = new Thread(null, doSetClock, "SetClockBkgrnd");
+        	thread4.start();
+    	}
+    	
         final Button goButton = (Button) findViewById(R.id.Button01);
         goButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
@@ -310,6 +286,31 @@ public class SUTAgentAndroid extends Activity
         	});
         }
     
+    private class UpdateStatus implements Runnable {
+    	public String sText = "";
+    	
+    	UpdateStatus(String sStatus) {
+    		sText = sStatus;
+    	}
+    	
+		@Override
+		public void run() {
+			displayStatus(sText);
+		}
+    }
+ 
+    public synchronized void displayStatus(String sStatus) {
+    	String sTVText = (String) tv.getText();
+    	sTVText += sStatus;
+    	tv.setText(sTVText);
+    }
+    
+    public void fixScreenOrientation()
+    	{
+    	setRequestedOrientation((getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) ?
+    							ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);    	
+    	}
+    
     protected void onActivityResult(int requestCode, int resultCode, Intent data)
     	{
         if (requestCode == START_PRG)
@@ -330,19 +331,11 @@ public class SUTAgentAndroid extends Activity
     		bNetworkingStarted = false;
     		
 			unregisterReceiver(battReceiver);
-	        KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
-	        if (km != null)
-	        	{
-	        	KeyguardManager.KeyguardLock kl = km.newKeyguardLock("SUTAgent");
-	        	if (kl != null)
-	        		kl.reenableKeyguard();
-	        	}
-	        
-	        if (pwl != null)
-	        	pwl.release();
 	        
 	    	if (wl != null)
 	    		wl.release();
+	    	
+	    	System.exit(0);
     		}
     	}
     
@@ -453,7 +446,6 @@ public class SUTAgentAndroid extends Activity
 			nRet = Settings.System.getInt(cr, Settings.System.WIFI_USE_STATIC_IP);
 			String foo2 = "" + nRet;
 		} catch (SettingNotFoundException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 */
@@ -614,7 +606,67 @@ public class SUTAgentAndroid extends Activity
     	
     	return(bRet);
     	}
+
+    // If there is an update.info file callback the server and send the status
+    private Runnable doUpdateCallback = new Runnable() {
+    	public void run() {
+    		DoCommand dc = new DoCommand(getApplication());
+    		String sRet = dc.UpdateCallBack("update.info");
+    		if (sRet.length() > 0) {
+        		if (sRet.contains("ok")) {
+        			sRet = "Callback Server contacted successfully" + lineSep;
+    			} else if (sRet.contains("Nothing to do")) {
+    				sRet = "";
+    			} else {
+    				sRet = "Callback Server NOT contacted successfully" + lineSep;
+    			}
+    		}
+            if (sRet.length() > 0)
+            	mHandler.post(new UpdateStatus(sRet));
+            dc = null;
+    	}
+    };
     
+    private Runnable doSetClock = new Runnable() {
+    	public void run() {
+			String sRet = "";
+
+    		DoCommand dc = new DoCommand(getApplication());
+
+    		sRet = dc.SetSystemTime(sNTPServer, null, null);
+    		
+           	mHandler.post(new UpdateStatus(sRet));
+           	
+            dc = null;
+    	}
+    };
+    
+    // registers with the reg server defined in the SUTAgent.ini file
+    private Runnable doRegisterDevice = new Runnable() {
+    	public void run() {
+    		DoCommand dc = new DoCommand(getApplication());
+    		String sRet = "";
+        	if (RegSvrIPAddr.length() > 0) {
+        		String sRegRet = dc.RegisterTheDevice(RegSvrIPAddr, RegSvrIPPort, sRegString);
+        		if (sRegRet.contains("ok")) {
+        			sRet += "Registered with testserver" + lineSep;
+        			sRet += "\tIPAddress: " + RegSvrIPAddr + lineSep;
+        			if (RegSvrIPPort.length() > 0)
+        				sRet += "\tPort: " + RegSvrIPPort + lineSep;
+    			} else {
+    				sRet += "Not registered with testserver" + lineSep;
+    			}
+    		} else {
+    			sRet += "Not registered with testserver" + lineSep;
+    		}
+        	
+        if (sRet.length() > 0)
+        	mHandler.post(new UpdateStatus(sRet));
+        dc = null;
+    	}
+    };
+    
+    // this starts the listener service for the command and data channels
     private Runnable doStartService = new Runnable()
     	{
     	public void run()
@@ -622,101 +674,8 @@ public class SUTAgentAndroid extends Activity
 			Intent listenerService = new Intent();
 			listenerService.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
 			startService(listenerService);
-//			service = startService(listenerService);
     		}
     	};
-/*
-    class ToDoListener extends TimerTask 
-    	{
-    	boolean 	bFirstRun = true;
-    	DoCommand	dc = null;
-    	
-    	ToDoListener() {}
-    	
-    	ToDoListener(DoCommand dc)
-    		{
-    		this.dc = dc;
-    		}
-    	
-		public void run ()
-			{
-			if (bFirstRun == true)
-				{
-				Intent listenerService = new Intent();
-				listenerService.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
-				service = startService(listenerService);
-				bFirstRun = false;
-				}
-			else
-				{
-				if (dc != null)
-					{
-					String sRet = this.dc.SendPing("www.mozilla.org", null);
-					if (sRet.contains("3 received"))
-						this.dc.StopAlert();
-					else
-						this.dc.StartAlert();
-					sRet = null;
-					System.gc();
-					}
-				}
-			}
-		}
-	
-	public void ToDoListening(int delay, int interval, DoCommand dc)
-		{
-		if (timer == null)
-			timer = new Timer();
-//		timer.scheduleAtFixedRate(new ToDoListener(dc), delay * 1000, interval * 1000);
-//		timer.schedule(new ToDoListener(dc), delay * 1000);
-		timer.schedule(new ToDoListener(), delay * 1000);
-		}
-
-	class DoHeartBeat extends TimerTask
-		{
-    	PrintWriter out;
-	
-    	DoHeartBeat(PrintWriter out)
-			{
-    		this.out = out;
-			}
-	
-    	public void run ()
-			{
-    		String sRet = "";
-    		
-    		Calendar cal = Calendar.getInstance();
-    		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd-HH:mm:ss");
-    		sRet = sdf.format(cal.getTime());
-    		sRet += " Thump thump - " + sUniqueID + "\r\n";
-
-    		out.write(sRet);
-    		out.flush();
-			}
-		}
-
-	public void StartHeartBeat(PrintWriter out)
-		{
-		// start the heartbeat
-		this.dataOut = out;
-		if (timer == null)
-			timer = new Timer();
-		timer.scheduleAtFixedRate(new DoHeartBeat(dataOut), 0, 60000);
-		}
-	
-	public void StopHeartBeat()
-		{
-		// stop the heartbeat
-		this.dataOut = null;
-		if (timer != null)
-			{
-			timer.cancel();
-			timer.purge();
-			timer = null;
-			System.gc();
-			}
-		}
-*/	
 	
     public String getLocalIpAddress()
 		{
diff --git a/build/mobile/sutagent/android/res/layout/main.xml b/build/mobile/sutagent/android/res/layout/main.xml
index eb534995432f..8c7d0599376e 100755
--- a/build/mobile/sutagent/android/res/layout/main.xml
+++ b/build/mobile/sutagent/android/res/layout/main.xml
@@ -14,4 +14,6 @@
 
 <Button android:id="@+id/Button01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" android:text="Exit"></Button>
 
+
+
 </LinearLayout>
diff --git a/build/mobile/sutagent/android/res/values/strings.xml b/build/mobile/sutagent/android/res/values/strings.xml
index b815f02e27a0..f5917ca7134b 100755
--- a/build/mobile/sutagent/android/res/values/strings.xml
+++ b/build/mobile/sutagent/android/res/values/strings.xml
@@ -3,4 +3,8 @@
     
     <string name="hello">Hello World, SUTAgentAndroid!</string>
     <string name="app_name">SUTAgentAndroid</string>
+	
+
+<string name="foreground_service_started">Foreground Service Started (ASMozStub)</string>
+
 </resources>

From e8ae13563913f73b95b8d13cb8acefb7f9934d3c Mon Sep 17 00:00:00 2001
From: Bob Moss <bmoss@mozilla.com>
Date: Mon, 18 Apr 2011 11:55:24 -0700
Subject: [PATCH 224/509] Bug 650110 - Update SUTAgent, whitespace refactor for
 agent code r=ctalbert

---
 build/mobile/sutagent/android/ASMozStub.java  |  430 +-
 .../sutagent/android/AlertLooperThread.java   |  192 +-
 .../sutagent/android/CmdWorkerThread.java     |  398 +-
 .../sutagent/android/DataWorkerThread.java    |  474 +-
 build/mobile/sutagent/android/DoAlert.java    |  162 +-
 build/mobile/sutagent/android/DoCommand.java  | 7362 ++++++++---------
 build/mobile/sutagent/android/Power.java      |  204 +-
 build/mobile/sutagent/android/R.java          |   66 +-
 .../sutagent/android/RedirOutputThread.java   |  326 +-
 .../mobile/sutagent/android/RunCmdThread.java |  636 +-
 .../sutagent/android/RunDataThread.java       |  250 +-
 .../sutagent/android/SUTAgentAndroid.java     | 1034 +--
 .../android/SUTStartupIntentReceiver.java     |  106 +-
 13 files changed, 5820 insertions(+), 5820 deletions(-)

diff --git a/build/mobile/sutagent/android/ASMozStub.java b/build/mobile/sutagent/android/ASMozStub.java
index a20e2b5ad077..b21584015a5e 100755
--- a/build/mobile/sutagent/android/ASMozStub.java
+++ b/build/mobile/sutagent/android/ASMozStub.java
@@ -1,215 +1,215 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.ServerSocket;
-import java.util.Timer;
-
-import com.mozilla.SUTAgentAndroid.R;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.IBinder;
-import android.util.Log;
-import android.view.Gravity;
-import android.widget.Toast;
-
-public class ASMozStub extends android.app.Service {
-	
-	private ServerSocket cmdChnl = null;
-	private ServerSocket dataChnl = null;
-	private Handler handler = new Handler();
-	RunCmdThread runCmdThrd = null;
-	RunDataThread runDataThrd = null;
-	Thread monitor = null;
-	Timer timer = null;
-	
-	@SuppressWarnings("unchecked")
-	private static final Class[] mStartForegroundSignature = new Class[] {
-        int.class, Notification.class};
-	@SuppressWarnings("unchecked")
-	private static final Class[] mStopForegroundSignature = new Class[] {
-        boolean.class};
-	
-    private NotificationManager mNM;
-    private Method mStartForeground;
-    private Method mStopForeground;
-    private Object[] mStartForegroundArgs = new Object[2];
-    private Object[] mStopForegroundArgs = new Object[1];
-
-    @Override
-	public IBinder onBind(Intent intent)
-		{
-		return null;
-		}
-	
-	@Override
-	public void onCreate() {
-		super.onCreate();
-		
-        mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-        try {
-            mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
-            mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
-        	}
-        catch (NoSuchMethodException e) {
-            // Running on an older platform.
-            mStartForeground = mStopForeground = null;
-        	}
-		
-        doToast("Listener Service created...");
-		}
-
-	public void onStart(Intent intent, int startId) {
-		super.onStart(intent, startId);
-		
-		try {
-			cmdChnl = new ServerSocket(20701);
-			runCmdThrd = new RunCmdThread(cmdChnl, this, handler);
-			runCmdThrd.start();
-			doToast("Command channel port 20701 ...");
-			
-			dataChnl = new ServerSocket(20700);
-			runDataThrd = new RunDataThread(dataChnl, this);
-			runDataThrd.start();
-			doToast("Data channel port 20700 ...");
-			
-            Notification notification = new Notification();
-            startForegroundCompat(R.string.foreground_service_started, notification);
-			} 
-		catch (Exception e) {
-			doToast(e.toString());
-//			Toast.makeText(getApplication().getApplicationContext(), e.toString(), Toast.LENGTH_LONG).show();
-			}
-		
-		return;
-		}
-	
-	public void onDestroy()
-		{
-		super.onDestroy();
-		
-		if (runCmdThrd.isAlive())
-			{
-			runCmdThrd.StopListening();
-			}
-		
-		if (runDataThrd.isAlive())
-			{
-			runDataThrd.StopListening();
-			}
-		
-		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-		notificationManager.cancel(1959);
-		
-		stopForegroundCompat(R.string.foreground_service_started);
-		
-		doToast("Listener Service destroyed...");
-		
-		System.exit(0);
-		}
-	
-	public void SendToDataChannel(String strToSend)
-		{
-		if (runDataThrd.isAlive())
-			runDataThrd.SendToDataChannel(strToSend);
-		}
-	
-	public void doToast(String sMsg) {
-		Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
-		toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
-		toast.show();
-	}
-	
-    /**
-     * This is a wrapper around the new startForeground method, using the older
-     * APIs if it is not available.
-     */
-    void startForegroundCompat(int id, Notification notification) {
-        // If we have the new startForeground API, then use it.
-        if (mStartForeground != null) {
-            mStartForegroundArgs[0] = Integer.valueOf(id);
-            mStartForegroundArgs[1] = notification;
-            try {
-                mStartForeground.invoke(this, mStartForegroundArgs);
-            } catch (InvocationTargetException e) {
-                // Should not happen.
-                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
-            } catch (IllegalAccessException e) {
-                // Should not happen.
-                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
-            }
-            return;
-        }
-
-        // Fall back on the old API.
-        setForeground(true);
-        mNM.notify(id, notification);
-    }
-
-    /**
-     * This is a wrapper around the new stopForeground method, using the older
-     * APIs if it is not available.
-     */
-    void stopForegroundCompat(int id) {
-        // If we have the new stopForeground API, then use it.
-        if (mStopForeground != null) {
-            mStopForegroundArgs[0] = Boolean.TRUE;
-            try {
-                mStopForeground.invoke(this, mStopForegroundArgs);
-            } catch (InvocationTargetException e) {
-                // Should not happen.
-                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
-            } catch (IllegalAccessException e) {
-                // Should not happen.
-                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
-            }
-            return;
-        }
-
-        // Fall back on the old API.  Note to cancel BEFORE changing the
-        // foreground state, since we could be killed at that point.
-        mNM.cancel(id);
-        setForeground(false);
-    }
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.ServerSocket;
+import java.util.Timer;
+
+import com.mozilla.SUTAgentAndroid.R;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.Toast;
+
+public class ASMozStub extends android.app.Service {
+
+    private ServerSocket cmdChnl = null;
+    private ServerSocket dataChnl = null;
+    private Handler handler = new Handler();
+    RunCmdThread runCmdThrd = null;
+    RunDataThread runDataThrd = null;
+    Thread monitor = null;
+    Timer timer = null;
+
+    @SuppressWarnings("unchecked")
+    private static final Class[] mStartForegroundSignature = new Class[] {
+        int.class, Notification.class};
+    @SuppressWarnings("unchecked")
+    private static final Class[] mStopForegroundSignature = new Class[] {
+        boolean.class};
+
+    private NotificationManager mNM;
+    private Method mStartForeground;
+    private Method mStopForeground;
+    private Object[] mStartForegroundArgs = new Object[2];
+    private Object[] mStopForegroundArgs = new Object[1];
+
+    @Override
+    public IBinder onBind(Intent intent)
+        {
+        return null;
+        }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+        try {
+            mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
+            mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
+            }
+        catch (NoSuchMethodException e) {
+            // Running on an older platform.
+            mStartForeground = mStopForeground = null;
+            }
+
+        doToast("Listener Service created...");
+        }
+
+    public void onStart(Intent intent, int startId) {
+        super.onStart(intent, startId);
+
+        try {
+            cmdChnl = new ServerSocket(20701);
+            runCmdThrd = new RunCmdThread(cmdChnl, this, handler);
+            runCmdThrd.start();
+            doToast("Command channel port 20701 ...");
+
+            dataChnl = new ServerSocket(20700);
+            runDataThrd = new RunDataThread(dataChnl, this);
+            runDataThrd.start();
+            doToast("Data channel port 20700 ...");
+
+            Notification notification = new Notification();
+            startForegroundCompat(R.string.foreground_service_started, notification);
+            }
+        catch (Exception e) {
+            doToast(e.toString());
+//            Toast.makeText(getApplication().getApplicationContext(), e.toString(), Toast.LENGTH_LONG).show();
+            }
+
+        return;
+        }
+
+    public void onDestroy()
+        {
+        super.onDestroy();
+
+        if (runCmdThrd.isAlive())
+            {
+            runCmdThrd.StopListening();
+            }
+
+        if (runDataThrd.isAlive())
+            {
+            runDataThrd.StopListening();
+            }
+
+        NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(1959);
+
+        stopForegroundCompat(R.string.foreground_service_started);
+
+        doToast("Listener Service destroyed...");
+
+        System.exit(0);
+        }
+
+    public void SendToDataChannel(String strToSend)
+        {
+        if (runDataThrd.isAlive())
+            runDataThrd.SendToDataChannel(strToSend);
+        }
+
+    public void doToast(String sMsg) {
+        Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
+        toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
+        toast.show();
+    }
+
+    /**
+     * This is a wrapper around the new startForeground method, using the older
+     * APIs if it is not available.
+     */
+    void startForegroundCompat(int id, Notification notification) {
+        // If we have the new startForeground API, then use it.
+        if (mStartForeground != null) {
+            mStartForegroundArgs[0] = Integer.valueOf(id);
+            mStartForegroundArgs[1] = notification;
+            try {
+                mStartForeground.invoke(this, mStartForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke startForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.
+        setForeground(true);
+        mNM.notify(id, notification);
+    }
+
+    /**
+     * This is a wrapper around the new stopForeground method, using the older
+     * APIs if it is not available.
+     */
+    void stopForegroundCompat(int id) {
+        // If we have the new stopForeground API, then use it.
+        if (mStopForeground != null) {
+            mStopForegroundArgs[0] = Boolean.TRUE;
+            try {
+                mStopForeground.invoke(this, mStopForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ScreenOnWidget", "Unable to invoke stopForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.  Note to cancel BEFORE changing the
+        // foreground state, since we could be killed at that point.
+        mNM.cancel(id);
+        setForeground(false);
+    }
+}
diff --git a/build/mobile/sutagent/android/AlertLooperThread.java b/build/mobile/sutagent/android/AlertLooperThread.java
index a2248c412df1..d97eb261ddc5 100755
--- a/build/mobile/sutagent/android/AlertLooperThread.java
+++ b/build/mobile/sutagent/android/AlertLooperThread.java
@@ -1,96 +1,96 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.util.Timer;
-
-import android.content.ContextWrapper;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-class AlertLooperThread extends Thread
-	{
-	public Handler mHandler;
-	private Looper looper = null;
-	private DoAlert da	= null;
-	private Timer alertTimer = null;
-	private ContextWrapper contextWrapper = null;
-	
-	AlertLooperThread(ContextWrapper ctxW)
-		{
-		this.contextWrapper = ctxW;
-		}
-	
-	public Timer getAlertTimer()
-		{
-		return alertTimer;
-		}
-
-	public void term()
-		{
-		if (da != null)
-			da.term();
-		}
-
-	public void quit()
-		{
-		if (looper != null)
-			looper.quit();
-		}
-
-	public void run()
-		{
-		Looper.prepare();
-    
-		looper = Looper.myLooper();
-      
-		mHandler = new Handler()
-    		{
-			public void handleMessage(Message msg)
-        		{
-				// process incoming messages here
-        		}
-    		};
-      
-    	alertTimer = new Timer();
-    	da = new DoAlert(contextWrapper);
-    	alertTimer.scheduleAtFixedRate(da, 0, 5000);
-    	Looper.loop();
-		}
-	}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.util.Timer;
+
+import android.content.ContextWrapper;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+class AlertLooperThread extends Thread
+    {
+    public Handler mHandler;
+    private Looper looper = null;
+    private DoAlert da    = null;
+    private Timer alertTimer = null;
+    private ContextWrapper contextWrapper = null;
+
+    AlertLooperThread(ContextWrapper ctxW)
+        {
+        this.contextWrapper = ctxW;
+        }
+
+    public Timer getAlertTimer()
+        {
+        return alertTimer;
+        }
+
+    public void term()
+        {
+        if (da != null)
+            da.term();
+        }
+
+    public void quit()
+        {
+        if (looper != null)
+            looper.quit();
+        }
+
+    public void run()
+        {
+        Looper.prepare();
+
+        looper = Looper.myLooper();
+
+        mHandler = new Handler()
+            {
+            public void handleMessage(Message msg)
+                {
+                // process incoming messages here
+                }
+            };
+
+        alertTimer = new Timer();
+        da = new DoAlert(contextWrapper);
+        alertTimer.scheduleAtFixedRate(da, 0, 5000);
+        Looper.loop();
+        }
+    }
diff --git a/build/mobile/sutagent/android/CmdWorkerThread.java b/build/mobile/sutagent/android/CmdWorkerThread.java
index 6036d03eca7a..bf7c8c174a66 100755
--- a/build/mobile/sutagent/android/CmdWorkerThread.java
+++ b/build/mobile/sutagent/android/CmdWorkerThread.java
@@ -1,199 +1,199 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-
-// import com.mozilla.SUTAgentAndroid.DoCommand;
-
-public class CmdWorkerThread extends Thread
-{
-	private RunCmdThread theParent = null;
-	private Socket socket	= null;
-	private String prompt = null;
-	boolean bListening	= true;
-
-	public CmdWorkerThread(RunCmdThread theParent, Socket workerSocket)
-		{
-		super("CmdWorkerThread");
-		this.theParent = theParent;
-		this.socket = workerSocket;
-		byte pr [] = new byte [3];
-		pr[0] = '$';
-		pr[1] = '>';
-		pr[2] = 0;
-		prompt = new String(pr,0,3);
-		}
-
-	public void StopListening()
-		{
-		bListening = false;
-		}
-	
-	private String readLine(BufferedInputStream in)
-		{
-		String sRet = "";
-		int nByte = 0;
-		char cChar = 0;
-		
-		try 
-			{
-			nByte = in.read();
-			while (nByte != -1)
-				{
-				cChar = ((char)(nByte & 0xFF));
-				if ((cChar != '\r') && (cChar != '\n'))
-					sRet += cChar;
-				else
-					break;
-				nByte = in.read();
-				}
-			
-			if ((in.available() > 0) && (cChar != '\n'))
-				{
-				in.mark(1024);
-				nByte = in.read();
-				
-				if (nByte != -1)
-					{
-					cChar = ((char)(nByte & 0xFF));
-					if (cChar != '\n')
-						{
-						in.reset();
-						}
-					}
-				}
-			}
-		catch (IOException e)
-			{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			}
-		
-		if (sRet.length() == 0)
-			sRet = null;
-		
-		return(sRet);
-		}
-
-	public void run()
-		{
-		try {
-			OutputStream cmdOut = socket.getOutputStream();
-			InputStream cmdIn = socket.getInputStream();
-			PrintWriter out = new PrintWriter(cmdOut, true);
-			BufferedInputStream in = new BufferedInputStream(cmdIn);
-			String inputLine, outputLine;
-			DoCommand dc = new DoCommand(theParent.svc);
-
-			int nAvail = cmdIn.available();
-			cmdIn.skip(nAvail);
-				
-			out.print(prompt);
-			out.flush();
-
-			while (bListening)
-				{
-				if (!(in.available() > 0))
-					{
-					socket.setSoTimeout(500);
-					try {
-						int nRead = cmdIn.read();
-						if (nRead == -1)
-							{
-							bListening = false;
-							continue;
-							}
-						else
-							{
-							inputLine = ((char)nRead) + "";
-							socket.setSoTimeout(120000);
-							}
-						}
-					catch(SocketTimeoutException toe)
-						{
-						continue;
-						}
-					}
-				else
-					inputLine = "";
-				
-				if ((inputLine += readLine(in)) != null)
-					{
-					outputLine = dc.processCommand(inputLine, out, in, cmdOut);
-					if (outputLine.length() > 0)
-						{
-						out.print(outputLine + "\n" + prompt);
-						}
-					else
-						out.print(prompt);
-					out.flush();
-					if (outputLine.equals("exit"))
-						{
-						theParent.StopListening();
-						bListening = false;
-						}
-					if (outputLine.equals("quit"))
-						{
-						bListening = false;
-						}
-					outputLine = null;
-					System.gc();
-					}
-				else
-					break;
-				}
-			out.close();
-			out = null;
-			in.close();
-			in = null;
-			socket.close();
-		}
-	catch (IOException e)
-		{
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-		}
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+
+// import com.mozilla.SUTAgentAndroid.DoCommand;
+
+public class CmdWorkerThread extends Thread
+{
+    private RunCmdThread theParent = null;
+    private Socket socket    = null;
+    private String prompt = null;
+    boolean bListening    = true;
+
+    public CmdWorkerThread(RunCmdThread theParent, Socket workerSocket)
+        {
+        super("CmdWorkerThread");
+        this.theParent = theParent;
+        this.socket = workerSocket;
+        byte pr [] = new byte [3];
+        pr[0] = '$';
+        pr[1] = '>';
+        pr[2] = 0;
+        prompt = new String(pr,0,3);
+        }
+
+    public void StopListening()
+        {
+        bListening = false;
+        }
+
+    private String readLine(BufferedInputStream in)
+        {
+        String sRet = "";
+        int nByte = 0;
+        char cChar = 0;
+
+        try
+            {
+            nByte = in.read();
+            while (nByte != -1)
+                {
+                cChar = ((char)(nByte & 0xFF));
+                if ((cChar != '\r') && (cChar != '\n'))
+                    sRet += cChar;
+                else
+                    break;
+                nByte = in.read();
+                }
+
+            if ((in.available() > 0) && (cChar != '\n'))
+                {
+                in.mark(1024);
+                nByte = in.read();
+
+                if (nByte != -1)
+                    {
+                    cChar = ((char)(nByte & 0xFF));
+                    if (cChar != '\n')
+                        {
+                        in.reset();
+                        }
+                    }
+                }
+            }
+        catch (IOException e)
+            {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            }
+
+        if (sRet.length() == 0)
+            sRet = null;
+
+        return(sRet);
+        }
+
+    public void run()
+        {
+        try {
+            OutputStream cmdOut = socket.getOutputStream();
+            InputStream cmdIn = socket.getInputStream();
+            PrintWriter out = new PrintWriter(cmdOut, true);
+            BufferedInputStream in = new BufferedInputStream(cmdIn);
+            String inputLine, outputLine;
+            DoCommand dc = new DoCommand(theParent.svc);
+
+            int nAvail = cmdIn.available();
+            cmdIn.skip(nAvail);
+
+            out.print(prompt);
+            out.flush();
+
+            while (bListening)
+                {
+                if (!(in.available() > 0))
+                    {
+                    socket.setSoTimeout(500);
+                    try {
+                        int nRead = cmdIn.read();
+                        if (nRead == -1)
+                            {
+                            bListening = false;
+                            continue;
+                            }
+                        else
+                            {
+                            inputLine = ((char)nRead) + "";
+                            socket.setSoTimeout(120000);
+                            }
+                        }
+                    catch(SocketTimeoutException toe)
+                        {
+                        continue;
+                        }
+                    }
+                else
+                    inputLine = "";
+
+                if ((inputLine += readLine(in)) != null)
+                    {
+                    outputLine = dc.processCommand(inputLine, out, in, cmdOut);
+                    if (outputLine.length() > 0)
+                        {
+                        out.print(outputLine + "\n" + prompt);
+                        }
+                    else
+                        out.print(prompt);
+                    out.flush();
+                    if (outputLine.equals("exit"))
+                        {
+                        theParent.StopListening();
+                        bListening = false;
+                        }
+                    if (outputLine.equals("quit"))
+                        {
+                        bListening = false;
+                        }
+                    outputLine = null;
+                    System.gc();
+                    }
+                else
+                    break;
+                }
+            out.close();
+            out = null;
+            in.close();
+            in = null;
+            socket.close();
+        }
+    catch (IOException e)
+        {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+        }
+    }
+}
diff --git a/build/mobile/sutagent/android/DataWorkerThread.java b/build/mobile/sutagent/android/DataWorkerThread.java
index 8dea41998b4a..0d4459931252 100755
--- a/build/mobile/sutagent/android/DataWorkerThread.java
+++ b/build/mobile/sutagent/android/DataWorkerThread.java
@@ -1,237 +1,237 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-// import com.mozilla.SUTAgentAndroid.DoCommand;
-import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
-
-public class DataWorkerThread extends Thread
-{
-	private RunDataThread theParent = null;
-	private Socket socket	= null;
-	boolean bListening	= true;
-	PrintWriter out = null;
-	SimpleDateFormat sdf = null;
-
-	public DataWorkerThread(RunDataThread theParent, Socket workerSocket)
-		{
-		super("DataWorkerThread");
-		this.theParent = theParent;
-		this.socket = workerSocket;
-		this.sdf = new SimpleDateFormat("yyyyMMdd-HH:mm:ss");
-		}
-
-	public void StopListening()
-		{
-		bListening = false;
-		}
-	
-	public void SendString(String strToSend)
-		{
-		if (this.out != null)
-			{
-			Calendar cal = Calendar.getInstance();
-			String strOut = sdf.format(cal.getTime());
-			strOut += " " + strToSend + "\r\n";
-		
-			out.write(strOut);
-			out.flush();
-			}
-		}
-
-	private String readLine(BufferedInputStream in)
-		{
-		String sRet = "";
-		int nByte = 0;
-		char cChar = 0;
-	
-		try 
-			{
-			nByte = in.read();
-			while (nByte != -1)
-				{
-				cChar = ((char)(nByte & 0xFF));
-				if ((cChar != '\r') && (cChar != '\n'))
-					sRet += cChar;
-				else
-					break;
-				nByte = in.read();
-				}
-		
-			if (in.available() > 0)
-				{
-				in.mark(1024);
-				nByte = in.read();
-		
-				while (nByte != -1)
-					{
-					cChar = ((char)(nByte & 0xFF));
-					if ((cChar == '\r') || (cChar == '\n'))
-						{
-						if (in.available() > 0)
-							{
-							in.mark(1024);
-							nByte = in.read();
-							}
-						else
-							nByte = -1;
-						}
-					else
-						{
-						in.reset();
-						break;
-						}
-					}
-				}
-			}
-		catch (IOException e)
-			{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			}
-	
-		if (sRet.length() == 0)
-			sRet = null;
-	
-		return(sRet);
-		}
-
-	public void run()
-		{
-		String	sRet = "";
-		long lEndTime = System.currentTimeMillis() + 60000;
-		
-		try {
-			while(bListening)
-				{
-				OutputStream cmdOut = socket.getOutputStream();
-				InputStream cmdIn = socket.getInputStream();
-				this.out = new PrintWriter(cmdOut, true);
-				BufferedInputStream in = new BufferedInputStream(cmdIn);
-				String inputLine, outputLine;
-				DoCommand dc = new DoCommand(theParent.svc);
-				
-	    		Calendar cal = Calendar.getInstance();
-	    		sRet = sdf.format(cal.getTime());
-	    		sRet += " trace output";
-
-				out.println(sRet);
-				out.flush();
-				int nAvail = cmdIn.available();
-				cmdIn.skip(nAvail);
-				
-				while (bListening)
-					{
-					if (System.currentTimeMillis() > lEndTime)
-						{
-						cal = Calendar.getInstance();
-			    		sRet = sdf.format(cal.getTime());
-			    		sRet += " Thump thump - " + SUTAgentAndroid.sUniqueID + "\r\n";
-
-			    		out.write(sRet);
-			    		out.flush();
-						
-						lEndTime = System.currentTimeMillis() + 60000;
-						}
-					
-					if (!(in.available() > 0))
-						{
-						socket.setSoTimeout(500);
-						try {
-							int nRead = cmdIn.read();
-							if (nRead == -1)
-								{
-								bListening = false;
-								continue;
-								}
-							else
-								inputLine = (char)nRead + ""; 
-							}
-						catch(SocketTimeoutException toe)
-							{
-							continue;
-							}
-						}
-					else
-						inputLine = "";
-				
-					if ((inputLine += readLine(in)) != null)
-						{
-						outputLine = dc.processCommand(inputLine, out, in, cmdOut);
-						out.print(outputLine + "\n");
-						out.flush();
-						if (outputLine.equals("exit"))
-							{
-							theParent.StopListening();
-							bListening = false;
-							}
-						if (outputLine.equals("quit"))
-							{
-							bListening = false;
-							}
-						outputLine = null;
-						System.gc();
-						}
-					else
-						break;
-					}
-				
-				out.close();
-				out = null;
-				in.close();
-				in = null;
-				socket.close();
-				}
-			}
-		catch (IOException e)
-			{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			}
-		}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+// import com.mozilla.SUTAgentAndroid.DoCommand;
+import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
+
+public class DataWorkerThread extends Thread
+{
+    private RunDataThread theParent = null;
+    private Socket socket    = null;
+    boolean bListening    = true;
+    PrintWriter out = null;
+    SimpleDateFormat sdf = null;
+
+    public DataWorkerThread(RunDataThread theParent, Socket workerSocket)
+        {
+        super("DataWorkerThread");
+        this.theParent = theParent;
+        this.socket = workerSocket;
+        this.sdf = new SimpleDateFormat("yyyyMMdd-HH:mm:ss");
+        }
+
+    public void StopListening()
+        {
+        bListening = false;
+        }
+
+    public void SendString(String strToSend)
+        {
+        if (this.out != null)
+            {
+            Calendar cal = Calendar.getInstance();
+            String strOut = sdf.format(cal.getTime());
+            strOut += " " + strToSend + "\r\n";
+
+            out.write(strOut);
+            out.flush();
+            }
+        }
+
+    private String readLine(BufferedInputStream in)
+        {
+        String sRet = "";
+        int nByte = 0;
+        char cChar = 0;
+
+        try
+            {
+            nByte = in.read();
+            while (nByte != -1)
+                {
+                cChar = ((char)(nByte & 0xFF));
+                if ((cChar != '\r') && (cChar != '\n'))
+                    sRet += cChar;
+                else
+                    break;
+                nByte = in.read();
+                }
+
+            if (in.available() > 0)
+                {
+                in.mark(1024);
+                nByte = in.read();
+
+                while (nByte != -1)
+                    {
+                    cChar = ((char)(nByte & 0xFF));
+                    if ((cChar == '\r') || (cChar == '\n'))
+                        {
+                        if (in.available() > 0)
+                            {
+                            in.mark(1024);
+                            nByte = in.read();
+                            }
+                        else
+                            nByte = -1;
+                        }
+                    else
+                        {
+                        in.reset();
+                        break;
+                        }
+                    }
+                }
+            }
+        catch (IOException e)
+            {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            }
+
+        if (sRet.length() == 0)
+            sRet = null;
+
+        return(sRet);
+        }
+
+    public void run()
+        {
+        String    sRet = "";
+        long lEndTime = System.currentTimeMillis() + 60000;
+
+        try {
+            while(bListening)
+                {
+                OutputStream cmdOut = socket.getOutputStream();
+                InputStream cmdIn = socket.getInputStream();
+                this.out = new PrintWriter(cmdOut, true);
+                BufferedInputStream in = new BufferedInputStream(cmdIn);
+                String inputLine, outputLine;
+                DoCommand dc = new DoCommand(theParent.svc);
+
+                Calendar cal = Calendar.getInstance();
+                sRet = sdf.format(cal.getTime());
+                sRet += " trace output";
+
+                out.println(sRet);
+                out.flush();
+                int nAvail = cmdIn.available();
+                cmdIn.skip(nAvail);
+
+                while (bListening)
+                    {
+                    if (System.currentTimeMillis() > lEndTime)
+                        {
+                        cal = Calendar.getInstance();
+                        sRet = sdf.format(cal.getTime());
+                        sRet += " Thump thump - " + SUTAgentAndroid.sUniqueID + "\r\n";
+
+                        out.write(sRet);
+                        out.flush();
+
+                        lEndTime = System.currentTimeMillis() + 60000;
+                        }
+
+                    if (!(in.available() > 0))
+                        {
+                        socket.setSoTimeout(500);
+                        try {
+                            int nRead = cmdIn.read();
+                            if (nRead == -1)
+                                {
+                                bListening = false;
+                                continue;
+                                }
+                            else
+                                inputLine = (char)nRead + "";
+                            }
+                        catch(SocketTimeoutException toe)
+                            {
+                            continue;
+                            }
+                        }
+                    else
+                        inputLine = "";
+
+                    if ((inputLine += readLine(in)) != null)
+                        {
+                        outputLine = dc.processCommand(inputLine, out, in, cmdOut);
+                        out.print(outputLine + "\n");
+                        out.flush();
+                        if (outputLine.equals("exit"))
+                            {
+                            theParent.StopListening();
+                            bListening = false;
+                            }
+                        if (outputLine.equals("quit"))
+                            {
+                            bListening = false;
+                            }
+                        outputLine = null;
+                        System.gc();
+                        }
+                    else
+                        break;
+                    }
+
+                out.close();
+                out = null;
+                in.close();
+                in = null;
+                socket.close();
+                }
+            }
+        catch (IOException e)
+            {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            }
+        }
+}
diff --git a/build/mobile/sutagent/android/DoAlert.java b/build/mobile/sutagent/android/DoAlert.java
index b52a7d6e4e6a..3f7c0f78de34 100755
--- a/build/mobile/sutagent/android/DoAlert.java
+++ b/build/mobile/sutagent/android/DoAlert.java
@@ -1,81 +1,81 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.util.TimerTask;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.widget.Toast;
-
-class DoAlert extends TimerTask
-	{
-	int	lcv = 0;
-	Toast toast = null;
-	Ringtone rt = null;
-
-	DoAlert(ContextWrapper contextWrapper)
-		{
-		Context	ctx = contextWrapper.getApplicationContext();
-		this.toast = Toast.makeText(ctx, "Help me!", Toast.LENGTH_LONG);
-		rt = RingtoneManager.getRingtone(ctx, RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM));
-		}
-
-	public void term()
-		{
-		if (rt != null)
-			{
-			if (rt.isPlaying())
-				rt.stop();
-			}
-
-		if (toast != null)
-			toast.cancel();
-		}
-
-	public void run ()
-		{
-		String sText =(((lcv++ % 2) == 0)  ? "Help me!" : "I've fallen down!" );
-		toast.setText(sText);
-		toast.show();
-		if (rt != null)
-			rt.play();
-		}
-	}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.util.TimerTask;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.widget.Toast;
+
+class DoAlert extends TimerTask
+    {
+    int    lcv = 0;
+    Toast toast = null;
+    Ringtone rt = null;
+
+    DoAlert(ContextWrapper contextWrapper)
+        {
+        Context    ctx = contextWrapper.getApplicationContext();
+        this.toast = Toast.makeText(ctx, "Help me!", Toast.LENGTH_LONG);
+        rt = RingtoneManager.getRingtone(ctx, RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM));
+        }
+
+    public void term()
+        {
+        if (rt != null)
+            {
+            if (rt.isPlaying())
+                rt.stop();
+            }
+
+        if (toast != null)
+            toast.cancel();
+        }
+
+    public void run ()
+        {
+        String sText =(((lcv++ % 2) == 0)  ? "Help me!" : "I've fallen down!" );
+        toast.setText(sText);
+        toast.show();
+        if (rt != null)
+            rt.play();
+        }
+    }
diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java
index b4b42adfe2e5..e3f79664c492 100755
--- a/build/mobile/sutagent/android/DoCommand.java
+++ b/build/mobile/sutagent/android/DoCommand.java
@@ -1,3681 +1,3681 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.zip.Adler32;
-import java.util.zip.CheckedInputStream;
-import java.util.zip.CheckedOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPFile;
-import org.apache.commons.net.ftp.FTPReply;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import com.mozilla.SUTAgentAndroid.NtpMessage;
-import com.mozilla.SUTAgentAndroid.R;
-import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlarmManager;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Debug;
-import android.os.Environment;
-import android.os.StatFs;
-import android.os.SystemClock;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.WindowManager;
-
-public class DoCommand {
-	
-	String lineSep = System.getProperty("line.separator");
-	Process	pProc;
-	OutputStream sutIn;
-	InputStream	sutErr;
-	InputStream	sutOut;
-	AlertLooperThread alrt = null;
-	ContextWrapper	contextWrapper = null;
-	
-	String	currentDir = "/";
-	String	sErrorPrefix = "##AGENT-WARNING## ";
-	boolean bTraceOn = false;
-	
-	String ffxProvider = "org.mozilla.ffxcp";
-	String fenProvider = "org.mozilla.fencp";
-	
-	private final String prgVersion = "SUTAgentAndroid Version 1.01";
-	
-	public enum Command
-		{
-		RUN ("run"),
-		EXEC ("exec"),
-		ENVRUN ("envrun"),
-		KILL ("kill"),
-		PS ("ps"),
-		DEVINFO ("info"),
-		OS ("os"),
-		ID ("id"),
-		UPTIME ("uptime"),
-		SETTIME ("settime"),
-		SYSTIME ("systime"),
-		SCREEN ("screen"),
-		MEMORY ("memory"),
-		POWER ("power"),
-		PROCESS ("process"),
-		GETAPPROOT ("getapproot"),
-		TESTROOT ("testroot"),
-		ALRT ("alrt"),
-		DISK ("disk"),
-		CP ("cp"),
-		TIME ("time"),
-		HASH ("hash"),
-		CD ("cd"),
-		CAT ("cat"),
-		CWD ("cwd"),
-		MV ("mv"),
-		PUSH ("push"),
-		PULL ("pull"),
-		RM ("rm"),
-		PRUNE ("rmdr"),
-		MKDR ("mkdr"),
-		DIRWRITABLE ("dirw"),
-		ISDIR ("isdir"),
-		DEAD ("dead"),
-		MEMS ("mems"),
-		LS ("ls"),
-		TMPD ("tmpd"),
-		PING ("ping"),
-		REBT ("rebt"),
-		UNZP ("unzp"),
-		ZIP ("zip"),
-		CLOK ("clok"),
-		STAT ("stat"),
-		QUIT ("quit"),
-		EXIT ("exit"),
-		HELP ("help"),
-		FTPG ("ftpg"),
-		FTPP ("ftpp"),
-		INST ("inst"),
-		UPDT ("updt"),
-		UNINST ("uninst"),
-		TEST ("test"),
-		DBG ("dbg"),
-		TRACE ("trace"),
-		VER ("ver"),
-		TZGET ("tzget"),
-		TZSET ("tzset"),
-		ADB ("adb"),
-		UNKNOWN ("unknown");
-		
-		private final String theCmd;
-		
-		Command(String theCmd) { this.theCmd = theCmd; }
-
-		public String theCmd() {return theCmd;}
-		
-		public static Command getCmd(String sCmd)
-			{
-			Command retCmd = UNKNOWN;
-			for (Command cmd : Command.values())
-				{
-				if (cmd.theCmd().equalsIgnoreCase(sCmd))
-					{
-					retCmd = cmd;
-					break;
-					}
-				}
-			return (retCmd);
-			}
-		}
-	
-	public DoCommand(ContextWrapper service)
-		{
-		this.contextWrapper = service;
-		}
-
-	public String processCommand(String theCmdLine, PrintWriter out, BufferedInputStream in, OutputStream cmdOut)
-		{
-		String 	strReturn = "";
-		Command	cCmd = null;
-		Command cSubCmd = null;
-		
-		if (bTraceOn)
-			((ASMozStub)this.contextWrapper).SendToDataChannel(theCmdLine);
-		
-		String [] Argv = parseCmdLine2(theCmdLine);
-		
-		int Argc = Argv.length;
-		
-		cCmd = Command.getCmd(Argv[0]);
-		
-		switch(cCmd)
-			{
-			case TRACE:
-				if (Argc == 2)
-					bTraceOn = (Argv[1].equalsIgnoreCase("on") ? true : false);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for trace command!";
-				break;
-				
-			case VER:
-				strReturn = prgVersion;
-				break;
-				
-			case CLOK:
-				strReturn = GetClok();
-				break;
-				
-			case TZGET:
-				strReturn = GetTimeZone();
-				break;
-				
-			case TZSET:
-				if (Argc == 2)
-					strReturn = SetTimeZone(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for settz command!";
-				break;
-				
-			case UPDT:
-				if (Argc >= 2)
-					strReturn = StrtUpdtOMatic(Argv[1], Argv[2], (Argc > 3 ? Argv[3] : null), (Argc > 4 ? Argv[4] : null));
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for updt command!";
-				break;
-			
-			case SETTIME:
-				strReturn = SetSystemTime(Argv[1], (Argc > 2 ? Argv[2] : null), cmdOut);
-				break;
-			
-			case CWD:
-				try {
-					strReturn = new java.io.File(currentDir).getCanonicalPath();
-					} 
-				catch (IOException e)
-					{
-					e.printStackTrace();
-					}
-				break;
-				
-			case CD:
-				if (Argc == 2)
-					strReturn = changeDir(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for cd command!";
-				break;
-			
-			case LS:
-				strReturn = PrintDir(((Argc > 1) ? Argv[1] : currentDir));
-				break;
-				
-			case GETAPPROOT:
-				if (Argc == 2)
-					strReturn = GetAppRoot(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for getapproot command!";
-				break;
-				
-			case ISDIR:
-				if (Argc == 2)
-					strReturn = isDirectory(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for isdir command!";
-				break;
-				
-			case TESTROOT:
-				strReturn = GetTestRoot();
-				break;
-				
-			case DEAD:
-				if (Argc == 2)
-					strReturn = (IsProcessDead(Argv[1]) ? (Argv[1] + " is hung or unresponsive") : (Argv[1] + " is ok"));
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for dead command!";
-				break;
-				
-			case PS:
-				strReturn = GetProcessInfo();
-				break;
-				
-			case PULL:
-				if (Argc >= 2) {
-					long lOff = 0;
-					long lLen = -1;
-					if (Argc > 2) {
-					    try {
-					    	lOff = Long.parseLong(Argv[2].trim());
-					    	System.out.println("offset = " + lOff);
-					    } catch (NumberFormatException nfe) {
-					    	lOff = 0;
-					    	System.out.println("NumberFormatException: " + nfe.getMessage());
-					    }
-					}
-					if (Argc == 4) {
-					    try {
-					    	lLen = Long.parseLong(Argv[3].trim());
-					    	System.out.println("length = " + lLen);
-					    } catch (NumberFormatException nfe) {
-					    	lLen = -1;
-					    	System.out.println("NumberFormatException: " + nfe.getMessage());
-					    }
-					}
-					strReturn = Pull(Argv[1], lOff, lLen, cmdOut);
-				} else {
-					strReturn = sErrorPrefix + "Wrong number of arguments for pull command!";
-				}
-				break;
-				
-			case PUSH:
-				if (Argc == 3)
-					{
-					long lArg = 0;
-				    try
-				    	{
-				        lArg = Long.parseLong(Argv[2].trim());
-				        System.out.println("long l = " + lArg);
-				    	}
-				    catch (NumberFormatException nfe)
-				    	{
-				        System.out.println("NumberFormatException: " + nfe.getMessage());
-				    	}
-					
-					strReturn = Push(Argv[1], in, lArg);
-					}
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for push command!";
-				break;
-				
-			case INST:
-				if (Argc >= 2)
-					strReturn = InstallApp(Argv[1], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for inst command!";
-				break;
-				
-			case UNINST:
-				if (Argc >= 2)
-					strReturn = UnInstallApp(Argv[1], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for inst command!";
-				break;
-				
-			case ALRT:
-				if (Argc > 1)
-					{
-					if (Argv[1].contentEquals("on"))
-						{
-						String sTitle = "Agent Alert";
-						String sMsg = "The Agent Alert System has been activated!";
-						if (Argc == 3) {
-							sTitle = Argv[2];
-							sMsg = "";
-						} else if (Argc == 4) {
-							sTitle = Argv[2];
-							sMsg = Argv[3];
-						}
-						StartAlert(sTitle, sMsg);
-						}
-					else
-						{
-						StopAlert();
-						}
-					}
-				else
-					{
-					strReturn = sErrorPrefix + "Wrong number of arguments for alrt command!";
-					}
-				break;
-				
-			case REBT:
-				if (Argc >= 1)
-					strReturn = RunReboot(cmdOut, (Argc > 1 ? Argv[1] : null), (Argc > 2 ? Argv[2] : null));
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for rebt command!";
-//				RunReboot(cmdOut);
-				break;
-				
-			case TMPD:
-				strReturn = GetTmpDir();
-				break;
-				
-			case DEVINFO:
-				if (Argc == 1)
-					{
-					strReturn += SUTAgentAndroid.sUniqueID;
-					strReturn += "\n";
-					strReturn += GetOSInfo();
-					strReturn += "\n";
-					strReturn += GetSystemTime();
-					strReturn += "\n";
-					strReturn += GetUptime();
-					strReturn += "\n";
-					strReturn += GetScreenInfo();
-					strReturn += "\n";
-					strReturn += GetMemoryInfo();
-					strReturn += "\n";
-					strReturn += GetPowerInfo();
-					strReturn += "\n";
-					strReturn += GetProcessInfo();
-					}
-				else
-					{
-					cSubCmd = Command.getCmd(Argv[1]);
-					switch(cSubCmd)
-						{
-						case ID:
-							strReturn = SUTAgentAndroid.sUniqueID;
-							break;
-							
-						case SCREEN:
-							strReturn = GetScreenInfo();
-							break;
-							
-						case PROCESS:
-							strReturn = GetProcessInfo();
-							break;
-							
-						case OS:
-							strReturn = GetOSInfo();
-							break;
-							
-						case SYSTIME:
-							strReturn = GetSystemTime();
-							break;
-							
-						case UPTIME:
-							strReturn = GetUptime();
-							break;
-							
-						case MEMORY:
-							strReturn = GetMemoryInfo();
-							break;
-							
-						case POWER:
-							strReturn += GetPowerInfo();
-							break;
-							
-						default:
-							break;
-						}
-					}
-				break;
-				
-			case STAT:
-				if (Argc == 2)
-					strReturn = StatProcess(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for ping command!";
-				break;
-				
-			case PING:
-				if (Argc == 2)
-					strReturn = SendPing(Argv[1], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for ping command!";
-				break;
-				
-			case HASH:
-				if (Argc == 2)
-					strReturn = HashFile(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for hash command!";
-				break;
-				
-			case PRUNE:
-				if (Argc == 2)
-					strReturn = PruneDir(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for prune command!";
-				break;
-				
-			case FTPG:
-				if (Argc == 4)
-					strReturn = FTPGetFile(Argv[1], Argv[2], Argv[3], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for ftpg command!";
-				break;
-				
-			case CAT:
-				if (Argc == 2)
-					strReturn = Cat(Argv[1], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for cat command!";
-				break;
-				
-			case DIRWRITABLE:
-				if (Argc == 2)
-					strReturn = IsDirWritable(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for dirwritable command!";
-				break;
-				
-			case TIME:
-				if (Argc == 2)
-					strReturn = PrintFileTimestamp(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for time command!";
-				break;
-				
-			case MKDR:
-				if (Argc == 2)
-					strReturn = MakeDir(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for mkdr command!";
-				break;
-				
-			case RM:
-				if (Argc == 2)
-					strReturn = RemoveFile(Argv[1]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for rm command!";
-				break;
-				
-			case MV:
-				if (Argc == 3)
-					strReturn = Move(Argv[1], Argv[2]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for mv command!";
-				break;
-				
-			case CP:
-				if (Argc == 3)
-					strReturn = CopyFile(Argv[1], Argv[2]);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for cp command!";
-				break;
-				
-			case QUIT:
-			case EXIT:
-				strReturn = Argv[0];
-				break;
-				
-			case DBG:
-		        Debug.waitForDebugger();
-		        strReturn = "waitForDebugger on";
-				break;
-				
-			case ADB:
-				if (Argc == 2) {
-					if (Argv[1].contains("ip") || Argv[1].contains("usb")) {
-						strReturn = SetADB(Argv[1]);
-					} else {
-						strReturn = sErrorPrefix + "Unrecognized argument for adb command!";
-					}
-				} else {
-					strReturn = sErrorPrefix + "Wrong number of arguments for adb command!";
-				}
-				break;
-				
-			case TEST:
-				long lFreeMemory = Runtime.getRuntime().freeMemory();
-				long lTotMemory = Runtime.getRuntime().totalMemory();
-				long lMaxMemory = Runtime.getRuntime().maxMemory();
-				
-				
-				if (lFreeMemory > 0) {
-					strReturn = "Max memory: " + lMaxMemory + "\nTotal Memory: " + lTotMemory + "\nFree memory: " + lFreeMemory;
-					break;
-				}
-				
-				ContentResolver cr = contextWrapper.getContentResolver();
-				Uri ffxFiles = null;
-				
-				if (Argv[1].contains("fennec")) {
-					ffxFiles = Uri.parse("content://" + fenProvider + "/dir");
-				} else if (Argv[1].contains("firefox")) {
-					ffxFiles = Uri.parse("content://" + ffxProvider + "/dir");
-				}
-					
-//				Uri ffxFiles = Uri.parse("content://org.mozilla.fencp/file");
-				String[] columns = new String[] {
-						"_id",
-						"isdir",
-						"filename",
-						"length"
-                    };
-//				String[] columns = new String[] {
-//						"_id",
-//						"chunk"
-//                     };
-				Cursor myCursor = cr.query(	ffxFiles,
-											columns, 						// Which columns to return 
-											(Argc > 1 ? Argv[1] : null),    // Which rows to return (all rows)
-                        					null,       					// Selection arguments (none)
-                        					null);							// Put the results in ascending order by name
-/*
-				if (myCursor != null) {
-					int nRows = myCursor.getCount();
-					String [] colNames = myCursor.getColumnNames();
-					int	nID = 0;
-					int nBytesRecvd = 0;
-				
-					for (int lcv = 0; lcv < nRows; lcv++) {
-						if  (myCursor.moveToPosition(lcv)) {
-							nID = myCursor.getInt(0);
-							byte [] buf = myCursor.getBlob(1);
-							if (buf != null) {
-								nBytesRecvd += buf.length;
-								strReturn += new String(buf);
-								buf = null;
-							}
-						}
-					}
-					strReturn += "[eof - " + nBytesRecvd + "]";
-					myCursor.close();
-				}
-
-*/
-				if (myCursor != null)
-					{
-					int nRows = myCursor.getCount();
-					int	nID = 0;
-					String sFileName = "";
-					long lFileSize = 0;
-					boolean bIsDir = false;
-					
-					for (int lcv = 0; lcv < nRows; lcv++)
-						{
-						if  (myCursor.moveToPosition(lcv))
-							{
-							nID = myCursor.getInt(0);
-							bIsDir = (myCursor.getInt(1) == 1 ? true : false);
-							sFileName = myCursor.getString(2);
-							lFileSize = myCursor.getLong(3);
-							strReturn += "" + nID + "\t" + (bIsDir ? "<dir> " : "      ") + sFileName + "\t" + lFileSize + "\n";
-							}
-						}
-					myCursor.close();
-					} 
-				break;
-				
-			case EXEC:
-			case ENVRUN:
-				if (Argc >= 2)
-					{
-					String [] theArgs = new String [Argc - 1];
-			
-					for (int lcv = 1; lcv < Argc; lcv++)
-						{
-						theArgs[lcv - 1] = Argv[lcv];
-						}
-			
-					strReturn = StartPrg2(theArgs, cmdOut);
-					}
-				else
-					{
-					strReturn = sErrorPrefix + "Wrong number of arguments for " + Argv[0] + " command!";
-					}
-				break;
-				
-			case RUN:
-				if (Argc >= 2)
-					{
-					String [] theArgs = new String [Argc - 1];
-				
-					for (int lcv = 1; lcv < Argc; lcv++)
-						{
-						theArgs[lcv - 1] = Argv[lcv];
-						}
-				
-					if (Argv[1].contains("/") || Argv[1].contains("\\") || !Argv[1].contains("."))
-						strReturn = StartPrg(theArgs, cmdOut);
-					else
-						strReturn = StartJavaPrg(theArgs, null);
-					}
-				else
-					{
-					strReturn = sErrorPrefix + "Wrong number of arguments for " + Argv[0] + " command!";
-					}
-				break;
-
-			case KILL:
-				if (Argc == 2)
-					strReturn = KillProcess(Argv[1], cmdOut);
-				else
-					strReturn = sErrorPrefix + "Wrong number of arguments for kill command!";
-				break;
-				
-			case DISK:
-				strReturn = GetDiskInfo((Argc == 2 ? Argv[1] : "/"));
-				break;
-				
-			case UNZP:
-				strReturn = Unzip(Argv[1], (Argc == 3 ? Argv[2] : ""));
-				break;
-				
-			case ZIP:
-				strReturn = Zip(Argv[1], (Argc == 3 ? Argv[2] : ""));
-				break;
-				
-			case HELP:
-				strReturn = PrintUsage();
-				break;
-				
-			default:
-				strReturn = sErrorPrefix + "[" + Argv[0] + "] command";
-				if (Argc > 1)
-					{
-					strReturn += " with arg(s) =";
-					for (int lcv = 1; lcv < Argc; lcv++)
-						{
-						strReturn += " [" + Argv[lcv] + "]";
-						}
-					}
-				strReturn += " is currently not implemented.";
-				break;
-			}
-		
-		return(strReturn);
-		}
-
-	private void SendNotification(String tickerText, String expandedText) {
-		NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
-		int icon = R.drawable.ateamlogo;
-		long when = System.currentTimeMillis();
-	
-		Notification notification = new Notification(icon, tickerText, when);
-	
-		notification.flags |= (Notification.FLAG_INSISTENT | Notification.FLAG_AUTO_CANCEL);
-		notification.defaults |= Notification.DEFAULT_SOUND;
-		notification.defaults |= Notification.DEFAULT_VIBRATE;
-		notification.defaults |= Notification.DEFAULT_LIGHTS;
-	
-		Context context = contextWrapper.getApplicationContext();
-	
-		// Intent to launch an activity when the extended text is clicked
-		Intent intent2 = new Intent(contextWrapper, SUTAgentAndroid.class);
-		PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent2, 0);
-	
-		notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
-			
-		notificationManager.notify(1959, notification);
-	}
-
-private void CancelNotification()
-	{
-	NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
-	notificationManager.cancel(1959);
-	}
-
-	public void StartAlert(String sTitle, String sMsg)
-		{
-		// start the alert message
-		SendNotification(sTitle, sMsg);
-		}
-
-	public void StopAlert()
-		{
-		CancelNotification();
-		}
-
-	public String [] parseCmdLine2(String theCmdLine)
-		{
-		String	cmdString;
-		String	workingString;
-		String	workingString2;
-		String	workingString3;
-		List<String> lst = new ArrayList<String>();
-		int nLength = 0;
-		int nFirstSpace = -1;
-		
-		// Null cmd line
-		if (theCmdLine == null)
-			{
-			String [] theArgs = new String [1];
-			theArgs[0] = new String("");
-			return(theArgs);
-			}
-		else
-			{
-			nLength = theCmdLine.length();
-			nFirstSpace = theCmdLine.indexOf(' ');
-			}
-		
-		if (nFirstSpace == -1)
-			{
-			String [] theArgs = new String [1];
-			theArgs[0] = new String(theCmdLine);
-			return(theArgs);
-			}
-		
-		// Get the command
-		cmdString = new String(theCmdLine.substring(0, nFirstSpace)); 
-		lst.add(cmdString);
-		
-		// Jump past the command and trim
-		workingString = (theCmdLine.substring(nFirstSpace + 1, nLength)).trim();
-		
-		while ((nLength = workingString.length()) > 0)
-			{
-			int nEnd = 0;
-			int	nStart = 0;
-			
-			// if we have a quote
-			if (workingString.startsWith("\""))
-				{
-				// point to the first non quote char
-				nStart = 1;
-				// find the matching quote
-				nEnd = workingString.indexOf('"', nStart);
-				
-				char prevChar;
-				
-				while(nEnd != -1)
-					{
-					// check to see if the quotation mark has been escaped
-					prevChar = workingString.charAt(nEnd - 1);
-					if (prevChar == '\\')
-						{
-						// if escaped, point past this quotation mark and find the next
-						nEnd++;
-						if (nEnd < nLength)
-							nEnd = workingString.indexOf('"', nEnd);
-						else
-							nEnd = -1;
-						}
-					else
-						break;
-					}
-				
-				// there isn't one
-				if (nEnd == -1)
-					{
-					// point at the quote
-					nStart = 0;
-					// so find the next space
-					nEnd = workingString.indexOf(' ', nStart);
-					// there isn't one of those either
-					if (nEnd == -1)
-						nEnd = nLength;	// Just grab the rest of the cmdline
-					}
-				}
-			else // no quote so find the next space
-				{
-				nEnd = workingString.indexOf(' ', nStart);
-				// there isn't one of those
-				if (nEnd == -1)
-					nEnd = nLength;	// Just grab the rest of the cmdline
-				}
-			
-			// get the substring
-			workingString2 = workingString.substring(nStart, nEnd);
-
-			// if we have escaped quotes
-			if (workingString2.contains("\\\""))
-				{
-				do
-					{
-					// replace escaped quote with embedded quote
-					workingString3 = workingString2.replace("\\\"", "\"");
-					workingString2 = workingString3;
-					}
-				while(workingString2.contains("\\\""));
-				}
-
-			// add it to the list
-			lst.add(new String(workingString2));
-			
-			// if we are dealing with a quote
-			if (nStart > 0)
-				nEnd++; //  point past the end one
-			
-			// jump past the substring and trim it
-			workingString = (workingString.substring(nEnd)).trim();
-			}
-		
-		// ok we're done package up the results
-		int nItems = lst.size();
-		
-		String [] theArgs = new String [nItems];
-		
-		for (int lcv = 0; lcv < nItems; lcv++)
-			{
-			theArgs[lcv] = lst.get(lcv);
-			}
-	
-		return(theArgs);
-		}
-	
-	public String [] parseCmdLine(String theCmdLine) {
-		String	cmdString;
-		String	workingString;
-		String	workingString2;
-		List<String> lst = new ArrayList<String>();
-		int nLength = 0;
-		int nFirstSpace = -1;
-		
-		// Null cmd line
-		if (theCmdLine == null)
-			{
-			String [] theArgs = new String [1];
-			theArgs[0] = new String("");
-			return(theArgs);
-			}
-		else
-			{
-			nLength = theCmdLine.length();
-			nFirstSpace = theCmdLine.indexOf(' ');
-			}
-		
-		if (nFirstSpace == -1)
-			{
-			String [] theArgs = new String [1];
-			theArgs[0] = new String(theCmdLine);
-			return(theArgs);
-			}
-		
-		// Get the command
-		cmdString = new String(theCmdLine.substring(0, nFirstSpace)); 
-		lst.add(cmdString);
-		
-		// Jump past the command and trim
-		workingString = (theCmdLine.substring(nFirstSpace + 1, nLength)).trim();
-		
-		while ((nLength = workingString.length()) > 0)
-			{
-			int nEnd = 0;
-			int	nStart = 0;
-			
-			// if we have a quote
-			if (workingString.startsWith("\""))
-				{
-				// point to the first non quote char
-				nStart = 1;
-				// find the matching quote
-				nEnd = workingString.indexOf('"', nStart);
-				// there isn't one
-				if (nEnd == -1)
-					{
-					// point at the quote
-					nStart = 0;
-					// so find the next space
-					nEnd = workingString.indexOf(' ', nStart);
-					// there isn't one of those either
-					if (nEnd == -1)
-						nEnd = nLength;	// Just grab the rest of the cmdline
-					}
-				else
-					{
-					nStart = 0;
-					nEnd++;
-					}
-				}
-			else // no quote so find the next space
-				{
-				nEnd = workingString.indexOf(' ', nStart);
-				
-				// there isn't one of those
-				if (nEnd == -1)
-					nEnd = nLength;	// Just grab the rest of the cmdline
-				}
-			
-			// get the substring
-			workingString2 = workingString.substring(nStart, nEnd);
-			
-			// add it to the list
-			lst.add(new String(workingString2));
-			
-			// jump past the substring and trim it
-			workingString = (workingString.substring(nEnd)).trim();
-			}
-		
-		int nItems = lst.size();
-		
-		String [] theArgs = new String [nItems];
-		
-		for (int lcv = 0; lcv < nItems; lcv++)
-			{
-			theArgs[lcv] = lst.get(lcv);
-			}
-	
-		return(theArgs);
-		}
-	
-	public String fixFileName(String fileName)
-		{
-		String	sRet = "";
-		String	sTmpFileName = "";
-		
-		sRet = fileName.replace('\\', '/');
-		
-		if (sRet.startsWith("/"))
-			sTmpFileName = sRet;
-		else
-			sTmpFileName = currentDir + "/" + sRet;
-		
-		sRet = sTmpFileName.replace('\\', '/');
-		sTmpFileName = sRet;
-		sRet = sTmpFileName.replace("//", "/");
-		
-		return(sRet);
-		}
-	
-	public String AddFilesToZip(ZipOutputStream out, String baseDir, String relDir)
-	{
-		final int 			BUFFER 	= 2048;
-		String				sRet	= "";
-		String 				curDir 	= "";
-		String				relFN	= "";
-		BufferedInputStream origin = null;
-	    byte 				data[] = new byte[BUFFER];
-	    
-	    if (relDir.length() > 0)
-	    	curDir = baseDir + "/" + relDir;
-	    else
-	    	curDir = baseDir;
-	    
-		File f = new File(curDir);
-		
-		if (f.isFile())
-			{
-		    try {
-		    	relFN = ((relDir.length() > 0) ? relDir + "/" + f.getName() : f.getName());
-		    	System.out.println("Adding: "+relFN);
-		    	sRet += "Adding: "+	relFN + lineSep;
-		    	FileInputStream fi = new FileInputStream(curDir);
-		    	origin = new BufferedInputStream(fi, BUFFER);
-		    	ZipEntry entry = new ZipEntry(relFN);
-		    	out.putNextEntry(entry);
-		    	int count;
-		    	while((count = origin.read(data, 0, BUFFER)) != -1)
-        			{
-		    		out.write(data, 0, count);
-        			}
-		    	origin.close();
-				}
-		    catch(Exception e)
-		    	{
-			    e.printStackTrace();
-		    	}
-		    
-		    return(sRet);
-			}
-		
-		String	files[] = f.list();
-		
-		if (files != null)
-			{
-			try {
-				for(int i = 0; i < files.length; i++)
-					{
-					f = new File(curDir + "/" + files[i]);
-					if (f.isDirectory())
-						{
-						if (relDir.length() > 0)
-							sRet += AddFilesToZip(out, baseDir, relDir + "/" + files[i]);
-						else
-							sRet += AddFilesToZip(out, baseDir, files[i]);
-						}
-					else
-						{
-						relFN = ((relDir.length() > 0) ? relDir + "/" + files[i] : files[i]);
-						System.out.println("Adding: "+relFN);
-						sRet += "Adding: "+	relFN + lineSep;
-						FileInputStream fi = new FileInputStream(curDir + "/" + files[i]);
-						origin = new BufferedInputStream(fi, BUFFER);
-						ZipEntry entry = new ZipEntry(relFN);
-						out.putNextEntry(entry);
-						int count;
-						while((count = origin.read(data, 0, BUFFER)) != -1)
-		        			{
-							out.write(data, 0, count);
-		        			}
-						origin.close();
-						}
-					}
-	    		}
-			catch(Exception e)
-	    		{
-				e.printStackTrace();
-	    		}
-			}
-
-		return(sRet);
-	}
-	
-	public String Zip(String zipFileName, String srcName)
-		{
-		String	fixedZipFileName = fixFileName(zipFileName);
-		String	fixedSrcName = fixFileName(srcName);
-		String sRet = "";
-		
-		try {
-		    FileOutputStream dest = new FileOutputStream(fixedZipFileName);
-		    CheckedOutputStream checksum = new CheckedOutputStream(dest, new Adler32());
-		    ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(checksum));
-		    out.setMethod(ZipOutputStream.DEFLATED);
-		    
-		    sRet += AddFilesToZip(out, fixedSrcName, "");
-		    
-		    out.close();
-		    System.out.println("checksum:		           "+checksum.getChecksum().getValue());
-	        sRet += "checksum:		           "+checksum.getChecksum().getValue();
-		    }
-		catch(Exception e)
-			{
-		    e.printStackTrace();
-		    }
-		
-		return(sRet);
-	}
-
-	public String Unzip(String zipFileName, String dstDirectory)
-		{
-		String 	sRet = "";
-		String	fixedZipFileName = fixFileName(zipFileName);
-		String	fixedDstDirectory = fixFileName(dstDirectory);
-		String	dstFileName = "";
-		int		nNumExtracted = 0;
-		boolean bRet = false;
-		
-		try {
-			final int BUFFER = 2048;
-			BufferedOutputStream dest = null;
-			ZipFile zipFile = new ZipFile(fixedZipFileName);
-			int nNumEntries = zipFile.size();
-			zipFile.close();
-			
-			FileInputStream fis = new FileInputStream(fixedZipFileName);
-			CheckedInputStream checksum = new CheckedInputStream(fis, new Adler32());
-			ZipInputStream zis = new ZipInputStream(new BufferedInputStream(checksum));
-			ZipEntry entry;
-
-			byte [] data = new byte[BUFFER];
-			
-			while((entry = zis.getNextEntry()) != null)
-        		{
-				System.out.println("Extracting: " + entry);
-				int count;
-				if (fixedDstDirectory.length() > 0)
-					dstFileName = fixedDstDirectory + entry.getName();
-				else
-					dstFileName = entry.getName();
-				
-				String tmpDir = dstFileName.substring(0, dstFileName.lastIndexOf('/'));
-				File tmpFile = new File(tmpDir);
-				if (!tmpFile.exists())
-					{
-					bRet = tmpFile.mkdirs();
-					}
-				else
-					bRet = true;
-				
-				if (bRet)
-					{
-					// if we aren't just creating a directory
-					if (dstFileName.lastIndexOf('/') != (dstFileName.length() - 1))
-						{
-						// write out the file
-						FileOutputStream fos = new FileOutputStream(dstFileName);
-						dest = new BufferedOutputStream(fos, BUFFER);
-						while ((count = zis.read(data, 0, BUFFER)) != -1)
-        					{
-							dest.write(data, 0, count);
-        					}
-						dest.flush();
-						dest.close();
-						dest = null;
-						fos.close();
-						fos = null;
-						}
-					nNumExtracted++;
-					}
-				else
-					sRet += " - failed" + lineSep;
-        		}
-			
-			data = null;
-			zis.close();
-			System.out.println("Checksum:          "+checksum.getChecksum().getValue());
-			sRet += "Checksum:          "+checksum.getChecksum().getValue();
-			sRet += lineSep + nNumExtracted + " of " + nNumEntries + " sucessfully extracted";
-			}
-		catch(Exception e)
-			{
-			e.printStackTrace();
-			}
-		
-		return(sRet);
-		}
-	
-	public String StatProcess(String string)
-		{
-		String sRet = "";
-		ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
-		int	[] nPids = new int [1];
-		
-		nPids[0] = Integer.parseInt(string);
-		
-		android.os.Debug.MemoryInfo[] mi = aMgr.getProcessMemoryInfo(nPids);
-		
-		sRet  = "Dalvik Private Dirty pages         " + mi[0].dalvikPrivateDirty     + " kb\n";
-		sRet += "Dalvik Proportional Set Size       " + mi[0].dalvikPss              + " kb\n";
-		sRet += "Dalvik Shared Dirty pages          " + mi[0].dalvikSharedDirty      + " kb\n\n";
-		sRet += "Native Private Dirty pages heap    " + mi[0].nativePrivateDirty     + " kb\n";
-		sRet += "Native Proportional Set Size heap  " + mi[0].nativePss              + " kb\n";
-		sRet += "Native Shared Dirty pages heap     " + mi[0].nativeSharedDirty      + " kb\n\n";
-		sRet += "Other Private Dirty pages          " + mi[0].otherPrivateDirty      + " kb\n";
-		sRet += "Other Proportional Set Size        " + mi[0].otherPss               + " kb\n";
-		sRet += "Other Shared Dirty pages           " + mi[0].otherSharedDirty       + " kb\n\n";
-		sRet += "Total Private Dirty Memory         " + mi[0].getTotalPrivateDirty() + " kb\n";
-		sRet += "Total Proportional Set Size Memory " + mi[0].getTotalPss()          + " kb\n";
-		sRet += "Total Shared Dirty Memory          " + mi[0].getTotalSharedDirty()  + " kb";
-		
-		
-		return(sRet);
-		}
-	
-	public String GetTestRoot()
-		{
-		String	sRet = null;
-		
-		if (Environment.getExternalStorageState().equalsIgnoreCase(Environment.MEDIA_MOUNTED))
-			{
-			sRet = Environment.getExternalStorageDirectory().getAbsolutePath();
-			}
-		else
-			{
-			sRet = GetTmpDir();			
-			}
-		
-		return(sRet);
-		}
-	
-	public String GetAppRoot(String AppName)
-		{
-		String sRet = sErrorPrefix + " internal error [no context]";
-		Context ctx = contextWrapper.getApplicationContext();
-		
-		if (ctx != null)
-			{
-			try {
-				Context appCtx = ctx.createPackageContext(AppName, 0);
-				ContextWrapper appCtxW = new ContextWrapper(appCtx);
-				sRet = appCtxW.getPackageResourcePath();
-				appCtxW = null;
-				appCtx = null;
-				ctx = null;
-				System.gc();
-				}
-			catch (NameNotFoundException e)
-				{
-				e.printStackTrace();
-				}
-			}
-		return(sRet);
-		}
-	
-	public String isDirectory(String sDir)
-		{
-		String	sRet = sErrorPrefix + sDir + " does not exist";
-		String	tmpDir	= fixFileName(sDir);
-		String [] theArgs = new String [3];
-		int	nFiles = 0;
-		
-		if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			
-			String[] columns = new String[] {
-					"_id",
-					"isdir",
-					"filename",
-					"length"
-                };
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 	// Which columns to return 
-										tmpDir,     // Which rows to return (all rows)
-                    					null,       // Selection arguments (none)
-                    					null);		// Order clause (none)
-			if (myCursor != null) {
-				nFiles = myCursor.getCount();
-				
-				// If no entries the dir is empty
-				if (nFiles > 0) {
-					if  (myCursor.moveToPosition(0)) {
-						sRet = ((myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) ? "TRUE" : "FALSE");
-					}
-				}
-				myCursor.close();
-			} 
-		} else {
-			File tmpFile = new java.io.File(tmpDir);
-		
-			if (tmpFile.exists()) {
-				sRet = (tmpFile.isDirectory() ? "TRUE" : "FALSE");
-			}
-			else {
-				try {
-					theArgs[0] = "su";
-					theArgs[1] = "-c";
-					theArgs[2] = "ls -l " + sDir;
-				
-					pProc = Runtime.getRuntime().exec(theArgs);
-					RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
-					outThrd.start();
-					outThrd.join(5000);
-					sRet = outThrd.strOutput;
-					if (!sRet.contains("No such file or directory") && sRet.startsWith("l"))
-						sRet = "FALSE";
-				}
-				catch (IOException e) {
-					sRet = e.getMessage();
-					e.printStackTrace();
-				} 
-				catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		return(sRet);
-		}
-
-
-	public String changeDir(String newDir)
-		{
-		String	tmpDir	= fixFileName(newDir);
-		String	sRet = sErrorPrefix + "Couldn't change directory to " + tmpDir;
-		int	nFiles = 0;
-		
-		if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			
-			String[] columns = new String[] {
-					"_id",
-					"isdir",
-					"filename"
-                };
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 	// Which columns to return 
-										tmpDir,     // Which rows to return (all rows)
-                    					null,       // Selection arguments (none)
-                    					null);		// Order clause (none)
-			if (myCursor != null) {
-				nFiles = myCursor.getCount();
-				
-				if (nFiles > 0) {
-					if  (myCursor.moveToPosition(0)) {
-						if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
-							currentDir = myCursor.getString(myCursor.getColumnIndex("filename"));
-							sRet = "";
-						}
-					}
-				} else {
-					sRet = sErrorPrefix + tmpDir + " is not a valid directory";
-				}
-				myCursor.close();
-			}
-		} else {
-			File tmpFile = new java.io.File(tmpDir);
-		
-			if (tmpFile.exists()) {
-				try {
-					if (tmpFile.isDirectory()) {
-						currentDir = tmpFile.getCanonicalPath();
-						sRet = "";
-					}
-				else
-					sRet = sErrorPrefix + tmpDir + " is not a valid directory";
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		return(sRet);
-		}
-	
-	static final String HEXES = "0123456789abcdef";
-	
-	public static String getHex( byte [] raw )
-		{
-	    if ( raw == null )
-	    	{
-	    	return null;
-	    	}
-	    
-	    final StringBuilder hex = new StringBuilder( 2 * raw.length );
-	    for ( final byte b : raw )
-	    	{
-	    	hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
-	    	}
-	    return hex.toString();
-		}
-
-	public String HashFile(String fileName)
-		{
-		String			sTmpFileName = fixFileName(fileName);
-		String			sRet 		= sErrorPrefix + "Couldn't calculate hash for file " + sTmpFileName;
-		byte[] 			buffer 		= new byte [4096];
-		int				nRead 		= 0;
-		long 			lTotalRead 	= 0;
-		MessageDigest	digest 		= null;
-		
-		try {
-			digest = java.security.MessageDigest.getInstance("MD5");
-			}
-		catch (NoSuchAlgorithmException e)
-			{
-			e.printStackTrace();
-			}
-		
-		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = null;
-			
-			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			
-			String[] columns = new String[] {
-					"_id",
-					"chunk"
-					};
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 		// Which columns to return 
-										sTmpFileName,   // Which rows to return (all rows)
-                    					null,       	// Selection arguments (none)
-                    					null);			// Order clause (none)
-			if (myCursor != null) {
-				int nRows = myCursor.getCount();
-				int nBytesRecvd = 0;
-			
-				for (int lcv = 0; lcv < nRows; lcv++) {
-					if  (myCursor.moveToPosition(lcv)) {
-						byte [] buf = myCursor.getBlob(1);
-						if (buf != null) {
-							nBytesRecvd += buf.length;
-							digest.update(buf, 0, buf.length);
-							lTotalRead += nRead;
-							buf = null;
-						}
-					}
-				}
-				myCursor.close();
-				byte [] hash = digest.digest();
-				
-				sRet = getHex(hash);
-			}
-		} else {
-			try {
-				FileInputStream srcFile  = new FileInputStream(sTmpFileName);
-				while((nRead = srcFile.read(buffer)) != -1) {
-					digest.update(buffer, 0, nRead);
-					lTotalRead += nRead;
-				}
-				srcFile.close();
-				byte [] hash = digest.digest();
-			
-				sRet = getHex(hash);
-			}
-			catch (FileNotFoundException e) {
-				sRet += " file not found";
-				e.printStackTrace();
-			}
-			catch (IOException e) {
-				sRet += " io exception";
-				e.printStackTrace();
-			}
-		}
-		return(sRet);
-	}
-	
-	public String RemoveFile(String fileName)
-		{
-		String	sTmpFileName = fixFileName(fileName);
-		String	sRet = sErrorPrefix + "Couldn't delete file " + sTmpFileName;
-		
-		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			if (cr.delete(ffxFiles, sTmpFileName, null) == 1) {
-				sRet = "deleted " + sTmpFileName;
-			}
-		} else {
-			File f = new File(sTmpFileName);
-			
-			if (f.delete())
-				sRet = "deleted " + sTmpFileName;
-		}
-		
-		return(sRet);
-		}
-	
-	public String PruneDir(String sDir)
-		{
-		String	sRet = "";
-		int nFiles = 0;
-		String sSubDir = null;
-		String	sTmpDir = fixFileName(sDir);
-		
-		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			if (cr.delete(ffxFiles, sTmpDir, null) > 0) {
-				sRet = "deleted " + sTmpDir;
-			}
-		} else {
-			File dir = new File(sTmpDir);
-		
-			if (dir.isDirectory()) {
-				sRet = "Deleting file(s) from " + sTmpDir;
-			
-				File [] files = dir.listFiles();
-				if (files != null) {
-					if ((nFiles = files.length) > 0) {
-						for (int lcv = 0; lcv < nFiles; lcv++) {
-							if (files[lcv].isDirectory()) {
-								sSubDir = files[lcv].getAbsolutePath();
-								sRet += "\n" + PruneDir(sSubDir);
-							}
-							else {
-								if (files[lcv].delete()) {
-								sRet += "\n\tDeleted " + files[lcv].getName();
-								}
-								else {
-									sRet += "\n\tUnable to delete " + files[lcv].getName();
-								}
-							}
-						}
-					}
-					else
-						sRet += "\n\t<empty>";
-				}
-			
-				if (dir.delete()) {
-					sRet += "\nDeleting directory " + sTmpDir;
-				}
-				else {
-					sRet += "\nUnable to delete directory " + sTmpDir;
-				}
-			}
-			else {
-				sRet += sErrorPrefix + sTmpDir + " is not a directory";
-			}
-		}
-		
-		return(sRet);
-		}
-	
-	public String PrintDir(String sDir)
-		{
-		String	sRet = "";
-		int nFiles = 0;
-		String	sTmpDir = fixFileName(sDir);
-		
-		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = null;
-			
-			ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			
-			String[] columns = new String[] {
-					"_id",
-					"isdir",
-					"filename",
-					"length"
-                };
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 	// Which columns to return 
-										sTmpDir,    // Which rows to return (all rows)
-                    					null,       // Selection arguments (none)
-                    					null);		// Order clause (none)
-			if (myCursor != null) {
-				nFiles = myCursor.getCount();
-				
-				// If only one entry and the index is -1 this is not a directory
-				int nNdx = myCursor.getColumnIndex("_id");
-				// If no entries the dir is empty
-				if (nFiles == 1) {
-					sRet = "<empty>";
-				} else {
-					// Show the entries
-					for (int lcv = 1; lcv < nFiles; lcv++) {
-						if  (myCursor.moveToPosition(lcv)) {
-							if ((lcv == 0) && (myCursor.getLong(nNdx) == -1)) {
-								sRet = sErrorPrefix + sTmpDir + " is not a directory";
-							} else {
-								sRet += myCursor.getString(2);
-								if (lcv < (nFiles - 1))
-									sRet += "\n";
-							}
-						}
-					}
-				}
-				myCursor.close();
-			} 
-		} else {
-			File dir = new File(sTmpDir);
-			
-			if (dir.isDirectory()) {
-				File [] files = dir.listFiles();
-			
-				if (files != null) {
-					if ((nFiles = files.length) > 0) {
-						for (int lcv = 0; lcv < nFiles; lcv++) {
-							sRet += files[lcv].getName();
-							if (lcv < (nFiles - 1)) {
-								sRet += "\n";
-							}
-						}
-					}
-					else {
-						sRet = "<empty>";
-					}
-				}
-			}
-			else {
-				sRet = sErrorPrefix + sTmpDir + " is not a directory";
-			}
-		}
-		return(sRet);
-	}
-	
-	public String Move(String sTmpSrcFileName, String sTmpDstFileName) {
-		String sRet = sErrorPrefix + "Could not move " + sTmpSrcFileName + " to " + sTmpDstFileName;
-		String sTmp = CopyFile(sTmpSrcFileName, sTmpDstFileName);
-		if (sTmp.contains(" copied to ")) {
-			sTmp = RemoveFile(sTmpSrcFileName);
-			if (sTmp.startsWith("deleted ")) {
-				sRet = sTmpSrcFileName + " moved to " + sTmpDstFileName;
-			}
-		}
-			
-		return(sRet);
-	}
-
-	public String CopyFile(String sTmpSrcFileName, String sTmpDstFileName) {
-		String sRet = sErrorPrefix + "Could not copy " + sTmpSrcFileName + " to " + sTmpDstFileName;
-		ContentValues cv = null;
-		File destFile = null;
-		Uri ffxSrcFiles = null;
-		Uri ffxDstFiles = null;
-		FileInputStream srcFile  = null;
-		FileOutputStream dstFile  = null;
-		byte[] buffer = new byte [4096];
-		int	nRead = 0;
-		long lTotalRead = 0;
-		long lTotalWritten = 0;
-		ContentResolver crIn = null;
-		ContentResolver crOut = null;
-		
-		if (sTmpSrcFileName.contains("org.mozilla.fennec") || sTmpSrcFileName.contains("org.mozilla.firefox")) {
-			ffxSrcFiles = Uri.parse("content://" + (sTmpSrcFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			crIn = contextWrapper.getContentResolver();
-		} else {
-			try {
-				srcFile  = new FileInputStream(sTmpSrcFileName);
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		if (sTmpDstFileName.contains("org.mozilla.fennec") || sTmpDstFileName.contains("org.mozilla.firefox")) {
-			ffxDstFiles = Uri.parse("content://" + (sTmpDstFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			crOut = contextWrapper.getContentResolver();
-			cv = new ContentValues();
-		} else {
-			try {
-				dstFile  = new FileOutputStream(sTmpDstFileName);
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		if (srcFile != null) {
-			try {
-				while((nRead = srcFile.read(buffer)) != -1)	{
-					lTotalRead += nRead;
-					if (dstFile != null) {
-						dstFile.write(buffer, 0, nRead);
-						dstFile.flush();
-					} else {
-						cv.put("length", nRead);
-						cv.put("chunk", buffer);
-						if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
-							break;
-						lTotalWritten += nRead;
-					}
-				}
-				
-				srcFile.close();
-				
-				if (dstFile != null) {
-					dstFile.flush();
-					dstFile.close();
-					
-					destFile = new File(sTmpDstFileName);
-					lTotalWritten = destFile.length();
-				}
-
-				if (lTotalWritten == lTotalRead) {
-					sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
-				}
-				else {
-					sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			
-		} else {
-			String[] columns = new String[] {
-					"_id",
-					"chunk",
-					"length"
-					};
-
-			Cursor myCursor = crIn.query(ffxSrcFiles,
-										columns, 			// Which columns to return 
-										sTmpSrcFileName,   	// Which rows to return (all rows)
-                    					null,       		// Selection arguments (none)
-                    					null);				// Order clause (none)
-			if (myCursor != null) {
-				int nRows = myCursor.getCount();
-				
-				byte [] buf = null;
-			
-				for (int lcv = 0; lcv < nRows; lcv++) {
-					if  (myCursor.moveToPosition(lcv)) {
-						buf = myCursor.getBlob(myCursor.getColumnIndex("chunk"));
-						if (buf != null) {
-							nRead = buf.length;
-							try {
-								lTotalRead += nRead;
-								if (dstFile != null) {
-									dstFile.write(buffer, 0, nRead);
-									dstFile.flush();
-								} else {
-									cv.put("length", nRead);
-									cv.put("chunk", buffer);
-									if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
-										break;
-									lTotalWritten += nRead;
-								}
-							} catch (IOException e) {
-								e.printStackTrace();
-							}
-							buf = null;
-						}
-					}
-				}
-				
-				if (nRows == -1) {
-					sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nNo such file or directory";
-				}
-				else {
-					myCursor.close();
-					
-					if (dstFile != null) {
-						try {
-							dstFile.flush();
-							dstFile.close();
-							
-							destFile = new File(sTmpDstFileName);
-							lTotalWritten = destFile.length();
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-
-					if (lTotalWritten == lTotalRead) {
-						sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
-					}
-					else {
-						sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
-					}
-				}
-			}
-			else {
-				sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nUnable to access file (internal error)";
-			}
-		}
-		
-		return (sRet);
-	}
-
-	public String IsDirWritable(String sDir)
-		{
-		String	sTmpDir = fixFileName(sDir);
-		String sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
-		
-		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = null;
-			
-			ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			
-			String[] columns = new String[] {
-					"_id",
-					"isdir",
-					"filename",
-					"length",
-					"writable"
-                };
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 	// Which columns to return 
-										sTmpDir,    // Which rows to return (all rows)
-                    					null,       // Selection arguments (none)
-                    					null);		// Order clause (none)
-			if (myCursor != null) {
-				if (myCursor.getCount() > 0) {
-					if (myCursor.moveToPosition(0)) {
-						if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
-							sRet = "[" + sTmpDir + "] " + ((myCursor.getLong(myCursor.getColumnIndex("writable")) == 1) ? "is" : "is not") + " writable";
-						}
-					}
-				}
-			}
-		} else {
-			File dir = new File(sTmpDir);
-			
-			if (dir.isDirectory()) {
-				sRet = "[" + sTmpDir + "] " + (dir.canWrite() ? "is" : "is not") + " writable";
-			} else {
-				sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
-			}
-		}
-		return(sRet);
-	}
-	
-	public String Push(String fileName, BufferedInputStream bufIn, long lSize)
-	{
-		byte []				buffer 			= new byte [8192];
-		int					nRead			= 0;
-		long				lRead			= 0;
-		String				sTmpFileName 	= fixFileName(fileName);
-		FileOutputStream 	dstFile			= null;
-		ContentResolver 	cr 				= null;
-		ContentValues		cv				= null;
-		Uri 				ffxFiles 		= null; 
-		String				sRet			= sErrorPrefix + "Push failed!";
-
-		try {
-			if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-				cr = contextWrapper.getContentResolver();
-				ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-				cv = new ContentValues();
-			}
-			else {
-				dstFile = new FileOutputStream(sTmpFileName, false);
-			}
-
-			while((nRead != -1) && (lRead < lSize))
-				{
-				nRead = bufIn.read(buffer);
-				if (nRead != -1) {
-					if (dstFile != null) {
-						dstFile.write(buffer, 0, nRead);
-						dstFile.flush();
-					} 
-					else {
-						cv.put("offset", lRead);
-						cv.put("length", nRead);
-						cv.put("chunk", buffer);
-						cr.update(ffxFiles, cv, sTmpFileName, null);
-					}
-					lRead += nRead;
-				}
-			}
-			
-			if (dstFile != null) {
-				dstFile.flush();
-				dstFile.close();
-			}
-			
-			if (lRead == lSize)	{
-				sRet = HashFile(sTmpFileName);
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		buffer = null;
-		
-		return(sRet);
-	}
-	
-	public String FTPGetFile(String sServer, String sSrcFileName, String sDstFileName, OutputStream out)
-		{
-		byte[] buffer = new byte [4096];
-		int	nRead = 0;
-		long lTotalRead = 0;
-		String sRet = sErrorPrefix + "FTP Get failed for " + sSrcFileName;
-		String strRet = "";
-		int	reply = 0;
-		FileOutputStream outStream = null;
-		String	sTmpDstFileName = fixFileName(sDstFileName);
-		
-		FTPClient ftp = new FTPClient();
-		try 
-			{
-			ftp.connect(sServer);
-			reply = ftp.getReplyCode();
-		    if(FTPReply.isPositiveCompletion(reply))
-		    	{
-			    ftp.login("anonymous", "b@t.com");
-				reply = ftp.getReplyCode();
-			    if(FTPReply.isPositiveCompletion(reply))
-			    	{
-				    ftp.enterLocalPassiveMode();
-				    if (ftp.setFileType(FTP.BINARY_FILE_TYPE))
-				    	{
-				    	File dstFile = new File(sTmpDstFileName);
-				    	outStream = new FileOutputStream(dstFile);
-				    	FTPFile [] ftpFiles = ftp.listFiles(sSrcFileName);
-				    	if (ftpFiles.length > 0)
-				    		{
-				    		long lFtpSize = ftpFiles[0].getSize();
-				    		if (lFtpSize <= 0)
-				    			lFtpSize = 1;
-				    	
-				    		InputStream ftpIn = ftp.retrieveFileStream(sSrcFileName);
-				    		while ((nRead = ftpIn.read(buffer)) != -1)
-								{
-				    			lTotalRead += nRead;
-				    			outStream.write(buffer, 0, nRead);
-				    			strRet = "\r" + lTotalRead + " of " + lFtpSize + " bytes received " + ((lTotalRead * 100) / lFtpSize) + "% completed";
-				    			out.write(strRet.getBytes());
-				    			out.flush();
-								}
-				    		ftpIn.close();
-				    		@SuppressWarnings("unused")
-				    		boolean bRet = ftp.completePendingCommand();
-				    		outStream.flush();
-				    		outStream.close();
-				    		strRet = ftp.getReplyString();
-				    		reply = ftp.getReplyCode();
-				    		}
-				    	else
-				    		{
-				    		strRet = sRet;
-				    		}
-				    	}
-				    ftp.logout();
-				    ftp.disconnect();
-				    sRet = "\n" + strRet; 
-			    	}
-			    else
-			    	{
-			        ftp.disconnect();
-			        System.err.println("FTP server refused login.");
-			        }
-		    	}
-		    else
-		    	{
-		        ftp.disconnect();
-		        System.err.println("FTP server refused connection.");
-		        }
-			}
-		catch (SocketException e)
-			{
-			sRet = e.getMessage();
-			strRet = ftp.getReplyString();
-			reply = ftp.getReplyCode();
-			sRet += "\n" + strRet;
-			e.printStackTrace();
-			}
-		catch (IOException e)
-			{
-			sRet = e.getMessage();
-			strRet = ftp.getReplyString();
-			reply = ftp.getReplyCode();
-			sRet += "\n" + strRet;
-			e.printStackTrace();
-			}
-		return (sRet);
-	}
-	
-	public String Pull(String fileName, long lOffset, long lLength, OutputStream out)
-		{
-		String	sTmpFileName = fixFileName(fileName);
-		String	sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
-		byte[]	buffer = new byte [4096];
-		int		nRead = 0;
-		long	lSent = 0;
-	
-		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = null;
-			
-			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			
-			String[] columns = new String[] {
-					"_id",
-					"chunk",
-					"length"
-					};
-			
-			String [] args = new String [2];
-			args[0] = Long.toString(lOffset);
-			args[1] = Long.toString(lLength);
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 		// Which columns to return 
-										sTmpFileName,   // Which rows to return (all rows)
-										args,       	// Selection arguments (none)
-                    					null);			// Order clause (none)
-			if (myCursor != null) {
-				int nRows = myCursor.getCount();
-				long lFileLength = 0;
-			
-				for (int lcv = 0; lcv < nRows; lcv++) {
-					if  (myCursor.moveToPosition(lcv)) {
-						if (lcv == 0) {
-							lFileLength = myCursor.getLong(2);
-							String sTmp = sTmpFileName + "," + lFileLength + "\n";
-							try {
-								out.write(sTmp.getBytes());
-							} catch (IOException e) {
-								e.printStackTrace();
-								break;
-							}
-						}
-
-						if (lLength != 0) {
-							byte [] buf = myCursor.getBlob(1);
-							if (buf != null) {
-								nRead = buf.length;
-								try {
-									if ((lSent + nRead) <= lFileLength)	{
-										out.write(buf,0,nRead);
-										lSent += nRead;
-									}
-									else {
-										nRead = (int) (lFileLength - lSent);
-										out.write(buf,0,nRead);
-										Log.d("pull warning", "more bytes read than expected");
-										break;
-									}
-								} catch (IOException e) {
-									e.printStackTrace();
-									sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
-								}
-								buf = null;
-							}
-						}
-					}
-				}
-				if (nRows == 0) {
-					String sTmp = sTmpFileName + "," + lFileLength + "\n";
-					try {
-						out.write(sTmp.getBytes());
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-				if (nRows == -1) {
-					sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
-				}
-				else {
-					myCursor.close();
-					sRet = "";
-				}
-			}
-			else {
-				sRet = sErrorPrefix + sTmpFileName + ",-1\nUnable to access file (internal error)";
-			}
-		} 
-		else {
-			try {
-				File f = new File(sTmpFileName);
-				long lFileLength = f.length();
-				FileInputStream fin = new FileInputStream(f);
-				if (lFileLength == 0) {
-					while ((nRead = fin.read(buffer)) != -1) {
-						lFileLength += nRead;
-					}
-					fin.close();
-					fin = new FileInputStream(f);
-				}
-				
-				// lLength == -1 return everything between lOffset and eof
-				// lLength == 0 return file length
-				// lLength > 0 return lLength bytes
-				if (lLength == -1) {
-					lFileLength = lFileLength - lOffset;
-				} else if (lLength == 0) {
-					// just return the file length
-				} else {
-					lFileLength = ((lLength <= (lFileLength - lOffset)) ? lLength : (lFileLength - lOffset));
-				}
-			
-				String sTmp = sTmpFileName + "," + lFileLength + "\n";
-				out.write(sTmp.getBytes());
-				if (lLength != 0) {
-					if  (lOffset > 0) {
-						fin.skip(lOffset);
-					}
-					while ((nRead = fin.read(buffer)) != -1) {
-						if ((lSent + nRead) <= lFileLength)	{
-							out.write(buffer,0,nRead);
-							lSent += nRead;
-						}
-						else {
-							nRead = (int) (lFileLength - lSent);
-							out.write(buffer,0,nRead);
-							if (lLength != -1)
-								Log.d("pull warning", "more bytes read than sent");
-							break;
-						}
-					}
-				}
-				fin.close();
-				out.flush();
-				sRet = "";
-				}
-			catch (FileNotFoundException e)	{
-				sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
-			} 
-			catch (IOException e) {
-				sRet = e.toString();
-			}
-		}
-		return (sRet);
-	}
-
-	public String Cat(String fileName, OutputStream out)
-		{
-		String	sTmpFileName = fixFileName(fileName);
-		String	sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
-		byte[]	buffer = new byte [4096];
-		int		nRead = 0;
-
-		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = null;
-			
-			ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
-			
-			String[] columns = new String[] {
-					"_id",
-					"chunk"
-					};
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 		// Which columns to return 
-										sTmpFileName,   // Which rows to return (all rows)
-                    					null,       	// Selection arguments (none)
-                    					null);			// Order clause (none)
-			if (myCursor != null) {
-				int nRows = myCursor.getCount();
-				int nBytesRecvd = 0;
-			
-				for (int lcv = 0; lcv < nRows; lcv++) {
-					if  (myCursor.moveToPosition(lcv)) {
-						byte [] buf = myCursor.getBlob(1);
-						if (buf != null) {
-							nBytesRecvd += buf.length;
-							try {
-								out.write(buf);
-								sRet = "";
-							} catch (IOException e) {
-								e.printStackTrace();
-								sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
-							}
-							buf = null;
-						}
-					}
-				}
-				if (nRows == 0) {
-					sRet = "";
-				}
-					
-				myCursor.close();
-			}
-		} else {
-			try {
-				FileInputStream fin = new FileInputStream(sTmpFileName);
-				while ((nRead = fin.read(buffer)) != -1) {
-					out.write(buffer,0,nRead);
-				}
-				fin.close();
-				out.flush();
-				sRet = "";
-				}
-			catch (FileNotFoundException e) {
-				sRet = sErrorPrefix + sTmpFileName + " No such file or directory";
-			} 
-			catch (IOException e) {
-				sRet = e.toString();
-			}
-		}
-		return (sRet);
-	}
-
-	public String MakeDir(String sDir)
-		{
-		String	sTmpDir = fixFileName(sDir);
-		String sRet = sErrorPrefix + "Could not create the directory " + sTmpDir;
-		if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			ContentValues cv = new ContentValues();
-			
-			if (cr.update(ffxFiles, cv, sTmpDir, null) == 1) {
-				sRet = sDir + " successfully created";
-			}
-		}
-		else {
-			File dir = new File(sTmpDir);
-			
-			if (dir.mkdirs())
-				sRet = sDir + " successfully created";
-		}
-		
-		return (sRet);
-		}
-	// move this to SUTAgentAndroid.java
-	public String GetScreenInfo()
-		{
-		String sRet = "";
-		DisplayMetrics metrics = new DisplayMetrics();
-		WindowManager wMgr = (WindowManager) contextWrapper.getSystemService(Context.WINDOW_SERVICE);
-		wMgr.getDefaultDisplay().getMetrics(metrics);
-		sRet = "X:" + metrics.widthPixels + " Y:" + metrics.heightPixels;
-		return (sRet);
-		}
-	// move this to SUTAgentAndroid.java
-	public int [] GetScreenXY()
-		{
-			int [] nRetXY = new int [2];
-			DisplayMetrics metrics = new DisplayMetrics();
-			WindowManager wMgr = (WindowManager) contextWrapper.getSystemService(Context.WINDOW_SERVICE);
-			wMgr.getDefaultDisplay().getMetrics(metrics);
-			nRetXY[0] = metrics.widthPixels;
-			nRetXY[1] = metrics.heightPixels;
-			return(nRetXY);
-		}
-	
-	public String SetADB(String sWhat) {
-		String sRet = "";
-		String sTmp = "";
-		String [] theArgs = new String [3];
-		
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		
-		if (sWhat.contains("ip")) {
-			theArgs[2] = "setprop service.adb.tcp.port 5555";
-		} else {
-			theArgs[2] = "setprop service.adb.tcp.port -1";
-		}
-		
-		try {
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
-			outThrd.start();
-			outThrd.join(5000);
-			sTmp = outThrd.strOutput;
-			Log.e("ADB", sTmp);
-			if (outThrd.nExitCode == 0) {
-				theArgs[2] = "stop adbd";
-				pProc = Runtime.getRuntime().exec(theArgs);
-				outThrd = new RedirOutputThread(pProc, null);
-				outThrd.start();
-				outThrd.join(5000);
-				sTmp = outThrd.strOutput;
-				Log.e("ADB", sTmp);
-				if (outThrd.nExitCode == 0) {
-					theArgs[2] = "start adbd";
-					pProc = Runtime.getRuntime().exec(theArgs);
-					outThrd = new RedirOutputThread(pProc, null);
-					outThrd.start();
-					outThrd.join(5000);
-					sTmp = outThrd.strOutput;
-					Log.e("ADB", sTmp);
-					if (outThrd.nExitCode == 0) {
-						sRet = "Successfully set adb to " + sWhat + "\n";
-					} else {
-						sRet = sErrorPrefix + "Failed to start adbd\n";
-					}
-				} else {
-					sRet = sErrorPrefix + "Failed to stop adbd\n";
-				}
-			} else {
-				sRet = sErrorPrefix + "Failed to setprop service.adb.tcp.port 5555\n";
-			}
-			
-		}
-	catch (IOException e) 
-		{
-		sRet = e.getMessage();
-		e.printStackTrace();
-		} 
-	catch (InterruptedException e)
-		{
-		e.printStackTrace();
-		}
-		return(sRet);
-	}
-	
-	public String KillProcess(String sProcName, OutputStream out)
-		{
-		String sTmp = "";
-		String [] theArgs = new String [3];
-		
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "kill";
-
-		String sRet = sErrorPrefix + "Unable to kill " + sProcName + "\n";
-		ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
-		int lcv = 0;
-		String strProcName = "";
-		int	nPID = 0;
-		
-		for (lcv = 0; lcv < lProcesses.size(); lcv++)
-			{
-			if (lProcesses.get(lcv).processName.contains(sProcName))
-				{
-				strProcName = lProcesses.get(lcv).processName;
-				nPID = lProcesses.get(lcv).pid;
-				sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
-
-				theArgs[2] += " " + nPID;
-				
-				try 
-					{
-					pProc = Runtime.getRuntime().exec(theArgs);
-					RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
-					outThrd.start();
-					outThrd.join(15000);
-					sTmp = outThrd.strOutput;
-					Log.e("KILLPROCESS", sTmp);
-					if (outThrd.nExitCode == 0) {
-						sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
-						nPID = 0;
-						break;
-					} else {
-						sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
-					}
-					}
-				catch (IOException e) 
-					{
-					sRet = e.getMessage();
-					e.printStackTrace();
-					} 
-				catch (InterruptedException e)
-					{
-					e.printStackTrace();
-					}
-
-				// Give the messages a chance to be processed
-				try {
-					Thread.sleep(2000);
-					}
-				catch (InterruptedException e)
-					{
-					e.printStackTrace();
-					}
-				break;
-				}
-			}
-		
-		if (nPID > 0)
-			{
-			sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
-			lProcesses = aMgr.getRunningAppProcesses();
-			for (lcv = 0; lcv < lProcesses.size(); lcv++)
-				{
-				if (lProcesses.get(lcv).processName.contains(sProcName))
-					{
-					sRet = sErrorPrefix + "Unable to kill " + nPID + " " + strProcName + "\n";
-					break;
-					}
-				}
-			}
-		
-		return (sRet);
-		}
-
-	public boolean IsProcessDead(String sProcName)
-		{
-		boolean bRet = false;
-		ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.ProcessErrorStateInfo> lProcesses = aMgr.getProcessesInErrorState();
-		int lcv = 0;
-		
-		if (lProcesses != null)
-			{
-			for (lcv = 0; lcv < lProcesses.size(); lcv++)
-				{
-				if (lProcesses.get(lcv).processName.contentEquals(sProcName) && 
-					lProcesses.get(lcv).condition != ActivityManager.ProcessErrorStateInfo.NO_ERROR)
-					{
-					bRet = true;
-					break;
-					}
-				}
-			}
-	
-		return (bRet);
-		}
-
-	public String GetProcessInfo()
-		{
-		String sRet = "";
-		ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
-		int	nProcs = lProcesses.size();
-		int lcv = 0;
-		String strProcName = "";
-		int	nPID = 0;
-		int nUser = 0;
-		
-		for (lcv = 0; lcv < nProcs; lcv++)
-			{
-			strProcName = lProcesses.get(lcv).processName;
-			nPID = lProcesses.get(lcv).pid;
-			nUser = lProcesses.get(lcv).uid;
-			sRet += nUser + "\t" + nPID + "\t" + strProcName;
-			if (lcv < (nProcs - 1))
-				sRet += "\n";
-			}
-			
-		return (sRet);
-		}
-	
-	public String GetOSInfo()
-		{
-		String sRet = "";
-		
-		sRet = Build.DISPLAY;
-		
-		return (sRet);
-		}
-	
-	public String GetPowerInfo()
-		{
-		String sRet = "";
-	
-		sRet = "Power status:\n  AC power " + SUTAgentAndroid.sACStatus + "\n";
-		sRet += "  Battery charge " + SUTAgentAndroid.sPowerStatus + "\n";
-		sRet += "  Remaining charge:      " + SUTAgentAndroid.nChargeLevel + "%\n";
-		sRet += "  Battery Temperature:   " + (((float)(SUTAgentAndroid.nBatteryTemp))/10) + " (c)\n";
-		return (sRet);
-		}
-
-	// todo
-	public String GetDiskInfo(String sPath)
-		{
-		String sRet = "";
-		StatFs statFS = new StatFs(sPath);
-		
-		int nBlockCount = statFS.getBlockCount();
-		int nBlockSize = statFS.getBlockSize();
-		int nBlocksAvail = statFS.getAvailableBlocks();
-		int nBlocksFree = statFS.getFreeBlocks();
-	
-		sRet = "total:     " + (nBlockCount * nBlockSize) + "\nfree:      " + (nBlocksFree * nBlockSize) + "\navailable: " + (nBlocksAvail * nBlockSize);
-	
-		return (sRet);
-		}
-
-	public String GetMemoryInfo()
-		{
-		String sRet = "PA:" + GetMemoryConfig();
-		return (sRet);
-		}
-
-	public long GetMemoryConfig()
-		{
-		ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
-		ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();
-		aMgr.getMemoryInfo(outInfo);
-		long lMem = outInfo.availMem;
-
-		return (lMem);
-		}
-	
-	public String UpdateCallBack(String sFileName)
-		{
-		String sRet = sErrorPrefix + "No file specified";
-		String sIP = "";
-		String sPort = "";
-		int nEnd = 0;
-		int nStart = 0;
-		
-		if ((sFileName == null) || (sFileName.length() == 0))
-			return(sRet);
-			
-		Context ctx = contextWrapper.getApplicationContext();
-		try {
-			FileInputStream fis = ctx.openFileInput(sFileName);
-			int nBytes = fis.available();
-			if (nBytes > 0)
-				{
-				byte [] buffer = new byte [nBytes + 1];
-				int nRead = fis.read(buffer, 0, nBytes);
-				fis.close();
-				ctx.deleteFile(sFileName);
-				if (nRead > 0)
-					{
-					String sBuffer = new String(buffer);
-					nEnd = sBuffer.indexOf(',');
-					if (nEnd > 0)
-						{
-						sIP = (sBuffer.substring(0, nEnd)).trim();
-						nStart = nEnd + 1;
-						nEnd = sBuffer.indexOf('\r', nStart);
-						if (nEnd > 0)
-							{
-							sPort = (sBuffer.substring(nStart, nEnd)).trim();
-							Thread.sleep(5000);
-							sRet = RegisterTheDevice(sIP, sPort, sBuffer.substring(nEnd + 1));
-							}
-						}
-					}
-				}
-			} 
-		catch (FileNotFoundException e)
-			{
-			sRet = sErrorPrefix + "Nothing to do";
-			} 
-		catch (IOException e)
-			{
-			sRet = sErrorPrefix + "Couldn't send info to " + sIP + ":" + sPort;
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-		return(sRet);
-		}
-	
-	public String RegisterTheDevice(String sSrvr, String sPort, String sData)
-		{
-		String sRet = "";
-		String line = "";
-		
-//		Debug.waitForDebugger();
-		
-		if (sSrvr != null && sPort != null && sData != null)
-			{
-			try
-				{
-				int nPort = Integer.parseInt(sPort);
-				Socket socket = new Socket(sSrvr, nPort);
-				PrintWriter out = new PrintWriter(socket.getOutputStream(), false);
-				BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-				out.println(sData);
-				if ( out.checkError() == false )
-					{
-					socket.setSoTimeout(30000);
-					while (socket.isInputShutdown() == false)
-						{
-						line = in.readLine();
-						
-						if (line != null)
-							{
-							line = line.toLowerCase();
-							sRet += line;
-							// ok means we're done
-							if (line.contains("ok"))
-								break;
-							}
-						else
-							{
-							// end of stream reached
-							break;
-							}
-						}
-					}
-				out.close();
-				in.close();
-				socket.close();
-				}
-			catch(NumberFormatException e)
-				{
-				sRet += "reg NumberFormatException thrown [" + e.getLocalizedMessage() + "]";
-				e.printStackTrace();
-				} 
-			catch (UnknownHostException e)
-				{
-				sRet += "reg UnknownHostException thrown [" + e.getLocalizedMessage() + "]";
-				e.printStackTrace();
-				}
-			catch (IOException e)
-				{
-				sRet += "reg IOException thrown [" + e.getLocalizedMessage() + "]";
-				e.printStackTrace();
-				}
-			}
-		return(sRet);
-		}
-	
-	public String GetInternetData(String sHost, String sPort, String sURL)
-		{
-		String sRet = "";
-		String sNewURL = "";
-		HttpClient httpClient = new DefaultHttpClient();
-		try 
-			{
-			sNewURL = "http://" + sHost + ((sPort.length() > 0) ? (":" + sPort) : "") + sURL;
-
-			HttpGet request = new HttpGet(sNewURL);
-			HttpResponse response = httpClient.execute(request);
-			int status = response.getStatusLine().getStatusCode();
-			// we assume that the response body contains the error message
-			if (status != HttpStatus.SC_OK)
-				{
-			    ByteArrayOutputStream ostream = new ByteArrayOutputStream();
-			    response.getEntity().writeTo(ostream);
-			    Log.e("HTTP CLIENT", ostream.toString());
-				}
-			else
-				{
-			    InputStream content = response.getEntity().getContent();
-			    byte [] data = new byte [2048];
-			    int nRead = content.read(data);
-			    sRet = new String(data, 0, nRead);
-			    content.close(); // this will also close the connection
-				}
-			}
-		catch (IllegalArgumentException e)
-			{
-			sRet = e.getLocalizedMessage();
-			e.printStackTrace();
-			}
-		catch (ClientProtocolException e)
-			{
-			sRet = e.getLocalizedMessage();
-			e.printStackTrace();
-			}
-		catch (IOException e)
-			{
-			sRet = e.getLocalizedMessage();
-			e.printStackTrace();
-			}
-		
-		return(sRet);
-		}
-	
-	public String GetTimeZone()
-		{
-		String	sRet = "";
-		TimeZone tz;
-		
-		tz = TimeZone.getDefault();
-		Date now = new Date();
-		sRet = tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG);
-		
-		return(sRet);
-		}
-	
-	public String SetTimeZone(String sTimeZone)
-		{
-		String			sRet = "Unable to set timezone to " + sTimeZone;
-		TimeZone 		tz = null;
-		AlarmManager 	amgr = null;
-		
-		if ((sTimeZone.length() > 0) && (sTimeZone.startsWith("GMT")))
-			{
-			amgr = (AlarmManager) contextWrapper.getSystemService(Context.ALARM_SERVICE);
-			if (amgr != null)
-				amgr.setTimeZone(sTimeZone);
-			}
-		else
-			{
-			String [] zoneNames = TimeZone.getAvailableIDs();
-			int nNumMatches = zoneNames.length;
-			int	lcv = 0;
-			
-			for (lcv = 0; lcv < nNumMatches; lcv++)
-				{
-				if (zoneNames[lcv].equalsIgnoreCase(sTimeZone))
-					break;
-				}
-
-			if (lcv < nNumMatches)
-				{
-				amgr = (AlarmManager) contextWrapper.getSystemService(Context.ALARM_SERVICE);
-				if (amgr != null)
-					amgr.setTimeZone(zoneNames[lcv]);
-				}
-			}
-		
-		if (amgr != null)
-			{
-			tz = TimeZone.getDefault();
-			Date now = new Date();
-			sRet = tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG);
-			}
-		
-		return(sRet);
-		}
-
-	public String GetSystemTime()
-		{
-		String sRet = "";
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS");
-		sRet = sdf.format(cal.getTime());
-	
-		return (sRet);
-		}
-	
-	public String SetSystemTime(String sDate, String sTime, OutputStream out) {
-		String sRet = "";
-		String sM = "";
-		String sMillis = "";
-		String [] theArgs = new String [3];
-		
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		
-		if (((sDate != null) && (sTime != null)) && 
-			(sDate.contains("/") || sDate.contains(".")) &&
-			(sTime.contains(":"))) {
-			int year = Integer.parseInt(sDate.substring(0,4));
-			int month = Integer.parseInt(sDate.substring(5,7));
-			int day = Integer.parseInt(sDate.substring(8,10));
-			
-			int hour = Integer.parseInt(sTime.substring(0,2));
-			int mins = Integer.parseInt(sTime.substring(3,5));
-			int secs = Integer.parseInt(sTime.substring(6,8));
-
-			Calendar cal = new GregorianCalendar(TimeZone.getDefault());
-			cal.set(year, month - 1, day, hour, mins, secs);
-			long lMillisecs = cal.getTime().getTime();
-			
-			sM = Long.toString(lMillisecs);
-			sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
-		
-		} else if ((sDate != null) && (sTime == null) && sDate.contains(".")) {
-			String serverName = sDate;
-//    		String serverName = "us.pool.ntp.org";
-			sRet = "NTP Server: " + serverName + lineSep;
-    		// Send request
-    		DatagramSocket socket;
-
-			try {
-				socket = new DatagramSocket();
-	    		InetAddress address = InetAddress.getByName(serverName);
-	    		byte[] buf = new NtpMessage().toByteArray();
-	    		DatagramPacket packet = new DatagramPacket(buf, buf.length, address, 123);
-		    		
-	    		// Set the transmit timestamp *just* before sending the packet
-	    		// ToDo: Does this actually improve performance or not?
-	    		NtpMessage.encodeTimestamp(packet.getData(), 40, (System.currentTimeMillis()/1000.0) + 2208988800.0);
-		    		
-	    		socket.send(packet);
-		    		
-	    		// Get response
-	    		System.out.println("NTP request sent, waiting for response...\n");
-	    		packet = new DatagramPacket(buf, buf.length);
-	    		socket.receive(packet);
-		    		
-	    		// Immediately record the incoming timestamp since 00:00 1-JAN-1900 in secs.
-	    		double destinationTimestamp = (System.currentTimeMillis()/1000.0) + 2208988800.0;
-		    		
-	    		// Process response
-	    		NtpMessage msg = new NtpMessage(packet.getData());
-		    		
-	    		// Corrected, according to RFC2030 errata
-	    		double roundTripDelay = (destinationTimestamp-msg.originateTimestamp) - (msg.transmitTimestamp-msg.receiveTimestamp);
-		    			
-	    		double localClockOffset = ((msg.receiveTimestamp - msg.originateTimestamp) + (msg.transmitTimestamp - destinationTimestamp)) / 2;
-		    		
-	    		// convert base of timestamp from 00:00 1900/01/01 to 00:00:00 1970/01/01
-	    		double utc = msg.transmitTimestamp - (2208988800.0);
-	    		
-	    		// convert from secs to ms
-	    		long lNewMillisecs = (long)(utc * 1000.0);
-	    		
-	    		// create a date object using the timestamp this will take into account the timezone and daylight savings settings
-	    		Date dt = new Date(lNewMillisecs);
-		    		
-	    		sRet += "  Time: " + new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS").format(dt) + lineSep;
-	    		
-		    	// get the timestamp
-	    		long lMillisecs = dt.getTime();
-	    		
-	    		// format the timestamp as required for the date command
-				sM = Long.toString(lMillisecs);
-				sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
-				
-				socket.close();
-			} catch (SocketException e) {
-				e.printStackTrace();
-			} catch (UnknownHostException e) {
-				e.printStackTrace();
-				sRet = sErrorPrefix + "Unknown host";
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		} else {
-			sRet += "Invalid argument(s)";
-		}
-		
-		// if we have an argument
-		if (sMillis.length() > 0) {
-			theArgs[2] = "date -u " + sMillis;
-			
-			try {
-				pProc = Runtime.getRuntime().exec(theArgs);
-				RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
-				outThrd.start();
-				outThrd.join(10000);
-				sRet += GetSystemTime();
-			} catch (IOException e) {
-				sRet = e.getMessage();
-				e.printStackTrace();
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-
-		return (sRet);
-	}
-
-	public String GetClok()
-		{
-		long lMillisecs = System.currentTimeMillis();
-		String sRet = "";
-		
-		if (lMillisecs > 0)
-			sRet = Long.toString(lMillisecs);
-		
-		return(sRet);
-		}
-	
-	public String GetUptime()
-		{
-		String sRet = "";
-		long lHold = 0;
-		long lUptime = SystemClock.elapsedRealtime();
-		int	nDays = 0;
-		int	nHours = 0;
-		int nMinutes = 0;
-		int nSecs = 0;
-		int nMilliseconds = 0;
-		
-		if (lUptime > 0)
-			{
-			nDays = (int)(lUptime / (24L * 60L * 60L * 1000L));
-			lHold = lUptime % (24L * 60L * 60L * 1000L);
-			nHours = (int)(lHold / (60L * 60L * 1000L));
-			lHold %= 60L * 60L * 1000L;
-			nMinutes = (int)(lHold / (60L * 1000L));
-			lHold %= 60L * 1000L;
-			nSecs = (int)(lHold / 1000L);
-			nMilliseconds = (int)(lHold % 1000);
-			sRet = "" + nDays + " days " + nHours + " hours " + nMinutes + " minutes " + nSecs + " seconds " + nMilliseconds + " ms";
-			}
-
-		return (sRet);
-		}
-
-	public String NewKillProc(String sProcId, OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [3];
-		
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "kill " + sProcId;
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(5000);
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-
-		return(sRet);
-		}
-	
-	public String SendPing(String sIPAddr, OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [4];
-		
-		theArgs[0] = "ping";
-		theArgs[1] = "-c";
-		theArgs[2] = "3";
-		theArgs[3] = sIPAddr;
-		
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(5000);
-			if (out == null)
-				sRet = outThrd.strOutput;
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-	
-		return (sRet);
-		}
-	
-	public String GetTmpDir()
-	{
-		String 	sRet = "";
-		Context ctx = contextWrapper.getApplicationContext();
-        File dir = ctx.getFilesDir();
-        ctx = null;
-        try {
-			sRet = dir.getCanonicalPath();
-			} 
-        catch (IOException e)
-        	{
-			e.printStackTrace();
-        	}
-        return(sRet);
-	}
-
-	public String PrintFileTimestamp(String sFile)
-		{
-		String 	sRet = "";
-		String	sTmpFileName = fixFileName(sFile);
-		long	lModified = -1;
-		
-		if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
-			ContentResolver cr = contextWrapper.getContentResolver();
-			Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
-			
-			String[] columns = new String[] {
-					"_id",
-					"isdir",
-					"filename",
-					"length",
-					"ts"
-                };
-
-			Cursor myCursor = cr.query(	ffxFiles,
-										columns, 		// Which columns to return 
-										sTmpFileName,   // Which rows to return (all rows)
-                    					null,       	// Selection arguments (none)
-                    					null);			// Order clause (none)
-			if (myCursor != null) {
-				if (myCursor.getCount() > 0) {
-					if (myCursor.moveToPosition(0)) {
-						lModified = myCursor.getLong(myCursor.getColumnIndex("ts"));
-					}
-				}
-				myCursor.close();
-			}
-		}
-		else {
-			File theFile = new File(sTmpFileName);
-			
-			if (theFile.exists()) {
-				lModified = theFile.lastModified();
-			}
-		}
-		
-		if (lModified != -1) {
-			Date dtModified = new Date(lModified);
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS");
-			sRet = "Last modified: " + sdf.format(dtModified);
-		}
-		else {
-			sRet = sErrorPrefix + "[" + sTmpFileName + "] doesn't exist";
-		}
-			
-		return(sRet);
-		}
-	
-	public String GetIniData(String sSection, String sKey, String sFile)
-		{
-		String sRet = "";
-		String sComp = "";
-		String sLine = "";
-		boolean bFound = false;
-		BufferedReader in = null;
-		String	sTmpFileName = fixFileName(sFile);
-		
-		try {
-			in = new BufferedReader(new FileReader(sTmpFileName));
-			sComp = "[" + sSection + "]";
-			while ((sLine = in.readLine()) != null)
-				{
-				if (sLine.equalsIgnoreCase(sComp))
-					{
-					bFound = true;
-					break;
-					}
-				}
-			
-			if (bFound)
-				{
-				sComp = (sKey + " =").toLowerCase();
-				while ((sLine = in.readLine()) != null)
-					{
-					if (sLine.toLowerCase().contains(sComp))
-						{
-						String [] temp = null;
-						temp = sLine.split("=");
-						if (temp != null)
-							{
-							if (temp.length > 1)
-								sRet = temp[1].trim();
-							}
-						break;
-						}
-					}
-				}
-			in.close();
-			}
-		catch (FileNotFoundException e)
-			{
-			sComp = e.toString();
-			} 
-		catch (IOException e) 
-			{
-			sComp = e.toString();
-			}
-		return (sRet);
-		}
-	
-	public String RunReboot(OutputStream out, String sCallBackIP, String sCallBackPort)
-		{
-		String sRet = "";
-		Context ctx = contextWrapper.getApplicationContext();
-		String [] theArgs = new String [3];
-	
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "reboot";
-		try {
-			if ((sCallBackIP != null) && (sCallBackPort != null) && 
-				(sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))	{
-				FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
-				String sBuffer = sCallBackIP + "," + sCallBackPort + "\rSystem rebooted\r";
-				fos.write(sBuffer.getBytes());
-				fos.flush();
-				fos.close();
-				fos = null;
-			}
-		} catch (FileNotFoundException e) {
-			sRet = sErrorPrefix + "Callback file creation error [rebt] call failed " + e.getMessage();
-			e.printStackTrace();
-		} catch (IOException e) {
-			sRet = sErrorPrefix + "Callback file error [rebt] call failed " + e.getMessage();
-			e.printStackTrace();
-		}
-	
-		try {
-			// Tell all of the data channels we are rebooting
-			((ASMozStub)this.contextWrapper).SendToDataChannel("Rebooting ...");
-			
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(10000);
-		} catch (IOException e) {
-			sRet = e.getMessage();
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-
-		return (sRet);
-		}
-	
-	public String UnInstallApp(String sApp, OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [3];
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "pm uninstall " + sApp + ";reboot;exit";
-		
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-		
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(60000);
-			int nRet = pProc.exitValue();
-			sRet = "\nuninst complete [" + nRet + "]";
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-		
-		return (sRet);
-	}
-	
-	public String InstallApp(String sApp, OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [3];
-		File	srcFile = new File(sApp);
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "mv " + GetTmpDir() + "/" + srcFile.getName() + " /data/local/tmp/" + srcFile.getName() + ";exit";
-		
-		sRet = CopyFile(sApp, GetTmpDir() + "/" + srcFile.getName());
-		try {
-			out.write(sRet.getBytes());
-			out.flush();
-			}
-		catch (IOException e1)
-			{
-			e1.printStackTrace();
-			}
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-			
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(90000);
-			int nRet = pProc.exitValue();
-			sRet = "\nmove complete [" + nRet + "]";
-			try 
-				{
-				out.write(sRet.getBytes());
-				out.flush();
-				}
-			catch (IOException e1)
-				{
-				e1.printStackTrace();
-				}
-			
-			theArgs[2] = "chmod 666 /data/local/tmp/" + srcFile.getName() + ";exit";
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd2 = new RedirOutputThread(pProc, out);
-			outThrd2.start();
-			outThrd2.join(10000);
-			int nRet2 = pProc.exitValue();
-			sRet = "\npermission change complete [" + nRet2 + "]\n";
-			try {
-				out.write(sRet.getBytes());
-				out.flush();
-				}
-			catch (IOException e1)
-				{
-				e1.printStackTrace();
-				}
-			
-			theArgs[2] = "pm install -r /data/local/tmp/" + srcFile.getName() + " Cleanup" + ";exit";
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd3 = new RedirOutputThread(pProc, out);
-			outThrd3.start();
-			outThrd3.join(60000);
-			int nRet3 = pProc.exitValue();
-			sRet = "\ninstallation complete [" + nRet3 + "]";
-			try {
-				out.write(sRet.getBytes());
-				out.flush();
-				}
-			catch (IOException e1)
-				{
-				e1.printStackTrace();
-				}
-			
-			theArgs[2] = "rm /data/local/tmp/" + srcFile.getName() + ";exit";
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd4 = new RedirOutputThread(pProc, out);
-			outThrd4.start();
-			outThrd4.join(60000);
-			int nRet4 = pProc.exitValue();
-			sRet = "\ntmp file removed [" + nRet4 + "]";
-			try {
-				out.write(sRet.getBytes());
-				out.flush();
-				}
-			catch (IOException e1)
-				{
-				e1.printStackTrace();
-				}
-			sRet = "\nSuccess";
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-
-		return (sRet);
-		}
-
-	public String StrtUpdtOMatic(String sPkgName, String sPkgFileName, String sCallBackIP, String sCallBackPort)
-		{
-		String sRet = "";
-		
-		Context ctx = contextWrapper.getApplicationContext();
-		PackageManager pm = ctx.getPackageManager();
-
-		Intent prgIntent = new Intent();
-		prgIntent.setPackage("com.mozilla.watcher");
-		
-		try {
-			PackageInfo pi = pm.getPackageInfo("com.mozilla.watcher", PackageManager.GET_SERVICES | PackageManager.GET_INTENT_FILTERS);
-			ServiceInfo [] si = pi.services;
-			for (int i = 0; i < si.length; i++)
-				{
-				ServiceInfo s = si[i];
-				if (s.name.length() > 0)
-					{
-					prgIntent.setClassName(s.packageName, s.name);
-					break;
-					}
-				}
-			}
-		catch (NameNotFoundException e)
-			{
-			e.printStackTrace();
-			sRet = sErrorPrefix + "watcher is not properly installed";
-			return(sRet);
-			}
-		
-		prgIntent.putExtra("command", "updt");
-		prgIntent.putExtra("pkgName", sPkgName);
-		prgIntent.putExtra("pkgFile", sPkgFileName);
-		prgIntent.putExtra("reboot", true);
-		
-		try 
-			{
-			if ((sCallBackIP != null) && (sCallBackPort != null) && 
-				(sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))
-				{
-				FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
-				String sBuffer = sCallBackIP + "," + sCallBackPort + "\rupdate started " + sPkgName + " " + sPkgFileName + "\r";
-				fos.write(sBuffer.getBytes());
-				fos.flush();
-				fos.close();
-				fos = null;
-				prgIntent.putExtra("outFile", ctx.getFilesDir() + "/update.info");
-				}
-			else {
-				if (prgIntent.hasExtra("outFile")) {
-					System.out.println("outFile extra unset from intent");
-					prgIntent.removeExtra("outFile");
-				}
-			}
-			
-			ComponentName cn = contextWrapper.startService(prgIntent);
-			if (cn != null)
-				sRet = "exit";
-			else
-				sRet = sErrorPrefix + "Unable to use watcher service";
-			}
-		catch(ActivityNotFoundException anf)
-			{
-			sRet = sErrorPrefix + "Activity Not Found Exception [updt] call failed";
-			anf.printStackTrace();
-			} 
-		catch (FileNotFoundException e)
-			{
-			sRet = sErrorPrefix + "File creation error [updt] call failed";
-			e.printStackTrace();
-			}
-		catch (IOException e)
-			{
-			sRet = sErrorPrefix + "File error [updt] call failed";
-			e.printStackTrace();
-			}
-
-		ctx = null;
-		
-		return (sRet);
-		}
-
-	public String StartJavaPrg(String [] sArgs, Intent preIntent)
-		{
-		String sRet = "";
-		String sArgList = "";
-		String sUrl = "";
-//		String sRedirFileName = "";
-		Intent prgIntent = null;
-		
-		Context ctx = contextWrapper.getApplicationContext();
-		PackageManager pm = ctx.getPackageManager();
-
-		if (preIntent == null)
-			prgIntent = new Intent();
-		else
-			prgIntent = preIntent;
-		
-		prgIntent.setPackage(sArgs[0]);
-		prgIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-		try {
-			PackageInfo pi = pm.getPackageInfo(sArgs[0], PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
-			ActivityInfo [] ai = pi.activities;
-			for (int i = 0; i < ai.length; i++)
-				{
-				ActivityInfo a = ai[i];
-				if (a.name.length() > 0)
-					{
-					prgIntent.setClassName(a.packageName, a.name);
-					break;
-					}
-				}
-			}
-		catch (NameNotFoundException e)
-			{
-			e.printStackTrace();
-			}
-		
-		if (sArgs.length > 1)
-			{
-			if (sArgs[0].contains("android.browser"))
-				prgIntent.setAction(Intent.ACTION_VIEW);
-			else
-				prgIntent.setAction(Intent.ACTION_MAIN);
-			
-			if (sArgs[0].contains("fennec"))
-				{
-				sArgList = "";
-				sUrl = "";
-				
-				for (int lcv = 1; lcv < sArgs.length; lcv++)
-					{
-					if (sArgs[lcv].contains("://"))
-						{
-						prgIntent.setAction(Intent.ACTION_VIEW);
-						sUrl = sArgs[lcv];
-						}
-					else
-						{
-						if (sArgs[lcv].equals(">"))
-							{
-							lcv++;
-							if (lcv < sArgs.length)
-								lcv++;
-//								sRedirFileName = sArgs[lcv++];
-							}
-						else
-							sArgList += " " + sArgs[lcv];
-						}
-					}
-				
-				if (sArgList.length() > 0)
-					prgIntent.putExtra("args", sArgList.trim());
-				
-				if (sUrl.length() > 0)
-					prgIntent.setData(Uri.parse(sUrl.trim()));
-				}
-			else
-				{
-				for (int lcv = 1; lcv < sArgs.length; lcv++)
-					sArgList += " " + sArgs[lcv];
-				
-				prgIntent.setData(Uri.parse(sArgList.trim()));
-				}
-			}
-		else
-			{
-			prgIntent.setAction(Intent.ACTION_MAIN);
-			}
-
-		try 
-			{
-			contextWrapper.startActivity(prgIntent);
-			}
-		catch(ActivityNotFoundException anf)
-			{
-			anf.printStackTrace();
-			}
-		
-		ctx = null;
-		return (sRet);
-		}
-
-	public String StartPrg(String [] progArray, OutputStream out)
-		{
-		String sRet = "";
-		
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(progArray);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(10000);
-			int nRetCode = pProc.exitValue();
-			sRet = "return code [" + nRetCode + "]";
-			}
-		catch (IOException e) 
-			{
-			e.printStackTrace();
-			}
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			sRet = "Timed out!";
-			}
-
-		return (sRet);
-		}
-
-	public String StartPrg2(String [] progArray, OutputStream out)
-		{
-		String sRet = "";
-		
-		int	nArraySize = 0;
-		int	nArgs = progArray.length - 1; // 1st arg is the environment string
-		int	lcv	= 0;
-		int	temp = 0;
-
-		String sEnvString = progArray[0];
-		
-		if (!sEnvString.contains("=") && (sEnvString.length() > 0))
-			{
-			if (sEnvString.contains("/") || sEnvString.contains("\\") || !sEnvString.contains("."))
-				sRet = StartPrg(progArray, out);
-			else
-				sRet = StartJavaPrg(progArray, null);
-			return(sRet);
-			}
-
-		// Set up command line args stripping off the environment string
-		String [] theArgs = new String [nArgs];
-		for (lcv = 0; lcv < nArgs; lcv++)
-			{
-			theArgs[lcv] = progArray[lcv + 1];
-			}
-		
-		try 
-			{
-			String [] envStrings = sEnvString.split(",");
-			Map<String, String> newEnv = new HashMap<String, String>();
-			
-			for (lcv = 0; lcv < envStrings.length; lcv++)
-				{
-				temp = envStrings[lcv].indexOf("=");
-				if (temp > 0)
-					{
-					newEnv.put(	envStrings[lcv].substring(0, temp), 
-								envStrings[lcv].substring(temp + 1, envStrings[lcv].length()));
-					}
-				}
-			
-			Map<String, String> sysEnv = System.getenv();
-			
-			nArraySize = sysEnv.size();
-			
-			for (Map.Entry<String, String> entry : newEnv.entrySet())
-				{
-				if (!sysEnv.containsKey(entry.getKey()))
-					{
-					nArraySize++;
-					}
-				}
-			
-			String[] envArray = new String[nArraySize];
-				
-			int		i = 0;
-			int		offset;
-			String	sKey = "";
-			String 	sValue = "";
-			
-	        for (Map.Entry<String, String> entry : sysEnv.entrySet())
-	        	{
-	        	sKey = entry.getKey();
-	        	if (newEnv.containsKey(sKey))
-	        		{
-	        		sValue = newEnv.get(sKey);
-	        		if ((offset = sValue.indexOf("$" + sKey)) != -1)
-	        			{
-	        			envArray[i++] = sKey + 
-	        							"=" + 
-	        							sValue.substring(0, offset) + 
-	        							entry.getValue() + 
-	        							sValue.substring(offset + sKey.length() + 1);
-	        			}
-	        		else
-	        			envArray[i++] = sKey + "=" + sValue;
-	        		newEnv.remove(sKey);
-	        		}
-	        	else
-	        		envArray[i++] = entry.getKey() + "=" + entry.getValue();
-	        	}
-	        
-			for (Map.Entry<String, String> entry : newEnv.entrySet())
-				{
-        		envArray[i++] = entry.getKey() + "=" + entry.getValue();
-				}
-			
-			if (theArgs[0].contains("/") || theArgs[0].contains("\\") || !theArgs[0].contains("."))
-				{
-				pProc = Runtime.getRuntime().exec(theArgs, envArray);
-
-				RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-				outThrd.start();
-				outThrd.join(10000);
-				int nRetCode = pProc.exitValue();
-				sRet = "return code [" + nRetCode + "]";
-				}
-			else
-				{
-				Intent preIntent = new Intent();
-				for (lcv = 0; lcv < envArray.length; lcv++)
-					{
-					preIntent.putExtra("env" + lcv, envArray[lcv]);
-					}
-				sRet = StartJavaPrg(theArgs, preIntent);
-				}
-			}
-		catch(UnsupportedOperationException e)
-			{
-			if (e != null)
-				e.printStackTrace();
-			}
-		catch(ClassCastException e)
-			{
-			if (e != null)
-				e.printStackTrace();
-			}
-		catch(IllegalArgumentException e)
-			{
-			if (e != null)
-				e.printStackTrace();
-			}
-		catch(NullPointerException e)
-			{
-			if (e != null)
-				e.printStackTrace();
-			}
-		catch (IOException e) 
-			{
-			e.printStackTrace();
-			}
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			sRet = "Timed out!";
-			}
-
-		return (sRet);
-		}
-
-	private String PrintUsage()
-		{
-		String sRet = 
-			"run [cmdline]                - start program no wait\n" +
-			"exec [env pairs] [cmdline]   - start program no wait optionally pass env\n" +
-			"                               key=value pairs (comma separated)\n" +
-			"kill [program name]          - kill program no path\n" +
-			"killall                      - kill all processes started\n" +
-			"ps                           - list of running processes\n" +
-			"info                         - list of device info\n" +
-			"        [os]                 - os version for device\n" +
-			"        [id]                 - unique identifier for device\n" +
-			"        [uptime]             - uptime for device\n" +
-			"        [systime]            - current system time\n" +
-			"        [screen]             - width, height and bits per pixel for device\n" +
-			"        [memory]             - physical, free, available, storage memory\n" +
-			"                               for device\n" +
-			"        [processes]          - list of running processes see 'ps'\n" +
-			"deadman timeout              - set the duration for the deadman timer\n" +
-			"alrt [on/off]                - start or stop sysalert behavior\n" +
-			"disk [arg]                   - prints disk space info\n" +
-			"cp file1 file2               - copy file1 to file2\n" +
-			"time file                    - timestamp for file\n" +
-			"hash file                    - generate hash for file\n" +
-			"cd directory                 - change cwd\n" +
-			"cat file                     - cat file\n" +
-			"cwd                          - display cwd\n" +
-			"mv file1 file2               - move file1 to file2\n" +
-			"push filename                - push file to device\n" +
-			"rm file                      - delete file\n" +
-			"rmdr directory               - delete directory even if not empty\n" +
-			"mkdr directory               - create directory\n" +
-			"dirw directory               - tests whether the directory is writable\n" +
-			"isdir directory              - test whether the directory exists\n" +
-			"stat processid               - stat process\n" +
-			"dead processid               - print whether the process is alive or hung\n" +
-			"mems                         - dump memory stats\n" +
-			"ls                           - print directory\n" +
-			"tmpd                         - print temp directory\n" +
-			"ping [hostname/ipaddr]       - ping a network device\n" +
-			"unzp zipfile destdir         - unzip the zipfile into the destination dir\n" +
-			"zip zipfile src              - zip the source file/dir into zipfile\n" +
-			"rebt                         - reboot device\n" +
-			"inst /path/filename.apk      - install the referenced apk file\n" +
-			"uninst packagename           - uninstall the referenced package\n" +
-			"updt pkgname pkgfile         - unpdate the referenced package\n" +
-			"clok                         - the current device time expressed as the" +
-			"                               number of millisecs since epoch\n" +
-			"settime date time            - sets the device date and time\n" +
-			"                               (YYYY/MM/DD HH:MM:SS)\n" +
-			"tzset timezone               - sets the device timezone format is\n" +
-			"                               GMTxhh:mm x = +/- or a recognized Olsen string\n" +
-			"tzget                        - returns the current timezone set on the device\n" +
-			"rebt                         - reboot device\n" +
-			"quit                         - disconnect SUTAgent\n" +
-			"exit                         - close SUTAgent\n" +
-			"ver                          - SUTAgent version\n" +
-			"help                         - you're reading it";
-		return (sRet);
-		}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.zip.Adler32;
+import java.util.zip.CheckedInputStream;
+import java.util.zip.CheckedOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import com.mozilla.SUTAgentAndroid.NtpMessage;
+import com.mozilla.SUTAgentAndroid.R;
+import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.AlarmManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Debug;
+import android.os.Environment;
+import android.os.StatFs;
+import android.os.SystemClock;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.WindowManager;
+
+public class DoCommand {
+
+    String lineSep = System.getProperty("line.separator");
+    Process    pProc;
+    OutputStream sutIn;
+    InputStream    sutErr;
+    InputStream    sutOut;
+    AlertLooperThread alrt = null;
+    ContextWrapper    contextWrapper = null;
+
+    String    currentDir = "/";
+    String    sErrorPrefix = "##AGENT-WARNING## ";
+    boolean bTraceOn = false;
+
+    String ffxProvider = "org.mozilla.ffxcp";
+    String fenProvider = "org.mozilla.fencp";
+
+    private final String prgVersion = "SUTAgentAndroid Version 1.01";
+
+    public enum Command
+        {
+        RUN ("run"),
+        EXEC ("exec"),
+        ENVRUN ("envrun"),
+        KILL ("kill"),
+        PS ("ps"),
+        DEVINFO ("info"),
+        OS ("os"),
+        ID ("id"),
+        UPTIME ("uptime"),
+        SETTIME ("settime"),
+        SYSTIME ("systime"),
+        SCREEN ("screen"),
+        MEMORY ("memory"),
+        POWER ("power"),
+        PROCESS ("process"),
+        GETAPPROOT ("getapproot"),
+        TESTROOT ("testroot"),
+        ALRT ("alrt"),
+        DISK ("disk"),
+        CP ("cp"),
+        TIME ("time"),
+        HASH ("hash"),
+        CD ("cd"),
+        CAT ("cat"),
+        CWD ("cwd"),
+        MV ("mv"),
+        PUSH ("push"),
+        PULL ("pull"),
+        RM ("rm"),
+        PRUNE ("rmdr"),
+        MKDR ("mkdr"),
+        DIRWRITABLE ("dirw"),
+        ISDIR ("isdir"),
+        DEAD ("dead"),
+        MEMS ("mems"),
+        LS ("ls"),
+        TMPD ("tmpd"),
+        PING ("ping"),
+        REBT ("rebt"),
+        UNZP ("unzp"),
+        ZIP ("zip"),
+        CLOK ("clok"),
+        STAT ("stat"),
+        QUIT ("quit"),
+        EXIT ("exit"),
+        HELP ("help"),
+        FTPG ("ftpg"),
+        FTPP ("ftpp"),
+        INST ("inst"),
+        UPDT ("updt"),
+        UNINST ("uninst"),
+        TEST ("test"),
+        DBG ("dbg"),
+        TRACE ("trace"),
+        VER ("ver"),
+        TZGET ("tzget"),
+        TZSET ("tzset"),
+        ADB ("adb"),
+        UNKNOWN ("unknown");
+
+        private final String theCmd;
+
+        Command(String theCmd) { this.theCmd = theCmd; }
+
+        public String theCmd() {return theCmd;}
+
+        public static Command getCmd(String sCmd)
+            {
+            Command retCmd = UNKNOWN;
+            for (Command cmd : Command.values())
+                {
+                if (cmd.theCmd().equalsIgnoreCase(sCmd))
+                    {
+                    retCmd = cmd;
+                    break;
+                    }
+                }
+            return (retCmd);
+            }
+        }
+
+    public DoCommand(ContextWrapper service)
+        {
+        this.contextWrapper = service;
+        }
+
+    public String processCommand(String theCmdLine, PrintWriter out, BufferedInputStream in, OutputStream cmdOut)
+        {
+        String     strReturn = "";
+        Command    cCmd = null;
+        Command cSubCmd = null;
+
+        if (bTraceOn)
+            ((ASMozStub)this.contextWrapper).SendToDataChannel(theCmdLine);
+
+        String [] Argv = parseCmdLine2(theCmdLine);
+
+        int Argc = Argv.length;
+
+        cCmd = Command.getCmd(Argv[0]);
+
+        switch(cCmd)
+            {
+            case TRACE:
+                if (Argc == 2)
+                    bTraceOn = (Argv[1].equalsIgnoreCase("on") ? true : false);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for trace command!";
+                break;
+
+            case VER:
+                strReturn = prgVersion;
+                break;
+
+            case CLOK:
+                strReturn = GetClok();
+                break;
+
+            case TZGET:
+                strReturn = GetTimeZone();
+                break;
+
+            case TZSET:
+                if (Argc == 2)
+                    strReturn = SetTimeZone(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for settz command!";
+                break;
+
+            case UPDT:
+                if (Argc >= 2)
+                    strReturn = StrtUpdtOMatic(Argv[1], Argv[2], (Argc > 3 ? Argv[3] : null), (Argc > 4 ? Argv[4] : null));
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for updt command!";
+                break;
+
+            case SETTIME:
+                strReturn = SetSystemTime(Argv[1], (Argc > 2 ? Argv[2] : null), cmdOut);
+                break;
+
+            case CWD:
+                try {
+                    strReturn = new java.io.File(currentDir).getCanonicalPath();
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    }
+                break;
+
+            case CD:
+                if (Argc == 2)
+                    strReturn = changeDir(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for cd command!";
+                break;
+
+            case LS:
+                strReturn = PrintDir(((Argc > 1) ? Argv[1] : currentDir));
+                break;
+
+            case GETAPPROOT:
+                if (Argc == 2)
+                    strReturn = GetAppRoot(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for getapproot command!";
+                break;
+
+            case ISDIR:
+                if (Argc == 2)
+                    strReturn = isDirectory(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for isdir command!";
+                break;
+
+            case TESTROOT:
+                strReturn = GetTestRoot();
+                break;
+
+            case DEAD:
+                if (Argc == 2)
+                    strReturn = (IsProcessDead(Argv[1]) ? (Argv[1] + " is hung or unresponsive") : (Argv[1] + " is ok"));
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for dead command!";
+                break;
+
+            case PS:
+                strReturn = GetProcessInfo();
+                break;
+
+            case PULL:
+                if (Argc >= 2) {
+                    long lOff = 0;
+                    long lLen = -1;
+                    if (Argc > 2) {
+                        try {
+                            lOff = Long.parseLong(Argv[2].trim());
+                            System.out.println("offset = " + lOff);
+                        } catch (NumberFormatException nfe) {
+                            lOff = 0;
+                            System.out.println("NumberFormatException: " + nfe.getMessage());
+                        }
+                    }
+                    if (Argc == 4) {
+                        try {
+                            lLen = Long.parseLong(Argv[3].trim());
+                            System.out.println("length = " + lLen);
+                        } catch (NumberFormatException nfe) {
+                            lLen = -1;
+                            System.out.println("NumberFormatException: " + nfe.getMessage());
+                        }
+                    }
+                    strReturn = Pull(Argv[1], lOff, lLen, cmdOut);
+                } else {
+                    strReturn = sErrorPrefix + "Wrong number of arguments for pull command!";
+                }
+                break;
+
+            case PUSH:
+                if (Argc == 3)
+                    {
+                    long lArg = 0;
+                    try
+                        {
+                        lArg = Long.parseLong(Argv[2].trim());
+                        System.out.println("long l = " + lArg);
+                        }
+                    catch (NumberFormatException nfe)
+                        {
+                        System.out.println("NumberFormatException: " + nfe.getMessage());
+                        }
+
+                    strReturn = Push(Argv[1], in, lArg);
+                    }
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for push command!";
+                break;
+
+            case INST:
+                if (Argc >= 2)
+                    strReturn = InstallApp(Argv[1], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for inst command!";
+                break;
+
+            case UNINST:
+                if (Argc >= 2)
+                    strReturn = UnInstallApp(Argv[1], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for inst command!";
+                break;
+
+            case ALRT:
+                if (Argc > 1)
+                    {
+                    if (Argv[1].contentEquals("on"))
+                        {
+                        String sTitle = "Agent Alert";
+                        String sMsg = "The Agent Alert System has been activated!";
+                        if (Argc == 3) {
+                            sTitle = Argv[2];
+                            sMsg = "";
+                        } else if (Argc == 4) {
+                            sTitle = Argv[2];
+                            sMsg = Argv[3];
+                        }
+                        StartAlert(sTitle, sMsg);
+                        }
+                    else
+                        {
+                        StopAlert();
+                        }
+                    }
+                else
+                    {
+                    strReturn = sErrorPrefix + "Wrong number of arguments for alrt command!";
+                    }
+                break;
+
+            case REBT:
+                if (Argc >= 1)
+                    strReturn = RunReboot(cmdOut, (Argc > 1 ? Argv[1] : null), (Argc > 2 ? Argv[2] : null));
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for rebt command!";
+//                RunReboot(cmdOut);
+                break;
+
+            case TMPD:
+                strReturn = GetTmpDir();
+                break;
+
+            case DEVINFO:
+                if (Argc == 1)
+                    {
+                    strReturn += SUTAgentAndroid.sUniqueID;
+                    strReturn += "\n";
+                    strReturn += GetOSInfo();
+                    strReturn += "\n";
+                    strReturn += GetSystemTime();
+                    strReturn += "\n";
+                    strReturn += GetUptime();
+                    strReturn += "\n";
+                    strReturn += GetScreenInfo();
+                    strReturn += "\n";
+                    strReturn += GetMemoryInfo();
+                    strReturn += "\n";
+                    strReturn += GetPowerInfo();
+                    strReturn += "\n";
+                    strReturn += GetProcessInfo();
+                    }
+                else
+                    {
+                    cSubCmd = Command.getCmd(Argv[1]);
+                    switch(cSubCmd)
+                        {
+                        case ID:
+                            strReturn = SUTAgentAndroid.sUniqueID;
+                            break;
+
+                        case SCREEN:
+                            strReturn = GetScreenInfo();
+                            break;
+
+                        case PROCESS:
+                            strReturn = GetProcessInfo();
+                            break;
+
+                        case OS:
+                            strReturn = GetOSInfo();
+                            break;
+
+                        case SYSTIME:
+                            strReturn = GetSystemTime();
+                            break;
+
+                        case UPTIME:
+                            strReturn = GetUptime();
+                            break;
+
+                        case MEMORY:
+                            strReturn = GetMemoryInfo();
+                            break;
+
+                        case POWER:
+                            strReturn += GetPowerInfo();
+                            break;
+
+                        default:
+                            break;
+                        }
+                    }
+                break;
+
+            case STAT:
+                if (Argc == 2)
+                    strReturn = StatProcess(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for ping command!";
+                break;
+
+            case PING:
+                if (Argc == 2)
+                    strReturn = SendPing(Argv[1], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for ping command!";
+                break;
+
+            case HASH:
+                if (Argc == 2)
+                    strReturn = HashFile(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for hash command!";
+                break;
+
+            case PRUNE:
+                if (Argc == 2)
+                    strReturn = PruneDir(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for prune command!";
+                break;
+
+            case FTPG:
+                if (Argc == 4)
+                    strReturn = FTPGetFile(Argv[1], Argv[2], Argv[3], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for ftpg command!";
+                break;
+
+            case CAT:
+                if (Argc == 2)
+                    strReturn = Cat(Argv[1], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for cat command!";
+                break;
+
+            case DIRWRITABLE:
+                if (Argc == 2)
+                    strReturn = IsDirWritable(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for dirwritable command!";
+                break;
+
+            case TIME:
+                if (Argc == 2)
+                    strReturn = PrintFileTimestamp(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for time command!";
+                break;
+
+            case MKDR:
+                if (Argc == 2)
+                    strReturn = MakeDir(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for mkdr command!";
+                break;
+
+            case RM:
+                if (Argc == 2)
+                    strReturn = RemoveFile(Argv[1]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for rm command!";
+                break;
+
+            case MV:
+                if (Argc == 3)
+                    strReturn = Move(Argv[1], Argv[2]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for mv command!";
+                break;
+
+            case CP:
+                if (Argc == 3)
+                    strReturn = CopyFile(Argv[1], Argv[2]);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for cp command!";
+                break;
+
+            case QUIT:
+            case EXIT:
+                strReturn = Argv[0];
+                break;
+
+            case DBG:
+                Debug.waitForDebugger();
+                strReturn = "waitForDebugger on";
+                break;
+
+            case ADB:
+                if (Argc == 2) {
+                    if (Argv[1].contains("ip") || Argv[1].contains("usb")) {
+                        strReturn = SetADB(Argv[1]);
+                    } else {
+                        strReturn = sErrorPrefix + "Unrecognized argument for adb command!";
+                    }
+                } else {
+                    strReturn = sErrorPrefix + "Wrong number of arguments for adb command!";
+                }
+                break;
+
+            case TEST:
+                long lFreeMemory = Runtime.getRuntime().freeMemory();
+                long lTotMemory = Runtime.getRuntime().totalMemory();
+                long lMaxMemory = Runtime.getRuntime().maxMemory();
+
+
+                if (lFreeMemory > 0) {
+                    strReturn = "Max memory: " + lMaxMemory + "\nTotal Memory: " + lTotMemory + "\nFree memory: " + lFreeMemory;
+                    break;
+                }
+
+                ContentResolver cr = contextWrapper.getContentResolver();
+                Uri ffxFiles = null;
+
+                if (Argv[1].contains("fennec")) {
+                    ffxFiles = Uri.parse("content://" + fenProvider + "/dir");
+                } else if (Argv[1].contains("firefox")) {
+                    ffxFiles = Uri.parse("content://" + ffxProvider + "/dir");
+                }
+
+//                Uri ffxFiles = Uri.parse("content://org.mozilla.fencp/file");
+                String[] columns = new String[] {
+                        "_id",
+                        "isdir",
+                        "filename",
+                        "length"
+                    };
+//                String[] columns = new String[] {
+//                        "_id",
+//                        "chunk"
+//                     };
+                Cursor myCursor = cr.query(    ffxFiles,
+                                            columns,                         // Which columns to return
+                                            (Argc > 1 ? Argv[1] : null),    // Which rows to return (all rows)
+                                            null,                           // Selection arguments (none)
+                                            null);                            // Put the results in ascending order by name
+/*
+                if (myCursor != null) {
+                    int nRows = myCursor.getCount();
+                    String [] colNames = myCursor.getColumnNames();
+                    int    nID = 0;
+                    int nBytesRecvd = 0;
+
+                    for (int lcv = 0; lcv < nRows; lcv++) {
+                        if  (myCursor.moveToPosition(lcv)) {
+                            nID = myCursor.getInt(0);
+                            byte [] buf = myCursor.getBlob(1);
+                            if (buf != null) {
+                                nBytesRecvd += buf.length;
+                                strReturn += new String(buf);
+                                buf = null;
+                            }
+                        }
+                    }
+                    strReturn += "[eof - " + nBytesRecvd + "]";
+                    myCursor.close();
+                }
+
+*/
+                if (myCursor != null)
+                    {
+                    int nRows = myCursor.getCount();
+                    int    nID = 0;
+                    String sFileName = "";
+                    long lFileSize = 0;
+                    boolean bIsDir = false;
+
+                    for (int lcv = 0; lcv < nRows; lcv++)
+                        {
+                        if  (myCursor.moveToPosition(lcv))
+                            {
+                            nID = myCursor.getInt(0);
+                            bIsDir = (myCursor.getInt(1) == 1 ? true : false);
+                            sFileName = myCursor.getString(2);
+                            lFileSize = myCursor.getLong(3);
+                            strReturn += "" + nID + "\t" + (bIsDir ? "<dir> " : "      ") + sFileName + "\t" + lFileSize + "\n";
+                            }
+                        }
+                    myCursor.close();
+                    }
+                break;
+
+            case EXEC:
+            case ENVRUN:
+                if (Argc >= 2)
+                    {
+                    String [] theArgs = new String [Argc - 1];
+
+                    for (int lcv = 1; lcv < Argc; lcv++)
+                        {
+                        theArgs[lcv - 1] = Argv[lcv];
+                        }
+
+                    strReturn = StartPrg2(theArgs, cmdOut);
+                    }
+                else
+                    {
+                    strReturn = sErrorPrefix + "Wrong number of arguments for " + Argv[0] + " command!";
+                    }
+                break;
+
+            case RUN:
+                if (Argc >= 2)
+                    {
+                    String [] theArgs = new String [Argc - 1];
+
+                    for (int lcv = 1; lcv < Argc; lcv++)
+                        {
+                        theArgs[lcv - 1] = Argv[lcv];
+                        }
+
+                    if (Argv[1].contains("/") || Argv[1].contains("\\") || !Argv[1].contains("."))
+                        strReturn = StartPrg(theArgs, cmdOut);
+                    else
+                        strReturn = StartJavaPrg(theArgs, null);
+                    }
+                else
+                    {
+                    strReturn = sErrorPrefix + "Wrong number of arguments for " + Argv[0] + " command!";
+                    }
+                break;
+
+            case KILL:
+                if (Argc == 2)
+                    strReturn = KillProcess(Argv[1], cmdOut);
+                else
+                    strReturn = sErrorPrefix + "Wrong number of arguments for kill command!";
+                break;
+
+            case DISK:
+                strReturn = GetDiskInfo((Argc == 2 ? Argv[1] : "/"));
+                break;
+
+            case UNZP:
+                strReturn = Unzip(Argv[1], (Argc == 3 ? Argv[2] : ""));
+                break;
+
+            case ZIP:
+                strReturn = Zip(Argv[1], (Argc == 3 ? Argv[2] : ""));
+                break;
+
+            case HELP:
+                strReturn = PrintUsage();
+                break;
+
+            default:
+                strReturn = sErrorPrefix + "[" + Argv[0] + "] command";
+                if (Argc > 1)
+                    {
+                    strReturn += " with arg(s) =";
+                    for (int lcv = 1; lcv < Argc; lcv++)
+                        {
+                        strReturn += " [" + Argv[lcv] + "]";
+                        }
+                    }
+                strReturn += " is currently not implemented.";
+                break;
+            }
+
+        return(strReturn);
+        }
+
+    private void SendNotification(String tickerText, String expandedText) {
+        NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
+        int icon = R.drawable.ateamlogo;
+        long when = System.currentTimeMillis();
+
+        Notification notification = new Notification(icon, tickerText, when);
+
+        notification.flags |= (Notification.FLAG_INSISTENT | Notification.FLAG_AUTO_CANCEL);
+        notification.defaults |= Notification.DEFAULT_SOUND;
+        notification.defaults |= Notification.DEFAULT_VIBRATE;
+        notification.defaults |= Notification.DEFAULT_LIGHTS;
+
+        Context context = contextWrapper.getApplicationContext();
+
+        // Intent to launch an activity when the extended text is clicked
+        Intent intent2 = new Intent(contextWrapper, SUTAgentAndroid.class);
+        PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent2, 0);
+
+        notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
+
+        notificationManager.notify(1959, notification);
+    }
+
+private void CancelNotification()
+    {
+    NotificationManager notificationManager = (NotificationManager)contextWrapper.getSystemService(Context.NOTIFICATION_SERVICE);
+    notificationManager.cancel(1959);
+    }
+
+    public void StartAlert(String sTitle, String sMsg)
+        {
+        // start the alert message
+        SendNotification(sTitle, sMsg);
+        }
+
+    public void StopAlert()
+        {
+        CancelNotification();
+        }
+
+    public String [] parseCmdLine2(String theCmdLine)
+        {
+        String    cmdString;
+        String    workingString;
+        String    workingString2;
+        String    workingString3;
+        List<String> lst = new ArrayList<String>();
+        int nLength = 0;
+        int nFirstSpace = -1;
+
+        // Null cmd line
+        if (theCmdLine == null)
+            {
+            String [] theArgs = new String [1];
+            theArgs[0] = new String("");
+            return(theArgs);
+            }
+        else
+            {
+            nLength = theCmdLine.length();
+            nFirstSpace = theCmdLine.indexOf(' ');
+            }
+
+        if (nFirstSpace == -1)
+            {
+            String [] theArgs = new String [1];
+            theArgs[0] = new String(theCmdLine);
+            return(theArgs);
+            }
+
+        // Get the command
+        cmdString = new String(theCmdLine.substring(0, nFirstSpace));
+        lst.add(cmdString);
+
+        // Jump past the command and trim
+        workingString = (theCmdLine.substring(nFirstSpace + 1, nLength)).trim();
+
+        while ((nLength = workingString.length()) > 0)
+            {
+            int nEnd = 0;
+            int    nStart = 0;
+
+            // if we have a quote
+            if (workingString.startsWith("\""))
+                {
+                // point to the first non quote char
+                nStart = 1;
+                // find the matching quote
+                nEnd = workingString.indexOf('"', nStart);
+
+                char prevChar;
+
+                while(nEnd != -1)
+                    {
+                    // check to see if the quotation mark has been escaped
+                    prevChar = workingString.charAt(nEnd - 1);
+                    if (prevChar == '\\')
+                        {
+                        // if escaped, point past this quotation mark and find the next
+                        nEnd++;
+                        if (nEnd < nLength)
+                            nEnd = workingString.indexOf('"', nEnd);
+                        else
+                            nEnd = -1;
+                        }
+                    else
+                        break;
+                    }
+
+                // there isn't one
+                if (nEnd == -1)
+                    {
+                    // point at the quote
+                    nStart = 0;
+                    // so find the next space
+                    nEnd = workingString.indexOf(' ', nStart);
+                    // there isn't one of those either
+                    if (nEnd == -1)
+                        nEnd = nLength;    // Just grab the rest of the cmdline
+                    }
+                }
+            else // no quote so find the next space
+                {
+                nEnd = workingString.indexOf(' ', nStart);
+                // there isn't one of those
+                if (nEnd == -1)
+                    nEnd = nLength;    // Just grab the rest of the cmdline
+                }
+
+            // get the substring
+            workingString2 = workingString.substring(nStart, nEnd);
+
+            // if we have escaped quotes
+            if (workingString2.contains("\\\""))
+                {
+                do
+                    {
+                    // replace escaped quote with embedded quote
+                    workingString3 = workingString2.replace("\\\"", "\"");
+                    workingString2 = workingString3;
+                    }
+                while(workingString2.contains("\\\""));
+                }
+
+            // add it to the list
+            lst.add(new String(workingString2));
+
+            // if we are dealing with a quote
+            if (nStart > 0)
+                nEnd++; //  point past the end one
+
+            // jump past the substring and trim it
+            workingString = (workingString.substring(nEnd)).trim();
+            }
+
+        // ok we're done package up the results
+        int nItems = lst.size();
+
+        String [] theArgs = new String [nItems];
+
+        for (int lcv = 0; lcv < nItems; lcv++)
+            {
+            theArgs[lcv] = lst.get(lcv);
+            }
+
+        return(theArgs);
+        }
+
+    public String [] parseCmdLine(String theCmdLine) {
+        String    cmdString;
+        String    workingString;
+        String    workingString2;
+        List<String> lst = new ArrayList<String>();
+        int nLength = 0;
+        int nFirstSpace = -1;
+
+        // Null cmd line
+        if (theCmdLine == null)
+            {
+            String [] theArgs = new String [1];
+            theArgs[0] = new String("");
+            return(theArgs);
+            }
+        else
+            {
+            nLength = theCmdLine.length();
+            nFirstSpace = theCmdLine.indexOf(' ');
+            }
+
+        if (nFirstSpace == -1)
+            {
+            String [] theArgs = new String [1];
+            theArgs[0] = new String(theCmdLine);
+            return(theArgs);
+            }
+
+        // Get the command
+        cmdString = new String(theCmdLine.substring(0, nFirstSpace));
+        lst.add(cmdString);
+
+        // Jump past the command and trim
+        workingString = (theCmdLine.substring(nFirstSpace + 1, nLength)).trim();
+
+        while ((nLength = workingString.length()) > 0)
+            {
+            int nEnd = 0;
+            int    nStart = 0;
+
+            // if we have a quote
+            if (workingString.startsWith("\""))
+                {
+                // point to the first non quote char
+                nStart = 1;
+                // find the matching quote
+                nEnd = workingString.indexOf('"', nStart);
+                // there isn't one
+                if (nEnd == -1)
+                    {
+                    // point at the quote
+                    nStart = 0;
+                    // so find the next space
+                    nEnd = workingString.indexOf(' ', nStart);
+                    // there isn't one of those either
+                    if (nEnd == -1)
+                        nEnd = nLength;    // Just grab the rest of the cmdline
+                    }
+                else
+                    {
+                    nStart = 0;
+                    nEnd++;
+                    }
+                }
+            else // no quote so find the next space
+                {
+                nEnd = workingString.indexOf(' ', nStart);
+
+                // there isn't one of those
+                if (nEnd == -1)
+                    nEnd = nLength;    // Just grab the rest of the cmdline
+                }
+
+            // get the substring
+            workingString2 = workingString.substring(nStart, nEnd);
+
+            // add it to the list
+            lst.add(new String(workingString2));
+
+            // jump past the substring and trim it
+            workingString = (workingString.substring(nEnd)).trim();
+            }
+
+        int nItems = lst.size();
+
+        String [] theArgs = new String [nItems];
+
+        for (int lcv = 0; lcv < nItems; lcv++)
+            {
+            theArgs[lcv] = lst.get(lcv);
+            }
+
+        return(theArgs);
+        }
+
+    public String fixFileName(String fileName)
+        {
+        String    sRet = "";
+        String    sTmpFileName = "";
+
+        sRet = fileName.replace('\\', '/');
+
+        if (sRet.startsWith("/"))
+            sTmpFileName = sRet;
+        else
+            sTmpFileName = currentDir + "/" + sRet;
+
+        sRet = sTmpFileName.replace('\\', '/');
+        sTmpFileName = sRet;
+        sRet = sTmpFileName.replace("//", "/");
+
+        return(sRet);
+        }
+
+    public String AddFilesToZip(ZipOutputStream out, String baseDir, String relDir)
+    {
+        final int             BUFFER     = 2048;
+        String                sRet    = "";
+        String                 curDir     = "";
+        String                relFN    = "";
+        BufferedInputStream origin = null;
+        byte                 data[] = new byte[BUFFER];
+
+        if (relDir.length() > 0)
+            curDir = baseDir + "/" + relDir;
+        else
+            curDir = baseDir;
+
+        File f = new File(curDir);
+
+        if (f.isFile())
+            {
+            try {
+                relFN = ((relDir.length() > 0) ? relDir + "/" + f.getName() : f.getName());
+                System.out.println("Adding: "+relFN);
+                sRet += "Adding: "+    relFN + lineSep;
+                FileInputStream fi = new FileInputStream(curDir);
+                origin = new BufferedInputStream(fi, BUFFER);
+                ZipEntry entry = new ZipEntry(relFN);
+                out.putNextEntry(entry);
+                int count;
+                while((count = origin.read(data, 0, BUFFER)) != -1)
+                    {
+                    out.write(data, 0, count);
+                    }
+                origin.close();
+                }
+            catch(Exception e)
+                {
+                e.printStackTrace();
+                }
+
+            return(sRet);
+            }
+
+        String    files[] = f.list();
+
+        if (files != null)
+            {
+            try {
+                for(int i = 0; i < files.length; i++)
+                    {
+                    f = new File(curDir + "/" + files[i]);
+                    if (f.isDirectory())
+                        {
+                        if (relDir.length() > 0)
+                            sRet += AddFilesToZip(out, baseDir, relDir + "/" + files[i]);
+                        else
+                            sRet += AddFilesToZip(out, baseDir, files[i]);
+                        }
+                    else
+                        {
+                        relFN = ((relDir.length() > 0) ? relDir + "/" + files[i] : files[i]);
+                        System.out.println("Adding: "+relFN);
+                        sRet += "Adding: "+    relFN + lineSep;
+                        FileInputStream fi = new FileInputStream(curDir + "/" + files[i]);
+                        origin = new BufferedInputStream(fi, BUFFER);
+                        ZipEntry entry = new ZipEntry(relFN);
+                        out.putNextEntry(entry);
+                        int count;
+                        while((count = origin.read(data, 0, BUFFER)) != -1)
+                            {
+                            out.write(data, 0, count);
+                            }
+                        origin.close();
+                        }
+                    }
+                }
+            catch(Exception e)
+                {
+                e.printStackTrace();
+                }
+            }
+
+        return(sRet);
+    }
+
+    public String Zip(String zipFileName, String srcName)
+        {
+        String    fixedZipFileName = fixFileName(zipFileName);
+        String    fixedSrcName = fixFileName(srcName);
+        String sRet = "";
+
+        try {
+            FileOutputStream dest = new FileOutputStream(fixedZipFileName);
+            CheckedOutputStream checksum = new CheckedOutputStream(dest, new Adler32());
+            ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(checksum));
+            out.setMethod(ZipOutputStream.DEFLATED);
+
+            sRet += AddFilesToZip(out, fixedSrcName, "");
+
+            out.close();
+            System.out.println("checksum:                   "+checksum.getChecksum().getValue());
+            sRet += "checksum:                   "+checksum.getChecksum().getValue();
+            }
+        catch(Exception e)
+            {
+            e.printStackTrace();
+            }
+
+        return(sRet);
+    }
+
+    public String Unzip(String zipFileName, String dstDirectory)
+        {
+        String     sRet = "";
+        String    fixedZipFileName = fixFileName(zipFileName);
+        String    fixedDstDirectory = fixFileName(dstDirectory);
+        String    dstFileName = "";
+        int        nNumExtracted = 0;
+        boolean bRet = false;
+
+        try {
+            final int BUFFER = 2048;
+            BufferedOutputStream dest = null;
+            ZipFile zipFile = new ZipFile(fixedZipFileName);
+            int nNumEntries = zipFile.size();
+            zipFile.close();
+
+            FileInputStream fis = new FileInputStream(fixedZipFileName);
+            CheckedInputStream checksum = new CheckedInputStream(fis, new Adler32());
+            ZipInputStream zis = new ZipInputStream(new BufferedInputStream(checksum));
+            ZipEntry entry;
+
+            byte [] data = new byte[BUFFER];
+
+            while((entry = zis.getNextEntry()) != null)
+                {
+                System.out.println("Extracting: " + entry);
+                int count;
+                if (fixedDstDirectory.length() > 0)
+                    dstFileName = fixedDstDirectory + entry.getName();
+                else
+                    dstFileName = entry.getName();
+
+                String tmpDir = dstFileName.substring(0, dstFileName.lastIndexOf('/'));
+                File tmpFile = new File(tmpDir);
+                if (!tmpFile.exists())
+                    {
+                    bRet = tmpFile.mkdirs();
+                    }
+                else
+                    bRet = true;
+
+                if (bRet)
+                    {
+                    // if we aren't just creating a directory
+                    if (dstFileName.lastIndexOf('/') != (dstFileName.length() - 1))
+                        {
+                        // write out the file
+                        FileOutputStream fos = new FileOutputStream(dstFileName);
+                        dest = new BufferedOutputStream(fos, BUFFER);
+                        while ((count = zis.read(data, 0, BUFFER)) != -1)
+                            {
+                            dest.write(data, 0, count);
+                            }
+                        dest.flush();
+                        dest.close();
+                        dest = null;
+                        fos.close();
+                        fos = null;
+                        }
+                    nNumExtracted++;
+                    }
+                else
+                    sRet += " - failed" + lineSep;
+                }
+
+            data = null;
+            zis.close();
+            System.out.println("Checksum:          "+checksum.getChecksum().getValue());
+            sRet += "Checksum:          "+checksum.getChecksum().getValue();
+            sRet += lineSep + nNumExtracted + " of " + nNumEntries + " sucessfully extracted";
+            }
+        catch(Exception e)
+            {
+            e.printStackTrace();
+            }
+
+        return(sRet);
+        }
+
+    public String StatProcess(String string)
+        {
+        String sRet = "";
+        ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
+        int    [] nPids = new int [1];
+
+        nPids[0] = Integer.parseInt(string);
+
+        android.os.Debug.MemoryInfo[] mi = aMgr.getProcessMemoryInfo(nPids);
+
+        sRet  = "Dalvik Private Dirty pages         " + mi[0].dalvikPrivateDirty     + " kb\n";
+        sRet += "Dalvik Proportional Set Size       " + mi[0].dalvikPss              + " kb\n";
+        sRet += "Dalvik Shared Dirty pages          " + mi[0].dalvikSharedDirty      + " kb\n\n";
+        sRet += "Native Private Dirty pages heap    " + mi[0].nativePrivateDirty     + " kb\n";
+        sRet += "Native Proportional Set Size heap  " + mi[0].nativePss              + " kb\n";
+        sRet += "Native Shared Dirty pages heap     " + mi[0].nativeSharedDirty      + " kb\n\n";
+        sRet += "Other Private Dirty pages          " + mi[0].otherPrivateDirty      + " kb\n";
+        sRet += "Other Proportional Set Size        " + mi[0].otherPss               + " kb\n";
+        sRet += "Other Shared Dirty pages           " + mi[0].otherSharedDirty       + " kb\n\n";
+        sRet += "Total Private Dirty Memory         " + mi[0].getTotalPrivateDirty() + " kb\n";
+        sRet += "Total Proportional Set Size Memory " + mi[0].getTotalPss()          + " kb\n";
+        sRet += "Total Shared Dirty Memory          " + mi[0].getTotalSharedDirty()  + " kb";
+
+
+        return(sRet);
+        }
+
+    public String GetTestRoot()
+        {
+        String    sRet = null;
+
+        if (Environment.getExternalStorageState().equalsIgnoreCase(Environment.MEDIA_MOUNTED))
+            {
+            sRet = Environment.getExternalStorageDirectory().getAbsolutePath();
+            }
+        else
+            {
+            sRet = GetTmpDir();
+            }
+
+        return(sRet);
+        }
+
+    public String GetAppRoot(String AppName)
+        {
+        String sRet = sErrorPrefix + " internal error [no context]";
+        Context ctx = contextWrapper.getApplicationContext();
+
+        if (ctx != null)
+            {
+            try {
+                Context appCtx = ctx.createPackageContext(AppName, 0);
+                ContextWrapper appCtxW = new ContextWrapper(appCtx);
+                sRet = appCtxW.getPackageResourcePath();
+                appCtxW = null;
+                appCtx = null;
+                ctx = null;
+                System.gc();
+                }
+            catch (NameNotFoundException e)
+                {
+                e.printStackTrace();
+                }
+            }
+        return(sRet);
+        }
+
+    public String isDirectory(String sDir)
+        {
+        String    sRet = sErrorPrefix + sDir + " does not exist";
+        String    tmpDir    = fixFileName(sDir);
+        String [] theArgs = new String [3];
+        int    nFiles = 0;
+
+        if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "isdir",
+                    "filename",
+                    "length"
+                };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,     // Which columns to return
+                                        tmpDir,     // Which rows to return (all rows)
+                                        null,       // Selection arguments (none)
+                                        null);        // Order clause (none)
+            if (myCursor != null) {
+                nFiles = myCursor.getCount();
+
+                // If no entries the dir is empty
+                if (nFiles > 0) {
+                    if  (myCursor.moveToPosition(0)) {
+                        sRet = ((myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) ? "TRUE" : "FALSE");
+                    }
+                }
+                myCursor.close();
+            }
+        } else {
+            File tmpFile = new java.io.File(tmpDir);
+
+            if (tmpFile.exists()) {
+                sRet = (tmpFile.isDirectory() ? "TRUE" : "FALSE");
+            }
+            else {
+                try {
+                    theArgs[0] = "su";
+                    theArgs[1] = "-c";
+                    theArgs[2] = "ls -l " + sDir;
+
+                    pProc = Runtime.getRuntime().exec(theArgs);
+                    RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+                    outThrd.start();
+                    outThrd.join(5000);
+                    sRet = outThrd.strOutput;
+                    if (!sRet.contains("No such file or directory") && sRet.startsWith("l"))
+                        sRet = "FALSE";
+                }
+                catch (IOException e) {
+                    sRet = e.getMessage();
+                    e.printStackTrace();
+                }
+                catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return(sRet);
+        }
+
+
+    public String changeDir(String newDir)
+        {
+        String    tmpDir    = fixFileName(newDir);
+        String    sRet = sErrorPrefix + "Couldn't change directory to " + tmpDir;
+        int    nFiles = 0;
+
+        if (tmpDir.contains("org.mozilla.fennec") || tmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (tmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "isdir",
+                    "filename"
+                };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,     // Which columns to return
+                                        tmpDir,     // Which rows to return (all rows)
+                                        null,       // Selection arguments (none)
+                                        null);        // Order clause (none)
+            if (myCursor != null) {
+                nFiles = myCursor.getCount();
+
+                if (nFiles > 0) {
+                    if  (myCursor.moveToPosition(0)) {
+                        if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
+                            currentDir = myCursor.getString(myCursor.getColumnIndex("filename"));
+                            sRet = "";
+                        }
+                    }
+                } else {
+                    sRet = sErrorPrefix + tmpDir + " is not a valid directory";
+                }
+                myCursor.close();
+            }
+        } else {
+            File tmpFile = new java.io.File(tmpDir);
+
+            if (tmpFile.exists()) {
+                try {
+                    if (tmpFile.isDirectory()) {
+                        currentDir = tmpFile.getCanonicalPath();
+                        sRet = "";
+                    }
+                else
+                    sRet = sErrorPrefix + tmpDir + " is not a valid directory";
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return(sRet);
+        }
+
+    static final String HEXES = "0123456789abcdef";
+
+    public static String getHex( byte [] raw )
+        {
+        if ( raw == null )
+            {
+            return null;
+            }
+
+        final StringBuilder hex = new StringBuilder( 2 * raw.length );
+        for ( final byte b : raw )
+            {
+            hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
+            }
+        return hex.toString();
+        }
+
+    public String HashFile(String fileName)
+        {
+        String            sTmpFileName = fixFileName(fileName);
+        String            sRet         = sErrorPrefix + "Couldn't calculate hash for file " + sTmpFileName;
+        byte[]             buffer         = new byte [4096];
+        int                nRead         = 0;
+        long             lTotalRead     = 0;
+        MessageDigest    digest         = null;
+
+        try {
+            digest = java.security.MessageDigest.getInstance("MD5");
+            }
+        catch (NoSuchAlgorithmException e)
+            {
+            e.printStackTrace();
+            }
+
+        if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = null;
+
+            ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "chunk"
+                    };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,         // Which columns to return
+                                        sTmpFileName,   // Which rows to return (all rows)
+                                        null,           // Selection arguments (none)
+                                        null);            // Order clause (none)
+            if (myCursor != null) {
+                int nRows = myCursor.getCount();
+                int nBytesRecvd = 0;
+
+                for (int lcv = 0; lcv < nRows; lcv++) {
+                    if  (myCursor.moveToPosition(lcv)) {
+                        byte [] buf = myCursor.getBlob(1);
+                        if (buf != null) {
+                            nBytesRecvd += buf.length;
+                            digest.update(buf, 0, buf.length);
+                            lTotalRead += nRead;
+                            buf = null;
+                        }
+                    }
+                }
+                myCursor.close();
+                byte [] hash = digest.digest();
+
+                sRet = getHex(hash);
+            }
+        } else {
+            try {
+                FileInputStream srcFile  = new FileInputStream(sTmpFileName);
+                while((nRead = srcFile.read(buffer)) != -1) {
+                    digest.update(buffer, 0, nRead);
+                    lTotalRead += nRead;
+                }
+                srcFile.close();
+                byte [] hash = digest.digest();
+
+                sRet = getHex(hash);
+            }
+            catch (FileNotFoundException e) {
+                sRet += " file not found";
+                e.printStackTrace();
+            }
+            catch (IOException e) {
+                sRet += " io exception";
+                e.printStackTrace();
+            }
+        }
+        return(sRet);
+    }
+
+    public String RemoveFile(String fileName)
+        {
+        String    sTmpFileName = fixFileName(fileName);
+        String    sRet = sErrorPrefix + "Couldn't delete file " + sTmpFileName;
+
+        if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+            if (cr.delete(ffxFiles, sTmpFileName, null) == 1) {
+                sRet = "deleted " + sTmpFileName;
+            }
+        } else {
+            File f = new File(sTmpFileName);
+
+            if (f.delete())
+                sRet = "deleted " + sTmpFileName;
+        }
+
+        return(sRet);
+        }
+
+    public String PruneDir(String sDir)
+        {
+        String    sRet = "";
+        int nFiles = 0;
+        String sSubDir = null;
+        String    sTmpDir = fixFileName(sDir);
+
+        if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+            if (cr.delete(ffxFiles, sTmpDir, null) > 0) {
+                sRet = "deleted " + sTmpDir;
+            }
+        } else {
+            File dir = new File(sTmpDir);
+
+            if (dir.isDirectory()) {
+                sRet = "Deleting file(s) from " + sTmpDir;
+
+                File [] files = dir.listFiles();
+                if (files != null) {
+                    if ((nFiles = files.length) > 0) {
+                        for (int lcv = 0; lcv < nFiles; lcv++) {
+                            if (files[lcv].isDirectory()) {
+                                sSubDir = files[lcv].getAbsolutePath();
+                                sRet += "\n" + PruneDir(sSubDir);
+                            }
+                            else {
+                                if (files[lcv].delete()) {
+                                sRet += "\n\tDeleted " + files[lcv].getName();
+                                }
+                                else {
+                                    sRet += "\n\tUnable to delete " + files[lcv].getName();
+                                }
+                            }
+                        }
+                    }
+                    else
+                        sRet += "\n\t<empty>";
+                }
+
+                if (dir.delete()) {
+                    sRet += "\nDeleting directory " + sTmpDir;
+                }
+                else {
+                    sRet += "\nUnable to delete directory " + sTmpDir;
+                }
+            }
+            else {
+                sRet += sErrorPrefix + sTmpDir + " is not a directory";
+            }
+        }
+
+        return(sRet);
+        }
+
+    public String PrintDir(String sDir)
+        {
+        String    sRet = "";
+        int nFiles = 0;
+        String    sTmpDir = fixFileName(sDir);
+
+        if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = null;
+
+            ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "isdir",
+                    "filename",
+                    "length"
+                };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,     // Which columns to return
+                                        sTmpDir,    // Which rows to return (all rows)
+                                        null,       // Selection arguments (none)
+                                        null);        // Order clause (none)
+            if (myCursor != null) {
+                nFiles = myCursor.getCount();
+
+                // If only one entry and the index is -1 this is not a directory
+                int nNdx = myCursor.getColumnIndex("_id");
+                // If no entries the dir is empty
+                if (nFiles == 1) {
+                    sRet = "<empty>";
+                } else {
+                    // Show the entries
+                    for (int lcv = 1; lcv < nFiles; lcv++) {
+                        if  (myCursor.moveToPosition(lcv)) {
+                            if ((lcv == 0) && (myCursor.getLong(nNdx) == -1)) {
+                                sRet = sErrorPrefix + sTmpDir + " is not a directory";
+                            } else {
+                                sRet += myCursor.getString(2);
+                                if (lcv < (nFiles - 1))
+                                    sRet += "\n";
+                            }
+                        }
+                    }
+                }
+                myCursor.close();
+            }
+        } else {
+            File dir = new File(sTmpDir);
+
+            if (dir.isDirectory()) {
+                File [] files = dir.listFiles();
+
+                if (files != null) {
+                    if ((nFiles = files.length) > 0) {
+                        for (int lcv = 0; lcv < nFiles; lcv++) {
+                            sRet += files[lcv].getName();
+                            if (lcv < (nFiles - 1)) {
+                                sRet += "\n";
+                            }
+                        }
+                    }
+                    else {
+                        sRet = "<empty>";
+                    }
+                }
+            }
+            else {
+                sRet = sErrorPrefix + sTmpDir + " is not a directory";
+            }
+        }
+        return(sRet);
+    }
+
+    public String Move(String sTmpSrcFileName, String sTmpDstFileName) {
+        String sRet = sErrorPrefix + "Could not move " + sTmpSrcFileName + " to " + sTmpDstFileName;
+        String sTmp = CopyFile(sTmpSrcFileName, sTmpDstFileName);
+        if (sTmp.contains(" copied to ")) {
+            sTmp = RemoveFile(sTmpSrcFileName);
+            if (sTmp.startsWith("deleted ")) {
+                sRet = sTmpSrcFileName + " moved to " + sTmpDstFileName;
+            }
+        }
+
+        return(sRet);
+    }
+
+    public String CopyFile(String sTmpSrcFileName, String sTmpDstFileName) {
+        String sRet = sErrorPrefix + "Could not copy " + sTmpSrcFileName + " to " + sTmpDstFileName;
+        ContentValues cv = null;
+        File destFile = null;
+        Uri ffxSrcFiles = null;
+        Uri ffxDstFiles = null;
+        FileInputStream srcFile  = null;
+        FileOutputStream dstFile  = null;
+        byte[] buffer = new byte [4096];
+        int    nRead = 0;
+        long lTotalRead = 0;
+        long lTotalWritten = 0;
+        ContentResolver crIn = null;
+        ContentResolver crOut = null;
+
+        if (sTmpSrcFileName.contains("org.mozilla.fennec") || sTmpSrcFileName.contains("org.mozilla.firefox")) {
+            ffxSrcFiles = Uri.parse("content://" + (sTmpSrcFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+            crIn = contextWrapper.getContentResolver();
+        } else {
+            try {
+                srcFile  = new FileInputStream(sTmpSrcFileName);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (sTmpDstFileName.contains("org.mozilla.fennec") || sTmpDstFileName.contains("org.mozilla.firefox")) {
+            ffxDstFiles = Uri.parse("content://" + (sTmpDstFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+            crOut = contextWrapper.getContentResolver();
+            cv = new ContentValues();
+        } else {
+            try {
+                dstFile  = new FileOutputStream(sTmpDstFileName);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (srcFile != null) {
+            try {
+                while((nRead = srcFile.read(buffer)) != -1)    {
+                    lTotalRead += nRead;
+                    if (dstFile != null) {
+                        dstFile.write(buffer, 0, nRead);
+                        dstFile.flush();
+                    } else {
+                        cv.put("length", nRead);
+                        cv.put("chunk", buffer);
+                        if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
+                            break;
+                        lTotalWritten += nRead;
+                    }
+                }
+
+                srcFile.close();
+
+                if (dstFile != null) {
+                    dstFile.flush();
+                    dstFile.close();
+
+                    destFile = new File(sTmpDstFileName);
+                    lTotalWritten = destFile.length();
+                }
+
+                if (lTotalWritten == lTotalRead) {
+                    sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
+                }
+                else {
+                    sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            String[] columns = new String[] {
+                    "_id",
+                    "chunk",
+                    "length"
+                    };
+
+            Cursor myCursor = crIn.query(ffxSrcFiles,
+                                        columns,             // Which columns to return
+                                        sTmpSrcFileName,       // Which rows to return (all rows)
+                                        null,               // Selection arguments (none)
+                                        null);                // Order clause (none)
+            if (myCursor != null) {
+                int nRows = myCursor.getCount();
+
+                byte [] buf = null;
+
+                for (int lcv = 0; lcv < nRows; lcv++) {
+                    if  (myCursor.moveToPosition(lcv)) {
+                        buf = myCursor.getBlob(myCursor.getColumnIndex("chunk"));
+                        if (buf != null) {
+                            nRead = buf.length;
+                            try {
+                                lTotalRead += nRead;
+                                if (dstFile != null) {
+                                    dstFile.write(buffer, 0, nRead);
+                                    dstFile.flush();
+                                } else {
+                                    cv.put("length", nRead);
+                                    cv.put("chunk", buffer);
+                                    if (crOut.update(ffxDstFiles, cv, sTmpDstFileName, null) == 0)
+                                        break;
+                                    lTotalWritten += nRead;
+                                }
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                            buf = null;
+                        }
+                    }
+                }
+
+                if (nRows == -1) {
+                    sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nNo such file or directory";
+                }
+                else {
+                    myCursor.close();
+
+                    if (dstFile != null) {
+                        try {
+                            dstFile.flush();
+                            dstFile.close();
+
+                            destFile = new File(sTmpDstFileName);
+                            lTotalWritten = destFile.length();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    if (lTotalWritten == lTotalRead) {
+                        sRet = sTmpSrcFileName + " copied to " + sTmpDstFileName;
+                    }
+                    else {
+                        sRet = sErrorPrefix + "Failed to copy " + sTmpSrcFileName + " [length = " + lTotalWritten + "] to " + sTmpDstFileName + " [length = " + lTotalRead + "]";
+                    }
+                }
+            }
+            else {
+                sRet = sErrorPrefix + sTmpSrcFileName + ",-1\nUnable to access file (internal error)";
+            }
+        }
+
+        return (sRet);
+    }
+
+    public String IsDirWritable(String sDir)
+        {
+        String    sTmpDir = fixFileName(sDir);
+        String sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
+
+        if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = null;
+
+            ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "isdir",
+                    "filename",
+                    "length",
+                    "writable"
+                };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,     // Which columns to return
+                                        sTmpDir,    // Which rows to return (all rows)
+                                        null,       // Selection arguments (none)
+                                        null);        // Order clause (none)
+            if (myCursor != null) {
+                if (myCursor.getCount() > 0) {
+                    if (myCursor.moveToPosition(0)) {
+                        if (myCursor.getLong(myCursor.getColumnIndex("isdir")) == 1) {
+                            sRet = "[" + sTmpDir + "] " + ((myCursor.getLong(myCursor.getColumnIndex("writable")) == 1) ? "is" : "is not") + " writable";
+                        }
+                    }
+                }
+            }
+        } else {
+            File dir = new File(sTmpDir);
+
+            if (dir.isDirectory()) {
+                sRet = "[" + sTmpDir + "] " + (dir.canWrite() ? "is" : "is not") + " writable";
+            } else {
+                sRet = sErrorPrefix + "[" + sTmpDir + "] is not a directory";
+            }
+        }
+        return(sRet);
+    }
+
+    public String Push(String fileName, BufferedInputStream bufIn, long lSize)
+    {
+        byte []                buffer             = new byte [8192];
+        int                    nRead            = 0;
+        long                lRead            = 0;
+        String                sTmpFileName     = fixFileName(fileName);
+        FileOutputStream     dstFile            = null;
+        ContentResolver     cr                 = null;
+        ContentValues        cv                = null;
+        Uri                 ffxFiles         = null;
+        String                sRet            = sErrorPrefix + "Push failed!";
+
+        try {
+            if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+                cr = contextWrapper.getContentResolver();
+                ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+                cv = new ContentValues();
+            }
+            else {
+                dstFile = new FileOutputStream(sTmpFileName, false);
+            }
+
+            while((nRead != -1) && (lRead < lSize))
+                {
+                nRead = bufIn.read(buffer);
+                if (nRead != -1) {
+                    if (dstFile != null) {
+                        dstFile.write(buffer, 0, nRead);
+                        dstFile.flush();
+                    }
+                    else {
+                        cv.put("offset", lRead);
+                        cv.put("length", nRead);
+                        cv.put("chunk", buffer);
+                        cr.update(ffxFiles, cv, sTmpFileName, null);
+                    }
+                    lRead += nRead;
+                }
+            }
+
+            if (dstFile != null) {
+                dstFile.flush();
+                dstFile.close();
+            }
+
+            if (lRead == lSize)    {
+                sRet = HashFile(sTmpFileName);
+            }
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        buffer = null;
+
+        return(sRet);
+    }
+
+    public String FTPGetFile(String sServer, String sSrcFileName, String sDstFileName, OutputStream out)
+        {
+        byte[] buffer = new byte [4096];
+        int    nRead = 0;
+        long lTotalRead = 0;
+        String sRet = sErrorPrefix + "FTP Get failed for " + sSrcFileName;
+        String strRet = "";
+        int    reply = 0;
+        FileOutputStream outStream = null;
+        String    sTmpDstFileName = fixFileName(sDstFileName);
+
+        FTPClient ftp = new FTPClient();
+        try
+            {
+            ftp.connect(sServer);
+            reply = ftp.getReplyCode();
+            if(FTPReply.isPositiveCompletion(reply))
+                {
+                ftp.login("anonymous", "b@t.com");
+                reply = ftp.getReplyCode();
+                if(FTPReply.isPositiveCompletion(reply))
+                    {
+                    ftp.enterLocalPassiveMode();
+                    if (ftp.setFileType(FTP.BINARY_FILE_TYPE))
+                        {
+                        File dstFile = new File(sTmpDstFileName);
+                        outStream = new FileOutputStream(dstFile);
+                        FTPFile [] ftpFiles = ftp.listFiles(sSrcFileName);
+                        if (ftpFiles.length > 0)
+                            {
+                            long lFtpSize = ftpFiles[0].getSize();
+                            if (lFtpSize <= 0)
+                                lFtpSize = 1;
+
+                            InputStream ftpIn = ftp.retrieveFileStream(sSrcFileName);
+                            while ((nRead = ftpIn.read(buffer)) != -1)
+                                {
+                                lTotalRead += nRead;
+                                outStream.write(buffer, 0, nRead);
+                                strRet = "\r" + lTotalRead + " of " + lFtpSize + " bytes received " + ((lTotalRead * 100) / lFtpSize) + "% completed";
+                                out.write(strRet.getBytes());
+                                out.flush();
+                                }
+                            ftpIn.close();
+                            @SuppressWarnings("unused")
+                            boolean bRet = ftp.completePendingCommand();
+                            outStream.flush();
+                            outStream.close();
+                            strRet = ftp.getReplyString();
+                            reply = ftp.getReplyCode();
+                            }
+                        else
+                            {
+                            strRet = sRet;
+                            }
+                        }
+                    ftp.logout();
+                    ftp.disconnect();
+                    sRet = "\n" + strRet;
+                    }
+                else
+                    {
+                    ftp.disconnect();
+                    System.err.println("FTP server refused login.");
+                    }
+                }
+            else
+                {
+                ftp.disconnect();
+                System.err.println("FTP server refused connection.");
+                }
+            }
+        catch (SocketException e)
+            {
+            sRet = e.getMessage();
+            strRet = ftp.getReplyString();
+            reply = ftp.getReplyCode();
+            sRet += "\n" + strRet;
+            e.printStackTrace();
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            strRet = ftp.getReplyString();
+            reply = ftp.getReplyCode();
+            sRet += "\n" + strRet;
+            e.printStackTrace();
+            }
+        return (sRet);
+    }
+
+    public String Pull(String fileName, long lOffset, long lLength, OutputStream out)
+        {
+        String    sTmpFileName = fixFileName(fileName);
+        String    sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
+        byte[]    buffer = new byte [4096];
+        int        nRead = 0;
+        long    lSent = 0;
+
+        if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = null;
+
+            ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "chunk",
+                    "length"
+                    };
+
+            String [] args = new String [2];
+            args[0] = Long.toString(lOffset);
+            args[1] = Long.toString(lLength);
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,         // Which columns to return
+                                        sTmpFileName,   // Which rows to return (all rows)
+                                        args,           // Selection arguments (none)
+                                        null);            // Order clause (none)
+            if (myCursor != null) {
+                int nRows = myCursor.getCount();
+                long lFileLength = 0;
+
+                for (int lcv = 0; lcv < nRows; lcv++) {
+                    if  (myCursor.moveToPosition(lcv)) {
+                        if (lcv == 0) {
+                            lFileLength = myCursor.getLong(2);
+                            String sTmp = sTmpFileName + "," + lFileLength + "\n";
+                            try {
+                                out.write(sTmp.getBytes());
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                                break;
+                            }
+                        }
+
+                        if (lLength != 0) {
+                            byte [] buf = myCursor.getBlob(1);
+                            if (buf != null) {
+                                nRead = buf.length;
+                                try {
+                                    if ((lSent + nRead) <= lFileLength)    {
+                                        out.write(buf,0,nRead);
+                                        lSent += nRead;
+                                    }
+                                    else {
+                                        nRead = (int) (lFileLength - lSent);
+                                        out.write(buf,0,nRead);
+                                        Log.d("pull warning", "more bytes read than expected");
+                                        break;
+                                    }
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                    sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
+                                }
+                                buf = null;
+                            }
+                        }
+                    }
+                }
+                if (nRows == 0) {
+                    String sTmp = sTmpFileName + "," + lFileLength + "\n";
+                    try {
+                        out.write(sTmp.getBytes());
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                if (nRows == -1) {
+                    sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
+                }
+                else {
+                    myCursor.close();
+                    sRet = "";
+                }
+            }
+            else {
+                sRet = sErrorPrefix + sTmpFileName + ",-1\nUnable to access file (internal error)";
+            }
+        }
+        else {
+            try {
+                File f = new File(sTmpFileName);
+                long lFileLength = f.length();
+                FileInputStream fin = new FileInputStream(f);
+                if (lFileLength == 0) {
+                    while ((nRead = fin.read(buffer)) != -1) {
+                        lFileLength += nRead;
+                    }
+                    fin.close();
+                    fin = new FileInputStream(f);
+                }
+
+                // lLength == -1 return everything between lOffset and eof
+                // lLength == 0 return file length
+                // lLength > 0 return lLength bytes
+                if (lLength == -1) {
+                    lFileLength = lFileLength - lOffset;
+                } else if (lLength == 0) {
+                    // just return the file length
+                } else {
+                    lFileLength = ((lLength <= (lFileLength - lOffset)) ? lLength : (lFileLength - lOffset));
+                }
+
+                String sTmp = sTmpFileName + "," + lFileLength + "\n";
+                out.write(sTmp.getBytes());
+                if (lLength != 0) {
+                    if  (lOffset > 0) {
+                        fin.skip(lOffset);
+                    }
+                    while ((nRead = fin.read(buffer)) != -1) {
+                        if ((lSent + nRead) <= lFileLength)    {
+                            out.write(buffer,0,nRead);
+                            lSent += nRead;
+                        }
+                        else {
+                            nRead = (int) (lFileLength - lSent);
+                            out.write(buffer,0,nRead);
+                            if (lLength != -1)
+                                Log.d("pull warning", "more bytes read than sent");
+                            break;
+                        }
+                    }
+                }
+                fin.close();
+                out.flush();
+                sRet = "";
+                }
+            catch (FileNotFoundException e)    {
+                sRet = sErrorPrefix + sTmpFileName + ",-1\nNo such file or directory";
+            }
+            catch (IOException e) {
+                sRet = e.toString();
+            }
+        }
+        return (sRet);
+    }
+
+    public String Cat(String fileName, OutputStream out)
+        {
+        String    sTmpFileName = fixFileName(fileName);
+        String    sRet = sErrorPrefix + "Could not read the file " + sTmpFileName;
+        byte[]    buffer = new byte [4096];
+        int        nRead = 0;
+
+        if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = null;
+
+            ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/file");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "chunk"
+                    };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,         // Which columns to return
+                                        sTmpFileName,   // Which rows to return (all rows)
+                                        null,           // Selection arguments (none)
+                                        null);            // Order clause (none)
+            if (myCursor != null) {
+                int nRows = myCursor.getCount();
+                int nBytesRecvd = 0;
+
+                for (int lcv = 0; lcv < nRows; lcv++) {
+                    if  (myCursor.moveToPosition(lcv)) {
+                        byte [] buf = myCursor.getBlob(1);
+                        if (buf != null) {
+                            nBytesRecvd += buf.length;
+                            try {
+                                out.write(buf);
+                                sRet = "";
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                                sRet = sErrorPrefix + "Could not write to out " + sTmpFileName;
+                            }
+                            buf = null;
+                        }
+                    }
+                }
+                if (nRows == 0) {
+                    sRet = "";
+                }
+
+                myCursor.close();
+            }
+        } else {
+            try {
+                FileInputStream fin = new FileInputStream(sTmpFileName);
+                while ((nRead = fin.read(buffer)) != -1) {
+                    out.write(buffer,0,nRead);
+                }
+                fin.close();
+                out.flush();
+                sRet = "";
+                }
+            catch (FileNotFoundException e) {
+                sRet = sErrorPrefix + sTmpFileName + " No such file or directory";
+            }
+            catch (IOException e) {
+                sRet = e.toString();
+            }
+        }
+        return (sRet);
+    }
+
+    public String MakeDir(String sDir)
+        {
+        String    sTmpDir = fixFileName(sDir);
+        String sRet = sErrorPrefix + "Could not create the directory " + sTmpDir;
+        if (sTmpDir.contains("org.mozilla.fennec") || sTmpDir.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (sTmpDir.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+            ContentValues cv = new ContentValues();
+
+            if (cr.update(ffxFiles, cv, sTmpDir, null) == 1) {
+                sRet = sDir + " successfully created";
+            }
+        }
+        else {
+            File dir = new File(sTmpDir);
+
+            if (dir.mkdirs())
+                sRet = sDir + " successfully created";
+        }
+
+        return (sRet);
+        }
+    // move this to SUTAgentAndroid.java
+    public String GetScreenInfo()
+        {
+        String sRet = "";
+        DisplayMetrics metrics = new DisplayMetrics();
+        WindowManager wMgr = (WindowManager) contextWrapper.getSystemService(Context.WINDOW_SERVICE);
+        wMgr.getDefaultDisplay().getMetrics(metrics);
+        sRet = "X:" + metrics.widthPixels + " Y:" + metrics.heightPixels;
+        return (sRet);
+        }
+    // move this to SUTAgentAndroid.java
+    public int [] GetScreenXY()
+        {
+            int [] nRetXY = new int [2];
+            DisplayMetrics metrics = new DisplayMetrics();
+            WindowManager wMgr = (WindowManager) contextWrapper.getSystemService(Context.WINDOW_SERVICE);
+            wMgr.getDefaultDisplay().getMetrics(metrics);
+            nRetXY[0] = metrics.widthPixels;
+            nRetXY[1] = metrics.heightPixels;
+            return(nRetXY);
+        }
+
+    public String SetADB(String sWhat) {
+        String sRet = "";
+        String sTmp = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+
+        if (sWhat.contains("ip")) {
+            theArgs[2] = "setprop service.adb.tcp.port 5555";
+        } else {
+            theArgs[2] = "setprop service.adb.tcp.port -1";
+        }
+
+        try {
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+            outThrd.start();
+            outThrd.join(5000);
+            sTmp = outThrd.strOutput;
+            Log.e("ADB", sTmp);
+            if (outThrd.nExitCode == 0) {
+                theArgs[2] = "stop adbd";
+                pProc = Runtime.getRuntime().exec(theArgs);
+                outThrd = new RedirOutputThread(pProc, null);
+                outThrd.start();
+                outThrd.join(5000);
+                sTmp = outThrd.strOutput;
+                Log.e("ADB", sTmp);
+                if (outThrd.nExitCode == 0) {
+                    theArgs[2] = "start adbd";
+                    pProc = Runtime.getRuntime().exec(theArgs);
+                    outThrd = new RedirOutputThread(pProc, null);
+                    outThrd.start();
+                    outThrd.join(5000);
+                    sTmp = outThrd.strOutput;
+                    Log.e("ADB", sTmp);
+                    if (outThrd.nExitCode == 0) {
+                        sRet = "Successfully set adb to " + sWhat + "\n";
+                    } else {
+                        sRet = sErrorPrefix + "Failed to start adbd\n";
+                    }
+                } else {
+                    sRet = sErrorPrefix + "Failed to stop adbd\n";
+                }
+            } else {
+                sRet = sErrorPrefix + "Failed to setprop service.adb.tcp.port 5555\n";
+            }
+
+        }
+    catch (IOException e)
+        {
+        sRet = e.getMessage();
+        e.printStackTrace();
+        }
+    catch (InterruptedException e)
+        {
+        e.printStackTrace();
+        }
+        return(sRet);
+    }
+
+    public String KillProcess(String sProcName, OutputStream out)
+        {
+        String sTmp = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "kill";
+
+        String sRet = sErrorPrefix + "Unable to kill " + sProcName + "\n";
+        ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+        int lcv = 0;
+        String strProcName = "";
+        int    nPID = 0;
+
+        for (lcv = 0; lcv < lProcesses.size(); lcv++)
+            {
+            if (lProcesses.get(lcv).processName.contains(sProcName))
+                {
+                strProcName = lProcesses.get(lcv).processName;
+                nPID = lProcesses.get(lcv).pid;
+                sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
+
+                theArgs[2] += " " + nPID;
+
+                try
+                    {
+                    pProc = Runtime.getRuntime().exec(theArgs);
+                    RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+                    outThrd.start();
+                    outThrd.join(15000);
+                    sTmp = outThrd.strOutput;
+                    Log.e("KILLPROCESS", sTmp);
+                    if (outThrd.nExitCode == 0) {
+                        sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
+                        nPID = 0;
+                        break;
+                    } else {
+                        sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
+                    }
+                    }
+                catch (IOException e)
+                    {
+                    sRet = e.getMessage();
+                    e.printStackTrace();
+                    }
+                catch (InterruptedException e)
+                    {
+                    e.printStackTrace();
+                    }
+
+                // Give the messages a chance to be processed
+                try {
+                    Thread.sleep(2000);
+                    }
+                catch (InterruptedException e)
+                    {
+                    e.printStackTrace();
+                    }
+                break;
+                }
+            }
+
+        if (nPID > 0)
+            {
+            sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
+            lProcesses = aMgr.getRunningAppProcesses();
+            for (lcv = 0; lcv < lProcesses.size(); lcv++)
+                {
+                if (lProcesses.get(lcv).processName.contains(sProcName))
+                    {
+                    sRet = sErrorPrefix + "Unable to kill " + nPID + " " + strProcName + "\n";
+                    break;
+                    }
+                }
+            }
+
+        return (sRet);
+        }
+
+    public boolean IsProcessDead(String sProcName)
+        {
+        boolean bRet = false;
+        ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.ProcessErrorStateInfo> lProcesses = aMgr.getProcessesInErrorState();
+        int lcv = 0;
+
+        if (lProcesses != null)
+            {
+            for (lcv = 0; lcv < lProcesses.size(); lcv++)
+                {
+                if (lProcesses.get(lcv).processName.contentEquals(sProcName) &&
+                    lProcesses.get(lcv).condition != ActivityManager.ProcessErrorStateInfo.NO_ERROR)
+                    {
+                    bRet = true;
+                    break;
+                    }
+                }
+            }
+
+        return (bRet);
+        }
+
+    public String GetProcessInfo()
+        {
+        String sRet = "";
+        ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+        int    nProcs = lProcesses.size();
+        int lcv = 0;
+        String strProcName = "";
+        int    nPID = 0;
+        int nUser = 0;
+
+        for (lcv = 0; lcv < nProcs; lcv++)
+            {
+            strProcName = lProcesses.get(lcv).processName;
+            nPID = lProcesses.get(lcv).pid;
+            nUser = lProcesses.get(lcv).uid;
+            sRet += nUser + "\t" + nPID + "\t" + strProcName;
+            if (lcv < (nProcs - 1))
+                sRet += "\n";
+            }
+
+        return (sRet);
+        }
+
+    public String GetOSInfo()
+        {
+        String sRet = "";
+
+        sRet = Build.DISPLAY;
+
+        return (sRet);
+        }
+
+    public String GetPowerInfo()
+        {
+        String sRet = "";
+
+        sRet = "Power status:\n  AC power " + SUTAgentAndroid.sACStatus + "\n";
+        sRet += "  Battery charge " + SUTAgentAndroid.sPowerStatus + "\n";
+        sRet += "  Remaining charge:      " + SUTAgentAndroid.nChargeLevel + "%\n";
+        sRet += "  Battery Temperature:   " + (((float)(SUTAgentAndroid.nBatteryTemp))/10) + " (c)\n";
+        return (sRet);
+        }
+
+    // todo
+    public String GetDiskInfo(String sPath)
+        {
+        String sRet = "";
+        StatFs statFS = new StatFs(sPath);
+
+        int nBlockCount = statFS.getBlockCount();
+        int nBlockSize = statFS.getBlockSize();
+        int nBlocksAvail = statFS.getAvailableBlocks();
+        int nBlocksFree = statFS.getFreeBlocks();
+
+        sRet = "total:     " + (nBlockCount * nBlockSize) + "\nfree:      " + (nBlocksFree * nBlockSize) + "\navailable: " + (nBlocksAvail * nBlockSize);
+
+        return (sRet);
+        }
+
+    public String GetMemoryInfo()
+        {
+        String sRet = "PA:" + GetMemoryConfig();
+        return (sRet);
+        }
+
+    public long GetMemoryConfig()
+        {
+        ActivityManager aMgr = (ActivityManager) contextWrapper.getSystemService(Activity.ACTIVITY_SERVICE);
+        ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();
+        aMgr.getMemoryInfo(outInfo);
+        long lMem = outInfo.availMem;
+
+        return (lMem);
+        }
+
+    public String UpdateCallBack(String sFileName)
+        {
+        String sRet = sErrorPrefix + "No file specified";
+        String sIP = "";
+        String sPort = "";
+        int nEnd = 0;
+        int nStart = 0;
+
+        if ((sFileName == null) || (sFileName.length() == 0))
+            return(sRet);
+
+        Context ctx = contextWrapper.getApplicationContext();
+        try {
+            FileInputStream fis = ctx.openFileInput(sFileName);
+            int nBytes = fis.available();
+            if (nBytes > 0)
+                {
+                byte [] buffer = new byte [nBytes + 1];
+                int nRead = fis.read(buffer, 0, nBytes);
+                fis.close();
+                ctx.deleteFile(sFileName);
+                if (nRead > 0)
+                    {
+                    String sBuffer = new String(buffer);
+                    nEnd = sBuffer.indexOf(',');
+                    if (nEnd > 0)
+                        {
+                        sIP = (sBuffer.substring(0, nEnd)).trim();
+                        nStart = nEnd + 1;
+                        nEnd = sBuffer.indexOf('\r', nStart);
+                        if (nEnd > 0)
+                            {
+                            sPort = (sBuffer.substring(nStart, nEnd)).trim();
+                            Thread.sleep(5000);
+                            sRet = RegisterTheDevice(sIP, sPort, sBuffer.substring(nEnd + 1));
+                            }
+                        }
+                    }
+                }
+            }
+        catch (FileNotFoundException e)
+            {
+            sRet = sErrorPrefix + "Nothing to do";
+            }
+        catch (IOException e)
+            {
+            sRet = sErrorPrefix + "Couldn't send info to " + sIP + ":" + sPort;
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+        return(sRet);
+        }
+
+    public String RegisterTheDevice(String sSrvr, String sPort, String sData)
+        {
+        String sRet = "";
+        String line = "";
+
+//        Debug.waitForDebugger();
+
+        if (sSrvr != null && sPort != null && sData != null)
+            {
+            try
+                {
+                int nPort = Integer.parseInt(sPort);
+                Socket socket = new Socket(sSrvr, nPort);
+                PrintWriter out = new PrintWriter(socket.getOutputStream(), false);
+                BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                out.println(sData);
+                if ( out.checkError() == false )
+                    {
+                    socket.setSoTimeout(30000);
+                    while (socket.isInputShutdown() == false)
+                        {
+                        line = in.readLine();
+
+                        if (line != null)
+                            {
+                            line = line.toLowerCase();
+                            sRet += line;
+                            // ok means we're done
+                            if (line.contains("ok"))
+                                break;
+                            }
+                        else
+                            {
+                            // end of stream reached
+                            break;
+                            }
+                        }
+                    }
+                out.close();
+                in.close();
+                socket.close();
+                }
+            catch(NumberFormatException e)
+                {
+                sRet += "reg NumberFormatException thrown [" + e.getLocalizedMessage() + "]";
+                e.printStackTrace();
+                }
+            catch (UnknownHostException e)
+                {
+                sRet += "reg UnknownHostException thrown [" + e.getLocalizedMessage() + "]";
+                e.printStackTrace();
+                }
+            catch (IOException e)
+                {
+                sRet += "reg IOException thrown [" + e.getLocalizedMessage() + "]";
+                e.printStackTrace();
+                }
+            }
+        return(sRet);
+        }
+
+    public String GetInternetData(String sHost, String sPort, String sURL)
+        {
+        String sRet = "";
+        String sNewURL = "";
+        HttpClient httpClient = new DefaultHttpClient();
+        try
+            {
+            sNewURL = "http://" + sHost + ((sPort.length() > 0) ? (":" + sPort) : "") + sURL;
+
+            HttpGet request = new HttpGet(sNewURL);
+            HttpResponse response = httpClient.execute(request);
+            int status = response.getStatusLine().getStatusCode();
+            // we assume that the response body contains the error message
+            if (status != HttpStatus.SC_OK)
+                {
+                ByteArrayOutputStream ostream = new ByteArrayOutputStream();
+                response.getEntity().writeTo(ostream);
+                Log.e("HTTP CLIENT", ostream.toString());
+                }
+            else
+                {
+                InputStream content = response.getEntity().getContent();
+                byte [] data = new byte [2048];
+                int nRead = content.read(data);
+                sRet = new String(data, 0, nRead);
+                content.close(); // this will also close the connection
+                }
+            }
+        catch (IllegalArgumentException e)
+            {
+            sRet = e.getLocalizedMessage();
+            e.printStackTrace();
+            }
+        catch (ClientProtocolException e)
+            {
+            sRet = e.getLocalizedMessage();
+            e.printStackTrace();
+            }
+        catch (IOException e)
+            {
+            sRet = e.getLocalizedMessage();
+            e.printStackTrace();
+            }
+
+        return(sRet);
+        }
+
+    public String GetTimeZone()
+        {
+        String    sRet = "";
+        TimeZone tz;
+
+        tz = TimeZone.getDefault();
+        Date now = new Date();
+        sRet = tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG);
+
+        return(sRet);
+        }
+
+    public String SetTimeZone(String sTimeZone)
+        {
+        String            sRet = "Unable to set timezone to " + sTimeZone;
+        TimeZone         tz = null;
+        AlarmManager     amgr = null;
+
+        if ((sTimeZone.length() > 0) && (sTimeZone.startsWith("GMT")))
+            {
+            amgr = (AlarmManager) contextWrapper.getSystemService(Context.ALARM_SERVICE);
+            if (amgr != null)
+                amgr.setTimeZone(sTimeZone);
+            }
+        else
+            {
+            String [] zoneNames = TimeZone.getAvailableIDs();
+            int nNumMatches = zoneNames.length;
+            int    lcv = 0;
+
+            for (lcv = 0; lcv < nNumMatches; lcv++)
+                {
+                if (zoneNames[lcv].equalsIgnoreCase(sTimeZone))
+                    break;
+                }
+
+            if (lcv < nNumMatches)
+                {
+                amgr = (AlarmManager) contextWrapper.getSystemService(Context.ALARM_SERVICE);
+                if (amgr != null)
+                    amgr.setTimeZone(zoneNames[lcv]);
+                }
+            }
+
+        if (amgr != null)
+            {
+            tz = TimeZone.getDefault();
+            Date now = new Date();
+            sRet = tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG);
+            }
+
+        return(sRet);
+        }
+
+    public String GetSystemTime()
+        {
+        String sRet = "";
+        Calendar cal = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS");
+        sRet = sdf.format(cal.getTime());
+
+        return (sRet);
+        }
+
+    public String SetSystemTime(String sDate, String sTime, OutputStream out) {
+        String sRet = "";
+        String sM = "";
+        String sMillis = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+
+        if (((sDate != null) && (sTime != null)) &&
+            (sDate.contains("/") || sDate.contains(".")) &&
+            (sTime.contains(":"))) {
+            int year = Integer.parseInt(sDate.substring(0,4));
+            int month = Integer.parseInt(sDate.substring(5,7));
+            int day = Integer.parseInt(sDate.substring(8,10));
+
+            int hour = Integer.parseInt(sTime.substring(0,2));
+            int mins = Integer.parseInt(sTime.substring(3,5));
+            int secs = Integer.parseInt(sTime.substring(6,8));
+
+            Calendar cal = new GregorianCalendar(TimeZone.getDefault());
+            cal.set(year, month - 1, day, hour, mins, secs);
+            long lMillisecs = cal.getTime().getTime();
+
+            sM = Long.toString(lMillisecs);
+            sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
+
+        } else if ((sDate != null) && (sTime == null) && sDate.contains(".")) {
+            String serverName = sDate;
+//            String serverName = "us.pool.ntp.org";
+            sRet = "NTP Server: " + serverName + lineSep;
+            // Send request
+            DatagramSocket socket;
+
+            try {
+                socket = new DatagramSocket();
+                InetAddress address = InetAddress.getByName(serverName);
+                byte[] buf = new NtpMessage().toByteArray();
+                DatagramPacket packet = new DatagramPacket(buf, buf.length, address, 123);
+
+                // Set the transmit timestamp *just* before sending the packet
+                // ToDo: Does this actually improve performance or not?
+                NtpMessage.encodeTimestamp(packet.getData(), 40, (System.currentTimeMillis()/1000.0) + 2208988800.0);
+
+                socket.send(packet);
+
+                // Get response
+                System.out.println("NTP request sent, waiting for response...\n");
+                packet = new DatagramPacket(buf, buf.length);
+                socket.receive(packet);
+
+                // Immediately record the incoming timestamp since 00:00 1-JAN-1900 in secs.
+                double destinationTimestamp = (System.currentTimeMillis()/1000.0) + 2208988800.0;
+
+                // Process response
+                NtpMessage msg = new NtpMessage(packet.getData());
+
+                // Corrected, according to RFC2030 errata
+                double roundTripDelay = (destinationTimestamp-msg.originateTimestamp) - (msg.transmitTimestamp-msg.receiveTimestamp);
+
+                double localClockOffset = ((msg.receiveTimestamp - msg.originateTimestamp) + (msg.transmitTimestamp - destinationTimestamp)) / 2;
+
+                // convert base of timestamp from 00:00 1900/01/01 to 00:00:00 1970/01/01
+                double utc = msg.transmitTimestamp - (2208988800.0);
+
+                // convert from secs to ms
+                long lNewMillisecs = (long)(utc * 1000.0);
+
+                // create a date object using the timestamp this will take into account the timezone and daylight savings settings
+                Date dt = new Date(lNewMillisecs);
+
+                sRet += "  Time: " + new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS").format(dt) + lineSep;
+
+                // get the timestamp
+                long lMillisecs = dt.getTime();
+
+                // format the timestamp as required for the date command
+                sM = Long.toString(lMillisecs);
+                sMillis = sM.substring(0, sM.length() - 3) + "." + sM.substring(sM.length() - 3);
+
+                socket.close();
+            } catch (SocketException e) {
+                e.printStackTrace();
+            } catch (UnknownHostException e) {
+                e.printStackTrace();
+                sRet = sErrorPrefix + "Unknown host";
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            sRet += "Invalid argument(s)";
+        }
+
+        // if we have an argument
+        if (sMillis.length() > 0) {
+            theArgs[2] = "date -u " + sMillis;
+
+            try {
+                pProc = Runtime.getRuntime().exec(theArgs);
+                RedirOutputThread outThrd = new RedirOutputThread(pProc, null);
+                outThrd.start();
+                outThrd.join(10000);
+                sRet += GetSystemTime();
+            } catch (IOException e) {
+                sRet = e.getMessage();
+                e.printStackTrace();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return (sRet);
+    }
+
+    public String GetClok()
+        {
+        long lMillisecs = System.currentTimeMillis();
+        String sRet = "";
+
+        if (lMillisecs > 0)
+            sRet = Long.toString(lMillisecs);
+
+        return(sRet);
+        }
+
+    public String GetUptime()
+        {
+        String sRet = "";
+        long lHold = 0;
+        long lUptime = SystemClock.elapsedRealtime();
+        int    nDays = 0;
+        int    nHours = 0;
+        int nMinutes = 0;
+        int nSecs = 0;
+        int nMilliseconds = 0;
+
+        if (lUptime > 0)
+            {
+            nDays = (int)(lUptime / (24L * 60L * 60L * 1000L));
+            lHold = lUptime % (24L * 60L * 60L * 1000L);
+            nHours = (int)(lHold / (60L * 60L * 1000L));
+            lHold %= 60L * 60L * 1000L;
+            nMinutes = (int)(lHold / (60L * 1000L));
+            lHold %= 60L * 1000L;
+            nSecs = (int)(lHold / 1000L);
+            nMilliseconds = (int)(lHold % 1000);
+            sRet = "" + nDays + " days " + nHours + " hours " + nMinutes + " minutes " + nSecs + " seconds " + nMilliseconds + " ms";
+            }
+
+        return (sRet);
+        }
+
+    public String NewKillProc(String sProcId, OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "kill " + sProcId;
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(5000);
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return(sRet);
+        }
+
+    public String SendPing(String sIPAddr, OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [4];
+
+        theArgs[0] = "ping";
+        theArgs[1] = "-c";
+        theArgs[2] = "3";
+        theArgs[3] = sIPAddr;
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(5000);
+            if (out == null)
+                sRet = outThrd.strOutput;
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    public String GetTmpDir()
+    {
+        String     sRet = "";
+        Context ctx = contextWrapper.getApplicationContext();
+        File dir = ctx.getFilesDir();
+        ctx = null;
+        try {
+            sRet = dir.getCanonicalPath();
+            }
+        catch (IOException e)
+            {
+            e.printStackTrace();
+            }
+        return(sRet);
+    }
+
+    public String PrintFileTimestamp(String sFile)
+        {
+        String     sRet = "";
+        String    sTmpFileName = fixFileName(sFile);
+        long    lModified = -1;
+
+        if (sTmpFileName.contains("org.mozilla.fennec") || sTmpFileName.contains("org.mozilla.firefox")) {
+            ContentResolver cr = contextWrapper.getContentResolver();
+            Uri ffxFiles = Uri.parse("content://" + (sTmpFileName.contains("fennec") ? fenProvider : ffxProvider) + "/dir");
+
+            String[] columns = new String[] {
+                    "_id",
+                    "isdir",
+                    "filename",
+                    "length",
+                    "ts"
+                };
+
+            Cursor myCursor = cr.query(    ffxFiles,
+                                        columns,         // Which columns to return
+                                        sTmpFileName,   // Which rows to return (all rows)
+                                        null,           // Selection arguments (none)
+                                        null);            // Order clause (none)
+            if (myCursor != null) {
+                if (myCursor.getCount() > 0) {
+                    if (myCursor.moveToPosition(0)) {
+                        lModified = myCursor.getLong(myCursor.getColumnIndex("ts"));
+                    }
+                }
+                myCursor.close();
+            }
+        }
+        else {
+            File theFile = new File(sTmpFileName);
+
+            if (theFile.exists()) {
+                lModified = theFile.lastModified();
+            }
+        }
+
+        if (lModified != -1) {
+            Date dtModified = new Date(lModified);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS");
+            sRet = "Last modified: " + sdf.format(dtModified);
+        }
+        else {
+            sRet = sErrorPrefix + "[" + sTmpFileName + "] doesn't exist";
+        }
+
+        return(sRet);
+        }
+
+    public String GetIniData(String sSection, String sKey, String sFile)
+        {
+        String sRet = "";
+        String sComp = "";
+        String sLine = "";
+        boolean bFound = false;
+        BufferedReader in = null;
+        String    sTmpFileName = fixFileName(sFile);
+
+        try {
+            in = new BufferedReader(new FileReader(sTmpFileName));
+            sComp = "[" + sSection + "]";
+            while ((sLine = in.readLine()) != null)
+                {
+                if (sLine.equalsIgnoreCase(sComp))
+                    {
+                    bFound = true;
+                    break;
+                    }
+                }
+
+            if (bFound)
+                {
+                sComp = (sKey + " =").toLowerCase();
+                while ((sLine = in.readLine()) != null)
+                    {
+                    if (sLine.toLowerCase().contains(sComp))
+                        {
+                        String [] temp = null;
+                        temp = sLine.split("=");
+                        if (temp != null)
+                            {
+                            if (temp.length > 1)
+                                sRet = temp[1].trim();
+                            }
+                        break;
+                        }
+                    }
+                }
+            in.close();
+            }
+        catch (FileNotFoundException e)
+            {
+            sComp = e.toString();
+            }
+        catch (IOException e)
+            {
+            sComp = e.toString();
+            }
+        return (sRet);
+        }
+
+    public String RunReboot(OutputStream out, String sCallBackIP, String sCallBackPort)
+        {
+        String sRet = "";
+        Context ctx = contextWrapper.getApplicationContext();
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "reboot";
+        try {
+            if ((sCallBackIP != null) && (sCallBackPort != null) &&
+                (sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))    {
+                FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
+                String sBuffer = sCallBackIP + "," + sCallBackPort + "\rSystem rebooted\r";
+                fos.write(sBuffer.getBytes());
+                fos.flush();
+                fos.close();
+                fos = null;
+            }
+        } catch (FileNotFoundException e) {
+            sRet = sErrorPrefix + "Callback file creation error [rebt] call failed " + e.getMessage();
+            e.printStackTrace();
+        } catch (IOException e) {
+            sRet = sErrorPrefix + "Callback file error [rebt] call failed " + e.getMessage();
+            e.printStackTrace();
+        }
+
+        try {
+            // Tell all of the data channels we are rebooting
+            ((ASMozStub)this.contextWrapper).SendToDataChannel("Rebooting ...");
+
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(10000);
+        } catch (IOException e) {
+            sRet = e.getMessage();
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        return (sRet);
+        }
+
+    public String UnInstallApp(String sApp, OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "pm uninstall " + sApp + ";reboot;exit";
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(60000);
+            int nRet = pProc.exitValue();
+            sRet = "\nuninst complete [" + nRet + "]";
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+    }
+
+    public String InstallApp(String sApp, OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [3];
+        File    srcFile = new File(sApp);
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "mv " + GetTmpDir() + "/" + srcFile.getName() + " /data/local/tmp/" + srcFile.getName() + ";exit";
+
+        sRet = CopyFile(sApp, GetTmpDir() + "/" + srcFile.getName());
+        try {
+            out.write(sRet.getBytes());
+            out.flush();
+            }
+        catch (IOException e1)
+            {
+            e1.printStackTrace();
+            }
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(90000);
+            int nRet = pProc.exitValue();
+            sRet = "\nmove complete [" + nRet + "]";
+            try
+                {
+                out.write(sRet.getBytes());
+                out.flush();
+                }
+            catch (IOException e1)
+                {
+                e1.printStackTrace();
+                }
+
+            theArgs[2] = "chmod 666 /data/local/tmp/" + srcFile.getName() + ";exit";
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd2 = new RedirOutputThread(pProc, out);
+            outThrd2.start();
+            outThrd2.join(10000);
+            int nRet2 = pProc.exitValue();
+            sRet = "\npermission change complete [" + nRet2 + "]\n";
+            try {
+                out.write(sRet.getBytes());
+                out.flush();
+                }
+            catch (IOException e1)
+                {
+                e1.printStackTrace();
+                }
+
+            theArgs[2] = "pm install -r /data/local/tmp/" + srcFile.getName() + " Cleanup" + ";exit";
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd3 = new RedirOutputThread(pProc, out);
+            outThrd3.start();
+            outThrd3.join(60000);
+            int nRet3 = pProc.exitValue();
+            sRet = "\ninstallation complete [" + nRet3 + "]";
+            try {
+                out.write(sRet.getBytes());
+                out.flush();
+                }
+            catch (IOException e1)
+                {
+                e1.printStackTrace();
+                }
+
+            theArgs[2] = "rm /data/local/tmp/" + srcFile.getName() + ";exit";
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd4 = new RedirOutputThread(pProc, out);
+            outThrd4.start();
+            outThrd4.join(60000);
+            int nRet4 = pProc.exitValue();
+            sRet = "\ntmp file removed [" + nRet4 + "]";
+            try {
+                out.write(sRet.getBytes());
+                out.flush();
+                }
+            catch (IOException e1)
+                {
+                e1.printStackTrace();
+                }
+            sRet = "\nSuccess";
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    public String StrtUpdtOMatic(String sPkgName, String sPkgFileName, String sCallBackIP, String sCallBackPort)
+        {
+        String sRet = "";
+
+        Context ctx = contextWrapper.getApplicationContext();
+        PackageManager pm = ctx.getPackageManager();
+
+        Intent prgIntent = new Intent();
+        prgIntent.setPackage("com.mozilla.watcher");
+
+        try {
+            PackageInfo pi = pm.getPackageInfo("com.mozilla.watcher", PackageManager.GET_SERVICES | PackageManager.GET_INTENT_FILTERS);
+            ServiceInfo [] si = pi.services;
+            for (int i = 0; i < si.length; i++)
+                {
+                ServiceInfo s = si[i];
+                if (s.name.length() > 0)
+                    {
+                    prgIntent.setClassName(s.packageName, s.name);
+                    break;
+                    }
+                }
+            }
+        catch (NameNotFoundException e)
+            {
+            e.printStackTrace();
+            sRet = sErrorPrefix + "watcher is not properly installed";
+            return(sRet);
+            }
+
+        prgIntent.putExtra("command", "updt");
+        prgIntent.putExtra("pkgName", sPkgName);
+        prgIntent.putExtra("pkgFile", sPkgFileName);
+        prgIntent.putExtra("reboot", true);
+
+        try
+            {
+            if ((sCallBackIP != null) && (sCallBackPort != null) &&
+                (sCallBackIP.length() > 0) && (sCallBackPort.length() > 0))
+                {
+                FileOutputStream fos = ctx.openFileOutput("update.info", Context.MODE_WORLD_READABLE | Context.MODE_WORLD_WRITEABLE);
+                String sBuffer = sCallBackIP + "," + sCallBackPort + "\rupdate started " + sPkgName + " " + sPkgFileName + "\r";
+                fos.write(sBuffer.getBytes());
+                fos.flush();
+                fos.close();
+                fos = null;
+                prgIntent.putExtra("outFile", ctx.getFilesDir() + "/update.info");
+                }
+            else {
+                if (prgIntent.hasExtra("outFile")) {
+                    System.out.println("outFile extra unset from intent");
+                    prgIntent.removeExtra("outFile");
+                }
+            }
+
+            ComponentName cn = contextWrapper.startService(prgIntent);
+            if (cn != null)
+                sRet = "exit";
+            else
+                sRet = sErrorPrefix + "Unable to use watcher service";
+            }
+        catch(ActivityNotFoundException anf)
+            {
+            sRet = sErrorPrefix + "Activity Not Found Exception [updt] call failed";
+            anf.printStackTrace();
+            }
+        catch (FileNotFoundException e)
+            {
+            sRet = sErrorPrefix + "File creation error [updt] call failed";
+            e.printStackTrace();
+            }
+        catch (IOException e)
+            {
+            sRet = sErrorPrefix + "File error [updt] call failed";
+            e.printStackTrace();
+            }
+
+        ctx = null;
+
+        return (sRet);
+        }
+
+    public String StartJavaPrg(String [] sArgs, Intent preIntent)
+        {
+        String sRet = "";
+        String sArgList = "";
+        String sUrl = "";
+//        String sRedirFileName = "";
+        Intent prgIntent = null;
+
+        Context ctx = contextWrapper.getApplicationContext();
+        PackageManager pm = ctx.getPackageManager();
+
+        if (preIntent == null)
+            prgIntent = new Intent();
+        else
+            prgIntent = preIntent;
+
+        prgIntent.setPackage(sArgs[0]);
+        prgIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        try {
+            PackageInfo pi = pm.getPackageInfo(sArgs[0], PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
+            ActivityInfo [] ai = pi.activities;
+            for (int i = 0; i < ai.length; i++)
+                {
+                ActivityInfo a = ai[i];
+                if (a.name.length() > 0)
+                    {
+                    prgIntent.setClassName(a.packageName, a.name);
+                    break;
+                    }
+                }
+            }
+        catch (NameNotFoundException e)
+            {
+            e.printStackTrace();
+            }
+
+        if (sArgs.length > 1)
+            {
+            if (sArgs[0].contains("android.browser"))
+                prgIntent.setAction(Intent.ACTION_VIEW);
+            else
+                prgIntent.setAction(Intent.ACTION_MAIN);
+
+            if (sArgs[0].contains("fennec"))
+                {
+                sArgList = "";
+                sUrl = "";
+
+                for (int lcv = 1; lcv < sArgs.length; lcv++)
+                    {
+                    if (sArgs[lcv].contains("://"))
+                        {
+                        prgIntent.setAction(Intent.ACTION_VIEW);
+                        sUrl = sArgs[lcv];
+                        }
+                    else
+                        {
+                        if (sArgs[lcv].equals(">"))
+                            {
+                            lcv++;
+                            if (lcv < sArgs.length)
+                                lcv++;
+//                                sRedirFileName = sArgs[lcv++];
+                            }
+                        else
+                            sArgList += " " + sArgs[lcv];
+                        }
+                    }
+
+                if (sArgList.length() > 0)
+                    prgIntent.putExtra("args", sArgList.trim());
+
+                if (sUrl.length() > 0)
+                    prgIntent.setData(Uri.parse(sUrl.trim()));
+                }
+            else
+                {
+                for (int lcv = 1; lcv < sArgs.length; lcv++)
+                    sArgList += " " + sArgs[lcv];
+
+                prgIntent.setData(Uri.parse(sArgList.trim()));
+                }
+            }
+        else
+            {
+            prgIntent.setAction(Intent.ACTION_MAIN);
+            }
+
+        try
+            {
+            contextWrapper.startActivity(prgIntent);
+            }
+        catch(ActivityNotFoundException anf)
+            {
+            anf.printStackTrace();
+            }
+
+        ctx = null;
+        return (sRet);
+        }
+
+    public String StartPrg(String [] progArray, OutputStream out)
+        {
+        String sRet = "";
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(progArray);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(10000);
+            int nRetCode = pProc.exitValue();
+            sRet = "return code [" + nRetCode + "]";
+            }
+        catch (IOException e)
+            {
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            sRet = "Timed out!";
+            }
+
+        return (sRet);
+        }
+
+    public String StartPrg2(String [] progArray, OutputStream out)
+        {
+        String sRet = "";
+
+        int    nArraySize = 0;
+        int    nArgs = progArray.length - 1; // 1st arg is the environment string
+        int    lcv    = 0;
+        int    temp = 0;
+
+        String sEnvString = progArray[0];
+
+        if (!sEnvString.contains("=") && (sEnvString.length() > 0))
+            {
+            if (sEnvString.contains("/") || sEnvString.contains("\\") || !sEnvString.contains("."))
+                sRet = StartPrg(progArray, out);
+            else
+                sRet = StartJavaPrg(progArray, null);
+            return(sRet);
+            }
+
+        // Set up command line args stripping off the environment string
+        String [] theArgs = new String [nArgs];
+        for (lcv = 0; lcv < nArgs; lcv++)
+            {
+            theArgs[lcv] = progArray[lcv + 1];
+            }
+
+        try
+            {
+            String [] envStrings = sEnvString.split(",");
+            Map<String, String> newEnv = new HashMap<String, String>();
+
+            for (lcv = 0; lcv < envStrings.length; lcv++)
+                {
+                temp = envStrings[lcv].indexOf("=");
+                if (temp > 0)
+                    {
+                    newEnv.put(    envStrings[lcv].substring(0, temp),
+                                envStrings[lcv].substring(temp + 1, envStrings[lcv].length()));
+                    }
+                }
+
+            Map<String, String> sysEnv = System.getenv();
+
+            nArraySize = sysEnv.size();
+
+            for (Map.Entry<String, String> entry : newEnv.entrySet())
+                {
+                if (!sysEnv.containsKey(entry.getKey()))
+                    {
+                    nArraySize++;
+                    }
+                }
+
+            String[] envArray = new String[nArraySize];
+
+            int        i = 0;
+            int        offset;
+            String    sKey = "";
+            String     sValue = "";
+
+            for (Map.Entry<String, String> entry : sysEnv.entrySet())
+                {
+                sKey = entry.getKey();
+                if (newEnv.containsKey(sKey))
+                    {
+                    sValue = newEnv.get(sKey);
+                    if ((offset = sValue.indexOf("$" + sKey)) != -1)
+                        {
+                        envArray[i++] = sKey +
+                                        "=" +
+                                        sValue.substring(0, offset) +
+                                        entry.getValue() +
+                                        sValue.substring(offset + sKey.length() + 1);
+                        }
+                    else
+                        envArray[i++] = sKey + "=" + sValue;
+                    newEnv.remove(sKey);
+                    }
+                else
+                    envArray[i++] = entry.getKey() + "=" + entry.getValue();
+                }
+
+            for (Map.Entry<String, String> entry : newEnv.entrySet())
+                {
+                envArray[i++] = entry.getKey() + "=" + entry.getValue();
+                }
+
+            if (theArgs[0].contains("/") || theArgs[0].contains("\\") || !theArgs[0].contains("."))
+                {
+                pProc = Runtime.getRuntime().exec(theArgs, envArray);
+
+                RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+                outThrd.start();
+                outThrd.join(10000);
+                int nRetCode = pProc.exitValue();
+                sRet = "return code [" + nRetCode + "]";
+                }
+            else
+                {
+                Intent preIntent = new Intent();
+                for (lcv = 0; lcv < envArray.length; lcv++)
+                    {
+                    preIntent.putExtra("env" + lcv, envArray[lcv]);
+                    }
+                sRet = StartJavaPrg(theArgs, preIntent);
+                }
+            }
+        catch(UnsupportedOperationException e)
+            {
+            if (e != null)
+                e.printStackTrace();
+            }
+        catch(ClassCastException e)
+            {
+            if (e != null)
+                e.printStackTrace();
+            }
+        catch(IllegalArgumentException e)
+            {
+            if (e != null)
+                e.printStackTrace();
+            }
+        catch(NullPointerException e)
+            {
+            if (e != null)
+                e.printStackTrace();
+            }
+        catch (IOException e)
+            {
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            sRet = "Timed out!";
+            }
+
+        return (sRet);
+        }
+
+    private String PrintUsage()
+        {
+        String sRet =
+            "run [cmdline]                - start program no wait\n" +
+            "exec [env pairs] [cmdline]   - start program no wait optionally pass env\n" +
+            "                               key=value pairs (comma separated)\n" +
+            "kill [program name]          - kill program no path\n" +
+            "killall                      - kill all processes started\n" +
+            "ps                           - list of running processes\n" +
+            "info                         - list of device info\n" +
+            "        [os]                 - os version for device\n" +
+            "        [id]                 - unique identifier for device\n" +
+            "        [uptime]             - uptime for device\n" +
+            "        [systime]            - current system time\n" +
+            "        [screen]             - width, height and bits per pixel for device\n" +
+            "        [memory]             - physical, free, available, storage memory\n" +
+            "                               for device\n" +
+            "        [processes]          - list of running processes see 'ps'\n" +
+            "deadman timeout              - set the duration for the deadman timer\n" +
+            "alrt [on/off]                - start or stop sysalert behavior\n" +
+            "disk [arg]                   - prints disk space info\n" +
+            "cp file1 file2               - copy file1 to file2\n" +
+            "time file                    - timestamp for file\n" +
+            "hash file                    - generate hash for file\n" +
+            "cd directory                 - change cwd\n" +
+            "cat file                     - cat file\n" +
+            "cwd                          - display cwd\n" +
+            "mv file1 file2               - move file1 to file2\n" +
+            "push filename                - push file to device\n" +
+            "rm file                      - delete file\n" +
+            "rmdr directory               - delete directory even if not empty\n" +
+            "mkdr directory               - create directory\n" +
+            "dirw directory               - tests whether the directory is writable\n" +
+            "isdir directory              - test whether the directory exists\n" +
+            "stat processid               - stat process\n" +
+            "dead processid               - print whether the process is alive or hung\n" +
+            "mems                         - dump memory stats\n" +
+            "ls                           - print directory\n" +
+            "tmpd                         - print temp directory\n" +
+            "ping [hostname/ipaddr]       - ping a network device\n" +
+            "unzp zipfile destdir         - unzip the zipfile into the destination dir\n" +
+            "zip zipfile src              - zip the source file/dir into zipfile\n" +
+            "rebt                         - reboot device\n" +
+            "inst /path/filename.apk      - install the referenced apk file\n" +
+            "uninst packagename           - uninstall the referenced package\n" +
+            "updt pkgname pkgfile         - unpdate the referenced package\n" +
+            "clok                         - the current device time expressed as the" +
+            "                               number of millisecs since epoch\n" +
+            "settime date time            - sets the device date and time\n" +
+            "                               (YYYY/MM/DD HH:MM:SS)\n" +
+            "tzset timezone               - sets the device timezone format is\n" +
+            "                               GMTxhh:mm x = +/- or a recognized Olsen string\n" +
+            "tzget                        - returns the current timezone set on the device\n" +
+            "rebt                         - reboot device\n" +
+            "quit                         - disconnect SUTAgent\n" +
+            "exit                         - close SUTAgent\n" +
+            "ver                          - SUTAgent version\n" +
+            "help                         - you're reading it";
+        return (sRet);
+        }
+}
diff --git a/build/mobile/sutagent/android/Power.java b/build/mobile/sutagent/android/Power.java
index 79feb62dcf50..47497e547ff1 100755
--- a/build/mobile/sutagent/android/Power.java
+++ b/build/mobile/sutagent/android/Power.java
@@ -1,102 +1,102 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.os;
-
-import java.io.IOException;
-
-/**
- * Class that provides access to some of the power management functions.
- *
- * {@hide}
- */
-public class Power
-{
-    // can't instantiate this class
-    private Power()
-    {
-    }
-
-    /**
-     * Wake lock that ensures that the CPU is running.  The screen might
-     * not be on.
-     */
-    public static final int PARTIAL_WAKE_LOCK = 1;
-
-    /**
-     * Wake lock that ensures that the screen is on.
-     */
-    public static final int FULL_WAKE_LOCK = 2;
-
-    public static native void acquireWakeLock(int lock, String id);
-    public static native void releaseWakeLock(String id);
-
-    /**
-     * Brightness value for fully off
-     */
-    public static final int BRIGHTNESS_OFF = 0;
-
-    /**
-     * Brightness value for dim backlight
-     */
-    public static final int BRIGHTNESS_DIM = 20;
-
-    /**
-     * Brightness value for fully on
-     */
-    public static final int BRIGHTNESS_ON = 255;
-
-    /**
-     * Brightness value to use when battery is low
-     */
-    public static final int BRIGHTNESS_LOW_BATTERY = 10;
-
-    /**
-     * Threshold for BRIGHTNESS_LOW_BATTERY (percentage)
-     * Screen will stay dim if battery level is <= LOW_BATTERY_THRESHOLD
-     */
-    public static final int LOW_BATTERY_THRESHOLD = 10;
-
-    /**
-     * Turn the screen on or off
-     *
-     * @param on Whether you want the screen on or off
-     */
-    public static native int setScreenState(boolean on);
-
-    public static native int setLastUserActivityTimeout(long ms);
-
-    /**
-     * Turn the device off.
-     *
-     * This method is considered deprecated in favor of
-     * {@link android.policy.ShutdownThread.shutdownAfterDisablingRadio()}.
-     *
-     * @deprecated
-     * @hide
-     */
-    @Deprecated
-    public static native void shutdown();
-
-    /**
-     * Reboot the device.
-     * @param reason code to pass to the kernel (e.g. "recovery"), or null.
-     *
-     * @throws IOException if reboot fails for some reason (eg, lack of
-     *         permission)
-     */
-    public static native void reboot(String reason) throws IOException;
-}
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import java.io.IOException;
+
+/**
+ * Class that provides access to some of the power management functions.
+ *
+ * {@hide}
+ */
+public class Power
+{
+    // can't instantiate this class
+    private Power()
+    {
+    }
+
+    /**
+     * Wake lock that ensures that the CPU is running.  The screen might
+     * not be on.
+     */
+    public static final int PARTIAL_WAKE_LOCK = 1;
+
+    /**
+     * Wake lock that ensures that the screen is on.
+     */
+    public static final int FULL_WAKE_LOCK = 2;
+
+    public static native void acquireWakeLock(int lock, String id);
+    public static native void releaseWakeLock(String id);
+
+    /**
+     * Brightness value for fully off
+     */
+    public static final int BRIGHTNESS_OFF = 0;
+
+    /**
+     * Brightness value for dim backlight
+     */
+    public static final int BRIGHTNESS_DIM = 20;
+
+    /**
+     * Brightness value for fully on
+     */
+    public static final int BRIGHTNESS_ON = 255;
+
+    /**
+     * Brightness value to use when battery is low
+     */
+    public static final int BRIGHTNESS_LOW_BATTERY = 10;
+
+    /**
+     * Threshold for BRIGHTNESS_LOW_BATTERY (percentage)
+     * Screen will stay dim if battery level is <= LOW_BATTERY_THRESHOLD
+     */
+    public static final int LOW_BATTERY_THRESHOLD = 10;
+
+    /**
+     * Turn the screen on or off
+     *
+     * @param on Whether you want the screen on or off
+     */
+    public static native int setScreenState(boolean on);
+
+    public static native int setLastUserActivityTimeout(long ms);
+
+    /**
+     * Turn the device off.
+     *
+     * This method is considered deprecated in favor of
+     * {@link android.policy.ShutdownThread.shutdownAfterDisablingRadio()}.
+     *
+     * @deprecated
+     * @hide
+     */
+    @Deprecated
+    public static native void shutdown();
+
+    /**
+     * Reboot the device.
+     * @param reason code to pass to the kernel (e.g. "recovery"), or null.
+     *
+     * @throws IOException if reboot fails for some reason (eg, lack of
+     *         permission)
+     */
+    public static native void reboot(String reason) throws IOException;
+}
diff --git a/build/mobile/sutagent/android/R.java b/build/mobile/sutagent/android/R.java
index 51c3077e34c1..2fc0a86aa3f5 100755
--- a/build/mobile/sutagent/android/R.java
+++ b/build/mobile/sutagent/android/R.java
@@ -1,33 +1,33 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.mozilla.SUTAgentAndroid;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ateamlogo=0x7f020000;
-        public static final int ic_stat_first=0x7f020001;
-        public static final int ic_stat_neterror=0x7f020002;
-        public static final int ic_stat_second=0x7f020003;
-        public static final int ic_stat_warning=0x7f020004;
-        public static final int icon=0x7f020005;
-    }
-    public static final class id {
-        public static final int Button01=0x7f050001;
-        public static final int Textview01=0x7f050000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int foreground_service_started=0x7f040002;
-        public static final int hello=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.mozilla.SUTAgentAndroid;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ateamlogo=0x7f020000;
+        public static final int ic_stat_first=0x7f020001;
+        public static final int ic_stat_neterror=0x7f020002;
+        public static final int ic_stat_second=0x7f020003;
+        public static final int ic_stat_warning=0x7f020004;
+        public static final int icon=0x7f020005;
+    }
+    public static final class id {
+        public static final int Button01=0x7f050001;
+        public static final int Textview01=0x7f050000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int foreground_service_started=0x7f040002;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/RedirOutputThread.java b/build/mobile/sutagent/android/RedirOutputThread.java
index 7a846d4ae3c6..f0091c5323c5 100755
--- a/build/mobile/sutagent/android/RedirOutputThread.java
+++ b/build/mobile/sutagent/android/RedirOutputThread.java
@@ -1,163 +1,163 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-public class RedirOutputThread extends Thread
-	{
-	OutputStream out;
-	InputStream	sutErr;
-	InputStream	sutOut;
-	Process pProc;
-	String	strOutput;
-	int	nExitCode = -1;
-	
-	public RedirOutputThread(Process pProc, OutputStream out)
-		{
-		if (pProc != null)
-			{
-			this.pProc = pProc;
-			sutErr = pProc.getErrorStream(); // Stderr
-			sutOut = pProc.getInputStream(); // Stdout
-			}
-		if (out != null)
-			this.out = out;
-		
-		strOutput = "";
-		}
-	
-	public void run()
-		{
-		boolean bStillRunning = true;
-		int	nBytesOut = 0;
-		int nBytesErr = 0;
-		int nBytesRead = 0;
-		PrintWriter pOut = null;
-		byte[] buffer = new byte[1024];
-		
-		if (out != null)
-			pOut = new PrintWriter(out);
-		else
-			bStillRunning = true;
-		
-		while (bStillRunning) 
-			{
-			try 
-				{
-				if ((nBytesOut = sutOut.available()) > 0)
-					{
-					if (nBytesOut > buffer.length)
-						{
-						buffer = null;
-						System.gc();
-						buffer = new byte[nBytesOut];
-						}
-					nBytesRead = sutOut.read(buffer, 0, nBytesOut);
-					if (nBytesRead == -1)
-						bStillRunning = false;
-					else 
-						{
-						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-						if (pOut != null)
-							{
-							pOut.print(sRep);
-							pOut.flush();
-							}
-						else
-							strOutput += sRep;
-						}
-					}
-
-				if ((nBytesErr = sutErr.available()) > 0)
-					{
-					if (nBytesErr > buffer.length)
-						{
-						buffer = null;
-						System.gc();
-						buffer = new byte[nBytesErr];
-						}
-					nBytesRead = sutErr.read(buffer, 0, nBytesErr);
-					if (nBytesRead == -1)
-						bStillRunning = false;
-					else 
-						{
-						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-						if (pOut != null)
-							{
-							pOut.print(sRep);
-							pOut.flush();
-							}
-						else
-							strOutput += sRep;
-						}
-					}
-
-				bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
-				} 
-			catch (IOException e)
-				{
-				e.printStackTrace();
-				}
-			}
-		
-		pProc.destroy();
-		buffer = null;
-		System.gc();
-		}
-	
-	private boolean IsProcRunning(Process pProc)
-		{
-		boolean bRet = false;
-	
-		try
-			{
-			nExitCode = pProc.exitValue();
-			}
-		catch (IllegalThreadStateException z)
-			{
-			nExitCode = -1;
-			bRet = true;
-			}
-
-		return(bRet);
-		}
-	}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+public class RedirOutputThread extends Thread
+    {
+    OutputStream out;
+    InputStream    sutErr;
+    InputStream    sutOut;
+    Process pProc;
+    String    strOutput;
+    int    nExitCode = -1;
+
+    public RedirOutputThread(Process pProc, OutputStream out)
+        {
+        if (pProc != null)
+            {
+            this.pProc = pProc;
+            sutErr = pProc.getErrorStream(); // Stderr
+            sutOut = pProc.getInputStream(); // Stdout
+            }
+        if (out != null)
+            this.out = out;
+
+        strOutput = "";
+        }
+
+    public void run()
+        {
+        boolean bStillRunning = true;
+        int    nBytesOut = 0;
+        int nBytesErr = 0;
+        int nBytesRead = 0;
+        PrintWriter pOut = null;
+        byte[] buffer = new byte[1024];
+
+        if (out != null)
+            pOut = new PrintWriter(out);
+        else
+            bStillRunning = true;
+
+        while (bStillRunning)
+            {
+            try
+                {
+                if ((nBytesOut = sutOut.available()) > 0)
+                    {
+                    if (nBytesOut > buffer.length)
+                        {
+                        buffer = null;
+                        System.gc();
+                        buffer = new byte[nBytesOut];
+                        }
+                    nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+                    if (nBytesRead == -1)
+                        bStillRunning = false;
+                    else
+                        {
+                        String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                        if (pOut != null)
+                            {
+                            pOut.print(sRep);
+                            pOut.flush();
+                            }
+                        else
+                            strOutput += sRep;
+                        }
+                    }
+
+                if ((nBytesErr = sutErr.available()) > 0)
+                    {
+                    if (nBytesErr > buffer.length)
+                        {
+                        buffer = null;
+                        System.gc();
+                        buffer = new byte[nBytesErr];
+                        }
+                    nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+                    if (nBytesRead == -1)
+                        bStillRunning = false;
+                    else
+                        {
+                        String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                        if (pOut != null)
+                            {
+                            pOut.print(sRep);
+                            pOut.flush();
+                            }
+                        else
+                            strOutput += sRep;
+                        }
+                    }
+
+                bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+                }
+            catch (IOException e)
+                {
+                e.printStackTrace();
+                }
+            }
+
+        pProc.destroy();
+        buffer = null;
+        System.gc();
+        }
+
+    private boolean IsProcRunning(Process pProc)
+        {
+        boolean bRet = false;
+
+        try
+            {
+            nExitCode = pProc.exitValue();
+            }
+        catch (IllegalThreadStateException z)
+            {
+            nExitCode = -1;
+            bRet = true;
+            }
+
+        return(bRet);
+        }
+    }
diff --git a/build/mobile/sutagent/android/RunCmdThread.java b/build/mobile/sutagent/android/RunCmdThread.java
index 5e26db446d91..caaa681f5d20 100755
--- a/build/mobile/sutagent/android/RunCmdThread.java
+++ b/build/mobile/sutagent/android/RunCmdThread.java
@@ -1,318 +1,318 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mozilla.SUTAgentAndroid.R;
-import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-
-public class RunCmdThread extends Thread
-	{
-	private ServerSocket SvrSocket = null;
-	private Socket socket	= null;
-	private Handler handler = null;
-	boolean bListening	= true;
-	boolean bNetError = false;
-	List<CmdWorkerThread> theWorkers = new ArrayList<CmdWorkerThread>();
-	android.app.Service	svc = null;
-
-	public RunCmdThread(ServerSocket socket, android.app.Service service, Handler handler)
-		{
-		super("RunCmdThread");
-		this.SvrSocket = socket;
-		this.svc = service;
-		this.handler = handler;
-		}
-	
-	public void StopListening()
-		{
-		bListening = false;
-		}
-	
-	public void run() {
-		try {
-			int	nIterations = 0;
-			
-			SvrSocket.setSoTimeout(5000);
-			while (bListening)
-				{
-				try 
-					{
-					socket = SvrSocket.accept();
-					CmdWorkerThread theWorker = new CmdWorkerThread(this, socket);
-					theWorker.start();
-					theWorkers.add(theWorker);
-					}
-				catch (SocketTimeoutException toe)
-					{
-					if (++nIterations > 60)
-						{
-						nIterations = 0;
-						String sRet = SendPing("www.mozilla.org");
-						if (sRet.contains("3 received"))
-							handler.post(new doCancelNotification());
-						else
-							handler.post(new doSendNotification("SUTAgent - Network Connectivity Error", sRet));
-						sRet = null;
-						}
-					continue;
-					}
-				catch (IOException e)
-					{
-					e.printStackTrace();
-					continue;
-					}
-				}
-			
-			int nNumWorkers = theWorkers.size();
-			for (int lcv = 0; lcv < nNumWorkers; lcv++)
-				{
-				if (theWorkers.get(lcv).isAlive())
-					{
-					theWorkers.get(lcv).StopListening();
-					while(theWorkers.get(lcv).isAlive())
-						;
-					}
-				}
-			
-			theWorkers.clear();
-			
-			SvrSocket.close();
-			
-			svc.stopSelf();
-			
-//			SUTAgentAndroid.me.finish();
-			} 
-		catch (IOException e)
-			{
-		    e.printStackTrace();
-			}
-		return;
-		}
-	
-	private String SendPing(String sIPAddr)
-		{
-		Process	pProc;
-		String sRet = "";
-		String [] theArgs = new String [4];
-		boolean bStillRunning = true;
-		int	nBytesOut = 0;
-		int nBytesErr = 0;
-		int nBytesRead = 0;
-		byte[] buffer = new byte[1024];
-	
-		theArgs[0] = "ping";
-		theArgs[1] = "-c";
-		theArgs[2] = "3";
-		theArgs[3] = sIPAddr;
-	
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-			
-			InputStream sutOut = pProc.getInputStream();
-			InputStream sutErr = pProc.getErrorStream();
-			
-			while (bStillRunning) 
-				{
-				try 
-					{
-					if ((nBytesOut = sutOut.available()) > 0)
-						{
-						if (nBytesOut > buffer.length)
-							{
-							buffer = null;
-							System.gc();
-							buffer = new byte[nBytesOut];
-							}
-						nBytesRead = sutOut.read(buffer, 0, nBytesOut);
-						if (nBytesRead == -1)
-							bStillRunning = false;
-						else 
-							{
-							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-							sRet += sRep;
-							sRep = null;
-							}
-						}
-
-					if ((nBytesErr = sutErr.available()) > 0)
-						{
-						if (nBytesErr > buffer.length)
-							{
-							buffer = null;
-							System.gc();
-							buffer = new byte[nBytesErr];
-							}
-						nBytesRead = sutErr.read(buffer, 0, nBytesErr);
-						if (nBytesRead == -1)
-							bStillRunning = false;
-						else 
-							{
-							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-							sRet += sRep;
-							sRep = null;
-							}
-						}
-
-					bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
-					} 
-				catch (IOException e)
-					{
-					e.printStackTrace();
-					}
-				
-				if ((bStillRunning == true) && (nBytesErr == 0) && (nBytesOut == 0))
-					{
-					try {
-						sleep(2000);
-						}
-					catch (InterruptedException e) {
-						e.printStackTrace();
-						}
-					}
-				}
-
-			pProc.destroy();
-			pProc = null;
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			}
-
-		return (sRet);
-		}
-	
-	private boolean IsProcRunning(Process pProc)
-		{
-		boolean bRet = false;
-		@SuppressWarnings("unused")
-		int nExitCode = 0;
-
-		try
-			{
-			nExitCode = pProc.exitValue();
-			}
-		catch (IllegalThreadStateException z)
-			{	
-			bRet = true;
-			}
-		catch (Exception e)
-			{
-			e.printStackTrace();
-			}
-
-		return(bRet);
-		}
-
-	private void SendNotification(String tickerText, String expandedText)
-		{
-		NotificationManager notificationManager = (NotificationManager)svc.getSystemService(Context.NOTIFICATION_SERVICE);
-		
-//		int icon = android.R.drawable.stat_notify_more;
-//		int icon = R.drawable.ic_stat_first;
-//		int icon = R.drawable.ic_stat_second;
-//		int icon = R.drawable.ic_stat_neterror;
-		int icon = R.drawable.ateamlogo;
-		long when = System.currentTimeMillis();
-		
-		Notification notification = new Notification(icon, tickerText, when);
-		
-		notification.flags |= (Notification.FLAG_INSISTENT | Notification.FLAG_AUTO_CANCEL);
-		notification.defaults |= Notification.DEFAULT_SOUND;
-		notification.defaults |= Notification.DEFAULT_VIBRATE;
-		notification.defaults |= Notification.DEFAULT_LIGHTS;
-		
-		Context context = svc.getApplicationContext();
-		
-		// Intent to launch an activity when the extended text is clicked
-		Intent intent2 = new Intent(svc, SUTAgentAndroid.class);
-		PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent2, 0);
-		
-		notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
-				
-		notificationManager.notify(1959, notification);
-		}
-	
-	private void CancelNotification()
-		{
-		NotificationManager notificationManager = (NotificationManager)svc.getSystemService(Context.NOTIFICATION_SERVICE);
-		notificationManager.cancel(1959);
-		}
-	
-	class doCancelNotification implements Runnable
-		{
-		public void run()
-			{
-			CancelNotification();
-			}
-		};
-
-	class doSendNotification implements Runnable
-		{
-		private String sTitle = "";
-		private String sBText = "";
-		
-		doSendNotification(String sTitle, String sBodyText)
-			{
-			this.sTitle = sTitle;
-			this.sBText = sBodyText;
-			}
-
-		public void run() 
-			{
-			SendNotification(sTitle, sBText);
-			}
-		};
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.mozilla.SUTAgentAndroid.R;
+import com.mozilla.SUTAgentAndroid.SUTAgentAndroid;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+
+public class RunCmdThread extends Thread
+    {
+    private ServerSocket SvrSocket = null;
+    private Socket socket    = null;
+    private Handler handler = null;
+    boolean bListening    = true;
+    boolean bNetError = false;
+    List<CmdWorkerThread> theWorkers = new ArrayList<CmdWorkerThread>();
+    android.app.Service    svc = null;
+
+    public RunCmdThread(ServerSocket socket, android.app.Service service, Handler handler)
+        {
+        super("RunCmdThread");
+        this.SvrSocket = socket;
+        this.svc = service;
+        this.handler = handler;
+        }
+
+    public void StopListening()
+        {
+        bListening = false;
+        }
+
+    public void run() {
+        try {
+            int    nIterations = 0;
+
+            SvrSocket.setSoTimeout(5000);
+            while (bListening)
+                {
+                try
+                    {
+                    socket = SvrSocket.accept();
+                    CmdWorkerThread theWorker = new CmdWorkerThread(this, socket);
+                    theWorker.start();
+                    theWorkers.add(theWorker);
+                    }
+                catch (SocketTimeoutException toe)
+                    {
+                    if (++nIterations > 60)
+                        {
+                        nIterations = 0;
+                        String sRet = SendPing("www.mozilla.org");
+                        if (sRet.contains("3 received"))
+                            handler.post(new doCancelNotification());
+                        else
+                            handler.post(new doSendNotification("SUTAgent - Network Connectivity Error", sRet));
+                        sRet = null;
+                        }
+                    continue;
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    continue;
+                    }
+                }
+
+            int nNumWorkers = theWorkers.size();
+            for (int lcv = 0; lcv < nNumWorkers; lcv++)
+                {
+                if (theWorkers.get(lcv).isAlive())
+                    {
+                    theWorkers.get(lcv).StopListening();
+                    while(theWorkers.get(lcv).isAlive())
+                        ;
+                    }
+                }
+
+            theWorkers.clear();
+
+            SvrSocket.close();
+
+            svc.stopSelf();
+
+//            SUTAgentAndroid.me.finish();
+            }
+        catch (IOException e)
+            {
+            e.printStackTrace();
+            }
+        return;
+        }
+
+    private String SendPing(String sIPAddr)
+        {
+        Process    pProc;
+        String sRet = "";
+        String [] theArgs = new String [4];
+        boolean bStillRunning = true;
+        int    nBytesOut = 0;
+        int nBytesErr = 0;
+        int nBytesRead = 0;
+        byte[] buffer = new byte[1024];
+
+        theArgs[0] = "ping";
+        theArgs[1] = "-c";
+        theArgs[2] = "3";
+        theArgs[3] = sIPAddr;
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            InputStream sutOut = pProc.getInputStream();
+            InputStream sutErr = pProc.getErrorStream();
+
+            while (bStillRunning)
+                {
+                try
+                    {
+                    if ((nBytesOut = sutOut.available()) > 0)
+                        {
+                        if (nBytesOut > buffer.length)
+                            {
+                            buffer = null;
+                            System.gc();
+                            buffer = new byte[nBytesOut];
+                            }
+                        nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+                        if (nBytesRead == -1)
+                            bStillRunning = false;
+                        else
+                            {
+                            String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                            sRet += sRep;
+                            sRep = null;
+                            }
+                        }
+
+                    if ((nBytesErr = sutErr.available()) > 0)
+                        {
+                        if (nBytesErr > buffer.length)
+                            {
+                            buffer = null;
+                            System.gc();
+                            buffer = new byte[nBytesErr];
+                            }
+                        nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+                        if (nBytesRead == -1)
+                            bStillRunning = false;
+                        else
+                            {
+                            String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                            sRet += sRep;
+                            sRep = null;
+                            }
+                        }
+
+                    bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    }
+
+                if ((bStillRunning == true) && (nBytesErr == 0) && (nBytesOut == 0))
+                    {
+                    try {
+                        sleep(2000);
+                        }
+                    catch (InterruptedException e) {
+                        e.printStackTrace();
+                        }
+                    }
+                }
+
+            pProc.destroy();
+            pProc = null;
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    private boolean IsProcRunning(Process pProc)
+        {
+        boolean bRet = false;
+        @SuppressWarnings("unused")
+        int nExitCode = 0;
+
+        try
+            {
+            nExitCode = pProc.exitValue();
+            }
+        catch (IllegalThreadStateException z)
+            {
+            bRet = true;
+            }
+        catch (Exception e)
+            {
+            e.printStackTrace();
+            }
+
+        return(bRet);
+        }
+
+    private void SendNotification(String tickerText, String expandedText)
+        {
+        NotificationManager notificationManager = (NotificationManager)svc.getSystemService(Context.NOTIFICATION_SERVICE);
+
+//        int icon = android.R.drawable.stat_notify_more;
+//        int icon = R.drawable.ic_stat_first;
+//        int icon = R.drawable.ic_stat_second;
+//        int icon = R.drawable.ic_stat_neterror;
+        int icon = R.drawable.ateamlogo;
+        long when = System.currentTimeMillis();
+
+        Notification notification = new Notification(icon, tickerText, when);
+
+        notification.flags |= (Notification.FLAG_INSISTENT | Notification.FLAG_AUTO_CANCEL);
+        notification.defaults |= Notification.DEFAULT_SOUND;
+        notification.defaults |= Notification.DEFAULT_VIBRATE;
+        notification.defaults |= Notification.DEFAULT_LIGHTS;
+
+        Context context = svc.getApplicationContext();
+
+        // Intent to launch an activity when the extended text is clicked
+        Intent intent2 = new Intent(svc, SUTAgentAndroid.class);
+        PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent2, 0);
+
+        notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
+
+        notificationManager.notify(1959, notification);
+        }
+
+    private void CancelNotification()
+        {
+        NotificationManager notificationManager = (NotificationManager)svc.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(1959);
+        }
+
+    class doCancelNotification implements Runnable
+        {
+        public void run()
+            {
+            CancelNotification();
+            }
+        };
+
+    class doSendNotification implements Runnable
+        {
+        private String sTitle = "";
+        private String sBText = "";
+
+        doSendNotification(String sTitle, String sBodyText)
+            {
+            this.sTitle = sTitle;
+            this.sBText = sBodyText;
+            }
+
+        public void run()
+            {
+            SendNotification(sTitle, sBText);
+            }
+        };
+}
diff --git a/build/mobile/sutagent/android/RunDataThread.java b/build/mobile/sutagent/android/RunDataThread.java
index dd363a071a7a..a5e290ada74b 100755
--- a/build/mobile/sutagent/android/RunDataThread.java
+++ b/build/mobile/sutagent/android/RunDataThread.java
@@ -1,125 +1,125 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid.service;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-
-public class RunDataThread extends Thread
-	{
-	Timer heartBeatTimer;
-	
-	private ServerSocket SvrSocket = null;
-	private Socket socket	= null;
-	boolean bListening	= true;
-	List<DataWorkerThread> theWorkers = new ArrayList<DataWorkerThread>();
-	android.app.Service	svc = null;
-	
-	public RunDataThread(ServerSocket socket, android.app.Service service)
-		{
-		super("RunDataThread");
-		this.SvrSocket = socket;
-		this.svc = service;
-		}
-	
-	public void StopListening()
-		{
-		bListening = false;
-		}
-	
-	public void SendToDataChannel(String strToSend)
-		{
-		int nNumWorkers = theWorkers.size();
-		for (int lcv = 0; lcv < nNumWorkers; lcv++)
-			{
-			if (theWorkers.get(lcv).isAlive())
-				{
-				theWorkers.get(lcv).SendString(strToSend);
-				}
-			}
-		return;
-		}
-
-	public void run() {
-		try {
-			SvrSocket.setSoTimeout(5000);
-			while (bListening)
-				{
-				try 
-					{
-					socket = SvrSocket.accept();
-					DataWorkerThread theWorker = new DataWorkerThread(this, socket);
-					theWorker.start();
-					theWorkers.add(theWorker);
-					}
-				catch (SocketTimeoutException toe)
-					{
-					continue;
-					}
-				}
-			
-			int nNumWorkers = theWorkers.size();
-			for (int lcv = 0; lcv < nNumWorkers; lcv++)
-				{
-				if (theWorkers.get(lcv).isAlive())
-					{
-					theWorkers.get(lcv).StopListening();
-					while(theWorkers.get(lcv).isAlive())
-						;
-					}
-				}
-			
-			theWorkers.clear();
-			
-			SvrSocket.close();
-
-			svc.stopSelf();
-			}
-		catch (IOException e)
-			{
-//			Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
-			e.printStackTrace();
-			}
-		return;
-		}
-	}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid.service;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+
+public class RunDataThread extends Thread
+    {
+    Timer heartBeatTimer;
+
+    private ServerSocket SvrSocket = null;
+    private Socket socket    = null;
+    boolean bListening    = true;
+    List<DataWorkerThread> theWorkers = new ArrayList<DataWorkerThread>();
+    android.app.Service    svc = null;
+
+    public RunDataThread(ServerSocket socket, android.app.Service service)
+        {
+        super("RunDataThread");
+        this.SvrSocket = socket;
+        this.svc = service;
+        }
+
+    public void StopListening()
+        {
+        bListening = false;
+        }
+
+    public void SendToDataChannel(String strToSend)
+        {
+        int nNumWorkers = theWorkers.size();
+        for (int lcv = 0; lcv < nNumWorkers; lcv++)
+            {
+            if (theWorkers.get(lcv).isAlive())
+                {
+                theWorkers.get(lcv).SendString(strToSend);
+                }
+            }
+        return;
+        }
+
+    public void run() {
+        try {
+            SvrSocket.setSoTimeout(5000);
+            while (bListening)
+                {
+                try
+                    {
+                    socket = SvrSocket.accept();
+                    DataWorkerThread theWorker = new DataWorkerThread(this, socket);
+                    theWorker.start();
+                    theWorkers.add(theWorker);
+                    }
+                catch (SocketTimeoutException toe)
+                    {
+                    continue;
+                    }
+                }
+
+            int nNumWorkers = theWorkers.size();
+            for (int lcv = 0; lcv < nNumWorkers; lcv++)
+                {
+                if (theWorkers.get(lcv).isAlive())
+                    {
+                    theWorkers.get(lcv).StopListening();
+                    while(theWorkers.get(lcv).isAlive())
+                        ;
+                    }
+                }
+
+            theWorkers.clear();
+
+            SvrSocket.close();
+
+            svc.stopSelf();
+            }
+        catch (IOException e)
+            {
+//            Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
+            e.printStackTrace();
+            }
+        return;
+        }
+    }
diff --git a/build/mobile/sutagent/android/SUTAgentAndroid.java b/build/mobile/sutagent/android/SUTAgentAndroid.java
index c54ba3fb8e4f..b1cd070b8a22 100755
--- a/build/mobile/sutagent/android/SUTAgentAndroid.java
+++ b/build/mobile/sutagent/android/SUTAgentAndroid.java
@@ -20,7 +20,7 @@
  *
  * Contributor(s):
  *  Bob Moss <bmoss@mozilla.com>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -75,24 +75,24 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class SUTAgentAndroid extends Activity 
-	{
-	final Handler mHandler = new Handler();
+public class SUTAgentAndroid extends Activity
+    {
+    final Handler mHandler = new Handler();
+
+    public static final int START_PRG = 1959;
+    MenuItem mExitMenuItem;
+    Timer timer = null;
 
-	public static final int START_PRG = 1959;
-	MenuItem mExitMenuItem;
-	Timer timer = null;
-	
     public static String sUniqueID = null;
     public static String sLocalIPAddr = null;
     public static String sACStatus = null;
     public static String sPowerStatus = null;
-    public static int	nChargeLevel = 0;
-    public static int	nBatteryTemp = 0;
-    
-	String lineSep = System.getProperty("line.separator");
+    public static int    nChargeLevel = 0;
+    public static int    nBatteryTemp = 0;
+
+    String lineSep = System.getProperty("line.separator");
     public PrintWriter dataOut = null;
-    
+
     private static boolean bNetworkingStarted = false;
     private static String RegSvrIPAddr = "";
     private static String RegSvrIPPort = "";
@@ -100,51 +100,51 @@ public class SUTAgentAndroid extends Activity
     private static String Pool = "";
     private static String sRegString = "";
     private static String sNTPServer = "";
-    
-    private WifiLock wl = null;
-    
-    private BroadcastReceiver battReceiver = null;
-    
-    private TextView  tv = null;
-    
-	public boolean onCreateOptionsMenu(Menu menu)
-		{
-		mExitMenuItem = menu.add("Exit");
-		mExitMenuItem.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-		return super.onCreateOptionsMenu(menu);
-		}
 
-	public boolean onMenuItemSelected(int featureId, MenuItem item)
-		{
-		if (item == mExitMenuItem)
-			{
-			finish();
-			}
-		return super.onMenuItemSelected(featureId, item);
-		}
-	
-	public static String getRegSvrIPAddr()
-		{
-		return(RegSvrIPAddr);
-		}
-    
+    private WifiLock wl = null;
+
+    private BroadcastReceiver battReceiver = null;
+
+    private TextView  tv = null;
+
+    public boolean onCreateOptionsMenu(Menu menu)
+        {
+        mExitMenuItem = menu.add("Exit");
+        mExitMenuItem.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
+        return super.onCreateOptionsMenu(menu);
+        }
+
+    public boolean onMenuItemSelected(int featureId, MenuItem item)
+        {
+        if (item == mExitMenuItem)
+            {
+            finish();
+            }
+        return super.onMenuItemSelected(featureId, item);
+        }
+
+    public static String getRegSvrIPAddr()
+        {
+        return(RegSvrIPAddr);
+        }
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState)
-    	{
+        {
         super.onCreate(savedInstanceState);
-        
+
         setContentView(R.layout.main);
 
         fixScreenOrientation();
-        
+
         DoCommand dc = new DoCommand(getApplication());
-        
+
         // Get configuration settings from "ini" file
         File dir = getFilesDir();
         File iniFile = new File(dir, "SUTAgent.ini");
         String sIniFile = iniFile.getAbsolutePath();
-        
+
         SUTAgentAndroid.RegSvrIPAddr = dc.GetIniData("Registration Server", "IPAddr", sIniFile);
         SUTAgentAndroid.RegSvrIPPort = dc.GetIniData("Registration Server", "PORT", sIniFile);
         SUTAgentAndroid.HardwareID = dc.GetIniData("Registration Server", "HARDWARE", sIniFile);
@@ -154,79 +154,79 @@ public class SUTAgentAndroid extends Activity
         tv = (TextView) this.findViewById(R.id.Textview01);
 
         if (getLocalIpAddress() == null)
-        	setUpNetwork(sIniFile);
-        
+            setUpNetwork(sIniFile);
+
         WifiInfo wifi;
         WifiManager wifiMan = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         String macAddress = "Unknown";
-        if (wifiMan != null) 
-        	{
-			wifi = wifiMan.getConnectionInfo();
-			if (wifi != null)
-				{
-				macAddress = wifi.getMacAddress();
-				if (macAddress != null)
-					sUniqueID = macAddress;
-				}
-        	}
-        
-        if (sUniqueID == null)
-        	{
-        	BluetoothAdapter ba = BluetoothAdapter.getDefaultAdapter();
-        	if ((ba != null) && (ba.isEnabled() != true))
-        		{
-        		ba.enable();
-        		while(ba.getState() != BluetoothAdapter.STATE_ON)
-        			{
-					try {
-						Thread.sleep(1000);
-						}
-        			catch (InterruptedException e)
-        				{
-						e.printStackTrace();
-        				}
-        			}
-        		
-            	sUniqueID = ba.getAddress();
-            	
-            	ba.disable();
-        		while(ba.getState() != BluetoothAdapter.STATE_OFF)
-    				{
-        			try {
-        				Thread.sleep(1000);
-						}
-        			catch (InterruptedException e)
-    					{
-        				e.printStackTrace();
-    					}
-    				}
-        		}
-        	else
-        		{
-        		if (ba != null)
-        			{
-        			sUniqueID = ba.getAddress();
-        			sUniqueID.toLowerCase();
-        			}
-        		}
-        	}
+        if (wifiMan != null)
+            {
+            wifi = wifiMan.getConnectionInfo();
+            if (wifi != null)
+                {
+                macAddress = wifi.getMacAddress();
+                if (macAddress != null)
+                    sUniqueID = macAddress;
+                }
+            }
 
         if (sUniqueID == null)
-        	{
-        	TelephonyManager mTelephonyMgr = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
-        	if (mTelephonyMgr != null)
-        		{
-        		sUniqueID = mTelephonyMgr.getDeviceId();
-        		if (sUniqueID == null)
-        			{
-        			sUniqueID = "0011223344556677";
-        			}
-        		}
-        	}
-        
+            {
+            BluetoothAdapter ba = BluetoothAdapter.getDefaultAdapter();
+            if ((ba != null) && (ba.isEnabled() != true))
+                {
+                ba.enable();
+                while(ba.getState() != BluetoothAdapter.STATE_ON)
+                    {
+                    try {
+                        Thread.sleep(1000);
+                        }
+                    catch (InterruptedException e)
+                        {
+                        e.printStackTrace();
+                        }
+                    }
+
+                sUniqueID = ba.getAddress();
+
+                ba.disable();
+                while(ba.getState() != BluetoothAdapter.STATE_OFF)
+                    {
+                    try {
+                        Thread.sleep(1000);
+                        }
+                    catch (InterruptedException e)
+                        {
+                        e.printStackTrace();
+                        }
+                    }
+                }
+            else
+                {
+                if (ba != null)
+                    {
+                    sUniqueID = ba.getAddress();
+                    sUniqueID.toLowerCase();
+                    }
+                }
+            }
+
+        if (sUniqueID == null)
+            {
+            TelephonyManager mTelephonyMgr = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+            if (mTelephonyMgr != null)
+                {
+                sUniqueID = mTelephonyMgr.getDeviceId();
+                if (sUniqueID == null)
+                    {
+                    sUniqueID = "0011223344556677";
+                    }
+                }
+            }
+
         sLocalIPAddr = getLocalIpAddress();
         Toast.makeText(getApplication().getApplicationContext(), "SUTAgent [" + sLocalIPAddr + "] ...", Toast.LENGTH_LONG).show();
-        
+
         String sConfig = "Unique ID: " + sUniqueID + lineSep;
         sConfig += "OS Info" + lineSep;
         sConfig += "\t" + dc.GetOSInfo() + lineSep;
@@ -241,7 +241,7 @@ public class SUTAgentAndroid extends Activity
         sConfig += "\tIP Address: " + sLocalIPAddr + lineSep;
 
         displayStatus(sConfig);
-        
+
         sRegString = "NAME=" + sUniqueID;
         sRegString += "&IPADDR=" + sLocalIPAddr;
         sRegString += "&CMDPORT=" + 20701;
@@ -253,451 +253,451 @@ public class SUTAgentAndroid extends Activity
         sRegString += "&MEMORY=" + dc.GetMemoryConfig();
         sRegString += "&HARDWARE=" + HardwareID;
         sRegString += "&POOL=" + Pool;
-        
+
         String sTemp = Uri.encode(sRegString,"=&");
         sRegString = "register " + sTemp;
 
         if (!bNetworkingStarted)
-        	{
-        	Thread thread = new Thread(null, doStartService, "StartServiceBkgnd");
-        	thread.start();
-        	bNetworkingStarted = true;
-        	
-        	Thread thread2 = new Thread(null, doRegisterDevice, "RegisterDeviceBkgnd");
-        	thread2.start();
-        	}
-        
+            {
+            Thread thread = new Thread(null, doStartService, "StartServiceBkgnd");
+            thread.start();
+            bNetworkingStarted = true;
+
+            Thread thread2 = new Thread(null, doRegisterDevice, "RegisterDeviceBkgnd");
+            thread2.start();
+            }
+
         monitorBatteryState();
-        
-    	// If we are returning from an update let'em know we're back
-    	Thread thread3 = new Thread(null, doUpdateCallback, "UpdateCallbackBkgnd");
-    	thread3.start();
-    	
-    	if (SUTAgentAndroid.sNTPServer.length() > 0) {
-        	Thread thread4 = new Thread(null, doSetClock, "SetClockBkgrnd");
-        	thread4.start();
-    	}
-    	
+
+        // If we are returning from an update let'em know we're back
+        Thread thread3 = new Thread(null, doUpdateCallback, "UpdateCallbackBkgnd");
+        thread3.start();
+
+        if (SUTAgentAndroid.sNTPServer.length() > 0) {
+            Thread thread4 = new Thread(null, doSetClock, "SetClockBkgrnd");
+            thread4.start();
+        }
+
         final Button goButton = (Button) findViewById(R.id.Button01);
         goButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-    			finish();
+                finish();
                 }
-        	});
+            });
         }
-    
+
     private class UpdateStatus implements Runnable {
-    	public String sText = "";
-    	
-    	UpdateStatus(String sStatus) {
-    		sText = sStatus;
-    	}
-    	
-		@Override
-		public void run() {
-			displayStatus(sText);
-		}
+        public String sText = "";
+
+        UpdateStatus(String sStatus) {
+            sText = sStatus;
+        }
+
+        @Override
+        public void run() {
+            displayStatus(sText);
+        }
     }
- 
+
     public synchronized void displayStatus(String sStatus) {
-    	String sTVText = (String) tv.getText();
-    	sTVText += sStatus;
-    	tv.setText(sTVText);
+        String sTVText = (String) tv.getText();
+        sTVText += sStatus;
+        tv.setText(sTVText);
     }
-    
+
     public void fixScreenOrientation()
-    	{
-    	setRequestedOrientation((getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) ?
-    							ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);    	
-    	}
-    
+        {
+        setRequestedOrientation((getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) ?
+                                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+
     protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    	{
+        {
         if (requestCode == START_PRG)
-        	{
-           	Toast.makeText(getApplication().getApplicationContext(), "SUTAgent startprg finished ...", Toast.LENGTH_LONG).show();
-        	}
-    	}
-    
+            {
+               Toast.makeText(getApplication().getApplicationContext(), "SUTAgent startprg finished ...", Toast.LENGTH_LONG).show();
+            }
+        }
+
     @Override
     public void onDestroy()
-    	{
-		super.onDestroy();
-    	if (isFinishing())
-    		{
-    		Intent listenerSvc = new Intent(this, ASMozStub.class);
-    		listenerSvc.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
-    		stopService(listenerSvc);
-    		bNetworkingStarted = false;
-    		
-			unregisterReceiver(battReceiver);
-	        
-	    	if (wl != null)
-	    		wl.release();
-	    	
-	    	System.exit(0);
-    		}
-    	}
-    
-    private void monitorBatteryState() 
-    	{
-		battReceiver = new BroadcastReceiver()
-			{
-			public void onReceive(Context context, Intent intent)
-				{
-				StringBuilder sb = new StringBuilder();
+        {
+        super.onDestroy();
+        if (isFinishing())
+            {
+            Intent listenerSvc = new Intent(this, ASMozStub.class);
+            listenerSvc.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
+            stopService(listenerSvc);
+            bNetworkingStarted = false;
 
-				int rawlevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); // charge level from 0 to scale inclusive
-				int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); // Max value for charge level
-				int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
-				int health = intent.getIntExtra(BatteryManager.EXTRA_HEALTH, -1);
-				boolean present = intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);
-				int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); //0 if the device is not plugged in; 1 if plugged into an AC power adapter; 2 if plugged in via USB.
-//				int voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1); // voltage in millivolts
-				nBatteryTemp = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1); // current battery temperature in tenths of a degree Centigrade
-//				String technology = intent.getStringExtra(BatteryManager.EXTRA_TECHNOLOGY);
+            unregisterReceiver(battReceiver);
+
+            if (wl != null)
+                wl.release();
+
+            System.exit(0);
+            }
+        }
+
+    private void monitorBatteryState()
+        {
+        battReceiver = new BroadcastReceiver()
+            {
+            public void onReceive(Context context, Intent intent)
+                {
+                StringBuilder sb = new StringBuilder();
+
+                int rawlevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); // charge level from 0 to scale inclusive
+                int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); // Max value for charge level
+                int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+                int health = intent.getIntExtra(BatteryManager.EXTRA_HEALTH, -1);
+                boolean present = intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);
+                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); //0 if the device is not plugged in; 1 if plugged into an AC power adapter; 2 if plugged in via USB.
+//                int voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1); // voltage in millivolts
+                nBatteryTemp = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1); // current battery temperature in tenths of a degree Centigrade
+//                String technology = intent.getStringExtra(BatteryManager.EXTRA_TECHNOLOGY);
+
+                nChargeLevel = -1;  // percentage, or -1 for unknown
+                if (rawlevel >= 0 && scale > 0)
+                    {
+                    nChargeLevel = (rawlevel * 100) / scale;
+                    }
+
+                if (plugged > 0)
+                    sACStatus = "ONLINE";
+                else
+                    sACStatus = "OFFLINE";
+
+                if (present == false)
+                    sb.append("NO BATTERY");
+                else
+                    {
+                    if (nChargeLevel < 10)
+                        sb.append("Critical");
+                    else if (nChargeLevel < 33)
+                        sb.append("LOW");
+                    else if (nChargeLevel > 80)
+                        sb.append("HIGH");
+                    }
+
+                if (BatteryManager.BATTERY_HEALTH_OVERHEAT == health)
+                    {
+                    sb.append("Overheated ");
+                    sb.append((((float)(nBatteryTemp))/10));
+                    sb.append("(C)");
+                    }
+                else
+                    {
+                    switch(status)
+                        {
+                        case BatteryManager.BATTERY_STATUS_UNKNOWN:
+                            // old emulator; maybe also when plugged in with no battery
+                            if (present == true)
+                                sb.append(" UNKNOWN");
+                            break;
+                        case BatteryManager.BATTERY_STATUS_CHARGING:
+                            sb.append(" CHARGING");
+                            break;
+                        case BatteryManager.BATTERY_STATUS_DISCHARGING:
+                            sb.append(" DISCHARGING");
+                            break;
+                        case BatteryManager.BATTERY_STATUS_NOT_CHARGING:
+                            sb.append(" NOTCHARGING");
+                            break;
+                        case BatteryManager.BATTERY_STATUS_FULL:
+                            sb.append(" FULL");
+                            break;
+                        default:
+                            if (present == true)
+                                sb.append("Unknown");
+                            break;
+                        }
+                    }
+
+                sPowerStatus = sb.toString();
+                }
+            };
+
+        IntentFilter battFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        registerReceiver(battReceiver, battFilter);
+        }
 
-				nChargeLevel = -1;  // percentage, or -1 for unknown
-				if (rawlevel >= 0 && scale > 0)
-					{
-					nChargeLevel = (rawlevel * 100) / scale;
-					}
-				
-				if (plugged > 0)
-					sACStatus = "ONLINE";
-				else
-					sACStatus = "OFFLINE";
-				
-				if (present == false)
-					sb.append("NO BATTERY");
-				else
-					{
-					if (nChargeLevel < 10)
-						sb.append("Critical");
-					else if (nChargeLevel < 33)
-						sb.append("LOW");
-					else if (nChargeLevel > 80)
-						sb.append("HIGH");
-					}
-				
-				if (BatteryManager.BATTERY_HEALTH_OVERHEAT == health)
-					{
-					sb.append("Overheated ");
-					sb.append((((float)(nBatteryTemp))/10));
-					sb.append("(C)");
-					}
-				else
-					{
-					switch(status)
-						{
-						case BatteryManager.BATTERY_STATUS_UNKNOWN:
-							// old emulator; maybe also when plugged in with no battery
-							if (present == true)
-								sb.append(" UNKNOWN");
-							break;
-						case BatteryManager.BATTERY_STATUS_CHARGING:
-							sb.append(" CHARGING");
-							break;
-						case BatteryManager.BATTERY_STATUS_DISCHARGING:
-							sb.append(" DISCHARGING");
-							break;
-						case BatteryManager.BATTERY_STATUS_NOT_CHARGING:
-							sb.append(" NOTCHARGING");
-							break;
-						case BatteryManager.BATTERY_STATUS_FULL:
-							sb.append(" FULL");
-							break;
-						default:
-							if (present == true)
-								sb.append("Unknown");
-							break;
-						}
-					}
-				
-				sPowerStatus = sb.toString();
-				}
-			};
-			
-		IntentFilter battFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
-		registerReceiver(battReceiver, battFilter);
-    	}
- 
     public boolean setUpNetwork(String sIniFile)
-    	{
-    	boolean	bRet = false;
-    	int	lcv	= 0;
-    	int	lcv2 = 0;
-    	WifiManager wifi = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-    	WifiConfiguration wc = new WifiConfiguration();
-    	DoCommand tmpdc = new DoCommand(getApplication());
-    	
-    	String ssid = tmpdc.GetIniData("Network Settings", "SSID", sIniFile);
-    	String auth = tmpdc.GetIniData("Network Settings", "AUTH", sIniFile);
-    	String encr = tmpdc.GetIniData("Network Settings", "ENCR", sIniFile);
-    	String key = tmpdc.GetIniData("Network Settings", "KEY", sIniFile);
-    	String eap = tmpdc.GetIniData("Network Settings", "EAP", sIniFile);
-    	String adhoc = tmpdc.GetIniData("Network Settings", "ADHOC", sIniFile);
-    	
-		Toast.makeText(getApplication().getApplicationContext(), "Starting and configuring network", Toast.LENGTH_LONG).show();
-/*		
-		ContentResolver cr = getContentResolver();
-		int nRet;
-		try {
-			nRet = Settings.System.getInt(cr, Settings.System.WIFI_USE_STATIC_IP);
-			String foo2 = "" + nRet;
-		} catch (SettingNotFoundException e1) {
-			e1.printStackTrace();
-		}
+        {
+        boolean    bRet = false;
+        int    lcv    = 0;
+        int    lcv2 = 0;
+        WifiManager wifi = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        WifiConfiguration wc = new WifiConfiguration();
+        DoCommand tmpdc = new DoCommand(getApplication());
+
+        String ssid = tmpdc.GetIniData("Network Settings", "SSID", sIniFile);
+        String auth = tmpdc.GetIniData("Network Settings", "AUTH", sIniFile);
+        String encr = tmpdc.GetIniData("Network Settings", "ENCR", sIniFile);
+        String key = tmpdc.GetIniData("Network Settings", "KEY", sIniFile);
+        String eap = tmpdc.GetIniData("Network Settings", "EAP", sIniFile);
+        String adhoc = tmpdc.GetIniData("Network Settings", "ADHOC", sIniFile);
+
+        Toast.makeText(getApplication().getApplicationContext(), "Starting and configuring network", Toast.LENGTH_LONG).show();
+/*
+        ContentResolver cr = getContentResolver();
+        int nRet;
+        try {
+            nRet = Settings.System.getInt(cr, Settings.System.WIFI_USE_STATIC_IP);
+            String foo2 = "" + nRet;
+        } catch (SettingNotFoundException e1) {
+            e1.printStackTrace();
+        }
 */
-/*    	
-    	wc.SSID = "\"Mozilla-Build\"";
-    	wc.preSharedKey  = "\"MozillaBuildQA500\"";
-    	wc.hiddenSSID = true;
-    	wc.status = WifiConfiguration.Status.ENABLED;    
-    	wc.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
-    	wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
-    	wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
-    	wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-    	wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
-    	wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
-    	wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
-*/    	
-		wc.SSID = "\"" + ssid + "\"";
-//    	wc.SSID = "\"Mozilla-G\"";
-//    	wc.SSID = "\"Mozilla\"";
-		
-		if (auth.contentEquals("wpa2"))
-			{
-	    	wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
-			wc.preSharedKey  = null;
-			}
-		
-		if (encr.contentEquals("aes"))
-			{
-	    	wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
-	    	wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
-			}
-		
-		if (eap.contentEquals("peap"))
-			{
-	    	wc.eap.setValue("PEAP");
-	    	wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
-	    	wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);
-			}
-		
-    	wc.hiddenSSID = false;
-    	wc.status = WifiConfiguration.Status.ENABLED;
-    	
-    	wc.password.setValue("\"password\"");
-    	wc.identity.setValue("\"bmoss@mozilla.com\"");
-    	
-    	if (!wifi.isWifiEnabled())
-    		wifi.setWifiEnabled(true);
-    	
-    	while(wifi.getWifiState() != WifiManager.WIFI_STATE_ENABLED)
-    		{
-    		Thread.yield();
-    		if (++lcv > 10000)
-    			return(bRet);
-    		}
-    	
-    	wl = wifi.createWifiLock(WifiManager.WIFI_MODE_FULL, "SUTAgent");
-    	if (wl != null)
-    		wl.acquire();
-    	
-    	WifiConfiguration	foo = null;
-    	int					nNetworkID = -1;
-    	
-    	List<WifiConfiguration> connsLst =  wifi.getConfiguredNetworks();
-    	int nConns = connsLst.size();
-    	for (int i = 0; i < nConns; i++)
-    		{
-    		
-    		foo = connsLst.get(i);
-    		if (foo.SSID.equalsIgnoreCase(wc.SSID))
-    			{
-    			nNetworkID = foo.networkId;
-    			wc.networkId = foo.networkId;
-    			break;
-    			}
-    		}
-    	
-    	int res;
-    	
-    	if (nNetworkID != -1)
-    		{
-    		res = wifi.updateNetwork(wc);
-    		}
-    	else
-    		{
-        	res = wifi.addNetwork(wc);
-    		}
-    		
-    	Log.d("WifiPreference", "add Network returned " + res );
-    	
-    	boolean b = wifi.enableNetwork(res, true);        
-    	Log.d("WifiPreference", "enableNetwork returned " + b );
-    	
-    	wifi.saveConfiguration();
-    	
-    	WifiInfo wi = wifi.getConnectionInfo();
-    	SupplicantState ss = wi.getSupplicantState();
-    	
-    	lcv = 0;
-    	lcv2 = 0;
-    	
-    	while (ss.compareTo(SupplicantState.COMPLETED) != 0)
-    		{
-    		try {
-				Thread.sleep(1000);
-				}
-    		catch (InterruptedException e)
-    			{
-				e.printStackTrace();
-    			}
-    		
-    		if (wi != null)
-    			wi = null;
-    		if (ss != null)
-    			ss = null;
-    		wi = wifi.getConnectionInfo();
-    		ss = wi.getSupplicantState();
-    		if (++lcv > 60)
-    			{
-    			if (++lcv2 > 5)
-    				{
-    				Toast.makeText(getApplication().getApplicationContext(), "Unable to start and configure network", Toast.LENGTH_LONG).show();
-    				return(bRet);
-    				}
-    			else
-    				{
-    				Toast.makeText(getApplication().getApplicationContext(), "Resetting wifi interface", Toast.LENGTH_LONG).show();
-    		    	if (wl != null)
-    		    		wl.release();
-    	    		wifi.setWifiEnabled(false);
-    	        	while(wifi.getWifiState() != WifiManager.WIFI_STATE_DISABLED)
-    	    			{
-    	        		Thread.yield();
-    	    			}
-    	        	
-    	    		wifi.setWifiEnabled(true);
-    	        	while(wifi.getWifiState() != WifiManager.WIFI_STATE_ENABLED)
-	    				{
-    	        		Thread.yield();
-	    				}
-    	        	b = wifi.enableNetwork(res, true);        
-    	        	Log.d("WifiPreference", "enableNetwork returned " + b );
-    	        	if (wl != null)
-    	        		wl.acquire();
-    	    		lcv = 0;
-    				}
-    			}
-    		}
-    	
-    	lcv = 0;
-    	while(getLocalIpAddress() == null)
-    		{
-    		if (++lcv > 10000)
-    			return(bRet);
-    		}
-    	
-		Toast.makeText(getApplication().getApplicationContext(), "Network started and configured", Toast.LENGTH_LONG).show();
-    	bRet = true;
-    	
-    	return(bRet);
-    	}
+/*
+        wc.SSID = "\"Mozilla-Build\"";
+        wc.preSharedKey  = "\"MozillaBuildQA500\"";
+        wc.hiddenSSID = true;
+        wc.status = WifiConfiguration.Status.ENABLED;
+        wc.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
+        wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+        wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+        wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+        wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
+        wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+        wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
+*/
+        wc.SSID = "\"" + ssid + "\"";
+//        wc.SSID = "\"Mozilla-G\"";
+//        wc.SSID = "\"Mozilla\"";
+
+        if (auth.contentEquals("wpa2"))
+            {
+            wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
+            wc.preSharedKey  = null;
+            }
+
+        if (encr.contentEquals("aes"))
+            {
+            wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+            wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+            }
+
+        if (eap.contentEquals("peap"))
+            {
+            wc.eap.setValue("PEAP");
+            wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
+            wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);
+            }
+
+        wc.hiddenSSID = false;
+        wc.status = WifiConfiguration.Status.ENABLED;
+
+        wc.password.setValue("\"password\"");
+        wc.identity.setValue("\"bmoss@mozilla.com\"");
+
+        if (!wifi.isWifiEnabled())
+            wifi.setWifiEnabled(true);
+
+        while(wifi.getWifiState() != WifiManager.WIFI_STATE_ENABLED)
+            {
+            Thread.yield();
+            if (++lcv > 10000)
+                return(bRet);
+            }
+
+        wl = wifi.createWifiLock(WifiManager.WIFI_MODE_FULL, "SUTAgent");
+        if (wl != null)
+            wl.acquire();
+
+        WifiConfiguration    foo = null;
+        int                    nNetworkID = -1;
+
+        List<WifiConfiguration> connsLst =  wifi.getConfiguredNetworks();
+        int nConns = connsLst.size();
+        for (int i = 0; i < nConns; i++)
+            {
+
+            foo = connsLst.get(i);
+            if (foo.SSID.equalsIgnoreCase(wc.SSID))
+                {
+                nNetworkID = foo.networkId;
+                wc.networkId = foo.networkId;
+                break;
+                }
+            }
+
+        int res;
+
+        if (nNetworkID != -1)
+            {
+            res = wifi.updateNetwork(wc);
+            }
+        else
+            {
+            res = wifi.addNetwork(wc);
+            }
+
+        Log.d("WifiPreference", "add Network returned " + res );
+
+        boolean b = wifi.enableNetwork(res, true);
+        Log.d("WifiPreference", "enableNetwork returned " + b );
+
+        wifi.saveConfiguration();
+
+        WifiInfo wi = wifi.getConnectionInfo();
+        SupplicantState ss = wi.getSupplicantState();
+
+        lcv = 0;
+        lcv2 = 0;
+
+        while (ss.compareTo(SupplicantState.COMPLETED) != 0)
+            {
+            try {
+                Thread.sleep(1000);
+                }
+            catch (InterruptedException e)
+                {
+                e.printStackTrace();
+                }
+
+            if (wi != null)
+                wi = null;
+            if (ss != null)
+                ss = null;
+            wi = wifi.getConnectionInfo();
+            ss = wi.getSupplicantState();
+            if (++lcv > 60)
+                {
+                if (++lcv2 > 5)
+                    {
+                    Toast.makeText(getApplication().getApplicationContext(), "Unable to start and configure network", Toast.LENGTH_LONG).show();
+                    return(bRet);
+                    }
+                else
+                    {
+                    Toast.makeText(getApplication().getApplicationContext(), "Resetting wifi interface", Toast.LENGTH_LONG).show();
+                    if (wl != null)
+                        wl.release();
+                    wifi.setWifiEnabled(false);
+                    while(wifi.getWifiState() != WifiManager.WIFI_STATE_DISABLED)
+                        {
+                        Thread.yield();
+                        }
+
+                    wifi.setWifiEnabled(true);
+                    while(wifi.getWifiState() != WifiManager.WIFI_STATE_ENABLED)
+                        {
+                        Thread.yield();
+                        }
+                    b = wifi.enableNetwork(res, true);
+                    Log.d("WifiPreference", "enableNetwork returned " + b );
+                    if (wl != null)
+                        wl.acquire();
+                    lcv = 0;
+                    }
+                }
+            }
+
+        lcv = 0;
+        while(getLocalIpAddress() == null)
+            {
+            if (++lcv > 10000)
+                return(bRet);
+            }
+
+        Toast.makeText(getApplication().getApplicationContext(), "Network started and configured", Toast.LENGTH_LONG).show();
+        bRet = true;
+
+        return(bRet);
+        }
 
     // If there is an update.info file callback the server and send the status
     private Runnable doUpdateCallback = new Runnable() {
-    	public void run() {
-    		DoCommand dc = new DoCommand(getApplication());
-    		String sRet = dc.UpdateCallBack("update.info");
-    		if (sRet.length() > 0) {
-        		if (sRet.contains("ok")) {
-        			sRet = "Callback Server contacted successfully" + lineSep;
-    			} else if (sRet.contains("Nothing to do")) {
-    				sRet = "";
-    			} else {
-    				sRet = "Callback Server NOT contacted successfully" + lineSep;
-    			}
-    		}
+        public void run() {
+            DoCommand dc = new DoCommand(getApplication());
+            String sRet = dc.UpdateCallBack("update.info");
+            if (sRet.length() > 0) {
+                if (sRet.contains("ok")) {
+                    sRet = "Callback Server contacted successfully" + lineSep;
+                } else if (sRet.contains("Nothing to do")) {
+                    sRet = "";
+                } else {
+                    sRet = "Callback Server NOT contacted successfully" + lineSep;
+                }
+            }
             if (sRet.length() > 0)
-            	mHandler.post(new UpdateStatus(sRet));
+                mHandler.post(new UpdateStatus(sRet));
             dc = null;
-    	}
+        }
     };
-    
+
     private Runnable doSetClock = new Runnable() {
-    	public void run() {
-			String sRet = "";
+        public void run() {
+            String sRet = "";
 
-    		DoCommand dc = new DoCommand(getApplication());
+            DoCommand dc = new DoCommand(getApplication());
+
+            sRet = dc.SetSystemTime(sNTPServer, null, null);
+
+               mHandler.post(new UpdateStatus(sRet));
 
-    		sRet = dc.SetSystemTime(sNTPServer, null, null);
-    		
-           	mHandler.post(new UpdateStatus(sRet));
-           	
             dc = null;
-    	}
+        }
     };
-    
+
     // registers with the reg server defined in the SUTAgent.ini file
     private Runnable doRegisterDevice = new Runnable() {
-    	public void run() {
-    		DoCommand dc = new DoCommand(getApplication());
-    		String sRet = "";
-        	if (RegSvrIPAddr.length() > 0) {
-        		String sRegRet = dc.RegisterTheDevice(RegSvrIPAddr, RegSvrIPPort, sRegString);
-        		if (sRegRet.contains("ok")) {
-        			sRet += "Registered with testserver" + lineSep;
-        			sRet += "\tIPAddress: " + RegSvrIPAddr + lineSep;
-        			if (RegSvrIPPort.length() > 0)
-        				sRet += "\tPort: " + RegSvrIPPort + lineSep;
-    			} else {
-    				sRet += "Not registered with testserver" + lineSep;
-    			}
-    		} else {
-    			sRet += "Not registered with testserver" + lineSep;
-    		}
-        	
+        public void run() {
+            DoCommand dc = new DoCommand(getApplication());
+            String sRet = "";
+            if (RegSvrIPAddr.length() > 0) {
+                String sRegRet = dc.RegisterTheDevice(RegSvrIPAddr, RegSvrIPPort, sRegString);
+                if (sRegRet.contains("ok")) {
+                    sRet += "Registered with testserver" + lineSep;
+                    sRet += "\tIPAddress: " + RegSvrIPAddr + lineSep;
+                    if (RegSvrIPPort.length() > 0)
+                        sRet += "\tPort: " + RegSvrIPPort + lineSep;
+                } else {
+                    sRet += "Not registered with testserver" + lineSep;
+                }
+            } else {
+                sRet += "Not registered with testserver" + lineSep;
+            }
+
         if (sRet.length() > 0)
-        	mHandler.post(new UpdateStatus(sRet));
+            mHandler.post(new UpdateStatus(sRet));
         dc = null;
-    	}
+        }
     };
-    
+
     // this starts the listener service for the command and data channels
     private Runnable doStartService = new Runnable()
-    	{
-    	public void run()
-    		{
-			Intent listenerService = new Intent();
-			listenerService.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
-			startService(listenerService);
-    		}
-    	};
-	
+        {
+        public void run()
+            {
+            Intent listenerService = new Intent();
+            listenerService.setAction("com.mozilla.SUTAgentAndroid.service.LISTENER_SERVICE");
+            startService(listenerService);
+            }
+        };
+
     public String getLocalIpAddress()
-		{
-		try
-    		{
-			for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) 
-        		{
-				NetworkInterface intf = en.nextElement();
-				for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) 
-            		{
-					InetAddress inetAddress = enumIpAddr.nextElement();
-					if (!inetAddress.isLoopbackAddress()) 
-                		{
-						return inetAddress.getHostAddress().toString();
-                		}
-            		}
-        		}
-    		} 
-		catch (SocketException ex)
-    		{
-			Toast.makeText(getApplication().getApplicationContext(), ex.toString(), Toast.LENGTH_LONG).show();
-    		}
-		return null;
-		}
+        {
+        try
+            {
+            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();)
+                {
+                NetworkInterface intf = en.nextElement();
+                for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();)
+                    {
+                    InetAddress inetAddress = enumIpAddr.nextElement();
+                    if (!inetAddress.isLoopbackAddress())
+                        {
+                        return inetAddress.getHostAddress().toString();
+                        }
+                    }
+                }
+            }
+        catch (SocketException ex)
+            {
+            Toast.makeText(getApplication().getApplicationContext(), ex.toString(), Toast.LENGTH_LONG).show();
+            }
+        return null;
+        }
 }
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/SUTStartupIntentReceiver.java b/build/mobile/sutagent/android/SUTStartupIntentReceiver.java
index a60bf05b56dd..c9a73d13a046 100755
--- a/build/mobile/sutagent/android/SUTStartupIntentReceiver.java
+++ b/build/mobile/sutagent/android/SUTStartupIntentReceiver.java
@@ -1,53 +1,53 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.SUTAgentAndroid;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class SUTStartupIntentReceiver extends BroadcastReceiver
-{
-	@Override
-	public void onReceive(Context context, Intent intent)
-		{
-		Intent mySUTAgentIntent = new Intent(context, SUTAgentAndroid.class);
-		mySUTAgentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);  
-		context.startActivity(mySUTAgentIntent);
-		}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.SUTAgentAndroid;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class SUTStartupIntentReceiver extends BroadcastReceiver
+{
+    @Override
+    public void onReceive(Context context, Intent intent)
+        {
+        Intent mySUTAgentIntent = new Intent(context, SUTAgentAndroid.class);
+        mySUTAgentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(mySUTAgentIntent);
+        }
+}

From 80e8072f9231bd4eeb5487f668d5a5ce540c61c6 Mon Sep 17 00:00:00 2001
From: Bob Moss <bmoss@mozilla.com>
Date: Mon, 18 Apr 2011 11:55:24 -0700
Subject: [PATCH 225/509] Bug 650110 Update SUTAgent - adding in fencp, ffxcp,
 watcher code r=ctalbert

---
 build/Makefile.in                             |   6 +-
 .../android/fencp/AndroidManifest.xml         |  22 +
 .../sutagent/android/fencp/DirCursor.java     | 175 ++++
 .../mobile/sutagent/android/fencp/FenCP.java  |  13 +
 .../sutagent/android/fencp/FenCPFP.java       | 190 ++++
 .../sutagent/android/fencp/FileCursor.java    | 166 ++++
 .../mobile/sutagent/android/fencp/Makefile.in | 103 ++
 build/mobile/sutagent/android/fencp/R.java    |  23 +
 .../sutagent/android/fencp/default.properties |  11 +
 .../android/fencp/res/drawable-hdpi/icon.png  | Bin 0 -> 4147 bytes
 .../android/fencp/res/drawable-ldpi/icon.png  | Bin 0 -> 1723 bytes
 .../android/fencp/res/drawable-mdpi/icon.png  | Bin 0 -> 2574 bytes
 .../android/fencp/res/layout/main.xml         |  12 +
 .../android/fencp/res/values/strings.xml      |   5 +
 .../android/ffxcp/AndroidManifest.xml         |  22 +
 .../sutagent/android/ffxcp/DirCursor.java     | 175 ++++
 .../sutagent/android/ffxcp/FfxCPFP.java       | 190 ++++
 .../sutagent/android/ffxcp/FileCursor.java    | 167 ++++
 .../mobile/sutagent/android/ffxcp/Makefile.in | 103 ++
 build/mobile/sutagent/android/ffxcp/R.java    |  23 +
 .../sutagent/android/ffxcp/default.properties |  11 +
 .../mobile/sutagent/android/ffxcp/ffxcp.java  |  13 +
 .../android/ffxcp/res/drawable-hdpi/icon.png  | Bin 0 -> 4147 bytes
 .../android/ffxcp/res/drawable-ldpi/icon.png  | Bin 0 -> 1723 bytes
 .../android/ffxcp/res/drawable-mdpi/icon.png  | Bin 0 -> 2574 bytes
 .../android/ffxcp/res/layout/main.xml         |  12 +
 .../android/ffxcp/res/values/strings.xml      |   5 +
 .../android/watcher/AndroidManifest.xml       |  38 +
 .../android/watcher/IWatcherService.java      | 104 ++
 .../sutagent/android/watcher/Makefile.in      | 107 ++
 build/mobile/sutagent/android/watcher/R.java  |  25 +
 .../android/watcher/RedirOutputThread.java    | 164 ++++
 .../sutagent/android/watcher/WatcherMain.java |  13 +
 .../android/watcher/WatcherReceiver.java      |  19 +
 .../android/watcher/WatcherService.java       | 914 ++++++++++++++++++
 .../android/watcher/default.properties        |  11 +
 .../watcher/res/drawable-hdpi/ateamlogo.png   | Bin 0 -> 1512 bytes
 .../watcher/res/drawable-hdpi/icon.png        | Bin 0 -> 4147 bytes
 .../watcher/res/drawable-ldpi/ateamlogo.png   | Bin 0 -> 1512 bytes
 .../watcher/res/drawable-ldpi/icon.png        | Bin 0 -> 1723 bytes
 .../watcher/res/drawable-mdpi/ateamlogo.png   | Bin 0 -> 1512 bytes
 .../watcher/res/drawable-mdpi/icon.png        | Bin 0 -> 2574 bytes
 .../android/watcher/res/layout/main.xml       |  12 +
 .../android/watcher/res/values/strings.xml    |   7 +
 testing/testsuite-targets.mk                  |   3 +
 45 files changed, 2863 insertions(+), 1 deletion(-)
 create mode 100644 build/mobile/sutagent/android/fencp/AndroidManifest.xml
 create mode 100644 build/mobile/sutagent/android/fencp/DirCursor.java
 create mode 100644 build/mobile/sutagent/android/fencp/FenCP.java
 create mode 100644 build/mobile/sutagent/android/fencp/FenCPFP.java
 create mode 100644 build/mobile/sutagent/android/fencp/FileCursor.java
 create mode 100644 build/mobile/sutagent/android/fencp/Makefile.in
 create mode 100644 build/mobile/sutagent/android/fencp/R.java
 create mode 100644 build/mobile/sutagent/android/fencp/default.properties
 create mode 100644 build/mobile/sutagent/android/fencp/res/drawable-hdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/fencp/res/drawable-ldpi/icon.png
 create mode 100644 build/mobile/sutagent/android/fencp/res/drawable-mdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/fencp/res/layout/main.xml
 create mode 100644 build/mobile/sutagent/android/fencp/res/values/strings.xml
 create mode 100644 build/mobile/sutagent/android/ffxcp/AndroidManifest.xml
 create mode 100644 build/mobile/sutagent/android/ffxcp/DirCursor.java
 create mode 100644 build/mobile/sutagent/android/ffxcp/FfxCPFP.java
 create mode 100644 build/mobile/sutagent/android/ffxcp/FileCursor.java
 create mode 100644 build/mobile/sutagent/android/ffxcp/Makefile.in
 create mode 100644 build/mobile/sutagent/android/ffxcp/R.java
 create mode 100644 build/mobile/sutagent/android/ffxcp/default.properties
 create mode 100644 build/mobile/sutagent/android/ffxcp/ffxcp.java
 create mode 100644 build/mobile/sutagent/android/ffxcp/res/drawable-hdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/ffxcp/res/drawable-ldpi/icon.png
 create mode 100644 build/mobile/sutagent/android/ffxcp/res/drawable-mdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/ffxcp/res/layout/main.xml
 create mode 100644 build/mobile/sutagent/android/ffxcp/res/values/strings.xml
 create mode 100644 build/mobile/sutagent/android/watcher/AndroidManifest.xml
 create mode 100644 build/mobile/sutagent/android/watcher/IWatcherService.java
 create mode 100644 build/mobile/sutagent/android/watcher/Makefile.in
 create mode 100644 build/mobile/sutagent/android/watcher/R.java
 create mode 100644 build/mobile/sutagent/android/watcher/RedirOutputThread.java
 create mode 100644 build/mobile/sutagent/android/watcher/WatcherMain.java
 create mode 100644 build/mobile/sutagent/android/watcher/WatcherReceiver.java
 create mode 100644 build/mobile/sutagent/android/watcher/WatcherService.java
 create mode 100644 build/mobile/sutagent/android/watcher/default.properties
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-hdpi/ateamlogo.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-hdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-ldpi/ateamlogo.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-ldpi/icon.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-mdpi/ateamlogo.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/drawable-mdpi/icon.png
 create mode 100644 build/mobile/sutagent/android/watcher/res/layout/main.xml
 create mode 100644 build/mobile/sutagent/android/watcher/res/values/strings.xml

diff --git a/build/Makefile.in b/build/Makefile.in
index 338d0eec8b4d..dc9a2a45f7b5 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -72,7 +72,11 @@ endif
 DIRS += pgo
 
 ifeq (Android,$(OS_TARGET))
-  DIRS += mobile/sutagent/android
+  DIRS += mobile/sutagent/android \
+          mobile/sutagent/android/watcher \
+          mobile/sutagent/android/ffxcp \
+          mobile/sutagent/android/fencp \
+          $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/build/mobile/sutagent/android/fencp/AndroidManifest.xml b/build/mobile/sutagent/android/fencp/AndroidManifest.xml
new file mode 100644
index 000000000000..3c0d1e0a3ba6
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.mozilla.fencp"
+      android:versionCode="1"
+      android:versionName="1.0" android:sharedUserId="org.mozilla.fennec.sharedID">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
+        <activity android:label="@string/app_name" android:name="FenCP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    <provider android:name="FenCPFP" 
+              android:enabled="true" 
+              android:authorities="org.mozilla.fencp" 
+              android:exported="true">
+	</provider>
+</application>
+    <uses-sdk android:minSdkVersion="6" />
+
+</manifest> 
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/fencp/DirCursor.java b/build/mobile/sutagent/android/fencp/DirCursor.java
new file mode 100644
index 000000000000..37a4f30d8227
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/DirCursor.java
@@ -0,0 +1,175 @@
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.IOException;
+
+import android.database.MatrixCursor;
+
+public class DirCursor extends MatrixCursor {
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String TIMESTAMP = "ts";
+    public static final String WRITABLE = "writable";
+	static final String[] DEFCOLUMNS = new String[] {
+			_ID,
+			ISDIR,
+			FILENAME,
+			LENGTH,
+			TIMESTAMP,
+			WRITABLE
+         };
+	private String dirPath = null;
+	private String [] theColumns = null;
+
+	public DirCursor(String[] columnNames, String sPath) {
+		super((columnNames == null ? DEFCOLUMNS : columnNames));
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		dirPath = sPath;
+		doLoadCursor(dirPath);
+	}
+
+	public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
+		super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		dirPath = sPath;
+		doLoadCursor(dirPath);
+	}
+	
+	private void doLoadCursor(String sDir) {
+		File dir = new File(sDir);
+		int	nFiles = 0;
+		int nCols = theColumns.length;
+		int	lcvFiles = 0;
+		int	nCIndex = 0;
+		Object [] vals = new Object[nCols];
+		
+		if (vals == null)
+			return;
+		
+		if (dir.isDirectory()) {
+			try {
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1)
+					vals[nCIndex] = -1;
+
+				nCIndex = getColumnIndex(ISDIR);
+				if (nCIndex > -1)
+					vals[nCIndex] = 1;
+				
+				nCIndex = getColumnIndex(FILENAME);
+				if (nCIndex > -1)
+					try {
+						vals[nCIndex] = dir.getCanonicalPath();
+					} catch (IOException e) {
+						vals[nCIndex] = dir.getName();
+					}
+
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(TIMESTAMP);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(WRITABLE);
+				if (nCIndex > -1)
+					vals[nCIndex] = (dir.canWrite() ? 1 : 0);
+				
+				addRow(vals);
+				}
+			catch (IllegalArgumentException iae) {
+				iae.printStackTrace();
+			}
+			
+			File [] files = dir.listFiles();
+			if (files != null) {
+				if ((nFiles = files.length) > 0) {
+					for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
+						nCIndex = getColumnIndex(_ID);
+						if (nCIndex > -1)
+							vals[nCIndex] = lcvFiles;
+
+						nCIndex = getColumnIndex(ISDIR);
+						if (nCIndex > -1)
+							vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
+						
+						nCIndex = getColumnIndex(FILENAME);
+						if (nCIndex > -1)
+								vals[nCIndex] = files[lcvFiles].getName();
+
+						nCIndex = getColumnIndex(LENGTH);
+						if (nCIndex > -1)
+							vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
+
+						try {
+							addRow(vals);
+						} catch (IllegalArgumentException iae) {
+							iae.printStackTrace();
+						}
+					}
+				}
+			}
+		} else {
+			if (dir.isFile()) {
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1)
+					vals[nCIndex] = -1;
+
+				nCIndex = getColumnIndex(ISDIR);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(FILENAME);
+				if (nCIndex > -1)
+					vals[nCIndex] = dir.getName();
+
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1)
+					vals[nCIndex] = dir.length();
+
+				nCIndex = getColumnIndex(TIMESTAMP);
+				if (nCIndex > -1) {
+					vals[nCIndex] = dir.lastModified();
+				}
+				
+				try {
+					addRow(vals);
+					}
+				catch (IllegalArgumentException iae) {
+					iae.printStackTrace();
+				}
+			}
+			else {
+				try {
+					nCIndex = getColumnIndex(_ID);
+					if (nCIndex > -1)
+						vals[nCIndex] = -1;
+
+					nCIndex = getColumnIndex(ISDIR);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					nCIndex = getColumnIndex(FILENAME);
+					if (nCIndex > -1)
+						vals[nCIndex] = null;
+
+					nCIndex = getColumnIndex(LENGTH);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					nCIndex = getColumnIndex(TIMESTAMP);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					addRow(vals);
+					}
+				catch (IllegalArgumentException iae) {
+					iae.printStackTrace();
+				}
+			}
+		}
+	}
+}
diff --git a/build/mobile/sutagent/android/fencp/FenCP.java b/build/mobile/sutagent/android/fencp/FenCP.java
new file mode 100644
index 000000000000..16ad24ec6904
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/FenCP.java
@@ -0,0 +1,13 @@
+package org.mozilla.fencp;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class FenCP extends Activity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/fencp/FenCPFP.java b/build/mobile/sutagent/android/fencp/FenCPFP.java
new file mode 100644
index 000000000000..c75fda5dd320
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/FenCPFP.java
@@ -0,0 +1,190 @@
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class FenCPFP extends ContentProvider {
+	public static final String PROVIDER_NAME = "org.mozilla.fencp";
+	public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
+	
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String CHUNK = "chunk";
+	static String[] dircolumns = new String[] {
+		_ID,
+		ISDIR,
+		FILENAME,
+		LENGTH
+     };
+    
+	static String[] filecolumns = new String[] {
+		_ID,
+		CHUNK
+     };
+	
+    private static final int DIR = 1;   
+    private static final int FILE_NAME = 2;
+       
+    private static final UriMatcher uriMatcher;
+    static {
+    	uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+       	uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
+       	uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
+    	}
+
+	public int PruneDir(String sTmpDir) {
+		int	nRet = 0;
+		int nFiles = 0;
+		String sSubDir = null;
+	
+		File dir = new File(sTmpDir);
+	
+		if (dir.isDirectory()) {
+			File [] files = dir.listFiles();
+			if (files != null) {
+				if ((nFiles = files.length) > 0) {
+					for (int lcv = 0; lcv < nFiles; lcv++) {
+						if (files[lcv].isDirectory()) {
+							sSubDir = files[lcv].getAbsolutePath();
+							nRet += PruneDir(sSubDir);
+						}
+						else {
+							if (files[lcv].delete()) {
+								nRet++;
+							}
+						}
+					}
+				}
+			}
+			if (dir.delete()) {
+				nRet++;
+			}
+			if ((nFiles + 1) > nRet) {
+				nRet = -1;
+			}
+		}
+
+	return(nRet);
+	}
+
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs) {
+		int nFiles = 0;
+		switch (uriMatcher.match(uri)) {
+			case FILE_NAME:
+				File f = new File(selection);
+				if (f.delete())
+					nFiles = 1;
+				break;
+				
+			case DIR:
+				nFiles = PruneDir(selection);
+				break;
+				
+			default:
+				break;
+		}
+		return nFiles;
+	}
+
+	@Override
+	public String getType(Uri uri)
+		{
+	    switch (uriMatcher.match(uri))
+	    	{
+	        //---get directory---
+	        case DIR:
+	            return "vnd.android.cursor.dir/vnd.mozilla.dir ";
+	        //---get a particular file---
+	        case FILE_NAME:
+	            return "vnd.android.cursor.item/vnd.mozilla.file ";
+	        //---Unknown---
+	        default:
+	            throw new IllegalArgumentException("Unsupported URI: " + uri);        
+	    	}   
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values) {
+		return null;
+	}
+
+	@Override
+	public boolean onCreate() {
+		return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+		Cursor retCursor = null;
+
+		switch(uriMatcher.match(uri)) {
+			case DIR:
+				retCursor = new DirCursor(projection, selection);
+				break;
+					
+			case FILE_NAME:
+				retCursor = new FileCursor(projection, selection, selectionArgs);
+				break;
+				
+			default:
+				break;
+		}
+		return (retCursor);
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+		int	nRet = 0;
+		FileOutputStream dstFile = null;
+		
+		switch(uriMatcher.match(uri)) {
+			case DIR:
+				File dir = new File(selection);
+				if (dir.mkdirs())
+					nRet = 1;
+				break;
+				
+			case FILE_NAME:
+				try {
+					long lOffset = values.getAsLong("offset");
+					byte [] buf = values.getAsByteArray(CHUNK);
+					int	nLength = values.getAsInteger(LENGTH);
+					if ((buf != null) && (nLength > 0)) {
+						File f = new File(selection);
+						dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
+						dstFile.write(buf,0, nLength);
+						dstFile.flush();
+						dstFile.close();
+						nRet = nLength;
+					}
+				} catch (FileNotFoundException fnfe) {
+					fnfe.printStackTrace();
+				} catch (IOException ioe) {
+					try {
+						dstFile.flush();
+					} catch (IOException e) {
+					}
+					try {
+						dstFile.close();
+					} catch (IOException e) {
+					}
+				}
+				break;
+				
+			default:
+				break;
+		}
+		return nRet;
+	}
+}
diff --git a/build/mobile/sutagent/android/fencp/FileCursor.java b/build/mobile/sutagent/android/fencp/FileCursor.java
new file mode 100644
index 000000000000..967b63b7f212
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/FileCursor.java
@@ -0,0 +1,166 @@
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import android.database.AbstractWindowedCursor;
+import android.database.CursorWindow;
+
+public class FileCursor extends AbstractWindowedCursor {
+    public static final String _ID = "_id";
+    public static final String CHUNK = "chunk";
+    public static final String LENGTH = "length";
+	static final String[] DEFCOLUMNS = new String[] {
+			_ID,
+			CHUNK,
+			LENGTH
+         };
+	private String filePath = null;
+	private String [] theColumns = null;
+
+	private static final int BUFSIZE = 4096;
+	private long lFileSize = 0;
+	private int nCount = 0;
+	private File theFile = null;
+	private byte [] theBuffer = null;
+	private long lOffset = 0;
+	private long lLength = -1;
+	
+	public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
+		super();
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		filePath = sFilePath;
+		nCount = -1;
+		
+		if ((selectionArgs != null) && (selectionArgs.length > 0)) {
+			lOffset = Long.parseLong(selectionArgs[0]);
+			lLength = Long.parseLong(selectionArgs[1]);
+		}
+		
+		if (filePath.length() > 0) {
+			theFile = new File(filePath);
+			if (theFile.exists() && theFile.canRead()) {
+				lFileSize = theFile.length();
+				
+				// lLength == -1 return everything between lOffset and eof
+				// lLength == 0 return file length
+				// lLength > 0 return lLength bytes
+				if (lLength == -1) {
+					lFileSize = lFileSize - lOffset;
+				} else if (lLength == 0) {
+					// just return the file length
+				} else {
+					lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
+				}
+				
+				if (lLength != 0) {
+					nCount = (int) (lFileSize / BUFSIZE);
+					if ((lFileSize % BUFSIZE) > 0)
+						nCount++;
+				} else {
+					nCount = 1;
+				}
+
+				mRowIdColumnIndex = 0;
+			}
+		}
+	}
+
+	public String getColumnName (int columnIndex) {
+		return theColumns[columnIndex];
+	}
+
+	@Override
+	public String[] getColumnNames() {
+		return theColumns;
+	}
+
+	@Override
+	public int getCount() {
+		return nCount;
+	}
+
+	@Override
+	public boolean onMove(int oldPosition, int newPosition) {
+		boolean bRet = true;
+		
+		// get rid of old data
+		mWindow.clear();
+		bRet = mWindow.setNumColumns(theColumns.length);
+		fillWindow(newPosition, mWindow);
+		
+		return bRet;
+	}
+	
+	@Override
+	public void fillWindow (int pos, CursorWindow window) {
+		int	nNumRows = window.getNumRows();
+		int nCIndex = 0;
+		window.setStartPosition(0);
+
+		if (pos > -1) {
+			if (nNumRows == 0) {
+				window.allocRow();
+				nNumRows = window.getNumRows();
+			}
+			
+			if (nNumRows == 1) {
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1) {
+					window.putLong(lFileSize, 0, nCIndex);
+				}
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1) {
+					window.putLong((long)pos, 0, nCIndex);
+				}
+				nCIndex = getColumnIndex(CHUNK);
+				if (nCIndex > -1) {
+					if (lLength != 0) {
+						byte[] value = getABlob (pos, 1);
+						window.putBlob(value, 0, nCIndex);
+					}
+				}
+			}
+			window.setStartPosition(pos);
+		}
+		return;
+	}
+	
+	public byte[] getABlob (int row, int column) {
+		int	nRead = 0;
+		int	nOffset = 0;
+		int nBufSize = 0;
+		
+		if ((column == 1) && (theFile != null)) {
+			try {
+				FileInputStream fin = new FileInputStream(theFile);
+				nOffset = row * BUFSIZE;
+				if (row < (nCount - 1)) {
+					nBufSize = BUFSIZE;
+				} else {
+					nBufSize = (int) (lFileSize - nOffset);
+				}
+				theBuffer = new byte[nBufSize];
+				
+				if (theBuffer != null) {
+					if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
+						if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
+							if (nRead != nBufSize) {
+								return null;
+							}
+						}
+					}
+				}
+					
+			fin.close();
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+			
+		return theBuffer;
+	}
+}
diff --git a/build/mobile/sutagent/android/fencp/Makefile.in b/build/mobile/sutagent/android/fencp/Makefile.in
new file mode 100644
index 000000000000..f1082fee2e62
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/Makefile.in
@@ -0,0 +1,103 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Android sutagent for testing.
+#
+# The Initial Developer of the Original Code is
+#   Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Clint Talbert <ctalbert@mozilla.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = FenCP
+
+JAVAFILES = \
+  DirCursor.java \
+  FenCP.java \
+  FenCPFP.java \
+  FileCursor.java \
+  R.java \
+  $(NULL)
+
+RES_FILES = \
+  res/drawable-hdpi/icon.png \
+  res/drawable-ldpi/icon.png \
+  res/drawable-mdpi/icon.png \
+  res/layout/main.xml \
+  res/values/strings.xml \
+  $(NULL)
+
+GARBAGE += \
+  AndroidManifest.xml  \
+  classes.dex  \
+  FenCP.apk  \
+  $(NULL)
+
+GARBAGE_DIRS += res classes network-libs
+
+JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
+
+include $(topsrcdir)/config/rules.mk
+
+# include Android specific java flags - using these instead of what's in rules.mk
+include $(topsrcdir)/config/android-common.mk
+
+tools:: FenCP.apk
+
+classes.dex: $(JAVAFILES)
+	$(NSINSTALL) -D classes
+	$(JAVAC) $(JAVAC_FLAGS) -d classes  $(addprefix $(srcdir)/,$(JAVAFILES))
+	$(DX) --dex --output=$@ classes
+
+FenCP.ap_: $(srcdir)/AndroidManifest.xml
+	$(AAPT) package -f -M $(srcdir)/AndroidManifest.xml -I $(ANDROID_SDK)/android.jar  -S res -F $@
+
+FenCP-unsigned-unaligned.apk: FenCP.ap_ classes.dex
+	$(APKBUILDER) $@ -v $(APKBUILDER_FLAGS) -z FenCP.ap_ -f classes.dex
+
+FenCP-unaligned.apk: FenCP-unsigned-unaligned.apk
+	cp  FenCP-unsigned-unaligned.apk $@
+ifdef JARSIGNER
+  $(JARSIGNER) $@
+endif
+
+FenCP.apk: FenCP-unaligned.apk
+	$(ZIPALIGN) -f -v 4 FenCP-unaligned.apk $@
+
+export::
+	$(NSINSTALL) -D res
+	@(cd $(srcdir)/res && tar $(TAR_CREATE_FLAGS) - *) | (cd $(DEPTH)/build/mobile/sutagent/android/fencp/res && tar -xf -)
+
diff --git a/build/mobile/sutagent/android/fencp/R.java b/build/mobile/sutagent/android/fencp/R.java
new file mode 100644
index 000000000000..8baab7ef70ca
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/R.java
@@ -0,0 +1,23 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.mozilla.fencp;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/fencp/default.properties b/build/mobile/sutagent/android/fencp/default.properties
new file mode 100644
index 000000000000..579744bf08a1
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-6
diff --git a/build/mobile/sutagent/android/fencp/res/drawable-hdpi/icon.png b/build/mobile/sutagent/android/fencp/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8074c4c571b8cd19e27f4ee5545df367420686d7
GIT binary patch
literal 4147
zcmV-35X|q1P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm000W`000W`0Ya=am;e9(9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1|5tw}^dRCt{2oOy6v)qTf5=iKFO(zBjyS+Xo+%Qj{)!7Q$W
z6KBFe9H5z!Cet*NNr0A2LK&8HhBBEZoyic|G);$p5}K_o1!mG|N`@p9l1vB;J7GzU
z0UH||Z?dh;mfn-zdhc2K$9>OwvMs$Q8_8nISM!^>PxsujeDCl4&hPxrxkp%Qc^^|l
zp6LqAcf3zf1H4aA1Gv-O6ha)ktct9Y+VA@N^9i;p0H%6v>ZJZYQ`zEa396z-gi{r_
zDz)D=vgRv62GCVeRjK{15j7<m5mZl(2gHEX4d3YbCqHS|8EZwgD)Wt;2qJ2{6v75Y
zvGsww4t^CV0F}B_(~=~n8|H-&l88hPhy!ic-_?C@ysdn7po;H83+4{Ko1~nL|K`DO
z9KIFE0%ag1(kL?(4~+<_k&^&YU;FXK@3ppjpEO#}zYf(17Np}aJ`(=&TVH<hHX=<b
z5s{?r6ht)YVl@ql0gJj;%S|0!N#3izr4TSYFun;`M5H+(6ZYt&XojGg?MdgxMnbQ(
zfHCh)hNKka#wsC@21bc&QApGuPFaI$20D(BQsC5V9{>V@v6|2nafFX6W7z2j1_T0a
zLyT3pGTubf1lB5)32>bl0*BflrA!$|_(<V4RW3$KB75pFc@&<Kfa&v`Fw!w=tK8Iy
zHVRiH=xw{4ws<c}SHKc=Lkreetg(}xDTiaMY5!xcI{O}^bumUCOUp@~3ss5EmUUcv
z?hlDO8H^6mIwbC7xc1y1)0w)EKovQ@ZYL8PjkvLDn_L>WD2)iJIfV}37=<tz>ZKAC
zSe3boYtQ=;o0i>)RtBvsI#iT{0!oF1VFeW`jDjF2Q4aE?{pGCAd>o8Kg#neIh*AMY
zLl{;F!vLiem7s*x0<9FKAd6LoPz3~G32P+F+cuGOJ5gcC@pU_?C<K#zxM?|P#!;*h
z<yaeeoHc_VQSY*5(bXKxzCv5Fm-fVJhKt+z;Idmt`HNZ7dLb2^=kZ;C$5{Cwn^xRG
zZ~I3Hb%|X0Ab~D%ara-4jxS|#%LP2Y?;eW55jL;+ds_T1et+Qmyx#v41QKfv%7pZ!
zH}KI_U!xctA=G7zRgr=;7(HxFvnR-Ds^N`rOa*J?)FjYl+7i8Vq}KApuDd8yhFQ7r
z3QEBkovrIw+xcf~8~8bAWiDey=A&d1tN5d3Ut-sh$0-EENIaAY=t!N%MN2<V-{|kj
zmHW7A&3CA%0<RDJl#i{xoA%_{#M}($cm63cw~Y_4xPwra**EeWu8d=hIiYUT$?@$v
z9fImJ5!Qk=6B4Ql%hDet?zeE^lFyO!+gaYW2}i`RR&#i43orNm8^uZvtiyuXa<K6H
z-tY3(;G+m3!AdNGf!v!svHLE9uuNC_0^aC<m>2fmix7g2<OKw(NJSO!Wh<G)O12OD
zk{9;hOR+MF#G6#FX=OtB>)SUaQO$NS07~H)#fn!Q<}KQWtX}wW`g2>cMld+`7Rxgq
zChaey66SG560JhO66zA!;sK1cWa2AG$9k~VQY??6bOmJsw9@3uL*z;WWa7(Nm{^TA
zilc?y#N9O3LcTo2c)6d}SQl-v-pE4^#wb=s(RxaE28f3FQW(yp$ulG9{KcQ7r>7mQ
zE!HYxUYex~*7IinL+l*>HR*UaD;HkQhkL(5I@UwN%Wz504M^d!ylo>ANvKPF_TvA<
zkugG5;F6x}$s~J8cnev->_(Ic7%lGQgUi3n#XVo36lUpcS<B*<^O3@1)uNA43bS0?
za~<a`{v?j@Ske9wVqO|oCZ?^w;|LChBf!5j-{=N?H4Q8SE&@KYZ+HK&Jq|$-TC1x+
zjI}`!SgWno%32kg6Ve1hV0CD17-|~^%35o!4y{$8K9;8rtqlWhby$7YT5EMR?_>9s
z)ympRr7}@|6WF)Ae;D{owN1;aZS<z%U`85L3`Wtq;{;U>R50al9h~?-WhbtKK%bDd
zhML131oi1Bu1&Qb$Cp199LJ#;j5d|FhW8_i4KO1OI>}J^p2DfreMSVGY9aFlr&90t
zyI2FvxQiKMFviSQeP$Ixh#70qj5O%I+O_I2t2XHWqmh2!1~tHpN3k<ugQ5k@C@Ok7
z+FQ2}+B9a|#m)q5Ej;-ypgId^I<pxY>A4n=1iHj?`@c<~3q<khQ_D+AiSPS(o;PhA
z`n^Sv1#1+erM+mQs!_q26XUurrBaD_Jl?i>^X6_Q$AqTDjBU`|!y<&lkqL|m5tG(b
z8a!z&j^m(|;?SW(l*?tZ*{m2H9d&3jqBtXh>O-5e4Qp-W*a5=2NL&Oi62BUM)>zE3
zbSHb>aU3d@3cGggA`C-PsT9^)oy}%dHCaO~nwOrm5E54=aD<PxWdc(q&_xc9ze;;z
zHLgsOaNCGEX{@j)Q^Ht%Tpp3F>g(&HR4S23Oa#-a^=}w%g?ZP-1iq8PSjE8jYaGZu
z$I<dGMoPOWg+~}HypAJW1P(3!5;{{KV0qg|Sem{J-)X5D@d@oNm&=TgkK?+NnkmGD
z-_Q{A#FMr-B8Dqt^yOY;>)?YN8he?F9>)<bj*Q_57qEn;3|Nj9cQTmY%C_N$=t`~Q
z;w4{XMcd^l6D<P?Ay7&Y1OdM9A8)vuc8KPXAd4&GNZ}FcLfta4#gi!lo#*+!e`fp8
z&(OAv=d=)a+Um*{SaelE1QL&!lK>2d$G6a*zm0XB*Rf&gZAjq(8l@CUDSY1tB#!i>
zW$VfG%#SYSiZ}<yUM62T%y}K3#sZ-(5_4L}RSxpRzOQpA_YyHTjW5$2?;2XGa7B!d
ztoRyIcszIDAF1eZgm9|eQuBwy|4Kd>;)>pHA`qlfDTEYQEwN6>NNEp+uxuqx({Fgr
zjI@!4xRc?vk^9+~eU|mzH__dCDI=xb{Cd}4bELS9xRaS!*FXMwtMR-RR%SLMh0Cjl
zencr8#Su<4(%}$yGVB<Bgt*hjhnC%m<GA#mwVG#MdW;e0Y1~wZEwtgvc)kC3T3hfY
zSMoH5`B0b0#8+|6>U-HX{18v=yPH*+%^Vtknc>2A;%-~DrYFx^3XfuVgvZ{#1tA==
zm3>IzAM2{3Iv_d1XG{P6^tN3|PkJMnjs&CWN7%7_CmjoVakUhsa&dMv==2~^ri?&x
zVdv*rnfVyM+I1^Kg*S=23mR@+0T9BWFZUu~@toA8d)fw6be=`Yb6DSX6D?jB%2YT~
z*aHjtIOozfMhA!Jd*?u5_n!SnX>vX`=Ti-1HA<HWRGx~;;frK-Ys%y;GE<2slXx;!
zx1GgM4s$rf_|Ve7;o7tR9cwMW*zuR_9{CMPZ!v@(j)WyE5}b8zA|%>4RiE>eI3vTn
zz+>Ccf0HX6Ans-ebOB>RJST-Cyr#4XAk+mAlJgdQnoE{^iIN)OcYFSpgJUmXtl@tT
z-^ZuUeSj5hSFrQwqX>~EtZ*{>Gi8Bu9_|o06oNtaXP?E936!a@DsvS*tsB@fa6kEA
z5GkjwmH?EgpiG&itsB_Tb1NxtF<S=iW9N}aFjnEobhIC__!e&t|CIIJH?ueUG}@}#
z*5IbJ2TmcPSR2JoRU8pxF#iT)<-^sjbdq(QH?VQp^>nvxh_s@9KYX1Sttf?AlI~)z
zT=6Y7ulx=}<8Scr_UqU-_z)5gPo%050PsbM*ZLno;_-ow&k?FZJtYmb2hPA$LkP)8
z=^d0Q6PImh6Y|QT?{grxj)S=uBKvY2EQUbm@ns9^yKiP~$DcD)c$5Em`zDSScH%iH
zVov&m=cMo`1tYwA=!a}vb_ef_{)Q2?FUqn>BR$6phXQRv^1%=YfyE-F$AR4Q?9D!f
zCzB^^#td~4u&l~l#rp2QLfe3+_ub9@+|x+m;=2(sQ`s%gO|j$XBb>A7Q(Uy<Ms~mR
z)sr@Bsv6HJK@x#68l_8!W4+tria4%_*Y>dipiMw%igcweV#Cr~SP);q>w`bxts_4}
znKHg?X==JDkQl3Y>Ckt%`s{n?Nq-1<xam62X*|eake2F>Fw5~%Mq$CAsi-`yu_bKm
zxs#QdE7&vgJD%M84f4SNzSDv)S|V?|$!d5a#lhT5>>YWE4NGqa9-fbmV$=<!@JM<c
zC&X_omO$rmWt??g*K=X#7Z@$=;a9tEXDI(Vu9G}wXJ-C-A`g4(;Dem+-U&z%S^l~N
zQ((^hAY(O|#LDVE#%LB51-uk1+Ae2(_f1IQ@xp<7*qeP4fxvebRLei*VsS*AT)B@e
zWA_nla&2xtIp+k0rc6h2Eh(>)@k&32kdEYetna>=j@0>V8+wRsL;po!3ivVwh<9tn
z2S<1u9DAAQ>x1Sn=fk`)At|quvleV($B|#Kap_lB-F^*yV=wZ{9baUu(uXfokr95^
zA*!*W=5a>$2Ps`<ZO3O>-F^+qRQT<luhKvM2V5DC;>^{*cN>vipT*4!r#p%{(#I7s
z0NN94*q?ib$KJjfDI_sjHNdmEVp5wB&j54O#VoFqBwy)gfA$%)4d_X4q${<K?$%4`
zAKx-J)i?#riIMhXoFj#uJh}JljFtNkLb7$>L9Xom2R3xy&ZBSNgt4a1d7K^CDWa9r
zVb-_52m}Vp)`9;ZSKd#|U4ZYj5}Gp49{4utST|=c`~(#>KHF6}CCov<Oc3fKBc;8#
zGIi`Nx+1|?<uF?Y9^~S#8%cQ`XcHd0KbtaZ1f3cTu8gxFwmkaSt`43|v19n>1iHYw
zt{bWo)A@yF2$~c(nR$rSAaFQ$(Wh{vkG1AlutDMw=mM`C`T=X&|Ad9fb5Od}ROt1z
z<iuFelzP>OpczHqrb4Jo^rSCiW#&o(m7jFamnrsTpQb;*h4o8r#$aZ}2RaT-x2u^^
z%u@YyIv$U^u~@9(XGbSwU@fk6SikH>j+D1jQrYTKGJpW%vUT{!d}7THI5&Sa?~MKy
zS0-mvMl+BOcroEJ@hN!2H_?coTEJ5Q<;Nd?yx;eIj4{$$E2?YUO|NtNPJ-PdDf;s}
zab;}Mz0kbOI}5*w@3gROcnl#5)wQnEhDBfn!Xhy`u>C}*E~vWpO^HS)FC>8^umI=+
z&H;LW6w#;EF`}vQd_9Muru`KnQVPI9U?(sD<bWa&SZmeEGH6DFY6WD0w}C;Rh4&^w
zc_LD>)&Dg-0j3#(!fNKVZ_GoYH{la~d*1Yh$TI-TL>mI4vpNb@sU2=IZ8vL%AXUx0
zz{K0|nK(yizLHaeW#ZhRfQXoK^}1$<rbM${EMT&_)(%*j&)QQ%O^fOeSPGdq*yOYb
xs*zGFL~-IVT`+%1s&@qImmziC^|Zdw{{iC%_e>=$#1{Yn002ovPDHLkV1n#w+^+xt

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/fencp/res/drawable-ldpi/icon.png b/build/mobile/sutagent/android/fencp/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1095584ec21f71cd0afc9e0993aa2209671b590c
GIT binary patch
literal 1723
zcmV;s21NOZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000JpNkl<ZSPAV|
zTWnNS6kYeubY6Whoj!oJloqJGA0nb5fDz@Ri3x^3On~Tz5)-4wS4_m1D8}&Nhfxy{
z69ayjV2tmmi3my*6%bHLDd3b!TbgO<OkeZ557)lsPCB=DDm0)!?#Z5e&z^J7UT5un
z&e?N;|7BtZ6qldHRz&qty;Kj?tsl+TEe4;^sTwtN^<Hc_aXON=04dx0QuR(xarQnl
z*Y$?on0m_h`QGh4&vC>ARe<Hh2}sx|ed^8SkIr5c-eKY<z@Y<$pYtcLyzu(tC*Edr
zfGVt6A|V+oDjOw3!~L}g5sYa<;YBw!cvP<gp2D9sD2mKstmNBG(}1d|`Ohi}28QFc
zd@4j8rse<%fUzQs`BO<V2!pqV3cn|URWqK1t{KpE6MB{**A-+kBUsn?3bR3hq3JMb
zGc*%gR>P91Tc8>~sHP8V>Ys(CF=aT`Sk=;|pS}XrJPb~T1dys{sdO&0YpQBSz*~us
zcN*3-J_EnE1cxrXiq*F~jZje~rkAe3vf3>;eR)3?Ox=jK*jEU7Do|T`2NqP{56w(*
zBAf)rvPB_7rsfeKd0^!CaR%BHUC$tsP9m8a!i@4&TxxzagzsYHJvblx4rRUu#0Jlz
zclZJwdC}7S3BvwaIMTiwb!98zRf|zoya>NudJkDGgEYs=q*HmC)>GExofw=92}s;l
z_YgKLUT5`<1RBwq{f)K<EkI>~I%M=gRE6d<FHDq&W)h|sStE^=^^YK)Y-gCukktCI
zyk;}6aco?&J1^Hr5X_bX_y7#KLtFtxLbEV4yat9bO7raUdvlKkyy4uvOtCUJFV~jL
z4F_gf?I6P`67*JZthLs?{Usrbgxc+9-qjV5^bjy6SJ}TU{|O*fbxYmRsk;KwbuMGF
zV~6Z!up~a*#1)Wq6hM;=nYFAZ2=_!2bp<33Og4weD-y{LCU=7y0hUbw7ZO)M(s|N=
zOdXwxqui@za+L9lLcsL(^&t=lRI|f4WUhcDzSj?k+on>)b5BP`8{u9x0-wsG%H)w^
zRU7n9FwtlfsZ<KFSWNbmYXiiN*Ok-)q-Xedoa)(!*hmY~dIHC~-a*J$h1uondA4mP
zSU)GJA(2QR7z~OFS!x0(50ooIHamrqTGLZ7%q)D~GHbL$9Xrt0`x#VKN-6Q6pnl3)
zbR>SjiSB(k8~Y5+O>dyoSI477Ly?|FR?m))C!ci%BtY!2Sst8Uri#|SFX&)8{_Ou2
z9r5p3Vz9_GY#%D>%huqp_>U}K45YGy__TE!HZA@bMxX~@{;><au~O%#R=eO1RfrvV
zN@}1b)ej(%>cGYRgH~Ih*vd7EgV7h6Pg$#$lH+5=^lj{W80p{{l+;{7_t5cv3xVUy
zl_BY4ht1JH*EEeRS{VwTC(QFIVu8zF&P8O$gJsMgsS<v<^cG8zH12ME8E3p7ArSJ)
z&M1j((`t=fkRbsyk@k;7F_7#+Brq3Ek@Z%>O35SVvBrX`Vah$Yz2-5T>-`4DJNH;N
zlSSY8-mfty+|1~*;BtTwL<Ip!$O-{6nJWXCZfj~?gGcf6rCkhL5i}!%NU#a3>z_w5
z+lRv)J28~G%ouyvca(@|{2->WsPii&79&nju7ITE6hMX4AQc{|KqZN#)aAvemg3IZ
zCr}Y+!r}JU&^>U1C2WyZC<=47itSYQ`?$5{VH?mtFMFFExfYTsfqK%*WzH@Onc#i`
zI@a|rm-WbKk{5my{mF}H>Duc$bit&yLAgFfqo2vVbm~?FeG#0F?dSP*kxSo0Ff!o@
z(C}B;r&6pa-NY4;y~5lX8g&*MYQ>yLGd^tDWC4(sGy$Ow-*!eh%xt;>ve|J1q$*w<
zh;B#cz!6l2=5bkX#nJ9PJQ`ew8t>7z$bxqf*QB=l2_UB$hK|1EIfloN-jQ=qcwChF
zYAkkyp=;FwcnUB3v0=*tMYMA(Hdy<PN`g-^IhR&%fzFN6N*#&lHK?Lk=ZxLc=3rdN
zq(e3yk0;yO+EN7N%Am(wh<K-;2jmbL8HO+Z6SBz}=uJg)0~flX15@%oImi=w^eu?^
z%t_uJK&!llk^e99-)25FLY2R~H%i2Lni{9JP+O^e)Z7~oXC_K$<<GxNRbG`8Q=NTi
znzRTYIm5)q73$E{HZP;%WJucbIzw0y6~<h{M*Cz$0Li2UlrSYKFR#RI$=`tPT2(|y
Rn%e*X002ovPDHLkV1g`*Fem^3

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/fencp/res/drawable-mdpi/icon.png b/build/mobile/sutagent/android/fencp/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6
GIT binary patch
literal 2574
zcmV+p3i0)cP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TqNkl<ZXa((A
zTaXl28UDI^W_OsGWtUy{!Y<c^KmeB|0kUGyGA1FG<+Tz*5iPC6veb&P)Rg5*9;h-e
z3TmlIsSioYk{F{DmNAwkFOUEcA|RU$mk^d6F3YkP_BQuRcl-T4)62|GPtQQe^5S3h
z&*?tr^nd>Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9<g8_@RM8%EGu#
zOyw}c*6!!ybr1%fK$!Ou1DhVH>sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj
zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc<S)8TvCJ(ixjw3
zDGP|(1X`9Un_CtJe5P6O4Tok16h-k}y%^cd)qX(~3y1&(;3R-pMJy1U42MmBECtgL
z_oL_(B#i{Bm05*qutp_76zFCKsv;ifWL$-`=mi{76bUH<88Zp5;&Y~_s+bHXMSDSF
zJckkwQy?ojfl&9Fx}jNKXK+QzP_5SD&ic<$5P277Obe~>;(H<$!ABY&g<qQoV`}XB
zymTgs1$FnL&bJu4p0VhC=8or(5d~RmWa&;lQ&x+IY&_aYq<~*13&;c!tSXaIRAEF=
zB<NcF6z2Nxz(jNa!_iZ?yY1^}3a-Li7k-IIVgR3A@f`f#Ip`ZXfIAz$i21em;CTN_
z=xEu3VAVXlcIsQuGdfb46xxDaSk?R`H2PP;NRz%=?4~pTga_dz#}k`EC}jbv!cw~B
zHsU&lZlE=|p3FXv_J;eB)>By1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY
z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)H<?OK4zWQV%p-Vko~Ntr}xRbH946I
zBbJy%oM;*<Qu-v?>pq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY
zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7
zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e`
zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf
zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC
z<IaPt3t7R-6esQN0HcDnT?G)P?Tm0c1gJ!Dt^$bfixvcL7nF-XR{?CME762Kcc$C2
z0^CXqusEZ9EG@XXRRY=h?lWDp(5=?IC?k=XaOY^+XgMBS1rS=c1#U%~*5f!7`iWIr
zm7^!xPp7$o27|RVH8pa$a)h!jBpN8E1xL!$I)x$2C0IsF*=^G#^@5r9yhtR1D_5>y
zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7!
z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(R<hk59!
zW=XvsOXl2%B`grF;AT}St~EM33K2wrmQn?+2@Y0p6+pBvrWT^^V6rHyhHhkp1z8pz
zbryOC|A-TVzh@Pjttc&ls7T$Eawdh)_?r~$O&m~viVgF=iIq(c^GhAcWD*{aheGlU
zQ|MtuY-GhO>b|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aF<C~nc##zP@rBRelZ&>K
zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``<Z0-}AfLb=^g=Q+9A---7|U+2N)
zKd9DfaQ52Yps9ZGfvJGaszssZ->}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW
zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`<
z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+Oz<nLfHjoFa)k
z@jh(Yx+=2QOc~A*As$?^lQRq)3_XjOK8~%cccZ0x1Js6YG`2CYa;IA-0bFCCGVPNr
zL2`REIf(P4`>Y^c-M9@+fz=G`q<GOZlu*|(zvf<SUix$Njqk_ab5A3#M<oK#J@_)#
zF{tIXf^lqXzDWDBuB!!Pf<XB!Bm$@iO&ma&w-a(qOl6{s9o|LdEh}1<fL$^7^H|-u
z1t+e)h<}~^0jEeP^C~Jg_vF<-^N3oHdfzhiXHHlwSd2LQxLQEw+g2#o8dP&Q$@42i
zPEox$JMwp2i=E|*xKLK(8ne@y=C5MuoQH7e;!Xzh0gHKS9qUO%VG7oKI61tVw;qp?
zT%HD|M7%DEs|AE<I}WaY;`}73!Vq_rZ9p-ZSF##4B|tSl?rMG<)t)-MGqejQhyFs1
zOYY$u$1R38AVwJR<T&GF2Y!V|ofl<qSqqf>a@v4sF5u-2289-#$**LWnyNNDwDf1(
zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W
zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V
zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB
z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp|
z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu
z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR
z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_S<r>mOtclS?KWk2VYE
zM*oS<=C483Xc<XBH-T2(vVJUXr<9s6L8%y!+?6<f{P<XJZ|@}c0}+%-f$DVxIixSf
zyZx`_jp~RryiOnPLN6^M#a^XAPNg`KKXr{n)Ewh?38G^@b)qVL^*LP6b}_MzC^c}&
z>kW?GN|1jfh3Ro(h<KDZN|fWBj7@=)05T}o0kZov5oZ%?h%8)~*k=Yr+YBDaVOp3T
zBFg{7f(5Qr%7ttVh}3fDAw-1vQZd7!TMCkUL<sw@Rk22a=Izx=SwI*ShDAWTmANx1
kfM{AOIT6Hei<0X907#l7&=u{JbN~PV07*qoM6N<$f*QKj`~Uy|

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/fencp/res/layout/main.xml b/build/mobile/sutagent/android/fencp/res/layout/main.xml
new file mode 100644
index 000000000000..3a5f117d3cb1
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/build/mobile/sutagent/android/fencp/res/values/strings.xml b/build/mobile/sutagent/android/fencp/res/values/strings.xml
new file mode 100644
index 000000000000..6243a1c192e4
--- /dev/null
+++ b/build/mobile/sutagent/android/fencp/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, FennecCP!</string>
+    <string name="app_name">FennecCP</string>
+</resources>
diff --git a/build/mobile/sutagent/android/ffxcp/AndroidManifest.xml b/build/mobile/sutagent/android/ffxcp/AndroidManifest.xml
new file mode 100644
index 000000000000..a9a0b97086f4
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.mozilla.ffxcp"
+      android:versionCode="1"
+      android:versionName="1.0" android:sharedUserId="org.mozilla.firefox.sharedID">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
+        <activity android:label="@string/app_name" android:name="ffxcp">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    <provider android:name="FfxCPFP" 
+              android:enabled="true" 
+              android:authorities="org.mozilla.ffxcp" 
+              android:exported="true">
+	</provider>
+    </application>
+    <uses-sdk android:minSdkVersion="6" />
+
+</manifest> 
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/ffxcp/DirCursor.java b/build/mobile/sutagent/android/ffxcp/DirCursor.java
new file mode 100644
index 000000000000..9a66212685ac
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/DirCursor.java
@@ -0,0 +1,175 @@
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.IOException;
+
+import android.database.MatrixCursor;
+
+public class DirCursor extends MatrixCursor {
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String TIMESTAMP = "ts";
+    public static final String WRITABLE = "writable";
+	static final String[] DEFCOLUMNS = new String[] {
+			_ID,
+			ISDIR,
+			FILENAME,
+			LENGTH,
+			TIMESTAMP,
+			WRITABLE
+         };
+	private String dirPath = null;
+	private String [] theColumns = null;
+
+	public DirCursor(String[] columnNames, String sPath) {
+		super((columnNames == null ? DEFCOLUMNS : columnNames));
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		dirPath = sPath;
+		doLoadCursor(dirPath);
+	}
+
+	public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
+		super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		dirPath = sPath;
+		doLoadCursor(dirPath);
+	}
+	
+	private void doLoadCursor(String sDir) {
+		File dir = new File(sDir);
+		int	nFiles = 0;
+		int nCols = theColumns.length;
+		int	lcvFiles = 0;
+		int	nCIndex = 0;
+		Object [] vals = new Object[nCols];
+		
+		if (vals == null)
+			return;
+		
+		if (dir.isDirectory()) {
+			try {
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1)
+					vals[nCIndex] = -1;
+
+				nCIndex = getColumnIndex(ISDIR);
+				if (nCIndex > -1)
+					vals[nCIndex] = 1;
+				
+				nCIndex = getColumnIndex(FILENAME);
+				if (nCIndex > -1)
+					try {
+						vals[nCIndex] = dir.getCanonicalPath();
+					} catch (IOException e) {
+						vals[nCIndex] = dir.getName();
+					}
+
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(TIMESTAMP);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(WRITABLE);
+				if (nCIndex > -1)
+					vals[nCIndex] = (dir.canWrite() ? 1 : 0);
+				
+				addRow(vals);
+				}
+			catch (IllegalArgumentException iae) {
+				iae.printStackTrace();
+			}
+			
+			File [] files = dir.listFiles();
+			if (files != null) {
+				if ((nFiles = files.length) > 0) {
+					for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
+						nCIndex = getColumnIndex(_ID);
+						if (nCIndex > -1)
+							vals[nCIndex] = lcvFiles;
+
+						nCIndex = getColumnIndex(ISDIR);
+						if (nCIndex > -1)
+							vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
+						
+						nCIndex = getColumnIndex(FILENAME);
+						if (nCIndex > -1)
+								vals[nCIndex] = files[lcvFiles].getName();
+
+						nCIndex = getColumnIndex(LENGTH);
+						if (nCIndex > -1)
+							vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
+
+						try {
+							addRow(vals);
+						} catch (IllegalArgumentException iae) {
+							iae.printStackTrace();
+						}
+					}
+				}
+			}
+		} else {
+			if (dir.isFile()) {
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1)
+					vals[nCIndex] = -1;
+
+				nCIndex = getColumnIndex(ISDIR);
+				if (nCIndex > -1)
+					vals[nCIndex] = 0;
+				
+				nCIndex = getColumnIndex(FILENAME);
+				if (nCIndex > -1)
+					vals[nCIndex] = dir.getName();
+
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1)
+					vals[nCIndex] = dir.length();
+
+				nCIndex = getColumnIndex(TIMESTAMP);
+				if (nCIndex > -1) {
+					vals[nCIndex] = dir.lastModified();
+				}
+				
+				try {
+					addRow(vals);
+					}
+				catch (IllegalArgumentException iae) {
+					iae.printStackTrace();
+				}
+			}
+			else {
+				try {
+					nCIndex = getColumnIndex(_ID);
+					if (nCIndex > -1)
+						vals[nCIndex] = -1;
+
+					nCIndex = getColumnIndex(ISDIR);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					nCIndex = getColumnIndex(FILENAME);
+					if (nCIndex > -1)
+						vals[nCIndex] = null;
+
+					nCIndex = getColumnIndex(LENGTH);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					nCIndex = getColumnIndex(TIMESTAMP);
+					if (nCIndex > -1)
+						vals[nCIndex] = 0;
+					
+					addRow(vals);
+					}
+				catch (IllegalArgumentException iae) {
+					iae.printStackTrace();
+				}
+			}
+		}
+	}
+}
diff --git a/build/mobile/sutagent/android/ffxcp/FfxCPFP.java b/build/mobile/sutagent/android/ffxcp/FfxCPFP.java
new file mode 100644
index 000000000000..87caeb1e5c85
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/FfxCPFP.java
@@ -0,0 +1,190 @@
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class FfxCPFP extends ContentProvider {
+	public static final String PROVIDER_NAME = "org.mozilla.ffxcp";
+	public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
+	
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String CHUNK = "chunk";
+	static String[] dircolumns = new String[] {
+		_ID,
+		ISDIR,
+		FILENAME,
+		LENGTH
+     };
+    
+	static String[] filecolumns = new String[] {
+		_ID,
+		CHUNK
+     };
+	
+    private static final int DIR = 1;   
+    private static final int FILE_NAME = 2;
+       
+    private static final UriMatcher uriMatcher;
+    static {
+    	uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+       	uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
+       	uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
+    	}
+
+	public int PruneDir(String sTmpDir) {
+		int	nRet = 0;
+		int nFiles = 0;
+		String sSubDir = null;
+	
+		File dir = new File(sTmpDir);
+	
+		if (dir.isDirectory()) {
+			File [] files = dir.listFiles();
+			if (files != null) {
+				if ((nFiles = files.length) > 0) {
+					for (int lcv = 0; lcv < nFiles; lcv++) {
+						if (files[lcv].isDirectory()) {
+							sSubDir = files[lcv].getAbsolutePath();
+							nRet += PruneDir(sSubDir);
+						}
+						else {
+							if (files[lcv].delete()) {
+								nRet++;
+							}
+						}
+					}
+				}
+			}
+			if (dir.delete()) {
+				nRet++;
+			}
+			if ((nFiles + 1) > nRet) {
+				nRet = -1;
+			}
+		}
+
+	return(nRet);
+	}
+
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs) {
+		int nFiles = 0;
+		switch (uriMatcher.match(uri)) {
+			case FILE_NAME:
+				File f = new File(selection);
+				if (f.delete())
+					nFiles = 1;
+				break;
+				
+			case DIR:
+				nFiles = PruneDir(selection);
+				break;
+				
+			default:
+				break;
+		}
+		return nFiles;
+	}
+
+	@Override
+	public String getType(Uri uri)
+		{
+	    switch (uriMatcher.match(uri))
+	    	{
+	        //---get directory---
+	        case DIR:
+	            return "vnd.android.cursor.dir/vnd.mozilla.dir ";
+	        //---get a particular file---
+	        case FILE_NAME:
+	            return "vnd.android.cursor.item/vnd.mozilla.file ";
+		    //---Unknown---
+	        default:
+	            throw new IllegalArgumentException("Unsupported URI: " + uri);        
+	    	}   
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values) {
+		return null;
+	}
+
+	@Override
+	public boolean onCreate() {
+		return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+		Cursor retCursor = null;
+
+		switch(uriMatcher.match(uri)) {
+			case DIR:
+				retCursor = new DirCursor(projection, selection);
+				break;
+					
+			case FILE_NAME:
+				retCursor = new FileCursor(projection, selection, selectionArgs);
+				break;
+					
+			default:
+				break;
+		}
+		return (retCursor);
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+		int	nRet = 0;
+		FileOutputStream dstFile = null;
+		
+		switch(uriMatcher.match(uri)) {
+			case DIR:
+				File dir = new File(selection);
+				if (dir.mkdirs())
+					nRet = 1;
+				break;
+				
+			case FILE_NAME:
+				try {
+					long lOffset = values.getAsLong("offset");
+					byte [] buf = values.getAsByteArray(CHUNK);
+					int	nLength = values.getAsInteger(LENGTH);
+					if ((buf != null) && (nLength > 0)) {
+						File f = new File(selection);
+						dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
+						dstFile.write(buf,0, nLength);
+						dstFile.flush();
+						dstFile.close();
+						nRet = nLength;
+					}
+				} catch (FileNotFoundException fnfe) {
+					fnfe.printStackTrace();
+				} catch (IOException ioe) {
+					try {
+						dstFile.flush();
+					} catch (IOException e) {
+					}
+					try {
+						dstFile.close();
+					} catch (IOException e) {
+					}
+				}
+				break;
+				
+			default:
+				break;
+		}
+		return nRet;
+	}
+}
diff --git a/build/mobile/sutagent/android/ffxcp/FileCursor.java b/build/mobile/sutagent/android/ffxcp/FileCursor.java
new file mode 100644
index 000000000000..8c4c6b03d974
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/FileCursor.java
@@ -0,0 +1,167 @@
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import android.database.AbstractWindowedCursor;
+import android.database.CursorWindow;
+
+public class FileCursor extends AbstractWindowedCursor {
+    public static final String _ID = "_id";
+    public static final String CHUNK = "chunk";
+    public static final String LENGTH = "length";
+	static final String[] DEFCOLUMNS = new String[] {
+			_ID,
+			CHUNK,
+			LENGTH
+         };
+	private String filePath = null;
+	private String [] theColumns = null;
+
+	private static final int BUFSIZE = 4096;
+	private long lFileSize = 0;
+	private int nCount = 0;
+	private File theFile = null;
+	private byte [] theBuffer = null;
+	private long lOffset = 0;
+	private long lLength = -1;
+	
+	public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
+		super();
+		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+		filePath = sFilePath;
+		nCount = -1;
+		
+		if ((selectionArgs != null) && (selectionArgs.length > 0)) {
+			lOffset = Long.parseLong(selectionArgs[0]);
+			lLength = Long.parseLong(selectionArgs[1]);
+		}
+		
+		if (filePath.length() > 0) {
+			theFile = new File(filePath);
+			if (theFile.exists() && theFile.canRead()) {
+				lFileSize = theFile.length();
+				
+				// lLength == -1 return everything between lOffset and eof
+				// lLength == 0 return file length
+				// lLength > 0 return lLength bytes
+				if (lLength == -1) {
+					lFileSize = lFileSize - lOffset;
+				} else if (lLength == 0) {
+					// just return the file length
+				} else {
+					lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
+				}
+				
+				if (lLength != 0) {
+					nCount = (int) (lFileSize / BUFSIZE);
+					if ((lFileSize % BUFSIZE) > 0)
+						nCount++;
+				} else {
+					nCount = 1;
+				}
+
+				mRowIdColumnIndex = 0;
+			}
+		}
+	}
+
+	public String getColumnName (int columnIndex) {
+		return theColumns[columnIndex];
+	}
+
+	@Override
+	public String[] getColumnNames() {
+		return theColumns;
+	}
+
+	@Override
+	public int getCount() {
+		return nCount;
+	}
+
+	@Override
+	public boolean onMove(int oldPosition, int newPosition) {
+		boolean bRet = true;
+		
+		// get rid of old data
+		mWindow.clear();
+		bRet = mWindow.setNumColumns(theColumns.length);
+		fillWindow(newPosition, mWindow);
+		
+		return bRet;
+	}
+	
+	@Override
+	public void fillWindow (int pos, CursorWindow window) {
+		int	nNumRows = window.getNumRows();
+		int nCIndex = 0;
+		window.setStartPosition(0);
+
+		if (pos > -1) {
+			if (nNumRows == 0) {
+				window.allocRow();
+				nNumRows = window.getNumRows();
+			}
+			
+			if (nNumRows == 1) {
+				nCIndex = getColumnIndex(LENGTH);
+				if (nCIndex > -1) {
+					window.putLong(lFileSize, 0, nCIndex);
+				}
+				nCIndex = getColumnIndex(_ID);
+				if (nCIndex > -1) {
+					window.putLong((long)pos, 0, nCIndex);
+				}
+				nCIndex = getColumnIndex(CHUNK);
+				if (nCIndex > -1) {
+					if (lLength != 0) {
+						byte[] value = getABlob (pos, 1);
+						window.putBlob(value, 0, nCIndex);
+					}
+				}
+			}
+			window.setStartPosition(pos);
+		}
+		return;
+	}
+	
+	public byte[] getABlob (int row, int column) {
+		int	nRead = 0;
+		int	nOffset = 0;
+		int nBufSize = 0;
+		
+		if ((column == 1) && (theFile != null)) {
+			try {
+				FileInputStream fin = new FileInputStream(theFile);
+				nOffset = row * BUFSIZE;
+				if (row < (nCount - 1)) {
+					nBufSize = BUFSIZE;
+				} else {
+					nBufSize = (int) (lFileSize - nOffset);
+				}
+				theBuffer = new byte[nBufSize];
+				
+				if (theBuffer != null) {
+					if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
+						if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
+							if (nRead != nBufSize) {
+								return null;
+							}
+						}
+					}
+				}
+					
+			fin.close();
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+			
+		return theBuffer;
+	}
+}
diff --git a/build/mobile/sutagent/android/ffxcp/Makefile.in b/build/mobile/sutagent/android/ffxcp/Makefile.in
new file mode 100644
index 000000000000..72c8e3a81f3c
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/Makefile.in
@@ -0,0 +1,103 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Android sutagent for testing.
+#
+# The Initial Developer of the Original Code is
+#   Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Clint Talbert <ctalbert@mozilla.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = FfxCP
+
+JAVAFILES = \
+  DirCursor.java \
+  ffxcp.java \
+  FfxCPFP.java \
+  FileCursor.java \
+  R.java \
+  $(NULL)
+
+RES_FILES = \
+  res/drawable-hdpi/icon.png \
+  res/drawable-ldpi/icon.png \
+  res/drawable-mdpi/icon.png \
+  res/layout/main.xml \
+  res/values/strings.xml \
+  $(NULL)
+
+GARBAGE += \
+  AndroidManifest.xml  \
+  classes.dex  \
+  FfxCP.apk  \
+  $(NULL)
+
+GARBAGE_DIRS += res classes network-libs
+
+JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
+
+include $(topsrcdir)/config/rules.mk
+
+# include Android specific java flags - using these instead of what's in rules.mk
+include $(topsrcdir)/config/android-common.mk
+
+tools:: FfxCP.apk
+
+classes.dex: $(JAVAFILES)
+	$(NSINSTALL) -D classes
+	$(JAVAC) $(JAVAC_FLAGS) -d classes  $(addprefix $(srcdir)/,$(JAVAFILES))
+	$(DX) --dex --output=$@ classes
+
+FfxCP.ap_: $(srcdir)/AndroidManifest.xml
+	$(AAPT) package -f -M $(srcdir)/AndroidManifest.xml -I $(ANDROID_SDK)/android.jar  -S res -F $@
+
+FfxCP-unsigned-unaligned.apk: FfxCP.ap_ classes.dex
+	$(APKBUILDER) $@ -v $(APKBUILDER_FLAGS) -z FfxCP.ap_ -f classes.dex
+
+FfxCP-unaligned.apk: FfxCP-unsigned-unaligned.apk
+	cp  FfxCP-unsigned-unaligned.apk $@
+ifdef JARSIGNER
+  $(JARSIGNER) $@
+endif
+
+FfxCP.apk: FfxCP-unaligned.apk
+	$(ZIPALIGN) -f -v 4 FfxCP-unaligned.apk $@
+
+export::
+	$(NSINSTALL) -D res
+	@(cd $(srcdir)/res && tar $(TAR_CREATE_FLAGS) - *) | (cd $(DEPTH)/build/mobile/sutagent/android/ffxcp/res && tar -xf -)
+
diff --git a/build/mobile/sutagent/android/ffxcp/R.java b/build/mobile/sutagent/android/ffxcp/R.java
new file mode 100644
index 000000000000..30c4f28ef653
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/R.java
@@ -0,0 +1,23 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.mozilla.ffxcp;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/default.properties b/build/mobile/sutagent/android/ffxcp/default.properties
new file mode 100644
index 000000000000..579744bf08a1
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-6
diff --git a/build/mobile/sutagent/android/ffxcp/ffxcp.java b/build/mobile/sutagent/android/ffxcp/ffxcp.java
new file mode 100644
index 000000000000..b3c7f5e647a0
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/ffxcp.java
@@ -0,0 +1,13 @@
+package org.mozilla.ffxcp;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ffxcp extends Activity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/ffxcp/res/drawable-hdpi/icon.png b/build/mobile/sutagent/android/ffxcp/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8074c4c571b8cd19e27f4ee5545df367420686d7
GIT binary patch
literal 4147
zcmV-35X|q1P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm000W`000W`0Ya=am;e9(9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1|5tw}^dRCt{2oOy6v)qTf5=iKFO(zBjyS+Xo+%Qj{)!7Q$W
z6KBFe9H5z!Cet*NNr0A2LK&8HhBBEZoyic|G);$p5}K_o1!mG|N`@p9l1vB;J7GzU
z0UH||Z?dh;mfn-zdhc2K$9>OwvMs$Q8_8nISM!^>PxsujeDCl4&hPxrxkp%Qc^^|l
zp6LqAcf3zf1H4aA1Gv-O6ha)ktct9Y+VA@N^9i;p0H%6v>ZJZYQ`zEa396z-gi{r_
zDz)D=vgRv62GCVeRjK{15j7<m5mZl(2gHEX4d3YbCqHS|8EZwgD)Wt;2qJ2{6v75Y
zvGsww4t^CV0F}B_(~=~n8|H-&l88hPhy!ic-_?C@ysdn7po;H83+4{Ko1~nL|K`DO
z9KIFE0%ag1(kL?(4~+<_k&^&YU;FXK@3ppjpEO#}zYf(17Np}aJ`(=&TVH<hHX=<b
z5s{?r6ht)YVl@ql0gJj;%S|0!N#3izr4TSYFun;`M5H+(6ZYt&XojGg?MdgxMnbQ(
zfHCh)hNKka#wsC@21bc&QApGuPFaI$20D(BQsC5V9{>V@v6|2nafFX6W7z2j1_T0a
zLyT3pGTubf1lB5)32>bl0*BflrA!$|_(<V4RW3$KB75pFc@&<Kfa&v`Fw!w=tK8Iy
zHVRiH=xw{4ws<c}SHKc=Lkreetg(}xDTiaMY5!xcI{O}^bumUCOUp@~3ss5EmUUcv
z?hlDO8H^6mIwbC7xc1y1)0w)EKovQ@ZYL8PjkvLDn_L>WD2)iJIfV}37=<tz>ZKAC
zSe3boYtQ=;o0i>)RtBvsI#iT{0!oF1VFeW`jDjF2Q4aE?{pGCAd>o8Kg#neIh*AMY
zLl{;F!vLiem7s*x0<9FKAd6LoPz3~G32P+F+cuGOJ5gcC@pU_?C<K#zxM?|P#!;*h
z<yaeeoHc_VQSY*5(bXKxzCv5Fm-fVJhKt+z;Idmt`HNZ7dLb2^=kZ;C$5{Cwn^xRG
zZ~I3Hb%|X0Ab~D%ara-4jxS|#%LP2Y?;eW55jL;+ds_T1et+Qmyx#v41QKfv%7pZ!
zH}KI_U!xctA=G7zRgr=;7(HxFvnR-Ds^N`rOa*J?)FjYl+7i8Vq}KApuDd8yhFQ7r
z3QEBkovrIw+xcf~8~8bAWiDey=A&d1tN5d3Ut-sh$0-EENIaAY=t!N%MN2<V-{|kj
zmHW7A&3CA%0<RDJl#i{xoA%_{#M}($cm63cw~Y_4xPwra**EeWu8d=hIiYUT$?@$v
z9fImJ5!Qk=6B4Ql%hDet?zeE^lFyO!+gaYW2}i`RR&#i43orNm8^uZvtiyuXa<K6H
z-tY3(;G+m3!AdNGf!v!svHLE9uuNC_0^aC<m>2fmix7g2<OKw(NJSO!Wh<G)O12OD
zk{9;hOR+MF#G6#FX=OtB>)SUaQO$NS07~H)#fn!Q<}KQWtX}wW`g2>cMld+`7Rxgq
zChaey66SG560JhO66zA!;sK1cWa2AG$9k~VQY??6bOmJsw9@3uL*z;WWa7(Nm{^TA
zilc?y#N9O3LcTo2c)6d}SQl-v-pE4^#wb=s(RxaE28f3FQW(yp$ulG9{KcQ7r>7mQ
zE!HYxUYex~*7IinL+l*>HR*UaD;HkQhkL(5I@UwN%Wz504M^d!ylo>ANvKPF_TvA<
zkugG5;F6x}$s~J8cnev->_(Ic7%lGQgUi3n#XVo36lUpcS<B*<^O3@1)uNA43bS0?
za~<a`{v?j@Ske9wVqO|oCZ?^w;|LChBf!5j-{=N?H4Q8SE&@KYZ+HK&Jq|$-TC1x+
zjI}`!SgWno%32kg6Ve1hV0CD17-|~^%35o!4y{$8K9;8rtqlWhby$7YT5EMR?_>9s
z)ympRr7}@|6WF)Ae;D{owN1;aZS<z%U`85L3`Wtq;{;U>R50al9h~?-WhbtKK%bDd
zhML131oi1Bu1&Qb$Cp199LJ#;j5d|FhW8_i4KO1OI>}J^p2DfreMSVGY9aFlr&90t
zyI2FvxQiKMFviSQeP$Ixh#70qj5O%I+O_I2t2XHWqmh2!1~tHpN3k<ugQ5k@C@Ok7
z+FQ2}+B9a|#m)q5Ej;-ypgId^I<pxY>A4n=1iHj?`@c<~3q<khQ_D+AiSPS(o;PhA
z`n^Sv1#1+erM+mQs!_q26XUurrBaD_Jl?i>^X6_Q$AqTDjBU`|!y<&lkqL|m5tG(b
z8a!z&j^m(|;?SW(l*?tZ*{m2H9d&3jqBtXh>O-5e4Qp-W*a5=2NL&Oi62BUM)>zE3
zbSHb>aU3d@3cGggA`C-PsT9^)oy}%dHCaO~nwOrm5E54=aD<PxWdc(q&_xc9ze;;z
zHLgsOaNCGEX{@j)Q^Ht%Tpp3F>g(&HR4S23Oa#-a^=}w%g?ZP-1iq8PSjE8jYaGZu
z$I<dGMoPOWg+~}HypAJW1P(3!5;{{KV0qg|Sem{J-)X5D@d@oNm&=TgkK?+NnkmGD
z-_Q{A#FMr-B8Dqt^yOY;>)?YN8he?F9>)<bj*Q_57qEn;3|Nj9cQTmY%C_N$=t`~Q
z;w4{XMcd^l6D<P?Ay7&Y1OdM9A8)vuc8KPXAd4&GNZ}FcLfta4#gi!lo#*+!e`fp8
z&(OAv=d=)a+Um*{SaelE1QL&!lK>2d$G6a*zm0XB*Rf&gZAjq(8l@CUDSY1tB#!i>
zW$VfG%#SYSiZ}<yUM62T%y}K3#sZ-(5_4L}RSxpRzOQpA_YyHTjW5$2?;2XGa7B!d
ztoRyIcszIDAF1eZgm9|eQuBwy|4Kd>;)>pHA`qlfDTEYQEwN6>NNEp+uxuqx({Fgr
zjI@!4xRc?vk^9+~eU|mzH__dCDI=xb{Cd}4bELS9xRaS!*FXMwtMR-RR%SLMh0Cjl
zencr8#Su<4(%}$yGVB<Bgt*hjhnC%m<GA#mwVG#MdW;e0Y1~wZEwtgvc)kC3T3hfY
zSMoH5`B0b0#8+|6>U-HX{18v=yPH*+%^Vtknc>2A;%-~DrYFx^3XfuVgvZ{#1tA==
zm3>IzAM2{3Iv_d1XG{P6^tN3|PkJMnjs&CWN7%7_CmjoVakUhsa&dMv==2~^ri?&x
zVdv*rnfVyM+I1^Kg*S=23mR@+0T9BWFZUu~@toA8d)fw6be=`Yb6DSX6D?jB%2YT~
z*aHjtIOozfMhA!Jd*?u5_n!SnX>vX`=Ti-1HA<HWRGx~;;frK-Ys%y;GE<2slXx;!
zx1GgM4s$rf_|Ve7;o7tR9cwMW*zuR_9{CMPZ!v@(j)WyE5}b8zA|%>4RiE>eI3vTn
zz+>Ccf0HX6Ans-ebOB>RJST-Cyr#4XAk+mAlJgdQnoE{^iIN)OcYFSpgJUmXtl@tT
z-^ZuUeSj5hSFrQwqX>~EtZ*{>Gi8Bu9_|o06oNtaXP?E936!a@DsvS*tsB@fa6kEA
z5GkjwmH?EgpiG&itsB_Tb1NxtF<S=iW9N}aFjnEobhIC__!e&t|CIIJH?ueUG}@}#
z*5IbJ2TmcPSR2JoRU8pxF#iT)<-^sjbdq(QH?VQp^>nvxh_s@9KYX1Sttf?AlI~)z
zT=6Y7ulx=}<8Scr_UqU-_z)5gPo%050PsbM*ZLno;_-ow&k?FZJtYmb2hPA$LkP)8
z=^d0Q6PImh6Y|QT?{grxj)S=uBKvY2EQUbm@ns9^yKiP~$DcD)c$5Em`zDSScH%iH
zVov&m=cMo`1tYwA=!a}vb_ef_{)Q2?FUqn>BR$6phXQRv^1%=YfyE-F$AR4Q?9D!f
zCzB^^#td~4u&l~l#rp2QLfe3+_ub9@+|x+m;=2(sQ`s%gO|j$XBb>A7Q(Uy<Ms~mR
z)sr@Bsv6HJK@x#68l_8!W4+tria4%_*Y>dipiMw%igcweV#Cr~SP);q>w`bxts_4}
znKHg?X==JDkQl3Y>Ckt%`s{n?Nq-1<xam62X*|eake2F>Fw5~%Mq$CAsi-`yu_bKm
zxs#QdE7&vgJD%M84f4SNzSDv)S|V?|$!d5a#lhT5>>YWE4NGqa9-fbmV$=<!@JM<c
zC&X_omO$rmWt??g*K=X#7Z@$=;a9tEXDI(Vu9G}wXJ-C-A`g4(;Dem+-U&z%S^l~N
zQ((^hAY(O|#LDVE#%LB51-uk1+Ae2(_f1IQ@xp<7*qeP4fxvebRLei*VsS*AT)B@e
zWA_nla&2xtIp+k0rc6h2Eh(>)@k&32kdEYetna>=j@0>V8+wRsL;po!3ivVwh<9tn
z2S<1u9DAAQ>x1Sn=fk`)At|quvleV($B|#Kap_lB-F^*yV=wZ{9baUu(uXfokr95^
zA*!*W=5a>$2Ps`<ZO3O>-F^+qRQT<luhKvM2V5DC;>^{*cN>vipT*4!r#p%{(#I7s
z0NN94*q?ib$KJjfDI_sjHNdmEVp5wB&j54O#VoFqBwy)gfA$%)4d_X4q${<K?$%4`
zAKx-J)i?#riIMhXoFj#uJh}JljFtNkLb7$>L9Xom2R3xy&ZBSNgt4a1d7K^CDWa9r
zVb-_52m}Vp)`9;ZSKd#|U4ZYj5}Gp49{4utST|=c`~(#>KHF6}CCov<Oc3fKBc;8#
zGIi`Nx+1|?<uF?Y9^~S#8%cQ`XcHd0KbtaZ1f3cTu8gxFwmkaSt`43|v19n>1iHYw
zt{bWo)A@yF2$~c(nR$rSAaFQ$(Wh{vkG1AlutDMw=mM`C`T=X&|Ad9fb5Od}ROt1z
z<iuFelzP>OpczHqrb4Jo^rSCiW#&o(m7jFamnrsTpQb;*h4o8r#$aZ}2RaT-x2u^^
z%u@YyIv$U^u~@9(XGbSwU@fk6SikH>j+D1jQrYTKGJpW%vUT{!d}7THI5&Sa?~MKy
zS0-mvMl+BOcroEJ@hN!2H_?coTEJ5Q<;Nd?yx;eIj4{$$E2?YUO|NtNPJ-PdDf;s}
zab;}Mz0kbOI}5*w@3gROcnl#5)wQnEhDBfn!Xhy`u>C}*E~vWpO^HS)FC>8^umI=+
z&H;LW6w#;EF`}vQd_9Muru`KnQVPI9U?(sD<bWa&SZmeEGH6DFY6WD0w}C;Rh4&^w
zc_LD>)&Dg-0j3#(!fNKVZ_GoYH{la~d*1Yh$TI-TL>mI4vpNb@sU2=IZ8vL%AXUx0
zz{K0|nK(yizLHaeW#ZhRfQXoK^}1$<rbM${EMT&_)(%*j&)QQ%O^fOeSPGdq*yOYb
xs*zGFL~-IVT`+%1s&@qImmziC^|Zdw{{iC%_e>=$#1{Yn002ovPDHLkV1n#w+^+xt

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/ffxcp/res/drawable-ldpi/icon.png b/build/mobile/sutagent/android/ffxcp/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1095584ec21f71cd0afc9e0993aa2209671b590c
GIT binary patch
literal 1723
zcmV;s21NOZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000JpNkl<ZSPAV|
zTWnNS6kYeubY6Whoj!oJloqJGA0nb5fDz@Ri3x^3On~Tz5)-4wS4_m1D8}&Nhfxy{
z69ayjV2tmmi3my*6%bHLDd3b!TbgO<OkeZ557)lsPCB=DDm0)!?#Z5e&z^J7UT5un
z&e?N;|7BtZ6qldHRz&qty;Kj?tsl+TEe4;^sTwtN^<Hc_aXON=04dx0QuR(xarQnl
z*Y$?on0m_h`QGh4&vC>ARe<Hh2}sx|ed^8SkIr5c-eKY<z@Y<$pYtcLyzu(tC*Edr
zfGVt6A|V+oDjOw3!~L}g5sYa<;YBw!cvP<gp2D9sD2mKstmNBG(}1d|`Ohi}28QFc
zd@4j8rse<%fUzQs`BO<V2!pqV3cn|URWqK1t{KpE6MB{**A-+kBUsn?3bR3hq3JMb
zGc*%gR>P91Tc8>~sHP8V>Ys(CF=aT`Sk=;|pS}XrJPb~T1dys{sdO&0YpQBSz*~us
zcN*3-J_EnE1cxrXiq*F~jZje~rkAe3vf3>;eR)3?Ox=jK*jEU7Do|T`2NqP{56w(*
zBAf)rvPB_7rsfeKd0^!CaR%BHUC$tsP9m8a!i@4&TxxzagzsYHJvblx4rRUu#0Jlz
zclZJwdC}7S3BvwaIMTiwb!98zRf|zoya>NudJkDGgEYs=q*HmC)>GExofw=92}s;l
z_YgKLUT5`<1RBwq{f)K<EkI>~I%M=gRE6d<FHDq&W)h|sStE^=^^YK)Y-gCukktCI
zyk;}6aco?&J1^Hr5X_bX_y7#KLtFtxLbEV4yat9bO7raUdvlKkyy4uvOtCUJFV~jL
z4F_gf?I6P`67*JZthLs?{Usrbgxc+9-qjV5^bjy6SJ}TU{|O*fbxYmRsk;KwbuMGF
zV~6Z!up~a*#1)Wq6hM;=nYFAZ2=_!2bp<33Og4weD-y{LCU=7y0hUbw7ZO)M(s|N=
zOdXwxqui@za+L9lLcsL(^&t=lRI|f4WUhcDzSj?k+on>)b5BP`8{u9x0-wsG%H)w^
zRU7n9FwtlfsZ<KFSWNbmYXiiN*Ok-)q-Xedoa)(!*hmY~dIHC~-a*J$h1uondA4mP
zSU)GJA(2QR7z~OFS!x0(50ooIHamrqTGLZ7%q)D~GHbL$9Xrt0`x#VKN-6Q6pnl3)
zbR>SjiSB(k8~Y5+O>dyoSI477Ly?|FR?m))C!ci%BtY!2Sst8Uri#|SFX&)8{_Ou2
z9r5p3Vz9_GY#%D>%huqp_>U}K45YGy__TE!HZA@bMxX~@{;><au~O%#R=eO1RfrvV
zN@}1b)ej(%>cGYRgH~Ih*vd7EgV7h6Pg$#$lH+5=^lj{W80p{{l+;{7_t5cv3xVUy
zl_BY4ht1JH*EEeRS{VwTC(QFIVu8zF&P8O$gJsMgsS<v<^cG8zH12ME8E3p7ArSJ)
z&M1j((`t=fkRbsyk@k;7F_7#+Brq3Ek@Z%>O35SVvBrX`Vah$Yz2-5T>-`4DJNH;N
zlSSY8-mfty+|1~*;BtTwL<Ip!$O-{6nJWXCZfj~?gGcf6rCkhL5i}!%NU#a3>z_w5
z+lRv)J28~G%ouyvca(@|{2->WsPii&79&nju7ITE6hMX4AQc{|KqZN#)aAvemg3IZ
zCr}Y+!r}JU&^>U1C2WyZC<=47itSYQ`?$5{VH?mtFMFFExfYTsfqK%*WzH@Onc#i`
zI@a|rm-WbKk{5my{mF}H>Duc$bit&yLAgFfqo2vVbm~?FeG#0F?dSP*kxSo0Ff!o@
z(C}B;r&6pa-NY4;y~5lX8g&*MYQ>yLGd^tDWC4(sGy$Ow-*!eh%xt;>ve|J1q$*w<
zh;B#cz!6l2=5bkX#nJ9PJQ`ew8t>7z$bxqf*QB=l2_UB$hK|1EIfloN-jQ=qcwChF
zYAkkyp=;FwcnUB3v0=*tMYMA(Hdy<PN`g-^IhR&%fzFN6N*#&lHK?Lk=ZxLc=3rdN
zq(e3yk0;yO+EN7N%Am(wh<K-;2jmbL8HO+Z6SBz}=uJg)0~flX15@%oImi=w^eu?^
z%t_uJK&!llk^e99-)25FLY2R~H%i2Lni{9JP+O^e)Z7~oXC_K$<<GxNRbG`8Q=NTi
znzRTYIm5)q73$E{HZP;%WJucbIzw0y6~<h{M*Cz$0Li2UlrSYKFR#RI$=`tPT2(|y
Rn%e*X002ovPDHLkV1g`*Fem^3

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/ffxcp/res/drawable-mdpi/icon.png b/build/mobile/sutagent/android/ffxcp/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6
GIT binary patch
literal 2574
zcmV+p3i0)cP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TqNkl<ZXa((A
zTaXl28UDI^W_OsGWtUy{!Y<c^KmeB|0kUGyGA1FG<+Tz*5iPC6veb&P)Rg5*9;h-e
z3TmlIsSioYk{F{DmNAwkFOUEcA|RU$mk^d6F3YkP_BQuRcl-T4)62|GPtQQe^5S3h
z&*?tr^nd>Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9<g8_@RM8%EGu#
zOyw}c*6!!ybr1%fK$!Ou1DhVH>sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj
zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc<S)8TvCJ(ixjw3
zDGP|(1X`9Un_CtJe5P6O4Tok16h-k}y%^cd)qX(~3y1&(;3R-pMJy1U42MmBECtgL
z_oL_(B#i{Bm05*qutp_76zFCKsv;ifWL$-`=mi{76bUH<88Zp5;&Y~_s+bHXMSDSF
zJckkwQy?ojfl&9Fx}jNKXK+QzP_5SD&ic<$5P277Obe~>;(H<$!ABY&g<qQoV`}XB
zymTgs1$FnL&bJu4p0VhC=8or(5d~RmWa&;lQ&x+IY&_aYq<~*13&;c!tSXaIRAEF=
zB<NcF6z2Nxz(jNa!_iZ?yY1^}3a-Li7k-IIVgR3A@f`f#Ip`ZXfIAz$i21em;CTN_
z=xEu3VAVXlcIsQuGdfb46xxDaSk?R`H2PP;NRz%=?4~pTga_dz#}k`EC}jbv!cw~B
zHsU&lZlE=|p3FXv_J;eB)>By1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY
z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)H<?OK4zWQV%p-Vko~Ntr}xRbH946I
zBbJy%oM;*<Qu-v?>pq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY
zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7
zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e`
zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf
zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC
z<IaPt3t7R-6esQN0HcDnT?G)P?Tm0c1gJ!Dt^$bfixvcL7nF-XR{?CME762Kcc$C2
z0^CXqusEZ9EG@XXRRY=h?lWDp(5=?IC?k=XaOY^+XgMBS1rS=c1#U%~*5f!7`iWIr
zm7^!xPp7$o27|RVH8pa$a)h!jBpN8E1xL!$I)x$2C0IsF*=^G#^@5r9yhtR1D_5>y
zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7!
z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(R<hk59!
zW=XvsOXl2%B`grF;AT}St~EM33K2wrmQn?+2@Y0p6+pBvrWT^^V6rHyhHhkp1z8pz
zbryOC|A-TVzh@Pjttc&ls7T$Eawdh)_?r~$O&m~viVgF=iIq(c^GhAcWD*{aheGlU
zQ|MtuY-GhO>b|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aF<C~nc##zP@rBRelZ&>K
zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``<Z0-}AfLb=^g=Q+9A---7|U+2N)
zKd9DfaQ52Yps9ZGfvJGaszssZ->}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW
zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`<
z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+Oz<nLfHjoFa)k
z@jh(Yx+=2QOc~A*As$?^lQRq)3_XjOK8~%cccZ0x1Js6YG`2CYa;IA-0bFCCGVPNr
zL2`REIf(P4`>Y^c-M9@+fz=G`q<GOZlu*|(zvf<SUix$Njqk_ab5A3#M<oK#J@_)#
zF{tIXf^lqXzDWDBuB!!Pf<XB!Bm$@iO&ma&w-a(qOl6{s9o|LdEh}1<fL$^7^H|-u
z1t+e)h<}~^0jEeP^C~Jg_vF<-^N3oHdfzhiXHHlwSd2LQxLQEw+g2#o8dP&Q$@42i
zPEox$JMwp2i=E|*xKLK(8ne@y=C5MuoQH7e;!Xzh0gHKS9qUO%VG7oKI61tVw;qp?
zT%HD|M7%DEs|AE<I}WaY;`}73!Vq_rZ9p-ZSF##4B|tSl?rMG<)t)-MGqejQhyFs1
zOYY$u$1R38AVwJR<T&GF2Y!V|ofl<qSqqf>a@v4sF5u-2289-#$**LWnyNNDwDf1(
zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W
zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V
zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB
z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp|
z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu
z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR
z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_S<r>mOtclS?KWk2VYE
zM*oS<=C483Xc<XBH-T2(vVJUXr<9s6L8%y!+?6<f{P<XJZ|@}c0}+%-f$DVxIixSf
zyZx`_jp~RryiOnPLN6^M#a^XAPNg`KKXr{n)Ewh?38G^@b)qVL^*LP6b}_MzC^c}&
z>kW?GN|1jfh3Ro(h<KDZN|fWBj7@=)05T}o0kZov5oZ%?h%8)~*k=Yr+YBDaVOp3T
zBFg{7f(5Qr%7ttVh}3fDAw-1vQZd7!TMCkUL<sw@Rk22a=Izx=SwI*ShDAWTmANx1
kfM{AOIT6Hei<0X907#l7&=u{JbN~PV07*qoM6N<$f*QKj`~Uy|

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/ffxcp/res/layout/main.xml b/build/mobile/sutagent/android/ffxcp/res/layout/main.xml
new file mode 100644
index 000000000000..3a5f117d3cb1
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/build/mobile/sutagent/android/ffxcp/res/values/strings.xml b/build/mobile/sutagent/android/ffxcp/res/values/strings.xml
new file mode 100644
index 000000000000..19770c76262b
--- /dev/null
+++ b/build/mobile/sutagent/android/ffxcp/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, firefoxcp!</string>
+    <string name="app_name">FirefoxCP</string>
+</resources>
diff --git a/build/mobile/sutagent/android/watcher/AndroidManifest.xml b/build/mobile/sutagent/android/watcher/AndroidManifest.xml
new file mode 100644
index 000000000000..655634b7fc8c
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.mozilla.watcher"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
+        <activity android:name=".WatcherMain"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".WatcherReceiver">
+            <intent-filter>
+                 <action android:value="android.intent.action.BOOT_COMPLETED" android:name="android.intent.action.BOOT_COMPLETED"/>
+                 <category android:value="android.intent.category.HOME" android:name="android.intent.category.HOME"/>
+            </intent-filter>
+        </receiver>
+	<service android:name="WatcherService">
+		<intent-filter>
+			<action android:name="com.mozilla.watcher.LISTENER_SERVICE" />
+		</intent-filter>
+	</service>
+
+    </application>
+    <uses-sdk android:minSdkVersion="5" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> 
+
+
+
+<uses-permission android:name="android.permission.DISABLE_KEYGUARD"></uses-permission>
+
+<uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
+
+<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
+
+</manifest> 
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/watcher/IWatcherService.java b/build/mobile/sutagent/android/watcher/IWatcherService.java
new file mode 100644
index 000000000000..1b98dbb1071e
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/IWatcherService.java
@@ -0,0 +1,104 @@
+/*
+ * This file is auto-generated.  DO NOT MODIFY.
+ * Original file: C:\\Users\\Bob\\workspace\\Watcher\\src\\com\\mozilla\\watcher\\IWatcherService.aidl
+ */
+package com.mozilla.watcher;
+public interface IWatcherService extends android.os.IInterface
+{
+/** Local-side IPC implementation stub class. */
+public static abstract class Stub extends android.os.Binder implements com.mozilla.watcher.IWatcherService
+{
+private static final java.lang.String DESCRIPTOR = "com.mozilla.watcher.IWatcherService";
+/** Construct the stub at attach it to the interface. */
+public Stub()
+{
+this.attachInterface(this, DESCRIPTOR);
+}
+/**
+ * Cast an IBinder object into an com.mozilla.watcher.IWatcherService interface,
+ * generating a proxy if needed.
+ */
+public static com.mozilla.watcher.IWatcherService asInterface(android.os.IBinder obj)
+{
+if ((obj==null)) {
+return null;
+}
+android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
+if (((iin!=null)&&(iin instanceof com.mozilla.watcher.IWatcherService))) {
+return ((com.mozilla.watcher.IWatcherService)iin);
+}
+return new com.mozilla.watcher.IWatcherService.Stub.Proxy(obj);
+}
+public android.os.IBinder asBinder()
+{
+return this;
+}
+@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+{
+switch (code)
+{
+case INTERFACE_TRANSACTION:
+{
+reply.writeString(DESCRIPTOR);
+return true;
+}
+case TRANSACTION_UpdateApplication:
+{
+data.enforceInterface(DESCRIPTOR);
+java.lang.String _arg0;
+_arg0 = data.readString();
+java.lang.String _arg1;
+_arg1 = data.readString();
+java.lang.String _arg2;
+_arg2 = data.readString();
+int _arg3;
+_arg3 = data.readInt();
+int _result = this.UpdateApplication(_arg0, _arg1, _arg2, _arg3);
+reply.writeNoException();
+reply.writeInt(_result);
+return true;
+}
+}
+return super.onTransact(code, data, reply, flags);
+}
+private static class Proxy implements com.mozilla.watcher.IWatcherService
+{
+private android.os.IBinder mRemote;
+Proxy(android.os.IBinder remote)
+{
+mRemote = remote;
+}
+public android.os.IBinder asBinder()
+{
+return mRemote;
+}
+public java.lang.String getInterfaceDescriptor()
+{
+return DESCRIPTOR;
+}
+public int UpdateApplication(java.lang.String sPkgName, java.lang.String sPkgFileName, java.lang.String sOutFile, int bReboot) throws android.os.RemoteException
+{
+android.os.Parcel _data = android.os.Parcel.obtain();
+android.os.Parcel _reply = android.os.Parcel.obtain();
+int _result;
+try {
+_data.writeInterfaceToken(DESCRIPTOR);
+_data.writeString(sPkgName);
+_data.writeString(sPkgFileName);
+_data.writeString(sOutFile);
+_data.writeInt(bReboot);
+mRemote.transact(Stub.TRANSACTION_UpdateApplication, _data, _reply, 0);
+_reply.readException();
+_result = _reply.readInt();
+}
+finally {
+_reply.recycle();
+_data.recycle();
+}
+return _result;
+}
+}
+static final int TRANSACTION_UpdateApplication = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+}
+public int UpdateApplication(java.lang.String sPkgName, java.lang.String sPkgFileName, java.lang.String sOutFile, int bReboot) throws android.os.RemoteException;
+}
diff --git a/build/mobile/sutagent/android/watcher/Makefile.in b/build/mobile/sutagent/android/watcher/Makefile.in
new file mode 100644
index 000000000000..b8c469254018
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/Makefile.in
@@ -0,0 +1,107 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Android sutagent for testing.
+#
+# The Initial Developer of the Original Code is
+#   Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Clint Talbert <ctalbert@mozilla.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = Watcher
+
+JAVAFILES = \
+  IWatcherService.java \
+  RedirOutputThread.java \
+  R.java \
+  WatcherMain.java \
+  WatcherReceiver.java \
+  WatcherService.java \
+  $(NULL)
+
+RES_FILES = \
+  res/drawable-hdpi/icon.png \
+  res/drawable-hdpi/ateamlogo.png \
+  res/drawable-ldpi/icon.png \
+  res/drawable-ldpi/ateamlogo.png \
+  res/drawable-mdpi/icon.png \
+  res/drawable-mdpi/ateamlogo.png \
+  res/layout/main.xml \
+  res/values/strings.xml \
+  $(NULL)
+
+GARBAGE += \
+  AndroidManifest.xml  \
+  classes.dex  \
+  Watcher.apk  \
+  $(NULL)
+
+GARBAGE_DIRS += res classes network-libs
+
+JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
+
+include $(topsrcdir)/config/rules.mk
+
+# include Android specific java flags - using these instead of what's in rules.mk
+include $(topsrcdir)/config/android-common.mk
+
+tools:: Watcher.apk
+
+classes.dex: $(JAVAFILES)
+	$(NSINSTALL) -D classes
+	$(JAVAC) $(JAVAC_FLAGS) -d classes  $(addprefix $(srcdir)/,$(JAVAFILES))
+	$(DX) --dex --output=$@ classes
+
+Watcher.ap_: $(srcdir)/AndroidManifest.xml
+	$(AAPT) package -f -M $(srcdir)/AndroidManifest.xml -I $(ANDROID_SDK)/android.jar  -S res -F $@
+
+Watcher-unsigned-unaligned.apk: Watcher.ap_ classes.dex
+	$(APKBUILDER) $@ -v $(APKBUILDER_FLAGS) -z Watcher.ap_ -f classes.dex
+
+Watcher-unaligned.apk: Watcher-unsigned-unaligned.apk
+	cp  Watcher-unsigned-unaligned.apk $@
+ifdef JARSIGNER
+  $(JARSIGNER) $@
+endif
+
+Watcher.apk: Watcher-unaligned.apk
+	$(ZIPALIGN) -f -v 4 Watcher-unaligned.apk $@
+
+export::
+	$(NSINSTALL) -D res
+	@(cd $(srcdir)/res && tar $(TAR_CREATE_FLAGS) - *) | (cd $(DEPTH)/build/mobile/sutagent/android/watcher/res && tar -xf -)
+
diff --git a/build/mobile/sutagent/android/watcher/R.java b/build/mobile/sutagent/android/watcher/R.java
new file mode 100644
index 000000000000..90dd265265a8
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/R.java
@@ -0,0 +1,25 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.mozilla.watcher;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ateamlogo=0x7f020000;
+        public static final int icon=0x7f020001;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int foreground_service_started=0x7f040002;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/watcher/RedirOutputThread.java b/build/mobile/sutagent/android/watcher/RedirOutputThread.java
new file mode 100644
index 000000000000..d31d0d4cb118
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/RedirOutputThread.java
@@ -0,0 +1,164 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ * 
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.watcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+public class RedirOutputThread extends Thread
+	{
+	OutputStream out;
+	InputStream	sutErr;
+	InputStream	sutOut;
+	Process pProc;
+	String	strOutput;
+	
+	public RedirOutputThread(Process pProc, OutputStream out)
+		{
+		if (pProc != null)
+			{
+			this.pProc = pProc;
+			sutErr = pProc.getErrorStream(); // Stderr
+			sutOut = pProc.getInputStream(); // Stdout
+			}
+		if (out != null)
+			this.out = out;
+		
+		strOutput = "";
+		}
+	
+	public void run()
+		{
+		boolean bStillRunning = true;
+		int	nBytesOut = 0;
+		int nBytesErr = 0;
+		int nBytesRead = 0;
+		PrintWriter pOut = null;
+		byte[] buffer = new byte[1024];
+		
+		if (out != null)
+			pOut = new PrintWriter(out);
+		else
+			bStillRunning = true;
+		
+		while (bStillRunning) 
+			{
+			try 
+				{
+				if ((nBytesOut = sutOut.available()) > 0)
+					{
+					if (nBytesOut > buffer.length)
+						{
+						buffer = null;
+						System.gc();
+						buffer = new byte[nBytesOut];
+						}
+					nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+					if (nBytesRead == -1)
+						bStillRunning = false;
+					else 
+						{
+						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+						if (pOut != null)
+							{
+							pOut.print(sRep);
+							pOut.flush();
+							}
+						else
+							strOutput += sRep;
+						}
+					}
+
+				if ((nBytesErr = sutErr.available()) > 0)
+					{
+					if (nBytesErr > buffer.length)
+						{
+						buffer = null;
+						System.gc();
+						buffer = new byte[nBytesErr];
+						}
+					nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+					if (nBytesRead == -1)
+						bStillRunning = false;
+					else 
+						{
+						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+						if (pOut != null)
+							{
+							pOut.print(sRep);
+							pOut.flush();
+							}
+						else
+							strOutput += sRep;
+						}
+					}
+
+				bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+				} 
+			catch (IOException e)
+				{
+//				Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
+				e.printStackTrace();
+				}
+			}
+		
+		pProc.destroy();
+		buffer = null;
+		System.gc();
+		}
+	
+	private boolean IsProcRunning(Process pProc)
+		{
+		boolean bRet = false;
+		@SuppressWarnings("unused")
+		int nExitCode = 0;
+	
+		try
+			{
+			nExitCode = pProc.exitValue();
+			}
+		catch (IllegalThreadStateException z)
+			{	
+			bRet = true;
+			}
+
+		return(bRet);
+		}
+	}
diff --git a/build/mobile/sutagent/android/watcher/WatcherMain.java b/build/mobile/sutagent/android/watcher/WatcherMain.java
new file mode 100644
index 000000000000..23c12813b283
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/WatcherMain.java
@@ -0,0 +1,13 @@
+package com.mozilla.watcher;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class WatcherMain extends Activity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
\ No newline at end of file
diff --git a/build/mobile/sutagent/android/watcher/WatcherReceiver.java b/build/mobile/sutagent/android/watcher/WatcherReceiver.java
new file mode 100644
index 000000000000..fa7e15255038
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/WatcherReceiver.java
@@ -0,0 +1,19 @@
+package com.mozilla.watcher;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+// import android.os.Debug;
+
+public class WatcherReceiver extends BroadcastReceiver {
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+//		Debug.waitForDebugger();
+		Intent serviceIntent = new Intent();
+		serviceIntent.putExtra("command", "start");
+		serviceIntent.setAction("com.mozilla.watcher.LISTENER_SERVICE");
+		context.startService(serviceIntent);
+	}
+
+}
diff --git a/build/mobile/sutagent/android/watcher/WatcherService.java b/build/mobile/sutagent/android/watcher/WatcherService.java
new file mode 100644
index 000000000000..5a394190a7b8
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/WatcherService.java
@@ -0,0 +1,914 @@
+package com.mozilla.watcher;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.KeyguardManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.Toast;
+
+public class WatcherService extends Service
+{
+    String sErrorPrefix = "##Installer Error## ";
+    String currentDir = "/";
+    String sPingTarget = "";
+    long	lDelay = 60000;
+    long	lPeriod = 300000;
+    int		nMaxStrikes = 3;
+	Process	pProc;
+	Context myContext = null;
+	Timer myTimer = null;
+    private PowerManager.WakeLock pwl = null;
+	public static final int NOTIFICATION_ID = 1964;
+	boolean bInstalling = false;
+
+    @SuppressWarnings("unchecked")
+	private static final Class[] mStartForegroundSignature = new Class[] {
+        int.class, Notification.class};
+    @SuppressWarnings("unchecked")
+	private static final Class[] mStopForegroundSignature = new Class[] {
+        boolean.class};
+
+    private NotificationManager mNM;
+    private Method mStartForeground;
+    private Method mStopForeground;
+    private Object[] mStartForegroundArgs = new Object[2];
+    private Object[] mStopForegroundArgs = new Object[1];
+
+	
+	private IWatcherService.Stub stub = new IWatcherService.Stub() {
+		@Override
+		public int UpdateApplication(String sAppName, String sFileName, String sOutFile, int bReboot) throws RemoteException
+			{
+			return UpdtApp(sAppName, sFileName, sOutFile, bReboot);
+			}
+	};
+	
+	@Override
+	public IBinder onBind(Intent arg0) {
+		return stub;
+	}
+
+	@Override
+	public void onCreate()
+		{
+		super.onCreate();
+		
+		myContext = this;
+		
+		getKeyGuardAndWakeLock();
+		
+        File dir = getFilesDir();
+        File iniFile = new File(dir, "watcher.ini");
+        String sIniFile = iniFile.getAbsolutePath();
+        String sHold = "";
+
+        this.sPingTarget = GetIniData("watcher", "PingTarget", sIniFile, "www.mozilla.org");
+        sHold = GetIniData("watcher", "delay", sIniFile, "60000");
+       	this.lDelay = Long.parseLong(sHold.trim());
+        sHold = GetIniData("watcher", "period", sIniFile,"300000");
+       	this.lPeriod = Long.parseLong(sHold.trim());
+        sHold = GetIniData("watcher", "strikes", sIniFile,"3");
+       	this.nMaxStrikes = Integer.parseInt(sHold.trim());
+       	
+		doToast("WatcherService created");
+		}
+
+	public String GetIniData(String sSection, String sKey, String sFile, String sDefault)
+		{
+		String sRet = sDefault;
+		String sComp = "";
+		String sLine = "";
+		boolean bFound = false;
+		BufferedReader in = null;
+		String	sTmpFileName = fixFileName(sFile);
+	
+		try {
+			in = new BufferedReader(new FileReader(sTmpFileName));
+			sComp = "[" + sSection + "]";
+			while ((sLine = in.readLine()) != null)
+				{
+				if (sLine.equalsIgnoreCase(sComp))
+					{
+					bFound = true;
+					break;
+					}
+				}
+		
+			if (bFound)
+				{
+				sComp = (sKey + " =").toLowerCase();
+				while ((sLine = in.readLine()) != null)
+					{
+					if (sLine.toLowerCase().contains(sComp))
+						{
+						String [] temp = null;
+						temp = sLine.split("=");
+						if (temp != null)
+							{
+							if (temp.length > 1)
+								sRet = temp[1].trim();
+							}
+						break;
+						}
+					}
+				}
+			in.close();
+			}
+		catch (FileNotFoundException e)
+			{
+			sComp = e.toString();
+			} 
+		catch (IOException e) 
+			{
+			sComp = e.toString();
+			}
+		return (sRet);
+		}
+	
+	private void handleCommand(Intent intent)
+		{
+		String sCmd = intent.getStringExtra("command");
+		
+//		Debug.waitForDebugger();
+		
+		if (sCmd != null)
+			{
+			if (sCmd.equalsIgnoreCase("updt"))
+				{
+				String sPkgName = intent.getStringExtra("pkgName");
+				String sPkgFile = intent.getStringExtra("pkgFile");
+				String sOutFile = intent.getStringExtra("outFile");
+				boolean bReboot = intent.getBooleanExtra("reboot", true);
+				int nReboot = bReboot ? 1 : 0;
+	       		SendNotification("WatcherService updating " + sPkgName + " using file " + sPkgFile, "WatcherService updating " + sPkgName + " using file " + sPkgFile);
+
+	       		UpdateApplication worker = new UpdateApplication(sPkgName, sPkgFile, sOutFile, nReboot);
+				}
+			else if (sCmd.equalsIgnoreCase("start"))
+				{
+				doToast("WatcherService started");
+				myTimer = new Timer();
+				myTimer.scheduleAtFixedRate(new MyTime(), lDelay, lPeriod);
+				}
+			else
+				{
+				doToast("WatcherService unknown command");
+				}
+			}
+		else
+			doToast("WatcherService created");
+		}
+
+
+	@Override
+	public void onStart(Intent intent, int startId) {
+		handleCommand(intent);
+		return;
+	}
+	
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		handleCommand(intent);
+		return START_STICKY;
+		}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		doToast("WatcherService destroyed");
+        if (pwl != null)
+        	pwl.release();
+        stopForegroundCompat(R.string.foreground_service_started);
+	}
+
+    protected void getKeyGuardAndWakeLock()
+    	{
+        // Fire off a thread to do some work that we shouldn't do directly in the UI thread
+        Thread t = new Thread() {
+            public void run() {
+                // Keep phone from locking or remove lock on screen
+                KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
+                if (km != null)
+                	{
+                	KeyguardManager.KeyguardLock kl = km.newKeyguardLock("watcher");
+                	if (kl != null)
+                		kl.disableKeyguard();
+                	}
+                
+                // No sleeping on the job
+                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+                if (pm != null)
+                	{
+                	pwl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "watcher");
+                	if (pwl != null)
+                		pwl.acquire();
+                	}
+               	
+                mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+                try {
+                    mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
+                    mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
+                	}
+                catch (NoSuchMethodException e)
+                	{
+                    // Running on an older platform.
+                    mStartForeground = mStopForeground = null;
+                	}
+                Notification notification = new Notification();
+                startForegroundCompat(R.string.foreground_service_started, notification);
+            	}
+        	};
+        t.start();
+    	}
+
+    /**
+     * This is a wrapper around the new startForeground method, using the older
+     * APIs if it is not available.
+     */
+    void startForegroundCompat(int id, Notification notification) {
+        // If we have the new startForeground API, then use it.
+        if (mStartForeground != null) {
+            mStartForegroundArgs[0] = Integer.valueOf(id);
+            mStartForegroundArgs[1] = notification;
+            try {
+                mStartForeground.invoke(this, mStartForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke startForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke startForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.
+        setForeground(true);
+        mNM.notify(id, notification);
+    }
+
+    /**
+     * This is a wrapper around the new stopForeground method, using the older
+     * APIs if it is not available.
+     */
+    void stopForegroundCompat(int id) {
+        // If we have the new stopForeground API, then use it.
+        if (mStopForeground != null) {
+            mStopForegroundArgs[0] = Boolean.TRUE;
+            try {
+                mStopForeground.invoke(this, mStopForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.  Note to cancel BEFORE changing the
+        // foreground state, since we could be killed at that point.
+        mNM.cancel(id);
+        setForeground(false);
+    }
+
+	public void doToast(String sMsg)
+		{
+		Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
+		toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
+		toast.show();
+		}
+	
+	public void CheckMem() {
+       	System.gc();
+		long lFreeMemory = Runtime.getRuntime().freeMemory();
+		long lTotMemory = Runtime.getRuntime().totalMemory();
+		long lMaxMemory = Runtime.getRuntime().maxMemory();
+		
+		SendNotification("Memory Check", "Free: " + lFreeMemory + "Total: " + lTotMemory + "Max: " + lMaxMemory);
+	}
+	
+	public int UpdtApp(String sPkgName, String sPkgFileName, String sOutFile, int bReboot)
+		{
+		int nRet = 1;
+		int lcv = 0;
+		String sRet = "";
+
+//		Debug.waitForDebugger();
+		
+    	FileOutputStream f = null;
+    	
+       	try {
+       		SendNotification("Killing " + sPkgName, "Step 1: Kill " + sPkgName + " if running");
+            while (!IsProcessDead(sPkgName) && (lcv < 5)) {
+            	if (KillProcess(sPkgName, null).startsWith("Successfully"))
+            		break;
+            	else
+            		lcv++;
+               	Thread.sleep(2000);
+       			}
+            
+           	CheckMem();
+           	
+            if ((sOutFile != null) && (sOutFile.length() > 0)) {
+            	File outFile = new File(sOutFile);
+            	if (outFile.exists() && outFile.canWrite()) {
+                	f = new FileOutputStream(outFile, true);
+            	} else {
+               		SendNotification("File not found or cannot write to " + sOutFile, "File not found or cannot write to " + sOutFile);
+            	}
+            }
+		} catch (InterruptedException e) {
+       		e.printStackTrace();
+		} catch (FileNotFoundException e) {
+       		SendNotification("File not found " + sOutFile, "Couldn't open " + sOutFile + " " + e.getLocalizedMessage());
+			e.printStackTrace();
+       	} catch (SecurityException e) {
+       		SendNotification("Security excepetion for " + sOutFile, "Exception message " + e.getLocalizedMessage());
+			e.printStackTrace();
+       	}
+       	
+    	if ((sPkgName != null) && (sPkgName.length() > 0))
+    		{
+       		SendNotification("Uninstalling " + sPkgName, "Step 2: Uninstall " + sPkgName);
+    		sRet = UnInstallApp(sPkgName, null);
+           	CheckMem();
+    		if ((sRet.length() > 0) && (f != null))
+    			{
+    			try {
+					f.write(sRet.getBytes());
+					f.flush();
+					}
+    			catch (IOException e)
+    				{
+					e.printStackTrace();
+    				}
+    			}
+    		}
+    		
+    	if ((sPkgFileName != null) && (sPkgFileName.length() > 0))
+    		{
+       		SendNotification("Installing " + sPkgFileName, "Step 3: Install " + sPkgFileName);
+    		sRet = InstallApp(sPkgFileName, null);
+       		SendNotification("Installed " + sPkgFileName, "" + sRet);
+           	CheckMem();
+    		if ((sRet.length() > 0) && (f != null))
+				{
+    			try {
+    				f.write(sRet.getBytes());
+    				f.flush();
+    				f.close();
+					}
+    			catch (IOException e)
+					{
+    				e.printStackTrace();
+					}
+				}
+    		}
+    	
+    	if (bReboot > 0)
+    		RunReboot(null);
+    	
+		return(nRet);
+		}
+	
+	public boolean GetProcessInfo(String sProcName)
+		{
+		boolean bRet = false;
+		ActivityManager aMgr = (ActivityManager) getApplicationContext().getSystemService(Activity.ACTIVITY_SERVICE);
+		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+		int	nProcs = lProcesses.size();
+		int lcv = 0;
+		String strProcName = "";
+
+		for (lcv = 0; lcv < nProcs; lcv++)
+			{
+			strProcName = lProcesses.get(lcv).processName;
+			if (strProcName.contains(sProcName))
+				{
+				bRet = true;
+				}
+			}
+	
+		return (bRet);
+		}
+	
+	public String RunReboot(OutputStream out)
+		{
+		String sRet = "";
+		String [] theArgs = new String [3];
+
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
+		theArgs[2] = "reboot";
+
+		try 
+			{
+			pProc = Runtime.getRuntime().exec(theArgs);
+			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+			outThrd.start();
+			outThrd.join(10000);
+			}
+		catch (IOException e) 
+			{
+			sRet = e.getMessage();
+			e.printStackTrace();
+			} 
+		catch (InterruptedException e)
+			{
+			e.printStackTrace();
+			}
+
+		return (sRet);
+		}
+
+	public String KillProcess(String sProcName, OutputStream out)
+		{
+		String [] theArgs = new String [3];
+
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
+		theArgs[2] = "kill";
+
+		String sRet = sErrorPrefix + "Unable to kill " + sProcName + "\n";
+		ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+		int lcv = 0;
+		String strProcName = "";
+		int	nPID = 0;
+
+		for (lcv = 0; lcv < lProcesses.size(); lcv++)
+			{
+			if (lProcesses.get(lcv).processName.contains(sProcName))
+				{
+				strProcName = lProcesses.get(lcv).processName;
+				nPID = lProcesses.get(lcv).pid;
+				sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
+
+				theArgs[2] += " " + nPID;
+		
+				try 
+					{
+					pProc = Runtime.getRuntime().exec(theArgs);
+					RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+					outThrd.start();
+					outThrd.join(5000);
+					}
+				catch (IOException e) 
+					{
+					sRet = e.getMessage();
+					e.printStackTrace();
+					} 
+				catch (InterruptedException e)
+					{
+					e.printStackTrace();
+					}
+
+				// Give the messages a chance to be processed
+				try {
+					Thread.sleep(2000);
+					}
+				catch (InterruptedException e)
+					{
+					e.printStackTrace();
+					}
+				break;
+				}
+			}
+
+		if (nPID > 0)
+			{
+			sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
+			lProcesses = aMgr.getRunningAppProcesses();
+			for (lcv = 0; lcv < lProcesses.size(); lcv++)
+				{
+				if (lProcesses.get(lcv).processName.contains(sProcName))
+					{
+					sRet = sErrorPrefix + "Unable to kill " + nPID + " " + strProcName + "\n";
+					break;
+					}
+				}
+			}
+
+		return (sRet);
+		}
+
+	public String GetAppRoot(String AppName)
+		{
+		String sRet = sErrorPrefix + " internal error [no context]";
+		Context ctx = getApplicationContext();
+	
+		if (ctx != null)
+			{
+			try {
+				Context appCtx = ctx.createPackageContext(AppName, 0);
+				ContextWrapper appCtxW = new ContextWrapper(appCtx);
+				sRet = appCtxW.getPackageResourcePath();
+				appCtxW = null;
+				appCtx = null;
+				ctx = null;
+				System.gc();
+				}
+			catch (NameNotFoundException e)
+				{
+				e.printStackTrace();
+				}
+			}
+		return(sRet);
+		}
+
+	public boolean IsProcessDead(String sProcName)
+		{
+		boolean bRet = true;
+		ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses(); //    .getProcessesInErrorState();
+		int lcv = 0;
+
+		if (lProcesses != null)
+			{
+			for (lcv = 0; lcv < lProcesses.size(); lcv++)
+				{
+				if (lProcesses.get(lcv).processName.contentEquals(sProcName))
+					{
+					bRet = false;
+					break;
+					}
+				}
+			}
+
+		return (bRet);
+		}
+
+	public String fixFileName(String fileName)
+		{
+		String	sRet = "";
+		String	sTmpFileName = "";
+
+		sRet = fileName.replace('\\', '/');
+
+		if (sRet.startsWith("/"))
+			sTmpFileName = sRet;
+		else
+			sTmpFileName = currentDir + "/" + sRet;
+
+		sRet = sTmpFileName.replace('\\', '/');
+		sTmpFileName = sRet;
+		sRet = sTmpFileName.replace("//", "/");
+
+		return(sRet);
+		}
+
+	public String GetTmpDir()
+		{
+		String 	sRet = "";
+		Context ctx = getApplicationContext();
+		File dir = ctx.getFilesDir();
+		ctx = null;
+		try {
+			sRet = dir.getCanonicalPath();
+			} 
+		catch (IOException e)
+    		{
+			e.printStackTrace();
+    		}
+		return(sRet);
+		}
+
+	public String UnInstallApp(String sApp, OutputStream out)
+		{
+		String sRet = "";
+		String [] theArgs = new String [3];
+
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
+		theArgs[2] = "pm uninstall " + sApp + ";exit";
+
+		try 
+			{
+			pProc = Runtime.getRuntime().exec(theArgs);
+
+			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+			outThrd.start();
+			outThrd.join(60000);
+			int nRet = pProc.exitValue();
+			sRet = "\nuninst complete [" + nRet + "]";
+			}
+		catch (IOException e) 
+			{
+			sRet = e.getMessage();
+			e.printStackTrace();
+			} 
+		catch (InterruptedException e)
+			{
+			e.printStackTrace();
+			}
+
+		return (sRet);
+		}
+
+	public String InstallApp(String sApp, OutputStream out)
+		{
+		String sRet = "";
+		String sHold = "";
+		String [] theArgs = new String [3];
+
+		theArgs[0] = "su";
+		theArgs[1] = "-c";
+		theArgs[2] = "pm install " + sApp + ";exit";
+
+		try 
+			{
+			pProc = Runtime.getRuntime().exec(theArgs);
+	
+			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+			outThrd.start();
+			outThrd.join(180000);
+			int nRet = pProc.exitValue();
+			sRet += "\ninstall complete [" + nRet + "]";
+			sHold = outThrd.strOutput;
+			sRet += "\nSuccess";
+			}
+		catch (IOException e) 
+			{
+			sRet = e.getMessage();
+			e.printStackTrace();
+			} 
+		catch (InterruptedException e)
+			{
+			e.printStackTrace();
+			}
+		
+		return (sRet);
+		}
+
+	private String SendPing(String sIPAddr)
+		{
+		Process	pProc;
+		String sRet = "";
+		String [] theArgs = new String [4];
+		boolean bStillRunning = true;
+		int	nBytesOut = 0;
+		int nBytesErr = 0;
+		int nBytesRead = 0;
+		byte[] buffer = new byte[1024];
+
+		theArgs[0] = "ping";
+		theArgs[1] = "-c";
+		theArgs[2] = "3";
+		theArgs[3] = sIPAddr;
+
+		try 
+			{
+			pProc = Runtime.getRuntime().exec(theArgs);
+		
+			InputStream sutOut = pProc.getInputStream();
+			InputStream sutErr = pProc.getErrorStream();
+		
+			while (bStillRunning) 
+				{
+				try 
+					{
+					if ((nBytesOut = sutOut.available()) > 0)
+						{
+						if (nBytesOut > buffer.length)
+							{
+							buffer = null;
+							System.gc();
+							buffer = new byte[nBytesOut];
+							}
+						nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+						if (nBytesRead == -1)
+							bStillRunning = false;
+						else 
+							{
+							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+							sRet += sRep;
+							sRep = null;
+							}
+						}
+
+					if ((nBytesErr = sutErr.available()) > 0)
+						{
+						if (nBytesErr > buffer.length)
+							{
+							buffer = null;
+							System.gc();
+							buffer = new byte[nBytesErr];
+							}
+						nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+						if (nBytesRead == -1)
+							bStillRunning = false;
+						else 
+							{
+							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+							sRet += sRep;
+							sRep = null;
+							}
+						}
+
+					bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+					} 
+				catch (IOException e)
+					{
+					e.printStackTrace();
+					}
+			
+				if ((bStillRunning == true) && (nBytesErr == 0) && (nBytesOut == 0))
+					{
+					try {
+						Thread.sleep(2000);
+						}
+					catch (InterruptedException e) {
+						e.printStackTrace();
+						}
+					}
+				}
+
+			pProc.destroy();
+			pProc = null;
+			}
+		catch (IOException e) 
+			{
+			sRet = e.getMessage();
+			e.printStackTrace();
+			}
+
+		return (sRet);
+		}
+	
+	private boolean IsProcRunning(Process pProc)
+		{
+		boolean bRet = false;
+		@SuppressWarnings("unused")
+		int nExitCode = 0;
+
+		try
+			{
+			nExitCode = pProc.exitValue();
+			}
+		catch (IllegalThreadStateException z)
+			{	
+			bRet = true;
+			}
+		catch (Exception e)
+			{
+			e.printStackTrace();
+			}
+
+		return(bRet);
+		}
+	
+	private class UpdateApplication implements Runnable {
+		Thread	runner;
+		String	msPkgName = "";
+		String	msPkgFileName = "";
+		String	msOutFile = "";
+		int		mbReboot = 0;
+		
+		public UpdateApplication(String sPkgName, String sPkgFileName, String sOutFile, int bReboot) {
+			runner = new Thread(this);
+			msPkgName = sPkgName;
+			msPkgFileName = sPkgFileName;
+			msOutFile = sOutFile;
+			mbReboot = bReboot;
+			runner.start();
+		}
+
+		@Override
+		public void run() {
+       		bInstalling = true;
+			UpdtApp(msPkgName, msPkgFileName, msOutFile, mbReboot);
+       		bInstalling = false;
+		}
+	}
+
+	private class MyTime extends TimerTask
+		{
+		int	nStrikes = 0;
+
+		public MyTime()
+			{
+			}
+	
+		@Override
+		public void run()
+			{
+			if (bInstalling)
+				return;
+			
+			// See if the network is up, if not after three failures reboot
+			String sRet = SendPing(sPingTarget);
+			if (!sRet.contains("3 received"))
+				{
+				if (nMaxStrikes > 0)
+					{
+					if (++nStrikes >= nMaxStrikes)
+						RunReboot(null);
+					}
+				}
+			else
+				{
+				nStrikes = 0;
+				}
+			sRet = null;
+
+			String sProgramName = "com.mozilla.SUTAgentAndroid";
+			PackageManager pm = myContext.getPackageManager();
+			
+//			Debug.waitForDebugger();
+		
+			if (!GetProcessInfo(sProgramName))
+				{
+				Intent agentIntent = new Intent();
+				agentIntent.setPackage(sProgramName);
+				agentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+				agentIntent.setAction(Intent.ACTION_MAIN);
+				try {
+					PackageInfo pi = pm.getPackageInfo(sProgramName, PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
+					ActivityInfo [] ai = pi.activities;
+					for (int i = 0; i < ai.length; i++)
+						{
+						ActivityInfo a = ai[i];
+						if (a.name.length() > 0)
+							{
+							agentIntent.setClassName(a.packageName, a.name);
+							break;
+							}
+						}
+					}
+				catch (NameNotFoundException e)
+					{
+					e.printStackTrace();
+					}
+				try 
+					{
+					myContext.startActivity(agentIntent);
+					}
+				catch(ActivityNotFoundException anf)
+					{
+					anf.printStackTrace();
+					}
+				}
+			}
+		}
+	
+	private void SendNotification(String tickerText, String expandedText) {
+		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+		int icon = R.drawable.ateamlogo;
+		long when = System.currentTimeMillis();
+	
+		Notification notification = new Notification(icon, tickerText, when);
+	
+		notification.flags |= Notification.FLAG_AUTO_CANCEL;
+		notification.defaults |= Notification.DEFAULT_SOUND;
+//		notification.defaults |= Notification.DEFAULT_VIBRATE;
+		notification.defaults |= Notification.DEFAULT_LIGHTS;
+	
+		Context context = getApplicationContext();
+	
+		// Intent to launch an activity when the extended text is clicked
+		Intent intent = new Intent(this, WatcherService.class);
+		PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent, 0);
+	
+		notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
+			
+		notificationManager.notify(NOTIFICATION_ID, notification);
+	}
+
+	private void CancelNotification() {
+		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+		notificationManager.cancel(NOTIFICATION_ID);
+	}
+
+}
diff --git a/build/mobile/sutagent/android/watcher/default.properties b/build/mobile/sutagent/android/watcher/default.properties
new file mode 100644
index 000000000000..dbf05f24f2fb
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-5
diff --git a/build/mobile/sutagent/android/watcher/res/drawable-hdpi/ateamlogo.png b/build/mobile/sutagent/android/watcher/res/drawable-hdpi/ateamlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f65bd6e971379d331efd2ff162f2b61938085f1
GIT binary patch
literal 1512
zcmV<E1sD2>P)<h;3K|Lk000e1NJLTq001@s000>X1^@s6dcWO100001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf06}y`Sad^gZEa<4
zbO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98EFf`pVQgu1
zc_2L?I5i5)@W$Z)00l5fL_t(oN5xoKD0W>Ge#;jZ=6RmSl&J`1jG~APxiJ(X7fNKf
zKoaG`5Em#iyPyn7Q8JV<ajBG{xKToqxG=51XVrc?Ug!8;ec${2yLM-vea;@9z1Dix
zT3hAk=SQBNp5*B0NVc}N<mBYUZF_rrva_?}Hu~_6>gDA{7~|{f%TLXUej6JbvbMJV
zQZZg`j4t|A0F{xEK@$@bw6d~7Jv}|t-Q7(yGcz<jJxzUmeN<apOLKE`w79rPVPRq9
z?d?rIK0dObtgNhPe}A9$_V#FJXNPuoce$c(YHErPM;Aae=VV~1si{;`Q$r}x(a|(I
zI!c?Ho3y&R%I&JEDtdf;q`bU53JeTnP;$T^&4`Eyo=2&enwly~`)>kPVKN5?2P!Qs
z<-Mp>DjFLb<I_GqKBj?z0jj8|pqrZ;YHDg?)r7jqsUm;{2M4P$eSCa;X(uKol81+f
z&ZWk{U_%`p9lQyg==SzDU0z<&$;k<=udlOezP!A!YNn;7u}unKQpusu$jC?**!%lC
z_qVjP@Opn!I&yO{Fl-2??d<H#D(3F)PA)DkT;1H<_#K<UH~c3jF#!}3-PqV*5K@T=
zU{G-oi`a}33H>Q>1}4B^<6_fjgCy`So=Ucb@c>^`R73>@1=QHss0a)njE#+TZf9y>
z-<^;+Rq5$!k_YT`a&nSJMn-;1Ah1K>HvUvHO5?QxrsS`r{bpunbbWnIS65d|K$=CU
zBKj*UD_QMz1q$;j0+ZU2R8mUPgKeQ49v(8V)6-K$%AcQ~=U_mmz`iqHIS_JvuCA_B
zQc}V|U|%LCCNwlOqzLTc;epv#r@)jZ{~cRNzvJ`~nV^J(gs`tGEG$$6h7ULlkdm&z
zDXOBTe^QDMh3^8j!;Zjs*f4zEcLnSTaQ_^bbU|Tna;yk;3knKi43HY6hyS3C&(F__
z*oKFPbs9Hn&5D|;Dc<3@8yXrIKyh)gS_+8pmzS3nft{b9lZA!F|06MN$OBOX;z|@m
z?x1~hb92(y*Qc_wvQNN7BqE-cmX<nm)Sn^`ZHPpZ`e9Qj7Z(>y^KWl&bbo(OcXxMm
zdwVM@F#!x&1tJz**qK(q1aWApBck-Aq$J*aS63IOJlYfiti8RR8T6k66U-<_9wOaA
z<c|V?{{H?HA0JOKF)>_`yPch#@prit2FWK9Q>Dm8#HLtZ+Q$Eyajp1A9KKfMq2$w`
zhDdKvq%;qzN5!U*&!I>|Dk(_0fEepxJk%5wnt@D1WEXHJa23cr@Gl4qZIPXzPb*-W
zCyIdxdLttvdDE}2ucW7^_k{?scy4a)7l{F+02dk>${?_Y*c{Yzc6OGIj*d7)8yp<u
zIiR|@zWDX)7r)on*Hc150=EMK0{EGdlEMe^V_*OUnodto|71?h&COrZ5in$3U7Z@3
zlodrA*}8#&0fVZpuBP7JUbZ`I4oNQJN<%|Ko&$F-QBhHpnVHGo*4EZ|&8Md)zREy>
zPla#&F)&a%7LY5r7XgKftQ>@*O+iM0!wL@%r`Xt7j$GhIwzjrtX=zEFE#U4YJ3E{G
z<-)=OPmMzWsJ6B?eitdxkAdN2^Yioh)(KY#qT;>3zhBLAu#K#&EIK$iU_U4QS94rv
zXD8bU0Ewg)s*VH1%@&+J)DnTf`1m*n*l}@jOibnF<<#2RN;x?>oKYkvC$nmQ3rvYL
z08Z}iP?Nd=PU((OdhaNA2ZFVs9RLW@z&s!atRYktbHI+#k3HdC*z14S7)K2k6Hd?o
O0000<MNUMnLSTZ(cchyD

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/drawable-hdpi/icon.png b/build/mobile/sutagent/android/watcher/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8074c4c571b8cd19e27f4ee5545df367420686d7
GIT binary patch
literal 4147
zcmV-35X|q1P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm000W`000W`0Ya=am;e9(9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1|5tw}^dRCt{2oOy6v)qTf5=iKFO(zBjyS+Xo+%Qj{)!7Q$W
z6KBFe9H5z!Cet*NNr0A2LK&8HhBBEZoyic|G);$p5}K_o1!mG|N`@p9l1vB;J7GzU
z0UH||Z?dh;mfn-zdhc2K$9>OwvMs$Q8_8nISM!^>PxsujeDCl4&hPxrxkp%Qc^^|l
zp6LqAcf3zf1H4aA1Gv-O6ha)ktct9Y+VA@N^9i;p0H%6v>ZJZYQ`zEa396z-gi{r_
zDz)D=vgRv62GCVeRjK{15j7<m5mZl(2gHEX4d3YbCqHS|8EZwgD)Wt;2qJ2{6v75Y
zvGsww4t^CV0F}B_(~=~n8|H-&l88hPhy!ic-_?C@ysdn7po;H83+4{Ko1~nL|K`DO
z9KIFE0%ag1(kL?(4~+<_k&^&YU;FXK@3ppjpEO#}zYf(17Np}aJ`(=&TVH<hHX=<b
z5s{?r6ht)YVl@ql0gJj;%S|0!N#3izr4TSYFun;`M5H+(6ZYt&XojGg?MdgxMnbQ(
zfHCh)hNKka#wsC@21bc&QApGuPFaI$20D(BQsC5V9{>V@v6|2nafFX6W7z2j1_T0a
zLyT3pGTubf1lB5)32>bl0*BflrA!$|_(<V4RW3$KB75pFc@&<Kfa&v`Fw!w=tK8Iy
zHVRiH=xw{4ws<c}SHKc=Lkreetg(}xDTiaMY5!xcI{O}^bumUCOUp@~3ss5EmUUcv
z?hlDO8H^6mIwbC7xc1y1)0w)EKovQ@ZYL8PjkvLDn_L>WD2)iJIfV}37=<tz>ZKAC
zSe3boYtQ=;o0i>)RtBvsI#iT{0!oF1VFeW`jDjF2Q4aE?{pGCAd>o8Kg#neIh*AMY
zLl{;F!vLiem7s*x0<9FKAd6LoPz3~G32P+F+cuGOJ5gcC@pU_?C<K#zxM?|P#!;*h
z<yaeeoHc_VQSY*5(bXKxzCv5Fm-fVJhKt+z;Idmt`HNZ7dLb2^=kZ;C$5{Cwn^xRG
zZ~I3Hb%|X0Ab~D%ara-4jxS|#%LP2Y?;eW55jL;+ds_T1et+Qmyx#v41QKfv%7pZ!
zH}KI_U!xctA=G7zRgr=;7(HxFvnR-Ds^N`rOa*J?)FjYl+7i8Vq}KApuDd8yhFQ7r
z3QEBkovrIw+xcf~8~8bAWiDey=A&d1tN5d3Ut-sh$0-EENIaAY=t!N%MN2<V-{|kj
zmHW7A&3CA%0<RDJl#i{xoA%_{#M}($cm63cw~Y_4xPwra**EeWu8d=hIiYUT$?@$v
z9fImJ5!Qk=6B4Ql%hDet?zeE^lFyO!+gaYW2}i`RR&#i43orNm8^uZvtiyuXa<K6H
z-tY3(;G+m3!AdNGf!v!svHLE9uuNC_0^aC<m>2fmix7g2<OKw(NJSO!Wh<G)O12OD
zk{9;hOR+MF#G6#FX=OtB>)SUaQO$NS07~H)#fn!Q<}KQWtX}wW`g2>cMld+`7Rxgq
zChaey66SG560JhO66zA!;sK1cWa2AG$9k~VQY??6bOmJsw9@3uL*z;WWa7(Nm{^TA
zilc?y#N9O3LcTo2c)6d}SQl-v-pE4^#wb=s(RxaE28f3FQW(yp$ulG9{KcQ7r>7mQ
zE!HYxUYex~*7IinL+l*>HR*UaD;HkQhkL(5I@UwN%Wz504M^d!ylo>ANvKPF_TvA<
zkugG5;F6x}$s~J8cnev->_(Ic7%lGQgUi3n#XVo36lUpcS<B*<^O3@1)uNA43bS0?
za~<a`{v?j@Ske9wVqO|oCZ?^w;|LChBf!5j-{=N?H4Q8SE&@KYZ+HK&Jq|$-TC1x+
zjI}`!SgWno%32kg6Ve1hV0CD17-|~^%35o!4y{$8K9;8rtqlWhby$7YT5EMR?_>9s
z)ympRr7}@|6WF)Ae;D{owN1;aZS<z%U`85L3`Wtq;{;U>R50al9h~?-WhbtKK%bDd
zhML131oi1Bu1&Qb$Cp199LJ#;j5d|FhW8_i4KO1OI>}J^p2DfreMSVGY9aFlr&90t
zyI2FvxQiKMFviSQeP$Ixh#70qj5O%I+O_I2t2XHWqmh2!1~tHpN3k<ugQ5k@C@Ok7
z+FQ2}+B9a|#m)q5Ej;-ypgId^I<pxY>A4n=1iHj?`@c<~3q<khQ_D+AiSPS(o;PhA
z`n^Sv1#1+erM+mQs!_q26XUurrBaD_Jl?i>^X6_Q$AqTDjBU`|!y<&lkqL|m5tG(b
z8a!z&j^m(|;?SW(l*?tZ*{m2H9d&3jqBtXh>O-5e4Qp-W*a5=2NL&Oi62BUM)>zE3
zbSHb>aU3d@3cGggA`C-PsT9^)oy}%dHCaO~nwOrm5E54=aD<PxWdc(q&_xc9ze;;z
zHLgsOaNCGEX{@j)Q^Ht%Tpp3F>g(&HR4S23Oa#-a^=}w%g?ZP-1iq8PSjE8jYaGZu
z$I<dGMoPOWg+~}HypAJW1P(3!5;{{KV0qg|Sem{J-)X5D@d@oNm&=TgkK?+NnkmGD
z-_Q{A#FMr-B8Dqt^yOY;>)?YN8he?F9>)<bj*Q_57qEn;3|Nj9cQTmY%C_N$=t`~Q
z;w4{XMcd^l6D<P?Ay7&Y1OdM9A8)vuc8KPXAd4&GNZ}FcLfta4#gi!lo#*+!e`fp8
z&(OAv=d=)a+Um*{SaelE1QL&!lK>2d$G6a*zm0XB*Rf&gZAjq(8l@CUDSY1tB#!i>
zW$VfG%#SYSiZ}<yUM62T%y}K3#sZ-(5_4L}RSxpRzOQpA_YyHTjW5$2?;2XGa7B!d
ztoRyIcszIDAF1eZgm9|eQuBwy|4Kd>;)>pHA`qlfDTEYQEwN6>NNEp+uxuqx({Fgr
zjI@!4xRc?vk^9+~eU|mzH__dCDI=xb{Cd}4bELS9xRaS!*FXMwtMR-RR%SLMh0Cjl
zencr8#Su<4(%}$yGVB<Bgt*hjhnC%m<GA#mwVG#MdW;e0Y1~wZEwtgvc)kC3T3hfY
zSMoH5`B0b0#8+|6>U-HX{18v=yPH*+%^Vtknc>2A;%-~DrYFx^3XfuVgvZ{#1tA==
zm3>IzAM2{3Iv_d1XG{P6^tN3|PkJMnjs&CWN7%7_CmjoVakUhsa&dMv==2~^ri?&x
zVdv*rnfVyM+I1^Kg*S=23mR@+0T9BWFZUu~@toA8d)fw6be=`Yb6DSX6D?jB%2YT~
z*aHjtIOozfMhA!Jd*?u5_n!SnX>vX`=Ti-1HA<HWRGx~;;frK-Ys%y;GE<2slXx;!
zx1GgM4s$rf_|Ve7;o7tR9cwMW*zuR_9{CMPZ!v@(j)WyE5}b8zA|%>4RiE>eI3vTn
zz+>Ccf0HX6Ans-ebOB>RJST-Cyr#4XAk+mAlJgdQnoE{^iIN)OcYFSpgJUmXtl@tT
z-^ZuUeSj5hSFrQwqX>~EtZ*{>Gi8Bu9_|o06oNtaXP?E936!a@DsvS*tsB@fa6kEA
z5GkjwmH?EgpiG&itsB_Tb1NxtF<S=iW9N}aFjnEobhIC__!e&t|CIIJH?ueUG}@}#
z*5IbJ2TmcPSR2JoRU8pxF#iT)<-^sjbdq(QH?VQp^>nvxh_s@9KYX1Sttf?AlI~)z
zT=6Y7ulx=}<8Scr_UqU-_z)5gPo%050PsbM*ZLno;_-ow&k?FZJtYmb2hPA$LkP)8
z=^d0Q6PImh6Y|QT?{grxj)S=uBKvY2EQUbm@ns9^yKiP~$DcD)c$5Em`zDSScH%iH
zVov&m=cMo`1tYwA=!a}vb_ef_{)Q2?FUqn>BR$6phXQRv^1%=YfyE-F$AR4Q?9D!f
zCzB^^#td~4u&l~l#rp2QLfe3+_ub9@+|x+m;=2(sQ`s%gO|j$XBb>A7Q(Uy<Ms~mR
z)sr@Bsv6HJK@x#68l_8!W4+tria4%_*Y>dipiMw%igcweV#Cr~SP);q>w`bxts_4}
znKHg?X==JDkQl3Y>Ckt%`s{n?Nq-1<xam62X*|eake2F>Fw5~%Mq$CAsi-`yu_bKm
zxs#QdE7&vgJD%M84f4SNzSDv)S|V?|$!d5a#lhT5>>YWE4NGqa9-fbmV$=<!@JM<c
zC&X_omO$rmWt??g*K=X#7Z@$=;a9tEXDI(Vu9G}wXJ-C-A`g4(;Dem+-U&z%S^l~N
zQ((^hAY(O|#LDVE#%LB51-uk1+Ae2(_f1IQ@xp<7*qeP4fxvebRLei*VsS*AT)B@e
zWA_nla&2xtIp+k0rc6h2Eh(>)@k&32kdEYetna>=j@0>V8+wRsL;po!3ivVwh<9tn
z2S<1u9DAAQ>x1Sn=fk`)At|quvleV($B|#Kap_lB-F^*yV=wZ{9baUu(uXfokr95^
zA*!*W=5a>$2Ps`<ZO3O>-F^+qRQT<luhKvM2V5DC;>^{*cN>vipT*4!r#p%{(#I7s
z0NN94*q?ib$KJjfDI_sjHNdmEVp5wB&j54O#VoFqBwy)gfA$%)4d_X4q${<K?$%4`
zAKx-J)i?#riIMhXoFj#uJh}JljFtNkLb7$>L9Xom2R3xy&ZBSNgt4a1d7K^CDWa9r
zVb-_52m}Vp)`9;ZSKd#|U4ZYj5}Gp49{4utST|=c`~(#>KHF6}CCov<Oc3fKBc;8#
zGIi`Nx+1|?<uF?Y9^~S#8%cQ`XcHd0KbtaZ1f3cTu8gxFwmkaSt`43|v19n>1iHYw
zt{bWo)A@yF2$~c(nR$rSAaFQ$(Wh{vkG1AlutDMw=mM`C`T=X&|Ad9fb5Od}ROt1z
z<iuFelzP>OpczHqrb4Jo^rSCiW#&o(m7jFamnrsTpQb;*h4o8r#$aZ}2RaT-x2u^^
z%u@YyIv$U^u~@9(XGbSwU@fk6SikH>j+D1jQrYTKGJpW%vUT{!d}7THI5&Sa?~MKy
zS0-mvMl+BOcroEJ@hN!2H_?coTEJ5Q<;Nd?yx;eIj4{$$E2?YUO|NtNPJ-PdDf;s}
zab;}Mz0kbOI}5*w@3gROcnl#5)wQnEhDBfn!Xhy`u>C}*E~vWpO^HS)FC>8^umI=+
z&H;LW6w#;EF`}vQd_9Muru`KnQVPI9U?(sD<bWa&SZmeEGH6DFY6WD0w}C;Rh4&^w
zc_LD>)&Dg-0j3#(!fNKVZ_GoYH{la~d*1Yh$TI-TL>mI4vpNb@sU2=IZ8vL%AXUx0
zz{K0|nK(yizLHaeW#ZhRfQXoK^}1$<rbM${EMT&_)(%*j&)QQ%O^fOeSPGdq*yOYb
xs*zGFL~-IVT`+%1s&@qImmziC^|Zdw{{iC%_e>=$#1{Yn002ovPDHLkV1n#w+^+xt

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/drawable-ldpi/ateamlogo.png b/build/mobile/sutagent/android/watcher/res/drawable-ldpi/ateamlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f65bd6e971379d331efd2ff162f2b61938085f1
GIT binary patch
literal 1512
zcmV<E1sD2>P)<h;3K|Lk000e1NJLTq001@s000>X1^@s6dcWO100001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf06}y`Sad^gZEa<4
zbO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98EFf`pVQgu1
zc_2L?I5i5)@W$Z)00l5fL_t(oN5xoKD0W>Ge#;jZ=6RmSl&J`1jG~APxiJ(X7fNKf
zKoaG`5Em#iyPyn7Q8JV<ajBG{xKToqxG=51XVrc?Ug!8;ec${2yLM-vea;@9z1Dix
zT3hAk=SQBNp5*B0NVc}N<mBYUZF_rrva_?}Hu~_6>gDA{7~|{f%TLXUej6JbvbMJV
zQZZg`j4t|A0F{xEK@$@bw6d~7Jv}|t-Q7(yGcz<jJxzUmeN<apOLKE`w79rPVPRq9
z?d?rIK0dObtgNhPe}A9$_V#FJXNPuoce$c(YHErPM;Aae=VV~1si{;`Q$r}x(a|(I
zI!c?Ho3y&R%I&JEDtdf;q`bU53JeTnP;$T^&4`Eyo=2&enwly~`)>kPVKN5?2P!Qs
z<-Mp>DjFLb<I_GqKBj?z0jj8|pqrZ;YHDg?)r7jqsUm;{2M4P$eSCa;X(uKol81+f
z&ZWk{U_%`p9lQyg==SzDU0z<&$;k<=udlOezP!A!YNn;7u}unKQpusu$jC?**!%lC
z_qVjP@Opn!I&yO{Fl-2??d<H#D(3F)PA)DkT;1H<_#K<UH~c3jF#!}3-PqV*5K@T=
zU{G-oi`a}33H>Q>1}4B^<6_fjgCy`So=Ucb@c>^`R73>@1=QHss0a)njE#+TZf9y>
z-<^;+Rq5$!k_YT`a&nSJMn-;1Ah1K>HvUvHO5?QxrsS`r{bpunbbWnIS65d|K$=CU
zBKj*UD_QMz1q$;j0+ZU2R8mUPgKeQ49v(8V)6-K$%AcQ~=U_mmz`iqHIS_JvuCA_B
zQc}V|U|%LCCNwlOqzLTc;epv#r@)jZ{~cRNzvJ`~nV^J(gs`tGEG$$6h7ULlkdm&z
zDXOBTe^QDMh3^8j!;Zjs*f4zEcLnSTaQ_^bbU|Tna;yk;3knKi43HY6hyS3C&(F__
z*oKFPbs9Hn&5D|;Dc<3@8yXrIKyh)gS_+8pmzS3nft{b9lZA!F|06MN$OBOX;z|@m
z?x1~hb92(y*Qc_wvQNN7BqE-cmX<nm)Sn^`ZHPpZ`e9Qj7Z(>y^KWl&bbo(OcXxMm
zdwVM@F#!x&1tJz**qK(q1aWApBck-Aq$J*aS63IOJlYfiti8RR8T6k66U-<_9wOaA
z<c|V?{{H?HA0JOKF)>_`yPch#@prit2FWK9Q>Dm8#HLtZ+Q$Eyajp1A9KKfMq2$w`
zhDdKvq%;qzN5!U*&!I>|Dk(_0fEepxJk%5wnt@D1WEXHJa23cr@Gl4qZIPXzPb*-W
zCyIdxdLttvdDE}2ucW7^_k{?scy4a)7l{F+02dk>${?_Y*c{Yzc6OGIj*d7)8yp<u
zIiR|@zWDX)7r)on*Hc150=EMK0{EGdlEMe^V_*OUnodto|71?h&COrZ5in$3U7Z@3
zlodrA*}8#&0fVZpuBP7JUbZ`I4oNQJN<%|Ko&$F-QBhHpnVHGo*4EZ|&8Md)zREy>
zPla#&F)&a%7LY5r7XgKftQ>@*O+iM0!wL@%r`Xt7j$GhIwzjrtX=zEFE#U4YJ3E{G
z<-)=OPmMzWsJ6B?eitdxkAdN2^Yioh)(KY#qT;>3zhBLAu#K#&EIK$iU_U4QS94rv
zXD8bU0Ewg)s*VH1%@&+J)DnTf`1m*n*l}@jOibnF<<#2RN;x?>oKYkvC$nmQ3rvYL
z08Z}iP?Nd=PU((OdhaNA2ZFVs9RLW@z&s!atRYktbHI+#k3HdC*z14S7)K2k6Hd?o
O0000<MNUMnLSTZ(cchyD

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/drawable-ldpi/icon.png b/build/mobile/sutagent/android/watcher/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1095584ec21f71cd0afc9e0993aa2209671b590c
GIT binary patch
literal 1723
zcmV;s21NOZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000JpNkl<ZSPAV|
zTWnNS6kYeubY6Whoj!oJloqJGA0nb5fDz@Ri3x^3On~Tz5)-4wS4_m1D8}&Nhfxy{
z69ayjV2tmmi3my*6%bHLDd3b!TbgO<OkeZ557)lsPCB=DDm0)!?#Z5e&z^J7UT5un
z&e?N;|7BtZ6qldHRz&qty;Kj?tsl+TEe4;^sTwtN^<Hc_aXON=04dx0QuR(xarQnl
z*Y$?on0m_h`QGh4&vC>ARe<Hh2}sx|ed^8SkIr5c-eKY<z@Y<$pYtcLyzu(tC*Edr
zfGVt6A|V+oDjOw3!~L}g5sYa<;YBw!cvP<gp2D9sD2mKstmNBG(}1d|`Ohi}28QFc
zd@4j8rse<%fUzQs`BO<V2!pqV3cn|URWqK1t{KpE6MB{**A-+kBUsn?3bR3hq3JMb
zGc*%gR>P91Tc8>~sHP8V>Ys(CF=aT`Sk=;|pS}XrJPb~T1dys{sdO&0YpQBSz*~us
zcN*3-J_EnE1cxrXiq*F~jZje~rkAe3vf3>;eR)3?Ox=jK*jEU7Do|T`2NqP{56w(*
zBAf)rvPB_7rsfeKd0^!CaR%BHUC$tsP9m8a!i@4&TxxzagzsYHJvblx4rRUu#0Jlz
zclZJwdC}7S3BvwaIMTiwb!98zRf|zoya>NudJkDGgEYs=q*HmC)>GExofw=92}s;l
z_YgKLUT5`<1RBwq{f)K<EkI>~I%M=gRE6d<FHDq&W)h|sStE^=^^YK)Y-gCukktCI
zyk;}6aco?&J1^Hr5X_bX_y7#KLtFtxLbEV4yat9bO7raUdvlKkyy4uvOtCUJFV~jL
z4F_gf?I6P`67*JZthLs?{Usrbgxc+9-qjV5^bjy6SJ}TU{|O*fbxYmRsk;KwbuMGF
zV~6Z!up~a*#1)Wq6hM;=nYFAZ2=_!2bp<33Og4weD-y{LCU=7y0hUbw7ZO)M(s|N=
zOdXwxqui@za+L9lLcsL(^&t=lRI|f4WUhcDzSj?k+on>)b5BP`8{u9x0-wsG%H)w^
zRU7n9FwtlfsZ<KFSWNbmYXiiN*Ok-)q-Xedoa)(!*hmY~dIHC~-a*J$h1uondA4mP
zSU)GJA(2QR7z~OFS!x0(50ooIHamrqTGLZ7%q)D~GHbL$9Xrt0`x#VKN-6Q6pnl3)
zbR>SjiSB(k8~Y5+O>dyoSI477Ly?|FR?m))C!ci%BtY!2Sst8Uri#|SFX&)8{_Ou2
z9r5p3Vz9_GY#%D>%huqp_>U}K45YGy__TE!HZA@bMxX~@{;><au~O%#R=eO1RfrvV
zN@}1b)ej(%>cGYRgH~Ih*vd7EgV7h6Pg$#$lH+5=^lj{W80p{{l+;{7_t5cv3xVUy
zl_BY4ht1JH*EEeRS{VwTC(QFIVu8zF&P8O$gJsMgsS<v<^cG8zH12ME8E3p7ArSJ)
z&M1j((`t=fkRbsyk@k;7F_7#+Brq3Ek@Z%>O35SVvBrX`Vah$Yz2-5T>-`4DJNH;N
zlSSY8-mfty+|1~*;BtTwL<Ip!$O-{6nJWXCZfj~?gGcf6rCkhL5i}!%NU#a3>z_w5
z+lRv)J28~G%ouyvca(@|{2->WsPii&79&nju7ITE6hMX4AQc{|KqZN#)aAvemg3IZ
zCr}Y+!r}JU&^>U1C2WyZC<=47itSYQ`?$5{VH?mtFMFFExfYTsfqK%*WzH@Onc#i`
zI@a|rm-WbKk{5my{mF}H>Duc$bit&yLAgFfqo2vVbm~?FeG#0F?dSP*kxSo0Ff!o@
z(C}B;r&6pa-NY4;y~5lX8g&*MYQ>yLGd^tDWC4(sGy$Ow-*!eh%xt;>ve|J1q$*w<
zh;B#cz!6l2=5bkX#nJ9PJQ`ew8t>7z$bxqf*QB=l2_UB$hK|1EIfloN-jQ=qcwChF
zYAkkyp=;FwcnUB3v0=*tMYMA(Hdy<PN`g-^IhR&%fzFN6N*#&lHK?Lk=ZxLc=3rdN
zq(e3yk0;yO+EN7N%Am(wh<K-;2jmbL8HO+Z6SBz}=uJg)0~flX15@%oImi=w^eu?^
z%t_uJK&!llk^e99-)25FLY2R~H%i2Lni{9JP+O^e)Z7~oXC_K$<<GxNRbG`8Q=NTi
znzRTYIm5)q73$E{HZP;%WJucbIzw0y6~<h{M*Cz$0Li2UlrSYKFR#RI$=`tPT2(|y
Rn%e*X002ovPDHLkV1g`*Fem^3

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/drawable-mdpi/ateamlogo.png b/build/mobile/sutagent/android/watcher/res/drawable-mdpi/ateamlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f65bd6e971379d331efd2ff162f2b61938085f1
GIT binary patch
literal 1512
zcmV<E1sD2>P)<h;3K|Lk000e1NJLTq001@s000>X1^@s6dcWO100001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf06}y`Sad^gZEa<4
zbO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98EFf`pVQgu1
zc_2L?I5i5)@W$Z)00l5fL_t(oN5xoKD0W>Ge#;jZ=6RmSl&J`1jG~APxiJ(X7fNKf
zKoaG`5Em#iyPyn7Q8JV<ajBG{xKToqxG=51XVrc?Ug!8;ec${2yLM-vea;@9z1Dix
zT3hAk=SQBNp5*B0NVc}N<mBYUZF_rrva_?}Hu~_6>gDA{7~|{f%TLXUej6JbvbMJV
zQZZg`j4t|A0F{xEK@$@bw6d~7Jv}|t-Q7(yGcz<jJxzUmeN<apOLKE`w79rPVPRq9
z?d?rIK0dObtgNhPe}A9$_V#FJXNPuoce$c(YHErPM;Aae=VV~1si{;`Q$r}x(a|(I
zI!c?Ho3y&R%I&JEDtdf;q`bU53JeTnP;$T^&4`Eyo=2&enwly~`)>kPVKN5?2P!Qs
z<-Mp>DjFLb<I_GqKBj?z0jj8|pqrZ;YHDg?)r7jqsUm;{2M4P$eSCa;X(uKol81+f
z&ZWk{U_%`p9lQyg==SzDU0z<&$;k<=udlOezP!A!YNn;7u}unKQpusu$jC?**!%lC
z_qVjP@Opn!I&yO{Fl-2??d<H#D(3F)PA)DkT;1H<_#K<UH~c3jF#!}3-PqV*5K@T=
zU{G-oi`a}33H>Q>1}4B^<6_fjgCy`So=Ucb@c>^`R73>@1=QHss0a)njE#+TZf9y>
z-<^;+Rq5$!k_YT`a&nSJMn-;1Ah1K>HvUvHO5?QxrsS`r{bpunbbWnIS65d|K$=CU
zBKj*UD_QMz1q$;j0+ZU2R8mUPgKeQ49v(8V)6-K$%AcQ~=U_mmz`iqHIS_JvuCA_B
zQc}V|U|%LCCNwlOqzLTc;epv#r@)jZ{~cRNzvJ`~nV^J(gs`tGEG$$6h7ULlkdm&z
zDXOBTe^QDMh3^8j!;Zjs*f4zEcLnSTaQ_^bbU|Tna;yk;3knKi43HY6hyS3C&(F__
z*oKFPbs9Hn&5D|;Dc<3@8yXrIKyh)gS_+8pmzS3nft{b9lZA!F|06MN$OBOX;z|@m
z?x1~hb92(y*Qc_wvQNN7BqE-cmX<nm)Sn^`ZHPpZ`e9Qj7Z(>y^KWl&bbo(OcXxMm
zdwVM@F#!x&1tJz**qK(q1aWApBck-Aq$J*aS63IOJlYfiti8RR8T6k66U-<_9wOaA
z<c|V?{{H?HA0JOKF)>_`yPch#@prit2FWK9Q>Dm8#HLtZ+Q$Eyajp1A9KKfMq2$w`
zhDdKvq%;qzN5!U*&!I>|Dk(_0fEepxJk%5wnt@D1WEXHJa23cr@Gl4qZIPXzPb*-W
zCyIdxdLttvdDE}2ucW7^_k{?scy4a)7l{F+02dk>${?_Y*c{Yzc6OGIj*d7)8yp<u
zIiR|@zWDX)7r)on*Hc150=EMK0{EGdlEMe^V_*OUnodto|71?h&COrZ5in$3U7Z@3
zlodrA*}8#&0fVZpuBP7JUbZ`I4oNQJN<%|Ko&$F-QBhHpnVHGo*4EZ|&8Md)zREy>
zPla#&F)&a%7LY5r7XgKftQ>@*O+iM0!wL@%r`Xt7j$GhIwzjrtX=zEFE#U4YJ3E{G
z<-)=OPmMzWsJ6B?eitdxkAdN2^Yioh)(KY#qT;>3zhBLAu#K#&EIK$iU_U4QS94rv
zXD8bU0Ewg)s*VH1%@&+J)DnTf`1m*n*l}@jOibnF<<#2RN;x?>oKYkvC$nmQ3rvYL
z08Z}iP?Nd=PU((OdhaNA2ZFVs9RLW@z&s!atRYktbHI+#k3HdC*z14S7)K2k6Hd?o
O0000<MNUMnLSTZ(cchyD

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/drawable-mdpi/icon.png b/build/mobile/sutagent/android/watcher/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6
GIT binary patch
literal 2574
zcmV+p3i0)cP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TqNkl<ZXa((A
zTaXl28UDI^W_OsGWtUy{!Y<c^KmeB|0kUGyGA1FG<+Tz*5iPC6veb&P)Rg5*9;h-e
z3TmlIsSioYk{F{DmNAwkFOUEcA|RU$mk^d6F3YkP_BQuRcl-T4)62|GPtQQe^5S3h
z&*?tr^nd>Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9<g8_@RM8%EGu#
zOyw}c*6!!ybr1%fK$!Ou1DhVH>sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj
zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc<S)8TvCJ(ixjw3
zDGP|(1X`9Un_CtJe5P6O4Tok16h-k}y%^cd)qX(~3y1&(;3R-pMJy1U42MmBECtgL
z_oL_(B#i{Bm05*qutp_76zFCKsv;ifWL$-`=mi{76bUH<88Zp5;&Y~_s+bHXMSDSF
zJckkwQy?ojfl&9Fx}jNKXK+QzP_5SD&ic<$5P277Obe~>;(H<$!ABY&g<qQoV`}XB
zymTgs1$FnL&bJu4p0VhC=8or(5d~RmWa&;lQ&x+IY&_aYq<~*13&;c!tSXaIRAEF=
zB<NcF6z2Nxz(jNa!_iZ?yY1^}3a-Li7k-IIVgR3A@f`f#Ip`ZXfIAz$i21em;CTN_
z=xEu3VAVXlcIsQuGdfb46xxDaSk?R`H2PP;NRz%=?4~pTga_dz#}k`EC}jbv!cw~B
zHsU&lZlE=|p3FXv_J;eB)>By1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY
z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)H<?OK4zWQV%p-Vko~Ntr}xRbH946I
zBbJy%oM;*<Qu-v?>pq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY
zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7
zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e`
zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf
zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC
z<IaPt3t7R-6esQN0HcDnT?G)P?Tm0c1gJ!Dt^$bfixvcL7nF-XR{?CME762Kcc$C2
z0^CXqusEZ9EG@XXRRY=h?lWDp(5=?IC?k=XaOY^+XgMBS1rS=c1#U%~*5f!7`iWIr
zm7^!xPp7$o27|RVH8pa$a)h!jBpN8E1xL!$I)x$2C0IsF*=^G#^@5r9yhtR1D_5>y
zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7!
z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(R<hk59!
zW=XvsOXl2%B`grF;AT}St~EM33K2wrmQn?+2@Y0p6+pBvrWT^^V6rHyhHhkp1z8pz
zbryOC|A-TVzh@Pjttc&ls7T$Eawdh)_?r~$O&m~viVgF=iIq(c^GhAcWD*{aheGlU
zQ|MtuY-GhO>b|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aF<C~nc##zP@rBRelZ&>K
zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``<Z0-}AfLb=^g=Q+9A---7|U+2N)
zKd9DfaQ52Yps9ZGfvJGaszssZ->}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW
zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`<
z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+Oz<nLfHjoFa)k
z@jh(Yx+=2QOc~A*As$?^lQRq)3_XjOK8~%cccZ0x1Js6YG`2CYa;IA-0bFCCGVPNr
zL2`REIf(P4`>Y^c-M9@+fz=G`q<GOZlu*|(zvf<SUix$Njqk_ab5A3#M<oK#J@_)#
zF{tIXf^lqXzDWDBuB!!Pf<XB!Bm$@iO&ma&w-a(qOl6{s9o|LdEh}1<fL$^7^H|-u
z1t+e)h<}~^0jEeP^C~Jg_vF<-^N3oHdfzhiXHHlwSd2LQxLQEw+g2#o8dP&Q$@42i
zPEox$JMwp2i=E|*xKLK(8ne@y=C5MuoQH7e;!Xzh0gHKS9qUO%VG7oKI61tVw;qp?
zT%HD|M7%DEs|AE<I}WaY;`}73!Vq_rZ9p-ZSF##4B|tSl?rMG<)t)-MGqejQhyFs1
zOYY$u$1R38AVwJR<T&GF2Y!V|ofl<qSqqf>a@v4sF5u-2289-#$**LWnyNNDwDf1(
zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W
zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V
zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB
z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp|
z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu
z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR
z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_S<r>mOtclS?KWk2VYE
zM*oS<=C483Xc<XBH-T2(vVJUXr<9s6L8%y!+?6<f{P<XJZ|@}c0}+%-f$DVxIixSf
zyZx`_jp~RryiOnPLN6^M#a^XAPNg`KKXr{n)Ewh?38G^@b)qVL^*LP6b}_MzC^c}&
z>kW?GN|1jfh3Ro(h<KDZN|fWBj7@=)05T}o0kZov5oZ%?h%8)~*k=Yr+YBDaVOp3T
zBFg{7f(5Qr%7ttVh}3fDAw-1vQZd7!TMCkUL<sw@Rk22a=Izx=SwI*ShDAWTmANx1
kfM{AOIT6Hei<0X907#l7&=u{JbN~PV07*qoM6N<$f*QKj`~Uy|

literal 0
HcmV?d00001

diff --git a/build/mobile/sutagent/android/watcher/res/layout/main.xml b/build/mobile/sutagent/android/watcher/res/layout/main.xml
new file mode 100644
index 000000000000..3a5f117d3cb1
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/build/mobile/sutagent/android/watcher/res/values/strings.xml b/build/mobile/sutagent/android/watcher/res/values/strings.xml
new file mode 100644
index 000000000000..8653dabd6061
--- /dev/null
+++ b/build/mobile/sutagent/android/watcher/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, WatcherMain!</string>
+    <string name="app_name">watcher</string>
+<string name="foreground_service_started">Foreground Service Started</string>
+
+</resources>
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index cdcb2adc4671..700f04b13cce 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -240,6 +240,9 @@ stage-mozmill: make-stage-dir
 
 stage-android: make-stage-dir
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/sutAgentAndroid.apk $(PKG_STAGE)/bin
+	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/watcher/Watcher.apk $(PKG_STAGE)/bin
+	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/fencp/FenCP.apk $(PKG_STAGE)/bin
+	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/ffxcp/FfxCP.apk $(PKG_STAGE)/bin
 
 stage-jetpack: make-stage-dir
 	$(NSINSTALL) $(topsrcdir)/testing/jetpack/jetpack-location.txt $(PKG_STAGE)/jetpack

From 158f68692916668c4228555a797285874b584459 Mon Sep 17 00:00:00 2001
From: Bob Moss <bmoss@mozilla.com>
Date: Mon, 18 Apr 2011 11:55:24 -0700
Subject: [PATCH 226/509] Bug 650110 Update SUTAgent, whitespace refactor for
 fencp, ffxcp, watcher, r=ctalbert

---
 .../sutagent/android/fencp/DirCursor.java     |  386 ++--
 .../mobile/sutagent/android/fencp/FenCP.java  |   36 +
 .../sutagent/android/fencp/FenCPFP.java       |  416 ++--
 .../sutagent/android/fencp/FileCursor.java    |  368 ++--
 build/mobile/sutagent/android/fencp/R.java    |   46 +-
 .../sutagent/android/ffxcp/DirCursor.java     |  386 ++--
 .../sutagent/android/ffxcp/FfxCPFP.java       |  416 ++--
 .../sutagent/android/ffxcp/FileCursor.java    |  370 ++--
 build/mobile/sutagent/android/ffxcp/R.java    |   46 +-
 .../mobile/sutagent/android/ffxcp/ffxcp.java  |   36 +
 build/mobile/sutagent/android/watcher/R.java  |   50 +-
 .../android/watcher/RedirOutputThread.java    |  328 +--
 .../sutagent/android/watcher/WatcherMain.java |   36 +
 .../android/watcher/WatcherReceiver.java      |   74 +-
 .../android/watcher/WatcherService.java       | 1864 +++++++++--------
 15 files changed, 2627 insertions(+), 2231 deletions(-)

diff --git a/build/mobile/sutagent/android/fencp/DirCursor.java b/build/mobile/sutagent/android/fencp/DirCursor.java
index 37a4f30d8227..3994a0825c24 100644
--- a/build/mobile/sutagent/android/fencp/DirCursor.java
+++ b/build/mobile/sutagent/android/fencp/DirCursor.java
@@ -1,175 +1,211 @@
-package org.mozilla.fencp;
-
-import java.io.File;
-import java.io.IOException;
-
-import android.database.MatrixCursor;
-
-public class DirCursor extends MatrixCursor {
-    public static final String _ID = "_id";
-    public static final String ISDIR = "isdir";
-    public static final String FILENAME = "filename";
-    public static final String LENGTH = "length";
-    public static final String TIMESTAMP = "ts";
-    public static final String WRITABLE = "writable";
-	static final String[] DEFCOLUMNS = new String[] {
-			_ID,
-			ISDIR,
-			FILENAME,
-			LENGTH,
-			TIMESTAMP,
-			WRITABLE
-         };
-	private String dirPath = null;
-	private String [] theColumns = null;
-
-	public DirCursor(String[] columnNames, String sPath) {
-		super((columnNames == null ? DEFCOLUMNS : columnNames));
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		dirPath = sPath;
-		doLoadCursor(dirPath);
-	}
-
-	public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
-		super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		dirPath = sPath;
-		doLoadCursor(dirPath);
-	}
-	
-	private void doLoadCursor(String sDir) {
-		File dir = new File(sDir);
-		int	nFiles = 0;
-		int nCols = theColumns.length;
-		int	lcvFiles = 0;
-		int	nCIndex = 0;
-		Object [] vals = new Object[nCols];
-		
-		if (vals == null)
-			return;
-		
-		if (dir.isDirectory()) {
-			try {
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1)
-					vals[nCIndex] = -1;
-
-				nCIndex = getColumnIndex(ISDIR);
-				if (nCIndex > -1)
-					vals[nCIndex] = 1;
-				
-				nCIndex = getColumnIndex(FILENAME);
-				if (nCIndex > -1)
-					try {
-						vals[nCIndex] = dir.getCanonicalPath();
-					} catch (IOException e) {
-						vals[nCIndex] = dir.getName();
-					}
-
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(TIMESTAMP);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(WRITABLE);
-				if (nCIndex > -1)
-					vals[nCIndex] = (dir.canWrite() ? 1 : 0);
-				
-				addRow(vals);
-				}
-			catch (IllegalArgumentException iae) {
-				iae.printStackTrace();
-			}
-			
-			File [] files = dir.listFiles();
-			if (files != null) {
-				if ((nFiles = files.length) > 0) {
-					for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
-						nCIndex = getColumnIndex(_ID);
-						if (nCIndex > -1)
-							vals[nCIndex] = lcvFiles;
-
-						nCIndex = getColumnIndex(ISDIR);
-						if (nCIndex > -1)
-							vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
-						
-						nCIndex = getColumnIndex(FILENAME);
-						if (nCIndex > -1)
-								vals[nCIndex] = files[lcvFiles].getName();
-
-						nCIndex = getColumnIndex(LENGTH);
-						if (nCIndex > -1)
-							vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
-
-						try {
-							addRow(vals);
-						} catch (IllegalArgumentException iae) {
-							iae.printStackTrace();
-						}
-					}
-				}
-			}
-		} else {
-			if (dir.isFile()) {
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1)
-					vals[nCIndex] = -1;
-
-				nCIndex = getColumnIndex(ISDIR);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(FILENAME);
-				if (nCIndex > -1)
-					vals[nCIndex] = dir.getName();
-
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1)
-					vals[nCIndex] = dir.length();
-
-				nCIndex = getColumnIndex(TIMESTAMP);
-				if (nCIndex > -1) {
-					vals[nCIndex] = dir.lastModified();
-				}
-				
-				try {
-					addRow(vals);
-					}
-				catch (IllegalArgumentException iae) {
-					iae.printStackTrace();
-				}
-			}
-			else {
-				try {
-					nCIndex = getColumnIndex(_ID);
-					if (nCIndex > -1)
-						vals[nCIndex] = -1;
-
-					nCIndex = getColumnIndex(ISDIR);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					nCIndex = getColumnIndex(FILENAME);
-					if (nCIndex > -1)
-						vals[nCIndex] = null;
-
-					nCIndex = getColumnIndex(LENGTH);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					nCIndex = getColumnIndex(TIMESTAMP);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					addRow(vals);
-					}
-				catch (IllegalArgumentException iae) {
-					iae.printStackTrace();
-				}
-			}
-		}
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.IOException;
+
+import android.database.MatrixCursor;
+
+public class DirCursor extends MatrixCursor {
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String TIMESTAMP = "ts";
+    public static final String WRITABLE = "writable";
+    static final String[] DEFCOLUMNS = new String[] {
+            _ID,
+            ISDIR,
+            FILENAME,
+            LENGTH,
+            TIMESTAMP,
+            WRITABLE
+         };
+    private String dirPath = null;
+    private String [] theColumns = null;
+
+    public DirCursor(String[] columnNames, String sPath) {
+        super((columnNames == null ? DEFCOLUMNS : columnNames));
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        dirPath = sPath;
+        doLoadCursor(dirPath);
+    }
+
+    public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
+        super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        dirPath = sPath;
+        doLoadCursor(dirPath);
+    }
+    
+    private void doLoadCursor(String sDir) {
+        File dir = new File(sDir);
+        int    nFiles = 0;
+        int nCols = theColumns.length;
+        int    lcvFiles = 0;
+        int    nCIndex = 0;
+        Object [] vals = new Object[nCols];
+        
+        if (vals == null)
+            return;
+        
+        if (dir.isDirectory()) {
+            try {
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1)
+                    vals[nCIndex] = -1;
+
+                nCIndex = getColumnIndex(ISDIR);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 1;
+                
+                nCIndex = getColumnIndex(FILENAME);
+                if (nCIndex > -1)
+                    try {
+                        vals[nCIndex] = dir.getCanonicalPath();
+                    } catch (IOException e) {
+                        vals[nCIndex] = dir.getName();
+                    }
+
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+                
+                nCIndex = getColumnIndex(TIMESTAMP);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+                
+                nCIndex = getColumnIndex(WRITABLE);
+                if (nCIndex > -1)
+                    vals[nCIndex] = (dir.canWrite() ? 1 : 0);
+                
+                addRow(vals);
+                }
+            catch (IllegalArgumentException iae) {
+                iae.printStackTrace();
+            }
+            
+            File [] files = dir.listFiles();
+            if (files != null) {
+                if ((nFiles = files.length) > 0) {
+                    for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
+                        nCIndex = getColumnIndex(_ID);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = lcvFiles;
+
+                        nCIndex = getColumnIndex(ISDIR);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
+                        
+                        nCIndex = getColumnIndex(FILENAME);
+                        if (nCIndex > -1)
+                                vals[nCIndex] = files[lcvFiles].getName();
+
+                        nCIndex = getColumnIndex(LENGTH);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
+
+                        try {
+                            addRow(vals);
+                        } catch (IllegalArgumentException iae) {
+                            iae.printStackTrace();
+                        }
+                    }
+                }
+            }
+        } else {
+            if (dir.isFile()) {
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1)
+                    vals[nCIndex] = -1;
+
+                nCIndex = getColumnIndex(ISDIR);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+                
+                nCIndex = getColumnIndex(FILENAME);
+                if (nCIndex > -1)
+                    vals[nCIndex] = dir.getName();
+
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1)
+                    vals[nCIndex] = dir.length();
+
+                nCIndex = getColumnIndex(TIMESTAMP);
+                if (nCIndex > -1) {
+                    vals[nCIndex] = dir.lastModified();
+                }
+                
+                try {
+                    addRow(vals);
+                    }
+                catch (IllegalArgumentException iae) {
+                    iae.printStackTrace();
+                }
+            }
+            else {
+                try {
+                    nCIndex = getColumnIndex(_ID);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = -1;
+
+                    nCIndex = getColumnIndex(ISDIR);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+                    
+                    nCIndex = getColumnIndex(FILENAME);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = null;
+
+                    nCIndex = getColumnIndex(LENGTH);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+                    
+                    nCIndex = getColumnIndex(TIMESTAMP);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+                    
+                    addRow(vals);
+                    }
+                catch (IllegalArgumentException iae) {
+                    iae.printStackTrace();
+                }
+            }
+        }
+    }
+}
diff --git a/build/mobile/sutagent/android/fencp/FenCP.java b/build/mobile/sutagent/android/fencp/FenCP.java
index 16ad24ec6904..21926ad38055 100644
--- a/build/mobile/sutagent/android/fencp/FenCP.java
+++ b/build/mobile/sutagent/android/fencp/FenCP.java
@@ -1,3 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package org.mozilla.fencp;
 
 import android.app.Activity;
diff --git a/build/mobile/sutagent/android/fencp/FenCPFP.java b/build/mobile/sutagent/android/fencp/FenCPFP.java
index c75fda5dd320..e7fe281bdd96 100644
--- a/build/mobile/sutagent/android/fencp/FenCPFP.java
+++ b/build/mobile/sutagent/android/fencp/FenCPFP.java
@@ -1,190 +1,226 @@
-package org.mozilla.fencp;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.net.Uri;
-
-public class FenCPFP extends ContentProvider {
-	public static final String PROVIDER_NAME = "org.mozilla.fencp";
-	public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
-	
-    public static final String _ID = "_id";
-    public static final String ISDIR = "isdir";
-    public static final String FILENAME = "filename";
-    public static final String LENGTH = "length";
-    public static final String CHUNK = "chunk";
-	static String[] dircolumns = new String[] {
-		_ID,
-		ISDIR,
-		FILENAME,
-		LENGTH
-     };
-    
-	static String[] filecolumns = new String[] {
-		_ID,
-		CHUNK
-     };
-	
-    private static final int DIR = 1;   
-    private static final int FILE_NAME = 2;
-       
-    private static final UriMatcher uriMatcher;
-    static {
-    	uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-       	uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
-       	uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
-    	}
-
-	public int PruneDir(String sTmpDir) {
-		int	nRet = 0;
-		int nFiles = 0;
-		String sSubDir = null;
-	
-		File dir = new File(sTmpDir);
-	
-		if (dir.isDirectory()) {
-			File [] files = dir.listFiles();
-			if (files != null) {
-				if ((nFiles = files.length) > 0) {
-					for (int lcv = 0; lcv < nFiles; lcv++) {
-						if (files[lcv].isDirectory()) {
-							sSubDir = files[lcv].getAbsolutePath();
-							nRet += PruneDir(sSubDir);
-						}
-						else {
-							if (files[lcv].delete()) {
-								nRet++;
-							}
-						}
-					}
-				}
-			}
-			if (dir.delete()) {
-				nRet++;
-			}
-			if ((nFiles + 1) > nRet) {
-				nRet = -1;
-			}
-		}
-
-	return(nRet);
-	}
-
-	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs) {
-		int nFiles = 0;
-		switch (uriMatcher.match(uri)) {
-			case FILE_NAME:
-				File f = new File(selection);
-				if (f.delete())
-					nFiles = 1;
-				break;
-				
-			case DIR:
-				nFiles = PruneDir(selection);
-				break;
-				
-			default:
-				break;
-		}
-		return nFiles;
-	}
-
-	@Override
-	public String getType(Uri uri)
-		{
-	    switch (uriMatcher.match(uri))
-	    	{
-	        //---get directory---
-	        case DIR:
-	            return "vnd.android.cursor.dir/vnd.mozilla.dir ";
-	        //---get a particular file---
-	        case FILE_NAME:
-	            return "vnd.android.cursor.item/vnd.mozilla.file ";
-	        //---Unknown---
-	        default:
-	            throw new IllegalArgumentException("Unsupported URI: " + uri);        
-	    	}   
-	}
-
-	@Override
-	public Uri insert(Uri uri, ContentValues values) {
-		return null;
-	}
-
-	@Override
-	public boolean onCreate() {
-		return true;
-	}
-
-	@Override
-	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-		Cursor retCursor = null;
-
-		switch(uriMatcher.match(uri)) {
-			case DIR:
-				retCursor = new DirCursor(projection, selection);
-				break;
-					
-			case FILE_NAME:
-				retCursor = new FileCursor(projection, selection, selectionArgs);
-				break;
-				
-			default:
-				break;
-		}
-		return (retCursor);
-	}
-
-	@Override
-	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-		int	nRet = 0;
-		FileOutputStream dstFile = null;
-		
-		switch(uriMatcher.match(uri)) {
-			case DIR:
-				File dir = new File(selection);
-				if (dir.mkdirs())
-					nRet = 1;
-				break;
-				
-			case FILE_NAME:
-				try {
-					long lOffset = values.getAsLong("offset");
-					byte [] buf = values.getAsByteArray(CHUNK);
-					int	nLength = values.getAsInteger(LENGTH);
-					if ((buf != null) && (nLength > 0)) {
-						File f = new File(selection);
-						dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
-						dstFile.write(buf,0, nLength);
-						dstFile.flush();
-						dstFile.close();
-						nRet = nLength;
-					}
-				} catch (FileNotFoundException fnfe) {
-					fnfe.printStackTrace();
-				} catch (IOException ioe) {
-					try {
-						dstFile.flush();
-					} catch (IOException e) {
-					}
-					try {
-						dstFile.close();
-					} catch (IOException e) {
-					}
-				}
-				break;
-				
-			default:
-				break;
-		}
-		return nRet;
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class FenCPFP extends ContentProvider {
+    public static final String PROVIDER_NAME = "org.mozilla.fencp";
+    public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
+
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String CHUNK = "chunk";
+    static String[] dircolumns = new String[] {
+        _ID,
+        ISDIR,
+        FILENAME,
+        LENGTH
+     };
+
+    static String[] filecolumns = new String[] {
+        _ID,
+        CHUNK
+     };
+
+    private static final int DIR = 1;
+    private static final int FILE_NAME = 2;
+
+    private static final UriMatcher uriMatcher;
+    static {
+        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+           uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
+           uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
+        }
+
+    public int PruneDir(String sTmpDir) {
+        int    nRet = 0;
+        int nFiles = 0;
+        String sSubDir = null;
+
+        File dir = new File(sTmpDir);
+
+        if (dir.isDirectory()) {
+            File [] files = dir.listFiles();
+            if (files != null) {
+                if ((nFiles = files.length) > 0) {
+                    for (int lcv = 0; lcv < nFiles; lcv++) {
+                        if (files[lcv].isDirectory()) {
+                            sSubDir = files[lcv].getAbsolutePath();
+                            nRet += PruneDir(sSubDir);
+                        }
+                        else {
+                            if (files[lcv].delete()) {
+                                nRet++;
+                            }
+                        }
+                    }
+                }
+            }
+            if (dir.delete()) {
+                nRet++;
+            }
+            if ((nFiles + 1) > nRet) {
+                nRet = -1;
+            }
+        }
+
+    return(nRet);
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        int nFiles = 0;
+        switch (uriMatcher.match(uri)) {
+            case FILE_NAME:
+                File f = new File(selection);
+                if (f.delete())
+                    nFiles = 1;
+                break;
+
+            case DIR:
+                nFiles = PruneDir(selection);
+                break;
+
+            default:
+                break;
+        }
+        return nFiles;
+    }
+
+    @Override
+    public String getType(Uri uri)
+        {
+        switch (uriMatcher.match(uri))
+            {
+            //---get directory---
+            case DIR:
+                return "vnd.android.cursor.dir/vnd.mozilla.dir ";
+            //---get a particular file---
+            case FILE_NAME:
+                return "vnd.android.cursor.item/vnd.mozilla.file ";
+            //---Unknown---
+            default:
+                throw new IllegalArgumentException("Unsupported URI: " + uri);
+            }
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        Cursor retCursor = null;
+
+        switch(uriMatcher.match(uri)) {
+            case DIR:
+                retCursor = new DirCursor(projection, selection);
+                break;
+
+            case FILE_NAME:
+                retCursor = new FileCursor(projection, selection, selectionArgs);
+                break;
+
+            default:
+                break;
+        }
+        return (retCursor);
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        int    nRet = 0;
+        FileOutputStream dstFile = null;
+
+        switch(uriMatcher.match(uri)) {
+            case DIR:
+                File dir = new File(selection);
+                if (dir.mkdirs())
+                    nRet = 1;
+                break;
+
+            case FILE_NAME:
+                try {
+                    long lOffset = values.getAsLong("offset");
+                    byte [] buf = values.getAsByteArray(CHUNK);
+                    int    nLength = values.getAsInteger(LENGTH);
+                    if ((buf != null) && (nLength > 0)) {
+                        File f = new File(selection);
+                        dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
+                        dstFile.write(buf,0, nLength);
+                        dstFile.flush();
+                        dstFile.close();
+                        nRet = nLength;
+                    }
+                } catch (FileNotFoundException fnfe) {
+                    fnfe.printStackTrace();
+                } catch (IOException ioe) {
+                    try {
+                        dstFile.flush();
+                    } catch (IOException e) {
+                    }
+                    try {
+                        dstFile.close();
+                    } catch (IOException e) {
+                    }
+                }
+                break;
+
+            default:
+                break;
+        }
+        return nRet;
+    }
+}
diff --git a/build/mobile/sutagent/android/fencp/FileCursor.java b/build/mobile/sutagent/android/fencp/FileCursor.java
index 967b63b7f212..b695bb19d883 100644
--- a/build/mobile/sutagent/android/fencp/FileCursor.java
+++ b/build/mobile/sutagent/android/fencp/FileCursor.java
@@ -1,166 +1,202 @@
-package org.mozilla.fencp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import android.database.AbstractWindowedCursor;
-import android.database.CursorWindow;
-
-public class FileCursor extends AbstractWindowedCursor {
-    public static final String _ID = "_id";
-    public static final String CHUNK = "chunk";
-    public static final String LENGTH = "length";
-	static final String[] DEFCOLUMNS = new String[] {
-			_ID,
-			CHUNK,
-			LENGTH
-         };
-	private String filePath = null;
-	private String [] theColumns = null;
-
-	private static final int BUFSIZE = 4096;
-	private long lFileSize = 0;
-	private int nCount = 0;
-	private File theFile = null;
-	private byte [] theBuffer = null;
-	private long lOffset = 0;
-	private long lLength = -1;
-	
-	public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
-		super();
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		filePath = sFilePath;
-		nCount = -1;
-		
-		if ((selectionArgs != null) && (selectionArgs.length > 0)) {
-			lOffset = Long.parseLong(selectionArgs[0]);
-			lLength = Long.parseLong(selectionArgs[1]);
-		}
-		
-		if (filePath.length() > 0) {
-			theFile = new File(filePath);
-			if (theFile.exists() && theFile.canRead()) {
-				lFileSize = theFile.length();
-				
-				// lLength == -1 return everything between lOffset and eof
-				// lLength == 0 return file length
-				// lLength > 0 return lLength bytes
-				if (lLength == -1) {
-					lFileSize = lFileSize - lOffset;
-				} else if (lLength == 0) {
-					// just return the file length
-				} else {
-					lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
-				}
-				
-				if (lLength != 0) {
-					nCount = (int) (lFileSize / BUFSIZE);
-					if ((lFileSize % BUFSIZE) > 0)
-						nCount++;
-				} else {
-					nCount = 1;
-				}
-
-				mRowIdColumnIndex = 0;
-			}
-		}
-	}
-
-	public String getColumnName (int columnIndex) {
-		return theColumns[columnIndex];
-	}
-
-	@Override
-	public String[] getColumnNames() {
-		return theColumns;
-	}
-
-	@Override
-	public int getCount() {
-		return nCount;
-	}
-
-	@Override
-	public boolean onMove(int oldPosition, int newPosition) {
-		boolean bRet = true;
-		
-		// get rid of old data
-		mWindow.clear();
-		bRet = mWindow.setNumColumns(theColumns.length);
-		fillWindow(newPosition, mWindow);
-		
-		return bRet;
-	}
-	
-	@Override
-	public void fillWindow (int pos, CursorWindow window) {
-		int	nNumRows = window.getNumRows();
-		int nCIndex = 0;
-		window.setStartPosition(0);
-
-		if (pos > -1) {
-			if (nNumRows == 0) {
-				window.allocRow();
-				nNumRows = window.getNumRows();
-			}
-			
-			if (nNumRows == 1) {
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1) {
-					window.putLong(lFileSize, 0, nCIndex);
-				}
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1) {
-					window.putLong((long)pos, 0, nCIndex);
-				}
-				nCIndex = getColumnIndex(CHUNK);
-				if (nCIndex > -1) {
-					if (lLength != 0) {
-						byte[] value = getABlob (pos, 1);
-						window.putBlob(value, 0, nCIndex);
-					}
-				}
-			}
-			window.setStartPosition(pos);
-		}
-		return;
-	}
-	
-	public byte[] getABlob (int row, int column) {
-		int	nRead = 0;
-		int	nOffset = 0;
-		int nBufSize = 0;
-		
-		if ((column == 1) && (theFile != null)) {
-			try {
-				FileInputStream fin = new FileInputStream(theFile);
-				nOffset = row * BUFSIZE;
-				if (row < (nCount - 1)) {
-					nBufSize = BUFSIZE;
-				} else {
-					nBufSize = (int) (lFileSize - nOffset);
-				}
-				theBuffer = new byte[nBufSize];
-				
-				if (theBuffer != null) {
-					if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
-						if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
-							if (nRead != nBufSize) {
-								return null;
-							}
-						}
-					}
-				}
-					
-			fin.close();
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-			
-		return theBuffer;
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.fencp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import android.database.AbstractWindowedCursor;
+import android.database.CursorWindow;
+
+public class FileCursor extends AbstractWindowedCursor {
+    public static final String _ID = "_id";
+    public static final String CHUNK = "chunk";
+    public static final String LENGTH = "length";
+    static final String[] DEFCOLUMNS = new String[] {
+            _ID,
+            CHUNK,
+            LENGTH
+         };
+    private String filePath = null;
+    private String [] theColumns = null;
+
+    private static final int BUFSIZE = 4096;
+    private long lFileSize = 0;
+    private int nCount = 0;
+    private File theFile = null;
+    private byte [] theBuffer = null;
+    private long lOffset = 0;
+    private long lLength = -1;
+
+    public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
+        super();
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        filePath = sFilePath;
+        nCount = -1;
+
+        if ((selectionArgs != null) && (selectionArgs.length > 0)) {
+            lOffset = Long.parseLong(selectionArgs[0]);
+            lLength = Long.parseLong(selectionArgs[1]);
+        }
+
+        if (filePath.length() > 0) {
+            theFile = new File(filePath);
+            if (theFile.exists() && theFile.canRead()) {
+                lFileSize = theFile.length();
+
+                // lLength == -1 return everything between lOffset and eof
+                // lLength == 0 return file length
+                // lLength > 0 return lLength bytes
+                if (lLength == -1) {
+                    lFileSize = lFileSize - lOffset;
+                } else if (lLength == 0) {
+                    // just return the file length
+                } else {
+                    lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
+                }
+
+                if (lLength != 0) {
+                    nCount = (int) (lFileSize / BUFSIZE);
+                    if ((lFileSize % BUFSIZE) > 0)
+                        nCount++;
+                } else {
+                    nCount = 1;
+                }
+
+                mRowIdColumnIndex = 0;
+            }
+        }
+    }
+
+    public String getColumnName (int columnIndex) {
+        return theColumns[columnIndex];
+    }
+
+    @Override
+    public String[] getColumnNames() {
+        return theColumns;
+    }
+
+    @Override
+    public int getCount() {
+        return nCount;
+    }
+
+    @Override
+    public boolean onMove(int oldPosition, int newPosition) {
+        boolean bRet = true;
+
+        // get rid of old data
+        mWindow.clear();
+        bRet = mWindow.setNumColumns(theColumns.length);
+        fillWindow(newPosition, mWindow);
+
+        return bRet;
+    }
+
+    @Override
+    public void fillWindow (int pos, CursorWindow window) {
+        int    nNumRows = window.getNumRows();
+        int nCIndex = 0;
+        window.setStartPosition(0);
+
+        if (pos > -1) {
+            if (nNumRows == 0) {
+                window.allocRow();
+                nNumRows = window.getNumRows();
+            }
+
+            if (nNumRows == 1) {
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1) {
+                    window.putLong(lFileSize, 0, nCIndex);
+                }
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1) {
+                    window.putLong((long)pos, 0, nCIndex);
+                }
+                nCIndex = getColumnIndex(CHUNK);
+                if (nCIndex > -1) {
+                    if (lLength != 0) {
+                        byte[] value = getABlob (pos, 1);
+                        window.putBlob(value, 0, nCIndex);
+                    }
+                }
+            }
+            window.setStartPosition(pos);
+        }
+        return;
+    }
+
+    public byte[] getABlob (int row, int column) {
+        int    nRead = 0;
+        int    nOffset = 0;
+        int nBufSize = 0;
+
+        if ((column == 1) && (theFile != null)) {
+            try {
+                FileInputStream fin = new FileInputStream(theFile);
+                nOffset = row * BUFSIZE;
+                if (row < (nCount - 1)) {
+                    nBufSize = BUFSIZE;
+                } else {
+                    nBufSize = (int) (lFileSize - nOffset);
+                }
+                theBuffer = new byte[nBufSize];
+
+                if (theBuffer != null) {
+                    if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
+                        if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
+                            if (nRead != nBufSize) {
+                                return null;
+                            }
+                        }
+                    }
+                }
+
+            fin.close();
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return theBuffer;
+    }
+}
diff --git a/build/mobile/sutagent/android/fencp/R.java b/build/mobile/sutagent/android/fencp/R.java
index 8baab7ef70ca..fdde951e2a11 100644
--- a/build/mobile/sutagent/android/fencp/R.java
+++ b/build/mobile/sutagent/android/fencp/R.java
@@ -1,23 +1,23 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.mozilla.fencp;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.mozilla.fencp;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/DirCursor.java b/build/mobile/sutagent/android/ffxcp/DirCursor.java
index 9a66212685ac..331eeb49a2d2 100644
--- a/build/mobile/sutagent/android/ffxcp/DirCursor.java
+++ b/build/mobile/sutagent/android/ffxcp/DirCursor.java
@@ -1,175 +1,211 @@
-package org.mozilla.ffxcp;
-
-import java.io.File;
-import java.io.IOException;
-
-import android.database.MatrixCursor;
-
-public class DirCursor extends MatrixCursor {
-    public static final String _ID = "_id";
-    public static final String ISDIR = "isdir";
-    public static final String FILENAME = "filename";
-    public static final String LENGTH = "length";
-    public static final String TIMESTAMP = "ts";
-    public static final String WRITABLE = "writable";
-	static final String[] DEFCOLUMNS = new String[] {
-			_ID,
-			ISDIR,
-			FILENAME,
-			LENGTH,
-			TIMESTAMP,
-			WRITABLE
-         };
-	private String dirPath = null;
-	private String [] theColumns = null;
-
-	public DirCursor(String[] columnNames, String sPath) {
-		super((columnNames == null ? DEFCOLUMNS : columnNames));
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		dirPath = sPath;
-		doLoadCursor(dirPath);
-	}
-
-	public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
-		super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		dirPath = sPath;
-		doLoadCursor(dirPath);
-	}
-	
-	private void doLoadCursor(String sDir) {
-		File dir = new File(sDir);
-		int	nFiles = 0;
-		int nCols = theColumns.length;
-		int	lcvFiles = 0;
-		int	nCIndex = 0;
-		Object [] vals = new Object[nCols];
-		
-		if (vals == null)
-			return;
-		
-		if (dir.isDirectory()) {
-			try {
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1)
-					vals[nCIndex] = -1;
-
-				nCIndex = getColumnIndex(ISDIR);
-				if (nCIndex > -1)
-					vals[nCIndex] = 1;
-				
-				nCIndex = getColumnIndex(FILENAME);
-				if (nCIndex > -1)
-					try {
-						vals[nCIndex] = dir.getCanonicalPath();
-					} catch (IOException e) {
-						vals[nCIndex] = dir.getName();
-					}
-
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(TIMESTAMP);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(WRITABLE);
-				if (nCIndex > -1)
-					vals[nCIndex] = (dir.canWrite() ? 1 : 0);
-				
-				addRow(vals);
-				}
-			catch (IllegalArgumentException iae) {
-				iae.printStackTrace();
-			}
-			
-			File [] files = dir.listFiles();
-			if (files != null) {
-				if ((nFiles = files.length) > 0) {
-					for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
-						nCIndex = getColumnIndex(_ID);
-						if (nCIndex > -1)
-							vals[nCIndex] = lcvFiles;
-
-						nCIndex = getColumnIndex(ISDIR);
-						if (nCIndex > -1)
-							vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
-						
-						nCIndex = getColumnIndex(FILENAME);
-						if (nCIndex > -1)
-								vals[nCIndex] = files[lcvFiles].getName();
-
-						nCIndex = getColumnIndex(LENGTH);
-						if (nCIndex > -1)
-							vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
-
-						try {
-							addRow(vals);
-						} catch (IllegalArgumentException iae) {
-							iae.printStackTrace();
-						}
-					}
-				}
-			}
-		} else {
-			if (dir.isFile()) {
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1)
-					vals[nCIndex] = -1;
-
-				nCIndex = getColumnIndex(ISDIR);
-				if (nCIndex > -1)
-					vals[nCIndex] = 0;
-				
-				nCIndex = getColumnIndex(FILENAME);
-				if (nCIndex > -1)
-					vals[nCIndex] = dir.getName();
-
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1)
-					vals[nCIndex] = dir.length();
-
-				nCIndex = getColumnIndex(TIMESTAMP);
-				if (nCIndex > -1) {
-					vals[nCIndex] = dir.lastModified();
-				}
-				
-				try {
-					addRow(vals);
-					}
-				catch (IllegalArgumentException iae) {
-					iae.printStackTrace();
-				}
-			}
-			else {
-				try {
-					nCIndex = getColumnIndex(_ID);
-					if (nCIndex > -1)
-						vals[nCIndex] = -1;
-
-					nCIndex = getColumnIndex(ISDIR);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					nCIndex = getColumnIndex(FILENAME);
-					if (nCIndex > -1)
-						vals[nCIndex] = null;
-
-					nCIndex = getColumnIndex(LENGTH);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					nCIndex = getColumnIndex(TIMESTAMP);
-					if (nCIndex > -1)
-						vals[nCIndex] = 0;
-					
-					addRow(vals);
-					}
-				catch (IllegalArgumentException iae) {
-					iae.printStackTrace();
-				}
-			}
-		}
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.IOException;
+
+import android.database.MatrixCursor;
+
+public class DirCursor extends MatrixCursor {
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String TIMESTAMP = "ts";
+    public static final String WRITABLE = "writable";
+    static final String[] DEFCOLUMNS = new String[] {
+            _ID,
+            ISDIR,
+            FILENAME,
+            LENGTH,
+            TIMESTAMP,
+            WRITABLE
+         };
+    private String dirPath = null;
+    private String [] theColumns = null;
+
+    public DirCursor(String[] columnNames, String sPath) {
+        super((columnNames == null ? DEFCOLUMNS : columnNames));
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        dirPath = sPath;
+        doLoadCursor(dirPath);
+    }
+
+    public DirCursor(String[] columnNames, int initialCapacity, String sPath) {
+        super((columnNames == null ? DEFCOLUMNS : columnNames), initialCapacity);
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        dirPath = sPath;
+        doLoadCursor(dirPath);
+    }
+
+    private void doLoadCursor(String sDir) {
+        File dir = new File(sDir);
+        int    nFiles = 0;
+        int nCols = theColumns.length;
+        int    lcvFiles = 0;
+        int    nCIndex = 0;
+        Object [] vals = new Object[nCols];
+
+        if (vals == null)
+            return;
+
+        if (dir.isDirectory()) {
+            try {
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1)
+                    vals[nCIndex] = -1;
+
+                nCIndex = getColumnIndex(ISDIR);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 1;
+
+                nCIndex = getColumnIndex(FILENAME);
+                if (nCIndex > -1)
+                    try {
+                        vals[nCIndex] = dir.getCanonicalPath();
+                    } catch (IOException e) {
+                        vals[nCIndex] = dir.getName();
+                    }
+
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+
+                nCIndex = getColumnIndex(TIMESTAMP);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+
+                nCIndex = getColumnIndex(WRITABLE);
+                if (nCIndex > -1)
+                    vals[nCIndex] = (dir.canWrite() ? 1 : 0);
+
+                addRow(vals);
+                }
+            catch (IllegalArgumentException iae) {
+                iae.printStackTrace();
+            }
+
+            File [] files = dir.listFiles();
+            if (files != null) {
+                if ((nFiles = files.length) > 0) {
+                    for (lcvFiles = 0; lcvFiles < nFiles; lcvFiles++) {
+                        nCIndex = getColumnIndex(_ID);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = lcvFiles;
+
+                        nCIndex = getColumnIndex(ISDIR);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = (files[lcvFiles].isDirectory() ? 1 : 0);
+
+                        nCIndex = getColumnIndex(FILENAME);
+                        if (nCIndex > -1)
+                                vals[nCIndex] = files[lcvFiles].getName();
+
+                        nCIndex = getColumnIndex(LENGTH);
+                        if (nCIndex > -1)
+                            vals[nCIndex] = (files[lcvFiles].isDirectory() ? -1 : files[lcvFiles].length());
+
+                        try {
+                            addRow(vals);
+                        } catch (IllegalArgumentException iae) {
+                            iae.printStackTrace();
+                        }
+                    }
+                }
+            }
+        } else {
+            if (dir.isFile()) {
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1)
+                    vals[nCIndex] = -1;
+
+                nCIndex = getColumnIndex(ISDIR);
+                if (nCIndex > -1)
+                    vals[nCIndex] = 0;
+
+                nCIndex = getColumnIndex(FILENAME);
+                if (nCIndex > -1)
+                    vals[nCIndex] = dir.getName();
+
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1)
+                    vals[nCIndex] = dir.length();
+
+                nCIndex = getColumnIndex(TIMESTAMP);
+                if (nCIndex > -1) {
+                    vals[nCIndex] = dir.lastModified();
+                }
+
+                try {
+                    addRow(vals);
+                    }
+                catch (IllegalArgumentException iae) {
+                    iae.printStackTrace();
+                }
+            }
+            else {
+                try {
+                    nCIndex = getColumnIndex(_ID);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = -1;
+
+                    nCIndex = getColumnIndex(ISDIR);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+
+                    nCIndex = getColumnIndex(FILENAME);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = null;
+
+                    nCIndex = getColumnIndex(LENGTH);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+
+                    nCIndex = getColumnIndex(TIMESTAMP);
+                    if (nCIndex > -1)
+                        vals[nCIndex] = 0;
+
+                    addRow(vals);
+                    }
+                catch (IllegalArgumentException iae) {
+                    iae.printStackTrace();
+                }
+            }
+        }
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/FfxCPFP.java b/build/mobile/sutagent/android/ffxcp/FfxCPFP.java
index 87caeb1e5c85..4612362de2b1 100644
--- a/build/mobile/sutagent/android/ffxcp/FfxCPFP.java
+++ b/build/mobile/sutagent/android/ffxcp/FfxCPFP.java
@@ -1,190 +1,226 @@
-package org.mozilla.ffxcp;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.net.Uri;
-
-public class FfxCPFP extends ContentProvider {
-	public static final String PROVIDER_NAME = "org.mozilla.ffxcp";
-	public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
-	
-    public static final String _ID = "_id";
-    public static final String ISDIR = "isdir";
-    public static final String FILENAME = "filename";
-    public static final String LENGTH = "length";
-    public static final String CHUNK = "chunk";
-	static String[] dircolumns = new String[] {
-		_ID,
-		ISDIR,
-		FILENAME,
-		LENGTH
-     };
-    
-	static String[] filecolumns = new String[] {
-		_ID,
-		CHUNK
-     };
-	
-    private static final int DIR = 1;   
-    private static final int FILE_NAME = 2;
-       
-    private static final UriMatcher uriMatcher;
-    static {
-    	uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-       	uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
-       	uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
-    	}
-
-	public int PruneDir(String sTmpDir) {
-		int	nRet = 0;
-		int nFiles = 0;
-		String sSubDir = null;
-	
-		File dir = new File(sTmpDir);
-	
-		if (dir.isDirectory()) {
-			File [] files = dir.listFiles();
-			if (files != null) {
-				if ((nFiles = files.length) > 0) {
-					for (int lcv = 0; lcv < nFiles; lcv++) {
-						if (files[lcv].isDirectory()) {
-							sSubDir = files[lcv].getAbsolutePath();
-							nRet += PruneDir(sSubDir);
-						}
-						else {
-							if (files[lcv].delete()) {
-								nRet++;
-							}
-						}
-					}
-				}
-			}
-			if (dir.delete()) {
-				nRet++;
-			}
-			if ((nFiles + 1) > nRet) {
-				nRet = -1;
-			}
-		}
-
-	return(nRet);
-	}
-
-	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs) {
-		int nFiles = 0;
-		switch (uriMatcher.match(uri)) {
-			case FILE_NAME:
-				File f = new File(selection);
-				if (f.delete())
-					nFiles = 1;
-				break;
-				
-			case DIR:
-				nFiles = PruneDir(selection);
-				break;
-				
-			default:
-				break;
-		}
-		return nFiles;
-	}
-
-	@Override
-	public String getType(Uri uri)
-		{
-	    switch (uriMatcher.match(uri))
-	    	{
-	        //---get directory---
-	        case DIR:
-	            return "vnd.android.cursor.dir/vnd.mozilla.dir ";
-	        //---get a particular file---
-	        case FILE_NAME:
-	            return "vnd.android.cursor.item/vnd.mozilla.file ";
-		    //---Unknown---
-	        default:
-	            throw new IllegalArgumentException("Unsupported URI: " + uri);        
-	    	}   
-	}
-
-	@Override
-	public Uri insert(Uri uri, ContentValues values) {
-		return null;
-	}
-
-	@Override
-	public boolean onCreate() {
-		return true;
-	}
-
-	@Override
-	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-		Cursor retCursor = null;
-
-		switch(uriMatcher.match(uri)) {
-			case DIR:
-				retCursor = new DirCursor(projection, selection);
-				break;
-					
-			case FILE_NAME:
-				retCursor = new FileCursor(projection, selection, selectionArgs);
-				break;
-					
-			default:
-				break;
-		}
-		return (retCursor);
-	}
-
-	@Override
-	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-		int	nRet = 0;
-		FileOutputStream dstFile = null;
-		
-		switch(uriMatcher.match(uri)) {
-			case DIR:
-				File dir = new File(selection);
-				if (dir.mkdirs())
-					nRet = 1;
-				break;
-				
-			case FILE_NAME:
-				try {
-					long lOffset = values.getAsLong("offset");
-					byte [] buf = values.getAsByteArray(CHUNK);
-					int	nLength = values.getAsInteger(LENGTH);
-					if ((buf != null) && (nLength > 0)) {
-						File f = new File(selection);
-						dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
-						dstFile.write(buf,0, nLength);
-						dstFile.flush();
-						dstFile.close();
-						nRet = nLength;
-					}
-				} catch (FileNotFoundException fnfe) {
-					fnfe.printStackTrace();
-				} catch (IOException ioe) {
-					try {
-						dstFile.flush();
-					} catch (IOException e) {
-					}
-					try {
-						dstFile.close();
-					} catch (IOException e) {
-					}
-				}
-				break;
-				
-			default:
-				break;
-		}
-		return nRet;
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class FfxCPFP extends ContentProvider {
+    public static final String PROVIDER_NAME = "org.mozilla.ffxcp";
+    public static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/file");
+
+    public static final String _ID = "_id";
+    public static final String ISDIR = "isdir";
+    public static final String FILENAME = "filename";
+    public static final String LENGTH = "length";
+    public static final String CHUNK = "chunk";
+    static String[] dircolumns = new String[] {
+        _ID,
+        ISDIR,
+        FILENAME,
+        LENGTH
+     };
+
+    static String[] filecolumns = new String[] {
+        _ID,
+        CHUNK
+     };
+
+    private static final int DIR = 1;
+    private static final int FILE_NAME = 2;
+
+    private static final UriMatcher uriMatcher;
+    static {
+        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+           uriMatcher.addURI(PROVIDER_NAME, "dir", DIR);
+           uriMatcher.addURI(PROVIDER_NAME, "file", FILE_NAME);
+        }
+
+    public int PruneDir(String sTmpDir) {
+        int    nRet = 0;
+        int nFiles = 0;
+        String sSubDir = null;
+
+        File dir = new File(sTmpDir);
+
+        if (dir.isDirectory()) {
+            File [] files = dir.listFiles();
+            if (files != null) {
+                if ((nFiles = files.length) > 0) {
+                    for (int lcv = 0; lcv < nFiles; lcv++) {
+                        if (files[lcv].isDirectory()) {
+                            sSubDir = files[lcv].getAbsolutePath();
+                            nRet += PruneDir(sSubDir);
+                        }
+                        else {
+                            if (files[lcv].delete()) {
+                                nRet++;
+                            }
+                        }
+                    }
+                }
+            }
+            if (dir.delete()) {
+                nRet++;
+            }
+            if ((nFiles + 1) > nRet) {
+                nRet = -1;
+            }
+        }
+
+    return(nRet);
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        int nFiles = 0;
+        switch (uriMatcher.match(uri)) {
+            case FILE_NAME:
+                File f = new File(selection);
+                if (f.delete())
+                    nFiles = 1;
+                break;
+
+            case DIR:
+                nFiles = PruneDir(selection);
+                break;
+
+            default:
+                break;
+        }
+        return nFiles;
+    }
+
+    @Override
+    public String getType(Uri uri)
+        {
+        switch (uriMatcher.match(uri))
+            {
+            //---get directory---
+            case DIR:
+                return "vnd.android.cursor.dir/vnd.mozilla.dir ";
+            //---get a particular file---
+            case FILE_NAME:
+                return "vnd.android.cursor.item/vnd.mozilla.file ";
+            //---Unknown---
+            default:
+                throw new IllegalArgumentException("Unsupported URI: " + uri);
+            }
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        Cursor retCursor = null;
+
+        switch(uriMatcher.match(uri)) {
+            case DIR:
+                retCursor = new DirCursor(projection, selection);
+                break;
+
+            case FILE_NAME:
+                retCursor = new FileCursor(projection, selection, selectionArgs);
+                break;
+
+            default:
+                break;
+        }
+        return (retCursor);
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        int    nRet = 0;
+        FileOutputStream dstFile = null;
+
+        switch(uriMatcher.match(uri)) {
+            case DIR:
+                File dir = new File(selection);
+                if (dir.mkdirs())
+                    nRet = 1;
+                break;
+
+            case FILE_NAME:
+                try {
+                    long lOffset = values.getAsLong("offset");
+                    byte [] buf = values.getAsByteArray(CHUNK);
+                    int    nLength = values.getAsInteger(LENGTH);
+                    if ((buf != null) && (nLength > 0)) {
+                        File f = new File(selection);
+                        dstFile = new FileOutputStream(f, (lOffset == 0 ? false : true));
+                        dstFile.write(buf,0, nLength);
+                        dstFile.flush();
+                        dstFile.close();
+                        nRet = nLength;
+                    }
+                } catch (FileNotFoundException fnfe) {
+                    fnfe.printStackTrace();
+                } catch (IOException ioe) {
+                    try {
+                        dstFile.flush();
+                    } catch (IOException e) {
+                    }
+                    try {
+                        dstFile.close();
+                    } catch (IOException e) {
+                    }
+                }
+                break;
+
+            default:
+                break;
+        }
+        return nRet;
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/FileCursor.java b/build/mobile/sutagent/android/ffxcp/FileCursor.java
index 8c4c6b03d974..766aa03e7c9a 100644
--- a/build/mobile/sutagent/android/ffxcp/FileCursor.java
+++ b/build/mobile/sutagent/android/ffxcp/FileCursor.java
@@ -1,167 +1,203 @@
-package org.mozilla.ffxcp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import android.database.AbstractWindowedCursor;
-import android.database.CursorWindow;
-
-public class FileCursor extends AbstractWindowedCursor {
-    public static final String _ID = "_id";
-    public static final String CHUNK = "chunk";
-    public static final String LENGTH = "length";
-	static final String[] DEFCOLUMNS = new String[] {
-			_ID,
-			CHUNK,
-			LENGTH
-         };
-	private String filePath = null;
-	private String [] theColumns = null;
-
-	private static final int BUFSIZE = 4096;
-	private long lFileSize = 0;
-	private int nCount = 0;
-	private File theFile = null;
-	private byte [] theBuffer = null;
-	private long lOffset = 0;
-	private long lLength = -1;
-	
-	public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
-		super();
-		theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
-		filePath = sFilePath;
-		nCount = -1;
-		
-		if ((selectionArgs != null) && (selectionArgs.length > 0)) {
-			lOffset = Long.parseLong(selectionArgs[0]);
-			lLength = Long.parseLong(selectionArgs[1]);
-		}
-		
-		if (filePath.length() > 0) {
-			theFile = new File(filePath);
-			if (theFile.exists() && theFile.canRead()) {
-				lFileSize = theFile.length();
-				
-				// lLength == -1 return everything between lOffset and eof
-				// lLength == 0 return file length
-				// lLength > 0 return lLength bytes
-				if (lLength == -1) {
-					lFileSize = lFileSize - lOffset;
-				} else if (lLength == 0) {
-					// just return the file length
-				} else {
-					lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
-				}
-				
-				if (lLength != 0) {
-					nCount = (int) (lFileSize / BUFSIZE);
-					if ((lFileSize % BUFSIZE) > 0)
-						nCount++;
-				} else {
-					nCount = 1;
-				}
-
-				mRowIdColumnIndex = 0;
-			}
-		}
-	}
-
-	public String getColumnName (int columnIndex) {
-		return theColumns[columnIndex];
-	}
-
-	@Override
-	public String[] getColumnNames() {
-		return theColumns;
-	}
-
-	@Override
-	public int getCount() {
-		return nCount;
-	}
-
-	@Override
-	public boolean onMove(int oldPosition, int newPosition) {
-		boolean bRet = true;
-		
-		// get rid of old data
-		mWindow.clear();
-		bRet = mWindow.setNumColumns(theColumns.length);
-		fillWindow(newPosition, mWindow);
-		
-		return bRet;
-	}
-	
-	@Override
-	public void fillWindow (int pos, CursorWindow window) {
-		int	nNumRows = window.getNumRows();
-		int nCIndex = 0;
-		window.setStartPosition(0);
-
-		if (pos > -1) {
-			if (nNumRows == 0) {
-				window.allocRow();
-				nNumRows = window.getNumRows();
-			}
-			
-			if (nNumRows == 1) {
-				nCIndex = getColumnIndex(LENGTH);
-				if (nCIndex > -1) {
-					window.putLong(lFileSize, 0, nCIndex);
-				}
-				nCIndex = getColumnIndex(_ID);
-				if (nCIndex > -1) {
-					window.putLong((long)pos, 0, nCIndex);
-				}
-				nCIndex = getColumnIndex(CHUNK);
-				if (nCIndex > -1) {
-					if (lLength != 0) {
-						byte[] value = getABlob (pos, 1);
-						window.putBlob(value, 0, nCIndex);
-					}
-				}
-			}
-			window.setStartPosition(pos);
-		}
-		return;
-	}
-	
-	public byte[] getABlob (int row, int column) {
-		int	nRead = 0;
-		int	nOffset = 0;
-		int nBufSize = 0;
-		
-		if ((column == 1) && (theFile != null)) {
-			try {
-				FileInputStream fin = new FileInputStream(theFile);
-				nOffset = row * BUFSIZE;
-				if (row < (nCount - 1)) {
-					nBufSize = BUFSIZE;
-				} else {
-					nBufSize = (int) (lFileSize - nOffset);
-				}
-				theBuffer = new byte[nBufSize];
-				
-				if (theBuffer != null) {
-					if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
-						if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
-							if (nRead != nBufSize) {
-								return null;
-							}
-						}
-					}
-				}
-					
-			fin.close();
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-			
-		return theBuffer;
-	}
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.mozilla.ffxcp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import android.database.AbstractWindowedCursor;
+import android.database.CursorWindow;
+
+public class FileCursor extends AbstractWindowedCursor {
+    public static final String _ID = "_id";
+    public static final String CHUNK = "chunk";
+    public static final String LENGTH = "length";
+    static final String[] DEFCOLUMNS = new String[] {
+            _ID,
+            CHUNK,
+            LENGTH
+         };
+    private String filePath = null;
+    private String [] theColumns = null;
+
+    private static final int BUFSIZE = 4096;
+    private long lFileSize = 0;
+    private int nCount = 0;
+    private File theFile = null;
+    private byte [] theBuffer = null;
+    private long lOffset = 0;
+    private long lLength = -1;
+
+    public FileCursor(String[] columnNames, String sFilePath, String [] selectionArgs) {
+        super();
+        theColumns = (columnNames == null ? DEFCOLUMNS : columnNames);
+        filePath = sFilePath;
+        nCount = -1;
+
+        if ((selectionArgs != null) && (selectionArgs.length > 0)) {
+            lOffset = Long.parseLong(selectionArgs[0]);
+            lLength = Long.parseLong(selectionArgs[1]);
+        }
+
+        if (filePath.length() > 0) {
+            theFile = new File(filePath);
+            if (theFile.exists() && theFile.canRead()) {
+                lFileSize = theFile.length();
+
+                // lLength == -1 return everything between lOffset and eof
+                // lLength == 0 return file length
+                // lLength > 0 return lLength bytes
+                if (lLength == -1) {
+                    lFileSize = lFileSize - lOffset;
+                } else if (lLength == 0) {
+                    // just return the file length
+                } else {
+                    lFileSize = ((lLength <= (lFileSize - lOffset)) ? lLength : (lFileSize - lOffset));
+                }
+
+                if (lLength != 0) {
+                    nCount = (int) (lFileSize / BUFSIZE);
+                    if ((lFileSize % BUFSIZE) > 0)
+                        nCount++;
+                } else {
+                    nCount = 1;
+                }
+
+                mRowIdColumnIndex = 0;
+            }
+        }
+    }
+
+    public String getColumnName (int columnIndex) {
+        return theColumns[columnIndex];
+    }
+
+    @Override
+    public String[] getColumnNames() {
+        return theColumns;
+    }
+
+    @Override
+    public int getCount() {
+        return nCount;
+    }
+
+    @Override
+    public boolean onMove(int oldPosition, int newPosition) {
+        boolean bRet = true;
+
+        // get rid of old data
+        mWindow.clear();
+        bRet = mWindow.setNumColumns(theColumns.length);
+        fillWindow(newPosition, mWindow);
+
+        return bRet;
+    }
+
+    @Override
+    public void fillWindow (int pos, CursorWindow window) {
+        int    nNumRows = window.getNumRows();
+        int nCIndex = 0;
+        window.setStartPosition(0);
+
+        if (pos > -1) {
+            if (nNumRows == 0) {
+                window.allocRow();
+                nNumRows = window.getNumRows();
+            }
+
+            if (nNumRows == 1) {
+                nCIndex = getColumnIndex(LENGTH);
+                if (nCIndex > -1) {
+                    window.putLong(lFileSize, 0, nCIndex);
+                }
+                nCIndex = getColumnIndex(_ID);
+                if (nCIndex > -1) {
+                    window.putLong((long)pos, 0, nCIndex);
+                }
+                nCIndex = getColumnIndex(CHUNK);
+                if (nCIndex > -1) {
+                    if (lLength != 0) {
+                        byte[] value = getABlob (pos, 1);
+                        window.putBlob(value, 0, nCIndex);
+                    }
+                }
+            }
+            window.setStartPosition(pos);
+        }
+        return;
+    }
+
+    public byte[] getABlob (int row, int column) {
+        int    nRead = 0;
+        int    nOffset = 0;
+        int nBufSize = 0;
+
+        if ((column == 1) && (theFile != null)) {
+            try {
+                FileInputStream fin = new FileInputStream(theFile);
+                nOffset = row * BUFSIZE;
+                if (row < (nCount - 1)) {
+                    nBufSize = BUFSIZE;
+                } else {
+                    nBufSize = (int) (lFileSize - nOffset);
+                }
+                theBuffer = new byte[nBufSize];
+
+                if (theBuffer != null) {
+                    if (fin.skip(nOffset + lOffset) == (nOffset + lOffset)) {
+                        if ((nRead = fin.read(theBuffer, 0, nBufSize)) != -1) {
+                            if (nRead != nBufSize) {
+                                return null;
+                            }
+                        }
+                    }
+                }
+
+            fin.close();
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return theBuffer;
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/R.java b/build/mobile/sutagent/android/ffxcp/R.java
index 30c4f28ef653..7de1af51d918 100644
--- a/build/mobile/sutagent/android/ffxcp/R.java
+++ b/build/mobile/sutagent/android/ffxcp/R.java
@@ -1,23 +1,23 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.mozilla.ffxcp;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.mozilla.ffxcp;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/ffxcp/ffxcp.java b/build/mobile/sutagent/android/ffxcp/ffxcp.java
index b3c7f5e647a0..5d3bf7c11548 100644
--- a/build/mobile/sutagent/android/ffxcp/ffxcp.java
+++ b/build/mobile/sutagent/android/ffxcp/ffxcp.java
@@ -1,3 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package org.mozilla.ffxcp;
 
 import android.app.Activity;
diff --git a/build/mobile/sutagent/android/watcher/R.java b/build/mobile/sutagent/android/watcher/R.java
index 90dd265265a8..de15e041ea03 100644
--- a/build/mobile/sutagent/android/watcher/R.java
+++ b/build/mobile/sutagent/android/watcher/R.java
@@ -1,25 +1,25 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.mozilla.watcher;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ateamlogo=0x7f020000;
-        public static final int icon=0x7f020001;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int foreground_service_started=0x7f040002;
-        public static final int hello=0x7f040000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.mozilla.watcher;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ateamlogo=0x7f020000;
+        public static final int icon=0x7f020001;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int foreground_service_started=0x7f040002;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/build/mobile/sutagent/android/watcher/RedirOutputThread.java b/build/mobile/sutagent/android/watcher/RedirOutputThread.java
index d31d0d4cb118..cfbe0c82b1c5 100644
--- a/build/mobile/sutagent/android/watcher/RedirOutputThread.java
+++ b/build/mobile/sutagent/android/watcher/RedirOutputThread.java
@@ -1,164 +1,164 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Android SUTAgent code.
- *
- * The Initial Developer of the Original Code is
- * Bob Moss.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Bob Moss <bmoss@mozilla.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package com.mozilla.watcher;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-public class RedirOutputThread extends Thread
-	{
-	OutputStream out;
-	InputStream	sutErr;
-	InputStream	sutOut;
-	Process pProc;
-	String	strOutput;
-	
-	public RedirOutputThread(Process pProc, OutputStream out)
-		{
-		if (pProc != null)
-			{
-			this.pProc = pProc;
-			sutErr = pProc.getErrorStream(); // Stderr
-			sutOut = pProc.getInputStream(); // Stdout
-			}
-		if (out != null)
-			this.out = out;
-		
-		strOutput = "";
-		}
-	
-	public void run()
-		{
-		boolean bStillRunning = true;
-		int	nBytesOut = 0;
-		int nBytesErr = 0;
-		int nBytesRead = 0;
-		PrintWriter pOut = null;
-		byte[] buffer = new byte[1024];
-		
-		if (out != null)
-			pOut = new PrintWriter(out);
-		else
-			bStillRunning = true;
-		
-		while (bStillRunning) 
-			{
-			try 
-				{
-				if ((nBytesOut = sutOut.available()) > 0)
-					{
-					if (nBytesOut > buffer.length)
-						{
-						buffer = null;
-						System.gc();
-						buffer = new byte[nBytesOut];
-						}
-					nBytesRead = sutOut.read(buffer, 0, nBytesOut);
-					if (nBytesRead == -1)
-						bStillRunning = false;
-					else 
-						{
-						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-						if (pOut != null)
-							{
-							pOut.print(sRep);
-							pOut.flush();
-							}
-						else
-							strOutput += sRep;
-						}
-					}
-
-				if ((nBytesErr = sutErr.available()) > 0)
-					{
-					if (nBytesErr > buffer.length)
-						{
-						buffer = null;
-						System.gc();
-						buffer = new byte[nBytesErr];
-						}
-					nBytesRead = sutErr.read(buffer, 0, nBytesErr);
-					if (nBytesRead == -1)
-						bStillRunning = false;
-					else 
-						{
-						String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-						if (pOut != null)
-							{
-							pOut.print(sRep);
-							pOut.flush();
-							}
-						else
-							strOutput += sRep;
-						}
-					}
-
-				bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
-				} 
-			catch (IOException e)
-				{
-//				Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
-				e.printStackTrace();
-				}
-			}
-		
-		pProc.destroy();
-		buffer = null;
-		System.gc();
-		}
-	
-	private boolean IsProcRunning(Process pProc)
-		{
-		boolean bRet = false;
-		@SuppressWarnings("unused")
-		int nExitCode = 0;
-	
-		try
-			{
-			nExitCode = pProc.exitValue();
-			}
-		catch (IllegalThreadStateException z)
-			{	
-			bRet = true;
-			}
-
-		return(bRet);
-		}
-	}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package com.mozilla.watcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+public class RedirOutputThread extends Thread
+    {
+    OutputStream out;
+    InputStream    sutErr;
+    InputStream    sutOut;
+    Process pProc;
+    String    strOutput;
+
+    public RedirOutputThread(Process pProc, OutputStream out)
+        {
+        if (pProc != null)
+            {
+            this.pProc = pProc;
+            sutErr = pProc.getErrorStream(); // Stderr
+            sutOut = pProc.getInputStream(); // Stdout
+            }
+        if (out != null)
+            this.out = out;
+
+        strOutput = "";
+        }
+
+    public void run()
+        {
+        boolean bStillRunning = true;
+        int    nBytesOut = 0;
+        int nBytesErr = 0;
+        int nBytesRead = 0;
+        PrintWriter pOut = null;
+        byte[] buffer = new byte[1024];
+
+        if (out != null)
+            pOut = new PrintWriter(out);
+        else
+            bStillRunning = true;
+
+        while (bStillRunning)
+            {
+            try
+                {
+                if ((nBytesOut = sutOut.available()) > 0)
+                    {
+                    if (nBytesOut > buffer.length)
+                        {
+                        buffer = null;
+                        System.gc();
+                        buffer = new byte[nBytesOut];
+                        }
+                    nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+                    if (nBytesRead == -1)
+                        bStillRunning = false;
+                    else
+                        {
+                        String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                        if (pOut != null)
+                            {
+                            pOut.print(sRep);
+                            pOut.flush();
+                            }
+                        else
+                            strOutput += sRep;
+                        }
+                    }
+
+                if ((nBytesErr = sutErr.available()) > 0)
+                    {
+                    if (nBytesErr > buffer.length)
+                        {
+                        buffer = null;
+                        System.gc();
+                        buffer = new byte[nBytesErr];
+                        }
+                    nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+                    if (nBytesRead == -1)
+                        bStillRunning = false;
+                    else
+                        {
+                        String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                        if (pOut != null)
+                            {
+                            pOut.print(sRep);
+                            pOut.flush();
+                            }
+                        else
+                            strOutput += sRep;
+                        }
+                    }
+
+                bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+                }
+            catch (IOException e)
+                {
+//                Toast.makeText(SUTAgentAndroid.me.getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show();
+                e.printStackTrace();
+                }
+            }
+
+        pProc.destroy();
+        buffer = null;
+        System.gc();
+        }
+
+    private boolean IsProcRunning(Process pProc)
+        {
+        boolean bRet = false;
+        @SuppressWarnings("unused")
+        int nExitCode = 0;
+
+        try
+            {
+            nExitCode = pProc.exitValue();
+            }
+        catch (IllegalThreadStateException z)
+            {
+            bRet = true;
+            }
+
+        return(bRet);
+        }
+    }
diff --git a/build/mobile/sutagent/android/watcher/WatcherMain.java b/build/mobile/sutagent/android/watcher/WatcherMain.java
index 23c12813b283..de2c01e6c782 100644
--- a/build/mobile/sutagent/android/watcher/WatcherMain.java
+++ b/build/mobile/sutagent/android/watcher/WatcherMain.java
@@ -1,3 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package com.mozilla.watcher;
 
 import android.app.Activity;
diff --git a/build/mobile/sutagent/android/watcher/WatcherReceiver.java b/build/mobile/sutagent/android/watcher/WatcherReceiver.java
index fa7e15255038..c2594b6a2a02 100644
--- a/build/mobile/sutagent/android/watcher/WatcherReceiver.java
+++ b/build/mobile/sutagent/android/watcher/WatcherReceiver.java
@@ -1,19 +1,55 @@
-package com.mozilla.watcher;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-// import android.os.Debug;
-
-public class WatcherReceiver extends BroadcastReceiver {
-
-	@Override
-	public void onReceive(Context context, Intent intent) {
-//		Debug.waitForDebugger();
-		Intent serviceIntent = new Intent();
-		serviceIntent.putExtra("command", "start");
-		serviceIntent.setAction("com.mozilla.watcher.LISTENER_SERVICE");
-		context.startService(serviceIntent);
-	}
-
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package com.mozilla.watcher;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+// import android.os.Debug;
+
+public class WatcherReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+//        Debug.waitForDebugger();
+        Intent serviceIntent = new Intent();
+        serviceIntent.putExtra("command", "start");
+        serviceIntent.setAction("com.mozilla.watcher.LISTENER_SERVICE");
+        context.startService(serviceIntent);
+    }
+
+}
diff --git a/build/mobile/sutagent/android/watcher/WatcherService.java b/build/mobile/sutagent/android/watcher/WatcherService.java
index 5a394190a7b8..ef2055e2c6f8 100644
--- a/build/mobile/sutagent/android/watcher/WatcherService.java
+++ b/build/mobile/sutagent/android/watcher/WatcherService.java
@@ -1,914 +1,950 @@
-package com.mozilla.watcher;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.KeyguardManager;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.widget.Toast;
-
-public class WatcherService extends Service
-{
-    String sErrorPrefix = "##Installer Error## ";
-    String currentDir = "/";
-    String sPingTarget = "";
-    long	lDelay = 60000;
-    long	lPeriod = 300000;
-    int		nMaxStrikes = 3;
-	Process	pProc;
-	Context myContext = null;
-	Timer myTimer = null;
-    private PowerManager.WakeLock pwl = null;
-	public static final int NOTIFICATION_ID = 1964;
-	boolean bInstalling = false;
-
-    @SuppressWarnings("unchecked")
-	private static final Class[] mStartForegroundSignature = new Class[] {
-        int.class, Notification.class};
-    @SuppressWarnings("unchecked")
-	private static final Class[] mStopForegroundSignature = new Class[] {
-        boolean.class};
-
-    private NotificationManager mNM;
-    private Method mStartForeground;
-    private Method mStopForeground;
-    private Object[] mStartForegroundArgs = new Object[2];
-    private Object[] mStopForegroundArgs = new Object[1];
-
-	
-	private IWatcherService.Stub stub = new IWatcherService.Stub() {
-		@Override
-		public int UpdateApplication(String sAppName, String sFileName, String sOutFile, int bReboot) throws RemoteException
-			{
-			return UpdtApp(sAppName, sFileName, sOutFile, bReboot);
-			}
-	};
-	
-	@Override
-	public IBinder onBind(Intent arg0) {
-		return stub;
-	}
-
-	@Override
-	public void onCreate()
-		{
-		super.onCreate();
-		
-		myContext = this;
-		
-		getKeyGuardAndWakeLock();
-		
-        File dir = getFilesDir();
-        File iniFile = new File(dir, "watcher.ini");
-        String sIniFile = iniFile.getAbsolutePath();
-        String sHold = "";
-
-        this.sPingTarget = GetIniData("watcher", "PingTarget", sIniFile, "www.mozilla.org");
-        sHold = GetIniData("watcher", "delay", sIniFile, "60000");
-       	this.lDelay = Long.parseLong(sHold.trim());
-        sHold = GetIniData("watcher", "period", sIniFile,"300000");
-       	this.lPeriod = Long.parseLong(sHold.trim());
-        sHold = GetIniData("watcher", "strikes", sIniFile,"3");
-       	this.nMaxStrikes = Integer.parseInt(sHold.trim());
-       	
-		doToast("WatcherService created");
-		}
-
-	public String GetIniData(String sSection, String sKey, String sFile, String sDefault)
-		{
-		String sRet = sDefault;
-		String sComp = "";
-		String sLine = "";
-		boolean bFound = false;
-		BufferedReader in = null;
-		String	sTmpFileName = fixFileName(sFile);
-	
-		try {
-			in = new BufferedReader(new FileReader(sTmpFileName));
-			sComp = "[" + sSection + "]";
-			while ((sLine = in.readLine()) != null)
-				{
-				if (sLine.equalsIgnoreCase(sComp))
-					{
-					bFound = true;
-					break;
-					}
-				}
-		
-			if (bFound)
-				{
-				sComp = (sKey + " =").toLowerCase();
-				while ((sLine = in.readLine()) != null)
-					{
-					if (sLine.toLowerCase().contains(sComp))
-						{
-						String [] temp = null;
-						temp = sLine.split("=");
-						if (temp != null)
-							{
-							if (temp.length > 1)
-								sRet = temp[1].trim();
-							}
-						break;
-						}
-					}
-				}
-			in.close();
-			}
-		catch (FileNotFoundException e)
-			{
-			sComp = e.toString();
-			} 
-		catch (IOException e) 
-			{
-			sComp = e.toString();
-			}
-		return (sRet);
-		}
-	
-	private void handleCommand(Intent intent)
-		{
-		String sCmd = intent.getStringExtra("command");
-		
-//		Debug.waitForDebugger();
-		
-		if (sCmd != null)
-			{
-			if (sCmd.equalsIgnoreCase("updt"))
-				{
-				String sPkgName = intent.getStringExtra("pkgName");
-				String sPkgFile = intent.getStringExtra("pkgFile");
-				String sOutFile = intent.getStringExtra("outFile");
-				boolean bReboot = intent.getBooleanExtra("reboot", true);
-				int nReboot = bReboot ? 1 : 0;
-	       		SendNotification("WatcherService updating " + sPkgName + " using file " + sPkgFile, "WatcherService updating " + sPkgName + " using file " + sPkgFile);
-
-	       		UpdateApplication worker = new UpdateApplication(sPkgName, sPkgFile, sOutFile, nReboot);
-				}
-			else if (sCmd.equalsIgnoreCase("start"))
-				{
-				doToast("WatcherService started");
-				myTimer = new Timer();
-				myTimer.scheduleAtFixedRate(new MyTime(), lDelay, lPeriod);
-				}
-			else
-				{
-				doToast("WatcherService unknown command");
-				}
-			}
-		else
-			doToast("WatcherService created");
-		}
-
-
-	@Override
-	public void onStart(Intent intent, int startId) {
-		handleCommand(intent);
-		return;
-	}
-	
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		handleCommand(intent);
-		return START_STICKY;
-		}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		doToast("WatcherService destroyed");
-        if (pwl != null)
-        	pwl.release();
-        stopForegroundCompat(R.string.foreground_service_started);
-	}
-
-    protected void getKeyGuardAndWakeLock()
-    	{
-        // Fire off a thread to do some work that we shouldn't do directly in the UI thread
-        Thread t = new Thread() {
-            public void run() {
-                // Keep phone from locking or remove lock on screen
-                KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
-                if (km != null)
-                	{
-                	KeyguardManager.KeyguardLock kl = km.newKeyguardLock("watcher");
-                	if (kl != null)
-                		kl.disableKeyguard();
-                	}
-                
-                // No sleeping on the job
-                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                if (pm != null)
-                	{
-                	pwl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "watcher");
-                	if (pwl != null)
-                		pwl.acquire();
-                	}
-               	
-                mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-                try {
-                    mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
-                    mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
-                	}
-                catch (NoSuchMethodException e)
-                	{
-                    // Running on an older platform.
-                    mStartForeground = mStopForeground = null;
-                	}
-                Notification notification = new Notification();
-                startForegroundCompat(R.string.foreground_service_started, notification);
-            	}
-        	};
-        t.start();
-    	}
-
-    /**
-     * This is a wrapper around the new startForeground method, using the older
-     * APIs if it is not available.
-     */
-    void startForegroundCompat(int id, Notification notification) {
-        // If we have the new startForeground API, then use it.
-        if (mStartForeground != null) {
-            mStartForegroundArgs[0] = Integer.valueOf(id);
-            mStartForegroundArgs[1] = notification;
-            try {
-                mStartForeground.invoke(this, mStartForegroundArgs);
-            } catch (InvocationTargetException e) {
-                // Should not happen.
-                Log.w("ApiDemos", "Unable to invoke startForeground", e);
-            } catch (IllegalAccessException e) {
-                // Should not happen.
-                Log.w("ApiDemos", "Unable to invoke startForeground", e);
-            }
-            return;
-        }
-
-        // Fall back on the old API.
-        setForeground(true);
-        mNM.notify(id, notification);
-    }
-
-    /**
-     * This is a wrapper around the new stopForeground method, using the older
-     * APIs if it is not available.
-     */
-    void stopForegroundCompat(int id) {
-        // If we have the new stopForeground API, then use it.
-        if (mStopForeground != null) {
-            mStopForegroundArgs[0] = Boolean.TRUE;
-            try {
-                mStopForeground.invoke(this, mStopForegroundArgs);
-            } catch (InvocationTargetException e) {
-                // Should not happen.
-                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
-            } catch (IllegalAccessException e) {
-                // Should not happen.
-                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
-            }
-            return;
-        }
-
-        // Fall back on the old API.  Note to cancel BEFORE changing the
-        // foreground state, since we could be killed at that point.
-        mNM.cancel(id);
-        setForeground(false);
-    }
-
-	public void doToast(String sMsg)
-		{
-		Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
-		toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
-		toast.show();
-		}
-	
-	public void CheckMem() {
-       	System.gc();
-		long lFreeMemory = Runtime.getRuntime().freeMemory();
-		long lTotMemory = Runtime.getRuntime().totalMemory();
-		long lMaxMemory = Runtime.getRuntime().maxMemory();
-		
-		SendNotification("Memory Check", "Free: " + lFreeMemory + "Total: " + lTotMemory + "Max: " + lMaxMemory);
-	}
-	
-	public int UpdtApp(String sPkgName, String sPkgFileName, String sOutFile, int bReboot)
-		{
-		int nRet = 1;
-		int lcv = 0;
-		String sRet = "";
-
-//		Debug.waitForDebugger();
-		
-    	FileOutputStream f = null;
-    	
-       	try {
-       		SendNotification("Killing " + sPkgName, "Step 1: Kill " + sPkgName + " if running");
-            while (!IsProcessDead(sPkgName) && (lcv < 5)) {
-            	if (KillProcess(sPkgName, null).startsWith("Successfully"))
-            		break;
-            	else
-            		lcv++;
-               	Thread.sleep(2000);
-       			}
-            
-           	CheckMem();
-           	
-            if ((sOutFile != null) && (sOutFile.length() > 0)) {
-            	File outFile = new File(sOutFile);
-            	if (outFile.exists() && outFile.canWrite()) {
-                	f = new FileOutputStream(outFile, true);
-            	} else {
-               		SendNotification("File not found or cannot write to " + sOutFile, "File not found or cannot write to " + sOutFile);
-            	}
-            }
-		} catch (InterruptedException e) {
-       		e.printStackTrace();
-		} catch (FileNotFoundException e) {
-       		SendNotification("File not found " + sOutFile, "Couldn't open " + sOutFile + " " + e.getLocalizedMessage());
-			e.printStackTrace();
-       	} catch (SecurityException e) {
-       		SendNotification("Security excepetion for " + sOutFile, "Exception message " + e.getLocalizedMessage());
-			e.printStackTrace();
-       	}
-       	
-    	if ((sPkgName != null) && (sPkgName.length() > 0))
-    		{
-       		SendNotification("Uninstalling " + sPkgName, "Step 2: Uninstall " + sPkgName);
-    		sRet = UnInstallApp(sPkgName, null);
-           	CheckMem();
-    		if ((sRet.length() > 0) && (f != null))
-    			{
-    			try {
-					f.write(sRet.getBytes());
-					f.flush();
-					}
-    			catch (IOException e)
-    				{
-					e.printStackTrace();
-    				}
-    			}
-    		}
-    		
-    	if ((sPkgFileName != null) && (sPkgFileName.length() > 0))
-    		{
-       		SendNotification("Installing " + sPkgFileName, "Step 3: Install " + sPkgFileName);
-    		sRet = InstallApp(sPkgFileName, null);
-       		SendNotification("Installed " + sPkgFileName, "" + sRet);
-           	CheckMem();
-    		if ((sRet.length() > 0) && (f != null))
-				{
-    			try {
-    				f.write(sRet.getBytes());
-    				f.flush();
-    				f.close();
-					}
-    			catch (IOException e)
-					{
-    				e.printStackTrace();
-					}
-				}
-    		}
-    	
-    	if (bReboot > 0)
-    		RunReboot(null);
-    	
-		return(nRet);
-		}
-	
-	public boolean GetProcessInfo(String sProcName)
-		{
-		boolean bRet = false;
-		ActivityManager aMgr = (ActivityManager) getApplicationContext().getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
-		int	nProcs = lProcesses.size();
-		int lcv = 0;
-		String strProcName = "";
-
-		for (lcv = 0; lcv < nProcs; lcv++)
-			{
-			strProcName = lProcesses.get(lcv).processName;
-			if (strProcName.contains(sProcName))
-				{
-				bRet = true;
-				}
-			}
-	
-		return (bRet);
-		}
-	
-	public String RunReboot(OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [3];
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "reboot";
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(10000);
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-
-		return (sRet);
-		}
-
-	public String KillProcess(String sProcName, OutputStream out)
-		{
-		String [] theArgs = new String [3];
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "kill";
-
-		String sRet = sErrorPrefix + "Unable to kill " + sProcName + "\n";
-		ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
-		int lcv = 0;
-		String strProcName = "";
-		int	nPID = 0;
-
-		for (lcv = 0; lcv < lProcesses.size(); lcv++)
-			{
-			if (lProcesses.get(lcv).processName.contains(sProcName))
-				{
-				strProcName = lProcesses.get(lcv).processName;
-				nPID = lProcesses.get(lcv).pid;
-				sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
-
-				theArgs[2] += " " + nPID;
-		
-				try 
-					{
-					pProc = Runtime.getRuntime().exec(theArgs);
-					RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-					outThrd.start();
-					outThrd.join(5000);
-					}
-				catch (IOException e) 
-					{
-					sRet = e.getMessage();
-					e.printStackTrace();
-					} 
-				catch (InterruptedException e)
-					{
-					e.printStackTrace();
-					}
-
-				// Give the messages a chance to be processed
-				try {
-					Thread.sleep(2000);
-					}
-				catch (InterruptedException e)
-					{
-					e.printStackTrace();
-					}
-				break;
-				}
-			}
-
-		if (nPID > 0)
-			{
-			sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
-			lProcesses = aMgr.getRunningAppProcesses();
-			for (lcv = 0; lcv < lProcesses.size(); lcv++)
-				{
-				if (lProcesses.get(lcv).processName.contains(sProcName))
-					{
-					sRet = sErrorPrefix + "Unable to kill " + nPID + " " + strProcName + "\n";
-					break;
-					}
-				}
-			}
-
-		return (sRet);
-		}
-
-	public String GetAppRoot(String AppName)
-		{
-		String sRet = sErrorPrefix + " internal error [no context]";
-		Context ctx = getApplicationContext();
-	
-		if (ctx != null)
-			{
-			try {
-				Context appCtx = ctx.createPackageContext(AppName, 0);
-				ContextWrapper appCtxW = new ContextWrapper(appCtx);
-				sRet = appCtxW.getPackageResourcePath();
-				appCtxW = null;
-				appCtx = null;
-				ctx = null;
-				System.gc();
-				}
-			catch (NameNotFoundException e)
-				{
-				e.printStackTrace();
-				}
-			}
-		return(sRet);
-		}
-
-	public boolean IsProcessDead(String sProcName)
-		{
-		boolean bRet = true;
-		ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
-		List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses(); //    .getProcessesInErrorState();
-		int lcv = 0;
-
-		if (lProcesses != null)
-			{
-			for (lcv = 0; lcv < lProcesses.size(); lcv++)
-				{
-				if (lProcesses.get(lcv).processName.contentEquals(sProcName))
-					{
-					bRet = false;
-					break;
-					}
-				}
-			}
-
-		return (bRet);
-		}
-
-	public String fixFileName(String fileName)
-		{
-		String	sRet = "";
-		String	sTmpFileName = "";
-
-		sRet = fileName.replace('\\', '/');
-
-		if (sRet.startsWith("/"))
-			sTmpFileName = sRet;
-		else
-			sTmpFileName = currentDir + "/" + sRet;
-
-		sRet = sTmpFileName.replace('\\', '/');
-		sTmpFileName = sRet;
-		sRet = sTmpFileName.replace("//", "/");
-
-		return(sRet);
-		}
-
-	public String GetTmpDir()
-		{
-		String 	sRet = "";
-		Context ctx = getApplicationContext();
-		File dir = ctx.getFilesDir();
-		ctx = null;
-		try {
-			sRet = dir.getCanonicalPath();
-			} 
-		catch (IOException e)
-    		{
-			e.printStackTrace();
-    		}
-		return(sRet);
-		}
-
-	public String UnInstallApp(String sApp, OutputStream out)
-		{
-		String sRet = "";
-		String [] theArgs = new String [3];
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "pm uninstall " + sApp + ";exit";
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(60000);
-			int nRet = pProc.exitValue();
-			sRet = "\nuninst complete [" + nRet + "]";
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-
-		return (sRet);
-		}
-
-	public String InstallApp(String sApp, OutputStream out)
-		{
-		String sRet = "";
-		String sHold = "";
-		String [] theArgs = new String [3];
-
-		theArgs[0] = "su";
-		theArgs[1] = "-c";
-		theArgs[2] = "pm install " + sApp + ";exit";
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-	
-			RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
-			outThrd.start();
-			outThrd.join(180000);
-			int nRet = pProc.exitValue();
-			sRet += "\ninstall complete [" + nRet + "]";
-			sHold = outThrd.strOutput;
-			sRet += "\nSuccess";
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			} 
-		catch (InterruptedException e)
-			{
-			e.printStackTrace();
-			}
-		
-		return (sRet);
-		}
-
-	private String SendPing(String sIPAddr)
-		{
-		Process	pProc;
-		String sRet = "";
-		String [] theArgs = new String [4];
-		boolean bStillRunning = true;
-		int	nBytesOut = 0;
-		int nBytesErr = 0;
-		int nBytesRead = 0;
-		byte[] buffer = new byte[1024];
-
-		theArgs[0] = "ping";
-		theArgs[1] = "-c";
-		theArgs[2] = "3";
-		theArgs[3] = sIPAddr;
-
-		try 
-			{
-			pProc = Runtime.getRuntime().exec(theArgs);
-		
-			InputStream sutOut = pProc.getInputStream();
-			InputStream sutErr = pProc.getErrorStream();
-		
-			while (bStillRunning) 
-				{
-				try 
-					{
-					if ((nBytesOut = sutOut.available()) > 0)
-						{
-						if (nBytesOut > buffer.length)
-							{
-							buffer = null;
-							System.gc();
-							buffer = new byte[nBytesOut];
-							}
-						nBytesRead = sutOut.read(buffer, 0, nBytesOut);
-						if (nBytesRead == -1)
-							bStillRunning = false;
-						else 
-							{
-							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-							sRet += sRep;
-							sRep = null;
-							}
-						}
-
-					if ((nBytesErr = sutErr.available()) > 0)
-						{
-						if (nBytesErr > buffer.length)
-							{
-							buffer = null;
-							System.gc();
-							buffer = new byte[nBytesErr];
-							}
-						nBytesRead = sutErr.read(buffer, 0, nBytesErr);
-						if (nBytesRead == -1)
-							bStillRunning = false;
-						else 
-							{
-							String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
-							sRet += sRep;
-							sRep = null;
-							}
-						}
-
-					bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
-					} 
-				catch (IOException e)
-					{
-					e.printStackTrace();
-					}
-			
-				if ((bStillRunning == true) && (nBytesErr == 0) && (nBytesOut == 0))
-					{
-					try {
-						Thread.sleep(2000);
-						}
-					catch (InterruptedException e) {
-						e.printStackTrace();
-						}
-					}
-				}
-
-			pProc.destroy();
-			pProc = null;
-			}
-		catch (IOException e) 
-			{
-			sRet = e.getMessage();
-			e.printStackTrace();
-			}
-
-		return (sRet);
-		}
-	
-	private boolean IsProcRunning(Process pProc)
-		{
-		boolean bRet = false;
-		@SuppressWarnings("unused")
-		int nExitCode = 0;
-
-		try
-			{
-			nExitCode = pProc.exitValue();
-			}
-		catch (IllegalThreadStateException z)
-			{	
-			bRet = true;
-			}
-		catch (Exception e)
-			{
-			e.printStackTrace();
-			}
-
-		return(bRet);
-		}
-	
-	private class UpdateApplication implements Runnable {
-		Thread	runner;
-		String	msPkgName = "";
-		String	msPkgFileName = "";
-		String	msOutFile = "";
-		int		mbReboot = 0;
-		
-		public UpdateApplication(String sPkgName, String sPkgFileName, String sOutFile, int bReboot) {
-			runner = new Thread(this);
-			msPkgName = sPkgName;
-			msPkgFileName = sPkgFileName;
-			msOutFile = sOutFile;
-			mbReboot = bReboot;
-			runner.start();
-		}
-
-		@Override
-		public void run() {
-       		bInstalling = true;
-			UpdtApp(msPkgName, msPkgFileName, msOutFile, mbReboot);
-       		bInstalling = false;
-		}
-	}
-
-	private class MyTime extends TimerTask
-		{
-		int	nStrikes = 0;
-
-		public MyTime()
-			{
-			}
-	
-		@Override
-		public void run()
-			{
-			if (bInstalling)
-				return;
-			
-			// See if the network is up, if not after three failures reboot
-			String sRet = SendPing(sPingTarget);
-			if (!sRet.contains("3 received"))
-				{
-				if (nMaxStrikes > 0)
-					{
-					if (++nStrikes >= nMaxStrikes)
-						RunReboot(null);
-					}
-				}
-			else
-				{
-				nStrikes = 0;
-				}
-			sRet = null;
-
-			String sProgramName = "com.mozilla.SUTAgentAndroid";
-			PackageManager pm = myContext.getPackageManager();
-			
-//			Debug.waitForDebugger();
-		
-			if (!GetProcessInfo(sProgramName))
-				{
-				Intent agentIntent = new Intent();
-				agentIntent.setPackage(sProgramName);
-				agentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				agentIntent.setAction(Intent.ACTION_MAIN);
-				try {
-					PackageInfo pi = pm.getPackageInfo(sProgramName, PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
-					ActivityInfo [] ai = pi.activities;
-					for (int i = 0; i < ai.length; i++)
-						{
-						ActivityInfo a = ai[i];
-						if (a.name.length() > 0)
-							{
-							agentIntent.setClassName(a.packageName, a.name);
-							break;
-							}
-						}
-					}
-				catch (NameNotFoundException e)
-					{
-					e.printStackTrace();
-					}
-				try 
-					{
-					myContext.startActivity(agentIntent);
-					}
-				catch(ActivityNotFoundException anf)
-					{
-					anf.printStackTrace();
-					}
-				}
-			}
-		}
-	
-	private void SendNotification(String tickerText, String expandedText) {
-		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-		int icon = R.drawable.ateamlogo;
-		long when = System.currentTimeMillis();
-	
-		Notification notification = new Notification(icon, tickerText, when);
-	
-		notification.flags |= Notification.FLAG_AUTO_CANCEL;
-		notification.defaults |= Notification.DEFAULT_SOUND;
-//		notification.defaults |= Notification.DEFAULT_VIBRATE;
-		notification.defaults |= Notification.DEFAULT_LIGHTS;
-	
-		Context context = getApplicationContext();
-	
-		// Intent to launch an activity when the extended text is clicked
-		Intent intent = new Intent(this, WatcherService.class);
-		PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent, 0);
-	
-		notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
-			
-		notificationManager.notify(NOTIFICATION_ID, notification);
-	}
-
-	private void CancelNotification() {
-		NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-		notificationManager.cancel(NOTIFICATION_ID);
-	}
-
-}
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Android SUTAgent code.
+ *
+ * The Initial Developer of the Original Code is
+ * Bob Moss.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Moss <bmoss@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package com.mozilla.watcher;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.KeyguardManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.Toast;
+
+public class WatcherService extends Service
+{
+    String sErrorPrefix = "##Installer Error## ";
+    String currentDir = "/";
+    String sPingTarget = "";
+    long    lDelay = 60000;
+    long    lPeriod = 300000;
+    int        nMaxStrikes = 3;
+    Process    pProc;
+    Context myContext = null;
+    Timer myTimer = null;
+    private PowerManager.WakeLock pwl = null;
+    public static final int NOTIFICATION_ID = 1964;
+    boolean bInstalling = false;
+
+    @SuppressWarnings("unchecked")
+    private static final Class[] mStartForegroundSignature = new Class[] {
+        int.class, Notification.class};
+    @SuppressWarnings("unchecked")
+    private static final Class[] mStopForegroundSignature = new Class[] {
+        boolean.class};
+
+    private NotificationManager mNM;
+    private Method mStartForeground;
+    private Method mStopForeground;
+    private Object[] mStartForegroundArgs = new Object[2];
+    private Object[] mStopForegroundArgs = new Object[1];
+
+
+    private IWatcherService.Stub stub = new IWatcherService.Stub() {
+        @Override
+        public int UpdateApplication(String sAppName, String sFileName, String sOutFile, int bReboot) throws RemoteException
+            {
+            return UpdtApp(sAppName, sFileName, sOutFile, bReboot);
+            }
+    };
+
+    @Override
+    public IBinder onBind(Intent arg0) {
+        return stub;
+    }
+
+    @Override
+    public void onCreate()
+        {
+        super.onCreate();
+
+        myContext = this;
+
+        getKeyGuardAndWakeLock();
+
+        File dir = getFilesDir();
+        File iniFile = new File(dir, "watcher.ini");
+        String sIniFile = iniFile.getAbsolutePath();
+        String sHold = "";
+
+        this.sPingTarget = GetIniData("watcher", "PingTarget", sIniFile, "www.mozilla.org");
+        sHold = GetIniData("watcher", "delay", sIniFile, "60000");
+           this.lDelay = Long.parseLong(sHold.trim());
+        sHold = GetIniData("watcher", "period", sIniFile,"300000");
+           this.lPeriod = Long.parseLong(sHold.trim());
+        sHold = GetIniData("watcher", "strikes", sIniFile,"3");
+           this.nMaxStrikes = Integer.parseInt(sHold.trim());
+
+        doToast("WatcherService created");
+        }
+
+    public String GetIniData(String sSection, String sKey, String sFile, String sDefault)
+        {
+        String sRet = sDefault;
+        String sComp = "";
+        String sLine = "";
+        boolean bFound = false;
+        BufferedReader in = null;
+        String    sTmpFileName = fixFileName(sFile);
+
+        try {
+            in = new BufferedReader(new FileReader(sTmpFileName));
+            sComp = "[" + sSection + "]";
+            while ((sLine = in.readLine()) != null)
+                {
+                if (sLine.equalsIgnoreCase(sComp))
+                    {
+                    bFound = true;
+                    break;
+                    }
+                }
+
+            if (bFound)
+                {
+                sComp = (sKey + " =").toLowerCase();
+                while ((sLine = in.readLine()) != null)
+                    {
+                    if (sLine.toLowerCase().contains(sComp))
+                        {
+                        String [] temp = null;
+                        temp = sLine.split("=");
+                        if (temp != null)
+                            {
+                            if (temp.length > 1)
+                                sRet = temp[1].trim();
+                            }
+                        break;
+                        }
+                    }
+                }
+            in.close();
+            }
+        catch (FileNotFoundException e)
+            {
+            sComp = e.toString();
+            }
+        catch (IOException e)
+            {
+            sComp = e.toString();
+            }
+        return (sRet);
+        }
+
+    private void handleCommand(Intent intent)
+        {
+        String sCmd = intent.getStringExtra("command");
+
+//        Debug.waitForDebugger();
+
+        if (sCmd != null)
+            {
+            if (sCmd.equalsIgnoreCase("updt"))
+                {
+                String sPkgName = intent.getStringExtra("pkgName");
+                String sPkgFile = intent.getStringExtra("pkgFile");
+                String sOutFile = intent.getStringExtra("outFile");
+                boolean bReboot = intent.getBooleanExtra("reboot", true);
+                int nReboot = bReboot ? 1 : 0;
+                   SendNotification("WatcherService updating " + sPkgName + " using file " + sPkgFile, "WatcherService updating " + sPkgName + " using file " + sPkgFile);
+
+                   UpdateApplication worker = new UpdateApplication(sPkgName, sPkgFile, sOutFile, nReboot);
+                }
+            else if (sCmd.equalsIgnoreCase("start"))
+                {
+                doToast("WatcherService started");
+                myTimer = new Timer();
+                myTimer.scheduleAtFixedRate(new MyTime(), lDelay, lPeriod);
+                }
+            else
+                {
+                doToast("WatcherService unknown command");
+                }
+            }
+        else
+            doToast("WatcherService created");
+        }
+
+
+    @Override
+    public void onStart(Intent intent, int startId) {
+        handleCommand(intent);
+        return;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        handleCommand(intent);
+        return START_STICKY;
+        }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        doToast("WatcherService destroyed");
+        if (pwl != null)
+            pwl.release();
+        stopForegroundCompat(R.string.foreground_service_started);
+    }
+
+    protected void getKeyGuardAndWakeLock()
+        {
+        // Fire off a thread to do some work that we shouldn't do directly in the UI thread
+        Thread t = new Thread() {
+            public void run() {
+                // Keep phone from locking or remove lock on screen
+                KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
+                if (km != null)
+                    {
+                    KeyguardManager.KeyguardLock kl = km.newKeyguardLock("watcher");
+                    if (kl != null)
+                        kl.disableKeyguard();
+                    }
+
+                // No sleeping on the job
+                PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+                if (pm != null)
+                    {
+                    pwl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "watcher");
+                    if (pwl != null)
+                        pwl.acquire();
+                    }
+
+                mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+                try {
+                    mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
+                    mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
+                    }
+                catch (NoSuchMethodException e)
+                    {
+                    // Running on an older platform.
+                    mStartForeground = mStopForeground = null;
+                    }
+                Notification notification = new Notification();
+                startForegroundCompat(R.string.foreground_service_started, notification);
+                }
+            };
+        t.start();
+        }
+
+    /**
+     * This is a wrapper around the new startForeground method, using the older
+     * APIs if it is not available.
+     */
+    void startForegroundCompat(int id, Notification notification) {
+        // If we have the new startForeground API, then use it.
+        if (mStartForeground != null) {
+            mStartForegroundArgs[0] = Integer.valueOf(id);
+            mStartForegroundArgs[1] = notification;
+            try {
+                mStartForeground.invoke(this, mStartForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke startForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke startForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.
+        setForeground(true);
+        mNM.notify(id, notification);
+    }
+
+    /**
+     * This is a wrapper around the new stopForeground method, using the older
+     * APIs if it is not available.
+     */
+    void stopForegroundCompat(int id) {
+        // If we have the new stopForeground API, then use it.
+        if (mStopForeground != null) {
+            mStopForegroundArgs[0] = Boolean.TRUE;
+            try {
+                mStopForeground.invoke(this, mStopForegroundArgs);
+            } catch (InvocationTargetException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
+            } catch (IllegalAccessException e) {
+                // Should not happen.
+                Log.w("ApiDemos", "Unable to invoke stopForeground", e);
+            }
+            return;
+        }
+
+        // Fall back on the old API.  Note to cancel BEFORE changing the
+        // foreground state, since we could be killed at that point.
+        mNM.cancel(id);
+        setForeground(false);
+    }
+
+    public void doToast(String sMsg)
+        {
+        Toast toast = Toast.makeText(this, sMsg, Toast.LENGTH_LONG);
+        toast.setGravity(Gravity.TOP|Gravity.CENTER_HORIZONTAL, 0, 100);
+        toast.show();
+        }
+
+    public void CheckMem() {
+           System.gc();
+        long lFreeMemory = Runtime.getRuntime().freeMemory();
+        long lTotMemory = Runtime.getRuntime().totalMemory();
+        long lMaxMemory = Runtime.getRuntime().maxMemory();
+
+        SendNotification("Memory Check", "Free: " + lFreeMemory + "Total: " + lTotMemory + "Max: " + lMaxMemory);
+    }
+
+    public int UpdtApp(String sPkgName, String sPkgFileName, String sOutFile, int bReboot)
+        {
+        int nRet = 1;
+        int lcv = 0;
+        String sRet = "";
+
+//        Debug.waitForDebugger();
+
+        FileOutputStream f = null;
+
+           try {
+               SendNotification("Killing " + sPkgName, "Step 1: Kill " + sPkgName + " if running");
+            while (!IsProcessDead(sPkgName) && (lcv < 5)) {
+                if (KillProcess(sPkgName, null).startsWith("Successfully"))
+                    break;
+                else
+                    lcv++;
+                   Thread.sleep(2000);
+                   }
+
+               CheckMem();
+
+            if ((sOutFile != null) && (sOutFile.length() > 0)) {
+                File outFile = new File(sOutFile);
+                if (outFile.exists() && outFile.canWrite()) {
+                    f = new FileOutputStream(outFile, true);
+                } else {
+                       SendNotification("File not found or cannot write to " + sOutFile, "File not found or cannot write to " + sOutFile);
+                }
+            }
+        } catch (InterruptedException e) {
+               e.printStackTrace();
+        } catch (FileNotFoundException e) {
+               SendNotification("File not found " + sOutFile, "Couldn't open " + sOutFile + " " + e.getLocalizedMessage());
+            e.printStackTrace();
+           } catch (SecurityException e) {
+               SendNotification("Security excepetion for " + sOutFile, "Exception message " + e.getLocalizedMessage());
+            e.printStackTrace();
+           }
+
+        if ((sPkgName != null) && (sPkgName.length() > 0))
+            {
+               SendNotification("Uninstalling " + sPkgName, "Step 2: Uninstall " + sPkgName);
+            sRet = UnInstallApp(sPkgName, null);
+               CheckMem();
+            if ((sRet.length() > 0) && (f != null))
+                {
+                try {
+                    f.write(sRet.getBytes());
+                    f.flush();
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    }
+                }
+            }
+
+        if ((sPkgFileName != null) && (sPkgFileName.length() > 0))
+            {
+               SendNotification("Installing " + sPkgFileName, "Step 3: Install " + sPkgFileName);
+            sRet = InstallApp(sPkgFileName, null);
+               SendNotification("Installed " + sPkgFileName, "" + sRet);
+               CheckMem();
+            if ((sRet.length() > 0) && (f != null))
+                {
+                try {
+                    f.write(sRet.getBytes());
+                    f.flush();
+                    f.close();
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    }
+                }
+            }
+
+        if (bReboot > 0)
+            RunReboot(null);
+
+        return(nRet);
+        }
+
+    public boolean GetProcessInfo(String sProcName)
+        {
+        boolean bRet = false;
+        ActivityManager aMgr = (ActivityManager) getApplicationContext().getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+        int    nProcs = lProcesses.size();
+        int lcv = 0;
+        String strProcName = "";
+
+        for (lcv = 0; lcv < nProcs; lcv++)
+            {
+            strProcName = lProcesses.get(lcv).processName;
+            if (strProcName.contains(sProcName))
+                {
+                bRet = true;
+                }
+            }
+
+        return (bRet);
+        }
+
+    public String RunReboot(OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "reboot";
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(10000);
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    public String KillProcess(String sProcName, OutputStream out)
+        {
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "kill";
+
+        String sRet = sErrorPrefix + "Unable to kill " + sProcName + "\n";
+        ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses();
+        int lcv = 0;
+        String strProcName = "";
+        int    nPID = 0;
+
+        for (lcv = 0; lcv < lProcesses.size(); lcv++)
+            {
+            if (lProcesses.get(lcv).processName.contains(sProcName))
+                {
+                strProcName = lProcesses.get(lcv).processName;
+                nPID = lProcesses.get(lcv).pid;
+                sRet = sErrorPrefix + "Failed to kill " + nPID + " " + strProcName + "\n";
+
+                theArgs[2] += " " + nPID;
+
+                try
+                    {
+                    pProc = Runtime.getRuntime().exec(theArgs);
+                    RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+                    outThrd.start();
+                    outThrd.join(5000);
+                    }
+                catch (IOException e)
+                    {
+                    sRet = e.getMessage();
+                    e.printStackTrace();
+                    }
+                catch (InterruptedException e)
+                    {
+                    e.printStackTrace();
+                    }
+
+                // Give the messages a chance to be processed
+                try {
+                    Thread.sleep(2000);
+                    }
+                catch (InterruptedException e)
+                    {
+                    e.printStackTrace();
+                    }
+                break;
+                }
+            }
+
+        if (nPID > 0)
+            {
+            sRet = "Successfully killed " + nPID + " " + strProcName + "\n";
+            lProcesses = aMgr.getRunningAppProcesses();
+            for (lcv = 0; lcv < lProcesses.size(); lcv++)
+                {
+                if (lProcesses.get(lcv).processName.contains(sProcName))
+                    {
+                    sRet = sErrorPrefix + "Unable to kill " + nPID + " " + strProcName + "\n";
+                    break;
+                    }
+                }
+            }
+
+        return (sRet);
+        }
+
+    public String GetAppRoot(String AppName)
+        {
+        String sRet = sErrorPrefix + " internal error [no context]";
+        Context ctx = getApplicationContext();
+
+        if (ctx != null)
+            {
+            try {
+                Context appCtx = ctx.createPackageContext(AppName, 0);
+                ContextWrapper appCtxW = new ContextWrapper(appCtx);
+                sRet = appCtxW.getPackageResourcePath();
+                appCtxW = null;
+                appCtx = null;
+                ctx = null;
+                System.gc();
+                }
+            catch (NameNotFoundException e)
+                {
+                e.printStackTrace();
+                }
+            }
+        return(sRet);
+        }
+
+    public boolean IsProcessDead(String sProcName)
+        {
+        boolean bRet = true;
+        ActivityManager aMgr = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+        List <ActivityManager.RunningAppProcessInfo> lProcesses = aMgr.getRunningAppProcesses(); //    .getProcessesInErrorState();
+        int lcv = 0;
+
+        if (lProcesses != null)
+            {
+            for (lcv = 0; lcv < lProcesses.size(); lcv++)
+                {
+                if (lProcesses.get(lcv).processName.contentEquals(sProcName))
+                    {
+                    bRet = false;
+                    break;
+                    }
+                }
+            }
+
+        return (bRet);
+        }
+
+    public String fixFileName(String fileName)
+        {
+        String    sRet = "";
+        String    sTmpFileName = "";
+
+        sRet = fileName.replace('\\', '/');
+
+        if (sRet.startsWith("/"))
+            sTmpFileName = sRet;
+        else
+            sTmpFileName = currentDir + "/" + sRet;
+
+        sRet = sTmpFileName.replace('\\', '/');
+        sTmpFileName = sRet;
+        sRet = sTmpFileName.replace("//", "/");
+
+        return(sRet);
+        }
+
+    public String GetTmpDir()
+        {
+        String     sRet = "";
+        Context ctx = getApplicationContext();
+        File dir = ctx.getFilesDir();
+        ctx = null;
+        try {
+            sRet = dir.getCanonicalPath();
+            }
+        catch (IOException e)
+            {
+            e.printStackTrace();
+            }
+        return(sRet);
+        }
+
+    public String UnInstallApp(String sApp, OutputStream out)
+        {
+        String sRet = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "pm uninstall " + sApp + ";exit";
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(60000);
+            int nRet = pProc.exitValue();
+            sRet = "\nuninst complete [" + nRet + "]";
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    public String InstallApp(String sApp, OutputStream out)
+        {
+        String sRet = "";
+        String sHold = "";
+        String [] theArgs = new String [3];
+
+        theArgs[0] = "su";
+        theArgs[1] = "-c";
+        theArgs[2] = "pm install " + sApp + ";exit";
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            RedirOutputThread outThrd = new RedirOutputThread(pProc, out);
+            outThrd.start();
+            outThrd.join(180000);
+            int nRet = pProc.exitValue();
+            sRet += "\ninstall complete [" + nRet + "]";
+            sHold = outThrd.strOutput;
+            sRet += "\nSuccess";
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+        catch (InterruptedException e)
+            {
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    private String SendPing(String sIPAddr)
+        {
+        Process    pProc;
+        String sRet = "";
+        String [] theArgs = new String [4];
+        boolean bStillRunning = true;
+        int    nBytesOut = 0;
+        int nBytesErr = 0;
+        int nBytesRead = 0;
+        byte[] buffer = new byte[1024];
+
+        theArgs[0] = "ping";
+        theArgs[1] = "-c";
+        theArgs[2] = "3";
+        theArgs[3] = sIPAddr;
+
+        try
+            {
+            pProc = Runtime.getRuntime().exec(theArgs);
+
+            InputStream sutOut = pProc.getInputStream();
+            InputStream sutErr = pProc.getErrorStream();
+
+            while (bStillRunning)
+                {
+                try
+                    {
+                    if ((nBytesOut = sutOut.available()) > 0)
+                        {
+                        if (nBytesOut > buffer.length)
+                            {
+                            buffer = null;
+                            System.gc();
+                            buffer = new byte[nBytesOut];
+                            }
+                        nBytesRead = sutOut.read(buffer, 0, nBytesOut);
+                        if (nBytesRead == -1)
+                            bStillRunning = false;
+                        else
+                            {
+                            String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                            sRet += sRep;
+                            sRep = null;
+                            }
+                        }
+
+                    if ((nBytesErr = sutErr.available()) > 0)
+                        {
+                        if (nBytesErr > buffer.length)
+                            {
+                            buffer = null;
+                            System.gc();
+                            buffer = new byte[nBytesErr];
+                            }
+                        nBytesRead = sutErr.read(buffer, 0, nBytesErr);
+                        if (nBytesRead == -1)
+                            bStillRunning = false;
+                        else
+                            {
+                            String sRep = new String(buffer,0,nBytesRead).replace("\n", "\r\n");
+                            sRet += sRep;
+                            sRep = null;
+                            }
+                        }
+
+                    bStillRunning = (IsProcRunning(pProc) || (sutOut.available() > 0) || (sutErr.available() > 0));
+                    }
+                catch (IOException e)
+                    {
+                    e.printStackTrace();
+                    }
+
+                if ((bStillRunning == true) && (nBytesErr == 0) && (nBytesOut == 0))
+                    {
+                    try {
+                        Thread.sleep(2000);
+                        }
+                    catch (InterruptedException e) {
+                        e.printStackTrace();
+                        }
+                    }
+                }
+
+            pProc.destroy();
+            pProc = null;
+            }
+        catch (IOException e)
+            {
+            sRet = e.getMessage();
+            e.printStackTrace();
+            }
+
+        return (sRet);
+        }
+
+    private boolean IsProcRunning(Process pProc)
+        {
+        boolean bRet = false;
+        @SuppressWarnings("unused")
+        int nExitCode = 0;
+
+        try
+            {
+            nExitCode = pProc.exitValue();
+            }
+        catch (IllegalThreadStateException z)
+            {
+            bRet = true;
+            }
+        catch (Exception e)
+            {
+            e.printStackTrace();
+            }
+
+        return(bRet);
+        }
+
+    private class UpdateApplication implements Runnable {
+        Thread    runner;
+        String    msPkgName = "";
+        String    msPkgFileName = "";
+        String    msOutFile = "";
+        int        mbReboot = 0;
+
+        public UpdateApplication(String sPkgName, String sPkgFileName, String sOutFile, int bReboot) {
+            runner = new Thread(this);
+            msPkgName = sPkgName;
+            msPkgFileName = sPkgFileName;
+            msOutFile = sOutFile;
+            mbReboot = bReboot;
+            runner.start();
+        }
+
+        @Override
+        public void run() {
+               bInstalling = true;
+            UpdtApp(msPkgName, msPkgFileName, msOutFile, mbReboot);
+               bInstalling = false;
+        }
+    }
+
+    private class MyTime extends TimerTask
+        {
+        int    nStrikes = 0;
+
+        public MyTime()
+            {
+            }
+
+        @Override
+        public void run()
+            {
+            if (bInstalling)
+                return;
+
+            // See if the network is up, if not after three failures reboot
+            String sRet = SendPing(sPingTarget);
+            if (!sRet.contains("3 received"))
+                {
+                if (nMaxStrikes > 0)
+                    {
+                    if (++nStrikes >= nMaxStrikes)
+                        RunReboot(null);
+                    }
+                }
+            else
+                {
+                nStrikes = 0;
+                }
+            sRet = null;
+
+            String sProgramName = "com.mozilla.SUTAgentAndroid";
+            PackageManager pm = myContext.getPackageManager();
+
+//            Debug.waitForDebugger();
+
+            if (!GetProcessInfo(sProgramName))
+                {
+                Intent agentIntent = new Intent();
+                agentIntent.setPackage(sProgramName);
+                agentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                agentIntent.setAction(Intent.ACTION_MAIN);
+                try {
+                    PackageInfo pi = pm.getPackageInfo(sProgramName, PackageManager.GET_ACTIVITIES | PackageManager.GET_INTENT_FILTERS);
+                    ActivityInfo [] ai = pi.activities;
+                    for (int i = 0; i < ai.length; i++)
+                        {
+                        ActivityInfo a = ai[i];
+                        if (a.name.length() > 0)
+                            {
+                            agentIntent.setClassName(a.packageName, a.name);
+                            break;
+                            }
+                        }
+                    }
+                catch (NameNotFoundException e)
+                    {
+                    e.printStackTrace();
+                    }
+                try
+                    {
+                    myContext.startActivity(agentIntent);
+                    }
+                catch(ActivityNotFoundException anf)
+                    {
+                    anf.printStackTrace();
+                    }
+                }
+            }
+        }
+
+    private void SendNotification(String tickerText, String expandedText) {
+        NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+        int icon = R.drawable.ateamlogo;
+        long when = System.currentTimeMillis();
+
+        Notification notification = new Notification(icon, tickerText, when);
+
+        notification.flags |= Notification.FLAG_AUTO_CANCEL;
+        notification.defaults |= Notification.DEFAULT_SOUND;
+//        notification.defaults |= Notification.DEFAULT_VIBRATE;
+        notification.defaults |= Notification.DEFAULT_LIGHTS;
+
+        Context context = getApplicationContext();
+
+        // Intent to launch an activity when the extended text is clicked
+        Intent intent = new Intent(this, WatcherService.class);
+        PendingIntent launchIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+        notification.setLatestEventInfo(context, tickerText, expandedText, launchIntent);
+
+        notificationManager.notify(NOTIFICATION_ID, notification);
+    }
+
+    private void CancelNotification() {
+        NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(NOTIFICATION_ID);
+    }
+
+}

From fcd47cca5b45b80b21bb1418b4854ad1bc311063 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 18 Apr 2011 12:30:51 -0700
Subject: [PATCH 227/509] Bug 637207 followup: Remove declaration of
 now-removed helper function. r=gal

---
 js/src/jsexn.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 8524800ceb40..1947c37137a1 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -79,9 +79,6 @@ exn_trace(JSTracer *trc, JSObject *obj);
 static void
 exn_finalize(JSContext *cx, JSObject *obj);
 
-static JSBool
-exn_enumerate(JSContext *cx, JSObject *obj);
-
 static JSBool
 exn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
             JSObject **objp);

From 9ac05428af4e6e4f90d2b523d41d9794606b4cad Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Mon, 18 Apr 2011 12:37:06 -0700
Subject: [PATCH 228/509] Bug 650578 - Disable notification tests on Android.
 r=mfinkle

---
 mobile/chrome/tests/browser_addons.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index ad759b45f0cc..015131406a4e 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -201,7 +201,11 @@ function checkNotification(aTitle, aMessage, aIcon, aCallback) {
     aCallback();
   };
 
-  waitFor(doTest, function() { return AlertsHelper.container.hidden == false; });
+  let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
+  if (sysInfo.get("device"))
+    aCallback();
+  else
+    waitFor(doTest, function() { return AlertsHelper.container.hidden == false; });
 }
 
 function checkAlert(aId, aName, aLabel, aShown, aCallback) {

From 4bfc8d1ddea2233fefab2dce445df34317f1cc4e Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Mon, 18 Apr 2011 12:37:09 -0700
Subject: [PATCH 229/509] Bug 650123 - Update max version used for addon tests
 in Fennec r=mfinkle

---
 mobile/chrome/tests/browser_install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/tests/browser_install.xml b/mobile/chrome/tests/browser_install.xml
index 0623420e4e2e..bb76898036bb 100644
--- a/mobile/chrome/tests/browser_install.xml
+++ b/mobile/chrome/tests/browser_install.xml
@@ -21,7 +21,7 @@
         <name>Fennec</name>
         <appID>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</appID>
         <min_version>0</min_version>
-        <max_version>5</max_version>
+        <max_version>*</max_version>
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
@@ -49,7 +49,7 @@
         <name>Fennec</name>
         <appID>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</appID>
         <min_version>0</min_version>
-        <max_version>5</max_version>
+        <max_version>*</max_version>
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>

From 1d43d57f196e358bbc6225db7b584c0e9ec25a35 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Mon, 18 Apr 2011 13:31:20 -0700
Subject: [PATCH 230/509] Bug 648367 - Add run_next_test to head.js. r=ted

---
 netwerk/test/unit/test_NetUtil.js             | 25 +--------
 netwerk/test/unit/test_data_protocol.js       |  4 --
 netwerk/test/unit/test_file_protocol.js       | 10 +---
 netwerk/test/unit/test_reopen.js              | 10 +---
 .../test/unit/test_connection_executeAsync.js | 29 +----------
 .../test/unit/test_sqlite_secure_delete.js    | 17 +------
 storage/test/unit/test_storage_connection.js  | 31 +----------
 testing/xpcshell/head.js                      | 51 +++++++++++++++++++
 .../tests/expiration/test_analyze_runs.js     |  4 +-
 .../components/places/tests/head_common.js    | 34 -------------
 .../tests/migration/test_v11_from_v10.js      |  4 +-
 .../test_v11_from_v10_migrated_from_v11.js    |  4 +-
 .../places/tests/queries/test_tags.js         |  7 ++-
 .../unit/test_486978_sort_by_date_queries.js  |  8 ++-
 .../test_PlacesUtils_asyncGetBookmarkIds.js   |  4 +-
 .../tests/unit/test_async_history_api.js      |  4 +-
 .../tests/unit/test_sql_guid_functions.js     |  4 +-
 17 files changed, 79 insertions(+), 171 deletions(-)

diff --git a/netwerk/test/unit/test_NetUtil.js b/netwerk/test/unit/test_NetUtil.js
index de25ad9e7988..05a37da2269a 100644
--- a/netwerk/test/unit/test_NetUtil.js
+++ b/netwerk/test/unit/test_NetUtil.js
@@ -539,7 +539,7 @@ function test_readInputStreamToString_too_many_bytes()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let tests = [
+[
   test_async_write_file,
   test_async_write_file_deferred,
   test_async_write_file_safe,
@@ -565,32 +565,11 @@ let tests = [
   test_readInputStreamToString_no_bytes_arg,
   test_readInputStreamToString_blocking_stream,
   test_readInputStreamToString_too_many_bytes,
-];
+].forEach(add_test);
 let index = 0;
 
-function run_next_test()
-{
-  if (index < tests.length) {
-    do_test_pending();
-
-    // Asynchronous test exceptions do not kill the test...
-    do_execute_soon(function() {
-      try {
-        print("Running the next test: " + tests[index].name);
-        tests[index++]();
-      }
-      catch (e) {
-        do_throw(e);
-      }
-    });
-  }
-
-  do_test_finished();
-}
-
 function run_test()
 {
-  do_test_pending();
   run_next_test();
 }
 
diff --git a/netwerk/test/unit/test_data_protocol.js b/netwerk/test/unit/test_data_protocol.js
index 334fe8b57d68..30cfd528015d 100644
--- a/netwerk/test/unit/test_data_protocol.js
+++ b/netwerk/test/unit/test_data_protocol.js
@@ -19,10 +19,6 @@ var urls = [
   ["DATA:TEXT/PLAIN;BASE64,Zm9 vI%20GJ%0Dhc%0Ag==", "text/plain",               "foo bar"]
 ];
 
-function run_next_test() {
-  test_array[test_index++]();
-}
-
 function run_test() {
   dump("*** run_test\n");
 
diff --git a/netwerk/test/unit/test_file_protocol.js b/netwerk/test/unit/test_file_protocol.js
index 208d85ca3da3..f454e8784f6d 100644
--- a/netwerk/test/unit/test_file_protocol.js
+++ b/netwerk/test/unit/test_file_protocol.js
@@ -7,18 +7,13 @@ const PR_RDONLY = 0x1;  // see prio.h
 
 const special_type = "application/x-our-special-type";
 
-var test_index = 0;
-var test_array = [
+[
   test_read_file,
   test_read_dir_1,
   test_read_dir_2,
   test_upload_file,
   do_test_finished
-];
-
-function run_next_test() {
-  test_array[test_index++]();
-}
+].forEach(add_test);
 
 function getFile(key) {
   var dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -228,6 +223,5 @@ function test_upload_file() {
 }
 
 function run_test() {
-  do_test_pending();
   run_next_test();
 }
diff --git a/netwerk/test/unit/test_reopen.js b/netwerk/test/unit/test_reopen.js
index 353018f81e89..ef2c06ffa75b 100644
--- a/netwerk/test/unit/test_reopen.js
+++ b/netwerk/test/unit/test_reopen.js
@@ -9,15 +9,14 @@ const NS_ERROR_ALREADY_OPENED = 0x804b0049;
 var chan = null;
 var httpserv = null;
 
-var test_index = 0;
-var test_array = [
+[
   test_data_channel,
   test_http_channel,
   test_file_channel,
   // Commented by default as it relies on external ressources
   //test_ftp_channel,
   end
-];
+].forEach(add_test);
 
 // Utility functions
 
@@ -87,10 +86,6 @@ function after_channel_closed() {
   run_next_test();
 }
 
-function run_next_test() {
-  test_array[test_index++]();
-}
-
 function test_channel(createChanClosure) {
   // First, synchronous reopening test
   chan = createChanClosure();
@@ -140,6 +135,5 @@ function run_test() {
   httpserv = new nsHttpServer();
   httpserv.start(4444);
   
-  do_test_pending();
   run_next_test();
 }
diff --git a/storage/test/unit/test_connection_executeAsync.js b/storage/test/unit/test_connection_executeAsync.js
index 0778efceb954..d920fb1632b5 100644
--- a/storage/test/unit/test_connection_executeAsync.js
+++ b/storage/test/unit/test_connection_executeAsync.js
@@ -307,7 +307,6 @@ function test_double_asyncClose_throws()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let tests =
 [
   test_create_and_add,
   test_transaction_created,
@@ -315,36 +314,10 @@ let tests =
   test_asyncClose_does_not_complete_before_statements,
   test_asyncClose_does_not_throw_no_callback,
   test_double_asyncClose_throws,
-];
-let index = 0;
-
-function run_next_test()
-{
-  function _run_next_test() {
-    if (index < tests.length) {
-      do_test_pending();
-      print("Running the next test: " + tests[index].name);
-
-      // Asynchronous tests means that exceptions don't kill the test.
-      try {
-        tests[index++]();
-      }
-      catch (e) {
-        do_throw(e);
-      }
-    }
-
-    do_test_finished();
-  }
-
-  // For saner stacks, we execute this code RSN.
-  do_execute_soon(_run_next_test);
-}
+].forEach(add_test);
 
 function run_test()
 {
   cleanup();
-
-  do_test_pending();
   run_next_test();
 }
diff --git a/storage/test/unit/test_sqlite_secure_delete.js b/storage/test/unit/test_sqlite_secure_delete.js
index 8a12d3f06fbb..66ddf000a545 100644
--- a/storage/test/unit/test_sqlite_secure_delete.js
+++ b/storage/test/unit/test_sqlite_secure_delete.js
@@ -112,27 +112,12 @@ function test_delete_removes_data()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-var tests =
 [
   test_delete_removes_data,
-];
-let index = 0;
-
-function run_next_test()
-{
-  if (index < tests.length) {
-    do_test_pending();
-    print("Running the next test: " + tests[index].name);
-    tests[index++]();
-  }
-
-  do_test_finished();
-}
+ ].forEach(add_test);
 
 function run_test()
 {
   cleanup();
-
-  do_test_pending();
   run_next_test();
 }
diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js
index eebd4706b6e5..0027148d3758 100644
--- a/storage/test/unit/test_storage_connection.js
+++ b/storage/test/unit/test_storage_connection.js
@@ -497,7 +497,7 @@ function test_getInterface()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-var tests = [
+[
   test_connectionReady_open,
   test_connectionReady_closed,
   test_databaseFile,
@@ -526,36 +526,9 @@ var tests = [
   test_clone_copies_functions,
   test_clone_copies_overridden_functions,
   test_getInterface,
-];
-let index = 0;
-
-function run_next_test()
-{
-  function _run_next_test() {
-    if (index < tests.length) {
-      do_test_pending();
-      print("Running the next test: " + tests[index].name);
-
-      // Asynchronous tests means that exceptions don't kill the test.
-      try {
-        tests[index++]();
-      }
-      catch (e) {
-        do_throw(e);
-      }
-    }
-
-    do_test_finished();
-  }
-
-  // For saner stacks, we execute this code RSN.
-  do_execute_soon(_run_next_test);
-}
+].forEach(add_test);
 
 function run_test()
 {
-  cleanup();
-
-  do_test_pending();
   run_next_test();
 }
diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js
index 3a9c9c403c28..a025db555597 100644
--- a/testing/xpcshell/head.js
+++ b/testing/xpcshell/head.js
@@ -829,3 +829,54 @@ function run_test_in_child(testFile, optionalCallback)
               callback);
 }
 
+
+/**
+ * Add a test function to the list of tests that are to be run asynchronously.
+ *
+ * Each test function must call run_next_test() when it's done. Test files
+ * should call run_next_test() in their run_test function to execute all
+ * async tests.
+ *
+ * @return the test function that was passed in.
+ */
+let gTests = [];
+function add_test(func) {
+  gTests.push(func);
+  return func;
+}
+
+/**
+ * Runs the next test function from the list of async tests.
+ */
+let gRunningTest = null;
+let gTestIndex = 0; // The index of the currently running test.
+function run_next_test()
+{
+  function _run_next_test()
+  {
+    if (gTestIndex < gTests.length) {
+      do_test_pending();
+      gRunningTest = gTests[gTestIndex++];
+      print("TEST-INFO | " + _TEST_FILE + " | Starting " +
+            gRunningTest.name);
+      // Exceptions do not kill asynchronous tests, so they'll time out.
+      try {
+        gRunningTest();
+      }
+      catch (e) {
+        do_throw(e);
+      }
+    }
+  }
+
+  // For sane stacks during failures, we execute this code soon, but not now.
+  // We do this now, before we call do_test_finished(), to ensure the pending
+  // counter (_tests_pending) never reaches 0 while we still have tests to run
+  // (do_execute_soon bumps that counter).
+  do_execute_soon(_run_next_test);
+
+  if (gRunningTest !== null) {
+    // Close the previous test do_test_pending call.
+    do_test_finished();
+  }
+}
diff --git a/toolkit/components/places/tests/expiration/test_analyze_runs.js b/toolkit/components/places/tests/expiration/test_analyze_runs.js
index b1948273bfd0..e09c35df62c9 100644
--- a/toolkit/components/places/tests/expiration/test_analyze_runs.js
+++ b/toolkit/components/places/tests/expiration/test_analyze_runs.js
@@ -135,12 +135,12 @@ function test_shutdown()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Harness
 
-let gTests = [
+[
   test_timed,
   test_debug,
   test_clear_history,
   test_shutdown,
-];
+].forEach(add_test);
 
 function run_test()
 {
diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js
index 9f4e78b81913..f20ec05daa3a 100644
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -647,40 +647,6 @@ function do_log_info(aMessage)
   print("TEST-INFO | " + _TEST_FILE + " | " + aMessage);
 }
 
-/**
- * Runs the next test in the gTests array.  gTests should be a array defined in
- * each test file.
- */
-let gRunningTest = null;
-let gTestIndex = 0; // The index of the currently running test.
-function run_next_test()
-{
-  function _run_next_test()
-  {
-    if (gTestIndex < gTests.length) {
-      do_test_pending();
-      gRunningTest = gTests[gTestIndex++];
-      print("TEST-INFO | " + _TEST_FILE + " | Starting " +
-            gRunningTest.name);
-      // Exceptions do not kill asynchronous tests, so they'll time out.
-      try {
-        gRunningTest();
-      }
-      catch (e) {
-        do_throw(e);
-      }
-    }
-  }
-
-  // For sane stacks during failures, we execute this code soon, but not now.
-  do_execute_soon(_run_next_test);
-
-  if (gRunningTest !== null) {
-    // Close the previous test do_test_pending call.
-    do_test_finished();
-  }
-}
-
 /**
  * Compares 2 arrays returning whether they contains the same elements.
  *
diff --git a/toolkit/components/places/tests/migration/test_v11_from_v10.js b/toolkit/components/places/tests/migration/test_v11_from_v10.js
index 34cc33ed5ffb..a27e03e9eca3 100644
--- a/toolkit/components/places/tests/migration/test_v11_from_v10.js
+++ b/toolkit/components/places/tests/migration/test_v11_from_v10.js
@@ -305,7 +305,7 @@ function test_final_state()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let gTests = [
+[
   test_initial_state,
   test_moz_bookmarks_guid_exists,
   test_bookmark_guids_non_null,
@@ -316,7 +316,7 @@ let gTests = [
   test_place_guid_annotation_imported,
   test_place_guid_annotation_removed,
   test_final_state,
-];
+].forEach(add_test);
 
 function run_test()
 {
diff --git a/toolkit/components/places/tests/migration/test_v11_from_v10_migrated_from_v11.js b/toolkit/components/places/tests/migration/test_v11_from_v10_migrated_from_v11.js
index 96df31cc70f8..c9b281f34c50 100644
--- a/toolkit/components/places/tests/migration/test_v11_from_v10_migrated_from_v11.js
+++ b/toolkit/components/places/tests/migration/test_v11_from_v10_migrated_from_v11.js
@@ -118,12 +118,12 @@ function test_final_state()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let gTests = [
+[
   test_initial_state,
   test_bookmark_guids_non_null,
   test_place_guids_non_null,
   test_final_state,
-];
+].forEach(add_test);
 
 function run_test()
 {
diff --git a/toolkit/components/places/tests/queries/test_tags.js b/toolkit/components/places/tests/queries/test_tags.js
index 1e93944e6a32..8ba3f4ba0962 100644
--- a/toolkit/components/places/tests/queries/test_tags.js
+++ b/toolkit/components/places/tests/queries/test_tags.js
@@ -41,9 +41,8 @@
  * Tests bookmark and history queries with tags.  See bug 399799.
  */
 
-// Add your tests here.  Each is an object with a summary string |desc| and a
-// method run() that's called to run the test.
-var gTests = [
+// Add your tests here.  Each is a function that's called to run the test.
+[
 
   function tags_getter_setter()
   {
@@ -590,7 +589,7 @@ var gTests = [
     cleanDatabase(run_next_test);
   },
 
-];
+].forEach(add_test);
 
 // The tag keys in query URIs, i.e., "place:tag=foo&!tags=1"
 //                                          ---     -----
diff --git a/toolkit/components/places/tests/unit/test_486978_sort_by_date_queries.js b/toolkit/components/places/tests/unit/test_486978_sort_by_date_queries.js
index d38a65d59729..cf9c008d92f4 100644
--- a/toolkit/components/places/tests/unit/test_486978_sort_by_date_queries.js
+++ b/toolkit/components/places/tests/unit/test_486978_sort_by_date_queries.js
@@ -58,12 +58,10 @@ function add_visit(aURI, aTime) {
   return visitId;
 }
 
-var gTests = [];
-
 /**
  * Tests that sorting date query by none will sort by title asc.
  */
-gTests.push(function() {
+add_test(function() {
   var options = hs.getNewQueryOptions();
   options.resultType = options.RESULTS_AS_DATE_QUERY;
   // This should sort by title asc.
@@ -89,7 +87,7 @@ gTests.push(function() {
 /**
  * Tests that sorting date query by date will sort accordingly.
  */
-gTests.push(function() {
+add_test(function() {
   var options = hs.getNewQueryOptions();
   options.resultType = options.RESULTS_AS_DATE_QUERY;
   // This should sort by title asc.
@@ -115,7 +113,7 @@ gTests.push(function() {
 /**
  * Tests that sorting date site query by date will still sort by title asc.
  */
-gTests.push(function() {
+add_test(function() {
   var options = hs.getNewQueryOptions();
   options.resultType = options.RESULTS_AS_DATE_SITE_QUERY;
   // This should sort by title asc.
diff --git a/toolkit/components/places/tests/unit/test_PlacesUtils_asyncGetBookmarkIds.js b/toolkit/components/places/tests/unit/test_PlacesUtils_asyncGetBookmarkIds.js
index 026eb7ed3a9b..f0b8dda44e30 100644
--- a/toolkit/components/places/tests/unit/test_PlacesUtils_asyncGetBookmarkIds.js
+++ b/toolkit/components/places/tests/unit/test_PlacesUtils_asyncGetBookmarkIds.js
@@ -7,7 +7,7 @@
 
 const TEST_URL = "http://www.example.com/";
 
-let gTests = [
+[
 
   function test_no_bookmark() {
     PlacesUtils.asyncGetBookmarkIds(TEST_URL, function (aItemIds, aURI) {
@@ -79,7 +79,7 @@ let gTests = [
     }, this);
   },
 
-];
+].forEach(add_test);
 
 function run_test() {
   run_next_test();
diff --git a/toolkit/components/places/tests/unit/test_async_history_api.js b/toolkit/components/places/tests/unit/test_async_history_api.js
index 2575268f886d..796fbb86b5a8 100644
--- a/toolkit/components/places/tests/unit/test_async_history_api.js
+++ b/toolkit/components/places/tests/unit/test_async_history_api.js
@@ -1252,7 +1252,7 @@ function test_referrer_sessionId_persists()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let gTests = [
+[
   test_interface_exists,
   test_invalid_uri_throws,
   test_invalid_places_throws,
@@ -1283,7 +1283,7 @@ let gTests = [
   test_title_change_notifies,
   test_visit_notifies,
   test_referrer_sessionId_persists,
-];
+].forEach(add_test);
 
 function run_test()
 {
diff --git a/toolkit/components/places/tests/unit/test_sql_guid_functions.js b/toolkit/components/places/tests/unit/test_sql_guid_functions.js
index ad1cca327896..ff8c971a84dc 100644
--- a/toolkit/components/places/tests/unit/test_sql_guid_functions.js
+++ b/toolkit/components/places/tests/unit/test_sql_guid_functions.js
@@ -98,10 +98,10 @@ function test_guid_on_background()
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Runner
 
-let gTests = [
+[
   test_guid_invariants,
   test_guid_on_background,
-];
+].forEach(add_test);
 
 function run_test()
 {

From 2958d1298346d81ecaa8c000d8add4dc9c285443 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Mon, 18 Apr 2011 21:57:32 +0100
Subject: [PATCH 231/509] Bug 639338 Unable to specify XBL modifiers for all
 possible mouse events r=smaug

--HG--
rename : content/xbl/test/test_bug403162.xhtml => content/xbl/test/test_bug639338.xhtml
---
 content/base/public/nsContentUtils.h  |  9 ++++
 content/base/src/nsContentUtils.cpp   | 11 +++++
 content/xbl/src/nsXBLEventHandler.cpp | 27 ++++-------
 content/xbl/test/Makefile.in          |  1 +
 content/xbl/test/test_bug639338.xhtml | 67 +++++++++++++++++++++++++++
 5 files changed, 98 insertions(+), 17 deletions(-)
 create mode 100644 content/xbl/test/test_bug639338.xhtml

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index a4516c08072d..8e00d0f9fd28 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -990,6 +990,15 @@ public:
    */
   static PRUint32 GetEventId(nsIAtom* aName);
 
+  /**
+   * Return the category for the event with the given name. The name is the
+   * event name *without* the 'on' prefix. Returns NS_EVENT if the event
+   * is not known to be in any particular category.
+   *
+   * @param aName the event name to look up
+   */
+  static PRUint32 GetEventCategory(const nsAString& aName);
+
   /**
    * Return the event id and atom for the event with the given name.
    * The name is the event name *without* the 'on' prefix.
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 0bacc146dc43..1957128f0276 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -3332,6 +3332,17 @@ nsContentUtils::GetEventId(nsIAtom* aName)
   return NS_USER_DEFINED_EVENT;
 }
 
+// static
+PRUint32
+nsContentUtils::GetEventCategory(const nsAString& aName)
+{
+  EventNameMapping mapping;
+  if (sStringEventTable->Get(aName, &mapping))
+    return mapping.mStructType;
+
+  return NS_EVENT;
+}
+
 nsIAtom*
 nsContentUtils::GetEventIdAndAtom(const nsAString& aName,
                                   PRUint32 aEventStruct,
diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp
index fb1428cd9bca..d55ae4de8f6e 100644
--- a/content/xbl/src/nsXBLEventHandler.cpp
+++ b/content/xbl/src/nsXBLEventHandler.cpp
@@ -191,23 +191,16 @@ NS_NewXBLEventHandler(nsXBLPrototypeHandler* aHandler,
                       nsIAtom* aEventType,
                       nsXBLEventHandler** aResult)
 {
-  if (aEventType == nsGkAtoms::mousedown ||
-      aEventType == nsGkAtoms::mouseup ||
-      aEventType == nsGkAtoms::click ||
-      aEventType == nsGkAtoms::dblclick ||
-      aEventType == nsGkAtoms::mouseover ||
-      aEventType == nsGkAtoms::mouseout ||
-      aEventType == nsGkAtoms::mousemove ||
-      aEventType == nsGkAtoms::contextmenu ||
-      aEventType == nsGkAtoms::dragenter ||
-      aEventType == nsGkAtoms::dragover ||
-      aEventType == nsGkAtoms::dragdrop ||
-      aEventType == nsGkAtoms::dragexit ||
-      aEventType == nsGkAtoms::draggesture) {
-    *aResult = new nsXBLMouseEventHandler(aHandler);
-  }
-  else {
-    *aResult = new nsXBLEventHandler(aHandler);
+  switch (nsContentUtils::GetEventCategory(nsDependentAtomString(aEventType))) {
+    case NS_DRAG_EVENT:
+    case NS_MOUSE_EVENT:
+    case NS_MOUSE_SCROLL_EVENT:
+    case NS_SIMPLE_GESTURE_EVENT:
+      *aResult = new nsXBLMouseEventHandler(aHandler);
+      break;
+    default:
+      *aResult = new nsXBLEventHandler(aHandler);
+      break;
   }
 
   if (!*aResult)
diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in
index b791a2e7a603..672032daeaf7 100644
--- a/content/xbl/test/Makefile.in
+++ b/content/xbl/test/Makefile.in
@@ -75,6 +75,7 @@ _TEST_FILES =	\
 		test_bug591198.html \
 		file_bug591198_xbl.xml \
 		file_bug591198_inner.html \
+		test_bug639338.xhtml \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/xbl/test/test_bug639338.xhtml b/content/xbl/test/test_bug639338.xhtml
new file mode 100644
index 000000000000..1484445b9fb7
--- /dev/null
+++ b/content/xbl/test/test_bug639338.xhtml
@@ -0,0 +1,67 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=403162
+-->
+<head>
+  <title>Test for Bug 639338</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <bindings xmlns="http://www.mozilla.org/xbl">
+    <binding id="test">
+      <handlers>
+        <handler event="DOMMouseScroll" action="window.triggerCount++"/>
+        <handler event="DOMMouseScroll" modifiers="shift" action="window.shiftCount++"/>
+        <handler event="DOMMouseScroll" modifiers="control" action="window.controlCount++"/>
+      </handlers>
+    </binding>
+  </bindings>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=639338">Mozilla Bug 639338</a>
+<p id="display" style="-moz-binding: url(#test)"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+<![CDATA[
+var triggerCount = 0;
+var shiftCount = 0;
+var controlCount = 0;
+
+function dispatchEvent(t, controlKey, shiftKey) {
+  var ev = document.createEvent("MouseScrollEvents");
+  ev.initMouseScrollEvent("DOMMouseScroll", true, true, window, 0, 0, 0, 0, 0, controlKey, false, shiftKey, false, 0, null, 0);
+  t.dispatchEvent(ev);  
+}
+
+/** Test for Bug 403162 **/
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  var t = $("display");
+  is(triggerCount, 0, "Haven't dispatched event");
+
+  dispatchEvent(t, false, false);
+  is(triggerCount, 1, "Dispatched once");
+  is(shiftCount, 0, "Not shift");
+  is(controlCount, 0, "Not control");
+
+  dispatchEvent(t, false, true);
+  is(triggerCount, 2, "Dispatched twice");
+  is(shiftCount, 1, "Shift");
+  is(controlCount, 0, "Not control");
+
+  dispatchEvent(t, true, false);
+  is(triggerCount, 3, "Dispatched thrice");
+  is(shiftCount, 1, "Not shift");
+  is(controlCount, 1, "Control");
+
+  SimpleTest.finish();
+});
+]]>
+</script>
+</pre>
+</body>
+</html>
+

From 97bcbc64d43bc91c7ee5e287c5631f15eb12687d Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 19 Apr 2011 09:37:12 +1200
Subject: [PATCH 232/509] Bug 434494 - Make Command+K successfully focus the
 search box when it creates a new window r=gavin.sharp

---
 browser/base/content/browser.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8a0047f2c19f..55aeaec3f8b8 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3296,16 +3296,15 @@ const BrowserSearch = {
         win.BrowserSearch.webSearch();
       } else {
         // If there are no open browser windows, open a new one
-
-        // This needs to be in a timeout so that we don't end up refocused
-        // in the url bar
-        function webSearchCallback() {
-          setTimeout(BrowserSearch.webSearch, 0);
+        function observer(subject, topic, data) {
+          if (subject == win) {
+            BrowserSearch.webSearch();
+            Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
+          }
         }
-
         win = window.openDialog("chrome://browser/content/", "_blank",
                                 "chrome,all,dialog=no", "about:blank");
-        win.addEventListener("load", webSearchCallback, false);
+        Services.obs.addObserver(observer, "browser-delayed-startup-finished", false); 
       }
       return;
     }

From 0bc38f728160a3e84478d5dbdf23ce7ce8af670b Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Mon, 18 Apr 2011 15:41:09 -0700
Subject: [PATCH 233/509] Bug 644680 - Tests for FileUtils.jsm. r=sdwilsh

---
 toolkit/mozapps/shared/FileUtils.jsm          |  10 +-
 toolkit/mozapps/shared/Makefile.in            |   2 +
 .../shared/test/unit/test_FileUtils.js        | 146 ++++++++++++++++++
 3 files changed, 152 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/mozapps/shared/test/unit/test_FileUtils.js

diff --git a/toolkit/mozapps/shared/FileUtils.jsm b/toolkit/mozapps/shared/FileUtils.jsm
index a7fe73859294..20af24c18dad 100644
--- a/toolkit/mozapps/shared/FileUtils.jsm
+++ b/toolkit/mozapps/shared/FileUtils.jsm
@@ -59,7 +59,7 @@ var FileUtils = {
   PERMS_DIRECTORY : 0755,
 
   /**
-   * Gets the file at the specified hierarchy under a Directory Service key.
+   * Gets a file at the specified hierarchy under a nsIDirectoryService key.
    * @param   key
    *          The Directory Service Key to start from
    * @param   pathArray
@@ -77,8 +77,8 @@ var FileUtils = {
   },
 
   /**
-   * Gets the specified directory at the specified hierarchy under a
-   * Directory Service key.
+   * Gets a directory at the specified hierarchy under a nsIDirectoryService
+   * key.
    * @param   key
    *          The Directory Service Key to start from
    * @param   pathArray
@@ -89,9 +89,7 @@ var FileUtils = {
    *          should be created if it does not exist, false otherwise.
    * @param   followLinks (optional)
    *          true if links should be followed, false otherwise.
-   * @return  nsIFile object for the location specified. If the directory
-   *          requested does not exist, it is created, along with any
-   *          parent directories that need to be created.
+   * @return  nsIFile object for the location specified.
    */
   getDir: function FileUtils_getDir(key, pathArray, shouldCreate, followLinks) {
     var dir = gDirService.get(key, Ci.nsILocalFile);
diff --git a/toolkit/mozapps/shared/Makefile.in b/toolkit/mozapps/shared/Makefile.in
index 01d0aaa4103f..244085f1b9f2 100644
--- a/toolkit/mozapps/shared/Makefile.in
+++ b/toolkit/mozapps/shared/Makefile.in
@@ -39,6 +39,7 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
+relativesrcdir = toolkit/mozapps/shared
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -51,6 +52,7 @@ EXTRA_PP_JS_MODULES = \
 
 ifdef ENABLE_TESTS
 DIRS += test/chrome
+XPCSHELL_TESTS = test/unit
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/shared/test/unit/test_FileUtils.js b/toolkit/mozapps/shared/test/unit/test_FileUtils.js
new file mode 100644
index 000000000000..e0111f8b49cc
--- /dev/null
+++ b/toolkit/mozapps/shared/test/unit/test_FileUtils.js
@@ -0,0 +1,146 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Components.utils.import("resource://gre/modules/FileUtils.jsm");
+
+function do_check_throws(f, result, stack) {
+  if (!stack)
+    stack = Components.stack.caller;
+
+  try {
+    f();
+  } catch (exc) {
+    if (exc.result == result)
+      return;
+    do_throw("expected result " + result + ", caught " + exc, stack);
+  }
+  do_throw("expected result " + result + ", none thrown", stack);
+}
+
+const gProfD = do_get_profile();
+
+add_test(function test_getFile() {
+  let file = FileUtils.getFile("ProfD", ["foobar"]);
+  do_check_true(file instanceof Components.interfaces.nsIFile);
+  do_check_false(file.exists());
+
+  let other = gProfD.clone();
+  other.append("foobar");
+  do_check_true(file.equals(other));
+
+  run_next_test();
+});
+
+add_test(function test_getFile_nonexistentDir() {
+  do_check_throws(function () {
+    let file = FileUtils.getFile("NonexistentD", ["foobar"]);
+  }, Components.results.NS_ERROR_FAILURE);
+
+  run_next_test();
+});
+
+add_test(function test_getFile_createDirs() {
+  let file = FileUtils.getFile("ProfD", ["a", "b", "foobar"]);
+  do_check_true(file instanceof Components.interfaces.nsIFile);
+  do_check_false(file.exists());
+
+  let other = gProfD.clone();
+  other.append("a");
+  do_check_true(other.isDirectory());
+  other.append("b");
+  do_check_true(other.isDirectory());
+  other.append("foobar");
+  do_check_true(file.equals(other));
+
+  run_next_test();
+});
+
+add_test(function test_getDir() {
+  let dir = FileUtils.getDir("ProfD", ["foodir"]);
+  do_check_true(dir instanceof Components.interfaces.nsIFile);
+  do_check_false(dir.exists());
+
+  let other = gProfD.clone();
+  other.append("foodir");
+  do_check_true(dir.equals(other));
+
+  run_next_test();
+});
+
+add_test(function test_getDir_nonexistentDir() {
+  do_check_throws(function () {
+    let file = FileUtils.getDir("NonexistentD", ["foodir"]);
+  }, Components.results.NS_ERROR_FAILURE);
+
+  run_next_test();
+});
+
+add_test(function test_getDir_shouldCreate() {
+  let dir = FileUtils.getDir("ProfD", ["c", "d", "foodir"], true);
+  do_check_true(dir instanceof Components.interfaces.nsIFile);
+  do_check_true(dir.exists());
+
+  let other = gProfD.clone();
+  other.append("c");
+  do_check_true(other.isDirectory());
+  other.append("d");
+  do_check_true(other.isDirectory());
+  other.append("foodir");
+  do_check_true(dir.equals(other));
+
+  run_next_test();
+});
+
+add_test(function test_openSafeFileOutputStream_defaultFlags() {
+  let file = FileUtils.getFile("ProfD", ["john"]);
+  let fos = FileUtils.openSafeFileOutputStream(file);
+  do_check_true(fos instanceof Components.interfaces.nsIFileOutputStream);
+  do_check_true(fos instanceof Components.interfaces.nsISafeOutputStream);
+
+  //TODO FileUtils.openSafeFileOutputStream() should use DEFER_OPEN in which
+  // case we want to verify that the file hasn't been created yet and gets
+  // created once we write to it.
+  do_check_true(file.exists());
+
+  // No nsIXULRuntime in xpcshell, so use this trick to determine whether we're
+  // on Windows.
+  if ("@mozilla.org/windows-registry-key;1" in Components.classes) {
+    do_check_eq(file.permissions, 0666);
+  } else {
+    do_check_eq(file.permissions, FileUtils.PERMS_FILE);
+  }
+
+  run_next_test();
+});
+
+// openSafeFileOutputStream will uses MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE
+// as the default mode flags, but we can pass in our own if we want to.
+add_test(function test_openSafeFileOutputStream_modeFlags() {
+  let file = FileUtils.getFile("ProfD", ["paul"]);
+  do_check_throws(function () {
+    FileUtils.openSafeFileOutputStream(file, FileUtils.MODE_WRONLY);
+  }, Components.results.NS_ERROR_FILE_NOT_FOUND);
+  do_check_false(file.exists());
+
+  run_next_test();
+});
+
+add_test(function test_closeSafeFileOutputStream() {
+  let file = FileUtils.getFile("ProfD", ["george"]);
+  let fos = FileUtils.openSafeFileOutputStream(file);
+
+  // We can write data to the stream just fine while it's open.
+  let data = "here comes the sun";
+  fos.write(data, data.length);
+
+  // But once we close it, we can't anymore.
+  FileUtils.closeSafeFileOutputStream(fos);
+  do_check_throws(function () {
+    fos.write(data, data.length);
+  }, Components.results.NS_BASE_STREAM_CLOSED);
+  run_next_test();
+});
+
+function run_test() {
+  run_next_test();
+}

From be8c9fb771f46358ccfa673c1411e061a01a645c Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Mon, 18 Apr 2011 15:41:09 -0700
Subject: [PATCH 234/509] Bug 644680 - FileUtils.openSafeFileOutputStream()
 should init stream with DEFER_OPEN. r=sdwilsh sr=rstrong

---
 toolkit/mozapps/shared/FileUtils.jsm               |  4 +++-
 toolkit/mozapps/shared/test/unit/test_FileUtils.js | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/shared/FileUtils.jsm b/toolkit/mozapps/shared/FileUtils.jsm
index 20af24c18dad..2f7f5bcf59f8 100644
--- a/toolkit/mozapps/shared/FileUtils.jsm
+++ b/toolkit/mozapps/shared/FileUtils.jsm
@@ -110,13 +110,15 @@ var FileUtils = {
    * @param   modeFlags
    *          (optional) File open flags. Can be undefined.
    * @returns nsIFileOutputStream to write to.
+   * @note The stream is initialized with the DEFER_OPEN behavior flag.
+   *       See nsIFileOutputStream.
    */
   openSafeFileOutputStream: function FileUtils_openSafeFileOutputStream(file, modeFlags) {
     var fos = Cc["@mozilla.org/network/safe-file-output-stream;1"].
               createInstance(Ci.nsIFileOutputStream);
     if (modeFlags === undefined)
       modeFlags = this.MODE_WRONLY | this.MODE_CREATE | this.MODE_TRUNCATE;
-    fos.init(file, modeFlags, this.PERMS_FILE, 0);
+    fos.init(file, modeFlags, this.PERMS_FILE, fos.DEFER_OPEN);
     return fos;
   },
 
diff --git a/toolkit/mozapps/shared/test/unit/test_FileUtils.js b/toolkit/mozapps/shared/test/unit/test_FileUtils.js
index e0111f8b49cc..3e7bf8b67598 100644
--- a/toolkit/mozapps/shared/test/unit/test_FileUtils.js
+++ b/toolkit/mozapps/shared/test/unit/test_FileUtils.js
@@ -97,9 +97,12 @@ add_test(function test_openSafeFileOutputStream_defaultFlags() {
   do_check_true(fos instanceof Components.interfaces.nsIFileOutputStream);
   do_check_true(fos instanceof Components.interfaces.nsISafeOutputStream);
 
-  //TODO FileUtils.openSafeFileOutputStream() should use DEFER_OPEN in which
-  // case we want to verify that the file hasn't been created yet and gets
-  // created once we write to it.
+  // FileUtils.openSafeFileOutputStream() opens the stream with DEFER_OPEN
+  // which means the file will not be open until we write to it.
+  do_check_false(file.exists());
+
+  let data = "imagine";
+  fos.write(data, data.length);
   do_check_true(file.exists());
 
   // No nsIXULRuntime in xpcshell, so use this trick to determine whether we're
@@ -117,8 +120,10 @@ add_test(function test_openSafeFileOutputStream_defaultFlags() {
 // as the default mode flags, but we can pass in our own if we want to.
 add_test(function test_openSafeFileOutputStream_modeFlags() {
   let file = FileUtils.getFile("ProfD", ["paul"]);
+  let fos = FileUtils.openSafeFileOutputStream(file, FileUtils.MODE_WRONLY);
+  let data = "yesterday";
   do_check_throws(function () {
-    FileUtils.openSafeFileOutputStream(file, FileUtils.MODE_WRONLY);
+    fos.write(data, data.length);
   }, Components.results.NS_ERROR_FILE_NOT_FOUND);
   do_check_false(file.exists());
 

From 4d493e350a44c070331de2f2bb09d21ac6015e4f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 17:16:40 -0400
Subject: [PATCH 235/509] Bug 355178 - Don't break words on hyphens before
 passing them to hunspell, as it can handle word breaking on hyphens on its
 own; r=smaug

--HG--
extra : rebase_source : 298f0832ac6f0b12497e9c883bbebea8e168284c
---
 .../dictionary-sources/upstream-hunspell.diff | 60 ++++++++++---------
 .../locales/en-US/hunspell/en-US.dic          |  3 +-
 .../spellcheck/src/mozInlineSpellWordUtil.cpp | 34 ++++++++++-
 layout/reftests/editor/reftest.list           |  2 +-
 4 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
index 81a8f3c7c45a..06dd08da40c4 100644
--- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
+++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
@@ -9463,101 +9463,103 @@
 < schrod's
 ---
 > schrod/SM
-42883,42885c48694
+41998a42010
+> scot-free
+42883,42885c48695
 < shit's
 < shit/S!
 < shite/S!
 ---
 > shit/MS!
-42887,42888c48696,48697
+42887,42888c48697,48698
 < shithead/S!
 < shitload/!
 ---
 > shithead/MS!
 > shitload/MS!
-42891c48700
+42891c48701
 < shitty/RT!
 ---
 > shitty/TR!
-42976a48786
+42976a48787
 > should've
-43008c48818
+43008c48819
 < showtime
 ---
 > showtime/MS
-43724,43726c49534
+43724,43726c49535
 < smoulder's
 < smouldered
 < smoulders
 ---
 > smoulder/GSMD
-44062c49870
+44062c49871
 < sonofabitch
 ---
 > sonofabitch/!
-44371a50180
+44371a50181
 > spick/S!
-44383c50192
+44383c50193
 < spik/S
 ---
 > spik/S!
-46106a51916
+46106a51917
 > syllabi
-46160c51970
+46160c51971
 < synch/GMD
 ---
 > synch/GMDS
-46167d51976
+46167d51977
 < synchs
-46203,46204c52012,52013
+46203,46204c52013,52014
 < sysadmin/S
 < sysop/S
 ---
 > sysadmin/MS
 > sysop/MS
-46752a52562
+46752a52563
 > terabit/MS
-46753a52564,52565
+46753a52565,52566
 > terahertz/M
 > terapixel/MS
-46817a52630
+46817a52631
 > testcase/MS
-46831a52645
+46831a52646
 > testsuite/MS
-46925a52740
+46925a52741
 > theremin/MS
-47755a53571
+47755a53572
 > transfect/DSMG
-47774a53591,53592
+47774a53592,53593
 > transgenderism
 > transgene/MS
-47951c53769
+47951c53770
 < triage/M
 ---
 > triage/MG
-48869a54688
+48869a54689
 > unlikeable
-49211c55030
+49211c55031
 < vagina/M
 ---
 > vagina/MS
-49368,49369c55187
+49368,49369c55188
 < velour's
 < velours's
 ---
 > velour/MS
-49478a55297
+49478a55298
 > vertices
-50148a55968
+50148a55969
 > weaponize/DSG
-50260,50261d56079
+50260,50261d56080
 < werwolf/M
 < werwolves
-50728c56546
+50728c56547
 < women
 ---
 > women/M
-50794c56612
+50794c56613
 < wop/S!
 ---
 > wop/MS!
diff --git a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
index bb6d661f35c6..cbe3597ffa46 100644
--- a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
+++ b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
@@ -1,4 +1,4 @@
-57434
+57435
 0/nm
 0th/pt
 1/n1
@@ -48141,6 +48141,7 @@ scorn/MDRSZG
 scorner/M
 scornful/Y
 scorpion/MS
+scot-free
 scotch/MDSG
 scotchs
 scoundrel/MS
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index 269cdc4e6d6e..2ca15167ecff 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -888,23 +888,55 @@ WordSplitState::ClassifyCharacter(PRInt32 aIndex, PRBool aRecurse) const
       return CHAR_CLASS_SEPARATOR;
     if (ClassifyCharacter(aIndex - 1, false) != CHAR_CLASS_WORD)
       return CHAR_CLASS_SEPARATOR;
+    // If the previous charatcer is a word-char, make sure that it's not a
+    // special dot character.
+    if (mDOMWordText[aIndex - 1] == '.')
+      return CHAR_CLASS_SEPARATOR;
 
     // now we know left char is a word-char, check the right-hand character
     if (aIndex == PRInt32(mDOMWordText.Length()) - 1)
       return CHAR_CLASS_SEPARATOR;
     if (ClassifyCharacter(aIndex + 1, false) != CHAR_CLASS_WORD)
       return CHAR_CLASS_SEPARATOR;
+    // If the next charatcer is a word-char, make sure that it's not a
+    // special dot character.
+    if (mDOMWordText[aIndex + 1] == '.')
+      return CHAR_CLASS_SEPARATOR;
 
     // char on either side is a word, this counts as a word
     return CHAR_CLASS_WORD;
   }
 
+  // The dot character, if appearing at the end of a word, should
+  // be considered part of that word.  Example: "etc.", or
+  // abbreviations
+  if (aIndex > 0 &&
+      mDOMWordText[aIndex] == '.' &&
+      mDOMWordText[aIndex - 1] != '.' &&
+      ClassifyCharacter(aIndex - 1, false) != CHAR_CLASS_WORD) {
+    return CHAR_CLASS_WORD;
+  }
+
   // all other punctuation
   if (charCategory == nsIUGenCategory::kSeparator ||
       charCategory == nsIUGenCategory::kOther ||
       charCategory == nsIUGenCategory::kPunctuation ||
-      charCategory == nsIUGenCategory::kSymbol)
+      charCategory == nsIUGenCategory::kSymbol) {
+    // Don't break on hyphens, as hunspell handles them on its own.
+    if (aIndex > 0 &&
+        mDOMWordText[aIndex] == '-' &&
+        mDOMWordText[aIndex - 1] != '-' &&
+        ClassifyCharacter(aIndex - 1, false) == CHAR_CLASS_WORD) {
+      // A hyphen is only meaningful as a separator inside a word
+      // if the previous and next characters are a word character.
+      if (aIndex == PRInt32(mDOMWordText.Length()) - 1)
+        return CHAR_CLASS_SEPARATOR;
+      if (mDOMWordText[aIndex + 1] != '.' &&
+          ClassifyCharacter(aIndex + 1, false) == CHAR_CLASS_WORD)
+        return CHAR_CLASS_WORD;
+    }
     return CHAR_CLASS_SEPARATOR;
+  }
 
   // any other character counts as a word
   return CHAR_CLASS_WORD;
diff --git a/layout/reftests/editor/reftest.list b/layout/reftests/editor/reftest.list
index 9ac99591f856..fcc920285b84 100644
--- a/layout/reftests/editor/reftest.list
+++ b/layout/reftests/editor/reftest.list
@@ -47,7 +47,7 @@ needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocu
 needs-focus == caret_after_reframe.html caret_after_reframe-ref.html
 == nobogusnode-1.html nobogusnode-ref.html
 == nobogusnode-2.html nobogusnode-ref.html
-fails-if(!Android) == spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
+fails-if(Android) == spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
 fails-if(Android) != spellcheck-hyphen-invalid.html spellcheck-hyphen-invalid-ref.html
 == spellcheck-slash-valid.html spellcheck-slash-valid-ref.html
 == spellcheck-period-valid.html spellcheck-period-valid-ref.html

From 74ff849e2d5ace83ad58ac69214a66cba4033622 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 14 Apr 2011 17:01:09 -0700
Subject: [PATCH 236/509] Bug 650139 - Enable mobile Feedback extension on
 Aurora channel [r=mfinkle DONTBUILD]

--HG--
extra : rebase_source : 52edee9fc8ca8ea885973dfdf78ec9cafb896654
---
 mobile/app/profile/extensions/Makefile.in                       | 2 +-
 .../profile/extensions/feedback@mobile.mozilla.org/install.rdf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/app/profile/extensions/Makefile.in b/mobile/app/profile/extensions/Makefile.in
index d3ebb9707268..1f264f294825 100644
--- a/mobile/app/profile/extensions/Makefile.in
+++ b/mobile/app/profile/extensions/Makefile.in
@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq (beta,$(MOZ_UPDATE_CHANNEL))
+ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
 EXTENSIONS = \
   feedback@mobile.mozilla.org \
   $(NULL)
diff --git a/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf b/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
index f2ec185ba7b7..e87719c1905c 100644
--- a/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
+++ b/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
         <em:minVersion>2.0b1pre</em:minVersion>
-        <em:maxVersion>4.*</em:maxVersion>
+        <em:maxVersion>6.*</em:maxVersion>
       </Description>
     </em:targetApplication>
    

From 5d950fcb8f8f09e1799cdf16821986f9b4b6ae28 Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Fri, 15 Apr 2011 13:29:54 +1200
Subject: [PATCH 237/509] Bug 650157 - Push nsBuiltinDecoderReader::mDataOffset
 down into nsOggReader. r=doublec

---
 content/media/nsBuiltinDecoderReader.cpp       |  3 +--
 content/media/nsBuiltinDecoderReader.h         |  8 --------
 content/media/nsBuiltinDecoderStateMachine.cpp |  3 +--
 content/media/ogg/nsOggReader.cpp              | 15 ++++++++++-----
 content/media/ogg/nsOggReader.h                |  5 +++++
 content/media/raw/nsRawReader.h                |  1 -
 content/media/wave/nsWaveReader.cpp            |  1 -
 content/media/webm/nsWebMReader.cpp            |  5 -----
 8 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index d13d2854fdbf..d9fb19a09cc9 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -208,8 +208,7 @@ VideoData* VideoData::Create(nsVideoInfo& aInfo,
 
 nsBuiltinDecoderReader::nsBuiltinDecoderReader(nsBuiltinDecoder* aDecoder)
   : mMonitor("media.decoderreader"),
-    mDecoder(aDecoder),
-    mDataOffset(0)
+    mDecoder(aDecoder)
 {
   MOZ_COUNT_CTOR(nsBuiltinDecoderReader);
 }
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index e7ce6732fcba..9d4b0899748f 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -92,10 +92,6 @@ public:
   // to and displayed at this size.
   nsIntSize mDisplay;
 
-  // The offset of the first non-header page in the file, in bytes.
-  // Used to seek to the start of the media.
-  PRInt64 mDataOffset;
-
   // Indicates the frame layout for single track stereo videos.
   mozilla::layers::StereoMode mStereoMode;
 
@@ -513,10 +509,6 @@ protected:
   // reader's monitor when accessing this.
   nsBuiltinDecoder* mDecoder;
 
-  // The offset of the start of the first non-header page in the file.
-  // Used to seek to media start time.
-  PRInt64 mDataOffset;
-
   // Stores presentation info required for playback. The reader's monitor
   // must be held when accessing this.
   nsVideoInfo mInfo;
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 07767a549bb1..b888e3cca32a 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -1557,10 +1557,9 @@ VideoData* nsBuiltinDecoderStateMachine::FindStartTime()
   PRInt64 startTime = 0;
   mStartTime = 0;
   VideoData* v = nsnull;
-  PRInt64 dataOffset = mInfo.mDataOffset;
   {
     MonitorAutoExit exitMon(mDecoder->GetMonitor());
-    v = mReader->FindStartTime(dataOffset, startTime);
+    v = mReader->FindStartTime(0, startTime);
   }
   if (startTime != 0) {
     mStartTime = startTime;
diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index 34cb78b15dfe..922654d7c7b2 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -107,7 +107,8 @@ nsOggReader::nsOggReader(nsBuiltinDecoder* aDecoder)
     mTheoraSerial(0),
     mPageOffset(0),
     mTheoraGranulepos(-1),
-    mVorbisGranulepos(-1)
+    mVorbisGranulepos(-1),
+    mDataOffset(0)
 {
   MOZ_COUNT_CTOR(nsOggReader);
 }
@@ -324,7 +325,6 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     mInfo.mDisplay = nsIntSize(mInfo.mPicture.width,
                                mInfo.mPicture.height);
   }
-  mInfo.mDataOffset = mDataOffset;
 
   if (mSkeletonState && mSkeletonState->HasIndex()) {
     // Extract the duration info out of the index, so we don't need to seek to
@@ -906,9 +906,13 @@ VideoData* nsOggReader::FindStartTime(PRInt64 aOffset,
                "Should be on state machine thread.");
   nsMediaStream* stream = mDecoder->GetCurrentStream();
   NS_ENSURE_TRUE(stream != nsnull, nsnull);
-  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, aOffset);
+  // Ensure aOffset is after mDataOffset, the offset of the first non-header page.
+  // This prevents us from trying to parse header pages as content pages.
+  NS_ASSERTION(mDataOffset > 0, "Must know mDataOffset by now");
+  PRInt64 offset = NS_MAX(mDataOffset, aOffset);
+  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, offset);
   NS_ENSURE_SUCCESS(res, nsnull);
-  return nsBuiltinDecoderReader::FindStartTime(aOffset, aOutStartTime);
+  return nsBuiltinDecoderReader::FindStartTime(offset, aOutStartTime);
 }
 
 PRInt64 nsOggReader::FindEndTime(PRInt64 aEndOffset)
@@ -918,7 +922,8 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aEndOffset)
                "Should be on state machine thread.");
   NS_ASSERTION(mDataOffset > 0,
                "Should have offset of first non-header page");
-  PRInt64 endTime = FindEndTime(mDataOffset, aEndOffset, PR_FALSE, &mOggState);
+  PRInt64 offset = NS_MAX(mDataOffset, aEndOffset);
+  PRInt64 endTime = FindEndTime(mDataOffset, offset, PR_FALSE, &mOggState);
   // Reset read head to start of media data.
   nsMediaStream* stream = mDecoder->GetCurrentStream();
   NS_ENSURE_TRUE(stream != nsnull, -1);
diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h
index 725f02db2633..2dbeb03ba320 100644
--- a/content/media/ogg/nsOggReader.h
+++ b/content/media/ogg/nsOggReader.h
@@ -282,6 +282,11 @@ private:
 
   // The granulepos of the last decoded Vorbis sample.
   PRInt64 mVorbisGranulepos;
+
+  // The offset of the first non-header page in the file, in bytes.
+  // Used to seek to the start of the media, and to prevent us trying to
+  // decode pages before this offset (the header pages) as content pages.
+  PRInt64 mDataOffset;
 };
 
 #endif
diff --git a/content/media/raw/nsRawReader.h b/content/media/raw/nsRawReader.h
index d2331a4b07fe..f683f7805d0e 100644
--- a/content/media/raw/nsRawReader.h
+++ b/content/media/raw/nsRawReader.h
@@ -112,7 +112,6 @@ public:
 
   virtual nsresult ReadMetadata(nsVideoInfo* aInfo);
   virtual nsresult Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime, PRInt64 aCurrentTime);
-  virtual PRInt64 FindEndTime(PRInt64 aEndOffset);
   virtual nsresult GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime);
 
 private:
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index d5e1ce664e64..974ff686a3ca 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -164,7 +164,6 @@ nsresult nsWaveReader::ReadMetadata(nsVideoInfo* aInfo)
   mInfo.mHasVideo = PR_FALSE;
   mInfo.mAudioRate = mSampleRate;
   mInfo.mAudioChannels = mChannels;
-  mInfo.mDataOffset = -1;
 
   *aInfo = mInfo;
 
diff --git a/content/media/webm/nsWebMReader.cpp b/content/media/webm/nsWebMReader.cpp
index 95b690c71c44..87d7d3ebdae8 100644
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -330,11 +330,6 @@ nsresult nsWebMReader::ReadMetadata(nsVideoInfo* aInfo)
           mInfo.mStereoMode = STEREO_MODE_MONO;
         }
       }
-
-      // mDataOffset is not used by the WebM backend.
-      // See bug 566779 for a suggestion to refactor
-      // and remove it.
-      mInfo.mDataOffset = -1;
     }
     else if (!mHasAudio && type == NESTEGG_TRACK_AUDIO) {
       nestegg_audio_params params;

From 12f39cb5d220405f0d39749f2ef40f70c712d265 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Fri, 15 Apr 2011 11:11:39 +0900
Subject: [PATCH 238/509] Bug 630486 - ASSERTION 'Want to fire mutation events,
 but it's not safe' in nsContentUtils::HasMutationListeners triggered by a11y,
 r=marcoz, gavin, bz, f=davidb

--HG--
rename : accessible/tests/mochitest/tree/test_colorpicker.xul => accessible/tests/mochitest/treeupdate/test_colorpicker.xul
rename : accessible/tests/mochitest/tree/test_button.xul => accessible/tests/mochitest/treeupdate/test_menubutton.xul
---
 accessible/src/base/nsAccessibilityAtomList.h |   1 -
 accessible/src/base/nsCoreUtils.cpp           |  41 ---
 accessible/src/base/nsCoreUtils.h             |  10 -
 .../src/xul/nsXULColorPickerAccessible.cpp    |  13 -
 .../src/xul/nsXULColorPickerAccessible.h      |   3 -
 .../src/xul/nsXULComboboxAccessible.cpp       |  10 -
 accessible/src/xul/nsXULComboboxAccessible.h  |   3 -
 .../src/xul/nsXULFormControlAccessible.cpp    |  15 -
 .../src/xul/nsXULFormControlAccessible.h      |   3 -
 accessible/src/xul/nsXULMenuAccessible.cpp    |  10 -
 accessible/src/xul/nsXULMenuAccessible.h      |   3 -
 .../tests/mochitest/actions/test_general.xul  |   7 +-
 accessible/tests/mochitest/tree/Makefile.in   |   2 -
 .../tests/mochitest/tree/test_button.xul      | 131 +------
 .../tests/mochitest/tree/test_colorpicker.xul |  75 ----
 accessible/tests/mochitest/tree/test_menu.xul |  86 -----
 .../tests/mochitest/treeupdate/Makefile.in    |   3 +
 .../mochitest/treeupdate/test_colorpicker.xul | 152 +++++++++
 .../mochitest/treeupdate/test_contextmenu.xul | 321 ++++++++++++++++++
 .../tests/mochitest/treeupdate/test_menu.xul  | 297 ++++------------
 .../mochitest/treeupdate/test_menubutton.xul  | 179 ++++++++++
 .../components/feeds/content/subscribe.xml    |   2 +-
 content/base/src/nsGkAtomList.h               |   1 -
 layout/xul/base/src/nsMenuPopupFrame.cpp      |  11 -
 24 files changed, 741 insertions(+), 638 deletions(-)
 delete mode 100644 accessible/tests/mochitest/tree/test_colorpicker.xul
 delete mode 100644 accessible/tests/mochitest/tree/test_menu.xul
 create mode 100644 accessible/tests/mochitest/treeupdate/test_colorpicker.xul
 create mode 100644 accessible/tests/mochitest/treeupdate/test_contextmenu.xul
 create mode 100644 accessible/tests/mochitest/treeupdate/test_menubutton.xul

diff --git a/accessible/src/base/nsAccessibilityAtomList.h b/accessible/src/base/nsAccessibilityAtomList.h
index ca96e1adc655..c5bb16e935c8 100644
--- a/accessible/src/base/nsAccessibilityAtomList.h
+++ b/accessible/src/base/nsAccessibilityAtomList.h
@@ -64,7 +64,6 @@ ACCESSIBILITY_ATOM(_false, "false")
 ACCESSIBILITY_ATOM(image, "image")
 ACCESSIBILITY_ATOM(menu, "menu")
 ACCESSIBILITY_ATOM(menuButton, "menu-button")
-ACCESSIBILITY_ATOM(menugenerated, "menugenerated")
 ACCESSIBILITY_ATOM(multiple, "multiple")
 ACCESSIBILITY_ATOM(open, "open")
 ACCESSIBILITY_ATOM(password, "password")
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index 796ec42c046e..d4a3b02fe2bb 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -761,47 +761,6 @@ nsCoreUtils::IsColumnHidden(nsITreeColumn *aColumn)
                               nsAccessibilityAtoms::_true, eCaseMatters);
 }
 
-void
-nsCoreUtils::GeneratePopupTree(nsIContent *aContent, PRBool aIsAnon)
-{
-  // Set menugenerated="true" on the menupopup node to generate the sub-menu
-  // items if they have not been generated.
-
-  nsCOMPtr<nsIDOMNodeList> list;
-  if (aIsAnon) {    
-    nsIDocument* document = aContent->GetCurrentDoc();
-    if (document)
-      document->GetXBLChildNodesFor(aContent, getter_AddRefs(list));
-
-  } else {
-    list = aContent->GetChildNodesList();
-  }
-
-  PRUint32 length = 0;
-  if (!list || NS_FAILED(list->GetLength(&length)))
-    return;
-
-  for (PRUint32 idx = 0; idx < length; idx++) {
-    nsCOMPtr<nsIDOMNode> childNode;
-    list->Item(idx, getter_AddRefs(childNode));
-    nsCOMPtr<nsIContent> child(do_QueryInterface(childNode));
-
-    PRBool isPopup = child->NodeInfo()->Equals(nsAccessibilityAtoms::menupopup,
-                                               kNameSpaceID_XUL) ||
-                     child->NodeInfo()->Equals(nsAccessibilityAtoms::panel,
-                                               kNameSpaceID_XUL);
-    if (isPopup && !child->AttrValueIs(kNameSpaceID_None,
-                                       nsAccessibilityAtoms::menugenerated,
-                                       nsAccessibilityAtoms::_true,
-                                       eCaseMatters)) {
-
-      child->SetAttr(kNameSpaceID_None, nsAccessibilityAtoms::menugenerated,
-                     NS_LITERAL_STRING("true"), PR_TRUE);
-      return;
-    }
-  }
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessibleDOMStringList
diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h
index ef895301dec1..66a2aa446ac9 100644
--- a/accessible/src/base/nsCoreUtils.h
+++ b/accessible/src/base/nsCoreUtils.h
@@ -367,16 +367,6 @@ public:
     return aContent->NodeInfo()->Equals(nsAccessibilityAtoms::th) ||
       aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::scope);
   }
-
-  /**
-   * Generates frames for popup subtree.
-   *
-   * @param aContent [in] DOM node containing the menupopup element as a child
-   * @param aIsAnon  [in] specifies whether popup should be searched inside of
-   *                  anonymous or explicit content
-   */
-  static void GeneratePopupTree(nsIContent *aContent,
-                                PRBool aIsAnon = PR_FALSE);
 };
 
 
diff --git a/accessible/src/xul/nsXULColorPickerAccessible.cpp b/accessible/src/xul/nsXULColorPickerAccessible.cpp
index 4b31dc6eaa2b..ce7afba78ef8 100644
--- a/accessible/src/xul/nsXULColorPickerAccessible.cpp
+++ b/accessible/src/xul/nsXULColorPickerAccessible.cpp
@@ -116,19 +116,6 @@ nsXULColorPickerAccessible::
 {
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// nsXULColorPickerAccessible: nsAccessNode
-
-PRBool
-nsXULColorPickerAccessible::Init()
-{
-  if (!nsXULColorPickerTileAccessible::Init())
-    return PR_FALSE;
-
-  nsCoreUtils::GeneratePopupTree(mContent, PR_TRUE);
-  return PR_TRUE;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULColorPickerAccessible: nsAccessible
 
diff --git a/accessible/src/xul/nsXULColorPickerAccessible.h b/accessible/src/xul/nsXULColorPickerAccessible.h
index ec4c24f45e2f..f1bd1a5f6477 100644
--- a/accessible/src/xul/nsXULColorPickerAccessible.h
+++ b/accessible/src/xul/nsXULColorPickerAccessible.h
@@ -68,9 +68,6 @@ class nsXULColorPickerAccessible : public nsXULColorPickerTileAccessible
 public:
   nsXULColorPickerAccessible(nsIContent *aContent, nsIWeakReference *aShell);
 
-  // nsAccessNode
-  virtual PRBool Init();
-
   // nsAccessible
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/xul/nsXULComboboxAccessible.cpp b/accessible/src/xul/nsXULComboboxAccessible.cpp
index dd0236243789..ba75670655a0 100644
--- a/accessible/src/xul/nsXULComboboxAccessible.cpp
+++ b/accessible/src/xul/nsXULComboboxAccessible.cpp
@@ -57,16 +57,6 @@ nsXULComboboxAccessible::
 {
 }
 
-PRBool
-nsXULComboboxAccessible::Init()
-{
-  if (!nsAccessibleWrap::Init())
-    return PR_FALSE;
-
-  nsCoreUtils::GeneratePopupTree(mContent);
-  return PR_TRUE;
-}
-
 PRUint32
 nsXULComboboxAccessible::NativeRole()
 {
diff --git a/accessible/src/xul/nsXULComboboxAccessible.h b/accessible/src/xul/nsXULComboboxAccessible.h
index af3c7625091e..4ad42feb3f06 100644
--- a/accessible/src/xul/nsXULComboboxAccessible.h
+++ b/accessible/src/xul/nsXULComboboxAccessible.h
@@ -60,9 +60,6 @@ public:
   NS_IMETHOD GetNumActions(PRUint8 *aNumActions);
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
 
-  // nsAccessNode
-  virtual PRBool Init();
-
   // nsAccessible
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/xul/nsXULFormControlAccessible.cpp b/accessible/src/xul/nsXULFormControlAccessible.cpp
index 197a2c1e28dc..296a130afe99 100644
--- a/accessible/src/xul/nsXULFormControlAccessible.cpp
+++ b/accessible/src/xul/nsXULFormControlAccessible.cpp
@@ -109,21 +109,6 @@ nsXULButtonAccessible::DoAction(PRUint8 aIndex)
   return NS_OK;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// nsXULButtonAccessible: nsAccessNode
-
-PRBool
-nsXULButtonAccessible::Init()
-{
-  if (!nsAccessibleWrap::Init())
-    return PR_FALSE;
-
-  if (ContainsMenu())
-    nsCoreUtils::GeneratePopupTree(mContent);
-
-  return PR_TRUE;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULButtonAccessible: nsAccessible
 
diff --git a/accessible/src/xul/nsXULFormControlAccessible.h b/accessible/src/xul/nsXULFormControlAccessible.h
index 029328359d78..327ca4735a06 100644
--- a/accessible/src/xul/nsXULFormControlAccessible.h
+++ b/accessible/src/xul/nsXULFormControlAccessible.h
@@ -66,9 +66,6 @@ public:
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
   NS_IMETHOD DoAction(PRUint8 index);
 
-  // nsAccessNode
-  virtual PRBool Init();
-
   // nsAccessible
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp
index ed0723ecf97e..5de0cc1c9077 100644
--- a/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -280,16 +280,6 @@ nsXULMenuitemAccessible::
 {
 }
 
-PRBool
-nsXULMenuitemAccessible::Init()
-{
-  if (!nsAccessibleWrap::Init())
-    return PR_FALSE;
-
-  nsCoreUtils::GeneratePopupTree(mContent);
-  return PR_TRUE;
-}
-
 PRUint64
 nsXULMenuitemAccessible::NativeState()
 {
diff --git a/accessible/src/xul/nsXULMenuAccessible.h b/accessible/src/xul/nsXULMenuAccessible.h
index e7b1524cdea8..c51c65497b19 100644
--- a/accessible/src/xul/nsXULMenuAccessible.h
+++ b/accessible/src/xul/nsXULMenuAccessible.h
@@ -89,9 +89,6 @@ public:
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
   NS_IMETHOD GetNumActions(PRUint8 *_retval);
 
-  // nsAccessNode
-  virtual PRBool Init();
-
   // nsAccessible
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
diff --git a/accessible/tests/mochitest/actions/test_general.xul b/accessible/tests/mochitest/actions/test_general.xul
index 3f5773565c0d..5c4dfdbff56d 100644
--- a/accessible/tests/mochitest/actions/test_general.xul
+++ b/accessible/tests/mochitest/actions/test_general.xul
@@ -29,7 +29,12 @@
         {
           ID: "menu",
           actionName: "click",
-          events: CLICK_EVENTS
+          events: CLICK_EVENTS,
+          // Wait for focus event, it guarantees us the submenu tree is created,
+          // that's necessary for next test.
+          eventSeq: [
+            new invokerChecker(EVENT_FOCUS, getNode("menu"))
+          ]
         },
         {
           ID: "submenu",
diff --git a/accessible/tests/mochitest/tree/Makefile.in b/accessible/tests/mochitest/tree/Makefile.in
index b7c6d7b9403b..e549e2e1cc80 100644
--- a/accessible/tests/mochitest/tree/Makefile.in
+++ b/accessible/tests/mochitest/tree/Makefile.in
@@ -51,7 +51,6 @@ _TEST_FILES =\
 		test_aria_globals.html \
 		test_aria_imgmap.html \
 		test_button.xul \
-		test_colorpicker.xul \
 		test_combobox.xul \
 		test_cssoverflow.html \
 		test_dochierarchy.html \
@@ -65,7 +64,6 @@ _TEST_FILES =\
 		test_img.html \
 		test_list.html \
 		test_media.html \
-		test_menu.xul \
 		test_select.html \
 		test_tabbox.xul \
 		test_tabbrowser.xul \
diff --git a/accessible/tests/mochitest/tree/test_button.xul b/accessible/tests/mochitest/tree/test_button.xul
index 0be372a104a8..486591a5e18b 100644
--- a/accessible/tests/mochitest/tree/test_button.xul
+++ b/accessible/tests/mochitest/tree/test_button.xul
@@ -24,7 +24,7 @@
     function doTest()
     {
       //////////////////////////////////////////////////////////////////////////
-      // button1
+      // button
 
       var accTree = {
         role: ROLE_PUSHBUTTON,
@@ -34,112 +34,14 @@
       testAccessibleTree("button1", accTree);
 
       //////////////////////////////////////////////////////////////////////////
-      // button2
-
-      accTree = {
-        role: ROLE_PUSHBUTTON,
-        name: "hello",
-        children: [
-          {
-            role: ROLE_MENUPOPUP,
-            children: [
-              {
-                role: ROLE_MENUITEM
-              },
-              {
-                role: ROLE_MENUITEM
-              }
-            ]
-          }
-        ]
-      };
-      testAccessibleTree("button2", accTree);
-
-      //////////////////////////////////////////////////////////////////////////
-      // button3
-
-      accTree = {
-        role: ROLE_PUSHBUTTON,
-        name: "hello",
-        children: [
-          {
-            role: ROLE_MENUPOPUP,
-            children: [
-              {
-                role: ROLE_MENUITEM
-              },
-              {
-                role: ROLE_MENUITEM
-              }
-            ]
-          },
-          {
-            role: ROLE_PUSHBUTTON,
-            children: [
-            ]
-          }
-        ]
-      };
-      testAccessibleTree("button3", accTree);
-
-      //////////////////////////////////////////////////////////////////////////
-      // button4
+      // toolbarbutton
 
       var accTree = {
         role: ROLE_PUSHBUTTON,
         name: "hello",
         children: [ ]
       };
-      testAccessibleTree("button4", accTree);
-
-      //////////////////////////////////////////////////////////////////////////
-      // button5
-
-      accTree = {
-        role: ROLE_PUSHBUTTON,
-        name: "hello",
-        children: [
-          {
-            role: ROLE_MENUPOPUP,
-            children: [
-              {
-                role: ROLE_MENUITEM
-              },
-              {
-                role: ROLE_MENUITEM
-              }
-            ]
-          }
-        ]
-      };
-      testAccessibleTree("button5", accTree);
-
-      //////////////////////////////////////////////////////////////////////////
-      // button6
-
-      accTree = {
-        role: ROLE_PUSHBUTTON,
-        name: "hello",
-        children: [
-          {
-            role: ROLE_MENUPOPUP,
-            children: [
-              {
-                role: ROLE_MENUITEM
-              },
-              {
-                role: ROLE_MENUITEM
-              }
-            ]
-          },
-          {
-            role: ROLE_PUSHBUTTON,
-            children: [
-            ]
-          }
-        ]
-      };
-      testAccessibleTree("button6", accTree);
+      testAccessibleTree("button2", accTree);
 
       SimpleTest.finish()
     }
@@ -165,32 +67,7 @@
 
     <vbox flex="1">
       <button id="button1" label="hello"/>
-      <button id="button2" type="menu" label="hello">
-        <menupopup>
-          <menuitem label="menuitem"/>
-          <menuitem label="menuitem"/>
-        </menupopup>
-      </button>
-      <button id="button3" type="menu-button" label="hello">
-        <menupopup>
-          <menuitem label="menuitem"/>
-          <menuitem label="menuitem"/>
-        </menupopup>
-      </button>
-
-      <toolbarbutton id="button4" label="hello"/>
-      <toolbarbutton id="button5" type="menu" label="hello">
-        <menupopup>
-          <menuitem label="menuitem"/>
-          <menuitem label="menuitem"/>
-        </menupopup>
-      </toolbarbutton>
-      <toolbarbutton id="button6" type="menu-button" label="hello">
-        <menupopup>
-          <menuitem label="menuitem"/>
-          <menuitem label="menuitem"/>
-        </menupopup>
-      </toolbarbutton>
+      <toolbarbutton id="button2" label="hello"/>
     </vbox>
   </hbox>
 
diff --git a/accessible/tests/mochitest/tree/test_colorpicker.xul b/accessible/tests/mochitest/tree/test_colorpicker.xul
deleted file mode 100644
index a3be946a1613..000000000000
--- a/accessible/tests/mochitest/tree/test_colorpicker.xul
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="Accessible XUL button hierarchy tests">
-
-  <script type="application/javascript" 
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-
-  <script type="application/javascript"
-          src="../common.js" />
-  <script type="application/javascript"
-          src="../role.js" />
-
-  <script type="application/javascript">
-  <![CDATA[
-    ////////////////////////////////////////////////////////////////////////////
-    // Test
-
-    function doTest()
-    {
-      //////////////////////////////////////////////////////////////////////////
-      // button1
-
-      var accTree = {
-        role: ROLE_BUTTONDROPDOWNGRID,
-        children: [
-          {
-            role: ROLE_ALERT,
-            children: [ ]
-          }
-        ]
-      };
-
-      var colorButtons = accTree.children[0].children;
-      for (var idx = 0; idx < 70; idx++) {
-        var obj = { role: ROLE_PUSHBUTTON };
-        colorButtons.push(obj);
-      }
-
-      testAccessibleTree("colorpicker", accTree);
-
-      SimpleTest.finish()
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTest);
-  ]]>
-  </script>
-
-  <hbox flex="1" style="overflow: auto;">
-    <body xmlns="http://www.w3.org/1999/xhtml">
-      <a target="_blank"
-         href="https://bugzilla.mozilla.org/show_bug.cgi?id=249292"
-         title="Ensure accessible children for toolbarbutton types 'menu' and 'menu-button'">
-        Mozilla Bug 249292
-      </a><br/>
-      <p id="display"></p>
-      <div id="content" style="display: none">
-      </div>
-      <pre id="test">
-      </pre>
-    </body>
-
-    <vbox flex="1">
-      <colorpicker id="colorpicker" type="button"/>
-    </vbox>
-  </hbox>
-
-</window>
-
diff --git a/accessible/tests/mochitest/tree/test_menu.xul b/accessible/tests/mochitest/tree/test_menu.xul
deleted file mode 100644
index 31824fccc057..000000000000
--- a/accessible/tests/mochitest/tree/test_menu.xul
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="Accessible XUL menu hierarchy tests">
-
-  <script type="application/javascript" 
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-
-  <script type="application/javascript"
-          src="../common.js" />
-  <script type="application/javascript"
-          src="../role.js" />
-
-  <script type="application/javascript">
-  <![CDATA[
-    ////////////////////////////////////////////////////////////////////////////
-    // Test
-
-    function doTest()
-    {
-      if (LINUX || SOLARIS) {
-        // XXX: bug 527646
-
-        todo(false, "Failure on Linux and Solaris.");
-        SimpleTest.finish();
-        return;
-      }
-
-      var accTree = {
-        role: ROLE_PARENT_MENUITEM,
-        name: "menu",
-        children: [
-          {
-            role: ROLE_MENUPOPUP,
-            children: [
-              {
-                role: ROLE_MENUITEM
-              },
-              {
-                role: ROLE_MENUITEM
-              }
-            ]
-          }
-        ]
-      };
-      testAccessibleTree("menu", accTree);
-
-      SimpleTest.finish();
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTest);
-  ]]>
-  </script>
-
-  <hbox flex="1" style="overflow: auto;">
-    <body xmlns="http://www.w3.org/1999/xhtml">
-      <a target="_blank"
-         href="https://bugzilla.mozilla.org/show_bug.cgi?id=249292"
-         title="Ensure accessible children for toolbarbutton types 'menu' and 'menu-button'">
-        Mozilla Bug 249292
-      </a><br/>
-      <p id="display"></p>
-      <div id="content" style="display: none">
-      </div>
-      <pre id="test">
-      </pre>
-    </body>
-
-    <vbox flex="1">
-      <menu id="menu" label="menu">
-        <menupopup>
-          <menuitem label="menuitem"/>
-          <menuitem label="menuitem"/>
-        </menupopup>
-      </menu>
-    </vbox>
-  </hbox>
-
-</window>
-
diff --git a/accessible/tests/mochitest/treeupdate/Makefile.in b/accessible/tests/mochitest/treeupdate/Makefile.in
index 30a55f1241e3..ca73261c52b7 100644
--- a/accessible/tests/mochitest/treeupdate/Makefile.in
+++ b/accessible/tests/mochitest/treeupdate/Makefile.in
@@ -47,11 +47,14 @@ include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES =\
 		test_ariadialog.html \
+		test_colorpicker.xul \
+		test_contextmenu.xul \
 		test_doc.html \
 		test_gencontent.html \
 		test_list_editabledoc.html \
 		test_list.html \
 		test_menu.xul \
+		test_menubutton.xul \
 		test_recreation.html \
 		test_select.html \
 		test_textleaf.html \
diff --git a/accessible/tests/mochitest/treeupdate/test_colorpicker.xul b/accessible/tests/mochitest/treeupdate/test_colorpicker.xul
new file mode 100644
index 000000000000..870c6c4bb405
--- /dev/null
+++ b/accessible/tests/mochitest/treeupdate/test_colorpicker.xul
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Accessible XUL button hierarchy tests">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+
+  <script type="application/javascript"
+          src="../common.js" />
+  <script type="application/javascript"
+          src="../role.js" />
+  <script type="application/javascript"
+          src="../events.js" />
+
+  <script type="application/javascript">
+  <![CDATA[
+    ////////////////////////////////////////////////////////////////////////////
+    // Test
+
+    function openColorpicker(aColorpickerID)
+    {
+      this.node = getNode(aColorpickerID);
+
+      this.eventSeq = [];
+
+      var it = new colorButtonIterator(this.node);
+      for (var btnNode = it.next(); btnNode = it.next(); btnNode)
+        this.eventSeq.push(new invokerChecker(EVENT_SHOW, btnNode));
+
+      var popupNode = getPopupNode(this.node);
+      this.eventSeq.push(new invokerChecker(EVENT_REORDER, popupNode));
+
+      this.invoke = function openColorpicker_invoke()
+      {
+        var tree =
+          { BUTTONDROPDOWNGRID: [
+            { ALERT: [ ] }
+          ] };
+        testAccessibleTree(this.node, tree);
+
+        this.node.showPopup();
+      }
+
+      this.finalCheck = function openColorpicker_finalCheck()
+      {
+        var tree =
+          { BUTTONDROPDOWNGRID: [
+            { ALERT: [ ] }
+          ] };
+
+        var colorButtons = tree.BUTTONDROPDOWNGRID[0].ALERT;
+        var it = new colorButtonIterator(this.node);
+        while (it.next()) {
+          var obj = { PUSHBUTTON: [ ] };
+          colorButtons.push(obj);
+        }
+
+        testAccessibleTree(this.node, tree);
+      }
+
+      this.getID = function openColorpicker_getID()
+      {
+        return "open colorpicker " + prettyName(aColorpickerID);
+      }
+    }
+
+    function getPopupNode(aColorpickerNode)
+    {
+      return aColorpickerNode.mPicker.parentNode;
+    }
+
+    function colorButtonIterator(aColorpickerNode)
+    {
+      this.container = aColorpickerNode.mPicker.mBox;
+      this.group = this.container.firstChild;
+      this.item = null;
+
+      this.next = function colorButtonIterator_next()
+      {
+        if (!this.group)
+          return null;
+
+        if (!this.item) {
+          this.item = this.group.firstChild;
+          return this.item;
+        }
+
+        if (this.item.nextSibling) {
+          this.item = this.item.nextSibling;
+          return this.item;
+        }
+
+        if (this.group.nextSibling) {
+          this.group = this.group.nextSibling;
+          this.item = this.group.firstChild;
+          return this.item;
+        }
+
+        this.group = null;
+        this.item = null;
+        return null;
+      }
+    }
+
+    //gA11yEventDumpToConsole = true; // debug stuff
+
+    var gQueue = null;
+    function doTest()
+    {
+      gQueue = new eventQueue();
+      gQueue.push(new openColorpicker("colorpicker"));
+      gQueue.invoke(); // Will call SimpleTest.finish()
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addA11yLoadEvent(doTest);
+  ]]>
+  </script>
+
+  <hbox flex="1" style="overflow: auto;">
+    <body xmlns="http://www.w3.org/1999/xhtml">
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=249292"
+         title="Ensure accessible children for toolbarbutton types 'menu' and 'menu-button'">
+        Mozilla Bug 249292
+      </a>
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=630486"
+         title="Don't force accessible creation for popup children.">
+        Mozilla Bug 630486
+      </a>
+      <br/>
+      <p id="display"></p>
+      <div id="content" style="display: none">
+      </div>
+      <pre id="test">
+      </pre>
+    </body>
+
+    <vbox flex="1">
+      <colorpicker id="colorpicker" type="button"/>
+    </vbox>
+  </hbox>
+
+</window>
+
diff --git a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul
new file mode 100644
index 000000000000..a930bdaeac13
--- /dev/null
+++ b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul
@@ -0,0 +1,321 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="menu tree and events">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+
+  <script type="application/javascript"
+          src="../common.js" />
+  <script type="application/javascript"
+          src="../events.js" />
+  <script type="application/javascript"
+          src="../role.js" />
+
+  <script type="application/javascript">
+  <![CDATA[
+
+    function openMenu(aID, aTree)
+    {
+      this.eventSeq = [
+        new invokerChecker(EVENT_MENUPOPUP_START, getNode(aID))
+      ];
+
+      this.invoke = function openMenu_invoke()
+      {
+        var button = getNode("button");
+        getNode(aID).openPopup(button, "after_start", 0, 0, true, false);
+      }
+
+      this.finalCheck = function openMenu_finalCheck(aEvent)
+      {
+        testAccessibleTree(aID, aTree);
+      }
+
+      this.getID = function openMenu_getID()
+      {
+        return "open menu " + prettyName(aID);
+      }
+    }
+
+    function selectNextMenuItem(aID)
+    {
+      this.eventSeq = [
+        new invokerChecker(EVENT_FOCUS, getNode(aID))
+      ];
+
+      this.invoke = function selectMenuItem_invoke()
+      {
+        synthesizeKey("VK_DOWN", { });
+      }
+
+      this.getID = function selectMenuItem_getID()
+      {
+        return "select menuitem " + prettyName(aID);
+      }
+    }
+    
+    function openSubMenu(aSubMenuID, aItemID, aMenuID, aTree)
+    {
+      this.eventSeq = [
+        new invokerChecker(EVENT_FOCUS, getNode(aItemID)),
+      ];
+
+      this.invoke = function openSubMenu_invoke()
+      {
+        synthesizeKey("VK_ENTER", { });
+      }
+
+      this.finalCheck = function openSubMenu_finalCheck(aEvent)
+      {
+        testAccessibleTree(aMenuID, aTree);
+      }
+
+      this.getID = function openSubMenu_getID()
+      {
+        return "open submenu " + prettyName(aSubMenuID) + " focusing item " + prettyName(aItemID);
+      }
+    }
+
+    function closeSubMenu(aSubMenuID, aItemID)
+    {
+      this.eventSeq = [
+        new invokerChecker(EVENT_FOCUS, getNode(aItemID)),
+      ];
+
+      this.invoke = function closeSubMenu_invoke()
+      {
+        synthesizeKey("VK_ESCAPE", { });
+      }
+
+      this.getID = function closeSubMenu_getID()
+      {
+        return "close submenu " + prettyName(aSubMenuID) + " focusing item " + prettyName(aItemID);
+      }
+    }
+
+    function closeMenu(aID)
+    {
+      this.eventSeq = [
+        new invokerChecker(EVENT_MENUPOPUP_END, getNode(aID))
+      ];
+
+      this.invoke = function closeMenu_invoke()
+      {
+        synthesizeKey("VK_ESCAPE", { });
+      }
+
+      this.getID = function closeMenu_getID()
+      {
+        return "close menu " + prettyName(aID);
+      }
+    }
+
+    //gA11yEventDumpID = "eventdump";
+    //gA11yEventDumpToConsole = true;
+
+    var gQueue = null;
+    var gContextTree = {};
+
+    // Linux and Windows menu trees discrepancy: bug 527646.
+
+    /**
+     * Return the context menu tree before submenus were open.
+     */
+    function getMenuTree1()
+    {
+      if (LINUX || SOLARIS) {
+        var tree = {
+          role: ROLE_MENUPOPUP,
+          children: [
+            {
+              name: "item0",
+              role: ROLE_MENUITEM,
+              children: []
+            },
+            {
+              name: "item1",
+              role: ROLE_MENUITEM,
+              children: []
+            },
+            {
+              name: "item2",
+              role: ROLE_PARENT_MENUITEM,
+              children: [ ]
+            }
+          ]
+        };
+        return tree;
+      }
+
+      // Windows
+      var tree = {
+        role: ROLE_MENUPOPUP,
+        children: [
+          {
+            name: "item0",
+            role: ROLE_MENUITEM,
+            children: []
+          },
+          {
+            name: "item1",
+            role: ROLE_MENUITEM,
+            children: []
+          },
+          {
+            name: "item2",
+            role: ROLE_PARENT_MENUITEM,
+            children: [
+              {
+                name: "item2",
+                role: ROLE_MENUPOPUP,
+                children: [ ]
+              }
+            ]
+          }
+        ]
+      };
+      return tree;
+    }
+
+    /**
+     * Return context menu tree when submenu was open.
+     */
+    function getMenuTree2()
+    {
+      var tree = getMenuTree1();
+      if (LINUX || SOLARIS) {
+        var submenuTree =
+        {
+          name: "item2.0",
+          role: ROLE_PARENT_MENUITEM,
+          children: [ ]
+        };
+        tree.children[2].children.push(submenuTree);
+        return tree;
+      }
+
+      // Windows
+      var submenuTree =
+      {
+        name: "item2.0",
+        role: ROLE_PARENT_MENUITEM,
+        children: [
+          {
+            name: "item2.0",
+            role: ROLE_MENUPOPUP,
+            children: [ ]
+          }
+        ]
+      };
+
+      tree.children[2].children[0].children.push(submenuTree);
+      return tree;
+    }
+
+    /**
+     * Return context menu tree when subsub menu was open.
+     */
+    function getMenuTree3()
+    {
+      var tree = getMenuTree2();
+      var subsubmenuTree =
+      {
+        name: "item2.0.0",
+        role: ROLE_MENUITEM,
+        children: []
+      };
+
+      if (LINUX || SOLARIS)
+        tree.children[2].children[0].\(subsubmenuTree);
+      else
+        tree.children[2].children[0].children[0].children[0].children.push(subsubmenuTree);
+
+      return tree;
+    }
+
+
+    function doTests()
+    {
+      gQueue = new eventQueue();
+
+      // Check initial empty tree
+      testAccessibleTree("context", { MENUPOPUP: [] });
+
+      // Open context menu and check that menu item accesibles are created.
+      gQueue.push(new openMenu("context", getMenuTree1()));
+
+      // Select items and check focus event on them.
+      gQueue.push(new selectNextMenuItem("item0"));
+      gQueue.push(new selectNextMenuItem("item1"));
+      gQueue.push(new selectNextMenuItem("item2"));
+
+      // Open sub menu and check menu accessible tree and focus event.
+      gQueue.push(new openSubMenu("submenu2", "item2.0",
+                                  "context", getMenuTree2()));
+      gQueue.push(new openSubMenu("submenu2.0", "item2.0.0",
+                                  "context", getMenuTree3()));
+
+      // Close submenus and check that focus goes to parent.
+      gQueue.push(new closeSubMenu("submenu2.0", "item2.0"));
+      gQueue.push(new closeSubMenu("submenu2", "item2"));
+
+      gQueue.push(new closeMenu("context"));
+
+      gQueue.invoke(); // Will call SimpleTest.finish();
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addA11yLoadEvent(doTests);
+  ]]>
+  </script>
+
+  <hbox flex="1" style="overflow: auto;">
+  <body xmlns="http://www.w3.org/1999/xhtml">
+    <a target="_blank"
+       href="https://bugzilla.mozilla.org/show_bug.cgi?id=630194"
+       title="Update accessible tree when opening the menu popup">
+      Mozilla Bug 630194
+    </a>
+    <a target="_blank"
+       href="https://bugzilla.mozilla.org/show_bug.cgi?id=630486"
+       title="Don't force accessible creation for popup children.">
+      Mozilla Bug 630486
+    </a>
+  <p id="display"></p>
+    <div id="content" style="display: none">
+    </div>
+    <pre id="test">
+    </pre>
+  </body>
+
+    <vbox flex="1">
+
+      <menupopup id="context">
+        <menuitem id="item0" label="item0"/>
+        <menuitem id="item1" label="item1"/>
+        <menu id="item2" label="item2">
+          <menupopup id="submenu2">
+            <menu id="item2.0" label="item2.0">
+              <menupopup id="submenu2.0">
+                <menuitem id="item2.0.0" label="item2.0.0"/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </menu>
+      </menupopup>
+
+      <button context="context" id="button">btn</button>
+
+      <vbox id="eventdump" role="log"/>
+    </vbox>
+  </hbox>
+</window>
diff --git a/accessible/tests/mochitest/treeupdate/test_menu.xul b/accessible/tests/mochitest/treeupdate/test_menu.xul
index 1678bbf426d2..312a75ad099b 100644
--- a/accessible/tests/mochitest/treeupdate/test_menu.xul
+++ b/accessible/tests/mochitest/treeupdate/test_menu.xul
@@ -4,39 +4,72 @@
                  type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="menu tree and events">
+        title="Accessible XUL menu hierarchy tests">
 
   <script type="application/javascript" 
           src="chrome://mochikit/content/MochiKit/packed.js" />
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
   <script type="application/javascript"
           src="../common.js" />
-  <script type="application/javascript"
-          src="../events.js" />
   <script type="application/javascript"
           src="../role.js" />
+  <script type="application/javascript"
+          src="../events.js" />
 
   <script type="application/javascript">
   <![CDATA[
-    function openMenu(aID, aTree)
+    ////////////////////////////////////////////////////////////////////////////
+    // Invokers
+
+    function openMenu(aID)
     {
+      this.menuNode = getNode(aID),
+
       this.eventSeq = [
-        new invokerChecker(EVENT_MENUPOPUP_START, getNode(aID))
+        new invokerChecker(EVENT_FOCUS, this.menuNode)
       ];
 
       this.invoke = function openMenu_invoke()
       {
-        var button = getNode("button");
-        getNode(aID).openPopup(button, "after_start", 0, 0, true, false);
+        var tree;
+        if (LINUX || SOLARIS) {
+          tree =
+            { PARENT_MENUITEM: [ ] };
+
+        } else {
+          tree =
+            { PARENT_MENUITEM: [
+              { MENUPOPUP: [ ] }
+            ] };
+        }
+        testAccessibleTree(aID, tree);
+
+        // Show menu.
+        this.menuNode.open = true;
       }
 
-      this.finalCheck = function openMenu_finalCheck(aEvent)
+      this.finalCheck = function openMenu_finalCheck()
       {
-        testAccessibleTree(aID, aTree);
+        var tree;
+        if (LINUX || SOLARIS) {
+          tree =
+            { PARENT_MENUITEM: [
+              { MENUITEM: [ ] },
+              { MENUITEM: [ ] }
+            ] };
+
+        } else {
+          tree =
+            { PARENT_MENUITEM: [
+              { MENUPOPUP: [
+                { MENUITEM: [ ] },
+                { MENUITEM: [ ] }
+              ] }
+            ] };
+        }
+        testAccessibleTree(aID, tree);
       }
 
       this.getID = function openMenu_getID()
@@ -45,233 +78,53 @@
       }
     }
 
-    function selectNextMenuItem(aID)
-    {
-      this.eventSeq = [
-        new invokerChecker(EVENT_FOCUS, getNode(aID))
-      ];
-
-      this.invoke = function selectMenuItem_invoke()
-      {
-        synthesizeKey("VK_DOWN", { });
-      }
-
-      this.getID = function selectMenuItem_getID()
-      {
-        return "select menuitem " + prettyName(aID);
-      }
-    }
-    
-    function openSubMenu(aSubMenuID, aItemID)
-    {
-      this.eventSeq = [
-        new invokerChecker(EVENT_FOCUS, getNode(aItemID)),
-      ];
-
-      this.invoke = function openSubMenu_invoke()
-      {
-        synthesizeKey("VK_ENTER", { });
-      }
-
-      this.finalCheck = function openSubMenu_finalCheck(aEvent)
-      {
-        getAccessible(aItemID);
-      }
-
-      this.getID = function openSubMenu_getID()
-      {
-        return "open submenu " + prettyName(aSubMenuID) + " focusing item " + prettyName(aItemID);
-      }
-    }
-
-    function closeSubMenu(aSubMenuID, aItemID)
-    {
-      this.eventSeq = [
-        new invokerChecker(EVENT_FOCUS, getNode(aItemID)),
-      ];
-
-      this.invoke = function closeSubMenu_invoke()
-      {
-        synthesizeKey("VK_ESCAPE", { });
-      }
-
-      this.getID = function closeSubMenu_getID()
-      {
-        return "close submenu " + prettyName(aSubMenuID) + " focusing item " + prettyName(aItemID);
-      }
-    }
-
-    function closeMenu(aID)
-    {
-      this.eventSeq = [
-        new invokerChecker(EVENT_MENUPOPUP_END, getNode(aID))
-      ];
-
-      this.invoke = function closeMenu_invoke()
-      {
-        synthesizeKey("VK_ESCAPE", { });
-      }
-
-      this.getID = function closeMenu_getID()
-      {
-        return "close menu " + prettyName(aID);
-      }
-    }
-
-    //gA11yEventDumpID = "eventdump";
-    //gA11yEventDumpToConsole = true;
+    ////////////////////////////////////////////////////////////////////////////
+    // Test
 
     var gQueue = null;
-    var gContextTree = {};
-
-    // bug 527646
-    if (LINUX || SOLARIS) {
-      gContextTree = {
-        role: ROLE_MENUPOPUP,
-        children: [
-          {
-            name: "item0",
-            role: ROLE_MENUITEM,
-            children: []
-          },
-          {
-            name: "item1",
-            role: ROLE_MENUITEM,
-            children: []
-          },
-          {
-            name: "item2",
-            role: ROLE_PARENT_MENUITEM,
-            children: [
-              {
-                name: "item2.0",
-                role: ROLE_PARENT_MENUITEM,
-                children: [
-                  { 
-                    name: "item2.0.0",
-                    role: ROLE_MENUITEM,
-                    children: []
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      };
-    } else {
-      gContextTree = {
-        role: ROLE_MENUPOPUP,
-        children: [
-          {
-            name: "item0",
-            role: ROLE_MENUITEM,
-            children: []
-          },
-          {
-            name: "item1",
-            role: ROLE_MENUITEM,
-            children: []
-          },
-          {
-            name: "item2",
-            role: ROLE_PARENT_MENUITEM,
-            children: [
-              {
-                name: "item2",
-                role: ROLE_MENUPOPUP,
-                children: [
-                  {
-                    name: "item2.0",
-                    role: ROLE_PARENT_MENUITEM,
-                    children: [
-                      { 
-                        name: "item2.0",
-                        role: ROLE_MENUPOPUP,
-                        children: [
-                          { 
-                            name: "item2.0.0",
-                            role: ROLE_MENUITEM,
-                            children: []
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      };
-    }
-
-
-    function doTests()
+    function doTest()
     {
       gQueue = new eventQueue();
-
-      // Check initial empty tree
-      testAccessibleTree("context", { MENUPOPUP: [] });
-
-      // Open context menu and check that menu item accesibles are created.
-      gQueue.push(new openMenu("context", gContextTree));
-
-      // Select items and check focus event on them.
-      gQueue.push(new selectNextMenuItem("item0"));
-      gQueue.push(new selectNextMenuItem("item1"));
-      gQueue.push(new selectNextMenuItem("item2"));
-
-      // Open sub menu and check menu item accessibles and focus event.
-      gQueue.push(new openSubMenu("submenu2", "item2.0"));
-      gQueue.push(new openSubMenu("submenu2.0", "item2.0.0"));
-
-      // Close submenus and check that focus goes to parent.
-      gQueue.push(new closeSubMenu("submenu2.0", "item2.0"));
-      gQueue.push(new closeSubMenu("submenu2", "item2"));
-
-      gQueue.push(new closeMenu("context"));
-
+      gQueue.push(new openMenu("menu"));
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTests);
+    addA11yLoadEvent(doTest);
   ]]>
   </script>
 
   <hbox flex="1" style="overflow: auto;">
-  <body xmlns="http://www.w3.org/1999/xhtml">
-    <a target="_blank"
-       href="https://bugzilla.mozilla.org/show_bug.cgi?id=630194"
-       title="Update accessible tree when opening the menu popup">
-      Mozilla Bug 630194
-    </a>
-  <p id="display"></p>
-    <div id="content" style="display: none">
-    </div>
-    <pre id="test">
-    </pre>
-  </body>
+    <body xmlns="http://www.w3.org/1999/xhtml">
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=249292"
+         title="Ensure accessible children for toolbarbutton types 'menu' and 'menu-button'">
+        Mozilla Bug 249292
+      </a>
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=630486"
+         title="Don't force accessible creation for popup children.">
+        Mozilla Bug 630486
+      </a>
+      <br/>
+      <p id="display"></p>
+      <div id="content" style="display: none">
+      </div>
+      <pre id="test">
+      </pre>
+    </body>
 
     <vbox flex="1">
-
-      <menupopup id="context">
-        <menuitem id="item0" label="item0"/>
-        <menuitem id="item1" label="item1"/>
-        <menu id="item2" label="item2">
-          <menupopup id="submenu2">
-            <menu id="item2.0" label="item2.0">
-              <menupopup id="submenu2.0">
-                <menuitem id="item2.0.0" label="item2.0.0"/>
-              </menupopup>
-            </menu>
+      <menubar>
+        <menu id="menu" label="menu">
+          <menupopup>
+            <menuitem label="menuitem"/>
+            <menuitem label="menuitem"/>
           </menupopup>
         </menu>
-      </menupopup>
-
-      <button context="context" id="button">btn</button>
-
-      <vbox id="eventdump" role="log"/>
+      </menubar>
     </vbox>
   </hbox>
+
 </window>
+
diff --git a/accessible/tests/mochitest/treeupdate/test_menubutton.xul b/accessible/tests/mochitest/treeupdate/test_menubutton.xul
new file mode 100644
index 000000000000..e56291980d86
--- /dev/null
+++ b/accessible/tests/mochitest/treeupdate/test_menubutton.xul
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Accessible XUL button hierarchy tests">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+
+  <script type="application/javascript"
+          src="../common.js" />
+  <script type="application/javascript"
+          src="../role.js" />
+  <script type="application/javascript"
+          src="../events.js" />
+
+  <script type="application/javascript">
+  <![CDATA[
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Invokers
+
+    function openMenu(aButtonID)
+    {
+      this.buttonNode = getNode(aButtonID);
+      this.menupoupNode = this.buttonNode.firstChild;
+
+      this.eventSeq = [
+        new invokerChecker(EVENT_REORDER, this.menupoupNode)
+      ];
+
+      this.invoke = function openMenu_invoke()
+      {
+        var tree =
+          { PUSHBUTTON: [
+            { MENUPOPUP: [ ] }
+          ] };
+        testAccessibleTree(this.buttonNode, tree);
+
+        this.buttonNode.open = true;
+      }
+
+      this.finalCheck = function openMenu_finalCheck()
+      {
+        var tree =
+          { PUSHBUTTON: [
+            { MENUPOPUP: [
+              { MENUITEM: [ ] },
+              { MENUITEM: [ ] }
+            ] }
+          ] };
+        testAccessibleTree(this.buttonNode, tree);
+      }
+
+      this.getID = function openMenu_getID()
+      {
+        return "open menu for button " + prettyName(aButtonID);
+      }
+    }
+
+    function openMenuButton(aButtonID)
+    {
+      this.buttonNode = getNode(aButtonID);
+      this.menupoupNode = this.buttonNode.firstChild;
+
+      this.eventSeq = [
+        new invokerChecker(EVENT_REORDER, this.menupoupNode)
+      ];
+
+      this.invoke = function openMenu_invoke()
+      {
+        var tree =
+          { PUSHBUTTON: [
+            { MENUPOPUP: [ ] },
+            { PUSHBUTTON: [ ] }
+          ] };
+        testAccessibleTree(this.buttonNode, tree);
+
+        this.buttonNode.open = true;
+      }
+
+      this.finalCheck = function openMenu_finalCheck()
+      {
+        var tree =
+          { PUSHBUTTON: [
+            { MENUPOPUP: [
+              { MENUITEM: [ ] },
+              { MENUITEM: [ ] }
+            ] },
+            { PUSHBUTTON: [ ] }
+          ] };
+        testAccessibleTree(this.buttonNode, tree);
+      }
+
+      this.getID = function openMenu_getID()
+      {
+        return "open menu for menu button " + prettyName(aButtonID);
+      }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Do test
+
+    gA11yEventDumpToConsole = true; // debug stuff
+
+    var gQueue = null;
+
+    function doTest()
+    {
+      gQueue = new eventQueue();
+
+      gQueue.push(new openMenu("button1"));
+      gQueue.push(new openMenuButton("button2"));
+      gQueue.push(new openMenu("button3"));
+      gQueue.push(new openMenuButton("button4"));
+
+      gQueue.invoke(); // SimpleTest.finish()
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addA11yLoadEvent(doTest);
+  ]]>
+  </script>
+
+  <hbox flex="1" style="overflow: auto;">
+    <body xmlns="http://www.w3.org/1999/xhtml">
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=249292"
+         title="Ensure accessible children for toolbarbutton types 'menu' and 'menu-button'">
+        Mozilla Bug 249292
+      </a>
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=630486"
+         title="Don't force accessible creation for popup children.">
+        Mozilla Bug 630486
+      </a>
+      <br/>
+      <p id="display"></p>
+      <div id="content" style="display: none">
+      </div>
+      <pre id="test">
+      </pre>
+    </body>
+
+    <vbox flex="1">
+      <button id="button1" type="menu" label="hello">
+        <menupopup>
+          <menuitem label="menuitem"/>
+          <menuitem label="menuitem"/>
+        </menupopup>
+      </button>
+      <button id="button2" type="menu-button" label="hello">
+        <menupopup>
+          <menuitem label="menuitem"/>
+          <menuitem label="menuitem"/>
+        </menupopup>
+      </button>
+
+      <toolbarbutton id="button3" type="menu" label="hello">
+        <menupopup>
+          <menuitem label="menuitem"/>
+          <menuitem label="menuitem"/>
+        </menupopup>
+      </toolbarbutton>
+      <toolbarbutton id="button4" type="menu-button" label="hello">
+        <menupopup>
+          <menuitem label="menuitem"/>
+          <menuitem label="menuitem"/>
+        </menupopup>
+      </toolbarbutton>
+    </vbox>
+  </hbox>
+
+</window>
+
diff --git a/browser/components/feeds/content/subscribe.xml b/browser/components/feeds/content/subscribe.xml
index 51ebd3a36baf..1462e463170d 100644
--- a/browser/components/feeds/content/subscribe.xml
+++ b/browser/components/feeds/content/subscribe.xml
@@ -49,7 +49,7 @@
         <xul:hbox align="center">
           <xul:description anonid="subscribeUsingDescription" class="subscribeUsingDescription"/>
           <xul:menulist anonid="handlersMenuList" class="handlersMenuList" aria-labelledby="subscribeUsingDescription">
-            <xul:menupopup menugenerated="true" anonid="handlersMenuPopup" class="handlersMenuPopup">
+            <xul:menupopup anonid="handlersMenuPopup" class="handlersMenuPopup">
               <xul:menuitem anonid="liveBookmarksMenuItem" label="&feedLiveBookmarks;" class="menuitem-iconic liveBookmarksMenuItem" image="chrome://browser/skin/page-livemarks.png" selected="true"/>
               <xul:menuseparator/>
             </xul:menupopup>
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index bc44f6132e67..875aa70ad917 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -561,7 +561,6 @@ GK_ATOM(menu, "menu")
 GK_ATOM(menubar, "menubar")
 GK_ATOM(menubutton, "menubutton")
 GK_ATOM(menuButton, "menu-button")
-GK_ATOM(menugenerated, "menugenerated")
 GK_ATOM(menuitem, "menuitem")
 GK_ATOM(menulist, "menulist")
 GK_ATOM(menupopup, "menupopup")
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 01ea5c398b63..419ab7ce5aee 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1781,17 +1781,6 @@ nsMenuPopupFrame::AttributeChanged(PRInt32 aNameSpaceID,
     }
   }
 
-  // accessibility needs this to ensure the frames get constructed when the
-  // menugenerated attribute is set, see bug 279703 comment 42 for discussion
-  if (aAttribute == nsGkAtoms::menugenerated &&
-      mFrames.IsEmpty() && !mGeneratedChildren) {
-    EnsureWidget();
-
-    // indicate that the children have been generated and then generate them
-    mGeneratedChildren = PR_TRUE;
-    PresContext()->PresShell()->FrameConstructor()->GenerateChildFrames(this);
-  }
-
   return rv;
 }
 

From 2b93d069f5eb16d1535e6df63189ac83e0c64fa6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 14 Apr 2011 23:45:24 -0400
Subject: [PATCH 239/509] Bug 650083 - nsEditor.cpp:1147: warning: unused
 variable 'rv'; r=roc

---
 editor/libeditor/base/nsEditor.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index 118357ca0eb8..d19d388b1e3e 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -1144,7 +1144,6 @@ nsEditor::GetDocumentModified(PRBool *outDocModified)
 NS_IMETHODIMP
 nsEditor::GetDocumentCharacterSet(nsACString &characterSet)
 {
-  nsresult rv = NS_OK;
   nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocWeak);
   NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
 
@@ -1155,7 +1154,6 @@ nsEditor::GetDocumentCharacterSet(nsACString &characterSet)
 NS_IMETHODIMP
 nsEditor::SetDocumentCharacterSet(const nsACString& characterSet)
 {
-  nsresult rv = NS_OK;
   nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocWeak);
   NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
 

From 6de32c8fa9ee89f89f9bc5c406b4007997e0757a Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 15 Apr 2011 11:03:17 +0200
Subject: [PATCH 240/509] Bug 643690 part 1 - Avoid requiring libstdc++ symbol
 versions > GLIBCXX_3.4.8 (gcc > 4.1). r=ted,r=tglek

---
 build/stdc++compat.cpp                     | 114 +++++++++++++++++++++
 build/unix/elfhack/Makefile.in             |   3 +
 config/autoconf.mk.in                      |   1 +
 configure.in                               |  22 ++++
 modules/plugin/test/testplugin/Makefile.in |   3 +
 toolkit/crashreporter/client/Makefile.in   |   7 +-
 toolkit/crashreporter/test/Makefile.in     |   2 +
 toolkit/library/Makefile.in                |   2 +
 xpcom/tests/Makefile.in                    |  33 +++---
 9 files changed, 173 insertions(+), 14 deletions(-)
 create mode 100644 build/stdc++compat.cpp

diff --git a/build/stdc++compat.cpp b/build/stdc++compat.cpp
new file mode 100644
index 000000000000..dce0e63bbe29
--- /dev/null
+++ b/build/stdc++compat.cpp
@@ -0,0 +1,114 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is a hack to avoid dependencies on recent libstdc++.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mike Hommey <mh@glandium.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <ostream>
+#include <istream>
+#ifdef DEBUG
+#include <string>
+#endif
+
+namespace std {
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)
+    /* Instantiate these templates to avoid GLIBCXX_3.4.9 symbol versions */
+    template ostream& ostream::_M_insert(double);
+    template ostream& ostream::_M_insert(long);
+    template ostream& ostream::_M_insert(unsigned long);
+    template ostream& __ostream_insert(ostream&, const char*, streamsize);
+    template istream& istream::_M_extract(double&);
+#endif
+#ifdef DEBUG
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)
+    /* Instantiate these templates to avoid GLIBCXX_3.4.14 symbol versions
+     * in debug builds */
+    template char *basic_string<char, char_traits<char>, allocator<char> >::_S_construct_aux_2(size_type, char, allocator<char> const&);
+    template wchar_t *basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >::_S_construct_aux_2(size_type, wchar_t, allocator<wchar_t> const&);
+#endif
+#endif
+}
+
+namespace std __attribute__((visibility("default"))) {
+
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)
+    /* Hack to avoid GLIBCXX_3.4.14 symbol versions */
+    struct _List_node_base
+    {
+        void hook(_List_node_base * const __position) throw ();
+
+        void unhook() throw ();
+
+        void transfer(_List_node_base * const __first,
+                      _List_node_base * const __last) throw();
+
+        void _M_hook(_List_node_base * const __position) throw ();
+
+        void _M_unhook() throw ();
+
+        void _M_transfer(_List_node_base * const __first,
+                         _List_node_base * const __last) throw();
+    };
+
+    /* The functions actually have the same implementation */
+    void
+    _List_node_base::_M_hook(_List_node_base * const __position) throw ()
+    {
+        hook(__position);
+    }
+
+    void
+    _List_node_base::_M_unhook() throw ()
+    {
+        unhook();
+    }
+
+    void
+    _List_node_base::_M_transfer(_List_node_base * const __first,
+                                 _List_node_base * const __last) throw ()
+    {
+        transfer(__first, __last);
+    }
+#endif
+
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)
+    /* Hack to avoid GLIBCXX_3.4.11 symbol versions
+       An inline definition of ctype<char>::_M_widen_init() used to be in
+       locale_facets.h before GCC 4.4, but moved out of headers in more
+       recent versions.
+       It is actually safe to make it do nothing. */
+    void ctype<char>::_M_widen_init() const {}
+#endif
+
+}
diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
index c7898281a44c..81ef3b29714f 100644
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -48,9 +48,12 @@ INTERNAL_TOOLS = 1
 HOST_PROGRAM = elfhack
 NO_DIST_INSTALL = 1
 
+VPATH += $(topsrcdir)/build
+
 HOST_CPPSRCS = \
   elf.cpp \
   elfhack.cpp \
+  $(STDCXX_COMPAT) \
   $(NULL)
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 8b94e1e081eb..c3b36803bbb4 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -117,6 +117,7 @@ DEHYDRA_PATH    = @DEHYDRA_PATH@
 NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
 USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
 USE_ELF_HACK = @USE_ELF_HACK@
+STDCXX_COMPAT = @STDCXX_COMPAT@
 INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
diff --git a/configure.in b/configure.in
index 473e847d26d1..0ff44aa99f85 100644
--- a/configure.in
+++ b/configure.in
@@ -7716,6 +7716,28 @@ if test "$USE_ELF_HACK" = 1; then
     esac
 fi
 
+dnl ========================================================
+dnl = libstdc++ compatibility hacks
+dnl ========================================================
+
+STDCXX_COMPAT=stdc++compat.cpp
+MOZ_ARG_DISABLE_BOOL(stdcxx-compat,
+[  --disable-stdcxx-compat Disable libstdc++ compatibility],
+    STDCXX_COMPAT=)
+
+# Disable on platforms where it doesn't make sense
+if test -n "$STDCXX_COMPAT"; then
+    case "${OS_TARGET}" in
+    Linux)
+        ;;
+    *)
+        STDCXX_COMPAT=
+        ;;
+    esac
+fi
+
+AC_SUBST(STDCXX_COMPAT)
+
 dnl ========================================================
 dnl = 
 dnl = Profiling and Instrumenting
diff --git a/modules/plugin/test/testplugin/Makefile.in b/modules/plugin/test/testplugin/Makefile.in
index 1e35691c441a..9cc76cc6a1ad 100644
--- a/modules/plugin/test/testplugin/Makefile.in
+++ b/modules/plugin/test/testplugin/Makefile.in
@@ -56,9 +56,12 @@ USE_STATIC_LIBS = 1
 NO_DIST_INSTALL	= 1
 NO_INSTALL = 1
 
+VPATH += $(topsrcdir)/build
+
 CPPSRCS   =  \
   nptest.cpp \
   nptest_utils.cpp \
+  $(STDCXX_COMPAT) \
   $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in
index ac8bd1d8cfbf..5f38836fe03b 100644
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -58,7 +58,12 @@ endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
 
-CPPSRCS = crashreporter.cpp
+VPATH += $(topsrcdir)/build/
+
+CPPSRCS = \
+  crashreporter.cpp \
+  $(STDCXX_COMPAT) \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += crashreporter_win.cpp
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 86b557f852a6..b54531787f82 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -52,6 +52,7 @@ NO_DIST_INSTALL = 1
 VPATH += \
   $(srcdir)/../google-breakpad/src/processor/ \
   $(srcdir)/../google-breakpad/src/common/ \
+  $(topsrcdir)/build/ \
   $(NULL)
 
 CPPSRCS = \
@@ -61,6 +62,7 @@ CPPSRCS = \
   logging.cc \
   minidump.cc \
   pathname_stripper.cc \
+  $(STDCXX_COMPAT) \
   $(NULL)
 
 LOCAL_INCLUDES += \
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 072f69dfa9c5..2d6ffa962e9c 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -63,6 +63,8 @@ LIBRARY_NAME=XUL
 MAKE_FRAMEWORK=1
 endif
 
+VPATH += $(topsrcdir)/build/
+CPPSRCS += $(STDCXX_COMPAT)
 
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CPPSRCS += dlldeps-xul.cpp
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 74f8f2ef5ec2..d839ae8e4672 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -64,20 +64,22 @@ ifdef DEHYDRA_PATH
 DIRS += static-checker
 endif
 
+VPATH += $(topsrcdir)/build
 
-CPPSRCS		= \
-		nsIFileEnumerator.cpp \
-		TestCallTemplates.cpp \
-		TestINIParser.cpp \
-		TestRacingServiceManager.cpp \
-		TestRegistrationOrder.cpp \
-		TestThreadPoolListener.cpp \
-		TestTimers.cpp \
-		TestBlockingProcess.cpp \
-		TestQuickReturn.cpp \
-		TestArguments.cpp \
-		TestUnicodeArguments.cpp \
-		$(NULL)
+CPPSRCS = \
+  nsIFileEnumerator.cpp \
+  TestCallTemplates.cpp \
+  TestINIParser.cpp \
+  TestRacingServiceManager.cpp \
+  TestRegistrationOrder.cpp \
+  TestThreadPoolListener.cpp \
+  TestTimers.cpp \
+  TestBlockingProcess.cpp \
+  TestQuickReturn.cpp \
+  TestArguments.cpp \
+  TestUnicodeArguments.cpp \
+  $(STDCPPFLAGS) \
+  $(NULL)
 
 ifdef WRAP_STL_INCLUDES
 CPPSRCS += TestSTLWrappers.cpp
@@ -224,3 +226,8 @@ check::
 	  $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) $(regOrderDir)
 
 GARBAGE += TestScriptable.h
+
+ifdef STDCXX_COMPAT
+TestCheckedInt: $(STDCXX_COMPAT:.cpp=.$(OBJ_SUFFIX))
+TestCheckedInt: LIBS += $(STDCXX_COMPAT:.cpp=.$(OBJ_SUFFIX))
+endif

From 68e04d9d544e77cf09fb9da2fcd6d319a6e8c3af Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 15 Apr 2011 11:03:35 +0200
Subject: [PATCH 241/509] Bug 643690 part 2 - Check that resulting binaries
 don't require GLIBCXX_3.4.9 or more. r=ted

---
 config/config.mk        | 4 ++++
 config/rules.mk         | 3 +++
 js/src/config/config.mk | 4 ++++
 js/src/config/rules.mk  | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/config/config.mk b/config/config.mk
index c2276abb5587..f6d0ad5ed449 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -849,3 +849,7 @@ EXPAND_CC = $(EXPAND_LIBS_EXEC) --uselist -- $(CC)
 EXPAND_CCC = $(EXPAND_LIBS_EXEC) --uselist -- $(CCC)
 EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselist -- $(LD)
 EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) --uselist -- $(MKSHLIB)
+
+ifdef STDCXX_COMPAT
+CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && echo "Error: We don't want these libstdc++ symbol versions to be used" && exit 1 || exit 0
+endif
diff --git a/config/rules.mk b/config/rules.mk
index 619263bab59c..7a046a88e763 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -992,6 +992,7 @@ endif
 else # !WINNT || GNU_CC
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
+	$(call CHECK_STDCXX,$@)
 else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
@@ -1057,6 +1058,7 @@ endif	# MSVC with manifest tool
 else
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
+	$(call CHECK_STDCXX,$@)
 else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
@@ -1177,6 +1179,7 @@ endif
 else # ! DTRACE_LIB_DEPENDENT
 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 endif # DTRACE_LIB_DEPENDENT
+	$(call CHECK_STDCXX,$@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index c2276abb5587..f6d0ad5ed449 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -849,3 +849,7 @@ EXPAND_CC = $(EXPAND_LIBS_EXEC) --uselist -- $(CC)
 EXPAND_CCC = $(EXPAND_LIBS_EXEC) --uselist -- $(CCC)
 EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselist -- $(LD)
 EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) --uselist -- $(MKSHLIB)
+
+ifdef STDCXX_COMPAT
+CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && echo "Error: We don't want these libstdc++ symbol versions to be used" && exit 1 || exit 0
+endif
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 619263bab59c..7a046a88e763 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -992,6 +992,7 @@ endif
 else # !WINNT || GNU_CC
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
+	$(call CHECK_STDCXX,$@)
 else # ! CPP_PROG_LINK
 	$(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
@@ -1057,6 +1058,7 @@ endif	# MSVC with manifest tool
 else
 ifeq ($(CPP_PROG_LINK),1)
 	$(EXPAND_CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
+	$(call CHECK_STDCXX,$@)
 else
 	$(EXPAND_CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
@@ -1177,6 +1179,7 @@ endif
 else # ! DTRACE_LIB_DEPENDENT
 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 endif # DTRACE_LIB_DEPENDENT
+	$(call CHECK_STDCXX,$@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL

From b3511ee384933a2251705386cd7bad31768dbaa9 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Fri, 15 Apr 2011 12:40:43 +0200
Subject: [PATCH 242/509] Bug 645970 - search service doesn't unpack jar:jar:
 [r=gavin]

---
 toolkit/components/search/Makefile.in         |   4 +
 toolkit/components/search/nsSearchService.js  |   2 +-
 toolkit/components/search/tests/Makefile.in   |  49 ++++++++++
 .../tests/xpcshell/data/chrome.manifest       |   1 +
 .../search/tests/xpcshell/data/searchTest.jar | Bin 0 -> 776 bytes
 .../search/tests/xpcshell/head_search.js      |  92 ++++++++++++++++++
 .../search/tests/xpcshell/test_645970.js      |  62 ++++++++++++
 7 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/components/search/tests/Makefile.in
 create mode 100644 toolkit/components/search/tests/xpcshell/data/chrome.manifest
 create mode 100644 toolkit/components/search/tests/xpcshell/data/searchTest.jar
 create mode 100644 toolkit/components/search/tests/xpcshell/head_search.js
 create mode 100644 toolkit/components/search/tests/xpcshell/test_645970.js

diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
index f8033b4a162e..d89bda16f83d 100644
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -49,4 +49,8 @@ EXTRA_PP_COMPONENTS = nsSearchService.js \
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
+ifdef ENABLE_TESTS
+DIRS += tests
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index af88962808c3..3c8df946c1c1 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -2868,7 +2868,7 @@ SearchService.prototype = {
       try {
         let chromeURI = gChromeReg.convertChromeURL(makeURI(root));
         let fileURI = chromeURI; // flat packaging
-        if (fileURI instanceof Ci.nsIJARURI)
+        while (fileURI instanceof Ci.nsIJARURI)
           fileURI = fileURI.JARFile; // JAR packaging
         fileURI.QueryInterface(Ci.nsIFileURL);
         chromeFile = fileURI.file;
diff --git a/toolkit/components/search/tests/Makefile.in b/toolkit/components/search/tests/Makefile.in
new file mode 100644
index 000000000000..30978c206031
--- /dev/null
+++ b/toolkit/components/search/tests/Makefile.in
@@ -0,0 +1,49 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla.org.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir = toolkit/components/search/tests
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= test_searchservice
+
+XPCSHELL_TESTS = xpcshell
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/search/tests/xpcshell/data/chrome.manifest b/toolkit/components/search/tests/xpcshell/data/chrome.manifest
new file mode 100644
index 000000000000..ac459af7e013
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/data/chrome.manifest
@@ -0,0 +1 @@
+locale testsearchplugin ar jar:jar:searchTest.jar!/chrome/searchTest.jar!/
diff --git a/toolkit/components/search/tests/xpcshell/data/searchTest.jar b/toolkit/components/search/tests/xpcshell/data/searchTest.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3882ae938f1df50ea037fbc17b1be2331a5b2da2
GIT binary patch
literal 776
zcmWIWW@h1HW&ncUb9?PTGz_o<8Oa$%`MIh30YF6}Kt&u3-+_u|T#x^y#KgdG2#7@y
zii%Sci;^=!Qj1IUvJ#7GC*}GC1xg%$FB(vO)a`RF@2qVbe+A6qIolEz7*>>jD^}HH
z<5O?Gb-Pu{^h=Mcd!CLH;F`tD9=+ORab_LI^_V&X%|rLtlBca*E4Z;WYEA0mu$1X@
zZXSD4|Lx73&416;SI_(JD99$9#IPmp?cM0c`Yla*i*`P&nC#V@J@tlRQu3U$%Wi(L
ze^cCVyhWC!;kPEk0pA4at*3ldmp)BB>N-X0y|I1fOpRx6y6W1m*_7?r^gv&W*E*Q%
zx#+8(Kf~i~C)_<}eEqIYkLyEW<3)=t7q5Qjdt<NJdT++}YmaKK{xIjGh*H^nwUU(?
zzP$JM>t(E-QL|p~b5G;1=Cj)!j(Ts1`d-OWYjSL2L|K&Y#Jhps%+YTjfBW(Ke8Ria
z#aorugr>`>UXPY#J3sB^i4gW<VP4Vk#l88ves%8TkMnGJxz6P&^A5v!J+lu*Rhz$Q
zEI5|^{5VVKp_Nr?+G4wQ8@%E86w4pFiTlPY?ORq^#m{&9IJ!1&F*fQoI~yMSaKfKo
zp7p=_-!<fOY<u&*a8sO(@X}COISXsOE%8y75q%!~sUI%6%@fj<J)ByeGVi9@UM=%I
zk2~Hco!qnQwZr=-w?8i2diz$+{0)xIPuH^se7HPwW53DNw&Vjv9$r-+;?sTZEBumK
zf2ZZ(V+lvGi6TGE88}=IOv!QEG-3LY%>NpULU+XOt8v$Qvc5I{BK_|_t61+O^Nl%I
z*wwN*T_aW&b~)<v?`1#u<E?psHzSh>Gw!qpNrwUrZyiA_cuE9m!krc&niLwAG^!#r
Yp{C3LZ&o&tGA1Cb0Mb>!WX!+-02$Igu>b%7

literal 0
HcmV?d00001

diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js
new file mode 100644
index 000000000000..110d94547b88
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -0,0 +1,92 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is POTI Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
+const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
+
+var gXULAppInfo = null;
+
+/**
+ * Creates an nsIXULAppInfo
+ * @param   id
+ *          The ID of the test application
+ * @param   name
+ *          A name for the test application
+ * @param   version
+ *          The version of the application
+ * @param   platformVersion
+ *          The gecko version of the application
+ */
+function createAppInfo(id, name, version, platformVersion)
+{
+  gXULAppInfo = {
+    vendor: "Mozilla",
+    name: name,
+    ID: id,
+    version: version,
+    appBuildID: "2007010101",
+    platformVersion: platformVersion,
+    platformBuildID: "2007010101",
+    inSafeMode: false,
+    logConsoleErrors: true,
+    OS: "XPCShell",
+    XPCOMABI: "noarch-spidermonkey",
+    invalidateCachesOnRestart: function invalidateCachesOnRestart() {},
+
+    QueryInterface: function QueryInterface(iid) {
+      if (iid.equals(Components.interfaces.nsIXULAppInfo)
+       || iid.equals(Components.interfaces.nsIXULRuntime)
+       || iid.equals(Components.interfaces.nsISupports))
+        return this;
+
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+  };
+
+  var XULAppInfoFactory = {
+    createInstance: function (outer, iid) {
+      if (outer != null)
+        throw Components.results.NS_ERROR_NO_AGGREGATION;
+      return gXULAppInfo.QueryInterface(iid);
+    }
+  };
+  var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+  registrar.registerFactory(XULAPPINFO_CID, "XULAppInfo",
+                            XULAPPINFO_CONTRACTID, XULAppInfoFactory);
+}
+
+// Need to create and register a profile folder.
+var gProfD = do_get_profile();
+
diff --git a/toolkit/components/search/tests/xpcshell/test_645970.js b/toolkit/components/search/tests/xpcshell/test_645970.js
new file mode 100644
index 000000000000..fa17f052995a
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/test_645970.js
@@ -0,0 +1,62 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is POTI Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+
+var gPrefService = Cc["@mozilla.org/preferences-service;1"]
+                    .getService(Ci.nsIPrefService)
+                    .QueryInterface(Ci.nsIPrefBranch);
+/**
+ * Test nsSearchService with nested jar: uris
+ */
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
+
+  do_load_manifest("data/chrome.manifest");
+
+  let url  = "chrome://testsearchplugin/locale/searchplugins/";
+  gPrefService.setCharPref("browser.search.jarURIs", url);
+
+  gPrefService.setBoolPref("browser.search.loadFromJars", true);
+
+  // The search service needs to be started after the jarURIs pref has been
+  // set in order to initiate it correctly
+  let searchService = Cc["@mozilla.org/browser/search-service;1"]
+                       .getService(Ci.nsIBrowserSearchService);
+  let engine = searchService.getEngineByName("bug645970");
+  do_check_neq(engine, null);
+}
+

From 31ec5528f6c9a09cc802168f951f82f0db5b899e Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Fri, 15 Apr 2011 12:41:49 +0200
Subject: [PATCH 243/509] Bug 568685 - about:blank does not refresh thumbnail
 image in left sidebar [r=wjohnston]

---
 mobile/chrome/content/browser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 70e8078acf60..4b6fa7ce407b 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1439,8 +1439,8 @@ Browser.WebProgress.prototype = {
       }
 
       aTab.scrolledAreaChanged();
-      if (browser.currentURI.spec != "about:blank")
-        aTab.updateThumbnail();
+      aTab.updateThumbnail();
+
       browser.messageManager.addMessageListener("MozScrolledAreaChanged", aTab.scrolledAreaChanged);
     });
   }

From 5d7ce76ef463a82e8e818c34dc00464127a076c2 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Fri, 15 Apr 2011 12:43:18 +0200
Subject: [PATCH 244/509] Bug 646632 - 'Find In Page' zoom should be relative
 to the default zoom level [r=mfinkle]

---
 mobile/chrome/content/browser.js   |  2 --
 mobile/chrome/content/common-ui.js | 52 ++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 4b6fa7ce407b..6fed04e51017 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -57,8 +57,6 @@ function getBrowser() {
   return Browser.selectedBrowser;
 }
 
-const kBrowserFormZoomLevelMin = 0.8;
-const kBrowserFormZoomLevelMax = 2.0;
 const kBrowserViewZoomLevelPrecision = 10000;
 
 const kDefaultBrowserWidth = 800;
diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index f3508a970af6..a1331a56b9db 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -1,4 +1,44 @@
 // -*- Mode: js2; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Mobile Browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const kBrowserFormZoomLevelMin = 0.8;
+const kBrowserFormZoomLevelMax = 2.0;
+
 var BrowserSearch = {
   get _popup() {
     delete this._popup;
@@ -563,7 +603,11 @@ var FindHelperUI = {
 
     if (Browser.selectedTab.allowZoom) {
       let zoomLevel = Browser._getZoomLevelForRect(aElementRect);
-      zoomLevel = Math.min(Math.max(kBrowserFormZoomLevelMin, zoomLevel), kBrowserFormZoomLevelMax);
+
+      // Clamp the zoom level relatively to the default zoom level of the page
+      let defaultZoomLevel = Browser.selectedTab.getDefaultZoomLevel();
+      zoomLevel = Util.clamp(zoomLevel, (defaultZoomLevel * kBrowserFormZoomLevelMin),
+                                        (defaultZoomLevel * kBrowserFormZoomLevelMax));
       zoomLevel = Browser.selectedTab.clampZoomLevel(zoomLevel);
 
       let zoomRect = Browser._getZoomRectForPoint(aElementRect.center().x, aElementRect.y, zoomLevel);
@@ -1150,7 +1194,11 @@ var FormHelperUI = {
   _getZoomLevelForRect: function _getZoomLevelForRect(aRect) {
     const margin = 30;
     let zoomLevel = getBrowser().getBoundingClientRect().width / (aRect.width + margin);
-    return Util.clamp(zoomLevel, kBrowserFormZoomLevelMin, kBrowserFormZoomLevelMax);
+
+    // Clamp the zoom level relatively to the default zoom level of the page
+    let defaultZoomLevel = Browser.selectedTab.getDefaultZoomLevel();
+    return Util.clamp(zoomLevel, (defaultZoomLevel * kBrowserFormZoomLevelMin),
+                                 (defaultZoomLevel * kBrowserFormZoomLevelMax));
   },
 
   _getOffsetForCaret: function _formHelperGetOffsetForCaret(aCaretRect, aRect) {

From 671bc8629eaa0b697918d448b85064eebba0853a Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Fri, 15 Apr 2011 12:44:30 +0200
Subject: [PATCH 245/509] Bug 648543 - Restart popup is still displayed when
 the current language pack is selected again [r=mfinkle]

---
 mobile/chrome/content/preferences.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/mobile/chrome/content/preferences.js b/mobile/chrome/content/preferences.js
index 25c144000ebe..342a688f7e57 100644
--- a/mobile/chrome/content/preferences.js
+++ b/mobile/chrome/content/preferences.js
@@ -39,7 +39,6 @@ var PreferencesView = {
   _currentLocale: null,
   _languages: null,
   _msg: null,
-  _restartCount: 0,
 
   _messageActions: function pv__messageActions(aData) {
     if (aData == "prefs-restart-app") {
@@ -78,9 +77,6 @@ var PreferencesView = {
   },
 
   showRestart: function ev_showRestart() {
-    // Increment the count in case the view is not completely initialized
-    this._restartCount++;
-
     if (this._msg) {
       let strings = Strings.browser;
       this.showMessage(strings.GetStringFromName("notificationRestart.normal"), "restart-app",
@@ -89,8 +85,7 @@ var PreferencesView = {
   },
 
   hideRestart: function ev_hideRestart() {
-    this._restartCount--;
-    if (this._restartCount == 0 && this._msg) {
+    if (this._msg) {
       let notification = this._msg.getNotificationWithValue("restart-app");
       if (notification)
         notification.close();
@@ -112,10 +107,10 @@ var PreferencesView = {
     // Query available and selected locales
     let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
     chrome.QueryInterface(Ci.nsIToolkitChromeRegistry);
-    
+
     let selectedLocale = chrome.getSelectedLocale("browser");
     let availableLocales = chrome.getLocalesForPackage("browser");
-    
+
     let strings = Services.strings.createBundle("chrome://browser/content/languages.properties");
 
     // Render locale menulist by iterating through the query result from getLocalesForPackage()
@@ -142,7 +137,7 @@ var PreferencesView = {
       autoDetect = Services.prefs.getBoolPref("intl.locale.matchOS");
     }
     catch (e) {}
-    
+
     // Highlight current locale (or auto-detect entry)
     if (autoDetect) {
       this._languages.selectedItem = document.getElementById("prefs-languages-auto");
@@ -150,7 +145,7 @@ var PreferencesView = {
     } else {
       this._languages.selectedItem = selectedItem;
     }
-    
+
     // Hide the setting if we only have one locale
     if (localeCount == 1)
       document.getElementById("prefs-uilanguage").hidden = true;

From d2104e17544c495b87121b6c0ac61abb88c0da27 Mon Sep 17 00:00:00 2001
From: Anas Husseini <linux.anas@gmail.com>
Date: Fri, 15 Apr 2011 12:47:51 +0200
Subject: [PATCH 246/509] Bug 647650 - [rtl] Give about:config more RTL care
 [r=vingtetun]

---
 mobile/themes/core/config.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mobile/themes/core/config.css b/mobile/themes/core/config.css
index e7cf2df0f603..c5fde619c17e 100644
--- a/mobile/themes/core/config.css
+++ b/mobile/themes/core/config.css
@@ -60,7 +60,7 @@ richlistitem .prefvalue {
   min-width: 200px;
   pointer-events: none;
   -moz-box-flex: 4;
-  text-align: right;
+  text-align: end;
   color: grey;
 }
 
@@ -114,6 +114,14 @@ richlistitem .prefvalue {
   -moz-box-flex: 1;
 }
 
+/* bug 647650: keep 'text-align: right' here instead of using start/end since 
+ * the field should looks like ltr as much as possible
+ */
+#editor-setting[type="string"] .setting-input > textbox:-moz-locale-dir(rtl) {
+  direction: ltr;
+  text-align: right;
+}
+
 #editor-buttons {
   margin: 2px;
 }

From 472443551135017a7e9fe29e468c629c3565516b Mon Sep 17 00:00:00 2001
From: Anas Husseini <linux.anas@gmail.com>
Date: Fri, 15 Apr 2011 12:50:02 +0200
Subject: [PATCH 247/509] Bug 647755 - [RTL] Edit bookmark's textboxes layout
 is wrong in rtl [r=vingtetun]

---
 mobile/chrome/content/bindings.xml | 2 +-
 mobile/themes/core/browser.css     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml
index 5935d8c3d88b..dad23043ee12 100644
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -874,7 +874,7 @@
         <xul:vbox flex="1">
           <xul:vbox flex="1">
             <xul:textbox anonid="name" xbl:inherits="value=title" class="prompt-edit" flex="1"/>
-            <xul:textbox anonid="uri" xbl:inherits="value=uri" class="prompt-edit" flex="1"/>
+            <xul:textbox anonid="uri" xbl:inherits="value=uri" type="url" class="uri-element" class="prompt-edit" flex="1"/>
             <xul:textbox anonid="tags" xbl:inherits="value=tags" emptytext="&editBookmarkTags.label;" class="prompt-edit" flex="1"/>
           </xul:vbox>
 
diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css
index 30e6d0ed1a4f..4f5bce67c509 100644
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -656,6 +656,11 @@ placeitem[ui="manage"] > .bookmark-manage > image {
   visibility: collapse;
 }
 
+/* making the url textbox right-aligned for rtl locales */
+placeitem[ui="manage"] > .bookmark-manage textbox[anonid="uri"]:-moz-locale-dir(rtl) {
+  text-align: right;
+}
+
 /* autocomplete-items */
 .autocomplete-items {
   background-color: white;

From 8e9047e08c88b6767307319df5fc59c486c177dd Mon Sep 17 00:00:00 2001
From: Anas Husseini <linux.anas@gmail.com>
Date: Fri, 15 Apr 2011 12:52:58 +0200
Subject: [PATCH 248/509] Bug 648733 - [rtl] addon title and version need more
 margin in about:home [r=vingtetun]

---
 mobile/themes/core/aboutHome.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/themes/core/aboutHome.css b/mobile/themes/core/aboutHome.css
index 4cb27260a1ed..c6bc65fc0dd5 100644
--- a/mobile/themes/core/aboutHome.css
+++ b/mobile/themes/core/aboutHome.css
@@ -125,7 +125,8 @@ body[dir="ltr"] .section-box .openall {
 }
 
 .section-box .version {
-  -moz-margin-start: 12px;
+  /* The addon title is not localized, so keep the margin on the left side */
+  margin-left: 12px;
   font-size: 18px;
   color: gray;
 }

From 82aa71d24d05114d8bcd9ec30b5d5071bc8aff2e Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 15 Apr 2011 16:45:35 +0200
Subject: [PATCH 249/509] Bug 555474 - While bookmark is dragged, the tooltip
 should not appear. r=enn

---
 layout/xul/base/src/nsXULTooltipListener.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp
index 7db18f6306e8..cf82c5486e93 100644
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -344,7 +344,7 @@ nsXULTooltipListener::AddTooltipSupport(nsIContent* aNode)
   nsCOMPtr<nsIDOMEventTarget> evtTarget(do_QueryInterface(aNode));
   evtTarget->AddEventListener(NS_LITERAL_STRING("mouseout"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
   evtTarget->AddEventListener(NS_LITERAL_STRING("mousemove"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
-  evtTarget->AddEventListener(NS_LITERAL_STRING("dragstart"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
+  evtTarget->AddEventListener(NS_LITERAL_STRING("dragstart"), static_cast<nsIDOMMouseListener*>(this), PR_TRUE);
   
   return NS_OK;
 }
@@ -358,7 +358,7 @@ nsXULTooltipListener::RemoveTooltipSupport(nsIContent* aNode)
   nsCOMPtr<nsIDOMEventTarget> evtTarget(do_QueryInterface(aNode));
   evtTarget->RemoveEventListener(NS_LITERAL_STRING("mouseout"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
   evtTarget->RemoveEventListener(NS_LITERAL_STRING("mousemove"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
-  evtTarget->RemoveEventListener(NS_LITERAL_STRING("dragstart"), static_cast<nsIDOMMouseListener*>(this), PR_FALSE);
+  evtTarget->RemoveEventListener(NS_LITERAL_STRING("dragstart"), static_cast<nsIDOMMouseListener*>(this), PR_TRUE);
 
   return NS_OK;
 }

From 64cba328ab43db71919e1b7f9920c0971f578fd0 Mon Sep 17 00:00:00 2001
From: "Adam Dane [:hobophobe]" <unusualtears@gmail.com>
Date: Fri, 15 Apr 2011 12:47:43 -0500
Subject: [PATCH 250/509] Bug 635311 - iQ(.appTabIcon, this.).each() calls in
 groupitems.js should return early if possible; r=ian

---
 browser/base/content/tabview/groupitems.js | 11 ++++++++---
 browser/base/content/tabview/iq.js         |  4 +---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index a9f607173802..207675d86a5a 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1147,7 +1147,9 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
       let $icon = iQ(icon);
       if ($icon.data("xulTab") == event.target) {
         $icon.attr("src", Utils.defaultFaviconURL);
+        return false;
       }
+      return true;
     });
   },
 
@@ -1193,9 +1195,10 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     iQ(".appTabIcon", this.$appTabTray).each(function(icon) {
       let $icon = iQ(icon);
       if ($icon.data("xulTab") != xulTab)
-        return;
+        return true;
         
       $icon.remove();
+      return false;
     });
     
     // adjust the tray
@@ -1215,7 +1218,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     elements.each(function(icon) {
       let $icon = iQ(icon);
       if ($icon.data("xulTab") != xulTab)
-        return;
+        return true;
 
       let targetIndex = xulTab._tPos;
 
@@ -1226,6 +1229,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         iQ(".appTabIcon:nth-child(" + (targetIndex + 1) + ")", self.$appTabTray)[0]);
       else
         $icon.appendTo(self.$appTabTray);
+      return false;
     });
   },
 
@@ -2037,10 +2041,11 @@ let GroupItems = {
       iQ(".appTabIcon", groupItem.$appTabTray).each(function(icon) {
         let $icon = iQ(icon);
         if ($icon.data("xulTab") != xulTab)
-          return;
+          return true;
 
         if (iconUrl != $icon.attr("src"))
           $icon.attr("src", iconUrl);
+        return false;
       });
     });
   },  
diff --git a/browser/base/content/tabview/iq.js b/browser/base/content/tabview/iq.js
index 6daa334263ea..29e5c6b80222 100644
--- a/browser/base/content/tabview/iq.js
+++ b/browser/base/content/tabview/iq.js
@@ -217,9 +217,7 @@ iQClass.prototype = {
       Utils.assert(false, "each's argument must be a function");
       return null;
     }
-    for (let i = 0; this[i] != null; i++) {
-      callback(this[i]);
-    }
+    for (let i = 0; this[i] != null && callback(this[i]) !== false; i++) {}
     return this;
   },
 

From 28ae3a46fb89150668211a00c9e22a636e20db72 Mon Sep 17 00:00:00 2001
From: "Adam Dane [:hobophobe]" <unusualtears@gmail.com>
Date: Fri, 15 Apr 2011 12:53:11 -0500
Subject: [PATCH 251/509] Bug 627113 - Thin line on the right edge of the
 window on pressing right button in panorama; r=ian

---
 browser/base/content/tabview/tabview.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/base/content/tabview/tabview.css b/browser/base/content/tabview/tabview.css
index 922d60a77953..682997b72798 100644
--- a/browser/base/content/tabview/tabview.css
+++ b/browser/base/content/tabview/tabview.css
@@ -13,6 +13,7 @@ body {
 }
 
 #content {
+  overflow: -moz-hidden-unscrollable;
   position: absolute;
   top: 0;
   left: 0;

From a7e100854b25d918d2dcd9646b51677ad83c429e Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 15 Apr 2011 23:58:36 +0200
Subject: [PATCH 252/509] bug 556721 - Clean up test_342484.xul.

---
 .../places/tests/chrome/test_342484.xul       | 113 +++++++++---------
 1 file changed, 54 insertions(+), 59 deletions(-)

diff --git a/toolkit/components/places/tests/chrome/test_342484.xul b/toolkit/components/places/tests/chrome/test_342484.xul
index 804b1f7f9280..7e432eee194d 100644
--- a/toolkit/components/places/tests/chrome/test_342484.xul
+++ b/toolkit/components/places/tests/chrome/test_342484.xul
@@ -4,7 +4,8 @@
   href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <window title="Add Bad Livemarks"
   xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="runTest()">
   <script type="application/javascript"
    src="chrome://mochikit/content/MochiKit/packed.js"></script>
   <script type="application/javascript"
@@ -23,73 +24,67 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 
-var iosvc = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/NetUtil.jsm");
+Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
 
-function uri(spec) {
-  return iosvc.newURI(spec, null, null);
-}
-
-var lmsvc = Cc["@mozilla.org/browser/livemark-service;2"].
-              getService(Ci.nsILivemarkService);
-var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
-              getService(Ci.nsINavBookmarksService);
-var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
-                getService(Ci.nsINavHistoryService);
-
-var toolbarFolderId = bmsvc.toolbarFolder;
-
-var observer =
-{
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsINavBookmarkObserver) ||
-        iid.equals(Ci.nsISupports))
-      return this;
-    throw Cr.NS_ERROR_NO_INTERFACE;
-  },
-
-  // nsINavBookmarkObserve
-  onBeginUpdateBatch: function(){},
-  onEndUpdateBatch: function(){
-    setTimeout(runTest, 1000);
-    bmsvc.removeObserver(this);
-  },
-  onItemAdded: function(){},
-  onBeforeItemRemoved: function(){},
-  onItemRemoved: function(){},
-  onItemChanged: function(){},
-  onItemVisited: function(){},
-  onItemMoved: function(){},
-
-};
+let gLivemarkId = -1;
 
 function runTest() {
-  var goodItems = ["http://example.org/first", "http://example.org/last"];
-  var options = histsvc.getNewQueryOptions();
-  var query = histsvc.getNewQuery();
-  query.setFolders([gLivemarkId], 1);
-  var result = histsvc.executeQuery(query, options);
-  var rootNode = result.root;
-  rootNode.containerOpen = true;
+  const FEEDSPEC = "http://mochi.test:8888/tests/toolkit/components/places/tests/chrome/bad_links.atom";
 
-  var cc = rootNode.childCount;
-  ok(cc == 2, "failed to create the two good livemark items");
-  for (var i = 0; i < cc; ++i) {
-    var node = rootNode.getChild(i);
-    ok(goodItems.indexOf(node.uri) != -1, "livemark item created with bad uri " + node.uri);
+  let bookmarksObserver = {
+    QueryInterface: XPCOMUtils.generateQI([
+      Ci.nsINavBookmarkObserver
+    ]),
+
+    onItemAdded: function (aItemId, aParentId, aIndex, aItemType, aURI) {
+      if (aURI.spec == "http://example.org/last")
+        this._updateFinished = true;
+    },
+    onEndUpdateBatch: function () {
+      if (this._updateFinished) {
+        PlacesUtils.bookmarks.removeObserver(this);
+        setTimeout(continueTest, 0);
+      }
+    },
+    onBeginUpdateBatch: function () {},
+    onBeforeItemRemoved: function () {},
+    onItemRemoved: function () {},
+    onItemChanged: function () {},
+    onItemVisited: function () {},
+    onItemMoved: function () {},
+  };
+
+  gLivemarkId = PlacesUtils.livemarks.createLivemarkFolderOnly(
+    PlacesUtils.toolbarFolderId, "foo", NetUtil.newURI("http://mochi.test/"),
+    NetUtil.newURI(FEEDSPEC), PlacesUtils.bookmarks.DEFAULT_INDEX
+  );
+  PlacesUtils.bookmarks.addObserver(bookmarksObserver, false);
+  PlacesUtils.livemarks.reloadLivemarkFolder(gLivemarkId);
+}
+
+function continueTest() {
+  const GOOD_URLS = ["http://example.org/first", "http://example.org/last"];
+
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let query = PlacesUtils.history.getNewQuery();
+  query.setFolders([gLivemarkId], 1);
+  let root = PlacesUtils.history.executeQuery(query, options).root;
+  root.containerOpen = true;
+
+  let cc = root.childCount;
+  is(cc, 2, "failed to create the two good livemark items");
+  for (let i = 0; i < cc; ++i) {
+    let node = root.getChild(i);
+    ok(GOOD_URLS.indexOf(node.uri) != -1, "livemark item created with bad uri " + node.uri);
   }
 
-  rootNode.containerOpen = false;
-  bmsvc.removeItem(gLivemarkId);
+  root.containerOpen = false;
+  PlacesUtils.bookmarks.removeItem(gLivemarkId);
   SimpleTest.finish();
 }
 
-const FEEDSPEC = "http://mochi.test:8888/tests/toolkit/components/places/tests/chrome/bad_links.atom";
-
-gLivemarkId = lmsvc.createLivemarkFolderOnly(toolbarFolderId, "foo",
-                                             uri("http:/mochi.test/"),
-                                             uri(FEEDSPEC), -1);
-bmsvc.addObserver(observer, false);
-lmsvc.reloadLivemarkFolder(gLivemarkId);
 ]]>
 </script>
 

From 4020e44b1fab05653b3e4b34f3a56a69ccab177b Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 17 Apr 2011 10:57:17 +0200
Subject: [PATCH 253/509] Bug 585877 - Remove support for document.width and
 document.height; r=jonas sr=jst * * * try: -b do -p all -u mochitest-o -t
 none

---
 content/html/document/src/nsHTMLDocument.cpp  | 52 -------------------
 dom/interfaces/html/nsIDOMNSHTMLDocument.idl  |  4 +-
 dom/locales/en-US/chrome/dom/dom.properties   |  2 -
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  2 -
 .../hudservice/tests/browser/Makefile.in      |  2 -
 ...ebconsole_bug_595934_message_categories.js |  6 +--
 .../test-bug-595934-dom-events-external.html  | 15 ------
 .../test-bug-595934-dom-events-external.js    |  9 ----
 8 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.html
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.js

diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 148bcc72facc..af2c5284987c 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -2319,58 +2319,6 @@ nsHTMLDocument::GetNumFormsSynchronous()
   return mNumForms;
 }
 
-nsresult
-nsHTMLDocument::GetBodySize(PRInt32* aWidth,
-                            PRInt32* aHeight)
-{
-  *aWidth = *aHeight = 0;
-
-  FlushPendingNotifications(Flush_Layout);
-
-  // Find the <body> element: this is what we'll want to use for the
-  // document's width and height values.
-  Element* body = GetBodyElement();
-  if (!body) {
-    return NS_OK;
-  }
-
-  // Now grab its frame
-  nsIFrame* frame = body->GetPrimaryFrame();
-  if (!frame)
-    return NS_OK;
-  
-  nsSize size = frame->GetSize();
-
-  *aWidth = nsPresContext::AppUnitsToIntCSSPixels(size.width);
-  *aHeight = nsPresContext::AppUnitsToIntCSSPixels(size.height);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetWidth(PRInt32* aWidth)
-{
-  NS_ENSURE_ARG_POINTER(aWidth);
-  if (!mWarnedWidthHeight) {
-    ReportUseOfDeprecatedMethod(this, "UseOfDocumentWidthWarning");
-    mWarnedWidthHeight = true;
-  }
-  PRInt32 height;
-  return GetBodySize(aWidth, &height);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetHeight(PRInt32* aHeight)
-{
-  NS_ENSURE_ARG_POINTER(aHeight);
-  if (!mWarnedWidthHeight) {
-    ReportUseOfDeprecatedMethod(this, "UseOfDocumentHeightWarning");
-    mWarnedWidthHeight = true;
-  }
-  PRInt32 width;
-  return GetBodySize(&width, aHeight);
-}
-
 NS_IMETHODIMP
 nsHTMLDocument::GetAlinkColor(nsAString& aAlinkColor)
 {
diff --git a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
index 845a45af75ad..24ca60fd88b1 100644
--- a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
@@ -39,11 +39,9 @@
 
 #include "domstubs.idl"
 
-[scriptable, uuid(95cd5ad4-ae8a-4f0e-b168-35e03d5e0b9a)]
+[scriptable, uuid(386e9eee-1f06-40a6-a1a7-ed986646b793)]
 interface nsIDOMNSHTMLDocument : nsISupports
 {
-  readonly attribute long                 width;
-  readonly attribute long                 height;
            attribute DOMString            alinkColor;
            attribute DOMString            linkColor;
            attribute DOMString            vlinkColor;
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
index 7ea6f0e14e07..a0719a69751d 100644
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -75,5 +75,3 @@ FormValidationInvalidURL=Please enter a URL.
 FormValidationPatternMismatch=Please match the requested format.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
-UseOfDocumentWidthWarning=Non-standard document.width was used. Use standard document.body.clientWidth instead.
-UseOfDocumentHeightWarning=Non-standard document.height was used. Use standard document.body.clientHeight instead.
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 7aa9f5810aa6..469d1b4625bc 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -329,8 +329,6 @@ members = [
     'nsIDOMHTMLCanvasElement.height',
     'nsIDOMHTMLCanvasElement.getContext',
     'nsIDOMHTMLCanvasElement.toDataURL',
-    'nsIDOMNSHTMLDocument.width',
-    'nsIDOMNSHTMLDocument.height',
     'nsIDOMNSHTMLDocument.domain',
     'nsIDOMNSHTMLDocument.getSelection',
     'nsIDOMNSHTMLDocument.designMode',
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 87dd39e2d23a..319148f74bb3 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -165,8 +165,6 @@ _BROWSER_TEST_PAGES = \
 	test-bug-595934-workers.js \
 	test-bug-595934-dom-html-external.html \
 	test-bug-595934-dom-html-external.js \
-	test-bug-595934-dom-events-external.html \
-	test-bug-595934-dom-events-external.js \
 	test-bug-595934-dom-events-external2.html \
 	test-bug-595934-dom-events-external2.js \
 	test-bug-595934-canvas.html \
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
index 4710edf02309..d0e7173009f6 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
@@ -59,11 +59,7 @@ const TESTS = [
     category: "DOM:HTML",
     matchString: "document.all",
   },
-  { // #9
-    file: "test-bug-595934-dom-events-external.html",
-    category: "DOM Events",
-    matchString: "clientWidth",
-  },
+  // #9 was a warning about document.width, for which support has been removed.
   { // #10
     file: "test-bug-595934-dom-events-external2.html",
     category: "DOM Events",
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.html b/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.html
deleted file mode 100644
index 6d3299e102bd..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Web Console test for bug 595934 - category: DOM Events.
-      (external script)</title>
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript"
-      src="test-bug-595934-dom-events-external.js"></script>
-  </head>
-  <body>
-    <p>Web Console test for bug 595934 - category "DOM Events" (external
-    script).</p>
-  </body>
-</html>
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.js b/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.js
deleted file mode 100644
index dd9694b07f74..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-window.addEventListener("DOMContentLoaded", function() {
-  document.width;
-}, false);
-

From 503a7a8fb80e40034264fcfc67f80c51be32a67d Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Sun, 17 Apr 2011 15:49:47 +0200
Subject: [PATCH 254/509] Bug 607544 - Remove DDRAW junk from configure, missed
 part; (Av1a) Missed cleanup, s/if/case/. r=ted.mielczarek.

---
 build/wince/tools/Makefile    |  1 -
 build/wince/tools/linkargs.c  |  1 -
 build/wince/tools/toolspath.c |  4 ++--
 build/wince/tools/toolspath.h |  2 --
 config/autoconf.mk.in         |  3 ---
 configure.in                  | 32 +++++++++++++-------------------
 toolkit/library/Makefile.in   |  3 ---
 7 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/build/wince/tools/Makefile b/build/wince/tools/Makefile
index 212df83b3e45..fdfc61d22ad7 100644
--- a/build/wince/tools/Makefile
+++ b/build/wince/tools/Makefile
@@ -72,7 +72,6 @@ endif
 CFLAGS += \
   -DVC_PATH='"$(subst \,\\,$(VCINSTALLDIR))\\"' \
   -DWM_SDK_PATH='"$(subst \,\\,$(WINCE_SDK_DIR))\\"' \
-  -DOGLES_SDK_PATH='"$(subst \,\\,$(OGLES_SDK_DIR))\\"' \
   -DMOZCE_DEVENV='"$(MOZCE_DEVENV)"' \
   -DTOPSRCDIR='"$(TOPSRCDIR)"' \
   $(NULL)
diff --git a/build/wince/tools/linkargs.c b/build/wince/tools/linkargs.c
index c7cc5614f3b8..f60844f90300 100644
--- a/build/wince/tools/linkargs.c
+++ b/build/wince/tools/linkargs.c
@@ -24,7 +24,6 @@ void addLinkArgs(int k, int s, int *i, int *j, char** args, char** argv) {
   args[(*i)++] = "/LIBPATH:\"" WCE_LIB "\"";
   args[(*i)++] = "/LIBPATH:\"" WCE_CRT "\"";
   args[(*i)++] = "/LIBPATH:\"" ATL_LIB "\"";
-  args[(*i)++] = "/LIBPATH:\"" OGLES_SDK_LIB "\"";
   args[(*i)++] = "/NODEFAULTLIB";
 
   args[(*i)++] = "/MAP";
diff --git a/build/wince/tools/toolspath.c b/build/wince/tools/toolspath.c
index 3e771f47c806..f701777aff46 100644
--- a/build/wince/tools/toolspath.c
+++ b/build/wince/tools/toolspath.c
@@ -199,8 +199,8 @@ DWORD run(char** args)
  _putenv("LIBPATH=");
  _putenv("CC=");
 
- _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" OGLES_SDK_INC ";" WCE_INC);
- _putenv("LIB=" WCE_LIB ";" OGLES_SDK_LIB ";" WCE_CRT);
+ _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" WCE_INC);
+ _putenv("LIB=" WCE_LIB ";" WCE_CRT);
 
  i = strlen(args[0]);
  for (j=0; j<i; j++)
diff --git a/build/wince/tools/toolspath.h b/build/wince/tools/toolspath.h
index 69339080f2c7..b3d0765b3093 100644
--- a/build/wince/tools/toolspath.h
+++ b/build/wince/tools/toolspath.h
@@ -5,8 +5,6 @@
 #include <stdio.h>
 #include <process.h>
 
-#define OGLES_SDK_INC  OGLES_SDK_PATH "inc"
-#define OGLES_SDK_LIB  OGLES_SDK_PATH "lib\\wince\\nvap\\release"
 #define WCE_BIN    VC_PATH "ce\\bin\\x86_arm\\"
 #define WCE_RC_BIN WIN_SDK_PATH  "bin\\"
 #define WCE_CRT    VC_PATH "ce\\lib\\armv4i"
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index c3b36803bbb4..6e1b39b93d87 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -660,12 +660,9 @@ MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 WINCE		= @WINCE@
 WINCE_SDK_DIR   = @WINCE_SDK_DIR@
-OGLES_SDK_DIR   = @OGLES_SDK_DIR@
 
 WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
-HAS_OGLES = @HAS_OGLES@
-
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
 MOZ_PLATFORM_MAEMO = @MOZ_PLATFORM_MAEMO@
diff --git a/configure.in b/configure.in
index f9a54ac00425..309037fb816d 100644
--- a/configure.in
+++ b/configure.in
@@ -366,11 +366,6 @@ case "$target" in
                           The path to the Windows CE SDK],
     WINCE_SDK_DIR=$withval)
 
-    MOZ_ARG_WITH_STRING(ogles-sdk,
-    [  --with-ogles-sdk=OGLES_SDK_DIR
-                          The path to the OGLES SDK],
-    OGLES_SDK_DIR=$withval)
-
     AC_DEFINE(WINCE)
     
     export WINCE=1
@@ -384,9 +379,9 @@ case "$target" in
 
     _pwd=`pwd -W`
     _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
-    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" \
-    TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
-    -C $srcdir/build/wince/tools
+    make WINCE_SDK_DIR="$WINCE_SDK_DIR" \
+         TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
+         -C $srcdir/build/wince/tools
 
     CC="$_pwd/dist/sdk/bin/$target-gcc.exe"
     CXX="$_pwd/dist/sdk/bin/$target-gcc.exe"
@@ -8604,15 +8599,16 @@ if test "$MOZ_TREE_CAIRO"; then
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="$FT2_CFLAGS"
     fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
+    case "$MOZ_WIDGET_TOOLKIT" in
+      qt)
         QT_SURFACE_FEATURE="#define CAIRO_HAS_QT_SURFACE 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+        ;;
+      cocoa)
         QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
         QUARTZ_IMAGE_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1"
         QUARTZ_FONT_FEATURE="#define CAIRO_HAS_QUARTZ_FONT 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
+        ;;
+      windows)
         WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
         if test -z "$WINCE"; then
             WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
@@ -8637,15 +8633,15 @@ if test "$MOZ_TREE_CAIRO"; then
         if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
           MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
         fi
-
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
+        ;;
+      os2)
         OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1"
         FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include"
         CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
-    fi
+        ;;
+    esac
     if test "$USE_FC_FREETYPE"; then
         FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1"
     fi
@@ -8655,7 +8651,6 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_SUBST(MOZ_ENABLE_D3D9_LAYER)
     AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
     AC_SUBST(CAIRO_FT_CFLAGS)
-    AC_SUBST(HAS_OGLES)
 
     if test "$MOZ_DEBUG"; then
       SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
@@ -9041,7 +9036,6 @@ AC_SUBST(MOZ_OS2_TOOLS)
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
-AC_SUBST(OGLES_SDK_DIR)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 2d6ffa962e9c..dacf2dad82dc 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -233,9 +233,6 @@ OS_LIBS += $(call EXPAND_LIBNAME, ceosutil libcmt comsuppw)
 ifdef WINCE_WINDOWS_MOBILE
 OS_LIBS += $(call EXPAND_LIBNAME, cellcore)
 endif
-ifdef HAS_OGLES
-OS_LIBS += $(call EXPAND_LIBNAME, libGLESv2 libEGL)
-endif
 endif
 
 ifdef MOZ_JPROF

From ea14397c3c02370e9d6a76dfe25a695f7919c926 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Sun, 17 Apr 2011 16:47:19 +0200
Subject: [PATCH 255/509] Bug 605701 - Make WIN32_REDIST_DIR support stricter
 and more explicit; (Av1a) Just do it. r=benjamin.

---
 build/win32/Makefile.in |  7 ++++---
 configure.in            | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index c1ad29234c27..a52de81469f4 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -58,10 +58,11 @@ PROGRAM = crashinject$(BIN_SUFFIX)
 USE_STATIC_LIBS = 1
 CPPSRCS = crashinject.cpp
 
-endif
+endif # ENABLE_TESTS
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_MEMORY
 ifdef WIN32_REDIST_DIR
 
 ifeq (1400,$(_MSC_VER))
@@ -89,11 +90,11 @@ REDIST_FILES = \
 	$(NULL)
 endif
 
-endif
-
 ifdef REDIST_FILES
 libs::
 	mkdir -p $(FINAL_TARGET)
 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
 endif
 
+endif # WIN32_REDIST_DIR
+endif # ! MOZ_MEMORY
diff --git a/configure.in b/configure.in
index 309037fb816d..3712d6a61df7 100644
--- a/configure.in
+++ b/configure.in
@@ -681,7 +681,10 @@ case "$target" in
         AC_DEFINE(HAVE_SEH_EXCEPTIONS)
 
         if test -n "$WIN32_REDIST_DIR"; then
-            WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd`
+          if test ! -d "$WIN32_REDIST_DIR"; then
+            AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}])
+          fi
+          WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd`
         fi
 
         dnl Ensure that mt.exe is 'Microsoft (R) Manifest Tool',
@@ -7434,8 +7437,15 @@ if test "$NS_TRACE_MALLOC"; then
     MOZ_MEMORY=
 fi
 
-if test "$MOZ_MEMORY"; then
-
+if test -z "$MOZ_MEMORY"; then
+  case "${target}" in
+    *-mingw*)
+      if test -z "$WIN32_REDIST_DIR"; then
+        AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
+      fi
+      ;;
+  esac
+else
   dnl Don't try to run compiler tests on Windows  
   if test "$OS_ARCH" = "WINNT"; then
     if test -z "$HAVE_64BIT_OS"; then
@@ -7549,7 +7559,7 @@ if test "$MOZ_MEMORY"; then
     AC_DEFINE(HAVE_JEMALLOC_POSIX_MEMALIGN)
     AC_DEFINE(HAVE_JEMALLOC_MEMALIGN)
   fi
-fi
+fi # MOZ_MEMORY
 AC_SUBST(MOZ_MEMORY)
 AC_SUBST(MOZ_MEMORY_LDFLAGS)
 AC_SUBST(WIN32_CRT_SRC_DIR)

From 5ecf181a61bb45c667f8104638e6afef95a33e06 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Sun, 17 Apr 2011 16:47:37 +0200
Subject: [PATCH 256/509] Bug 605701 - Make WIN32_REDIST_DIR support stricter
 and more explicit; (Cv1-JS) Remove useless WIN32_REDIST_DIR support.
 r=ted.mielczarek.

---
 js/src/config/autoconf.mk.in | 1 -
 js/src/configure.in          | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 03c77d7fed68..102b38d5307e 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -316,7 +316,6 @@ MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
 MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
 MOZ_QUANTIFY	= @MOZ_QUANTIFY@
 MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
-WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
 MOZ_MEMORY_LDFLAGS = @MOZ_MEMORY_LDFLAGS@
 
 # Codesighs tools option, enables win32 mapfiles.
diff --git a/js/src/configure.in b/js/src/configure.in
index cb955826e2e4..6b6878096527 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -674,10 +674,6 @@ case "$target" in
         _MOZ_EXCEPTIONS_FLAGS_ON='-EHsc'
         _MOZ_EXCEPTIONS_FLAGS_OFF=''
 
-        if test -n "$WIN32_REDIST_DIR"; then
-            WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd`
-        fi
-
         dnl Ensure that mt.exe is 'Microsoft (R) Manifest Tool',
         dnl not something else like "magnetic tape manipulation utility".
         MSMT_TOOL=`mt 2>&1|grep 'Microsoft (R) Manifest Tool'`
@@ -5696,7 +5692,6 @@ dnl win32 options
 AC_SUBST(MOZ_MAPINFO)
 AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(MOZ_TOOLS_DIR)
-AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(PYTHON)
 
 AC_SUBST(WINCE)

From 2759ff18ea1f5939cc0eb9e496b04d09b6062cdd Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 19:39:34 -0400
Subject: [PATCH 257/509] Bug 649012 - Fix some flaky mochitests which rely on
 non-zero timeout values; rs=ted

---
 content/base/test/chrome/test_bug430050.xul     |  2 +-
 content/base/test/file_bug503473-frame.sjs      |  2 +-
 content/base/test/test_bug300992.html           |  4 ++--
 content/base/test/test_bug343596.html           |  2 +-
 content/base/test/test_bug513194.html           |  2 +-
 docshell/test/navigation/NavigationUtils.js     |  2 +-
 editor/libeditor/text/tests/test_bug527935.html | 12 ++++++++++--
 extensions/cookie/test/file_testloadflags.js    |  2 +-
 8 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/content/base/test/chrome/test_bug430050.xul b/content/base/test/chrome/test_bug430050.xul
index 9616fe8631cc..242f9d04a778 100644
--- a/content/base/test/chrome/test_bug430050.xul
+++ b/content/base/test/chrome/test_bug430050.xul
@@ -38,10 +38,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430050
           document.getElementById('b').loadURI('data:text/plain,succeeded',
                                                null,
                                                'UTF-8');
+          setTimeout(endTest, 0);
         }
       }, true);
     document.documentElement.setAttribute("foo", "bar");
-    setTimeout(endTest, 100);
   }
   
   SimpleTest.waitForExplicitFinish();
diff --git a/content/base/test/file_bug503473-frame.sjs b/content/base/test/file_bug503473-frame.sjs
index 1d5fe02959cb..5a78292fb4c3 100644
--- a/content/base/test/file_bug503473-frame.sjs
+++ b/content/base/test/file_bug503473-frame.sjs
@@ -13,7 +13,7 @@ function handleRequest(request, response) {
     '  parent.done();' +
     '  document.close();' +
     '}' +
-    'setTimeout(doWrite, 1);' +
+    'setTimeout(doWrite, 0);' +
     '</script>' 
   );
 
diff --git a/content/base/test/test_bug300992.html b/content/base/test/test_bug300992.html
index 97d727c52ed0..c2270f547fd7 100644
--- a/content/base/test/test_bug300992.html
+++ b/content/base/test/test_bug300992.html
@@ -35,10 +35,10 @@ document.addEventListener('readystatechange', function(event) {
 window.addEventListener('readystatechange', function(event) {
   ok(false, 'window listener', 'readystatechange event should not bubble to window');
 }, false);
-setTimeout(function() {
+addLoadEvent(function() {
   is(i, states.length, 'readystatechange event count');
   SimpleTest.finish();
-}, 1000);
+});
 
 </script>
 </pre>
diff --git a/content/base/test/test_bug343596.html b/content/base/test/test_bug343596.html
index f52e2f56ddca..c7796a15bc59 100644
--- a/content/base/test/test_bug343596.html
+++ b/content/base/test/test_bug343596.html
@@ -40,7 +40,7 @@ catch(ex){
 setTimeout(function(){
 ok(true,"setTimeout still executes after bogus script insertion"); 
 window.error = errorHandler;
-SimpleTest.finish();}, 200);
+SimpleTest.finish();}, 0);
 
 
 
diff --git a/content/base/test/test_bug513194.html b/content/base/test/test_bug513194.html
index 1476bf86df90..be1c5ca2a357 100644
--- a/content/base/test/test_bug513194.html
+++ b/content/base/test/test_bug513194.html
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=513194
     consoleListener.finish();
     consoleService.unregisterListener(consoleListener);
   }
-  setTimeout(done, 1);
+  setTimeout(done, 0);
 </script>
 </pre>
 </body>
diff --git a/docshell/test/navigation/NavigationUtils.js b/docshell/test/navigation/NavigationUtils.js
index d0baf963e6ba..cb3bcaea82ac 100644
--- a/docshell/test/navigation/NavigationUtils.js
+++ b/docshell/test/navigation/NavigationUtils.js
@@ -189,7 +189,7 @@ function xpcWaitForFinishedFrames(callback, numFrames) {
 
     if (finishedFrameCount == numFrames) {
       clearInterval(frameWaitInterval);
-      setTimeout(callback, 1);
+      setTimeout(callback, 0);
       return;
     }
 
diff --git a/editor/libeditor/text/tests/test_bug527935.html b/editor/libeditor/text/tests/test_bug527935.html
index e811867bf316..9b09fa47d8d6 100644
--- a/editor/libeditor/text/tests/test_bug527935.html
+++ b/editor/libeditor/text/tests/test_bug527935.html
@@ -48,11 +48,11 @@ SimpleTest.waitForFocus(function() {
       newInput.focus();
       newInput.dispatchEvent(event);
 
-      setTimeout(function() {
+      hitEventLoop(function() {
         ok(!popupShown, "Popup must not be opened");
         SpecialPowers.removeAutoCompletePopupEventListener(window, listener);
         SimpleTest.finish();
-      }, 1000);
+      }, 100);
     }, 0);
   }, false);
 
@@ -61,6 +61,14 @@ SimpleTest.waitForFocus(function() {
   synthesizeKey("VK_ENTER", {});
 });
 
+function hitEventLoop(func, times) {
+  if (times > 0) {
+    setTimeout(hitEventLoop, 0, func, times - 1);
+  } else {
+    setTimeout(func, 0);
+  }
+}
+
 </script>
 </pre>
 </body>
diff --git a/extensions/cookie/test/file_testloadflags.js b/extensions/cookie/test/file_testloadflags.js
index 84507f4ae674..56e0cdf9f1e6 100644
--- a/extensions/cookie/test/file_testloadflags.js
+++ b/extensions/cookie/test/file_testloadflags.js
@@ -179,5 +179,5 @@ function runTest() {
   is(count, gExpectedCookies, "total number of cookies");
   cs.removeAll();
 
-  setTimeout(finishTest, 5000);
+  finishTest();
 }

From 2bf02f16c0afe86926bd29266afa7e4584f09a83 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Apr 2011 18:48:39 -0400
Subject: [PATCH 258/509] Bug 355178 - Raise the maximum spell checked word
 length to 130 letters; r=smaug

--HG--
extra : rebase_source : e2ac56d2e1729124ccf2df21dc97c30903e2164c
---
 extensions/spellcheck/src/mozSpellChecker.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/spellcheck/src/mozSpellChecker.cpp b/extensions/spellcheck/src/mozSpellChecker.cpp
index 43105e9d1b11..ee79054c5956 100644
--- a/extensions/spellcheck/src/mozSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozSpellChecker.cpp
@@ -41,7 +41,9 @@
 #include "nsICategoryManager.h"
 #include "nsISupportsPrimitives.h"
 
-#define UNREASONABLE_WORD_LENGTH 64
+// The number 130 more or less comes out of thin air.
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=355178#c78 for a pseudo-rationale.
+#define UNREASONABLE_WORD_LENGTH 130
 
 #define DEFAULT_SPELL_CHECKER "@mozilla.org/spellchecker/engine;1"
 

From d023a5084593823dc1b7194bef6ede3389ee1e05 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Apr 2011 18:48:39 -0400
Subject: [PATCH 259/509] Bug 355178 - Part 3: Work around the reftest failure
 by turning spell checker off; r=roc

--HG--
extra : rebase_source : cb826c804267df18f3aaceaa38c48e2334b7fb89
---
 layout/reftests/text/wordwrap-02.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/reftests/text/wordwrap-02.html b/layout/reftests/text/wordwrap-02.html
index 421e67cf4456..8dcac75ecb9f 100644
--- a/layout/reftests/text/wordwrap-02.html
+++ b/layout/reftests/text/wordwrap-02.html
@@ -17,6 +17,7 @@ textarea {
   <title>Test Wordwrap</title>
  </head>
  <body>
-  <textarea rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوعةكل,تمبوابةاقتصاديةهذه.ضمنهاالروسوحرمانبلعدد,يكنجسيمةلإعادةلم.يكنوالحلفاءبالقنابلهو,بحثخسائرالدفاعبالهجومعن.فرنسيةمارشالبينيتودحرثم,وصلبشريةالرايخبالحربتم.</textarea>
+  <!-- spellcheck="false" added as a workaround to our maximum length of words for the spell checker -->
+  <textarea spellcheck="false" rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوعةكل,تمبوابةاقتصاديةهذه.ضمنهاالروسوحرمانبلعدد,يكنجسيمةلإعادةلم.يكنوالحلفاءبالقنابلهو,بحثخسائرالدفاعبالهجومعن.فرنسيةمارشالبينيتودحرثم,وصلبشريةالرايخبالحربتم.</textarea>
  </body>
 </html>

From bcc407039e8e7abf2db4c0e4b4a74a221982cda2 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Apr 2011 18:49:12 -0400
Subject: [PATCH 260/509] Bug 650410 - Test for bug 383369 uses a timeout
 because it doesn't know how to use the download manager API!; r=sdwilsh

--HG--
extra : rebase_source : 36445f348b0909f9c9cecdc3a12f3a8ef187f6b7
---
 .../mixedcontent/test_bug383369.html          | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
index eb60b95aac66..2d6a01e93c35 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html
@@ -48,13 +48,31 @@
     var downloadManager = Components.classes["@mozilla.org/download-manager;1"]
       .getService(Components.interfaces.nsIDownloadManager);
     var theWindow = window;
-    window.setTimeout(function()
-    {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      downloadManager.cleanUp();
-      theWindow.location = "bug383369step2.html";
-    }, 3000);
-  
+    var observer = {
+      observe: function(subject, topic, data) {
+        switch (topic) {
+        case "dl-done":
+        case "dl-failed":
+        case "dl-blocked":
+        case "dl-dirty":
+          netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          downloadManager.cleanUp();
+          theWindow.location = "bug383369step2.html";
+          observerService.removeObserver(this, "dl-done");
+          observerService.removeObserver(this, "dl-failed");
+          observerService.removeObserver(this, "dl-blocked");
+          observerService.removeObserver(this, "dl-dirty");
+          break;
+        }
+      }
+    };
+    var observerService = Components.classes["@mozilla.org/observer-service;1"]
+      .getService(Components.interfaces.nsIObserverService);
+    observerService.addObserver(observer, "dl-done", false);
+    observerService.addObserver(observer, "dl-failed", false);
+    observerService.addObserver(observer, "dl-blocked", false);
+    observerService.addObserver(observer, "dl-dirty", false);
+
     window.location = "download.auto";
   }
 

From c91dde16ae7fd34f10c9767561aaa7bf5cf606e0 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 19:39:34 -0400
Subject: [PATCH 261/509] Bug 649012 - Fix some flaky mochitests which rely on
 non-zero timeout values; rs=ted

--HG--
extra : rebase_source : 88fc16ca38ded79ca87bb861dc4cef92a69dd548
---
 content/html/content/test/test_bug587469.html |  5 ++++-
 content/xul/document/test/test_bug583948.xul  | 20 +++++++++----------
 .../xpconnect/tests/chrome/test_bug596580.xul |  2 +-
 .../base/tests/chrome/test_bug396367-1.html   |  2 +-
 .../base/tests/chrome/test_bug396367-2.html   |  2 +-
 ...t_leaf_layers_partition_browser_window.xul |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/content/html/content/test/test_bug587469.html b/content/html/content/test/test_bug587469.html
index 748b4afeb7c4..5bd97e96e44b 100644
--- a/content/html/content/test/test_bug587469.html
+++ b/content/html/content/test/test_bug587469.html
@@ -29,7 +29,10 @@ function finish() {
 }
 SimpleTest.waitForFocus(function() {
   synthesizeMouse(document.getElementsByTagName("img")[0], 50, 50, {});
-  setTimeout(finish, 50); // Sorry!
+  // Hit the event loop twice before doing the test
+  setTimeout(function() {
+    setTimeout(finish, 0);
+  }, 0);
 });
 
 
diff --git a/content/xul/document/test/test_bug583948.xul b/content/xul/document/test/test_bug583948.xul
index 630eb0e5f4dd..140ff88da6a9 100644
--- a/content/xul/document/test/test_bug583948.xul
+++ b/content/xul/document/test/test_bug583948.xul
@@ -18,24 +18,24 @@ SimpleTest.waitForExplicitFinish();
 var attempts = 0;
 
 function update() {
-  setTimeout(function() {
-    if (otherWindow.location)
-      otherWindow.location.reload()
-    }, 1);
-  otherWindow.document.commandDispatcher.updateCommands('');
   // without the crash fix, this usually crashes after 2 to 4 reloads
   if (++attempts == 6) {
     ok(true, "didn't crash after 6 attempts");
     otherWindow.close();
-    SimpleTest.finish();
-  }
-  else {
-    setTimeout(update, 100);
+    SimpleTest.waitForFocus(function() {
+      SimpleTest.finish();
+    });
+  } else {
+    SimpleTest.waitForFocus(function() {
+      otherWindow.location.reload()
+      SimpleTest.waitForFocus(update, otherWindow);
+    });
+    otherWindow.document.commandDispatcher.updateCommands('');
   }
 }
 
 var otherWindow = window.open("window_bug583948.xul", "_new", "chrome");
-setTimeout(update, 100);
+SimpleTest.waitForFocus(update, otherWindow);
 </script>
 
 </window>
diff --git a/js/src/xpconnect/tests/chrome/test_bug596580.xul b/js/src/xpconnect/tests/chrome/test_bug596580.xul
index 7b8c6b6939fa..9e5074ac9399 100644
--- a/js/src/xpconnect/tests/chrome/test_bug596580.xul
+++ b/js/src/xpconnect/tests/chrome/test_bug596580.xul
@@ -42,7 +42,7 @@
     Test.include("notfound.js");
 
     // If init is called directly, it works.
-    setTimeout('init();', 10);
+    setTimeout('init();', 0);
 
     SimpleTest.waitForExplicitFinish();
 
diff --git a/layout/base/tests/chrome/test_bug396367-1.html b/layout/base/tests/chrome/test_bug396367-1.html
index fc4ded7fa167..40fc1111ffa7 100644
--- a/layout/base/tests/chrome/test_bug396367-1.html
+++ b/layout/base/tests/chrome/test_bug396367-1.html
@@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396367
 var docviewer = getdocviewer();
 docviewer.textZoom=Math.floor(10*Math.random())/4+0.2;
 document.documentElement.offsetHeight;
-setTimeout(finish,10);
+setTimeout(finish, 0);
 </script>
 
 
diff --git a/layout/base/tests/chrome/test_bug396367-2.html b/layout/base/tests/chrome/test_bug396367-2.html
index 9e2da9777cad..45d87a293a56 100644
--- a/layout/base/tests/chrome/test_bug396367-2.html
+++ b/layout/base/tests/chrome/test_bug396367-2.html
@@ -47,7 +47,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396367
 var docviewer = getdocviewer();
 docviewer.textZoom=Math.floor(10*Math.random())/4+0.2;
 document.documentElement.offsetHeight;
-setTimeout(finish,10);
+setTimeout(finish, 0);
 </script>
 </li>
 </div>
diff --git a/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul b/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
index f2f9db61ac42..4ae2a261c020 100644
--- a/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
+++ b/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
@@ -37,7 +37,7 @@
         if (win.mozPaintCount == initialCount) {
           is(win.mozPaintCount, initialCount, "Waiting for mozPaintCount to increase.");
           // Do not use SimpleTest.executeSoon() here: give a little more time.
-          setTimeout(nextStep, 25);
+          setTimeout(nextStep, 0);
           return;
         }
 

From 3901838fe17cfa9971acf5ab7a3fc26fce80e87f Mon Sep 17 00:00:00 2001
From: Graeme McCutcheon <graememcc_firefox@graeme-online.co.uk>
Date: Sun, 17 Apr 2011 17:39:18 +0100
Subject: [PATCH 262/509] Bug 640302 - Some addon manager tests depended on a
 specific date format and failed in some locales. r=dtownsend

---
 .../extensions/test/browser/browser_details.js        |  4 ++--
 .../mozapps/extensions/test/browser/browser_list.js   |  6 +++---
 toolkit/mozapps/extensions/test/browser/head.js       | 11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index cfad88b7af3f..44275339650b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -265,7 +265,7 @@ add_test(function() {
     is_element_hidden(get("detail-contrib-suggested"), "Contributions amount should be hidden");
 
     is_element_visible(get("detail-dateUpdated"), "Update date should not be hidden");
-    is(Date.parse(get("detail-dateUpdated").value), gDate.getTime(), "Update date should be correct");
+    is(get("detail-dateUpdated").value, formatDate(gDate), "Update date should be correct");
 
     is_element_hidden(get("detail-rating-row"), "Rating should be hidden");
 
@@ -312,7 +312,7 @@ add_test(function() {
     is_element_hidden(get("detail-contributions"), "Contributions section should be hidden");
 
     is_element_visible(get("detail-dateUpdated"), "Update date should not be hidden");
-    is(Date.parse(get("detail-dateUpdated").value), gDate.getTime(), "Update date should be correct");
+    is(get("detail-dateUpdated").value, formatDate(gDate), "Update date should be correct");
 
     is_element_visible(get("detail-rating-row"), "Rating row should not be hidden");
     is_element_hidden(get("detail-rating"), "Rating should be hidden");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/extensions/test/browser/browser_list.js
index 41293921be4f..532261e325f0 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_list.js
@@ -135,7 +135,7 @@ add_test(function() {
     is(get_node(addon, "description").value, "A test add-on", "Description should be correct");
     is_element_hidden(get_class_node(addon, "disabled-postfix"), "Disabled postfix should be hidden");
     is_element_hidden(get_class_node(addon, "update-postfix"), "Update postfix should be hidden");
-    is(Date.parse(get_node(addon, "date-updated").value), gDate.getTime(), "Update date should be correct");
+    is(get_node(addon, "date-updated").value, formatDate(gDate), "Update date should be correct");
 
     is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
     is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
@@ -370,7 +370,7 @@ add_test(function() {
       is(get_node(addon, "description").value, "A test add-on", "Description should be correct");
       is_element_hidden(get_class_node(addon, "disabled-postfix"), "Disabled postfix should be hidden");
       is_element_hidden(get_class_node(addon, "update-postfix"), "Update postfix should be hidden");
-      is(Date.parse(get_node(addon, "date-updated").value), gDate.getTime(), "Update date should be correct");
+      is(get_node(addon, "date-updated").value, formatDate(gDate), "Update date should be correct");
 
       is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
       is_element_visible(get_node(addon, "enable-btn"), "Enable button should be visible");
@@ -573,7 +573,7 @@ add_test(function() {
   is(get_node(addon, "description").value, "A test add-on with a new description", "Description should be correct");
   is_element_hidden(get_class_node(addon, "disabled-postfix"), "Disabled postfix should be hidden");
   is_element_hidden(get_class_node(addon, "update-postfix"), "Update postfix should be hidden");
-  is(Date.parse(get_node(addon, "date-updated").value), gDate.getTime(), "Update date should be correct");
+  is(get_node(addon, "date-updated").value, formatDate(gDate), "Update date should be correct");
 
   is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
   is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
index ac0ec7bd0140..b1a733c585f6 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -326,6 +326,17 @@ function get_string(aName) {
   return bundle.formatStringFromName(aName, args, args.length);
 }
 
+function formatDate(aDate) {
+  return Cc["@mozilla.org/intl/scriptabledateformat;1"]
+           .getService(Ci.nsIScriptableDateFormat)
+           .FormatDate("",
+                       Ci.nsIScriptableDateFormat.dateFormatLong,
+                       aDate.getFullYear(),
+                       aDate.getMonth() + 1,
+                       aDate.getDate()
+                       );
+}
+
 function is_hidden(aElement) {
   var style = aElement.ownerDocument.defaultView.getComputedStyle(aElement, "");
   if (style.display == "none")

From 1763b4ce4a918cf6933140d3e9283cf08cf4f460 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 22:05:35 -0700
Subject: [PATCH 263/509] Remove the fails-if(Android) annotation on some
 reftests that actually do pass on Android

---
 layout/reftests/font-face/reftest.list     | 2 +-
 layout/reftests/font-features/reftest.list | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list
index b7d3d06ce17b..4d843717448e 100644
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -104,7 +104,7 @@ HTTP(..) == load-badfullname.html load-badfullname-ref.html
 HTTP(..) != 507960-1-nofont.html 507960-1-ref.html
 # check that the WOFF version loads, with and without a format hint
 HTTP(..) == 507960-1-woff.html 507960-1-ref.html
-fails-if(Android) HTTP(..) == 507960-1-woff-hint.html 507960-1-ref.html
+HTTP(..) == 507960-1-woff-hint.html 507960-1-ref.html
 # try damaged fonts that should still load (bad checksums)
 HTTP(..) == 507960-1-bad-checksums-ttf.html 507960-1-ref.html
 HTTP(..) == 507960-1-bad-checksums-woff.html 507960-1-ref.html
diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list
index e2425b4c4595..9722499428fa 100644
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -7,13 +7,13 @@
 
 # check that Turkish language causes a change in rendering (no fi ligature)
 # (also works via Pango)
-fails-if(Android) HTTP(..) != font-features-turkish.html font-features-ref.html
+HTTP(..) != font-features-turkish.html font-features-ref.html
 
 # check that disabling ligatures causes a change
-fails-if(Android) HTTP(..) != font-features-noliga.html font-features-ref.html
+HTTP(..) != font-features-noliga.html font-features-ref.html
 
 # check that enabling optional ligatures causes a change
-fails-if(Android) HTTP(..) != font-features-hlig.html font-features-ref.html
+HTTP(..) != font-features-hlig.html font-features-ref.html
 
 # compare Turkish rendering with reference using ZWNJ to break the ligature
 # (also works via Pango)

From b87062b8a4427bf3ac06abbe8d46c372b87f9c77 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 23:01:25 -0700
Subject: [PATCH 264/509] Bug 650589 - Annotate
 layout/reftests/image-element/element-paint-native-widget.html as failing on
 Android, since it does

---
 layout/reftests/image-element/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/image-element/reftest.list b/layout/reftests/image-element/reftest.list
index a001b0ea79d8..c102c43c890c 100644
--- a/layout/reftests/image-element/reftest.list
+++ b/layout/reftests/image-element/reftest.list
@@ -16,7 +16,7 @@ random-if(d2d) == element-paint-transform-02.html element-paint-transform-02-ref
 == element-paint-background-size-02.html element-paint-background-size-02-ref.html
 == element-paint-transform-repeated.html element-paint-transform-repeated-ref.html
 == element-paint-transform-03.html element-paint-transform-03-ref.html
-== element-paint-native-widget.html element-paint-native-widget-ref.html
+fails-if(Android) == element-paint-native-widget.html element-paint-native-widget-ref.html # bug 650589
 == element-paint-subimage-sampling-restriction.html about:blank
 == element-paint-clippath.html element-paint-clippath-ref.html
 == element-paint-sharpness-01a.html element-paint-sharpness-01b.html

From 045781138a95cccdc29c6737038decd6d6a538eb Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 23:01:30 -0700
Subject: [PATCH 265/509] Bug 650591 - Annotate
 layout/reftests/percent-overflow-sizing/hScroll* as failing on Android, since
 they do

---
 .../percent-overflow-sizing/reftest.list      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/layout/reftests/percent-overflow-sizing/reftest.list b/layout/reftests/percent-overflow-sizing/reftest.list
index be81895bf3cd..ff00d07ae2c6 100644
--- a/layout/reftests/percent-overflow-sizing/reftest.list
+++ b/layout/reftests/percent-overflow-sizing/reftest.list
@@ -1,24 +1,24 @@
 == simpleHeight100.html greenbox.html
 == simpleAbsHeight.html greenbox.html
-== hScrollSimpleHeight.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-1.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-2.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-3.html greenboxhbar.html
-== hScrollAbsHeight.html greenboxhbar.html
-== hScrollAbsHeightQuirks.html greenboxhbar.html
+fails-if(Android) == hScrollSimpleHeight.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-1.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-2.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-3.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsHeight.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsHeightQuirks.html greenboxhbar.html # bug 650591
 == simpleHeight100D.html greenbox.html
 == simpleAbsHeightD.html greenbox.html
-== hScrollSimpleHeightD.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-1D.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-2D.html greenboxhbar.html
-== hScrollSimpleHeightQuirks-3D.html greenboxhbar.html
-== hScrollAbsHeightD.html greenboxhbar.html
-== hScrollAbsHeightQuirksD.html greenboxhbar.html
+fails-if(Android) == hScrollSimpleHeightD.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-1D.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-2D.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsHeightD.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsHeightQuirksD.html greenboxhbar.html # bug 650591
 == simpleMinHeight100D.html greenbox.html
 == simpleAbsMinHeightD.html greenbox.html
-== hScrollSimpleMinHeightD.html greenboxhbar.html
-== hScrollSimpleMinHeightQuirks-1D.html greenboxhbar.html
-== hScrollSimpleMinHeightQuirks-3D.html greenboxhbar.html
-== hScrollAbsMinHeightD.html greenboxhbar.html
-== hScrollAbsMinHeightQuirksD.html greenboxhbar.html
+fails-if(Android) == hScrollSimpleMinHeightD.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleMinHeightQuirks-1D.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollSimpleMinHeightQuirks-3D.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsMinHeightD.html greenboxhbar.html # bug 650591
+fails-if(Android) == hScrollAbsMinHeightQuirksD.html greenboxhbar.html # bug 650591
 == dynamicHeight100.html dynamicHeight100-ref.html

From 54b83996a929058378c9f2b13c0394b24cb9b434 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 23:30:22 -0700
Subject: [PATCH 266/509] Bug 650597 - Annotate
 layout/xul/base/src/grid/reftests/not-full* as failing on Android, since they
 do

---
 layout/xul/base/src/grid/reftests/reftest.list | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/layout/xul/base/src/grid/reftests/reftest.list b/layout/xul/base/src/grid/reftests/reftest.list
index d8cf024e6aaf..9252bbcafc6c 100644
--- a/layout/xul/base/src/grid/reftests/reftest.list
+++ b/layout/xul/base/src/grid/reftests/reftest.list
@@ -5,14 +5,14 @@
 == row-or-column-sizing-1.xul row-or-column-sizing-4.xul
 == z-order-1.xul z-order-1-ref.xul
 == z-order-2.xul z-order-2-ref.xul
-== not-full-basic.xul not-full-basic-ref.xhtml
-== not-full-grid-pack-align.xul not-full-basic-ref.xhtml
+fails-if(Android) == not-full-basic.xul not-full-basic-ref.xhtml # bug 650597
+fails-if(Android) == not-full-grid-pack-align.xul not-full-basic-ref.xhtml # bug 650597
 == not-full-row-group-align.xul not-full-row-group-align-ref.xhtml # does anyone want/need this behavior?
 == not-full-row-group-pack.xul not-full-row-group-pack-ref.xhtml
-== not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml
-== not-full-row-leaf-align.xul not-full-basic-ref.xhtml
-== not-full-row-leaf-pack.xul not-full-row-leaf-pack-ref.xhtml
-== not-full-row-leaf-direction.xul not-full-row-leaf-pack-ref.xhtml
-== scrollable-columns.xul scrollable-columns-ref.xhtml
+fails-if(Android) == not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml # bug 650597
+fails-if(Android) == not-full-row-leaf-align.xul not-full-basic-ref.xhtml # bug 650597
+fails-if(Android) == not-full-row-leaf-pack.xul not-full-row-leaf-pack-ref.xhtml # bug 650597
+fails-if(Android) == not-full-row-leaf-direction.xul not-full-row-leaf-pack-ref.xhtml # bug 650597
+fails-if(Android) == scrollable-columns.xul scrollable-columns-ref.xhtml # bug 650597
 fails == scrollable-rows.xul scrollable-rows-ref.xhtml
 == sizing-2d.xul sizing-2d-ref.xul

From 229fcb8b750f6e725097ef38b6fd7c106d1b6541 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 16 Apr 2011 23:37:56 -0700
Subject: [PATCH 267/509] Bug 650602 - Annotate
 content/html/content/reftests/583514-1.html as failing on Android, since it
 does

---
 content/html/content/reftests/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/html/content/reftests/reftest.list b/content/html/content/reftests/reftest.list
index 27800d3ab9e2..38517be71e94 100644
--- a/content/html/content/reftests/reftest.list
+++ b/content/html/content/reftests/reftest.list
@@ -21,7 +21,7 @@ include autofocus/reftest.list
 == 596455-2a.html 596455-ref-2.html
 == 596455-2b.html 596455-ref-2.html
 == 610935.html 610935-ref.html
-== 583514-1.html 583514-1-ref.html
+fails-if(Android) == 583514-1.html 583514-1-ref.html
 == 583514-2.html 583514-2-ref.html
 == 409604-1.html 409604-1-ref.html
 == hidden-1a.html hidden-1-ref.html

From a17b894b1f2c5d7faffbba82c769bbf02b77cfed Mon Sep 17 00:00:00 2001
From: Christian Ascheberg <c.ascheberg@gmx.de>
Date: Sun, 17 Apr 2011 19:28:54 +0200
Subject: [PATCH 268/509] Bug 637049 - No GUI to return from fullscreen mode
 with popups. r=dao

---
 browser/base/content/browser.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index b95da1f5e58e..8a0047f2c19f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4034,16 +4034,19 @@ var FullScreen = {
     // controls on nav bar.
     var fullscreenflex = document.getElementById("fullscreenflex");
     var fullscreenctls = document.getElementById("window-controls");
-    var ctlsOnTabbar = TabsOnTop.enabled &&
-                       !gPrefService.getBoolPref("browser.tabs.autoHide");
-    if (fullscreenctls.parentNode.id == "nav-bar" && ctlsOnTabbar) {
+    var navbar = document.getElementById("nav-bar");
+    var ctlsOnTabbar = window.toolbar.visible &&
+                       (navbar.collapsed ||
+                          (TabsOnTop.enabled &&
+                           !gPrefService.getBoolPref("browser.tabs.autoHide")));
+    if (fullscreenctls.parentNode == navbar && ctlsOnTabbar) {
       document.getElementById("TabsToolbar").appendChild(fullscreenctls);
       // we don't need this space in tabs-on-top mode, so prevent it from 
       // being shown
       fullscreenflex.removeAttribute("fullscreencontrol");
     }
     else if (fullscreenctls.parentNode.id == "TabsToolbar" && !ctlsOnTabbar) {
-      document.getElementById("nav-bar").appendChild(fullscreenctls);
+      navbar.appendChild(fullscreenctls);
       fullscreenflex.setAttribute("fullscreencontrol", "true");
     }
 

From 0bb0c3bf95d243619c9a06466aca648b6e9a95e8 Mon Sep 17 00:00:00 2001
From: Bjarne <bjarne@runitsoft.com>
Date: Sun, 17 Apr 2011 19:31:15 +0200
Subject: [PATCH 269/509] Bug 549767 - Write/flush cache metadata off
 main-thread. r=michal.novotny

---
 netwerk/cache/nsDiskCacheBinding.cpp |  1 +
 netwerk/cache/nsDiskCacheBinding.h   |  8 +++
 netwerk/cache/nsDiskCacheDevice.cpp  | 88 ++++++++++++++++++++++++----
 netwerk/cache/nsDiskCacheDevice.h    | 11 ++++
 4 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/netwerk/cache/nsDiskCacheBinding.cpp b/netwerk/cache/nsDiskCacheBinding.cpp
index c5be5aada077..db64f1dd0f75 100644
--- a/netwerk/cache/nsDiskCacheBinding.cpp
+++ b/netwerk/cache/nsDiskCacheBinding.cpp
@@ -117,6 +117,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding)
 nsDiskCacheBinding::nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record)
     :   mCacheEntry(entry)
     ,   mStreamIO(nsnull)
+    ,   mDeactivateEvent(nsnull)
 {
     NS_ASSERTION(record->ValidRecord(), "bad record");
     PR_INIT_CLIST(this);
diff --git a/netwerk/cache/nsDiskCacheBinding.h b/netwerk/cache/nsDiskCacheBinding.h
index 651357be45bf..c0faabb6735c 100644
--- a/netwerk/cache/nsDiskCacheBinding.h
+++ b/netwerk/cache/nsDiskCacheBinding.h
@@ -62,6 +62,8 @@
  *
  *****************************************************************************/
 
+class nsDiskCacheDeviceDeactivateEntryEvent;
+
 class nsDiskCacheBinding : public nsISupports, public PRCList {
 public:
     NS_DECL_ISUPPORTS
@@ -79,6 +81,12 @@ public:
     nsDiskCacheStreamIO*    mStreamIO;      // strong reference
     PRBool                  mDoomed;        // record is not stored in cache map
     PRUint8                 mGeneration;    // possibly just reservation
+
+    // If set, points to a pending event which will deactivate |mCacheEntry|.
+    // If not set then either |mCacheEntry| is not deactivated, or it has been
+    // deactivated but the device returned it from FindEntry() before the event
+    // fired. In both two latter cases this binding is to be considered valid.
+    nsDiskCacheDeviceDeactivateEntryEvent *mDeactivateEvent;
 };
 
 
diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp
index d20c842823a6..f10778738330 100644
--- a/netwerk/cache/nsDiskCacheDevice.cpp
+++ b/netwerk/cache/nsDiskCacheDevice.cpp
@@ -80,6 +80,7 @@
 #include "nsISimpleEnumerator.h"
 
 #include "mozilla/FunctionTimer.h"
+#include "nsThreadUtils.h"
 
 static const char DISK_CACHE_DEVICE_ID[] = { "disk" };
 
@@ -450,6 +451,38 @@ nsDiskCacheDevice::GetDeviceID()
     return DISK_CACHE_DEVICE_ID;
 }
 
+class nsDiskCacheDeviceDeactivateEntryEvent : public nsRunnable {
+public:
+    nsDiskCacheDeviceDeactivateEntryEvent(nsDiskCacheDevice *device,
+                                          nsCacheEntry * entry,
+                                          nsDiskCacheBinding * binding)
+        : mCanceled(PR_FALSE),
+          mEntry(entry),
+          mDevice(device),
+          mBinding(binding)
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+        nsCacheServiceAutoLock lock;
+#ifdef PR_LOGGING
+        CACHE_LOG_DEBUG(("nsDiskCacheDeviceDeactivateEntryEvent[%p]\n", this));
+#endif
+        if (!mCanceled) {
+            (void) mDevice->DeactivateEntry_Private(mEntry, mBinding);
+        }
+        return NS_OK;
+    }
+    
+    void CancelEvent() { mCanceled = PR_TRUE; }
+private:
+    PRBool mCanceled;
+    nsCacheEntry *mEntry;
+    nsDiskCacheDevice *mDevice;
+    nsDiskCacheBinding *mBinding;
+};
+
 
 /**
  *  FindEntry -
@@ -474,6 +507,16 @@ nsDiskCacheDevice::FindEntry(nsCString * key, PRBool *collision)
     if (binding && !binding->mCacheEntry->Key()->Equals(*key)) {
         *collision = PR_TRUE;
         return nsnull;
+    } else if (binding && binding->mDeactivateEvent) {
+        binding->mDeactivateEvent->CancelEvent();
+        binding->mDeactivateEvent = nsnull;
+        CACHE_LOG_DEBUG(("CACHE: reusing deactivated entry %p " \
+                         "req-key=%s  entry-key=%s\n",
+                         binding->mCacheEntry, key, binding->mCacheEntry->Key()));
+
+        return binding->mCacheEntry; // just return this one, observing that
+                                     // FindActiveBinding() does not return
+                                     // bindings to doomed entries
     }
     binding = nsnull;
 
@@ -511,12 +554,32 @@ nsDiskCacheDevice::DeactivateEntry(nsCacheEntry * entry)
 {
     nsresult              rv = NS_OK;
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
-    NS_ASSERTION(binding, "DeactivateEntry: binding == nsnull");
-    if (!binding)  return NS_ERROR_UNEXPECTED;
+    if (!IsValidBinding(binding))
+        return NS_ERROR_UNEXPECTED;
 
     CACHE_LOG_DEBUG(("CACHE: disk DeactivateEntry [%p %x]\n",
         entry, binding->mRecord.HashNumber()));
 
+    nsDiskCacheDeviceDeactivateEntryEvent *event =
+        new nsDiskCacheDeviceDeactivateEntryEvent(this, entry, binding);
+
+    // ensure we can cancel the event via the binding later if necessary
+    binding->mDeactivateEvent = event;
+
+    rv = nsCacheService::DispatchToCacheIOThread(event);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "DeactivateEntry: Failed dispatching "
+                                   "deactivation event");
+    return NS_OK;
+}
+
+/**
+ *  NOTE: called while holding the cache service lock
+ */
+nsresult
+nsDiskCacheDevice::DeactivateEntry_Private(nsCacheEntry * entry,
+                                           nsDiskCacheBinding * binding)
+{
+    nsresult rv = NS_OK;
     if (entry->IsDoomed()) {
         // delete data, entry, record from disk for entry
         rv = mCacheMap.DeleteStorage(&binding->mRecord);
@@ -644,7 +707,8 @@ nsDiskCacheDevice::DoomEntry(nsCacheEntry * entry)
 
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
     NS_ASSERTION(binding, "DoomEntry: binding == nsnull");
-    if (!binding)  return;
+    if (!binding)
+        return;
 
     if (!binding->mDoomed) {
         // so it can't be seen by FindEntry() ever again.
@@ -675,8 +739,9 @@ nsDiskCacheDevice::OpenInputStreamForEntry(nsCacheEntry *      entry,
 
     nsresult             rv;
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
-    NS_ENSURE_TRUE(binding, NS_ERROR_UNEXPECTED);
-    
+    if (!IsValidBinding(binding))
+        return NS_ERROR_UNEXPECTED;
+
     NS_ASSERTION(binding->mCacheEntry == entry, "binding & entry don't point to each other");
 
     rv = binding->EnsureStreamIO();
@@ -703,7 +768,8 @@ nsDiskCacheDevice::OpenOutputStreamForEntry(nsCacheEntry *      entry,
 
     nsresult             rv;
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
-    NS_ENSURE_TRUE(binding, NS_ERROR_UNEXPECTED);
+    if (!IsValidBinding(binding))
+        return NS_ERROR_UNEXPECTED;
     
     NS_ASSERTION(binding->mCacheEntry == entry, "binding & entry don't point to each other");
 
@@ -727,11 +793,9 @@ nsDiskCacheDevice::GetFileForEntry(nsCacheEntry *    entry,
     nsresult             rv;
         
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
-    if (!binding) {
-        NS_WARNING("GetFileForEntry: binding == nsnull");
+    if (!IsValidBinding(binding))
         return NS_ERROR_UNEXPECTED;
-    }
-    
+
     // check/set binding->mRecord for separate file, sync w/mCacheMap
     if (binding->mRecord.DataLocationInitialized()) {
         if (binding->mRecord.DataFile() != 0)
@@ -776,8 +840,8 @@ nsDiskCacheDevice::OnDataSizeChange(nsCacheEntry * entry, PRInt32 deltaSize)
         return NS_OK;
 
     nsDiskCacheBinding * binding = GetCacheEntryBinding(entry);
-    NS_ASSERTION(binding, "OnDataSizeChange: binding == nsnull");
-    if (!binding)  return NS_ERROR_UNEXPECTED;
+    if (!IsValidBinding(binding))
+        return NS_ERROR_UNEXPECTED;
 
     NS_ASSERTION(binding->mRecord.ValidRecord(), "bad record");
 
diff --git a/netwerk/cache/nsDiskCacheDevice.h b/netwerk/cache/nsDiskCacheDevice.h
index 1d5ac1ce10d3..97d6499a668c 100644
--- a/netwerk/cache/nsDiskCacheDevice.h
+++ b/netwerk/cache/nsDiskCacheDevice.h
@@ -105,13 +105,24 @@ public:
     nsDiskCacheMap *        CacheMap()    { return &mCacheMap; }
     
 private:    
+    friend class nsDiskCacheDeviceDeactivateEntryEvent;
     /**
      *  Private methods
      */
 
+    inline bool IsValidBinding(nsDiskCacheBinding *binding)
+    {
+        NS_ASSERTION(binding, "  binding == nsnull");
+        NS_ASSERTION(binding->mDeactivateEvent == nsnull,
+                     "  entry in process of deactivation");
+        return (binding && !binding->mDeactivateEvent);
+    }
+
     PRBool                  Initialized() { return mInitialized; }
 
     nsresult                Shutdown_Private(PRBool flush);
+    nsresult                DeactivateEntry_Private(nsCacheEntry * entry,
+                                                    nsDiskCacheBinding * binding);
 
     nsresult                OpenDiskCache();
     nsresult                ClearDiskCache();

From 929164065228f1b9cf3f3e257f5930ee772c48c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 17 Apr 2011 21:53:25 +0200
Subject: [PATCH 270/509] Bug 487059 - clearUserPref shouldn't throw if a pref
 doesn't have a default or user value. r+sr=bsedberg

---
 browser/base/content/openLocationLastURL.jsm           |  3 +--
 browser/components/migration/content/migration.js      |  5 +----
 .../test/browser/browser_privatebrowsing_opendir.js    |  3 +--
 .../sessionstore/test/browser/browser_480893.js        |  5 +----
 content/events/test/test_bug238987.html                |  4 +---
 content/events/test/test_bug409604.html                |  4 +---
 content/events/test/test_bug457672.html                |  4 +---
 content/html/document/test/test_bug369370.html         |  6 +-----
 layout/forms/test/test_bug411236.html                  |  4 +---
 layout/generic/test/test_movement_by_words.html        |  8 ++------
 layout/style/test/test_bug401046.html                  |  6 +-----
 modules/libpref/public/nsIPrefBranch.idl               |  3 +--
 modules/libpref/public/nsIPrefBranch2.idl              |  2 +-
 modules/libpref/src/prefapi.cpp                        |  4 +---
 modules/libpref/test/unit/test_libPrefs.js             |  3 +--
 toolkit/components/search/nsSearchService.js           |  3 +--
 .../tests/chrome/test_retention_is_0_closes.xul        | 10 ++--------
 17 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/browser/base/content/openLocationLastURL.jsm b/browser/base/content/openLocationLastURL.jsm
index b5f7ffab9172..508e85ea2b88 100644
--- a/browser/base/content/openLocationLastURL.jsm
+++ b/browser/base/content/openLocationLastURL.jsm
@@ -96,8 +96,7 @@ let gOpenLocationLastURL = {
     }
   },
   reset: function() {
-    if (prefSvc.prefHasUserValue(LAST_URL_PREF))
-        prefSvc.clearUserPref(LAST_URL_PREF);
+    prefSvc.clearUserPref(LAST_URL_PREF);
     gOpenLocationLastURLData = "";
   }
 };
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
index 6291da4fdee5..1d7fb19376f0 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -457,10 +457,7 @@ var MigrationWizard = {
             var prefBranch = prefSvc.getBranch(null);
 
             if (this._newHomePage == "DEFAULT") {
-              try {
-                prefBranch.clearUserPref("browser.startup.homepage");
-              }
-              catch (e) { }
+              prefBranch.clearUserPref("browser.startup.homepage");
             }
             else {
               var str = Components.classes["@mozilla.org/supports-string;1"]
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js
index 475bd7ba866a..cb83edf610fa 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js
@@ -54,8 +54,7 @@ function test() {
 
   function setupCleanSlate() {
     gLastOpenDirectory.reset();
-    if (gPrefService.prefHasUserValue(kPrefName))
-        gPrefService.clearUserPref(kPrefName);
+    gPrefService.clearUserPref(kPrefName);
   }
 
   setupCleanSlate();
diff --git a/browser/components/sessionstore/test/browser/browser_480893.js b/browser/components/sessionstore/test/browser/browser_480893.js
index c53f83866302..bad3a8f5a625 100644
--- a/browser/components/sessionstore/test/browser/browser_480893.js
+++ b/browser/components/sessionstore/test/browser/browser_480893.js
@@ -77,10 +77,7 @@ function test() {
 
           // close tab, restore default values and finish the test
           gBrowser.removeTab(tab);
-          // we need this if-statement because if there is no user set value, 
-          // clearUserPref throws a uncatched exception and finish is not called
-          if (gPrefService.prefHasUserValue("browser.startup.page"))
-            gPrefService.clearUserPref("browser.startup.page");
+          gPrefService.clearUserPref("browser.startup.page");
           gPrefService.clearUserPref("browser.startup.homepage");
           finish();
         }, true);
diff --git a/content/events/test/test_bug238987.html b/content/events/test/test_bug238987.html
index 09e90d7892a2..4ee9e8441e1f 100644
--- a/content/events/test/test_bug238987.html
+++ b/content/events/test/test_bug238987.html
@@ -41,9 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238987
     var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
                                                      .getBranch("accessibility.");
     if (!newValue) {
-      try {
-        prefs.clearUserPref("tabfocus");
-      } catch(ex) {}
+      prefs.clearUserPref("tabfocus");
     } else {
       prefs.setIntPref("tabfocus", newValue);
     }
diff --git a/content/events/test/test_bug409604.html b/content/events/test/test_bug409604.html
index 96342cb22185..217bc9ea9768 100644
--- a/content/events/test/test_bug409604.html
+++ b/content/events/test/test_bug409604.html
@@ -99,9 +99,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=409604
     var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
                                                      .getBranch("ui.key.");
     if (!newValue) {
-      try {
-        prefs.clearUserPref("contentAccess");
-      } catch(ex) {}
+      prefs.clearUserPref("contentAccess");
     } else {
       prefs.setIntPref("contentAccess", newValue);
     }
diff --git a/content/events/test/test_bug457672.html b/content/events/test/test_bug457672.html
index 533e2b02741b..ea112b8002ef 100644
--- a/content/events/test/test_bug457672.html
+++ b/content/events/test/test_bug457672.html
@@ -29,9 +29,7 @@ function setUserPref(reset) {
   var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
                                                    .getBranch("browser.link.");
   if (reset) {
-    try {
-      prefs.clearUserPref("open_newwindow");
-    } catch (ex) {}
+    prefs.clearUserPref("open_newwindow");
   } else {
     prefs.setIntPref("open_newwindow", 3);
   }
diff --git a/content/html/document/test/test_bug369370.html b/content/html/document/test/test_bug369370.html
index 0714210efcee..fe90291e0b26 100644
--- a/content/html/document/test/test_bug369370.html
+++ b/content/html/document/test/test_bug369370.html
@@ -88,11 +88,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=369370
 
         kidWin.close();
         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-        try {
-          prefs.clearUserPref("browser.enable_automatic_image_resizing");
-        } catch (ex) {
-          // throws if it wasn't already set because app default was true
-        }
+        prefs.clearUserPref("browser.enable_automatic_image_resizing");
         SimpleTest.finish();
     }
 
diff --git a/layout/forms/test/test_bug411236.html b/layout/forms/test/test_bug411236.html
index c58a6f7e9d9b..257c3967c036 100644
--- a/layout/forms/test/test_bug411236.html
+++ b/layout/forms/test/test_bug411236.html
@@ -34,9 +34,7 @@ function setOrRestoreTabFocus(newValue) {
   var prefs = Components.classes[prefSvcContractID].getService(prefSvcIID)
                                                    .getBranch("accessibility.");
   if (!newValue) {
-    try {
-      prefs.clearUserPref("tabfocus");
-    } catch(ex) {}
+    prefs.clearUserPref("tabfocus");
   } else {
     prefs.setIntPref("tabfocus", newValue);
   }
diff --git a/layout/generic/test/test_movement_by_words.html b/layout/generic/test/test_movement_by_words.html
index a4868e0a19cd..39a6b21b57ac 100644
--- a/layout/generic/test/test_movement_by_words.html
+++ b/layout/generic/test/test_movement_by_words.html
@@ -38,12 +38,8 @@ function setPrefs(eat_space, stop_at_punctuation) {
 }
 
 function restorePrefs() {
-  try {
-    getPrefs().clearUserPref("eat_space_to_next_word");
-  } catch(ex) {}
-  try {
-    getPrefs().clearUserPref("stop_at_punctuation");
-  } catch(ex) {}
+  getPrefs().clearUserPref("eat_space_to_next_word");
+  getPrefs().clearUserPref("stop_at_punctuation");
 }
 
 function test() {
diff --git a/layout/style/test/test_bug401046.html b/layout/style/test/test_bug401046.html
index 077223d2485f..6c424e5cf038 100644
--- a/layout/style/test/test_bug401046.html
+++ b/layout/style/test/test_bug401046.html
@@ -63,11 +63,7 @@ var CI = Components.interfaces;
 var prefs =
   CC["@mozilla.org/preferences-service;1"].getService(CI.nsIPrefBranch);
 
-try {
-    prefs.clearUserPref('font.minimum-size.x-western');
-} catch (ex) {
-    // throws if it wasn't already set
-}
+prefs.clearUserPref('font.minimum-size.x-western');
 
 // preference change is async (although one setTimeout might be enough?)
 setTimeout(setTimeout, 0, step1, 0);
diff --git a/modules/libpref/public/nsIPrefBranch.idl b/modules/libpref/public/nsIPrefBranch.idl
index d4e631b9bb57..857455e2c0ff 100644
--- a/modules/libpref/public/nsIPrefBranch.idl
+++ b/modules/libpref/public/nsIPrefBranch.idl
@@ -55,7 +55,7 @@
  * @see nsIPrefService
  */
 
-[scriptable, uuid(56c35506-f14b-11d3-99d3-ddbfac2ccf65)]
+[scriptable, uuid(e0b6e170-691b-11e0-ae3e-0800200c9a66)]
 interface nsIPrefBranch : nsISupports
 {
 
@@ -211,7 +211,6 @@ interface nsIPrefBranch : nsISupports
    * This method does nothing if this object is a default branch.
    *
    * @return NS_OK The user preference was successfully cleared.
-   * @return Other The preference does not exist or have a user set value.
    */
   void clearUserPref(in string aPrefName);
 
diff --git a/modules/libpref/public/nsIPrefBranch2.idl b/modules/libpref/public/nsIPrefBranch2.idl
index e543d411c53d..6205f1514697 100644
--- a/modules/libpref/public/nsIPrefBranch2.idl
+++ b/modules/libpref/public/nsIPrefBranch2.idl
@@ -47,7 +47,7 @@ interface nsIObserver;
  *
  * @see nsIPrefBranch
  */
-[scriptable, uuid(74567534-eb94-4b1c-8f45-389643bfc555)]
+[scriptable, uuid(784de8e2-e72f-441a-ae74-9d5fdfe13be3)]
 interface nsIPrefBranch2 : nsIPrefBranch
 {
   /**
diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp
index 6a3e3207ae84..cf80c7c9310d 100644
--- a/modules/libpref/src/prefapi.cpp
+++ b/modules/libpref/src/prefapi.cpp
@@ -613,7 +613,6 @@ PREF_ClearUserPref(const char *pref_name)
     if (!gHashTable.ops)
         return NS_ERROR_NOT_INITIALIZED;
 
-    nsresult rv = NS_ERROR_UNEXPECTED;
     PrefHashEntry* pref = pref_HashTableLookup(pref_name);
     if (pref && PREF_HAS_USER_VALUE(pref))
     {
@@ -629,9 +628,8 @@ PREF_ClearUserPref(const char *pref_name)
 
         pref_DoCallback(pref_name);
         gDirty = PR_TRUE;
-        rv = NS_OK;
     }
-    return rv;
+    return NS_OK;
 }
 
 static PLDHashOperator
diff --git a/modules/libpref/test/unit/test_libPrefs.js b/modules/libpref/test/unit/test_libPrefs.js
index 4ced2a27b240..e7fd5ca023f5 100644
--- a/modules/libpref/test/unit/test_libPrefs.js
+++ b/modules/libpref/test/unit/test_libPrefs.js
@@ -100,8 +100,7 @@ function run_test() {
   // Nonexisting user preferences
 
   do_check_eq(pb.prefHasUserValue("UserPref.nonexistent.hasUserValue"), false);
-  do_check_throws(function() {
-    pb.clearUserPref("UserPref.nonexistent.clearUserPref");},  Cr.NS_ERROR_UNEXPECTED);
+  pb.clearUserPref("UserPref.nonexistent.clearUserPref"); // shouldn't throw
   do_check_eq(pb.getPrefType("UserPref.nonexistent.getPrefType"), PREF_INVALID);
   do_check_eq(pb.root, "");
 
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 3c8df946c1c1..69e7a9f9dcf2 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -3393,8 +3393,7 @@ SearchService.prototype = {
     var currentEnginePref = BROWSER_SEARCH_PREF + "selectedEngine";
 
     if (this._currentEngine == this.defaultEngine) {
-      if (gPrefSvc.prefHasUserValue(currentEnginePref))
-        gPrefSvc.clearUserPref(currentEnginePref);
+      gPrefSvc.clearUserPref(currentEnginePref);
     }
     else {
       setLocalizedPref(currentEnginePref, this._currentEngine.name);
diff --git a/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul b/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
index a240f8e1a39d..b3ccd364d74e 100644
--- a/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
+++ b/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
@@ -109,14 +109,8 @@ bug413093obs.prototype = {
         // reset the changed config values to default value
         let prefs = Cc["@mozilla.org/preferences-service;1"].
                     getService(Ci.nsIPrefService);
-        try {
-          prefs.clearUserPref("browser.download.manager.retention");
-        }
-        catch (err) { }
-        try {
-          prefs.clearUserPref("browser.download.manager.closeWhenDone");
-        }
-        catch (err) { }
+        prefs.clearUserPref("browser.download.manager.retention");
+        prefs.clearUserPref("browser.download.manager.closeWhenDone");
 
         SimpleTest.finish();
       });

From f9cbda11ff6978fe349c7f7d4d02544b00489887 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sun, 17 Apr 2011 09:44:20 -0700
Subject: [PATCH 271/509] Bug 650594 - plugin-transform-1.html unexpectedly
 passes on Android, annotate that we don't actually care about pass or fail in
 the !haveTestPlugin case, r=roc

---
 modules/plugin/test/reftest/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugin/test/reftest/reftest.list b/modules/plugin/test/reftest/reftest.list
index 6e5a2966840e..c716f1c7f39b 100644
--- a/modules/plugin/test/reftest/reftest.list
+++ b/modules/plugin/test/reftest/reftest.list
@@ -17,5 +17,5 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) =
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-2-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-5-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-10-step.html plugin-background-ref.html
-fails-if(!haveTestPlugin) == plugin-transform-1.html plugin-transform-1-ref.html
+random-if(!haveTestPlugin) == plugin-transform-1.html plugin-transform-1-ref.html
 fails-if(!haveTestPlugin) fails-if(http.platform=="X11") == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496

From 8e89cb6ec87b4b46fe1df3ba8169453799b740d9 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 18 Apr 2011 17:31:01 +0900
Subject: [PATCH 272/509] Bug 638408 - Remove unused nsUConvDll.*. r=smontagu

---
 intl/uconv/src/nsCharsetConverterManager.cpp |  1 -
 intl/uconv/src/nsTextToSubURI.cpp            |  1 -
 intl/uconv/src/nsUConvDll.cpp                | 54 --------------------
 intl/uconv/src/nsUConvDll.h                  | 46 -----------------
 intl/uconv/src/nsUConvModule.cpp             |  1 -
 intl/uconv/src/nsUCvMinDll.h                 | 43 ----------------
 intl/uconv/src/nsUTF8ConverterService.cpp    |  1 -
 7 files changed, 147 deletions(-)
 delete mode 100644 intl/uconv/src/nsUConvDll.cpp
 delete mode 100644 intl/uconv/src/nsUConvDll.h
 delete mode 100644 intl/uconv/src/nsUCvMinDll.h

diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp
index bf951c2ca62c..a0419555814c 100644
--- a/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -46,7 +46,6 @@
 #include "nsICharsetConverterManager.h"
 #include "nsEncoderDecoderUtils.h"
 #include "nsIStringBundle.h"
-#include "nsUConvDll.h"
 #include "prmem.h"
 #include "nsCRT.h"
 #include "nsTArray.h"
diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp
index f3f75b5fbec5..715ffca02c4a 100644
--- a/intl/uconv/src/nsTextToSubURI.cpp
+++ b/intl/uconv/src/nsTextToSubURI.cpp
@@ -41,7 +41,6 @@
 #include "nsReadableUtils.h"
 #include "nsITextToSubURI.h"
 #include "nsIServiceManager.h"
-#include "nsUConvDll.h"
 #include "nsEscape.h"
 #include "prmem.h"
 #include "nsTextToSubURI.h"
diff --git a/intl/uconv/src/nsUConvDll.cpp b/intl/uconv/src/nsUConvDll.cpp
deleted file mode 100644
index 6f97030142f8..000000000000
--- a/intl/uconv/src/nsUConvDll.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIComponentManager.h"
-#include "nsCOMPtr.h"
-#include "nsICharsetConverterManager.h"
-#include "nsIPlatformCharset.h"
-#include "nsPlatformCharsetFactory.h"
-#include "nsICharsetAlias.h"
-#include "nsCharsetAliasFactory.h"
-#include "nsITextToSubURI.h"
-#include "nsTextToSubURI.h"
-#include "nsIServiceManager.h"
-#include "rdf.h"
-#include "nsUConvDll.h"
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
diff --git a/intl/uconv/src/nsUConvDll.h b/intl/uconv/src/nsUConvDll.h
deleted file mode 100644
index 356e17f39c18..000000000000
--- a/intl/uconv/src/nsUConvDll.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsUConvDll_h___
-#define nsUConvDll_h___
-
-#include "nsISupports.h"
-class nsIComponentManager;
-class nsIFile;
-struct nsModuleComponentInfo;
-
-#endif /* nsUConvDll_h___ */
diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp
index 2a26a0522ae6..3aaa9db79f2c 100644
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@@ -58,7 +58,6 @@
 
 #include "nsITextToSubURI.h"
 
-#include "nsUConvDll.h"
 #include "nsIFile.h"
 
 #include "nsCRT.h"
diff --git a/intl/uconv/src/nsUCvMinDll.h b/intl/uconv/src/nsUCvMinDll.h
deleted file mode 100644
index 13a9cec6458b..000000000000
--- a/intl/uconv/src/nsUCvMinDll.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsUCvMinDll_h___
-#define nsUCvMinDll_h___
-
-#include "prtypes.h"
-
-#endif /* nsUCvMinDll_h___ */
diff --git a/intl/uconv/src/nsUTF8ConverterService.cpp b/intl/uconv/src/nsUTF8ConverterService.cpp
index 0cb916d3e42e..ab85dd6a8d7e 100644
--- a/intl/uconv/src/nsUTF8ConverterService.cpp
+++ b/intl/uconv/src/nsUTF8ConverterService.cpp
@@ -41,7 +41,6 @@
 #include "nsICharsetConverterManager.h"
 #include "nsReadableUtils.h"
 #include "nsIServiceManager.h"
-#include "nsUConvDll.h"
 #include "prmem.h"
 #include "nsUTF8ConverterService.h"
 #include "nsEscape.h"

From 3536306f00182436d1126b101b64caa23f7ac1a0 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 18 Apr 2011 17:31:51 +0900
Subject: [PATCH 273/509] Bug 643667 - Remove HAVE_XIE. r=ted

---
 config/autoconf.mk.in        |  3 ---
 config/system-headers        |  1 -
 configure.in                 | 23 -----------------------
 js/src/config/system-headers |  1 -
 4 files changed, 28 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 6e1b39b93d87..5a70a2e3ceed 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -573,7 +573,6 @@ FT2_LIBS               = @FT2_LIBS@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
 
-MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
 XT_LIBS			= @XT_LIBS@
 
 MOZ_LIBPROXY_CFLAGS     = @MOZ_LIBPROXY_CFLAGS@
@@ -626,8 +625,6 @@ AIX_OBJMODEL = @AIX_OBJMODEL@
 MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
 
-HAVE_XIE=@HAVE_XIE@
-
 MOZ_PSM=@MOZ_PSM@
 
 # Gssapi (krb5) libraries and headers for the Negotiate auth method
diff --git a/config/system-headers b/config/system-headers
index e1b5e17000b7..6b5a307e5fa4 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -895,7 +895,6 @@ X11/cursorfont.h
 X11/extensions/Print.h
 X11/extensions/shape.h
 X11/extensions/scrnsaver.h
-X11/extensions/XIElib.h
 X11/extensions/XShm.h
 X11/extensions/Xrender.h
 X11/extensions/Xdamage.h
diff --git a/configure.in b/configure.in
index 3712d6a61df7..6e2ea6854b3b 100644
--- a/configure.in
+++ b/configure.in
@@ -3521,26 +3521,6 @@ else
             [XSS_LIBS="-lXss $XEXT_LIBS $XLIBS"
              AC_DEFINE(HAVE_LIBXSS)],, $XEXT_LIBS $XLIBS))
 
-    dnl ========================================================
-    dnl = Check for XIE
-    dnl ========================================================
-    AC_CHECK_LIB(XIE, XieFloGeometry, [MOZ_XIE_LIBS="-lXIE"],,
-        $XLIBS $XEXT_LIBS)
-    MOZ_CHECK_HEADER(X11/extensions/XIElib.h)
-
-    if test "$MOZ_XIE_LIBS"; then
-	dnl ====================================================
-	dnl = If XIE is present and is desired, turn it on
-	dnl ====================================================
-	case $target in
-	    *-hpux*)
-		;;
-	    *)
-		HAVE_XIE=1
-		;;
-	esac
-    fi
-
 	LDFLAGS="$_SAVE_LDFLAGS"
 
     dnl ========================================================
@@ -9001,9 +8981,6 @@ AC_SUBST(JAR)
 
 AC_SUBST(MOZ_PROFILELOCKING)
 
-AC_SUBST(HAVE_XIE)
-AC_SUBST(MOZ_XIE_LIBS)
-
 AC_SUBST(BUILD_STATIC_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
 AC_SUBST(ENABLE_TESTS)
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index e1b5e17000b7..6b5a307e5fa4 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -895,7 +895,6 @@ X11/cursorfont.h
 X11/extensions/Print.h
 X11/extensions/shape.h
 X11/extensions/scrnsaver.h
-X11/extensions/XIElib.h
 X11/extensions/XShm.h
 X11/extensions/Xrender.h
 X11/extensions/Xdamage.h

From 43def1db2c2c839605e8caf219468d35daf540ae Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 18 Apr 2011 11:25:52 +0200
Subject: [PATCH 274/509] Bug 650629 - Clean up and fixes tests landed with bug
 583514. r=ehsan

---
 .../html/content/reftests/409604-1-ref.html   |  6 --
 content/html/content/reftests/409604-1.html   | 15 -----
 .../html/content/reftests/583514-1-ref.html   |  3 -
 content/html/content/reftests/583514-1.html   | 24 -------
 .../html/content/reftests/583514-2-ref.html   |  2 -
 content/html/content/reftests/583514-2.html   | 13 ----
 content/html/content/reftests/reftest.list    |  3 -
 content/html/content/test/Makefile.in         |  1 +
 content/html/content/test/test_bug583514.html | 67 +++++++++++--------
 9 files changed, 40 insertions(+), 94 deletions(-)
 delete mode 100644 content/html/content/reftests/409604-1-ref.html
 delete mode 100644 content/html/content/reftests/409604-1.html
 delete mode 100644 content/html/content/reftests/583514-1-ref.html
 delete mode 100644 content/html/content/reftests/583514-1.html
 delete mode 100644 content/html/content/reftests/583514-2-ref.html
 delete mode 100644 content/html/content/reftests/583514-2.html

diff --git a/content/html/content/reftests/409604-1-ref.html b/content/html/content/reftests/409604-1-ref.html
deleted file mode 100644
index f079d76789a6..000000000000
--- a/content/html/content/reftests/409604-1-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <body">
-        <div>pass</div>
-    </body>
-</html>
diff --git a/content/html/content/reftests/409604-1.html b/content/html/content/reftests/409604-1.html
deleted file mode 100644
index d06b59d29e20..000000000000
--- a/content/html/content/reftests/409604-1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html class=reftest-wait>
-    <script>
-        function onLoadHandler()
-        {
-        var v = document.createElement("input");
-        v.setAttribute("onclick", "document.getElementById('result').innerHTML += 'pass';\
-                                   document.documentElement.removeAttribute('class');");
-        v.click();
-        }
-    </script>
-    <body onload="onLoadHandler();">
-        <div id="result"></div>
-    </body>
-</html>
diff --git a/content/html/content/reftests/583514-1-ref.html b/content/html/content/reftests/583514-1-ref.html
deleted file mode 100644
index e4777912bf5a..000000000000
--- a/content/html/content/reftests/583514-1-ref.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-<input>
-<div>Results: div clicked body clicked input clicked div clicked body clicked input focused
diff --git a/content/html/content/reftests/583514-1.html b/content/html/content/reftests/583514-1.html
deleted file mode 100644
index 4df5458aa0ec..000000000000
--- a/content/html/content/reftests/583514-1.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<head>
-<script>
-function test()
-{
-  document.getElementById("a").click();
-  document.getElementById("b").click();
-  document.getElementById("a").focus();
-  document.getElementById("b").focus();
-  
-  // unfocus input to avoid failing due to caret
-  document.getElementById("b").blur();
-}
-
-function log(text)
-{
-  document.getElementById("c").innerHTML+=text;
-}
-</script>
-</head>
-
-<body id="body" onload='javascript:test()' onclick='log("body clicked");'>
-<div id=a onclick='log(" div clicked ");' onfocus='log(" div focused ");'>
-<input id=b onclick='log(" input clicked ");' onfocus='log(" input focused ");'></div>
-<div id="c">Results:
diff --git a/content/html/content/reftests/583514-2-ref.html b/content/html/content/reftests/583514-2-ref.html
deleted file mode 100644
index 95aec3d4e4b2..000000000000
--- a/content/html/content/reftests/583514-2-ref.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-Pass
diff --git a/content/html/content/reftests/583514-2.html b/content/html/content/reftests/583514-2.html
deleted file mode 100644
index 17479f7471c6..000000000000
--- a/content/html/content/reftests/583514-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <script>
-        function test() {
-            var elem = document.createElement("input");
-            elem.setAttribute("onclick","document.getElementById('result').innerHTML = 'Pass'");
-            elem.click();
-        }
-    </script>
-</head>
-<body onload="test()">
-    <div id="result">Fail</div>
-</body>
\ No newline at end of file
diff --git a/content/html/content/reftests/reftest.list b/content/html/content/reftests/reftest.list
index 38517be71e94..5150ac68e6c8 100644
--- a/content/html/content/reftests/reftest.list
+++ b/content/html/content/reftests/reftest.list
@@ -21,9 +21,6 @@ include autofocus/reftest.list
 == 596455-2a.html 596455-ref-2.html
 == 596455-2b.html 596455-ref-2.html
 == 610935.html 610935-ref.html
-fails-if(Android) == 583514-1.html 583514-1-ref.html
-== 583514-2.html 583514-2-ref.html
-== 409604-1.html 409604-1-ref.html
 == hidden-1a.html hidden-1-ref.html
 == hidden-1b.html hidden-1-ref.html
 == hidden-1c.html hidden-1-ref.html
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index e03863e859d8..713d1ccd52cc 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -261,6 +261,7 @@ _TEST_FILES = \
 		test_bug633058.html \
 		test_bug641219.html \
 		test_bug643051.html \
+		test_bug583514.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug583514.html b/content/html/content/test/test_bug583514.html
index 427cc89b822e..58fe2ba38d3c 100644
--- a/content/html/content/test/test_bug583514.html
+++ b/content/html/content/test/test_bug583514.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=562932
+https://bugzilla.mozilla.org/show_bug.cgi?id=583514
 -->
 <head>
   <title>Test for Bug 583514</title>
@@ -13,47 +13,58 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=562932
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=583514">Mozilla Bug 583514</a>
 <p id="display"></p>
 <div id="content">
-  <div id="a" accesskey="a" onfocus="divfocus = true;" onclick="divclicked = true;">
-    <input id="b" accesskey = "b" onfocus="inputfocus = true;" onclick="inputclicked = true;">
-  </div>
+  <input>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
-    /** Test for Bug 583514 **/
+/** Test for Bug 583514 **/
 
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+var gExpectDivClick = false;
+var gExpectInputClick = false;
 
-    var Cc = Components.classes;
-    var Ci = Components.interfaces;
+var div = document.getElementById('content');
+var input = document.getElementsByTagName('input')[0];
 
-    var modifier = Cc["@mozilla.org/preferences-service;1"].
-    getService(Ci.nsIPrefBranch).
-    getIntPref("ui.key.contentAccess");
+div.addEventListener('click', function() {
+  ok(gExpectDivClick, "click event received on div and expected status was: " +
+                       gExpectDivClick);
+}, false);
 
-    var divfocus = false;
-    var divclicked = false;
-    var inputfocus = false;
-    var inputclicked = false;
+input.addEventListener('click', function() {
+  ok(gExpectInputClick, "click event received on input and expected status was: " +
+                        gExpectInputClick);
+}, false);
 
-    var utils = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-    //utils.sendNativeKeyEvent(0, 65, modifier, "a", "a");
+SimpleTest.waitForExplicitFinish();
 
-    utils.sendKeyEvent("keypress", "a", 65, modifier);
+SimpleTest.waitForFocus(function() {
+  var body = document.body;
 
-    is(divfocus, false, "accesskey does not focus div");
-    is(divclicked, true, "accesskey fires click at div");
-    is(inputfocus, false, "input was not targeted");
-    is(inputclicked, false, "inpt was not targeted");
+  body.addEventListener('click', function(aEvent) {
+    if (aEvent.target == input) {
+      body.removeEventListener('click', arguments.callee, false);
+    }
 
-    divclicked = false;
+    ok(true, "click event received on body");
 
-    utils.sendKeyEvent("keypress", "b", 66, modifier);
+    SimpleTest.executeSoon(function() {
+      isnot(document.activeElement, input, "input shouldn't have been focused");
+      isnot(document.activeElement, div, "div shouldn't have been focused");
 
-    is(divfocus, false, "focus cannot bubble to div");
-    is(divclicked, true, "click bubbles to div");
-    is(inputfocus, true, "accesskey focuses input");
-    is(inputclicked, true, "accesskey clicks input");
+      if (aEvent.target == input) {
+        SimpleTest.finish();
+      } else {
+        gExpectDivClick = true;
+        gExpectInputClick = true;
+        input.click();
+      }
+    });
+  }, false);
+
+  gExpectDivClick = true;
+  div.click();
+});
 
 </script>
 </pre>

From 2db60beb6f549f2dba1e2ccdd8fac345c3460fd4 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Apr 2011 19:39:43 -0400
Subject: [PATCH 275/509] Bug 492181 - test_plugin_freezing.html causes focus
 problems for the following test; r=roc

---
 content/base/test/Makefile.in               |  4 +---
 content/base/test/test_plugin_freezing.html | 14 ++++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 25eace64c0d4..2690cb6859e5 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -475,6 +475,7 @@ _TEST_FILES2 = \
 		test_bug604592.html \
 		test_bug628938.html \
 		test_bug626262.html \
+		test_plugin_freezing.html \
 		$(NULL)
 
 # This test fails on the Mac for some reason
@@ -483,9 +484,6 @@ _TEST_FILES2 += 	test_copyimage.html \
 		$(NULL)
 endif
 
-# Disabled; see bug 492181
-#		test_plugin_freezing.html
-
 # Disabled for now. Mochitest isn't reliable enough for these.
 # test_bug444546.html \
 # bug444546.sjs \
diff --git a/content/base/test/test_plugin_freezing.html b/content/base/test/test_plugin_freezing.html
index 24f01766d131..41d41be5805e 100644
--- a/content/base/test/test_plugin_freezing.html
+++ b/content/base/test/test_plugin_freezing.html
@@ -19,14 +19,16 @@ var tests;
 
 window.addEventListener("unload", function() {
   e1.stopWatchingInstanceCount();
-  if (w) {
-    w.close();
-  }
 }, false);
 
 function nextTest() {
   if (testIndex == tests.length) {
-    SimpleTest.finish();
+    if (w) {
+      w.close();
+    }
+    SimpleTest.waitForFocus(function() {
+      SimpleTest.finish();
+    });
     return;
   }
 
@@ -41,7 +43,7 @@ function waitForInstanceCount(n) {
     nextTest();
     return;
   }
-  setTimeout(function() { waitForInstanceCount(n); }, 100);
+  setTimeout(function() { waitForInstanceCount(n); }, 0);
 }
 
 tests = [
@@ -53,7 +55,7 @@ tests = [
 try {
   e1.startWatchingInstanceCount();
   var w = window.open("data:text/html,<embed id='e2' type='application/x-test'></embed>");
-  w.onload = nextTest;
+  SimpleTest.waitForFocus(nextTest, w);
   SimpleTest.waitForExplicitFinish();
 } catch (err) {
   todo(false, "Instances already being watched?");

From 61c4d352fa531a564da998bbb8244d0ceb728fb0 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Sun, 17 Apr 2011 23:13:15 +0200
Subject: [PATCH 276/509] Bug 650653 - Fix test_ident_escaping.html and
 test_parse_ident.html when using DBCS locales. r=dbaron

---
 layout/style/nsCSSScanner.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index 0e95eff195f3..9be202e130f4 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -86,7 +86,7 @@ static const PRUint8 IS_WHITESPACE = 0x08;
 #define XI  IS_IDENT            |IS_HEX_DIGIT
 #define XSI IS_IDENT|START_IDENT|IS_HEX_DIGIT
 
-static const PRUint8 gLexTable[256] = {
+static const PRUint8 gLexTable[] = {
 //                                     TAB LF      FF  CR
    0,  0,  0,  0,  0,  0,  0,  0,  0,  W,  W,  0,  W,  W,  0,  0,
 //
@@ -103,24 +103,26 @@ static const PRUint8 gLexTable[256] = {
    0,  XSI,XSI,XSI,XSI,XSI,XSI,SI, SI, SI, SI, SI, SI, SI, SI, SI,
 // p   q   r   s   t   u   v   w   x   y   z   {   |   }   ~
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, 0,  0,  0,  0,  0,
-//
+// U+008*
    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//
+// U+009*
    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-// NBSP¡   ¢   £   ¤   ¥   ¦   §   ¨   ©   ª   «   ¬   ­   ®   ¯
+// U+00A*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
-// °   ±   ²   ³   ´   µ   ¶   ·   ¸   ¹   º   »   ¼   ½   ¾   ¿
+// U+00B*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
-// À   Á   Â   Ã   Ä   Å   Æ   Ç   È   É   Ê   Ë   Ì   Í   Î   Ï
+// U+00C*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
-// Ð   Ñ   Ò   Ó   Ô   Õ   Ö   ×   Ø   Ù   Ú   Û   Ü   Ý   Þ   ß
+// U+00D*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
-// à   á   â   ã   ä   å   æ   ç   è   é   ê   ë   ì   í   î   ï
+// U+00E*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
-// ð   ñ   ò   ó   ô   õ   ö   ÷   ø   ù   ú   û   ü   ý   þ   ÿ
+// U+00F*
    SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI, SI,
 };
 
+PR_STATIC_ASSERT(NS_ARRAY_LENGTH(gLexTable) == 256);
+
 #undef W
 #undef S
 #undef I

From 034e16023b305cc02a59ed68238140dc4a564fc0 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Mon, 18 Apr 2011 12:15:37 +0200
Subject: [PATCH 277/509] Bug 648721 - Fix linking of xpcshell and
 plugin-container on OpenBSD. r=glandium

---
 configure.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 0ff44aa99f85..953067f5bcae 100644
--- a/configure.in
+++ b/configure.in
@@ -2626,7 +2626,8 @@ ia64*-hpux*)
 	;;
 
 *-openbsd*)
-    DLL_SUFFIX=".so.1.0"
+    DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
+    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'

From eec9b975b9443f0f0d2d576af0f4e4f355fd3489 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 19 Apr 2011 01:25:24 +0200
Subject: [PATCH 278/509] Bug 649367 - "nightly is up to date" does not have
 enough contrast against the new about window dark backgrounds. r=gavin

---
 browser/base/content/aboutDialog.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
index 8d366489528e..bfb96b616ec2 100644
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -87,7 +87,9 @@
 }
 
 #updateDeck > hbox > label:not([class="text-link"]) {
+%ifdef MOZ_OFFICIAL_BRANDING
   color: #909090;
+%endif
   font-style:italic;
 }
 

From 8b1fe7b365b289f4cd4ac0970c6958357440442b Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
Date: Tue, 19 Apr 2011 01:26:33 +0200
Subject: [PATCH 279/509] Bug 650476 - Fix build --with-libxul-sdk. r=glandium

---
 config/config.mk        | 2 +-
 js/src/config/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index f6d0ad5ed449..f572e2947366 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
+XPIDL_LINK = $(PYTHON) $(LIBXUL_SDK)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index f6d0ad5ed449..f572e2947366 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
+XPIDL_LINK = $(PYTHON) $(LIBXUL_SDK)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen

From 8c8a4d9bf5e04b6312d3989a13015e9d1bcc5e7b Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Tue, 19 Apr 2011 01:29:48 +0200
Subject: [PATCH 280/509] Bug 633193 - Implement
 CalculateProcessCreationTimestamp() on OpenBSD. r=taras

---
 toolkit/components/startup/nsAppStartup.cpp | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
index e48e4f568f51..a6489253d690 100644
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
@@ -26,6 +26,7 @@
  *   Benjamin Smedberg <bsmedberg@covad.net>
  *   Daniel Brooks <db48x@db48x.net>
  *   Taras Glek <tglek@mozilla.com>
+ *   Landry Breuil <landry@openbsd.org>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -90,6 +91,11 @@
 #include <sys/sysctl.h>
 #endif
 
+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 #ifdef MOZ_ENABLE_LIBXUL
 extern PRTime gXRE_mainTimestamp;
@@ -646,6 +652,25 @@ CalculateProcessCreationTimestamp()
   free(proc);
   return starttime;
 }
+#elif defined(__OpenBSD__)
+static PRTime
+CalculateProcessCreationTimestamp()
+{
+  int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 };
+  size_t buffer_size;
+  if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0))
+    return 0;
+
+  struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size);
+  if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) {
+    free(proc);
+    return 0;
+  }
+  PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC;
+  starttime += proc->p_ustart_usec;
+  free(proc);
+  return starttime;
+}
 #else
 static PRTime
 CalculateProcessCreationTimestamp()

From e25a9ca2e3bf837d6117d6dd0945d1d8adcdfb80 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Mon, 18 Apr 2011 19:55:07 +0100
Subject: [PATCH 281/509] Bug 648819 - Stop ASSERTION: unknown nsISVGValue with
 invalid patternTransform. r=dholbert

---
 content/svg/content/src/nsSVGTransformList.cpp | 6 ++++--
 layout/svg/crashtests/648819-1.html            | 6 ++++++
 layout/svg/crashtests/crashtests.list          | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 layout/svg/crashtests/648819-1.html

diff --git a/content/svg/content/src/nsSVGTransformList.cpp b/content/svg/content/src/nsSVGTransformList.cpp
index 3b6090a6bf8d..580303bd458c 100644
--- a/content/svg/content/src/nsSVGTransformList.cpp
+++ b/content/svg/content/src/nsSVGTransformList.cpp
@@ -180,8 +180,7 @@ nsSVGTransformList::SetValueString(const nsAString& aValue)
   if (NS_FAILED(rv)) {
     // there was a parse error.
     rv = NS_ERROR_DOM_SYNTAX_ERR;
-  }
-  else {
+  } else {
     WillModify();
     ReleaseTransforms();
     PRInt32 count = xforms.Count();
@@ -235,6 +234,9 @@ NS_IMETHODIMP nsSVGTransformList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 /* void clear (); */
 NS_IMETHODIMP nsSVGTransformList::Clear()
 {
+  if (mTransforms.IsEmpty()) {
+    return NS_OK;
+  }
   WillModify();
   ReleaseTransforms();
   DidModify();
diff --git a/layout/svg/crashtests/648819-1.html b/layout/svg/crashtests/648819-1.html
new file mode 100644
index 000000000000..727ca3e55f7a
--- /dev/null
+++ b/layout/svg/crashtests/648819-1.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<script>
+var p = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
+p.setAttribute("patternTransform", "i");
+p.patternTransform.baseVal.clear();
+</script>
diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list
index 9d6155c4a608..91b71096d098 100644
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -105,3 +105,4 @@ load 612662-2.svg
 load 614367-1.svg
 load 620034-1.html
 load 621598-1.svg
+load 648819-1.html

From 77bd0e5388fb5d145f2aa497b01eaec1afb5dee1 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 19 Apr 2011 16:04:03 -0400
Subject: [PATCH 282/509] Bug 650676 - browser_autocompletesearch.js throws
 getting ProfD, then times out, on Android [r=vingtetun]

---
 .../tests/browser_autocompletesearch.js       | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/mobile/chrome/tests/browser_autocompletesearch.js b/mobile/chrome/tests/browser_autocompletesearch.js
index 95d0475a49d3..a16016a5ad0b 100644
--- a/mobile/chrome/tests/browser_autocompletesearch.js
+++ b/mobile/chrome/tests/browser_autocompletesearch.js
@@ -48,10 +48,29 @@ function saveMockCache() {
   info("mock path: " + mockCachePath);
   let mockCacheURI = getResolvedURI(mockCachePath);
   info("mock URI: " + mockCacheURI.spec);
-  let mockCacheFile = getChromeDir(mockCacheURI);
-  info("mock file: " + mockCacheFile.path);
-  mockCacheFile.append("mock_autocomplete.json");
-  mockCacheFile.copyToFollowingLinks(gProfileDir, "autocomplete.json");
+  if (mockCacheURI instanceof Ci.nsIJARURI) {
+    // Android tests are stored in a JAR file, so we need to extract the mock_autocomplete.json file
+    info("jar file: " + mockCacheURI.JARFile.spec);
+    let zReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(Ci.nsIZipReader);
+    let fileHandler = Cc["@mozilla.org/network/protocol;1?name=file"].getService(Ci.nsIFileProtocolHandler);
+    let fileName = fileHandler.getFileFromURLSpec(mockCacheURI.JARFile.spec);
+    zReader.open(fileName);
+
+    let extract = mockCacheURI.JARFile.spec.split("!")[1];
+    extract = extract.substring(1, extract.lastIndexOf("/") + 1);
+    extract += "mock_autocomplete.json";
+    info("extract path: " + extract);
+    let target = gProfileDir.clone();
+    target.append("autocomplete.json");
+    info("target path: " + target.path);
+    zReader.extract(extract, target);
+  } else {
+    // Tests are run from a folder, so we can just copy the mock_autocomplete.json file
+    let mockCacheFile = getChromeDir(mockCacheURI);
+    info("mock file: " + mockCacheFile.path);
+    mockCacheFile.append("mock_autocomplete.json");
+    mockCacheFile.copyToFollowingLinks(gProfileDir, "autocomplete.json");
+  }
 
   // Listen for when the mock cache has been loaded
   Services.obs.addObserver(function (aSubject, aTopic, aData) {

From 62611b3e52607687220f82cdd0b0d5b2f24e6ebb Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 19 Apr 2011 14:18:17 -0700
Subject: [PATCH 283/509] Bug 638352 - tab-modal dialogs can get into bad focus
 state and key events can bleed through tabs. r=gavin

---
 browser/base/content/tabbrowser.xml           | 38 ++++++++++--------
 .../components/prompts/src/CommonDialog.jsm   | 40 +++++++++++++------
 toolkit/components/prompts/src/nsPrompter.js  |  6 ---
 3 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index b647f11cd0ef..710678dcdb92 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -357,15 +357,10 @@
 
             let promptBox = {
               appendPrompt : function(args, onCloseCallback) {
-                let count = browser.getAttribute("tabmodalPromptShowing");
-                if (count)
-                    count = parseInt(count) + 1;
-                else
-                    count = 1;
-                browser.setAttribute("tabmodalPromptShowing", count);
-
                 let newPrompt = document.createElementNS(XUL_NS, "tabmodalprompt");
                 stack.appendChild(newPrompt);
+                browser.setAttribute("tabmodalPromptShowing", true);
+
                 newPrompt.clientTop; // style flush to assure binding is attached
 
                 let tab = self._getTabForContentWindow(browser.contentWindow);
@@ -374,21 +369,22 @@
               },
 
               removePrompt : function(aPrompt) {
-                let count = parseInt(browser.getAttribute("tabmodalPromptShowing"));
-                count--;
-                if (count)
-                    browser.setAttribute("tabmodalPromptShowing", count);
-                else
-                    browser.removeAttribute("tabmodalPromptShowing");
                 stack.removeChild(aPrompt);
+
+                let prompts = this.listPrompts();
+                if (prompts.length) {
+                  let prompt = prompts[prompts.length - 1];
+                  prompt.Dialog.setDefaultFocus();
+                } else {
+                  browser.removeAttribute("tabmodalPromptShowing");
+                  browser.focus();
+                }
               },
 
               listPrompts : function(aPrompt) {
-                let prompts = [];
                 let els = stack.getElementsByTagNameNS(XUL_NS, "tabmodalprompt");
                 // NodeList --> real JS array
-                for (let i = 0; i < els.length; i++)
-                  prompts.push(els[i]);
+                let prompts = Array.slice(els);
                 return prompts;
               },
             };
@@ -952,6 +948,16 @@
 
               // Adjust focus
               do {
+
+                // If there's a tabmodal prompt showing, focus it.
+                if (newBrowser.hasAttribute("tabmodalPromptShowing")) {
+                  let XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+                  let prompts = newBrowser.parentNode.getElementsByTagNameNS(XUL_NS, "tabmodalprompt");
+                  let prompt = prompts[prompts.length - 1];
+                  prompt.Dialog.setDefaultFocus();
+                  break;
+                }
+
                 // Focus the location bar if it was previously focused for that tab.
                 // In full screen mode, only bother making the location bar visible
                 // if the tab is a blank one.
diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
index 17eb824b1124..f335c3fb2591 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -190,18 +190,7 @@ CommonDialog.prototype = {
             button.setAttribute("default", "true");
 
         // Set default focus / selection.
-        if (!this.hasInputField) {
-            let isOSX = ("nsILocalFileMac" in Components.interfaces);
-            if (isOSX)
-                this.ui.infoBody.focus();
-            else
-                button.focus();
-        } else {
-            if (this.args.promptType == "promptPassword")
-                this.ui.password1Textbox.select();
-            else
-                this.ui.loginTextbox.select();
-        }
+        this.setDefaultFocus(true);
 
         if (this.args.enableDelay) {
             this.setButtonsEnabledState(false);
@@ -310,6 +299,33 @@ CommonDialog.prototype = {
         this.setButtonsEnabledState(true);
     },
 
+    setDefaultFocus : function(isInitialLoad) {
+        let b = (this.args.defaultButtonNum || 0);
+        let button = this.ui["button" + b];
+
+        if (!this.hasInputField) {
+            let isOSX = ("nsILocalFileMac" in Components.interfaces);
+            if (isOSX)
+                this.ui.infoBody.focus();
+            else
+                button.focus();
+        } else {
+            // When the prompt is initialized, focus and select the textbox
+            // contents. Afterwards, only focus the textbox.
+            if (this.args.promptType == "promptPassword") {
+                if (isInitialLoad)
+                    this.ui.password1Textbox.select();
+                else
+                    this.ui.password1Textbox.focus();
+            } else {
+                if (isInitialLoad)
+                    this.ui.loginTextbox.select();
+                else
+                    this.ui.loginTextbox.focus();
+            }
+        }
+    },
+
     onCheckbox : function() {
         this.args.checked = this.ui.checkbox.checked;
     },
diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js
index 59c92ce01e23..a58625c49d9b 100644
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -438,12 +438,6 @@ function openTabPrompt(domWin, tabPrompt, args) {
         winUtils.leaveModalStateWithWindow(callerWin);
 
         PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
-
-        // Restore focus to the previously focused element within tab.
-        let fm = Cc["@mozilla.org/focus-manager;1"].
-                 getService(Ci.nsIFocusManager);
-        let e = fm.getFocusedElementForWindow(domWin.top, false, {});
-        fm.setFocus(e, fm.FLAG_NOSCROLL);
     }
 
     let newPrompt;

From acc6ecc70e440af2a9429db46c5141f45be15cfd Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 19 Apr 2011 14:18:17 -0700
Subject: [PATCH 284/509] Bug 637160 - window-modal prompts used instead of
 tab-modal prompts when reentering a page using back/forward. r=bz

---
 layout/base/nsDocumentViewer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 8815f856a68a..3ef28eb3e7f7 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1360,6 +1360,8 @@ DocumentViewerImpl::Open(nsISupports *aState, nsISHEntry *aSHEntry)
   nsresult rv = InitInternal(mParentWidget, aState, mBounds, PR_FALSE);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  mHidden = PR_FALSE;
+
   if (mPresShell)
     mPresShell->SetForwardingContainer(nsnull);
 

From 0e53288b95853929829bc636feb33a10505939ab Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Tue, 19 Apr 2011 14:53:07 -0700
Subject: [PATCH 285/509] Bug 617289: PluginProvider doesn't keep IDs of
 plugins consistent between restarts. r=robstrong

---
 toolkit/mozapps/extensions/PluginProvider.jsm |  68 +++++--
 .../test/xpcshell/test_duplicateplugins.js    | 175 ++++++++++++++++++
 .../extensions/test/xpcshell/test_plugins.js  |  12 ++
 3 files changed, 235 insertions(+), 20 deletions(-)
 create mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js

diff --git a/toolkit/mozapps/extensions/PluginProvider.jsm b/toolkit/mozapps/extensions/PluginProvider.jsm
index 3e799d19512c..b8dee6cdca82 100644
--- a/toolkit/mozapps/extensions/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/PluginProvider.jsm
@@ -54,10 +54,41 @@ Components.utils.import("resource://gre/modules/Services.jsm");
   });
 }, this);
 
+function getIDHashForString(aStr) {
+  // return the two-digit hexadecimal code for a byte
+  function toHexString(charCode)
+    ("0" + charCode.toString(16)).slice(-2);
+
+  let hasher = Cc["@mozilla.org/security/hash;1"].
+               createInstance(Ci.nsICryptoHash);
+  hasher.init(Ci.nsICryptoHash.MD5);
+  let stringStream = Cc["@mozilla.org/io/string-input-stream;1"].
+                     createInstance(Ci.nsIStringInputStream);
+                     stringStream.data = aStr ? aStr : "null";
+  hasher.updateFromStream(stringStream, -1);
+
+  // convert the binary hash data to a hex string.
+  let binary = hasher.finish(false);
+  let hash = [toHexString(binary.charCodeAt(i)) for (i in binary)].join("").toLowerCase();
+  return "{" + hash.substr(0, 8) + "-" +
+               hash.substr(8, 4) + "-" +
+               hash.substr(12, 4) + "-" +
+               hash.substr(16, 4) + "-" +
+               hash.substr(20) + "}";
+}
+
 var PluginProvider = {
   // A dictionary mapping IDs to names and descriptions
   plugins: null,
 
+  /**
+   * Called when the application is shutting down. Only necessary for tests
+   * to be able to simulate a shutdown.
+   */
+  shutdown: function PL_shutdown() {
+    this.plugins = null;
+  },
+
   /**
    * Called to get an Addon with a particular ID.
    *
@@ -73,17 +104,9 @@ var PluginProvider = {
     if (aId in this.plugins) {
       let name = this.plugins[aId].name;
       let description = this.plugins[aId].description;
+      let tags = this.plugins[aId].tags;
 
-      let tags = Cc["@mozilla.org/plugin/host;1"].
-                 getService(Ci.nsIPluginHost).
-                 getPluginTags({});
-      let selected = [];
-      tags.forEach(function(aTag) {
-        if (aTag.name == name && aTag.description == description)
-          selected.push(aTag);
-      }, this);
-
-      aCallback(new PluginWrapper(aId, name, description, selected));
+      aCallback(new PluginWrapper(aId, name, description, tags));
     }
     else {
       aCallback(null);
@@ -148,19 +171,24 @@ var PluginProvider = {
                getPluginTags({});
 
     this.plugins = {};
-    let seen = {};
+    let plugins = {};
     tags.forEach(function(aTag) {
-      if (!(aTag.name in seen))
-        seen[aTag.name] = {};
-      if (!(aTag.description in seen[aTag.name])) {
-        let id = Cc["@mozilla.org/uuid-generator;1"].
-                 getService(Ci.nsIUUIDGenerator).
-                 generateUUID();
-        this.plugins[id] = {
+      if (!(aTag.name in plugins))
+        plugins[aTag.name] = {};
+      if (!(aTag.description in plugins[aTag.name])) {
+        let plugin = {
           name: aTag.name,
-          description: aTag.description
+          description: aTag.description,
+          tags: [aTag]
         };
-        seen[aTag.name][aTag.description] = true;
+
+        let id = getIDHashForString(aTag.name + aTag.description);
+
+        plugins[aTag.name][aTag.description] = plugin;
+        this.plugins[id] = plugin;
+      }
+      else {
+        plugins[aTag.name][aTag.description].tags.push(aTag);
       }
     }, this);
   }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js b/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js
new file mode 100644
index 000000000000..e6f2c8cf291c
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js
@@ -0,0 +1,175 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This verifies that duplicate plugins are coalesced and maintain their ID
+// across restarts.
+
+var PLUGINS = [{
+  name: "Duplicate Plugin 1",
+  description: "A duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "/home/mozilla/.plugins/dupplugin1.so"
+}, {
+  name: "Duplicate Plugin 1",
+  description: "A duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "",
+  filename: "/usr/lib/plugins/dupplugin1.so"
+}, {
+  name: "Duplicate Plugin 2",
+  description: "Another duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "/home/mozilla/.plugins/dupplugin2.so"
+}, {
+  name: "Duplicate Plugin 2",
+  description: "Another duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "",
+  filename: "/usr/lib/plugins/dupplugin2.so"
+}, {
+  name: "Non-duplicate Plugin", // 3
+  description: "Not a duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "/home/mozilla/.plugins/dupplugin3.so"
+}, {
+  name: "Non-duplicate Plugin", // 4
+  description: "Not a duplicate because the descriptions are different",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "",
+  filename: "/usr/lib/plugins/dupplugin4.so"
+}, {
+  name: "Another Non-duplicate Plugin", // 5
+  description: "Not a duplicate plugin",
+  version: "1",
+  blocklisted: false,
+  disabled: false,
+  filename: "/home/mozilla/.plugins/dupplugin5.so"
+}];
+
+// A fake plugin host to return the plugins defined above
+var PluginHost = {
+  getPluginTags: function(countRef) {
+    countRef.value = PLUGINS.length;
+    return PLUGINS;
+  },
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Components.interfaces.nsIPluginHost)
+     || iid.equals(Components.interfaces.nsISupports))
+      return this;
+  
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+var PluginHostFactory = {
+  createInstance: function (outer, iid) {
+    if (outer != null)
+      throw Components.results.NS_ERROR_NO_AGGREGATION;
+    return PluginHost.QueryInterface(iid);
+  }
+};
+
+var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+registrar.registerFactory(Components.ID("{721c3e73-969e-474b-a6dc-059fd288c428}"),
+                          "Fake Plugin Host",
+                          "@mozilla.org/plugin/host;1", PluginHostFactory);
+
+var gPluginIDs = [null, null, null, null, null];
+
+function run_test() {
+  do_test_pending();
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+  startupManager();
+
+  run_test_1();
+}
+
+function found_plugin(aNum, aId) {
+  if (gPluginIDs[aNum])
+    do_throw("Found duplicate of plugin " + aNum);
+  gPluginIDs[aNum] = aId;
+}
+
+// Test that the plugins were coalesced and all appear in the returned list
+function run_test_1() {
+  AddonManager.getAddonsByTypes(["plugin"], function(aAddons) {
+    do_check_eq(aAddons.length, 5);
+    aAddons.forEach(function(aAddon) {
+      if (aAddon.name == "Duplicate Plugin 1") {
+        found_plugin(0, aAddon.id);
+        do_check_eq(aAddon.description, "A duplicate plugin");
+      }
+      else if (aAddon.name == "Duplicate Plugin 2") {
+        found_plugin(1, aAddon.id);
+        do_check_eq(aAddon.description, "Another duplicate plugin");
+      }
+      else if (aAddon.name == "Another Non-duplicate Plugin") {
+        found_plugin(5, aAddon.id);
+        do_check_eq(aAddon.description, "Not a duplicate plugin");
+      }
+      else if (aAddon.name == "Non-duplicate Plugin") {
+        if (aAddon.description == "Not a duplicate plugin")
+          found_plugin(3, aAddon.id);
+        else if (aAddon.description == "Not a duplicate because the descriptions are different")
+          found_plugin(4, aAddon.id);
+        else
+          do_throw("Found unexpected plugin with description " + aAddon.description);
+      }
+      else {
+        do_throw("Found unexpected plugin " + aAddon.name);
+      }
+    });
+
+    run_test_2();
+  });
+}
+
+// Test that disabling a coalesced plugin disables all its tags
+function run_test_2() {
+  AddonManager.getAddonByID(gPluginIDs[0], function(p) {
+    do_check_false(p.userDisabled);
+    p.userDisabled = true;
+    do_check_true(PLUGINS[0].disabled);
+    do_check_true(PLUGINS[1].disabled);
+
+    run_test_3();
+  });
+}
+
+// Test that IDs persist across restart
+function run_test_3() {
+  restartManager();
+
+  AddonManager.getAddonByID(gPluginIDs[0], function(p) {
+    do_check_neq(p, null);
+    do_check_eq(p.name, "Duplicate Plugin 1");
+    do_check_eq(p.description, "A duplicate plugin");
+
+    // Reorder the plugins and restart again
+    [PLUGINS[0], PLUGINS[1]] = [PLUGINS[1], PLUGINS[0]];
+    restartManager();
+
+    AddonManager.getAddonByID(gPluginIDs[0], function(p) {
+      do_check_neq(p, null);
+      do_check_eq(p.name, "Duplicate Plugin 1");
+      do_check_eq(p.description, "A duplicate plugin");
+
+      do_test_finished();
+    });
+  });
+}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
index ace1f648e141..71e9ac14572f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
@@ -166,6 +166,18 @@ function run_test_3(p) {
     do_check_true(p.isActive);
     do_check_eq(p.name, "Test Plug-in");
 
+    run_test_4();
+  });
+}
+
+// Verify that after a restart the test plugin has the same ID
+function run_test_4() {
+  restartManager();
+
+  AddonManager.getAddonByID(gID, function(p) {
+    do_check_neq(p, null);
+    do_check_eq(p.name, "Test Plug-in");
+
     do_test_finished();
   });
 }

From 2fc576d5729f3b3895cadea1d912143ee51ffad7 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Tue, 19 Apr 2011 23:12:50 +0100
Subject: [PATCH 286/509] Bug 650950 Simplify DOMMouseScroll event handler
 r=dao

---
 browser/components/search/content/search.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index ea43bf7276d3..b1f474fff84c 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -523,11 +523,8 @@
 
       <handler event="DOMMouseScroll"
                phase="capturing"
-#ifdef XP_MACOSX
-               action="if (event.metaKey) this.selectEngine(event, (event.detail > 0));"/>
-#else
-               action="if (event.ctrlKey) this.selectEngine(event, (event.detail > 0));"/>
-#endif
+               modifiers="accel"
+               action="this.selectEngine(event, (event.detail > 0));"/>
     </handlers>
   </binding>
 

From a183e9343981c2a656ef525054de424fa315581d Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 19 Apr 2011 15:17:01 -0700
Subject: [PATCH 287/509] Bug 650828 - change runtestremote and remotereftests
 to generate pid file. r=ctalbert

---
 layout/tools/reftest/remotereftest.py | 17 +++++++++++++++++
 testing/mochitest/runtestsremote.py   | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/layout/tools/reftest/remotereftest.py b/layout/tools/reftest/remotereftest.py
index abb225489c39..17375d7cb3e8 100644
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -101,6 +101,12 @@ class RemoteOptions(ReftestOptions):
                     type = "string", dest = "remoteLogFile",
                     help = "Name of log file on the device relative to device root.  PLEASE USE ONLY A FILENAME.")
         defaults["remoteLogFile"] = None
+
+        self.add_option("--pidfile", action = "store",
+                    type = "string", dest = "pidFile",
+                    help = "name of the pidfile to generate")
+        defaults["pidFile"] = ""
+
         defaults["localLogName"] = None
 
         self.set_defaults(**defaults)
@@ -153,6 +159,11 @@ class RemoteOptions(ReftestOptions):
 
         options.logFile = options.remoteLogFile
 
+        if (options.pidFile != ""):
+            f = open(options.pidFile, 'w')
+            f.write("%s" % os.getpid())
+            f.close()
+
         # TODO: Copied from main, but I think these are no longer used in a post xulrunner world
         #options.xrePath = options.remoteTestRoot + self._automation._product + '/xulrunner'
         #options.utilityPath = options.testRoot + self._automation._product + '/bin'
@@ -238,6 +249,7 @@ class RemoteReftest(RefTest):
         self.remoteTestRoot = options.remoteTestRoot
         self.remoteLogFile = options.remoteLogFile
         self.localLogName = options.localLogName
+        self.pidFile = options.pidFile
         if self.automation.IS_DEBUG_BUILD:
             self.SERVER_STARTUP_TIMEOUT = 180
         else:
@@ -336,6 +348,11 @@ class RemoteReftest(RefTest):
         self._devicemanager.removeDir(self.remoteProfile)
         self._devicemanager.removeDir(self.remoteTestRoot)
         RefTest.cleanup(self, profileDir)
+        if (self.pidFile != ""):
+            try:
+                os.remove(self.pidFile)
+            except:
+                print "Warning: cleaning up pidfile '%s' was unsuccessful from the test harness" % self.pidFile
 
 def main():
     dm_none = DeviceManager(None, None)
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index 3e84d243c250..6d29fde90422 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -96,6 +96,11 @@ class RemoteOptions(MochitestOptions):
                     help = "ip address where the remote web server is hosted at")
         defaults["sslPort"] = automation.DEFAULT_SSL_PORT
 
+        self.add_option("--pidfile", action = "store",
+                    type = "string", dest = "pidFile",
+                    help = "name of the pidfile to generate")
+        defaults["pidFile"] = ""
+
         defaults["remoteTestRoot"] = None
         defaults["logFile"] = "mochitest.log"
         defaults["autorun"] = True
@@ -149,6 +154,11 @@ class RemoteOptions(MochitestOptions):
             else:
                 options.xrePath = options.utilityPath
 
+        if (options.pidFile != ""):
+            f = open(options.pidFile, 'w')
+            f.write("%s" % os.getpid())
+            f.close()
+
         return options
 
     def verifyOptions(self, options, mochitest):
@@ -183,6 +193,11 @@ class MochiRemote(Mochitest):
         self._dm.getFile(self.remoteLog, self.localLog)
         self._dm.removeFile(self.remoteLog)
         self._dm.removeDir(self.remoteProfile)
+        if (options.pidFile != ""):
+            try:
+                os.remove(options.pidFile)
+            except:
+                print "Warning: cleaning up pidfile '%s' was unsuccessful from the test harness" % options.pidFile
 
     def findPath(self, paths, filename = None):
         for path in paths:

From 694034860f8fee374af3bebad2f644b803b2f512 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 19 Apr 2011 15:17:02 -0700
Subject: [PATCH 288/509] Bug 649475 - [android-tests-only] remote jsreftests
 fail because user.js forces prompt for elevated privileges r=ctalbert

---
 layout/tools/reftest/remotereftest.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/layout/tools/reftest/remotereftest.py b/layout/tools/reftest/remotereftest.py
index 17375d7cb3e8..7d254e28f883 100644
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -102,6 +102,10 @@ class RemoteOptions(ReftestOptions):
                     help = "Name of log file on the device relative to device root.  PLEASE USE ONLY A FILENAME.")
         defaults["remoteLogFile"] = None
 
+        self.add_option("--enable-privilege", action="store_true", dest = "enablePrivilege",
+                    help = "add webserver and port to the user.js file for remote script access and universalXPConnect")
+        defaults["enablePrivilege"] = False
+
         self.add_option("--pidfile", action = "store",
                     type = "string", dest = "pidFile",
                     help = "name of the pidfile to generate")
@@ -316,6 +320,15 @@ class RemoteReftest(RefTest):
     def createReftestProfile(self, options, profileDir):
         RefTest.createReftestProfile(self, options, profileDir, server=options.remoteWebServer)
 
+        #workaround for jsreftests.
+        if options.enablePrivilege:
+          fhandle = open(os.path.join(profileDir, "user.js"), 'a')
+          fhandle.write("""
+user_pref("capability.principal.codebase.p2.granted", "UniversalPreferencesWrite UniversalXPConnect UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead");
+user_pref("capability.principal.codebase.p2.id", "http://%s:%s");
+""" % (options.remoteWebServer, options.httpPort))
+          fhandle.close()
+
         if (self._devicemanager.pushDir(profileDir, options.remoteProfile) == None):
             raise devicemanager.FileError("Failed to copy profiledir to device")
 

From 22100730c392a3c676d16404b4581486abb2a0b0 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@vt.edu>
Date: Mon, 18 Apr 2011 12:22:51 -0700
Subject: [PATCH 289/509] Bug 650834 - Add casts to pointer differences in
 assertion r=dougt

---
 gfx/ycbcr/ycbcr_to_rgb565.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gfx/ycbcr/ycbcr_to_rgb565.cpp b/gfx/ycbcr/ycbcr_to_rgb565.cpp
index 95f2c862eb36..24845359d1d4 100644
--- a/gfx/ycbcr/ycbcr_to_rgb565.cpp
+++ b/gfx/ycbcr/ycbcr_to_rgb565.cpp
@@ -377,7 +377,8 @@ NS_GFX_(void) ScaleYCbCrToRGB565(const PRUint8 *y_buf,
      that would require the mis-alignment to be the same for the U and V
      planes.*/
   NS_ASSERTION((y_pitch&15) == 0 && (uv_pitch&15) == 0 &&
-   ((y_buf-NULL)&15) == 0 && ((u_buf-NULL)&15) == 0 && ((v_buf-NULL)&15) == 0,
+   ((y_buf-(PRUint8 *)NULL)&15) == 0 &&
+   ((u_buf-(PRUint8 *)NULL)&15) == 0 && ((v_buf-(PRUint8 *)NULL)&15) == 0,
    "ScaleYCbCrToRGB565 source image unaligned");
   /*We take an area-based approach to pixel coverage to avoid shifting by small
      amounts (or not so small, when up-scaling or down-scaling by a large

From 688e762c8c3e30b7190e9f623e846a61f0c2863e Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 19 Apr 2011 10:47:40 +1200
Subject: [PATCH 290/509] Bug 586508 - Improve GL error code output. r=bjacob

---
 gfx/thebes/GLContext.h | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/GLContext.h b/gfx/thebes/GLContext.h
index 02db8fb0668e..a9ba22a83795 100644
--- a/gfx/thebes/GLContext.h
+++ b/gfx/thebes/GLContext.h
@@ -1031,13 +1031,40 @@ public:
             if (mDebugMode & DebugTrace)
                 printf_stderr("[gl:%p] < %s [0x%04x]\n", this, glFunction, mGLError);
             if (mGLError != LOCAL_GL_NO_ERROR) {
-                printf_stderr("GL ERROR: %s generated GL error 0x%x.", glFunction, mGLError);
+                printf_stderr("GL ERROR: %s generated GL error %s(0x%04x)\n", 
+                              glFunction,
+                              GLErrorToString(mGLError),
+                              mGLError);
                 if (mDebugMode & DebugAbortOnError)
                     NS_ABORT();
             }
         }
     }
 
+    const char* GLErrorToString(GLenum aError)
+    {
+        switch (aError) {
+            case LOCAL_GL_INVALID_ENUM:
+                return "GL_INVALID_ENUM";
+            case LOCAL_GL_INVALID_VALUE:
+                return "GL_INVALID_VALUE";
+            case LOCAL_GL_INVALID_OPERATION:
+                return "GL_INVALID_OPERATION";
+            case LOCAL_GL_STACK_OVERFLOW:
+                return "GL_STACK_OVERFLOW";
+            case LOCAL_GL_STACK_UNDERFLOW:
+                return "GL_STACK_UNDERFLOW";
+            case LOCAL_GL_OUT_OF_MEMORY:
+                return "GL_OUT_OF_MEMORY";
+            case LOCAL_GL_TABLE_TOO_LARGE:
+                return "GL_TABLE_TOO_LARGE";
+            case LOCAL_GL_INVALID_FRAMEBUFFER_OPERATION:
+                return "GL_INVALID_FRAMEBUFFER_OPERATION";
+            default:
+                return "";
+        }
+     }
+
 #define BEFORE_GL_CALL do {                     \
     BeforeGLCall(MOZ_FUNCTION_NAME);            \
 } while (0)

From af306501e02a80abe9a5622a8d9391ea00b38d5a Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 19 Apr 2011 10:49:00 +1200
Subject: [PATCH 291/509] Bug 638323 - Skip unnecessary MakeCurrent calls in
 GLContextProviderCGL. r=bjacob

---
 gfx/thebes/GLContextProviderCGL.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gfx/thebes/GLContextProviderCGL.mm b/gfx/thebes/GLContextProviderCGL.mm
index 242472e281a4..d1d4c79469ad 100644
--- a/gfx/thebes/GLContextProviderCGL.mm
+++ b/gfx/thebes/GLContextProviderCGL.mm
@@ -166,6 +166,10 @@ public:
 
     PRBool MakeCurrentImpl(PRBool aForce = PR_FALSE)
     {
+        if (!aForce && [NSOpenGLContext currentContext] == mContext) {
+            return PR_TRUE;
+        }
+
         if (mContext) {
             [mContext makeCurrentContext];
         }

From 66e0bad8173b3d605e95a8576399c0dc3b629236 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 19 Apr 2011 10:50:54 +1200
Subject: [PATCH 292/509] Bug 648741 - Correctly bind pixmaps to textures
 during the draw call on X11 accelerated layers. r=bjacob

---
 gfx/layers/opengl/ThebesLayerOGL.cpp | 4 ++--
 gfx/thebes/GLContextProviderGLX.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp
index 77ece0f28327..dd0cd7338ae4 100644
--- a/gfx/layers/opengl/ThebesLayerOGL.cpp
+++ b/gfx/layers/opengl/ThebesLayerOGL.cpp
@@ -210,8 +210,8 @@ ThebesLayerBufferOGL::RenderTo(const nsIntPoint& aOffset,
   }
 
   // Bind textures.
-  TextureImage::ScopedBindTexture(mTexImage, LOCAL_GL_TEXTURE0);
-  TextureImage::ScopedBindTexture(mTexImageOnWhite, LOCAL_GL_TEXTURE1);
+  TextureImage::ScopedBindTexture texBind(mTexImage, LOCAL_GL_TEXTURE0);
+  TextureImage::ScopedBindTexture texOnWhiteBind(mTexImageOnWhite, LOCAL_GL_TEXTURE1);
 
   float xres = mLayer->GetXResolution();
   float yres = mLayer->GetYResolution();
diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index 8e84d8fa11e8..dc0e584a7643 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -609,7 +609,7 @@ public:
         return mUpdateSurface.get();
     }
 
-    virtual PRBool InUpdate() const { return !mInUpdate; }
+    virtual PRBool InUpdate() const { return mInUpdate; }
 
 private:
    TextureImageGLX(GLuint aTexture,

From 487f99cce8079bf0a0171dde1c84921453ddfad8 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Mon, 18 Apr 2011 19:23:21 -0400
Subject: [PATCH 293/509] fix build bustage for jdk 1.5 from bug 650110 r=dougt

---
 build/mobile/sutagent/android/SUTAgentAndroid.java        | 1 -
 build/mobile/sutagent/android/watcher/WatcherService.java | 2 --
 2 files changed, 3 deletions(-)

diff --git a/build/mobile/sutagent/android/SUTAgentAndroid.java b/build/mobile/sutagent/android/SUTAgentAndroid.java
index b1cd070b8a22..77d4950906c7 100755
--- a/build/mobile/sutagent/android/SUTAgentAndroid.java
+++ b/build/mobile/sutagent/android/SUTAgentAndroid.java
@@ -293,7 +293,6 @@ public class SUTAgentAndroid extends Activity
             sText = sStatus;
         }
 
-        @Override
         public void run() {
             displayStatus(sText);
         }
diff --git a/build/mobile/sutagent/android/watcher/WatcherService.java b/build/mobile/sutagent/android/watcher/WatcherService.java
index ef2055e2c6f8..8560e62b2764 100644
--- a/build/mobile/sutagent/android/watcher/WatcherService.java
+++ b/build/mobile/sutagent/android/watcher/WatcherService.java
@@ -102,7 +102,6 @@ public class WatcherService extends Service
 
 
     private IWatcherService.Stub stub = new IWatcherService.Stub() {
-        @Override
         public int UpdateApplication(String sAppName, String sFileName, String sOutFile, int bReboot) throws RemoteException
             {
             return UpdtApp(sAppName, sFileName, sOutFile, bReboot);
@@ -841,7 +840,6 @@ public class WatcherService extends Service
             runner.start();
         }
 
-        @Override
         public void run() {
                bInstalling = true;
             UpdtApp(msPkgName, msPkgFileName, msOutFile, mbReboot);

From 3032962f2a085d391632371dc9eae8b02154dd42 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 19 Apr 2011 02:10:30 +0200
Subject: [PATCH 294/509] Backout b0217a5e665a due to build bustage.

---
 config/config.mk        | 2 +-
 js/src/config/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index f572e2947366..f6d0ad5ed449 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(LIBXUL_SDK)/sdk/bin/xpt.py link
+XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index f572e2947366..f6d0ad5ed449 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(LIBXUL_SDK)/sdk/bin/xpt.py link
+XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen

From e95cda65f3f2c88e5a64a4bdffc2a4274d2d5d5c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Apr 2011 20:15:53 -0400
Subject: [PATCH 295/509] Bug 649012 - Revert test_bug583948.xul since the new
 version fails on Linux64

---
 content/xul/document/test/test_bug583948.xul | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/xul/document/test/test_bug583948.xul b/content/xul/document/test/test_bug583948.xul
index 140ff88da6a9..630eb0e5f4dd 100644
--- a/content/xul/document/test/test_bug583948.xul
+++ b/content/xul/document/test/test_bug583948.xul
@@ -18,24 +18,24 @@ SimpleTest.waitForExplicitFinish();
 var attempts = 0;
 
 function update() {
+  setTimeout(function() {
+    if (otherWindow.location)
+      otherWindow.location.reload()
+    }, 1);
+  otherWindow.document.commandDispatcher.updateCommands('');
   // without the crash fix, this usually crashes after 2 to 4 reloads
   if (++attempts == 6) {
     ok(true, "didn't crash after 6 attempts");
     otherWindow.close();
-    SimpleTest.waitForFocus(function() {
-      SimpleTest.finish();
-    });
-  } else {
-    SimpleTest.waitForFocus(function() {
-      otherWindow.location.reload()
-      SimpleTest.waitForFocus(update, otherWindow);
-    });
-    otherWindow.document.commandDispatcher.updateCommands('');
+    SimpleTest.finish();
+  }
+  else {
+    setTimeout(update, 100);
   }
 }
 
 var otherWindow = window.open("window_bug583948.xul", "_new", "chrome");
-SimpleTest.waitForFocus(update, otherWindow);
+setTimeout(update, 100);
 </script>
 
 </window>

From bfecde1b126810274bdb8d930468a45c4d3cc3b2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 18 Apr 2011 20:46:38 -0400
Subject: [PATCH 296/509] When a wrapper is expired, do deferred release of
 mIdentity to fix bug 629610, and also lock the wrapped native map
 appropriately to fix bug 645442.  Accomplish both of these by sharing more
 code between FlatJSObjectFinalized and ~XPCWrappedNative; r=peterv

---
 js/src/xpconnect/src/xpcprivate.h         |  1 +
 js/src/xpconnect/src/xpcwrappednative.cpp | 40 ++++++++++++-----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 216781151a9a..42ab00d598b7 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -2760,6 +2760,7 @@ protected:
                      XPCNativeSet* aSet);
 
     virtual ~XPCWrappedNative();
+    void Destroy();
 
 private:
     enum {
diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp
index 3ca2b61beab5..623357b13bbd 100644
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -932,6 +932,12 @@ XPCWrappedNative::~XPCWrappedNative()
 {
     DEBUG_TrackDeleteWrapper(this);
 
+    Destroy();
+}
+
+void
+XPCWrappedNative::Destroy()
+{
     XPCWrappedNativeProto* proto = GetProto();
 
     if(mScriptableInfo &&
@@ -939,6 +945,7 @@ XPCWrappedNative::~XPCWrappedNative()
         (proto && proto->GetScriptableInfo() != mScriptableInfo)))
     {
         delete mScriptableInfo;
+        mScriptableInfo = nsnull;
     }
 
     XPCWrappedNativeScope *scope = GetScope();
@@ -959,7 +966,11 @@ XPCWrappedNative::~XPCWrappedNative()
         XPCJSRuntime* rt = GetRuntime();
         if(rt && rt->GetDoingFinalization())
         {
-            if(!rt->DeferredRelease(mIdentity))
+            if(rt->DeferredRelease(mIdentity))
+            {
+                mIdentity = nsnull;
+            }
+            else
             {
                 NS_WARNING("Failed to append object for deferred release.");
                 // XXX do we really want to do this???
@@ -971,6 +982,8 @@ XPCWrappedNative::~XPCWrappedNative()
             NS_RELEASE(mIdentity);
         }
     }
+
+    mMaybeScope = nsnull;
 }
 
 // This is factored out so that it can be called publicly 
@@ -1277,7 +1290,8 @@ NS_IMPL_THREADSAFE_RELEASE(XPCWrappedNative)
  *
  *  - The wrapper has a pointer to the nsISupports 'view' of the wrapped native
  *    object i.e... mIdentity. This is held until the wrapper's refcount goes
- *    to zero and the wrapper is released.
+ *    to zero and the wrapper is released, or until an expired wrapper (i.e.,
+ *    one unlinked by the cycle collector) has had its JS object finalized.
  *
  *  - The wrapper also has 'tearoffs'. It has one tearoff for each interface
  *    that is actually used on the native object. 'Used' means we have either
@@ -1372,23 +1386,6 @@ XPCWrappedNative::FlatJSObjectFinalized(JSContext *cx)
         }
     }
 
-    if(IsWrapperExpired())
-    {
-        GetScope()->GetWrappedNativeMap()->Remove(this);
-
-        XPCWrappedNativeProto* proto = GetProto();
-
-        if(mScriptableInfo &&
-           (!HasProto() ||
-            (proto && proto->GetScriptableInfo() != mScriptableInfo)))
-        {
-            delete mScriptableInfo;
-            mScriptableInfo = nsnull;
-        }
-
-        mMaybeScope = nsnull;
-    }
-
     nsWrapperCache *cache = nsnull;
     CallQueryInterface(mIdentity, &cache);
     if(cache)
@@ -1404,6 +1401,11 @@ XPCWrappedNative::FlatJSObjectFinalized(JSContext *cx)
     NS_ASSERTION(*(int*)mIdentity != 0,          "bad pointer!");
 #endif
 
+    if(IsWrapperExpired())
+    {
+        Destroy();
+    }
+
     // Note that it's not safe to touch mNativeWrapper here since it's
     // likely that it has already been finalized.
 

From 4e1a8c20b862ef954b0a6aa87f7243a0ad5d8b48 Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Tue, 19 Apr 2011 10:11:09 +0900
Subject: [PATCH 297/509] Bug 634286.  Remove font cache size info from
 about:support on Windows. r=jmuizelaar

---
 gfx/thebes/gfxWindowsPlatform.cpp | 33 -------------------------------
 gfx/thebes/gfxWindowsPlatform.h   |  2 --
 widget/src/windows/GfxInfo.cpp    |  8 +-------
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index f7f2deb06a5a..a975fbfca4e2 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -78,9 +78,6 @@
 #endif
 #endif
 
-#include <shlobj.h>
-#include <shlwapi.h>
-
 #ifdef CAIRO_HAS_D2D_SURFACE
 #include "gfxD2DSurface.h"
 
@@ -779,36 +776,6 @@ gfxWindowsPlatform::GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion
     aVersion.Assign(NS_ConvertUTF8toUTF16(buf));
 }
 
-void
-gfxWindowsPlatform::GetFontCacheSize(nsAString& aSize)
-{
-    WIN32_FIND_DATAW findFileData;
-    HANDLE file;
-    WCHAR path[MAX_PATH];
-
-    aSize.Assign(L"n/a");
-
-    if (FAILED(SHGetFolderPathW(NULL, CSIDL_WINDOWS, NULL, 0, path))) {
-        return;
-    }
-
-    PathAppendW(path, 
-        L"ServiceProfiles\\LocalService\\AppData\\Local\\FontCache-*-*.dat");
-    file = FindFirstFileW(path, &findFileData);
-    if (file == INVALID_HANDLE_VALUE) {
-        return;
-    }
-
-    WCHAR size[256];
-
-    double sizeMB = (double(findFileData.nFileSizeLow) +
-                     findFileData.nFileSizeHigh * (double(MAXDWORD) + 1))
-                    / 1000000.0;
-    swprintf_s(size, NS_ARRAY_LENGTH(size), L"%.2f MB", sizeMB);
-    aSize.Assign(size);
-    FindClose(file);
-}
-
 void
 gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref)
 {
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index e92c14bd1ff0..641d66220237 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -236,8 +236,6 @@ public:
 
     static void GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion);
 
-    static void GetFontCacheSize(nsAString& aSize);
-
     virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);
 
 #ifdef CAIRO_HAS_DWRITE_FONT
diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp
index d7f4507d9cb9..342b642de444 100644
--- a/widget/src/windows/GfxInfo.cpp
+++ b/widget/src/windows/GfxInfo.cpp
@@ -102,13 +102,7 @@ GfxInfo::GetDWriteEnabled(PRBool *aEnabled)
 NS_IMETHODIMP
 GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
 {
-  nsAutoString str;
-  gfxWindowsPlatform::GetPlatform()->GetDLLVersion(L"dwrite.dll", str);
-  aDwriteVersion.Assign(str);
-  aDwriteVersion.Append(L", font cache ");
-  gfxWindowsPlatform::GetPlatform()->GetFontCacheSize(str);
-  aDwriteVersion.Append(str);
-
+  gfxWindowsPlatform::GetPlatform()->GetDLLVersion(L"dwrite.dll", aDwriteVersion);
   return NS_OK;
 }
 

From 99c5414e91cd44ba6a9ee60c81f818b6508d1603 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Apr 2011 22:51:28 -0400
Subject: [PATCH 298/509] Mark spellcheck-hyphen-valid.html as passing on
 Android

---
 layout/reftests/editor/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/editor/reftest.list b/layout/reftests/editor/reftest.list
index fcc920285b84..80a5caf9dfec 100644
--- a/layout/reftests/editor/reftest.list
+++ b/layout/reftests/editor/reftest.list
@@ -47,7 +47,7 @@ needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocu
 needs-focus == caret_after_reframe.html caret_after_reframe-ref.html
 == nobogusnode-1.html nobogusnode-ref.html
 == nobogusnode-2.html nobogusnode-ref.html
-fails-if(Android) == spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
+== spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
 fails-if(Android) != spellcheck-hyphen-invalid.html spellcheck-hyphen-invalid-ref.html
 == spellcheck-slash-valid.html spellcheck-slash-valid-ref.html
 == spellcheck-period-valid.html spellcheck-period-valid-ref.html

From 7b717f5250c256f3105d5e4d76e66f585ff65121 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Mon, 18 Apr 2011 19:54:11 -0700
Subject: [PATCH 299/509] Bug 618052: Intermittent test_utils_queryAsync.js:
 don't call success callback on error. r=philiKON

---
 services/sync/modules/util.js                     | 12 ++++++++++--
 services/sync/tests/unit/test_utils_queryAsync.js |  8 ++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 505951a1d3ed..63588f2f7395 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -53,7 +53,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 const CB_READY = {};
 const CB_COMPLETE = {};
 const CB_FAIL = {};
-
+const REASON_ERROR = Ci.mozIStorageStatementCallback.REASON_ERROR;
 
 /*
  * Utility functions
@@ -217,7 +217,8 @@ let Utils = {
   // than on every queryAsync invocation.
   _storageCallbackPrototype: {
     results: null,
-    // These are set by queryAsync
+
+    // These are set by queryAsync.
     names: null,
     syncCb: null,
 
@@ -241,6 +242,13 @@ let Utils = {
       this.syncCb.throw(error);
     },
     handleCompletion: function handleCompletion(reason) {
+
+      // If we got an error, handleError will also have been called, so don't
+      // call the callback! We never cancel statements, so we don't need to
+      // address that quandary.
+      if (reason == REASON_ERROR)
+        return;
+
       // If we were called with column names but didn't find any results,
       // the calling code probably still expects an array as a return value.
       if (this.names && !this.results) {
diff --git a/services/sync/tests/unit/test_utils_queryAsync.js b/services/sync/tests/unit/test_utils_queryAsync.js
index e171bbaa85a2..234be1b1c131 100644
--- a/services/sync/tests/unit/test_utils_queryAsync.js
+++ b/services/sync/tests/unit/test_utils_queryAsync.js
@@ -1,7 +1,11 @@
 _("Make sure queryAsync will synchronously fetch rows for a query asyncly");
 Cu.import("resource://services-sync/util.js");
 
+const SQLITE_CONSTRAINT_VIOLATION = 19;  // http://www.sqlite.org/c3ref/c_abort.html
+
 function run_test() {
+  initTestLogging("Trace");
+
   _("Using the form service to test queries");
   function c(query) Svc.Form.DBConnection.createStatement(query);
 
@@ -64,14 +68,14 @@ function run_test() {
   do_check_eq(r10.length, 3);
 
   _("Generate an execution error");
-  let r11, except, query = c("UPDATE moz_formhistory SET value = NULL WHERE fieldname = 'more'");
+  let r11, except, query = c("INSERT INTO moz_formhistory (fieldname, value) VALUES ('one', NULL)");
   try {
     r11 = Utils.queryAsync(query);
   } catch(e) {
     except = e;
   }
   do_check_true(!!except);
-  do_check_eq(except.result, 19); // constraint violation error
+  do_check_eq(except.result, SQLITE_CONSTRAINT_VIOLATION);
 
   _("Cleaning up");
   Utils.queryAsync(c("DELETE FROM moz_formhistory"));

From 3c866720cc8627e55a053b6215273728c3f4962c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:21 +1200
Subject: [PATCH 300/509] Bug 641426. Part 1: Create Point and Size templates.
 r=joe,sr=cjones

---
 content/canvas/src/CanvasImageCache.h   |   3 +-
 gfx/src/BasePoint.h                     | 100 +++++++++++++++++++
 gfx/src/BaseSize.h                      | 101 +++++++++++++++++++
 gfx/src/Makefile.in                     |  12 ++-
 gfx/src/nsPoint.h                       |  84 +++-------------
 gfx/src/nsSize.h                        |  59 +++--------
 gfx/thebes/gfxContext.cpp               |   8 +-
 gfx/thebes/gfxPoint.h                   | 125 +++---------------------
 gfx/thebes/gfxRect.h                    |   7 +-
 ipc/glue/IPCMessageUtils.h              |  18 ----
 layout/base/nsCSSRenderingBorders.cpp   |   2 +-
 layout/generic/nsObjectFrame.cpp        |   4 +-
 layout/mathml/nsMathMLmencloseFrame.cpp |   2 +-
 layout/mathml/nsMathMLmfracFrame.cpp    |   2 +-
 layout/svg/base/src/nsSVGUtils.h        |   1 -
 15 files changed, 264 insertions(+), 264 deletions(-)
 create mode 100644 gfx/src/BasePoint.h
 create mode 100644 gfx/src/BaseSize.h

diff --git a/content/canvas/src/CanvasImageCache.h b/content/canvas/src/CanvasImageCache.h
index bc5680fa8a7c..073e6250ab30 100644
--- a/content/canvas/src/CanvasImageCache.h
+++ b/content/canvas/src/CanvasImageCache.h
@@ -42,7 +42,8 @@ class nsIDOMElement;
 class nsHTMLCanvasElement;
 class imgIRequest;
 class gfxASurface;
-struct gfxIntSize;
+
+#include "gfxPoint.h"
 
 namespace mozilla {
 
diff --git a/gfx/src/BasePoint.h b/gfx/src/BasePoint.h
new file mode 100644
index 000000000000..568caf80ab65
--- /dev/null
+++ b/gfx/src/BasePoint.h
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASEPOINT_H_
+#define MOZILLA_BASEPOINT_H_
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass. This allows methods to safely
+ * cast 'this' to 'Sub*'.
+ */
+template <class T, class Sub>
+struct BasePoint {
+  T x, y;
+
+  // Constructors
+  BasePoint() : x(0), y(0) {}
+  BasePoint(T aX, T aY) : x(aX), y(aY) {}
+
+  void MoveTo(T aX, T aY) { x = aX; y = aY; }
+  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
+
+  // Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+
+  bool operator==(const Sub& aPoint) const {
+    return x == aPoint.x && y == aPoint.y;
+  }
+  bool operator!=(const Sub& aPoint) const {
+    return x != aPoint.x || y != aPoint.y;
+  }
+
+  Sub operator+(const Sub& aPoint) const {
+    return Sub(x + aPoint.x, y + aPoint.y);
+  }
+  Sub operator-(const Sub& aPoint) const {
+    return Sub(x - aPoint.x, y - aPoint.y);
+  }
+  Sub& operator+=(const Sub& aPoint) {
+    x += aPoint.x;
+    y += aPoint.y;
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Sub& aPoint) {
+    x -= aPoint.x;
+    y -= aPoint.y;
+    return *static_cast<Sub*>(this);
+  }
+
+  Sub operator*(T aScale) const {
+    return Sub(x * aScale, y * aScale);
+  }
+  Sub operator/(T aScale) const {
+    return Sub(x / aScale, y / aScale);
+  }
+
+  Sub operator-() const {
+    return Sub(-x, -y);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASEPOINT_H_ */
diff --git a/gfx/src/BaseSize.h b/gfx/src/BaseSize.h
new file mode 100644
index 000000000000..5cb3ba58de57
--- /dev/null
+++ b/gfx/src/BaseSize.h
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASESIZE_H_
+#define MOZILLA_BASESIZE_H_
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass. This allows methods to safely
+ * cast 'this' to 'Sub*'.
+ */
+template <class T, class Sub>
+struct BaseSize {
+  T width, height;
+
+  // Constructors
+  BaseSize() : width(0), height(0) {}
+  BaseSize(T aWidth, T aHeight) : width(aWidth), height(aHeight) {}
+
+  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
+
+  // Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+
+  bool operator==(const Sub& aSize) const {
+    return width == aSize.width && height == aSize.height;
+  }
+  bool operator!=(const Sub& aSize) const {
+    return width != aSize.width || height != aSize.height;
+  }
+  bool operator<=(const Sub& aSize) const {
+    return width <= aSize.width && height <= aSize.height;
+  }
+  bool operator<(const Sub& aSize) const {
+    return *this <= aSize && *this != aSize;
+  }
+
+  Sub operator+(const Sub& aSize) const {
+    return Sub(width + aSize.width, height + aSize.height);
+  }
+  Sub operator-(const Sub& aSize) const {
+    return Sub(width - aSize.width, height - aSize.height);
+  }
+  Sub& operator+=(const Sub& aSize) {
+    width += aSize.width;
+    height += aSize.height;
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Sub& aSize) {
+    width -= aSize.width;
+    height -= aSize.height;
+    return *static_cast<Sub*>(this);
+  }
+
+  Sub operator*(T aScale) const {
+    return Sub(width * aScale, height * aScale);
+  }
+  Sub operator/(T aScale) const {
+    return Sub(width / aScale, height / aScale);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASESIZE_H_ */
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 7e8f8ecda1df..9107492d8dec 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -59,8 +59,16 @@ XPIDLSRCS = \
 	gfxidltypes.idl \
 	$(NULL)
 
+EXPORTS_NAMESPACES = mozilla
+
+EXPORTS_mozilla = \
+	BasePoint.h \
+	BaseSize.h \
+	$(NULL)
+
 EXPORTS	= \
 	gfxCore.h \
+	gfxCrashReporterUtils.h \
 	nsColor.h \
 	nsColorNames.h \
 	nsColorNameList.h \
@@ -79,13 +87,11 @@ EXPORTS	= \
 	nsIRegion.h \
 	nsITheme.h \
 	nsThemeConstants.h \
-	gfxCrashReporterUtils.h \
 	nsBoundingMetrics.h \
 	$(NULL)
 
 ifdef MOZ_X11
-EXPORTS_NAMESPACES	= mozilla
-EXPORTS_mozilla		= X11Util.h
+EXPORTS_mozilla	+= X11Util.h
 endif
 
 CPPSRCS = \
diff --git a/gfx/src/nsPoint.h b/gfx/src/nsPoint.h
index 34ebdbaff4a2..d67e15857ff8 100644
--- a/gfx/src/nsPoint.h
+++ b/gfx/src/nsPoint.h
@@ -39,48 +39,18 @@
 #define NSPOINT_H
 
 #include "nsCoord.h"
+#include "mozilla/BaseSize.h"
+#include "mozilla/BasePoint.h"
+#include "nsSize.h"
 
 struct nsIntPoint;
 
-struct nsPoint {
-  nscoord x, y;
+struct nsPoint : public mozilla::BasePoint<nscoord, nsPoint> {
+  typedef mozilla::BasePoint<nscoord, nsPoint> Super;
 
-  // Constructors
-  nsPoint() {}
-  nsPoint(const nsPoint& aPoint) { x = aPoint.x; y = aPoint.y;}
-  nsPoint(nscoord aX, nscoord aY) { VERIFY_COORD(aX); VERIFY_COORD(aY); x = aX; y = aY;}
-
-  void MoveTo(nscoord aX, nscoord aY) {x = aX; y = aY;}
-  void MoveBy(nscoord aDx, nscoord aDy) {x += aDx; y += aDy;}
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-  PRBool   operator==(const nsPoint& aPoint) const {
-    return (PRBool) ((x == aPoint.x) && (y == aPoint.y));
-  }
-  PRBool   operator!=(const nsPoint& aPoint) const {
-    return (PRBool) ((x != aPoint.x) || (y != aPoint.y));
-  }
-  nsPoint operator+(const nsPoint& aPoint) const {
-    return nsPoint(x + aPoint.x, y + aPoint.y);
-  }
-  nsPoint operator-(const nsPoint& aPoint) const {
-    return nsPoint(x - aPoint.x, y - aPoint.y);
-  }
-  nsPoint& operator+=(const nsPoint& aPoint) {
-    x += aPoint.x;
-    y += aPoint.y;
-    return *this;
-  }
-  nsPoint& operator-=(const nsPoint& aPoint) {
-    x -= aPoint.x;
-    y -= aPoint.y;
-    return *this;
-  }
-
-  nsPoint operator-() const {
-    return nsPoint(-x, -y);
-  }
+  nsPoint() : Super() {}
+  nsPoint(const nsPoint& aPoint) : Super(aPoint) {}
+  nsPoint(nscoord aX, nscoord aY) : Super(aX, aY) {}
 
   inline nsIntPoint ToNearestPixels(nscoord aAppUnitsPerPixel) const;
 
@@ -88,40 +58,12 @@ struct nsPoint {
   inline nsPoint ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const;
 };
 
-struct nsIntPoint {
-  PRInt32 x, y;
+struct nsIntPoint : public mozilla::BasePoint<PRInt32, nsIntPoint> {
+  typedef mozilla::BasePoint<PRInt32, nsIntPoint> Super;
 
-  // Constructors
-  nsIntPoint() {}
-  nsIntPoint(const nsIntPoint& aPoint) { x = aPoint.x; y = aPoint.y;}
-  nsIntPoint(PRInt32 aX, PRInt32 aY) { x = aX; y = aY;}
-
-  PRBool   operator==(const nsIntPoint& aPoint) const {
-    return (PRBool) ((x == aPoint.x) && (y == aPoint.y));
-  }
-  PRBool   operator!=(const nsIntPoint& aPoint) const {
-    return (PRBool) ((x != aPoint.x) || (y != aPoint.y));
-  }
-  nsIntPoint operator+(const nsIntPoint& aPoint) const {
-    return nsIntPoint(x + aPoint.x, y + aPoint.y);
-  }
-  nsIntPoint operator-(const nsIntPoint& aPoint) const {
-    return nsIntPoint(x - aPoint.x, y - aPoint.y);
-  }
-  nsIntPoint& operator+=(const nsIntPoint& aPoint) {
-    x += aPoint.x;
-    y += aPoint.y;
-    return *this;
-  }
-  nsIntPoint& operator-=(const nsIntPoint& aPoint) {
-    x -= aPoint.x;
-    y -= aPoint.y;
-    return *this;
-  }
-  nsIntPoint operator-() const {
-    return nsIntPoint(-x, -y);
-  }
-  void MoveTo(PRInt32 aX, PRInt32 aY) {x = aX; y = aY;}
+  nsIntPoint() : Super() {}
+  nsIntPoint(const nsIntPoint& aPoint) : Super(aPoint) {}
+  nsIntPoint(PRInt32 aX, PRInt32 aY) : Super(aX, aY) {}
 };
 
 inline nsIntPoint
diff --git a/gfx/src/nsSize.h b/gfx/src/nsSize.h
index 9e3fd5ccdc63..4e2cb6b8b07b 100644
--- a/gfx/src/nsSize.h
+++ b/gfx/src/nsSize.h
@@ -39,65 +39,28 @@
 #define NSSIZE_H
 
 #include "nsCoord.h"
+#include "mozilla/BaseSize.h"
 
 // Maximum allowable size
 #define NS_MAXSIZE nscoord_MAX
 
-struct nsSize {
-  nscoord width, height;
+struct nsSize : public mozilla::BaseSize<nscoord, nsSize> {
+  typedef mozilla::BaseSize<nscoord, nsSize> Super;
 
-  // Constructors
-  nsSize() {}
-  nsSize(const nsSize& aSize) {width = aSize.width; height = aSize.height;}
-  nsSize(nscoord aWidth, nscoord aHeight) {width = aWidth; height = aHeight;}
-
-  void SizeTo(nscoord aWidth, nscoord aHeight) {width = aWidth; height = aHeight;}
-  void SizeBy(nscoord aDeltaWidth, nscoord aDeltaHeight) {width += aDeltaWidth;
-                                                          height += aDeltaHeight;}
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-  PRBool  operator==(const nsSize& aSize) const {
-    return (PRBool) ((width == aSize.width) && (height == aSize.height));
-  }
-  PRBool  operator!=(const nsSize& aSize) const {
-    return (PRBool) ((width != aSize.width) || (height != aSize.height));
-  }
-  nsSize operator+(const nsSize& aSize) const {
-    return nsSize(width + aSize.width, height + aSize.height);
-  }
-  nsSize& operator+=(const nsSize& aSize) {width += aSize.width;
-                                           height += aSize.height;
-                                           return *this;}
+  nsSize() : Super() {}
+  nsSize(const nsSize& aSize) : Super(aSize) {}
+  nsSize(nscoord aWidth, nscoord aHeight) : Super(aWidth, aHeight) {}
 
   // Converts this size from aFromAPP, an appunits per pixel ratio, to aToAPP.
   inline nsSize ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const;
 };
 
-struct nsIntSize {
-  PRInt32 width, height;
+struct nsIntSize : public mozilla::BaseSize<PRInt32, nsIntSize> {
+  typedef mozilla::BaseSize<PRInt32, nsIntSize> Super;
 
-  nsIntSize() {}
-  nsIntSize(const nsIntSize& aSize) {width = aSize.width; height = aSize.height;}
-  nsIntSize(PRInt32 aWidth, PRInt32 aHeight) {width = aWidth; height = aHeight;}
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-  PRBool  operator==(const nsIntSize& aSize) const {
-    return (PRBool) ((width == aSize.width) && (height == aSize.height));
-  }
-  PRBool  operator!=(const nsIntSize& aSize) const {
-    return (PRBool) ((width != aSize.width) || (height != aSize.height));
-  }
-  PRBool  operator<(const nsIntSize& aSize) const {
-    return (PRBool) (operator<=(aSize) &&
-                     (width < aSize.width || height < aSize.height));
-  }
-  PRBool  operator<=(const nsIntSize& aSize) const {
-    return (PRBool) ((width <= aSize.width) && (height <= aSize.height));
-  }
-
-  void SizeTo(PRInt32 aWidth, PRInt32 aHeight) {width = aWidth; height = aHeight;}
+  nsIntSize() : Super() {}
+  nsIntSize(const nsIntSize& aSize) : Super(aSize) {}
+  nsIntSize(PRInt32 aWidth, PRInt32 aHeight) : Super(aWidth, aHeight) {}
 };
 
 inline nsSize
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index dd2d90fb059f..341df78cbc00 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -254,7 +254,7 @@ void
 gfxContext::Ellipse(const gfxPoint& center, const gfxSize& dimensions)
 {
     gfxSize halfDim = dimensions / 2.0;
-    gfxRect r(center - halfDim, dimensions);
+    gfxRect r(center - gfxPoint(halfDim.width, halfDim.height), dimensions);
     gfxCornerSizes c(halfDim, halfDim, halfDim, halfDim);
 
     RoundedRectangle (r, c);
@@ -430,9 +430,9 @@ gfxContext::UserToDevicePixelSnapped(gfxRect& rect, PRBool ignoreScale) const
         return PR_FALSE;
 #undef WITHIN_E
 
-    gfxPoint p1 = UserToDevice(rect.pos);
-    gfxPoint p2 = UserToDevice(rect.pos + gfxSize(rect.size.width, 0.0));
-    gfxPoint p3 = UserToDevice(rect.pos + rect.size);
+    gfxPoint p1 = UserToDevice(rect.TopLeft());
+    gfxPoint p2 = UserToDevice(rect.TopRight());
+    gfxPoint p3 = UserToDevice(rect.BottomRight());
 
     // Check that the rectangle is axis-aligned. For an axis-aligned rectangle,
     // two opposite corners define the entire rectangle. So check if
diff --git a/gfx/thebes/gfxPoint.h b/gfx/thebes/gfxPoint.h
index 09c92a357181..610ae4b08603 100644
--- a/gfx/thebes/gfxPoint.h
+++ b/gfx/thebes/gfxPoint.h
@@ -39,125 +39,30 @@
 #define GFX_POINT_H
 
 #include "nsMathUtils.h"
+#include "mozilla/BaseSize.h"
+#include "mozilla/BasePoint.h"
+#include "nsSize.h"
+#include "nsPoint.h"
 
 #include "gfxTypes.h"
 
-/*
- * gfxSize and gfxIntSize -- please keep their member functions in sync.
- * also note: gfxIntSize may be replaced by nsIntSize at some point...
- */
-struct THEBES_API gfxIntSize {
-    PRInt32 width, height;
+typedef nsIntSize gfxIntSize;
 
-    gfxIntSize() {}
-    gfxIntSize(PRInt32 _width, PRInt32 _height) : width(_width), height(_height) {}
+struct THEBES_API gfxSize : public mozilla::BaseSize<gfxFloat, gfxSize> {
+    typedef mozilla::BaseSize<gfxFloat, gfxSize> Super;
 
-    void SizeTo(PRInt32 _width, PRInt32 _height) {width = _width; height = _height;}
-
-    int operator==(const gfxIntSize& s) const {
-        return ((width == s.width) && (height == s.height));
-    }
-    int operator!=(const gfxIntSize& s) const {
-        return ((width != s.width) || (height != s.height));
-    }
-    bool operator<(const gfxIntSize& s) const {
-        return (operator<=(s) &&
-                (width < s.width || height < s.height));
-    }
-    bool operator<=(const gfxIntSize& s) const {
-        return (width <= s.width) && (height <= s.height);
-    }
-    gfxIntSize operator+(const gfxIntSize& s) const {
-        return gfxIntSize(width + s.width, height + s.height);
-    }
-    gfxIntSize operator-() const {
-        return gfxIntSize(- width, - height);
-    }
-    gfxIntSize operator-(const gfxIntSize& s) const {
-        return gfxIntSize(width - s.width, height - s.height);
-    }
-    gfxIntSize operator*(const PRInt32 v) const {
-        return gfxIntSize(width * v, height * v);
-    }
-    gfxIntSize operator/(const PRInt32 v) const {
-        return gfxIntSize(width / v, height / v);
-    }
+    gfxSize() : Super() {}
+    gfxSize(gfxFloat aWidth, gfxFloat aHeight) : Super(aWidth, aHeight) {}
+    gfxSize(const nsIntSize& aSize) : Super(aSize.width, aSize.height) {}
 };
 
-struct THEBES_API gfxSize {
-    gfxFloat width, height;
+struct THEBES_API gfxPoint : public mozilla::BasePoint<gfxFloat, gfxPoint> {
+    typedef mozilla::BasePoint<gfxFloat, gfxPoint> Super;
 
-    gfxSize() {}
-    gfxSize(gfxFloat _width, gfxFloat _height) : width(_width), height(_height) {}
-    gfxSize(const gfxIntSize& size) : width(size.width), height(size.height) {}
+    gfxPoint() : Super() {}
+    gfxPoint(gfxFloat aX, gfxFloat aY) : Super(aX, aY) {}
+    gfxPoint(const nsIntPoint& aPoint) : Super(aPoint.x, aPoint.y) {}
 
-    void SizeTo(gfxFloat _width, gfxFloat _height) {width = _width; height = _height;}
-
-    int operator==(const gfxSize& s) const {
-        return ((width == s.width) && (height == s.height));
-    }
-    int operator!=(const gfxSize& s) const {
-        return ((width != s.width) || (height != s.height));
-    }
-    gfxSize operator+(const gfxSize& s) const {
-        return gfxSize(width + s.width, height + s.height);
-    }
-    gfxSize operator-() const {
-        return gfxSize(- width, - height);
-    }
-    gfxSize operator-(const gfxSize& s) const {
-        return gfxSize(width - s.width, height - s.height);
-    }
-    gfxSize operator*(const gfxFloat v) const {
-        return gfxSize(width * v, height * v);
-    }
-    gfxSize operator/(const gfxFloat v) const {
-        return gfxSize(width / v, height / v);
-    }
-};
-
-
-
-struct THEBES_API gfxPoint {
-    gfxFloat x, y;
-
-    gfxPoint() { }
-    gfxPoint(gfxFloat _x, gfxFloat _y) : x(_x), y(_y) {}
-
-    void MoveTo(gfxFloat aX, gfxFloat aY) { x = aX; y = aY; }
-
-    int operator==(const gfxPoint& p) const {
-        return ((x == p.x) && (y == p.y));
-    }
-    int operator!=(const gfxPoint& p) const {
-        return ((x != p.x) || (y != p.y));
-    }
-    const gfxPoint& operator+=(const gfxPoint& p) {
-        x += p.x;
-        y += p.y;
-        return *this;
-    }
-    gfxPoint operator+(const gfxPoint& p) const {
-        return gfxPoint(x + p.x, y + p.y);
-    }
-    gfxPoint operator+(const gfxSize& s) const {
-        return gfxPoint(x + s.width, y + s.height);
-    }
-    gfxPoint operator-(const gfxPoint& p) const {
-        return gfxPoint(x - p.x, y - p.y);
-    }
-    gfxPoint operator-(const gfxSize& s) const {
-        return gfxPoint(x - s.width, y - s.height);
-    }
-    gfxPoint operator-() const {
-        return gfxPoint(- x, - y);
-    }
-    gfxPoint operator*(const gfxFloat v) const {
-        return gfxPoint(x * v, y * v);
-    }
-    gfxPoint operator/(const gfxFloat v) const {
-        return gfxPoint(x / v, y / v);
-    }
     // Round() is *not* rounding to nearest integer if the values are negative.
     // They are always rounding as floor(n + 0.5).
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=410748#c14
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index 5f614c02856d..86cfe756ee4d 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -192,9 +192,10 @@ struct THEBES_API gfxRect {
 
     // grabbing specific points
     gfxPoint TopLeft() const { return gfxPoint(pos); }
-    gfxPoint TopRight() const { return pos + gfxSize(size.width, 0.0); }
-    gfxPoint BottomLeft() const { return pos + gfxSize(0.0, size.height); }
-    gfxPoint BottomRight() const { return pos + size; }
+    gfxPoint TopRight() const { return pos + gfxPoint(size.width, 0.0); }
+    gfxPoint BottomLeft() const { return pos + gfxPoint(0.0, size.height); }
+    gfxPoint BottomRight() const { return pos + gfxPoint(size.width, size.height); }
+    gfxPoint Center() const { return pos + gfxPoint(size.width, size.height)/2.0; }
 
     gfxPoint AtCorner(mozilla::css::Corner corner) const {
         switch (corner) {
diff --git a/ipc/glue/IPCMessageUtils.h b/ipc/glue/IPCMessageUtils.h
index 23f0855760b9..a8d2d0263a31 100644
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@@ -687,24 +687,6 @@ struct ParamTraits<nsRect>
   }
 };
 
-template<>
-struct ParamTraits<gfxIntSize>
-{
-  typedef gfxIntSize paramType;
-  
-  static void Write(Message* msg, const paramType& param)
-  {
-    WriteParam(msg, param.width);
-    WriteParam(msg, param.height); 
-  }
-
-  static bool Read(const Message* msg, void** iter, paramType* result)
-  {
-    return (ReadParam(msg, iter, &result->width) &&
-            ReadParam(msg, iter, &result->height));
-  }
-};
-
 } /* namespace IPC */
 
 #endif /* __IPC_GLUE_IPCMESSAGEUTILS_H__ */
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index 61d15fe4d816..9556bca78b92 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -490,7 +490,7 @@ nsCSSBorderRenderer::DoSideClipSubPath(mozilla::css::Side aSide)
   else if (endIsDashed && isDashed)
     endType = SIDE_CLIP_RECTANGLE;
 
-  gfxPoint midPoint = mInnerRect.pos + mInnerRect.size / 2.0;
+  gfxPoint midPoint = mInnerRect.Center();
 
   start[0] = mOuterRect.CCWCorner(aSide);
   start[1] = mInnerRect.CCWCorner(aSide);
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 977d2a16df14..d4bba8cb4a9e 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -4258,7 +4258,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
 #ifdef XP_MACOSX
 
 #ifndef NP_NO_CARBON
-static void InitializeEventRecord(EventRecord* event, Point* aMousePosition)
+static void InitializeEventRecord(EventRecord* event, ::Point* aMousePosition)
 {
   memset(event, 0, sizeof(EventRecord));
   if (aMousePosition) {
@@ -5283,7 +5283,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
                   presContext->AppUnitsToDevPixels(pt.y));
 #ifndef NP_NO_CARBON
   nsIntPoint geckoScreenCoords = mWidget->WidgetToScreenOffset();
-  Point carbonPt = { ptPx.y + geckoScreenCoords.y, ptPx.x + geckoScreenCoords.x };
+  ::Point carbonPt = { ptPx.y + geckoScreenCoords.y, ptPx.x + geckoScreenCoords.x };
   if (eventModel == NPEventModelCarbon) {
     if (event && anEvent.eventStructType == NS_MOUSE_EVENT) {
       static_cast<EventRecord*>(event)->where = carbonPt;
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index c5b6fc918d2a..60b287e5504d 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -784,7 +784,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder,
   switch(mType)
     {
     case NOTATION_CIRCLE:
-      gfxCtx->Ellipse(rect.pos + rect.size / 2.0, rect.size);
+      gfxCtx->Ellipse(rect.Center(), rect.size);
       break;
 
     case NOTATION_ROUNDEDBOX:
diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp
index 24d86e70caa8..393ee05d7115 100644
--- a/layout/mathml/nsMathMLmfracFrame.cpp
+++ b/layout/mathml/nsMathMLmfracFrame.cpp
@@ -613,7 +613,7 @@ void nsDisplayMathMLSlash::Paint(nsDisplayListBuilder* aBuilder,
  
   // draw the slash as a parallelogram 
   gfxContext *gfxCtx = aCtx->ThebesContext();
-  gfxSize delta = gfxSize(presContext->AppUnitsToGfxUnits(mThickness), 0);
+  gfxPoint delta = gfxPoint(presContext->AppUnitsToGfxUnits(mThickness), 0);
   gfxCtx->NewPath();
   gfxCtx->MoveTo(rect.BottomLeft());
   gfxCtx->LineTo(rect.BottomLeft() + delta);
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index 0ad995598957..ec0385e7113c 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -72,7 +72,6 @@ class gfxASurface;
 class gfxPattern;
 class gfxImageSurface;
 struct gfxSize;
-struct gfxIntSize;
 struct nsStyleFont;
 class nsSVGEnum;
 class nsISVGChildFrame;

From 629c1b7e18642bb463f0c117ace97c12e74a9f5f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:21 +1200
Subject: [PATCH 301/509] Bug 641426. Part 2: Remove a bunch of direct
 gfxRect::pos/size usage. r=joe

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  2 +-
 dom/plugins/ipc/PluginInstanceChild.cpp       |  4 +-
 gfx/layers/Layers.cpp                         |  4 +-
 gfx/layers/ThebesLayerBuffer.cpp              |  8 +--
 gfx/layers/basic/BasicLayers.cpp              | 10 +--
 gfx/layers/opengl/LayerManagerOGL.cpp         |  2 +-
 gfx/layers/opengl/ThebesLayerOGL.cpp          |  4 +-
 gfx/src/nsRenderingContext.cpp                | 20 +++---
 gfx/thebes/gfxASurface.cpp                    |  4 +-
 gfx/thebes/gfxContext.cpp                     | 24 +++----
 gfx/thebes/gfxFont.cpp                        | 18 +++---
 gfx/thebes/gfxMatrix.cpp                      | 36 +++--------
 gfx/thebes/gfxQuartzNativeDrawing.cpp         |  4 +-
 gfx/thebes/gfxRect.h                          | 32 +++++++++-
 gfx/thebes/gfxUtils.cpp                       |  6 +-
 gfx/thebes/gfxWindowsNativeDrawing.cpp        | 16 +++--
 layout/base/nsCSSRendering.cpp                | 20 +++---
 layout/base/nsCSSRenderingBorders.cpp         | 64 ++++++++-----------
 layout/base/nsLayoutUtils.cpp                 | 16 ++---
 layout/generic/nsHTMLCanvasFrame.cpp          |  2 +-
 layout/generic/nsImageFrame.cpp               |  6 +-
 layout/generic/nsObjectFrame.cpp              |  2 +-
 layout/generic/nsTextFrameThebes.cpp          |  2 +-
 layout/generic/nsVideoFrame.cpp               |  2 +-
 layout/ipc/RenderFrameParent.cpp              |  4 +-
 layout/svg/base/src/nsSVGFilterFrame.cpp      |  2 +-
 layout/svg/base/src/nsSVGMaskFrame.cpp        |  2 +-
 .../svg/base/src/nsSVGPathGeometryFrame.cpp   |  6 +-
 widget/src/gtk2/nsNativeThemeGTK.cpp          |  4 +-
 widget/src/windows/nsNativeThemeWin.cpp       |  8 +--
 30 files changed, 164 insertions(+), 170 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index cf067f8f2005..df7b4fc22c96 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -1965,7 +1965,7 @@ nsCanvasRenderingContext2D::ClearRect(float x, float y, float w, float h)
 nsresult
 nsCanvasRenderingContext2D::DrawRect(const gfxRect& rect, Style style)
 {
-    if (!FloatValidate(rect.pos.x, rect.pos.y, rect.size.width, rect.size.height))
+    if (!FloatValidate(rect.X(), rect.Y(), rect.Width(), rect.Height()))
         return NS_OK;
 
     PathAutoSaveRestore pathSR(this);
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
index 7991213f688e..a6b3f25d02f0 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -2812,7 +2812,7 @@ PluginInstanceChild::PaintRectWithAlphaExtraction(const nsIntRect& aRect,
     nsRefPtr<gfxImageSurface> blackImage;
     gfxRect targetRect(rect.x, rect.y, rect.width, rect.height);
     gfxIntSize targetSize(rect.width, rect.height);
-    gfxPoint deviceOffset = -targetRect.pos;
+    gfxPoint deviceOffset = -targetRect.TopLeft();
 
     // We always use a temporary "white image"
     whiteImage = new gfxImageSurface(targetSize, gfxASurface::ImageFormatRGB24);
@@ -2831,7 +2831,7 @@ PluginInstanceChild::PaintRectWithAlphaExtraction(const nsIntRect& aRect,
     // background and copy the result
     PaintRectToSurface(rect, aSurface, gfxRGBA(1.0, 1.0, 1.0));
     {
-        gfxRect copyRect(gfxPoint(0, 0), targetRect.size);
+        gfxRect copyRect(gfxPoint(0, 0), targetRect.Size());
         nsRefPtr<gfxContext> ctx = new gfxContext(whiteImage);
         ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
         ctx->SetSource(aSurface, deviceOffset);
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index 580463638fd3..e09919103710 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -290,8 +290,8 @@ Layer::SnapTransform(const gfx3DMatrix& aTransform,
     }
     // compute translation factors that will move aSnapRect to the snapped rect
     // given those scale factors
-    snappedMatrix.x0 = topLeft.x - aSnapRect.pos.x*snappedMatrix.xx;
-    snappedMatrix.y0 = topLeft.y - aSnapRect.pos.y*snappedMatrix.yy;
+    snappedMatrix.x0 = topLeft.x - aSnapRect.X()*snappedMatrix.xx;
+    snappedMatrix.y0 = topLeft.y - aSnapRect.Y()*snappedMatrix.yy;
     result = gfx3DMatrix::From2D(snappedMatrix);
     if (aResidualTransform && !snappedMatrix.IsSingular()) {
       // set aResidualTransform so that aResidual * snappedMatrix == matrix2D.
diff --git a/gfx/layers/ThebesLayerBuffer.cpp b/gfx/layers/ThebesLayerBuffer.cpp
index e8738ea0caf2..68860cc07f2b 100644
--- a/gfx/layers/ThebesLayerBuffer.cpp
+++ b/gfx/layers/ThebesLayerBuffer.cpp
@@ -55,7 +55,7 @@ ScaledSize(const nsIntSize& aSize, float aXScale, float aYScale)
   gfxRect rect(0, 0, aSize.width, aSize.height);
   rect.Scale(aXScale, aYScale);
   rect.RoundOut();
-  return nsIntSize(rect.size.width, rect.size.height);
+  return nsIntSize(rect.Width(), rect.Height());
 }
 
 nsIntRect
@@ -201,9 +201,9 @@ MovePixels(gfxASurface* aBuffer,
   src.Round();
   dest.Round();
 
-  aBuffer->MovePixels(nsIntRect(src.pos.x, src.pos.y,
-                                src.size.width, src.size.height),
-                      nsIntPoint(dest.pos.x, dest.pos.y));
+  aBuffer->MovePixels(nsIntRect(src.X(), src.Y(),
+                                src.Width(), src.Height()),
+                      nsIntPoint(dest.X(), dest.Y()));
 }
 
 static void
diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index e0b15584483c..b7f1579aa04d 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -1059,7 +1059,7 @@ ToOutsideIntRect(const gfxRect &aRect)
 {
   gfxRect r = aRect;
   r.RoundOut();
-  return nsIntRect(r.pos.x, r.pos.y, r.size.width, r.size.height);
+  return nsIntRect(r.X(), r.Y(), r.Width(), r.Height());
 }
 
 static nsIntRect
@@ -1067,7 +1067,7 @@ ToInsideIntRect(const gfxRect& aRect)
 {
   gfxRect r = aRect;
   r.RoundIn();
-  return nsIntRect(r.pos.x, r.pos.y, r.size.width, r.size.height);
+  return nsIntRect(r.X(), r.Y(), r.Width(), r.Height());
 }
 
 /**
@@ -1194,11 +1194,11 @@ BasicLayerManager::PushGroupWithCachedSurface(gfxContext *aTarget,
 
   nsRefPtr<gfxContext> ctx =
     mCachedSurface.Get(aContent,
-                       gfxIntSize(clip.size.width, clip.size.height),
+                       gfxIntSize(clip.Width(), clip.Height()),
                        currentSurf);
   /* Align our buffer for the original surface */
-  ctx->Translate(-clip.pos);
-  *aSavedOffset = clip.pos;
+  ctx->Translate(-clip.TopLeft());
+  *aSavedOffset = clip.TopLeft();
   ctx->Multiply(saveMatrix.Matrix());
   return ctx.forget();
 }
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 4a6cf39da971..80350afd6b7d 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -712,7 +712,7 @@ LayerManagerOGL::WorldTransformRect(nsIntRect& aRect)
 {
   gfxRect grect(aRect.x, aRect.y, aRect.width, aRect.height);
   grect = mWorldMatrix.TransformBounds(grect);
-  aRect.SetRect(grect.pos.x, grect.pos.y, grect.size.width, grect.size.height);
+  aRect.SetRect(grect.X(), grect.Y(), grect.Width(), grect.Height());
 }
 
 void
diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp
index dd0cd7338ae4..2c39ce3c972c 100644
--- a/gfx/layers/opengl/ThebesLayerOGL.cpp
+++ b/gfx/layers/opengl/ThebesLayerOGL.cpp
@@ -918,8 +918,8 @@ ShadowBufferOGL::Upload(gfxASurface* aUpdate, const nsIntRegion& aUpdated,
   destRect.RoundOut();
 
   // NB: this gfxContext must not escape EndUpdate() below
-  nsIntRegion scaledDestRegion(nsIntRect(destRect.pos.x, destRect.pos.y,
-                                         destRect.size.width, destRect.size.height));
+  nsIntRegion scaledDestRegion(nsIntRect(destRect.X(), destRect.Y(),
+                                         destRect.Width(), destRect.Height()));
   mTexImage->DirectUpdate(aUpdate, scaledDestRegion);
 
   mBufferRect = aRect;
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 558d537dafa3..f70b8366d53d 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -304,30 +304,30 @@ static PRBool
 ConditionRect(gfxRect& r) {
     // if either x or y is way out of bounds;
     // note that we don't handle negative w/h here
-    if (r.pos.x > CAIRO_COORD_MAX || r.pos.y > CAIRO_COORD_MAX)
+    if (r.X() > CAIRO_COORD_MAX || r.Y() > CAIRO_COORD_MAX)
         return PR_FALSE;
 
-    if (r.pos.x < 0.0) {
-        r.size.width += r.pos.x;
+    if (r.X() < 0.0) {
+        r.size.width += r.X();
         if (r.size.width < 0.0)
             return PR_FALSE;
         r.pos.x = 0.0;
     }
 
-    if (r.pos.x + r.size.width > CAIRO_COORD_MAX) {
-        r.size.width = CAIRO_COORD_MAX - r.pos.x;
+    if (r.XMost() > CAIRO_COORD_MAX) {
+        r.size.width = CAIRO_COORD_MAX - r.X();
     }
 
-    if (r.pos.y < 0.0) {
-        r.size.height += r.pos.y;
-        if (r.size.height < 0.0)
+    if (r.Y() < 0.0) {
+        r.size.height += r.Y();
+        if (r.Height() < 0.0)
             return PR_FALSE;
 
         r.pos.y = 0.0;
     }
 
-    if (r.pos.y + r.size.height > CAIRO_COORD_MAX) {
-        r.size.height = CAIRO_COORD_MAX - r.pos.y;
+    if (r.YMost() > CAIRO_COORD_MAX) {
+        r.size.height = CAIRO_COORD_MAX - r.Y();
     }
     return PR_TRUE;
 }
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index e005c1f425fc..a4842fe56c70 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -290,8 +290,8 @@ void
 gfxASurface::MarkDirty(const gfxRect& r)
 {
     cairo_surface_mark_dirty_rectangle(mSurface,
-                                       (int) r.pos.x, (int) r.pos.y,
-                                       (int) r.size.width, (int) r.size.height);
+                                       (int) r.X(), (int) r.Y(),
+                                       (int) r.Width(), (int) r.Height());
 }
 
 void
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index 341df78cbc00..02f5329e21df 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -247,7 +247,7 @@ gfxContext::Rectangle(const gfxRect& rect, PRBool snapToPixels)
         }
     }
 
-    cairo_rectangle(mCairo, rect.pos.x, rect.pos.y, rect.size.width, rect.size.height);
+    cairo_rectangle(mCairo, rect.X(), rect.Y(), rect.Width(), rect.Height());
 }
 
 void
@@ -386,11 +386,7 @@ gfxContext::UserToDevice(const gfxSize& size) const
 gfxRect
 gfxContext::UserToDevice(const gfxRect& rect) const
 {
-    double xmin, ymin, xmax, ymax;
-    xmin = rect.pos.x;
-    ymin = rect.pos.y;
-    xmax = rect.pos.x + rect.size.width;
-    ymax = rect.pos.y + rect.size.height;
+    double xmin = rect.X(), ymin = rect.Y(), xmax = rect.XMost(), ymax = rect.YMost();
 
     double x[3], y[3];
     x[0] = xmin;  y[0] = ymax;
@@ -444,9 +440,9 @@ gfxContext::UserToDevicePixelSnapped(gfxRect& rect, PRBool ignoreScale) const
         p1.Round();
         p3.Round();
 
-        rect.pos = gfxPoint(NS_MIN(p1.x, p3.x), NS_MIN(p1.y, p3.y));
-        rect.size = gfxSize(NS_MAX(p1.x, p3.x) - rect.pos.x,
-                            NS_MAX(p1.y, p3.y) - rect.pos.y);
+        rect.MoveTo(gfxPoint(NS_MIN(p1.x, p3.x), NS_MIN(p1.y, p3.y)));
+        rect.SizeTo(gfxSize(NS_MAX(p1.x, p3.x) - rect.X(),
+                            NS_MAX(p1.y, p3.y) - rect.Y()));
         return PR_TRUE;
     }
 
@@ -497,8 +493,8 @@ gfxContext::PixelSnappedRectangleAndSetPattern(const gfxRect& rect,
         IdentityMatrix();
     }
 
-    Translate(r.pos);
-    r.pos.x = r.pos.y = 0;
+    Translate(r.TopLeft());
+    r.MoveTo(gfxPoint(0, 0));
     Rectangle(r);
     SetPattern(pattern);
 
@@ -635,7 +631,7 @@ void
 gfxContext::Clip(const gfxRect& rect)
 {
     cairo_new_path(mCairo);
-    cairo_rectangle(mCairo, rect.pos.x, rect.pos.y, rect.size.width, rect.size.height);
+    cairo_rectangle(mCairo, rect.X(), rect.Y(), rect.Width(), rect.Height());
     cairo_clip(mCairo);
 }
 
@@ -977,9 +973,9 @@ gfxContext::RoundedRectangle(const gfxRect& rect,
     gfxPoint pc, p0, p1, p2, p3;
 
     if (draw_clockwise)
-        cairo_move_to(mCairo, rect.pos.x + corners[NS_CORNER_TOP_LEFT].width, rect.pos.y);
+        cairo_move_to(mCairo, rect.X() + corners[NS_CORNER_TOP_LEFT].width, rect.Y());
     else
-        cairo_move_to(mCairo, rect.pos.x + rect.size.width - corners[NS_CORNER_TOP_RIGHT].width, rect.pos.y);
+        cairo_move_to(mCairo, rect.X() + rect.Width() - corners[NS_CORNER_TOP_RIGHT].width, rect.Y());
 
     NS_FOR_CSS_CORNERS(i) {
         // the corner index -- either 1 2 3 0 (cw) or 0 3 2 1 (ccw)
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index b946c25c9576..4633257c9fa0 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -1360,9 +1360,9 @@ gfxFont::Measure(gfxTextRun *aTextRun,
                             advance, metrics.mBoundingBox.Height());
                     }
                     if (isRTL) {
-                        glyphRect.pos.x -= advance;
+                        glyphRect -= gfxPoint(advance, 0);
                     }
-                    glyphRect.pos.x += x;
+                    glyphRect += gfxPoint(x, 0);
                     metrics.mBoundingBox = metrics.mBoundingBox.Union(glyphRect);
                 }
             }
@@ -1389,9 +1389,9 @@ gfxFont::Measure(gfxTextRun *aTextRun,
                             advance, metrics.mAscent + metrics.mDescent);
                     }
                     if (isRTL) {
-                        glyphRect.pos.x -= advance;
+                        glyphRect -= gfxPoint(advance, 0);
                     }
-                    glyphRect.pos.x += x;
+                    glyphRect += gfxPoint(x, 0);
                     metrics.mBoundingBox = metrics.mBoundingBox.Union(glyphRect);
                     x += direction*advance;
                 }
@@ -1414,7 +1414,7 @@ gfxFont::Measure(gfxTextRun *aTextRun,
         metrics.mBoundingBox = metrics.mBoundingBox.Union(fontBox);
     }
     if (isRTL) {
-        metrics.mBoundingBox.pos.x -= x;
+        metrics.mBoundingBox -= gfxPoint(x, 0);
     }
 
     metrics.mAdvanceWidth = x*direction;
@@ -1943,10 +1943,10 @@ gfxGlyphExtents::SetTightGlyphExtents(PRUint32 aGlyphID, const gfxRect& aExtents
     HashEntry *entry = mTightGlyphExtents.PutEntry(aGlyphID);
     if (!entry)
         return;
-    entry->x = aExtentsAppUnits.pos.x;
-    entry->y = aExtentsAppUnits.pos.y;
-    entry->width = aExtentsAppUnits.size.width;
-    entry->height = aExtentsAppUnits.size.height;
+    entry->x = aExtentsAppUnits.X();
+    entry->y = aExtentsAppUnits.Y();
+    entry->width = aExtentsAppUnits.Width();
+    entry->height = aExtentsAppUnits.Height();
 }
 
 gfxFontGroup::gfxFontGroup(const nsAString& aFamilies, const gfxFontStyle *aStyle, gfxUserFontSet *aUserFontSet)
diff --git a/gfx/thebes/gfxMatrix.cpp b/gfx/thebes/gfxMatrix.cpp
index e1e85146a504..b2c196f131a6 100644
--- a/gfx/thebes/gfxMatrix.cpp
+++ b/gfx/thebes/gfxMatrix.cpp
@@ -110,7 +110,7 @@ gfxMatrix::Transform(const gfxSize& size) const
 gfxRect
 gfxMatrix::Transform(const gfxRect& rect) const
 {
-    return gfxRect(Transform(rect.pos), Transform(rect.size));
+    return gfxRect(Transform(rect.TopLeft()), Transform(rect.Size()));
 }
 
 gfxRect
@@ -122,20 +122,20 @@ gfxMatrix::TransformBounds(const gfxRect& rect) const
     double min_x, max_x;
     double min_y, max_y;
 
-    quad_x[0] = rect.pos.x;
-    quad_y[0] = rect.pos.y;
+    quad_x[0] = rect.X();
+    quad_y[0] = rect.Y();
     cairo_matrix_transform_point (CONST_CAIRO_MATRIX(this), &quad_x[0], &quad_y[0]);
 
-    quad_x[1] = rect.pos.x + rect.size.width;
-    quad_y[1] = rect.pos.y;
+    quad_x[1] = rect.XMost();
+    quad_y[1] = rect.Y();
     cairo_matrix_transform_point (CONST_CAIRO_MATRIX(this), &quad_x[1], &quad_y[1]);
 
-    quad_x[2] = rect.pos.x;
-    quad_y[2] = rect.pos.y + rect.size.height;
+    quad_x[2] = rect.X();
+    quad_y[2] = rect.YMost();
     cairo_matrix_transform_point (CONST_CAIRO_MATRIX(this), &quad_x[2], &quad_y[2]);
 
-    quad_x[3] = rect.pos.x + rect.size.width;
-    quad_y[3] = rect.pos.y + rect.size.height;
+    quad_x[3] = rect.XMost();
+    quad_y[3] = rect.YMost();
     cairo_matrix_transform_point (CONST_CAIRO_MATRIX(this), &quad_x[3], &quad_y[3]);
 
     min_x = max_x = quad_x[0];
@@ -153,24 +153,6 @@ gfxMatrix::TransformBounds(const gfxRect& rect) const
             max_y = quad_y[i];
     }
 
-    // we don't compute this now
-#if 0
-    if (is_tight) {
-        /* it's tight if and only if the four corner points form an axis-aligned
-           rectangle.
-           And that's true if and only if we can derive corners 0 and 3 from
-           corners 1 and 2 in one of two straightforward ways...
-           We could use a tolerance here but for now we'll fall back to FALSE in the case
-           of floating point error.
-        */
-        *is_tight =
-            (quad_x[1] == quad_x[0] && quad_y[1] == quad_y[3] &&
-             quad_x[2] == quad_x[3] && quad_y[2] == quad_y[0]) ||
-            (quad_x[1] == quad_x[3] && quad_y[1] == quad_y[0] &&
-             quad_x[2] == quad_x[0] && quad_y[2] == quad_y[3]);
-    }
-#endif
-
     return gfxRect(min_x, min_y, max_x - min_x, max_y - min_y);
 }
 
diff --git a/gfx/thebes/gfxQuartzNativeDrawing.cpp b/gfx/thebes/gfxQuartzNativeDrawing.cpp
index b1548dffb812..b081160e1032 100644
--- a/gfx/thebes/gfxQuartzNativeDrawing.cpp
+++ b/gfx/thebes/gfxQuartzNativeDrawing.cpp
@@ -107,7 +107,7 @@ gfxQuartzNativeDrawing::BeginNativeDrawing()
         // bug 382049 - need to explicity set the composite operation to sourceOver
         CGContextSetCompositeOperation(mCGContext, kPrivateCGCompositeSourceOver);
     } else {
-        mQuartzSurface = new gfxQuartzSurface(mNativeRect.size,
+        mQuartzSurface = new gfxQuartzSurface(mNativeRect.Size(),
                                               gfxASurface::ImageFormatARGB32);
         if (mQuartzSurface->CairoStatus())
             return nsnull;
@@ -133,6 +133,6 @@ gfxQuartzNativeDrawing::EndNativeDrawing()
 
         // Copy back to destination
         mContext->Translate(mNativeRect.TopLeft());
-        mContext->DrawSurface(mQuartzSurface, mNativeRect.size);
+        mContext->DrawSurface(mQuartzSurface, mNativeRect.Size());
     }
 }
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index 86cfe756ee4d..d828ca0a9199 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -90,16 +90,45 @@ struct THEBES_API gfxRect {
         return (pos != s.pos) || (size != s.size);
     }
 
+    void MoveTo(const gfxPoint& aPt) { pos = aPt; }
     const gfxRect& MoveBy(const gfxPoint& aPt) {
         pos = pos + aPt;
         return *this;
     }
+    void SizeTo(const gfxSize& aSize) { size = aSize; }
+
     gfxRect operator+(const gfxPoint& aPt) const {
         return gfxRect(pos + aPt, size);
     }
     gfxRect operator-(const gfxPoint& aPt) const {
         return gfxRect(pos - aPt, size);
     }
+    gfxRect operator+(const gfxSize& aSize) const {
+        return gfxRect(pos + gfxPoint(aSize.width, aSize.height), size);
+    }
+    gfxRect operator-(const gfxSize& aSize) const {
+        return gfxRect(pos - gfxPoint(aSize.width, aSize.height), size);
+    }
+    gfxRect operator*(const gfxFloat aScale) const {
+        return gfxRect(pos * aScale, size * aScale);
+    }
+
+    const gfxRect& operator+=(const gfxPoint& aPt) {
+        pos += aPt;
+        return *this;
+    }
+    const gfxRect& operator-=(const gfxPoint& aPt) {
+        pos -= aPt;
+        return *this;
+    }
+    const gfxRect& operator+=(const gfxSize& aSize) {
+        pos += gfxPoint(aSize.width, aSize.height);
+        return *this;
+    }
+    const gfxRect& operator-=(const gfxSize& aSize) {
+        pos -= gfxPoint(aSize.width, aSize.height);
+        return *this;
+    }
 
     gfxFloat Width() const { return size.width; }
     gfxFloat Height() const { return size.height; }
@@ -122,8 +151,7 @@ struct THEBES_API gfxRect {
      */
     PRBool WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const;
 
-    gfxPoint TopLeft() { return pos; }
-    gfxPoint BottomRight() { return gfxPoint(XMost(), YMost()); }
+    gfxSize Size() const { return size; }
 
     void Inset(gfxFloat k) {
         pos.x += k;
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index 6f149f026736..e55ca157cd1b 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -272,15 +272,15 @@ CreateSamplingRestrictedDrawable(gfxDrawable* aDrawable,
 
     nsRefPtr<gfxContext> tmpCtx = new gfxContext(temp);
     tmpCtx->SetOperator(OptimalFillOperator());
-    aDrawable->Draw(tmpCtx, needed - needed.pos, PR_TRUE,
-                    gfxPattern::FILTER_FAST, gfxMatrix().Translate(needed.pos));
+    aDrawable->Draw(tmpCtx, needed - needed.TopLeft(), PR_TRUE,
+                    gfxPattern::FILTER_FAST, gfxMatrix().Translate(needed.TopLeft()));
 
     nsRefPtr<gfxPattern> resultPattern = new gfxPattern(temp);
     if (!resultPattern)
         return nsnull;
 
     nsRefPtr<gfxDrawable> drawable = 
-        new gfxSurfaceDrawable(temp, size, gfxMatrix().Translate(-needed.pos));
+        new gfxSurfaceDrawable(temp, size, gfxMatrix().Translate(-needed.TopLeft()));
     return drawable.forget();
 }
 
diff --git a/gfx/thebes/gfxWindowsNativeDrawing.cpp b/gfx/thebes/gfxWindowsNativeDrawing.cpp
index 4d613e14fb69..18d3f4f3f374 100644
--- a/gfx/thebes/gfxWindowsNativeDrawing.cpp
+++ b/gfx/thebes/gfxWindowsNativeDrawing.cpp
@@ -137,8 +137,9 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
                 // and it fixes bug 382458
                 // There's probably a better fix, but I haven't figured out
                 // the root cause of the problem.
-                mTempSurfaceSize.width = (PRInt32) NS_ceil(mNativeRect.size.width + 1);
-                mTempSurfaceSize.height = (PRInt32) NS_ceil(mNativeRect.size.height + 1);
+                mTempSurfaceSize =
+                    gfxIntSize((PRInt32) NS_ceil(mNativeRect.Width() + 1),
+                               (PRInt32) NS_ceil(mNativeRect.Height() + 1));
             } else {
                 // figure out the scale factors
                 mScale = m.ScaleFactors(PR_TRUE);
@@ -151,8 +152,9 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
                 mWorldTransform.eDy  = 0.0f;
 
                 // See comment above about "+1"
-                mTempSurfaceSize.width = (PRInt32) NS_ceil(mNativeRect.size.width * mScale.width + 1);
-                mTempSurfaceSize.height = (PRInt32) NS_ceil(mNativeRect.size.height * mScale.height + 1);
+                mTempSurfaceSize =
+                    gfxIntSize((PRInt32) NS_ceil(mNativeRect.Width() * mScale.width + 1),
+                               (PRInt32) NS_ceil(mNativeRect.Height() * mScale.height + 1));
             }
         }
     }
@@ -294,9 +296,9 @@ gfxWindowsNativeDrawing::PaintToContext()
                                 gfxASurface::ImageFormatARGB32);
 
         mContext->Save();
-        mContext->Translate(mNativeRect.pos);
+        mContext->Translate(mNativeRect.TopLeft());
         mContext->NewPath();
-        mContext->Rectangle(gfxRect(gfxPoint(0.0, 0.0), mNativeRect.size));
+        mContext->Rectangle(gfxRect(gfxPoint(0.0, 0.0), mNativeRect.Size()));
 
         nsRefPtr<gfxPattern> pat = new gfxPattern(alphaSurface);
 
@@ -334,7 +336,7 @@ gfxWindowsNativeDrawing::TransformToNativeRect(const gfxRect& r,
             roundedRect.MoveBy(mTranslation);
         }
     } else {
-        roundedRect.MoveBy(- mNativeRect.pos);
+        roundedRect.MoveBy(-mNativeRect.TopLeft());
     }
 
     roundedRect.Round();
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 1275ab5ed749..0f1cf10ea4ce 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1617,7 +1617,7 @@ SetupBackgroundClip(BackgroundClipState& aClipState, gfxContext *aCtx,
       // http://hg.mozilla.org/mozilla-central/rev/50e934e4979b landed.
       NS_WARNING("converted background area should not be empty");
       // Make our caller not do anything.
-      aClipState.mDirtyRectGfx.size.SizeTo(0.0, 0.0);
+      aClipState.mDirtyRectGfx.SizeTo(gfxSize(0.0, 0.0));
       return;
     }
 
@@ -1657,7 +1657,7 @@ DrawBackgroundColor(BackgroundClipState& aClipState, gfxContext *aCtx,
     // http://hg.mozilla.org/mozilla-central/rev/50e934e4979b landed.
     NS_WARNING("converted background area should not be empty");
     // Make our caller not do anything.
-    aClipState.mDirtyRectGfx.size.SizeTo(0.0, 0.0);
+    aClipState.mDirtyRectGfx.SizeTo(gfxSize(0.0, 0.0));
     return;
   }
 
@@ -1942,10 +1942,10 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
   gfxPoint lineStart, lineEnd;
   double radiusX = 0, radiusY = 0; // for radial gradients only
   if (aGradient->mShape == NS_STYLE_GRADIENT_SHAPE_LINEAR) {
-    ComputeLinearGradientLine(aPresContext, aGradient, oneCellArea.size,
+    ComputeLinearGradientLine(aPresContext, aGradient, oneCellArea.Size(),
                               &lineStart, &lineEnd);
   } else {
-    ComputeRadialGradientLine(aPresContext, aGradient, oneCellArea.size,
+    ComputeRadialGradientLine(aPresContext, aGradient, oneCellArea.Size(),
                               &lineStart, &lineEnd, &radiusX, &radiusY);
   }
   gfxFloat lineLength = NS_hypot(lineEnd.x - lineStart.x,
@@ -2192,9 +2192,9 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
       // tile with the overall area we're supposed to be filling
       gfxRect fillRect = tileRect.Intersect(areaToFill);
       ctx->NewPath();
-      ctx->Translate(tileRect.pos);
+      ctx->Translate(tileRect.TopLeft());
       ctx->SetPattern(gradientPattern);
-      ctx->Rectangle(fillRect - tileRect.pos, PR_TRUE);
+      ctx->Rectangle(fillRect - tileRect.TopLeft(), PR_TRUE);
       ctx->Fill();
       ctx->SetMatrix(ctm);
     }
@@ -3560,7 +3560,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
       rect.pos.x += lineHeight / 2.0;
       aGfxContext->NewPath();
 
-      gfxPoint pt(rect.pos);
+      gfxPoint pt(rect.TopLeft());
       gfxFloat rightMost = pt.x + rect.Width() + lineHeight;
       gfxFloat adv = rect.Height() - lineHeight;
       gfxFloat flatLengthAtVertex = NS_MAX((lineHeight - 1.0) * 2.0, 1.0);
@@ -3568,7 +3568,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
       pt.x -= lineHeight;
       aGfxContext->MoveTo(pt); // 1
 
-      pt.x = rect.pos.x;
+      pt.x = rect.X();
       aGfxContext->LineTo(pt); // 2
 
       PRBool goDown = PR_TRUE;
@@ -3640,9 +3640,7 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
 
   PRBool canLiftUnderline = aDescentLimit >= 0.0;
 
-  gfxRect r;
-  r.pos.x = NS_floor(aPt.x + 0.5);
-  r.size.width = NS_round(aLineSize.width);
+  gfxRect r(NS_floor(aPt.x + 0.5), 0, NS_round(aLineSize.width), 0);
 
   gfxFloat lineHeight = NS_round(aLineSize.height);
   lineHeight = NS_MAX(lineHeight, 1.0);
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index 9556bca78b92..dfbbc5bda247 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -225,10 +225,10 @@ ComputeBorderCornerDimensions(const gfxRect& aOuterRect,
                               const gfxCornerSizes& aRadii,
                               gfxCornerSizes *aDimsRet)
 {
-  gfxFloat topWidth = aInnerRect.pos.y - aOuterRect.pos.y;
-  gfxFloat leftWidth = aInnerRect.pos.x - aOuterRect.pos.x;
-  gfxFloat rightWidth = aOuterRect.size.width - aInnerRect.size.width - leftWidth;
-  gfxFloat bottomWidth = aOuterRect.size.height - aInnerRect.size.height - topWidth;
+  gfxFloat leftWidth = aInnerRect.X() - aOuterRect.X();
+  gfxFloat topWidth = aInnerRect.Y() - aOuterRect.Y();
+  gfxFloat rightWidth = aOuterRect.Width() - aInnerRect.Width() - leftWidth;
+  gfxFloat bottomWidth = aOuterRect.Height() - aInnerRect.Height() - topWidth;
 
   if (AllCornersZeroSize(aRadii)) {
     // These will always be in pixel units from CSS
@@ -354,11 +354,11 @@ nsCSSBorderRenderer::DoCornerSubPath(mozilla::css::Corner aCorner)
   gfxPoint offset(0.0, 0.0);
 
   if (aCorner == C_TR || aCorner == C_BR)
-    offset.x = mOuterRect.size.width - mBorderCornerDimensions[aCorner].width;
+    offset.x = mOuterRect.Width() - mBorderCornerDimensions[aCorner].width;
   if (aCorner == C_BR || aCorner == C_BL)
-    offset.y = mOuterRect.size.height - mBorderCornerDimensions[aCorner].height;
+    offset.y = mOuterRect.Height() - mBorderCornerDimensions[aCorner].height;
 
-  mContext->Rectangle(gfxRect(mOuterRect.pos + offset,
+  mContext->Rectangle(gfxRect(mOuterRect.TopLeft() + offset,
                               mBorderCornerDimensions[aCorner]));
 }
 
@@ -375,11 +375,11 @@ nsCSSBorderRenderer::DoSideClipWithoutCornersSubPath(mozilla::css::Side aSide)
   if (aSide == NS_SIDE_TOP) {
     offset.x = mBorderCornerDimensions[C_TL].width;
   } else if (aSide == NS_SIDE_RIGHT) {
-    offset.x = mOuterRect.size.width - mBorderWidths[NS_SIDE_RIGHT];
+    offset.x = mOuterRect.Width() - mBorderWidths[NS_SIDE_RIGHT];
     offset.y = mBorderCornerDimensions[C_TR].height;
   } else if (aSide == NS_SIDE_BOTTOM) {
     offset.x = mBorderCornerDimensions[C_BL].width;
-    offset.y = mOuterRect.size.height - mBorderWidths[NS_SIDE_BOTTOM];
+    offset.y = mOuterRect.Height() - mBorderWidths[NS_SIDE_BOTTOM];
   } else if (aSide == NS_SIDE_LEFT) {
     offset.y = mBorderCornerDimensions[C_TL].height;
   }
@@ -390,8 +390,8 @@ nsCSSBorderRenderer::DoSideClipWithoutCornersSubPath(mozilla::css::Side aSide)
   // with both proceeding clockwise.
   gfxSize sideCornerSum = mBorderCornerDimensions[mozilla::css::Corner(aSide)]
                         + mBorderCornerDimensions[mozilla::css::Corner(NEXT_SIDE(aSide))];
-  gfxRect rect(mOuterRect.pos + offset,
-               mOuterRect.size - sideCornerSum);
+  gfxRect rect(mOuterRect.TopLeft() + offset,
+               mOuterRect.Size() - sideCornerSum);
 
   if (aSide == NS_SIDE_TOP || aSide == NS_SIDE_BOTTOM)
     rect.size.height = mBorderWidths[aSide];
@@ -581,29 +581,27 @@ nsCSSBorderRenderer::FillSolidBorder(const gfxRect& aOuterRect,
 
   // compute base rects for each side
   if (aSides & SIDE_BIT_TOP) {
-    r[NS_SIDE_TOP].pos = aOuterRect.TopLeft();
-    r[NS_SIDE_TOP].size.width = aOuterRect.size.width;
-    r[NS_SIDE_TOP].size.height = aBorderSizes[NS_SIDE_TOP];
+    r[NS_SIDE_TOP] =
+        gfxRect(aOuterRect.X(), aOuterRect.Y(),
+                aOuterRect.Width(), aBorderSizes[NS_SIDE_TOP]);
   }
 
   if (aSides & SIDE_BIT_BOTTOM) {
-    r[NS_SIDE_BOTTOM].pos = aOuterRect.BottomLeft();
-    r[NS_SIDE_BOTTOM].pos.y -= aBorderSizes[NS_SIDE_BOTTOM];
-    r[NS_SIDE_BOTTOM].size.width = aOuterRect.size.width;
-    r[NS_SIDE_BOTTOM].size.height = aBorderSizes[NS_SIDE_BOTTOM];
+    r[NS_SIDE_BOTTOM] =
+        gfxRect(aOuterRect.X(), aOuterRect.YMost() - aBorderSizes[NS_SIDE_BOTTOM],
+                aOuterRect.Width(), aBorderSizes[NS_SIDE_BOTTOM]);
   }
 
   if (aSides & SIDE_BIT_LEFT) {
-    r[NS_SIDE_LEFT].pos = aOuterRect.TopLeft();
-    r[NS_SIDE_LEFT].size.width = aBorderSizes[NS_SIDE_LEFT];
-    r[NS_SIDE_LEFT].size.height = aOuterRect.size.height;
+    r[NS_SIDE_LEFT] =
+        gfxRect(aOuterRect.X(), aOuterRect.Y(),
+                aBorderSizes[NS_SIDE_LEFT], aOuterRect.Height());
   }
 
   if (aSides & SIDE_BIT_RIGHT) {
-    r[NS_SIDE_RIGHT].pos = aOuterRect.TopRight();
-    r[NS_SIDE_RIGHT].pos.x -= aBorderSizes[NS_SIDE_RIGHT];
-    r[NS_SIDE_RIGHT].size.width = aBorderSizes[NS_SIDE_RIGHT];
-    r[NS_SIDE_RIGHT].size.height = aOuterRect.size.height;
+    r[NS_SIDE_RIGHT] =
+        gfxRect(aOuterRect.XMost() - aBorderSizes[NS_SIDE_RIGHT], aOuterRect.Y(),
+                aBorderSizes[NS_SIDE_RIGHT], aOuterRect.Height());
   }
 
   // If two sides meet at a corner that we're rendering, then
@@ -695,7 +693,6 @@ nsCSSBorderRenderer::DrawBorderSidesCompositeColors(PRIntn aSides, const nsBorde
 
   // the generic composite colors path; each border is 1px in size
   gfxRect soRect = mOuterRect;
-  gfxRect siRect;
   gfxFloat maxBorderWidth = 0;
   NS_FOR_CSS_SIDES (i) {
     maxBorderWidth = NS_MAX(maxBorderWidth, mBorderWidths[i]);
@@ -703,21 +700,18 @@ nsCSSBorderRenderer::DrawBorderSidesCompositeColors(PRIntn aSides, const nsBorde
 
   gfxFloat fakeBorderSizes[4];
 
-  gfxRGBA lineColor;
-  gfxPoint tl, br;
-
   gfxPoint itl = mInnerRect.TopLeft();
   gfxPoint ibr = mInnerRect.BottomRight();
 
   for (PRUint32 i = 0; i < PRUint32(maxBorderWidth); i++) {
-    lineColor = ComputeCompositeColorForLine(i, aCompositeColors);
+    gfxRGBA lineColor = ComputeCompositeColorForLine(i, aCompositeColors);
 
-    siRect = soRect;
+    gfxRect siRect = soRect;
     siRect.Inset(1.0, 1.0, 1.0, 1.0);
 
     // now cap the rects to the real mInnerRect
-    tl = siRect.TopLeft();
-    br = siRect.BottomRight();
+    gfxPoint tl = siRect.TopLeft();
+    gfxPoint br = siRect.BottomRight();
 
     tl.x = NS_MIN(tl.x, itl.x);
     tl.y = NS_MIN(tl.y, itl.y);
@@ -725,9 +719,7 @@ nsCSSBorderRenderer::DrawBorderSidesCompositeColors(PRIntn aSides, const nsBorde
     br.x = NS_MAX(br.x, ibr.x);
     br.y = NS_MAX(br.y, ibr.y);
 
-    siRect.pos = tl;
-    siRect.size.width = br.x - tl.x;
-    siRect.size.height = br.y - tl.y;
+    siRect = gfxRect(tl.x, tl.y, br.x - tl.x , br.y - tl.y);
 
     fakeBorderSizes[NS_SIDE_TOP] = siRect.TopLeft().y - soRect.TopLeft().y;
     fakeBorderSizes[NS_SIDE_RIGHT] = soRect.TopRight().x - siRect.TopRight().x;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 66abab6c2eef..e05c118a20be 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1009,9 +1009,7 @@ nsRect
 nsLayoutUtils::RoundGfxRectToAppRect(const gfxRect &aRect, float aFactor)
 {
   /* Get a new gfxRect whose units are app units by scaling by the specified factor. */
-  gfxRect scaledRect(aRect.pos.x * aFactor, aRect.pos.y * aFactor,
-                     aRect.size.width * aFactor,
-                     aRect.size.height * aFactor);
+  gfxRect scaledRect = aRect * aFactor;
 
   /* Round outward. */
   scaledRect.RoundOut();
@@ -1023,8 +1021,8 @@ nsLayoutUtils::RoundGfxRectToAppRect(const gfxRect &aRect, float aFactor)
   ConstrainToCoordValues(scaledRect.size.height);
 
   /* Now typecast everything back.  This is guaranteed to be safe. */
-  return nsRect(nscoord(scaledRect.pos.x), nscoord(scaledRect.pos.y),
-                nscoord(scaledRect.size.width), nscoord(scaledRect.size.height));
+  return nsRect(nscoord(scaledRect.X()), nscoord(scaledRect.Y()),
+                nscoord(scaledRect.Width()), nscoord(scaledRect.Height()));
 }
 
 
@@ -3088,8 +3086,8 @@ static gfxPoint
 MapToFloatImagePixels(const gfxSize& aSize,
                       const gfxRect& aDest, const gfxPoint& aPt)
 {
-  return gfxPoint(((aPt.x - aDest.pos.x)*aSize.width)/aDest.size.width,
-                  ((aPt.y - aDest.pos.y)*aSize.height)/aDest.size.height);
+  return gfxPoint(((aPt.x - aDest.X())*aSize.width)/aDest.Width(),
+                  ((aPt.y - aDest.Y())*aSize.height)/aDest.Height());
 }
 
 /**
@@ -3104,8 +3102,8 @@ static gfxPoint
 MapToFloatUserPixels(const gfxSize& aSize,
                      const gfxRect& aDest, const gfxPoint& aPt)
 {
-  return gfxPoint(aPt.x*aDest.size.width/aSize.width + aDest.pos.x,
-                  aPt.y*aDest.size.height/aSize.height + aDest.pos.y);
+  return gfxPoint(aPt.x*aDest.Width()/aSize.width + aDest.X(),
+                  aPt.y*aDest.Height()/aSize.height + aDest.Y());
 }
 
 /* static */ gfxRect
diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp
index 54168e380439..4420a61ee648 100644
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -287,7 +287,7 @@ nsHTMLCanvasFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   // Transform the canvas into the right place
   gfxMatrix transform;
-  transform.Translate(r.pos);
+  transform.Translate(r.TopLeft());
   transform.Scale(r.Width()/canvasSize.width, r.Height()/canvasSize.height);
   layer->SetTransform(gfx3DMatrix::From2D(transform));
   layer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(this));
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 2ab878d617ed..0ffc4509c8ca 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1223,9 +1223,9 @@ nsDisplayImage::ConfigureLayer(ImageLayer* aLayer)
   mImage->GetHeight(&imageHeight);
 
   gfxMatrix transform;
-  transform.Translate(destRect.pos);
-  transform.Scale(destRect.size.width/imageWidth,
-                  destRect.size.height/imageHeight);
+  transform.Translate(destRect.TopLeft());
+  transform.Scale(destRect.Width()/imageWidth,
+                  destRect.Height()/imageHeight);
   aLayer->SetTransform(gfx3DMatrix::From2D(transform));
 
   aLayer->SetVisibleRegion(nsIntRect(0, 0, imageWidth, imageHeight));
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index d4bba8cb4a9e..6b66e6a53111 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -2185,7 +2185,7 @@ nsObjectFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   // Set a transform on the layer to draw the plugin in the right place
   gfxMatrix transform;
-  transform.Translate(r.pos);
+  transform.Translate(r.TopLeft());
 
   layer->SetTransform(gfx3DMatrix::From2D(transform));
   layer->SetVisibleRegion(nsIntRect(0, 0, size.width, size.height));
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 99488f908a12..fae48353841e 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -5050,7 +5050,7 @@ nsTextFrame::GetSnappedBaselineY(gfxContext* aContext, gfxFloat aY)
   gfxRect putativeRect(0, baseline/appUnitsPerDevUnit, 1, 1);
   if (!aContext->UserToDevicePixelSnapped(putativeRect))
     return baseline;
-  return aContext->DeviceToUser(putativeRect.pos).y*appUnitsPerDevUnit;
+  return aContext->DeviceToUser(putativeRect.TopLeft()).y*appUnitsPerDevUnit;
 }
 
 void
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index 6427ed46b9d3..49a8d3598e2e 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -278,7 +278,7 @@ nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
   layer->SetContentFlags(Layer::CONTENT_OPAQUE);
   // Set a transform on the layer to draw the video in the right place
   gfxMatrix transform;
-  transform.Translate(r.pos);
+  transform.Translate(r.TopLeft());
   transform.Scale(r.Width()/frameSize.width, r.Height()/frameSize.height);
   layer->SetTransform(gfx3DMatrix::From2D(transform));
   layer->SetVisibleRegion(nsIntRect(0, 0, videoSize.width, videoSize.height));
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 3586aa7d231f..5bfe9c0465a2 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -488,8 +488,8 @@ BuildBackgroundPatternFor(ContainerLayer* aContainer,
   gfxRect localContentVis(t.Transform(contentVis));
   // Round *in* here because this area is punched out of the background
   localContentVis.RoundIn();
-  nsIntRect localIntContentVis(localContentVis.pos.x, localContentVis.pos.y,
-                               localContentVis.size.width, localContentVis.size.height);
+  nsIntRect localIntContentVis(localContentVis.X(), localContentVis.Y(),
+                               localContentVis.Width(), localContentVis.Height());
 
   // Get the frame's rect
   nscoord auPerDevPixel = aFrame->PresContext()->AppUnitsPerDevPixel();
diff --git a/layout/svg/base/src/nsSVGFilterFrame.cpp b/layout/svg/base/src/nsSVGFilterFrame.cpp
index 7361ac975556..b45e269187c1 100644
--- a/layout/svg/base/src/nsSVGFilterFrame.cpp
+++ b/layout/svg/base/src/nsSVGFilterFrame.cpp
@@ -169,7 +169,7 @@ nsAutoFilterInstance::nsAutoFilterInstance(nsIFrame *aTarget,
     // We don't care if this overflows, because we can handle upscaling/
     // downscaling to filterRes
     PRBool overflow;
-    filterRes = nsSVGUtils::ConvertToSurfaceSize(filterRegion.size * scale,
+    filterRes = nsSVGUtils::ConvertToSurfaceSize(filterRegion.Size() * scale,
                                                  &overflow);
   }
 
diff --git a/layout/svg/base/src/nsSVGMaskFrame.cpp b/layout/svg/base/src/nsSVGMaskFrame.cpp
index 688875448fea..fd186fce5871 100644
--- a/layout/svg/base/src/nsSVGMaskFrame.cpp
+++ b/layout/svg/base/src/nsSVGMaskFrame.cpp
@@ -112,7 +112,7 @@ nsSVGMaskFrame::ComputeMaskAlpha(nsSVGRenderState *aContext,
     new gfxImageSurface(surfaceSize, gfxASurface::ImageFormatARGB32);
   if (!image || image->CairoStatus())
     return nsnull;
-  image->SetDeviceOffset(-clipExtents.pos);
+  image->SetDeviceOffset(-clipExtents.TopLeft());
 
   nsSVGRenderState tmpState(image);
 
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index 2f112f0ba7a6..317312516e67 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -275,10 +275,8 @@ nsSVGPathGeometryFrame::UpdateCoveredRegion()
       // GetUserStrokeExtent gets the extents wrong we can still use it
       // to get the device space position of zero length stroked paths.
       extent = context->GetUserStrokeExtent();
-      extent.pos.x += extent.size.width / 2;
-      extent.pos.y += extent.size.height / 2;
-      extent.size.width = 0;
-      extent.size.height = 0;
+      extent += extent.Size()/2;
+      extent.SizeTo(gfxSize(0, 0));
     }
     extent = nsSVGUtils::PathExtentsToMaxStrokeExtents(extent, this);
   } else if (GetStyleSVG()->mFill.mType == eStyleSVGPaintType_None) {
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 200fb1dc9b9c..3d7b3d4c1418 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -788,7 +788,7 @@ nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
   }
 
   // Translate the dirty rect so that it is wrt the widget top-left.
-  dirtyRect.MoveBy(-rect.pos);
+  dirtyRect.MoveBy(-rect.TopLeft());
   // Round out the dirty rect to gdk pixels to ensure that gtk draws
   // enough pixels for interpolation to device pixels.
   dirtyRect.RoundOut();
@@ -837,7 +837,7 @@ nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
     // Rects are in device coords.
     ctx->IdentityMatrix(); 
   }
-  ctx->Translate(rect.pos + gfxPoint(drawingRect.x, drawingRect.y));
+  ctx->Translate(rect.TopLeft() + gfxPoint(drawingRect.x, drawingRect.y));
 
   NS_ASSERTION(!IsWidgetTypeDisabled(mDisabledWidgetTypes, aWidgetType),
                "Trying to render an unsafe widget!");
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 6c9058754adb..fb0b734ef048 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1544,12 +1544,12 @@ RENDER_AGAIN:
     // are because we might have drawn something above them (like a background-image).
     ctx->Save();
     ctx->ResetClip();
-    ctx->Translate(dr.pos);
+    ctx->Translate(dr.TopLeft());
 
     // Create a rounded rectangle to follow the buttons' look.
-    gfxRect buttonbox1(0.0, 0.0, dr.size.width, dr.size.height - 2.0);
-    gfxRect buttonbox2(1.0, dr.size.height - 2.0, dr.size.width - 1.0, 1.0);
-    gfxRect buttonbox3(2.0, dr.size.height - 1.0, dr.size.width - 3.0, 1.0);
+    gfxRect buttonbox1(0.0, 0.0, dr.Width(), dr.Height() - 2.0);
+    gfxRect buttonbox2(1.0, dr.Height() - 2.0, dr.Width() - 1.0, 1.0);
+    gfxRect buttonbox3(2.0, dr.Height() - 1.0, dr.Width() - 3.0, 1.0);
 
     gfxContext::GraphicsOperator currentOp = ctx->CurrentOperator();
     ctx->SetOperator(gfxContext::OPERATOR_CLEAR);

From 8498002a492524bb9070b7883ecbb78d1fc3b079 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:21 +1200
Subject: [PATCH 302/509] Bug 641426. Part 2.5: Make gfxBlur bail out in all
 cases where the blur rect is empty. r=tnikkel

---
 gfx/thebes/gfxBlur.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gfx/thebes/gfxBlur.cpp b/gfx/thebes/gfxBlur.cpp
index dd9e4376150d..cfd303ac9185 100644
--- a/gfx/thebes/gfxBlur.cpp
+++ b/gfx/thebes/gfxBlur.cpp
@@ -66,9 +66,6 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
     rect.Outset(aBlurRadius + aSpreadRadius);
     rect.RoundOut();
 
-    if (rect.IsEmpty())
-        return nsnull;
-
     if (aDirtyRect) {
         // If we get passed a dirty rect from layout, we can minimize the
         // shadow size and make painting faster.
@@ -81,6 +78,12 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
         mHasDirtyRect = PR_FALSE;
     }
 
+    // Check rect empty after accounting for aDirtyRect, since that may have
+    // make the rectangle empty. BoxBlurVertical and BoxBlurHorizontal require
+    // that we have a nonzero number of rows and columns.
+    if (rect.IsEmpty())
+        return nsnull;
+
     if (aSkipRect) {
         // If we get passed a skip rect, we can lower the amount of
         // blurring/spreading we need to do. We convert it to nsIntRect to avoid
@@ -138,6 +141,8 @@ BoxBlurHorizontal(unsigned char* aInput,
                   PRInt32 aRows,
                   const nsIntRect& aSkipRect)
 {
+    NS_ASSERTION(aWidth > 0, "Can't handle zero width here");
+
     PRInt32 boxSize = aLeftLobe + aRightLobe + 1;
     PRBool skipRectCoversWholeRow = 0 >= aSkipRect.x &&
                                     aWidth <= aSkipRect.XMost();
@@ -156,6 +161,8 @@ BoxBlurHorizontal(unsigned char* aInput,
         PRInt32 alphaSum = 0;
         for (PRInt32 i = 0; i < boxSize; i++) {
             PRInt32 pos = i - aLeftLobe;
+            // See assertion above; if aWidth is zero, then we would have no
+            // valid position to clamp to.
             pos = NS_MAX(pos, 0);
             pos = NS_MIN(pos, aWidth - 1);
             alphaSum += aInput[aWidth * y + pos];
@@ -174,6 +181,8 @@ BoxBlurHorizontal(unsigned char* aInput,
                 alphaSum = 0;
                 for (PRInt32 i = 0; i < boxSize; i++) {
                     PRInt32 pos = x + i - aLeftLobe;
+                    // See assertion above; if aWidth is zero, then we would have no
+                    // valid position to clamp to.
                     pos = NS_MAX(pos, 0);
                     pos = NS_MIN(pos, aWidth - 1);
                     alphaSum += aInput[aWidth * y + pos];
@@ -205,6 +214,8 @@ BoxBlurVertical(unsigned char* aInput,
                 PRInt32 aRows,
                 const nsIntRect& aSkipRect)
 {
+    NS_ASSERTION(aRows > 0, "Can't handle zero rows here");
+
     PRInt32 boxSize = aTopLobe + aBottomLobe + 1;
     PRBool skipRectCoversWholeColumn = 0 >= aSkipRect.y &&
                                        aRows <= aSkipRect.YMost();
@@ -220,6 +231,8 @@ BoxBlurVertical(unsigned char* aInput,
         PRInt32 alphaSum = 0;
         for (PRInt32 i = 0; i < boxSize; i++) {
             PRInt32 pos = i - aTopLobe;
+            // See assertion above; if aRows is zero, then we would have no
+            // valid position to clamp to.
             pos = NS_MAX(pos, 0);
             pos = NS_MIN(pos, aRows - 1);
             alphaSum += aInput[aWidth * pos + x];
@@ -234,6 +247,8 @@ BoxBlurVertical(unsigned char* aInput,
                 alphaSum = 0;
                 for (PRInt32 i = 0; i < boxSize; i++) {
                     PRInt32 pos = y + i - aTopLobe;
+                    // See assertion above; if aRows is zero, then we would have no
+                    // valid position to clamp to.
                     pos = NS_MAX(pos, 0);
                     pos = NS_MIN(pos, aRows - 1);
                     alphaSum += aInput[aWidth * pos + x];

From 1c5c997eb599f95841b0f512e8844dccd6d5b119 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:21 +1200
Subject: [PATCH 303/509] Bug 641426. Part 3: Convert gfxRect::pos/size to
 x/y/width/height. r=joe,sr=cjones

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |   2 +-
 gfx/layers/ImageLayers.h                      |   2 +-
 gfx/src/nsRenderingContext.cpp                |  14 +-
 gfx/thebes/gfxContext.cpp                     |   4 +-
 gfx/thebes/gfxFont.cpp                        |   6 +-
 gfx/thebes/gfxRect.cpp                        |  72 +++++-----
 gfx/thebes/gfxRect.h                          | 130 +++++++++---------
 layout/base/nsCSSRendering.cpp                |  22 +--
 layout/base/nsCSSRenderingBorders.cpp         |  16 +--
 layout/base/nsLayoutUtils.cpp                 |   8 +-
 layout/generic/nsObjectFrame.cpp              |  16 +--
 layout/mathml/nsMathMLmencloseFrame.cpp       |   2 +-
 layout/svg/base/src/nsSVGFilterInstance.cpp   |   8 +-
 .../svg/base/src/nsSVGPathGeometryFrame.cpp   |   2 +-
 layout/svg/base/src/nsSVGUtils.cpp            |  12 +-
 widget/src/windows/nsNativeThemeWin.cpp       |  12 +-
 16 files changed, 162 insertions(+), 166 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index df7b4fc22c96..8e757c48e797 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -2769,7 +2769,7 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
     processor.mPt.y += anchorY;
 
     // correct bounding box to get it to be the correct size/position
-    processor.mBoundingBox.size.width = totalWidth;
+    processor.mBoundingBox.width = totalWidth;
     processor.mBoundingBox.MoveBy(processor.mPt);
 
     processor.mPt.x *= processor.mAppUnitsPerDevPixel;
diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
index e0507602798b..bf4bdf28f7f1 100644
--- a/gfx/layers/ImageLayers.h
+++ b/gfx/layers/ImageLayers.h
@@ -344,7 +344,7 @@ public:
     gfxRect snap(0, 0, 0, 0);
     if (mContainer) {
       gfxIntSize size = mContainer->GetCurrentSize();
-      snap.size = gfxSize(size.width, size.height);
+      snap.SizeTo(gfxSize(size.width, size.height));
     }
     // Snap our local transform first, and snap the inherited transform as well.
     // This makes our snapping equivalent to what would happen if our content
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index f70b8366d53d..a51bb3602169 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -308,26 +308,26 @@ ConditionRect(gfxRect& r) {
         return PR_FALSE;
 
     if (r.X() < 0.0) {
-        r.size.width += r.X();
-        if (r.size.width < 0.0)
+        r.width += r.X();
+        if (r.width < 0.0)
             return PR_FALSE;
-        r.pos.x = 0.0;
+        r.x = 0.0;
     }
 
     if (r.XMost() > CAIRO_COORD_MAX) {
-        r.size.width = CAIRO_COORD_MAX - r.X();
+        r.width = CAIRO_COORD_MAX - r.X();
     }
 
     if (r.Y() < 0.0) {
-        r.size.height += r.Y();
+        r.height += r.Y();
         if (r.Height() < 0.0)
             return PR_FALSE;
 
-        r.pos.y = 0.0;
+        r.y = 0.0;
     }
 
     if (r.YMost() > CAIRO_COORD_MAX) {
-        r.size.height = CAIRO_COORD_MAX - r.Y();
+        r.height = CAIRO_COORD_MAX - r.Y();
     }
     return PR_TRUE;
 }
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index 02f5329e21df..8c4ccfc81d8f 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -362,8 +362,8 @@ gfxRect
 gfxContext::DeviceToUser(const gfxRect& rect) const
 {
     gfxRect ret = rect;
-    cairo_device_to_user(mCairo, &ret.pos.x, &ret.pos.y);
-    cairo_device_to_user_distance(mCairo, &ret.size.width, &ret.size.height);
+    cairo_device_to_user(mCairo, &ret.x, &ret.y);
+    cairo_device_to_user_distance(mCairo, &ret.width, &ret.height);
     return ret;
 }
 
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 4633257c9fa0..e0d3c0559cc6 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -3624,12 +3624,12 @@ gfxTextRun::AccumulatePartialLigatureMetrics(gfxFont *aFont,
     // Where we are going to start "drawing" relative to our left baseline origin
     gfxFloat origin = IsRightToLeft() ? metrics.mAdvanceWidth - data.mPartAdvance : 0;
     ClipPartialLigature(this, &bboxLeft, &bboxRight, origin, &data);
-    metrics.mBoundingBox.pos.x = bboxLeft;
-    metrics.mBoundingBox.size.width = bboxRight - bboxLeft;
+    metrics.mBoundingBox.x = bboxLeft;
+    metrics.mBoundingBox.width = bboxRight - bboxLeft;
 
     // mBoundingBox is now relative to the left baseline origin for the entire
     // ligature. Shift it left.
-    metrics.mBoundingBox.pos.x -=
+    metrics.mBoundingBox.x -=
         IsRightToLeft() ? metrics.mAdvanceWidth - (data.mPartAdvance + data.mPartWidth)
             : data.mPartAdvance;    
     metrics.mAdvanceWidth = data.mPartWidth;
diff --git a/gfx/thebes/gfxRect.cpp b/gfx/thebes/gfxRect.cpp
index 1b81d442fe33..42bee2032c10 100644
--- a/gfx/thebes/gfxRect.cpp
+++ b/gfx/thebes/gfxRect.cpp
@@ -97,10 +97,10 @@ PRBool
 gfxRect::WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const
 {
     NS_ASSERTION(-0.5 < aEpsilon && aEpsilon < 0.5, "Nonsense epsilon value");
-    return (WithinEpsilonOfInteger(pos.x, aEpsilon) &&
-            WithinEpsilonOfInteger(pos.y, aEpsilon) &&
-            WithinEpsilonOfInteger(size.width, aEpsilon) &&
-            WithinEpsilonOfInteger(size.height, aEpsilon));
+    return (WithinEpsilonOfInteger(x, aEpsilon) &&
+            WithinEpsilonOfInteger(y, aEpsilon) &&
+            WithinEpsilonOfInteger(width, aEpsilon) &&
+            WithinEpsilonOfInteger(height, aEpsilon));
 }
 
 void
@@ -112,11 +112,11 @@ gfxRect::Round()
     gfxFloat x1 = NS_floor(XMost() + 0.5);
     gfxFloat y1 = NS_floor(YMost() + 0.5);
 
-    pos.x = x0;
-    pos.y = y0;
+    x = x0;
+    y = y0;
 
-    size.width = x1 - x0;
-    size.height = y1 - y0;
+    width = x1 - x0;
+    height = y1 - y0;
 }
 
 void
@@ -127,11 +127,11 @@ gfxRect::RoundIn()
     gfxFloat x1 = NS_floor(XMost());
     gfxFloat y1 = NS_floor(YMost());
 
-    pos.x = x0;
-    pos.y = y0;
+    x = x0;
+    y = y0;
 
-    size.width = x1 - x0;
-    size.height = y1 - y0;
+    width = x1 - x0;
+    height = y1 - y0;
 }
 
 void
@@ -142,11 +142,11 @@ gfxRect::RoundOut()
     gfxFloat x1 = NS_ceil(XMost());
     gfxFloat y1 = NS_ceil(YMost());
 
-    pos.x = x0;
-    pos.y = y0;
+    x = x0;
+    y = y0;
 
-    size.width = x1 - x0;
-    size.height = y1 - y0;
+    width = x1 - x0;
+    height = y1 - y0;
 }
 
 /* Clamp r to CAIRO_COORD_MIN .. CAIRO_COORD_MAX
@@ -164,35 +164,35 @@ gfxRect::Condition()
 {
     // if either x or y is way out of bounds;
     // note that we don't handle negative w/h here
-    if (pos.x > CAIRO_COORD_MAX) {
-        pos.x = CAIRO_COORD_MAX;
-        size.width = 0.0;
+    if (x > CAIRO_COORD_MAX) {
+        x = CAIRO_COORD_MAX;
+        width = 0.0;
     } 
 
-    if (pos.y > CAIRO_COORD_MAX) {
-        pos.y = CAIRO_COORD_MAX;
-        size.height = 0.0;
+    if (y > CAIRO_COORD_MAX) {
+        y = CAIRO_COORD_MAX;
+        height = 0.0;
     }
 
-    if (pos.x < CAIRO_COORD_MIN) {
-        size.width += pos.x - CAIRO_COORD_MIN;
-        if (size.width < 0.0)
-            size.width = 0.0;
-        pos.x = CAIRO_COORD_MIN;
+    if (x < CAIRO_COORD_MIN) {
+        width += x - CAIRO_COORD_MIN;
+        if (width < 0.0)
+            width = 0.0;
+        x = CAIRO_COORD_MIN;
     }
 
-    if (pos.y < CAIRO_COORD_MIN) {
-        size.height += pos.y - CAIRO_COORD_MIN;
-        if (size.height < 0.0)
-            size.height = 0.0;
-        pos.y = CAIRO_COORD_MIN;
+    if (y < CAIRO_COORD_MIN) {
+        height += y - CAIRO_COORD_MIN;
+        if (height < 0.0)
+            height = 0.0;
+        y = CAIRO_COORD_MIN;
     }
 
-    if (pos.x + size.width > CAIRO_COORD_MAX) {
-        size.width = CAIRO_COORD_MAX - pos.x;
+    if (x + width > CAIRO_COORD_MAX) {
+        width = CAIRO_COORD_MAX - x;
     }
 
-    if (pos.y + size.height > CAIRO_COORD_MAX) {
-        size.height = CAIRO_COORD_MAX - pos.y;
+    if (y + height > CAIRO_COORD_MAX) {
+        height = CAIRO_COORD_MAX - y;
     }
 }
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index d828ca0a9199..61340c35043a 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -73,71 +73,67 @@ static inline mozilla::css::Corner operator++(mozilla::css::Corner& corner, int)
     return corner;
 }
 
-struct THEBES_API gfxRect {
-    // pt? point?
-    gfxPoint pos;
-    gfxSize size;
+struct THEBES_API gfxRect
+{
+    gfxFloat x, y;
+    gfxFloat width, height;
 
     gfxRect() {}
-    gfxRect(const gfxPoint& _pos, const gfxSize& _size) : pos(_pos), size(_size) {}
+    gfxRect(const gfxPoint& _pos, const gfxSize& _size) :
+        x(_pos.x), y(_pos.y), width(_size.width), height(_size.height) {}
     gfxRect(gfxFloat _x, gfxFloat _y, gfxFloat _width, gfxFloat _height) :
-        pos(_x, _y), size(_width, _height) {}
+        x(_x), y(_y), width(_width), height(_height) {}
 
     int operator==(const gfxRect& s) const {
-        return (pos == s.pos) && (size == s.size);
+        return x == s.x && y == s.y && width == s.width && height == s.height;
     }
     int operator!=(const gfxRect& s) const {
-        return (pos != s.pos) || (size != s.size);
+        return !(*this == s);
     }
 
-    void MoveTo(const gfxPoint& aPt) { pos = aPt; }
+    void MoveTo(const gfxPoint& aPt) { x = aPt.x; y = aPt.y; }
     const gfxRect& MoveBy(const gfxPoint& aPt) {
-        pos = pos + aPt;
+        x += aPt.x;
+        y += aPt.y;
         return *this;
     }
-    void SizeTo(const gfxSize& aSize) { size = aSize; }
+    void SizeTo(const gfxSize& aSize) { width = aSize.width; height = aSize.height; }
 
     gfxRect operator+(const gfxPoint& aPt) const {
-        return gfxRect(pos + aPt, size);
+        return gfxRect(x + aPt.x, y + aPt.y, width, height);
     }
     gfxRect operator-(const gfxPoint& aPt) const {
-        return gfxRect(pos - aPt, size);
+        return gfxRect(x - aPt.x, y - aPt.y, width, height);
     }
     gfxRect operator+(const gfxSize& aSize) const {
-        return gfxRect(pos + gfxPoint(aSize.width, aSize.height), size);
+        return gfxRect(x + aSize.width, y + aSize.height, width, height);
     }
     gfxRect operator-(const gfxSize& aSize) const {
-        return gfxRect(pos - gfxPoint(aSize.width, aSize.height), size);
+        return gfxRect(x - aSize.width, y - aSize.height, width, height);
     }
     gfxRect operator*(const gfxFloat aScale) const {
-        return gfxRect(pos * aScale, size * aScale);
+        return gfxRect(x * aScale, y * aScale, width * aScale, height * aScale);
     }
 
     const gfxRect& operator+=(const gfxPoint& aPt) {
-        pos += aPt;
+        x += aPt.x;
+        y += aPt.y;
         return *this;
     }
     const gfxRect& operator-=(const gfxPoint& aPt) {
-        pos -= aPt;
-        return *this;
-    }
-    const gfxRect& operator+=(const gfxSize& aSize) {
-        pos += gfxPoint(aSize.width, aSize.height);
-        return *this;
-    }
-    const gfxRect& operator-=(const gfxSize& aSize) {
-        pos -= gfxPoint(aSize.width, aSize.height);
+        x -= aPt.x;
+        y -= aPt.y;
         return *this;
     }
 
-    gfxFloat Width() const { return size.width; }
-    gfxFloat Height() const { return size.height; }
-    gfxFloat X() const { return pos.x; }
-    gfxFloat Y() const { return pos.y; }
-    gfxFloat XMost() const { return pos.x + size.width; }
-    gfxFloat YMost() const { return pos.y + size.height; }
+    gfxFloat Width() const { return width; }
+    gfxFloat Height() const { return height; }
+    gfxFloat X() const { return x; }
+    gfxFloat Y() const { return y; }
+    gfxFloat XMost() const { return x + width; }
+    gfxFloat YMost() const { return y + height; }
 
-    PRBool IsEmpty() const { return size.width <= 0 || size.height <= 0; }
+    PRBool IsEmpty() const { return width <= 0 || height <= 0; }
     gfxRect Intersect(const gfxRect& aRect) const;
     gfxRect Union(const gfxRect& aRect) const;
     PRBool Contains(const gfxRect& aRect) const;
@@ -151,20 +147,20 @@ struct THEBES_API gfxRect {
      */
     PRBool WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const;
 
-    gfxSize Size() const { return size; }
+    gfxSize Size() const { return gfxSize(width, height); }
 
     void Inset(gfxFloat k) {
-        pos.x += k;
-        pos.y += k;
-        size.width = PR_MAX(0.0, size.width - k * 2.0);
-        size.height = PR_MAX(0.0, size.height - k * 2.0);
+        x += k;
+        y += k;
+        width = PR_MAX(0.0, width - k * 2.0);
+        height = PR_MAX(0.0, height - k * 2.0);
     }
 
     void Inset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        pos.x += left;
-        pos.y += top;
-        size.width = PR_MAX(0.0, size.width - (right+left));
-        size.height = PR_MAX(0.0, size.height - (bottom+top));
+        x += left;
+        y += top;
+        width = PR_MAX(0.0, width - (right+left));
+        height = PR_MAX(0.0, height - (bottom+top));
     }
 
     void Inset(const gfxFloat *sides) {
@@ -176,17 +172,17 @@ struct THEBES_API gfxRect {
     }
 
     void Outset(gfxFloat k) {
-        pos.x -= k;
-        pos.y -= k;
-        size.width = PR_MAX(0.0, size.width + k * 2.0);
-        size.height = PR_MAX(0.0, size.height + k * 2.0);
+        x -= k;
+        y -= k;
+        width = PR_MAX(0.0, width + k * 2.0);
+        height = PR_MAX(0.0, height + k * 2.0);
     }
 
     void Outset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        pos.x -= left;
-        pos.y -= top;
-        size.width = PR_MAX(0.0, size.width + (right+left));
-        size.height = PR_MAX(0.0, size.height + (bottom+top));
+        x -= left;
+        y -= top;
+        width = PR_MAX(0.0, width + (right+left));
+        height = PR_MAX(0.0, height + (bottom+top));
     }
 
     void Outset(const gfxFloat *sides) {
@@ -219,11 +215,11 @@ struct THEBES_API gfxRect {
     void RoundOut();
 
     // grabbing specific points
-    gfxPoint TopLeft() const { return gfxPoint(pos); }
-    gfxPoint TopRight() const { return pos + gfxPoint(size.width, 0.0); }
-    gfxPoint BottomLeft() const { return pos + gfxPoint(0.0, size.height); }
-    gfxPoint BottomRight() const { return pos + gfxPoint(size.width, size.height); }
-    gfxPoint Center() const { return pos + gfxPoint(size.width, size.height)/2.0; }
+    gfxPoint TopLeft() const { return gfxPoint(x, y); }
+    gfxPoint TopRight() const { return gfxPoint(x, y) + gfxPoint(width, 0.0); }
+    gfxPoint BottomLeft() const { return gfxPoint(x, y) + gfxPoint(0.0, height); }
+    gfxPoint BottomRight() const { return gfxPoint(x, y) + gfxPoint(width, height); }
+    gfxPoint Center() const { return gfxPoint(x, y) + gfxPoint(width, height)/2.0; }
 
     gfxPoint AtCorner(mozilla::css::Corner corner) const {
         switch (corner) {
@@ -272,27 +268,27 @@ struct THEBES_API gfxRect {
 
     void Scale(gfxFloat k) {
         NS_ASSERTION(k >= 0.0, "Invalid (negative) scale factor");
-        pos.x *= k;
-        pos.y *= k;
-        size.width *= k;
-        size.height *= k;
+        x *= k;
+        y *= k;
+        width *= k;
+        height *= k;
     }
 
     void Scale(gfxFloat sx, gfxFloat sy) {
         NS_ASSERTION(sx >= 0.0, "Invalid (negative) scale factor");
         NS_ASSERTION(sy >= 0.0, "Invalid (negative) scale factor");
-        pos.x *= sx;
-        pos.y *= sy;
-        size.width *= sx;
-        size.height *= sy;
+        x *= sx;
+        y *= sy;
+        width *= sx;
+        height *= sy;
     }
 
     void ScaleInverse(gfxFloat k) {
         NS_ASSERTION(k > 0.0, "Invalid (negative) scale factor");
-        pos.x /= k;
-        pos.y /= k;
-        size.width /= k;
-        size.height /= k;
+        x /= k;
+        y /= k;
+        width /= k;
+        height /= k;
     }
 };
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 0f1cf10ea4ce..4d9029f02a30 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -3445,7 +3445,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
       aGfxContext->SetLineCap(gfxContext::LINE_CAP_BUTT);
       aGfxContext->SetDash(dash, 2, 0.0);
       // We should continue to draw the last dash even if it is not in the rect.
-      rect.size.width += dashWidth;
+      rect.width += dashWidth;
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_DOTTED: {
@@ -3464,7 +3464,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
       }
       aGfxContext->SetDash(dash, 2, 0.0);
       // We should continue to draw the last dot even if it is not in the rect.
-      rect.size.width += dashWidth;
+      rect.width += dashWidth;
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_WAVY:
@@ -3486,7 +3486,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
   }
 
   // The y position should be set to the middle of the line.
-  rect.pos.y += lineHeight / 2;
+  rect.y += lineHeight / 2;
 
   aGfxContext->SetColor(gfxRGBA(aColor));
   aGfxContext->SetLineWidth(lineHeight);
@@ -3515,7 +3515,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
       aGfxContext->NewPath();
       aGfxContext->MoveTo(rect.TopLeft());
       aGfxContext->LineTo(rect.TopRight());
-      rect.size.height -= lineHeight;
+      rect.height -= lineHeight;
       aGfxContext->MoveTo(rect.BottomLeft());
       aGfxContext->LineTo(rect.BottomRight());
       aGfxContext->Stroke();
@@ -3557,7 +3557,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
        *  7. Repeat from 2 until reached to right-most edge of the area.
        */
 
-      rect.pos.x += lineHeight / 2.0;
+      rect.x += lineHeight / 2.0;
       aGfxContext->NewPath();
 
       gfxPoint pt(rect.TopLeft());
@@ -3649,7 +3649,7 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
   gfxFloat descentLimit = NS_floor(aDescentLimit);
 
   gfxFloat suggestedMaxRectHeight = NS_MAX(NS_MIN(ascent, descentLimit), 1.0);
-  r.size.height = lineHeight;
+  r.height = lineHeight;
   if (aStyle == NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE) {
     /**
      *  We will draw double line as:
@@ -3668,12 +3668,12 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
      */
     gfxFloat gap = NS_round(lineHeight / 2.0);
     gap = NS_MAX(gap, 1.0);
-    r.size.height = lineHeight * 2.0 + gap;
+    r.height = lineHeight * 2.0 + gap;
     if (canLiftUnderline) {
       if (r.Height() > suggestedMaxRectHeight) {
         // Don't shrink the line height, because the thickness has some meaning.
         // We can just shrink the gap at this time.
-        r.size.height = NS_MAX(suggestedMaxRectHeight, lineHeight * 2.0 + 1.0);
+        r.height = NS_MAX(suggestedMaxRectHeight, lineHeight * 2.0 + 1.0);
       }
     }
   } else if (aStyle == NS_STYLE_TEXT_DECORATION_STYLE_WAVY) {
@@ -3690,14 +3690,14 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
      * |        XXXXXX            XXXXXX           |
      * +-------------------------------------------+
      */
-    r.size.height = lineHeight > 2.0 ? lineHeight * 4.0 : lineHeight * 3.0;
+    r.height = lineHeight > 2.0 ? lineHeight * 4.0 : lineHeight * 3.0;
     if (canLiftUnderline) {
       if (r.Height() > suggestedMaxRectHeight) {
         // Don't shrink the line height even if there is not enough space,
         // because the thickness has some meaning.  E.g., the 1px wavy line and
         // 2px wavy line can be used for different meaning in IME selections
         // at same time.
-        r.size.height = NS_MAX(suggestedMaxRectHeight, lineHeight * 2.0);
+        r.height = NS_MAX(suggestedMaxRectHeight, lineHeight * 2.0);
       }
     }
   }
@@ -3731,7 +3731,7 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
     default:
       NS_ERROR("Invalid decoration value!");
   }
-  r.pos.y = baseline - NS_floor(offset + 0.5);
+  r.y = baseline - NS_floor(offset + 0.5);
   return r;
 }
 
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index dfbbc5bda247..f16c7295ccf4 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -394,9 +394,9 @@ nsCSSBorderRenderer::DoSideClipWithoutCornersSubPath(mozilla::css::Side aSide)
                mOuterRect.Size() - sideCornerSum);
 
   if (aSide == NS_SIDE_TOP || aSide == NS_SIDE_BOTTOM)
-    rect.size.height = mBorderWidths[aSide];
+    rect.height = mBorderWidths[aSide];
   else
-    rect.size.width = mBorderWidths[aSide];
+    rect.width = mBorderWidths[aSide];
 
   mContext->Rectangle(rect);
 }
@@ -611,24 +611,24 @@ nsCSSBorderRenderer::FillSolidBorder(const gfxRect& aOuterRect,
 
   if ((aSides & (SIDE_BIT_TOP | SIDE_BIT_LEFT)) == (SIDE_BIT_TOP | SIDE_BIT_LEFT)) {
     // adjust the left's top down a bit
-    r[NS_SIDE_LEFT].pos.y += aBorderSizes[NS_SIDE_TOP];
-    r[NS_SIDE_LEFT].size.height -= aBorderSizes[NS_SIDE_TOP];
+    r[NS_SIDE_LEFT].y += aBorderSizes[NS_SIDE_TOP];
+    r[NS_SIDE_LEFT].height -= aBorderSizes[NS_SIDE_TOP];
   }
 
   if ((aSides & (SIDE_BIT_TOP | SIDE_BIT_RIGHT)) == (SIDE_BIT_TOP | SIDE_BIT_RIGHT)) {
     // adjust the top's left a bit
-    r[NS_SIDE_TOP].size.width -= aBorderSizes[NS_SIDE_RIGHT];
+    r[NS_SIDE_TOP].width -= aBorderSizes[NS_SIDE_RIGHT];
   }
 
   if ((aSides & (SIDE_BIT_BOTTOM | SIDE_BIT_RIGHT)) == (SIDE_BIT_BOTTOM | SIDE_BIT_RIGHT)) {
     // adjust the right's bottom a bit
-    r[NS_SIDE_RIGHT].size.height -= aBorderSizes[NS_SIDE_BOTTOM];
+    r[NS_SIDE_RIGHT].height -= aBorderSizes[NS_SIDE_BOTTOM];
   }
 
   if ((aSides & (SIDE_BIT_BOTTOM | SIDE_BIT_LEFT)) == (SIDE_BIT_BOTTOM | SIDE_BIT_LEFT)) {
     // adjust the bottom's left a bit
-    r[NS_SIDE_BOTTOM].pos.x += aBorderSizes[NS_SIDE_LEFT];
-    r[NS_SIDE_BOTTOM].size.width -= aBorderSizes[NS_SIDE_LEFT];
+    r[NS_SIDE_BOTTOM].x += aBorderSizes[NS_SIDE_LEFT];
+    r[NS_SIDE_BOTTOM].width -= aBorderSizes[NS_SIDE_LEFT];
   }
 
   // Filling these one by one is faster than filling them all at once.
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index e05c118a20be..958be61583a2 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1015,10 +1015,10 @@ nsLayoutUtils::RoundGfxRectToAppRect(const gfxRect &aRect, float aFactor)
   scaledRect.RoundOut();
 
   /* We now need to constrain our results to the max and min values for coords. */
-  ConstrainToCoordValues(scaledRect.pos.x);
-  ConstrainToCoordValues(scaledRect.pos.y);
-  ConstrainToCoordValues(scaledRect.size.width);
-  ConstrainToCoordValues(scaledRect.size.height);
+  ConstrainToCoordValues(scaledRect.x);
+  ConstrainToCoordValues(scaledRect.y);
+  ConstrainToCoordValues(scaledRect.width);
+  ConstrainToCoordValues(scaledRect.height);
 
   /* Now typecast everything back.  This is guaranteed to be safe. */
   return nsRect(nscoord(scaledRect.X()), nscoord(scaledRect.Y()),
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 6b66e6a53111..f065edd08684 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -6000,7 +6000,7 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
 
   // Round out the dirty rect to plugin pixels to ensure the plugin draws
   // enough pixels for interpolation to device pixels.
-  gfxRect dirtyRect = aDirtyRect + -pluginRect.pos;
+  gfxRect dirtyRect = aDirtyRect - pluginRect.TopLeft();
   dirtyRect.RoundOut();
 
   // Plugins can only draw an integer number of pixels.
@@ -6013,14 +6013,14 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
   // draw a suitable number of pixels for interpolation to device pixels in
   // Renderer::Draw, but such cases are not common enough to warrant the
   // effort now.
-  nsIntSize pluginSize(NS_lround(pluginRect.size.width),
-                       NS_lround(pluginRect.size.height));
+  nsIntSize pluginSize(NS_lround(pluginRect.width),
+                       NS_lround(pluginRect.height));
 
   // Determine what the plugin needs to draw.
-  nsIntRect pluginDirtyRect(PRInt32(dirtyRect.pos.x),
-                            PRInt32(dirtyRect.pos.y),
-                            PRInt32(dirtyRect.size.width),
-                            PRInt32(dirtyRect.size.height));
+  nsIntRect pluginDirtyRect(PRInt32(dirtyRect.x),
+                            PRInt32(dirtyRect.y),
+                            PRInt32(dirtyRect.width),
+                            PRInt32(dirtyRect.height));
   if (!pluginDirtyRect.
       IntersectRect(nsIntRect(0, 0, pluginSize.width, pluginSize.height),
                     pluginDirtyRect))
@@ -6043,7 +6043,7 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
 
   // Renderer::Draw() draws a rectangle with top-left at the aContext origin.
   gfxContextAutoSaveRestore autoSR(aContext);
-  aContext->Translate(pluginRect.pos);
+  aContext->Translate(pluginRect.TopLeft());
 
   Renderer renderer(window, this, pluginSize, pluginDirtyRect);
 #ifdef MOZ_WIDGET_GTK2
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 60b287e5504d..23ff471dcc56 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -784,7 +784,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder,
   switch(mType)
     {
     case NOTATION_CIRCLE:
-      gfxCtx->Ellipse(rect.Center(), rect.size);
+      gfxCtx->Ellipse(rect.Center(), rect.Size());
       break;
 
     case NOTATION_ROUNDEDBOX:
diff --git a/layout/svg/base/src/nsSVGFilterInstance.cpp b/layout/svg/base/src/nsSVGFilterInstance.cpp
index 88e58eb87f22..471435c89089 100644
--- a/layout/svg/base/src/nsSVGFilterInstance.cpp
+++ b/layout/svg/base/src/nsSVGFilterInstance.cpp
@@ -140,13 +140,13 @@ nsSVGFilterInstance::ComputeFilterPrimitiveSubregion(PrimitiveInfo* aPrimitive)
   gfxRect region = UserSpaceToFilterSpace(feArea);
 
   if (!fE->HasAttr(kNameSpaceID_None, nsGkAtoms::x))
-    region.pos.x = defaultFilterSubregion.X();
+    region.x = defaultFilterSubregion.X();
   if (!fE->HasAttr(kNameSpaceID_None, nsGkAtoms::y))
-    region.pos.y = defaultFilterSubregion.Y();
+    region.y = defaultFilterSubregion.Y();
   if (!fE->HasAttr(kNameSpaceID_None, nsGkAtoms::width))
-    region.size.width = defaultFilterSubregion.Width();
+    region.width = defaultFilterSubregion.Width();
   if (!fE->HasAttr(kNameSpaceID_None, nsGkAtoms::height))
-    region.size.height = defaultFilterSubregion.Height();
+    region.height = defaultFilterSubregion.Height();
 
   // We currently require filter primitive subregions to be pixel-aligned.
   // Following the spec, any pixel partially in the region is included
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index 317312516e67..63034158e058 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -275,7 +275,7 @@ nsSVGPathGeometryFrame::UpdateCoveredRegion()
       // GetUserStrokeExtent gets the extents wrong we can still use it
       // to get the device space position of zero length stroked paths.
       extent = context->GetUserStrokeExtent();
-      extent += extent.Size()/2;
+      extent += gfxPoint(extent.width, extent.height)/2;
       extent.SizeTo(gfxSize(0, 0));
     }
     extent = nsSVGUtils::PathExtentsToMaxStrokeExtents(extent, this);
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index e076d77b477c..2eeab42b2be9 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1193,19 +1193,19 @@ nsSVGUtils::GetClipRectForFrame(nsIFrame *aFrame,
       gfxRect(clipPxRect.x, clipPxRect.y, clipPxRect.width, clipPxRect.height);
 
     if (NS_STYLE_CLIP_RIGHT_AUTO & disp->mClipFlags) {
-      clipRect.size.width = aWidth - clipRect.X();
+      clipRect.width = aWidth - clipRect.X();
     }
     if (NS_STYLE_CLIP_BOTTOM_AUTO & disp->mClipFlags) {
-      clipRect.size.height = aHeight - clipRect.Y();
+      clipRect.height = aHeight - clipRect.Y();
     }
 
     if (disp->mOverflowX != NS_STYLE_OVERFLOW_HIDDEN) {
-      clipRect.pos.x = aX;
-      clipRect.size.width = aWidth;
+      clipRect.x = aX;
+      clipRect.width = aWidth;
     }
     if (disp->mOverflowY != NS_STYLE_OVERFLOW_HIDDEN) {
-      clipRect.pos.y = aY;
-      clipRect.size.height = aHeight;
+      clipRect.y = aY;
+      clipRect.height = aHeight;
     }
      
     return clipRect;
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index fb0b734ef048..a57b7b9192e7 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1259,13 +1259,13 @@ nsNativeThemeWin::DrawWidgetBackground(nsRenderingContext* aContext,
   if (aWidgetType == NS_THEME_DROPDOWN_BUTTON &&
       part == CBP_DROPMARKER_VISTA && IsHTMLContent(aFrame))
   {
-    tr.pos.y -= 1.0;
-    tr.size.width += 1.0;
-    tr.size.height += 2.0;
+    tr.y -= 1.0;
+    tr.width += 1.0;
+    tr.height += 2.0;
 
-    dr.pos.y -= 1.0;
-    dr.size.width += 1.0;
-    dr.size.height += 2.0;
+    dr.y -= 1.0;
+    dr.width += 1.0;
+    dr.height += 2.0;
   }
 
   nsRefPtr<gfxContext> ctx = aContext->ThebesContext();

From ca5e5d48e9af71faade75c892efe569ab8400b87 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:22 +1200
Subject: [PATCH 304/509] Bug 641426. Part 3.5: Remove usage of
 nsMargin::TopLeft and nsMargin::IsZero. r=dbaron

---
 layout/generic/nsBulletFrame.cpp |  6 ++--
 layout/generic/nsFrame.cpp       | 29 ++++++++++++++------
 layout/generic/nsIFrame.h        |  2 ++
 layout/generic/nsObjectFrame.cpp | 47 +++++++++++++++-----------------
 layout/tables/nsTableFrame.cpp   |  4 +--
 5 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp
index e5dd44226bd2..f9260f35b4d2 100644
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@@ -314,9 +314,9 @@ nsBulletFrame::PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
 
   case NS_STYLE_LIST_STYLE_SQUARE:
     {
-      nsRect rect(mPadding.TopLeft() + aPt,
-                  nsSize(mRect.width - mPadding.LeftRight(),
-                         mRect.height - mPadding.TopBottom()));
+      nsRect rect(aPt, mRect.Size());
+      rect.Deflate(mPadding);
+
       // Snap the height and the width of the rectangle to device pixels,
       // and then center the result within the original rectangle, so that
       // all square bullets at the same font size have the same visual
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index a0c067b289d3..ba8addbfdefa 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -710,14 +710,20 @@ nsIFrame::ApplySkipSides(nsMargin& aMargin) const
     aMargin.left = 0;
 }
 
+nsRect
+nsIFrame::GetPaddingRectRelativeToSelf() const
+{
+  nsMargin bp(GetUsedBorder());
+  ApplySkipSides(bp);
+  nsRect r(0, 0, mRect.width, mRect.height);
+  r.Deflate(bp);
+  return r;
+}
+
 nsRect
 nsIFrame::GetPaddingRect() const
 {
-  nsMargin b(GetUsedBorder());
-  ApplySkipSides(b);
-  nsRect r(mRect);
-  r.Deflate(b);
-  return r;
+  return GetPaddingRectRelativeToSelf() + GetPosition();
 }
 
 PRBool
@@ -728,15 +734,21 @@ nsIFrame::IsTransformed() const
 }
 
 nsRect
-nsIFrame::GetContentRect() const
+nsIFrame::GetContentRectRelativeToSelf() const
 {
   nsMargin bp(GetUsedBorderAndPadding());
   ApplySkipSides(bp);
-  nsRect r(mRect);
+  nsRect r(0, 0, mRect.width, mRect.height);
   r.Deflate(bp);
   return r;
 }
 
+nsRect
+nsIFrame::GetContentRect() const
+{
+  return GetContentRectRelativeToSelf() + GetPosition();
+}
+
 PRBool
 nsIFrame::ComputeBorderRadii(const nsStyleCorners& aBorderRadius,
                              const nsSize& aFrameSize,
@@ -6590,7 +6602,8 @@ nsIFrame::IsFocusable(PRInt32 *aTabIndex, PRBool aWithMouse)
         // When clicked on, the selection position within the element 
         // will be enough to make them keyboard scrollable.
         nsIScrollableFrame *scrollFrame = do_QueryFrame(this);
-        if (scrollFrame && !scrollFrame->GetActualScrollbarSizes().IsZero()) {
+        if (scrollFrame &&
+            scrollFrame->GetActualScrollbarSizes() != nsMargin(0,0,0,0)) {
             // Scroll bars will be used for overflow
             isFocusable = PR_TRUE;
             tabIndex = 0;
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 278fa93aa7df..6d9cf23f5051 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -941,7 +941,9 @@ public:
    * other rectangles of the frame, in app units, relative to the parent.
    */
   nsRect GetPaddingRect() const;
+  nsRect GetPaddingRectRelativeToSelf() const;
   nsRect GetContentRect() const;
+  nsRect GetContentRectRelativeToSelf() const;
 
   /**
    * Get the size, in app units, of the border radii. It returns FALSE iff all
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index f065edd08684..76c59a392a3e 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -840,7 +840,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth,
     if (!parentWidget)
       return NS_ERROR_FAILURE;
 
-    mInnerView = viewMan->CreateView(GetContentRect() - GetPosition(), view);
+    mInnerView = viewMan->CreateView(GetContentRectRelativeToSelf(), view);
     if (!mInnerView) {
       NS_ERROR("Could not create inner view");
       return NS_ERROR_OUT_OF_MEMORY;
@@ -883,7 +883,7 @@ nsObjectFrame::CreateWidget(nscoord aWidth,
       // On Mac, we need to invalidate ourselves since even windowed
       // plugins are painted through Thebes and we need to ensure
       // the Thebes layer containing the plugin is updated.
-      Invalidate(GetContentRect() - GetPosition());
+      Invalidate(GetContentRectRelativeToSelf());
 #endif
     }
   }
@@ -1207,7 +1207,7 @@ nsObjectFrame::CallSetWindow(PRBool aCheckIsHidden)
     return NS_ERROR_FAILURE;
   PRInt32 appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
   nsIFrame* rootFrame = rootPC->PresShell()->FrameManager()->GetRootFrame();
-  nsRect bounds = GetContentRect() + GetParent()->GetOffsetToCrossDoc(rootFrame);
+  nsRect bounds = GetContentRectRelativeToSelf() + GetOffsetToCrossDoc(rootFrame);
   nsIntRect intBounds = bounds.ToNearestPixels(appUnitsPerDevPixel);
   window->x = intBounds.x;
   window->y = intBounds.y;
@@ -1279,9 +1279,7 @@ nsIntPoint nsObjectFrame::GetWindowOriginInPixels(PRBool aWindowless)
     parentWithView->GetNearestWidget(&offsetToWidget);
     origin += offsetToWidget;
   }
-  // It's OK to use GetUsedBorderAndPadding here (and below) since
-  // GetSkipSides always returns 0; we don't split nsObjectFrames
-  origin += GetUsedBorderAndPadding().TopLeft();
+  origin += GetContentRectRelativeToSelf().TopLeft();
 
   return nsIntPoint(PresContext()->AppUnitsToDevPixels(origin.x),
                     PresContext()->AppUnitsToDevPixels(origin.y));
@@ -1322,7 +1320,7 @@ nsObjectFrame::DidReflow(nsPresContext*            aPresContext,
 nsObjectFrame::PaintPrintPlugin(nsIFrame* aFrame, nsRenderingContext* aCtx,
                                 const nsRect& aDirtyRect, nsPoint aPt)
 {
-  nsPoint pt = aPt + aFrame->GetUsedBorderAndPadding().TopLeft();
+  nsPoint pt = aPt + aFrame->GetContentRectRelativeToSelf().TopLeft();
   nsRenderingContext::AutoPushTranslation translate(aCtx, pt);
   // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
   static_cast<nsObjectFrame*>(aFrame)->PrintPlugin(*aCtx, aDirtyRect);
@@ -1366,8 +1364,7 @@ static nsRect
 GetDisplayItemBounds(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem, nsIFrame* aFrame)
 {
   // XXX For slightly more accurate region computations we should pixel-snap this
-  return aFrame->GetContentRect() - aFrame->GetPosition() +
-    aItem->ToReferenceFrame();
+  return aFrame->GetContentRectRelativeToSelf() + aItem->ToReferenceFrame();
 }
 
 nsRect
@@ -1461,7 +1458,7 @@ nsDisplayPlugin::GetWidgetConfiguration(nsDisplayListBuilder* aBuilder,
                                         nsTArray<nsIWidget::Configuration>* aConfigurations)
 {
   nsObjectFrame* f = static_cast<nsObjectFrame*>(mFrame);
-  nsPoint pluginOrigin = mFrame->GetUsedBorderAndPadding().TopLeft() +
+  nsPoint pluginOrigin = mFrame->GetContentRectRelativeToSelf().TopLeft() +
     ToReferenceFrame();
   f->ComputeWidgetGeometry(mVisibleRegion, pluginOrigin, aConfigurations);
 }
@@ -1494,7 +1491,7 @@ nsObjectFrame::ComputeWidgetGeometry(const nsRegion& aRegion,
 
   PRInt32 appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
   nsIFrame* rootFrame = rootPC->PresShell()->FrameManager()->GetRootFrame();
-  nsRect bounds = GetContentRect() + GetParent()->GetOffsetToCrossDoc(rootFrame);
+  nsRect bounds = GetContentRectRelativeToSelf() + GetOffsetToCrossDoc(rootFrame);
   configuration->mBounds = bounds.ToNearestPixels(appUnitsPerDevPixel);
 
   // This should produce basically the same rectangle (but not relative
@@ -1720,7 +1717,7 @@ nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
   
 // platform specific printing code
 #ifdef MAC_CARBON_PLUGINS
-  nsSize contentSize = GetContentRect().Size();
+  nsSize contentSize = GetContentRectRelativeToSelf().Size();
   window.x = 0;
   window.y = 0;
   window.width = presContext->AppUnitsToDevPixels(contentSize.width);
@@ -1843,7 +1840,7 @@ nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
    */
 
   /* we'll already be translated into the right spot by gfxWindowsNativeDrawing */
-  nsSize contentSize = GetContentRect().Size();
+  nsSize contentSize = GetContentRectRelativeToSelf().Size();
   window.x = 0;
   window.y = 0;
   window.width = presContext->AppUnitsToDevPixels(contentSize.width);
@@ -1929,7 +1926,7 @@ nsObjectFrame::GetPaintedRect(nsDisplayPlugin* aItem)
 {
   if (!mInstanceOwner)
     return nsRect();
-  nsRect r = GetContentRect() - GetPosition();
+  nsRect r = GetContentRectRelativeToSelf();
   if (!mInstanceOwner->UseAsyncRendering())
     return r;
 
@@ -2123,7 +2120,7 @@ nsObjectFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
 
   gfxIntSize size = container->GetCurrentSize();
 
-  nsRect area = GetContentRect() + aBuilder->ToReferenceFrame(GetParent());
+  nsRect area = GetContentRectRelativeToSelf() + aItem->ToReferenceFrame();
   gfxRect r = nsLayoutUtils::RectToGfxRect(area, PresContext()->AppUnitsPerDevPixel());
   // to provide crisper and faster drawing.
   r.Round();
@@ -2646,10 +2643,10 @@ nsObjectFrame::Instantiate(nsIChannel* aChannel, nsIStreamListener** aStreamList
   mInstanceOwner->SetPluginHost(pluginHost);
 
   // This must be done before instantiating the plugin
-  FixupWindow(GetContentRect().Size());
+  FixupWindow(GetContentRectRelativeToSelf().Size());
 
   // Ensure we redraw when a plugin is instantiated
-  Invalidate(GetContentRect() - GetPosition());
+  Invalidate(GetContentRectRelativeToSelf());
 
   nsWeakFrame weakFrame(this);
 
@@ -2700,10 +2697,10 @@ nsObjectFrame::Instantiate(const char* aMimeType, nsIURI* aURI)
   nsWeakFrame weakFrame(this);
 
   // This must be done before instantiating the plugin
-  FixupWindow(GetContentRect().Size());
+  FixupWindow(GetContentRectRelativeToSelf().Size());
 
   // Ensure we redraw when a plugin is instantiated
-  Invalidate(GetContentRect() - GetPosition());
+  Invalidate(GetContentRectRelativeToSelf());
 
   // get the nsIPluginHost service
   nsCOMPtr<nsIPluginHost> pluginHost(do_GetService(MOZ_PLUGIN_HOST_CONTRACTID, &rv));
@@ -3569,7 +3566,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::InvalidateRect(NPRect *invalidRect)
       rect.UnionRect(rect, oldRect);
     }
   }
-  rect.MoveBy(mObjectFrame->GetUsedBorderAndPadding().TopLeft());
+  rect.MoveBy(mObjectFrame->GetContentRectRelativeToSelf().TopLeft());
   mObjectFrame->InvalidateLayer(rect, nsDisplayItem::TYPE_PLUGIN);
   return NS_OK;
 }
@@ -4980,7 +4977,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEventX11Composited(const nsGUIEvent&
         const nsPresContext* presContext = mObjectFrame->PresContext();
         nsPoint appPoint =
           nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mObjectFrame) -
-          mObjectFrame->GetUsedBorderAndPadding().TopLeft();
+          mObjectFrame->GetContentRectRelativeToSelf().TopLeft();
         nsIntPoint pluginPoint(presContext->AppUnitsToDevPixels(appPoint.x),
                                presContext->AppUnitsToDevPixels(appPoint.y));
         mLastPoint = pluginPoint;
@@ -5277,7 +5274,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
   void* event = anEvent.pluginEvent;
   nsPoint pt =
   nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mObjectFrame) -
-  mObjectFrame->GetUsedBorderAndPadding().TopLeft();
+  mObjectFrame->GetContentRectRelativeToSelf().TopLeft();
   nsPresContext* presContext = mObjectFrame->PresContext();
   nsIntPoint ptPx(presContext->AppUnitsToDevPixels(pt.x),
                   presContext->AppUnitsToDevPixels(pt.y));
@@ -5480,7 +5477,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
                    "Incorrect event type for coordinate translation");
       nsPoint pt =
         nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mObjectFrame) -
-        mObjectFrame->GetUsedBorderAndPadding().TopLeft();
+        mObjectFrame->GetContentRectRelativeToSelf().TopLeft();
       nsPresContext* presContext = mObjectFrame->PresContext();
       nsIntPoint ptPx(presContext->AppUnitsToDevPixels(pt.x),
                       presContext->AppUnitsToDevPixels(pt.y));
@@ -5541,7 +5538,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
         const nsPresContext* presContext = mObjectFrame->PresContext();
         nsPoint appPoint =
           nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mObjectFrame) -
-          mObjectFrame->GetUsedBorderAndPadding().TopLeft();
+          mObjectFrame->GetContentRectRelativeToSelf().TopLeft();
         nsIntPoint pluginPoint(presContext->AppUnitsToDevPixels(appPoint.x),
                                presContext->AppUnitsToDevPixels(appPoint.y));
         const nsMouseEvent& mouseEvent =
@@ -6698,7 +6695,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)
 #endif
 
           // Changing to windowless mode changes the NPWindow geometry.
-          mObjectFrame->FixupWindow(mObjectFrame->GetContentRect().Size());
+          mObjectFrame->FixupWindow(mObjectFrame->GetContentRectRelativeToSelf().Size());
         } else if (mWidget) {
           nsIWidget* parent = mWidget->GetParent();
           NS_ASSERTION(parent, "Plugin windows must not be toplevel");
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 15de0adb2f22..c3e4d96032dc 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1308,7 +1308,7 @@ nsTableFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
     // If 'deflate' is (0,0,0,0) then we can paint the table background
     // in its own display item, so do that to take advantage of
     // opacity and visibility optimizations
-    if (deflate.IsZero()) {
+    if (deflate == nsMargin(0, 0, 0, 0)) {
       nsresult rv = DisplayBackgroundUnconditional(aBuilder, aLists, PR_FALSE);
       NS_ENSURE_SUCCESS(rv, rv);
     }
@@ -1356,7 +1356,7 @@ nsTableFrame::PaintTableBorderBackground(nsRenderingContext& aRenderingContext,
   nsMargin deflate = GetDeflationForBackground(presContext);
   // If 'deflate' is (0,0,0,0) then we'll paint the table background
   // in a separate display item, so don't do it here.
-  nsresult rv = painter.PaintTable(this, deflate, !deflate.IsZero());
+  nsresult rv = painter.PaintTable(this, deflate, deflate != nsMargin(0, 0, 0, 0));
   if (NS_FAILED(rv)) return;
 
   if (GetStyleVisibility()->IsVisible()) {

From 7228fe8d836df380d42455f5deb130e5eb80d226 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:22 +1200
Subject: [PATCH 305/509] Bug 641426. Part 4: Create Margin template.
 r=joe,sr=cjones

---
 gfx/src/BaseMargin.h | 105 +++++++++++++++++++++++++++++++++++++++++
 gfx/src/Makefile.in  |   1 +
 gfx/src/nsMargin.h   | 109 ++++++-------------------------------------
 3 files changed, 119 insertions(+), 96 deletions(-)
 create mode 100644 gfx/src/BaseMargin.h

diff --git a/gfx/src/BaseMargin.h b/gfx/src/BaseMargin.h
new file mode 100644
index 000000000000..790a6b8f9fed
--- /dev/null
+++ b/gfx/src/BaseMargin.h
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASEMARGIN_H_
+#define MOZILLA_BASEMARGIN_H_
+
+#include "gfxCore.h"
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass.
+ */
+template <class T, class Sub>
+struct BaseMargin {
+  typedef mozilla::css::Side Side;
+
+  T top, right, bottom, left;
+
+  // Constructors
+  BaseMargin() : top(0), right(0), bottom(0), left(0) {}
+  BaseMargin(T aLeft, T aTop, T aRight, T aBottom) :
+      top(aTop), right(aRight), bottom(aBottom), left(aLeft) {}
+
+  void SizeTo(T aLeft, T aTop, T aRight, T aBottom)
+  {
+    left = aLeft; top = aTop; right = aRight; bottom = aBottom;
+  }
+
+  T LeftRight() const { return left + right; }
+  T TopBottom() const { return top + bottom; }
+
+  T& side(Side aSide) {
+    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    return *(&top + aSide);
+  }
+  T side(Side aSide) const {
+    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    return *(&top + aSide);
+  }
+
+  // Overloaded operators. Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+  bool operator==(const Sub& aMargin) const {
+    return left == aMargin.left && top == aMargin.top &&
+           right == aMargin.right && bottom == aMargin.bottom;
+  }
+  bool operator!=(const Sub& aMargin) const {
+    return !(*this == aMargin);
+  }
+  Sub operator+(const Sub& aMargin) const {
+    return Sub(left + aMargin.left, top + aMargin.top,
+             right + aMargin.right, bottom + aMargin.bottom);
+  }
+  Sub operator-(const Sub& aMargin) const {
+    return Sub(left - aMargin.left, top - aMargin.top,
+             right - aMargin.right, bottom - aMargin.bottom);
+  }
+  Sub& operator+=(const Sub& aMargin) {
+    left += aMargin.left;
+    top += aMargin.top;
+    right += aMargin.right;
+    bottom += aMargin.bottom;
+    return *static_cast<Sub*>(this);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASEMARGIN_H_ */
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 9107492d8dec..40d36195ca18 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -62,6 +62,7 @@ XPIDLSRCS = \
 EXPORTS_NAMESPACES = mozilla
 
 EXPORTS_mozilla = \
+	BaseMargin.h \
 	BasePoint.h \
 	BaseSize.h \
 	$(NULL)
diff --git a/gfx/src/nsMargin.h b/gfx/src/nsMargin.h
index 4916bcde07de..7ae3811b7ca4 100644
--- a/gfx/src/nsMargin.h
+++ b/gfx/src/nsMargin.h
@@ -41,109 +41,26 @@
 #include "nsCoord.h"
 #include "nsPoint.h"
 #include "gfxCore.h"
+#include "mozilla/BaseMargin.h"
 
-struct nsMargin {
-  nscoord top, right, bottom, left;
+struct nsMargin : public mozilla::BaseMargin<nscoord, nsMargin> {
+  typedef mozilla::BaseMargin<nscoord, nsMargin> Super;
 
   // Constructors
-  nsMargin() {}
-  nsMargin(const nsMargin& aMargin) {*this = aMargin;}
-  nsMargin(nscoord aLeft,  nscoord aTop,
-           nscoord aRight, nscoord aBottom) {left = aLeft; top = aTop;
-                                             right = aRight; bottom = aBottom;}
-
-  void SizeTo(nscoord aLeft,  nscoord aTop,
-              nscoord aRight, nscoord aBottom) {left = aLeft; top = aTop;
-                                                right = aRight; bottom = aBottom;}
-  void SizeBy(nscoord aLeft, nscoord  aTop,
-              nscoord aRight, nscoord aBottom) {left += aLeft; top += aTop;
-                                                right += aRight; bottom += aBottom;}
-
-  nscoord LeftRight() const { return left + right; }
-  nscoord TopBottom() const { return top + bottom; }
-
-  nsPoint TopLeft() const { return nsPoint(left, top); }
-
-  nscoord& side(mozilla::css::Side aSide) {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    return *(&top + aSide);
-  }
-
-  nscoord side(mozilla::css::Side aSide) const {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    return *(&top + aSide);
-  }
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-  PRBool operator==(const nsMargin& aMargin) const {
-    return (PRBool) ((left == aMargin.left) && (top == aMargin.top) &&
-                     (right == aMargin.right) && (bottom == aMargin.bottom));
-  }
-  PRBool operator!=(const nsMargin& aMargin) const {
-    return (PRBool) ((left != aMargin.left) || (top != aMargin.top) ||
-                     (right != aMargin.right) || (bottom != aMargin.bottom));
-  }
-  nsMargin operator+(const nsMargin& aMargin) const {
-    return nsMargin(left + aMargin.left, top + aMargin.top,
-                    right + aMargin.right, bottom + aMargin.bottom);
-  }
-  nsMargin operator-(const nsMargin& aMargin) const {
-    return nsMargin(left - aMargin.left, top - aMargin.top,
-                    right - aMargin.right, bottom - aMargin.bottom);
-  }
-  nsMargin& operator+=(const nsMargin& aMargin) {left += aMargin.left;
-                                                 top += aMargin.top;
-                                                 right += aMargin.right;
-                                                 bottom += aMargin.bottom;
-                                                 return *this;}
-  nsMargin& operator-=(const nsMargin& aMargin) {left -= aMargin.left;
-                                                 top -= aMargin.top;
-                                                 right -= aMargin.right;
-                                                 bottom -= aMargin.bottom;
-                                                 return *this;}
-
-  PRBool IsZero() { return !left && !top && !right && !bottom; }
+  nsMargin() : Super() {}
+  nsMargin(const nsMargin& aMargin) : Super(aMargin) {}
+  nsMargin(nscoord aLeft,  nscoord aTop, nscoord aRight, nscoord aBottom)
+    : Super(aLeft, aTop, aRight, aBottom) {}
 };
 
-struct nsIntMargin {
-  PRInt32 top, right, bottom, left;
+struct nsIntMargin : public mozilla::BaseMargin<PRInt32, nsIntMargin> {
+  typedef mozilla::BaseMargin<PRInt32, nsIntMargin> Super;
 
   // Constructors
-  nsIntMargin() {}
-  nsIntMargin(const nsIntMargin& aMargin) {*this = aMargin;}
-  nsIntMargin(PRInt32 aLeft,  PRInt32 aTop,
-              PRInt32 aRight, PRInt32 aBottom) {left = aLeft; top = aTop;
-                                                right = aRight; bottom = aBottom;}
-  void SizeTo(PRInt32 aLeft,  PRInt32 aTop,
-              PRInt32 aRight, PRInt32 aBottom) {left = aLeft; top = aTop;
-                                                right = aRight; bottom = aBottom;}
-
-  PRInt32 LeftRight() const { return left + right; }
-  PRInt32 TopBottom() const { return top + bottom; }
-
-  nsPoint TopLeft() const { return nsPoint(left, top); }
-
-  PRInt32& side(mozilla::css::Side aSide) {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    return *(&top + aSide);
-  }
-
-  PRInt32 side(mozilla::css::Side aSide) const {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    return *(&top + aSide);
-  }
-
-  PRBool operator!=(const nsIntMargin& aMargin) const {
-    return (PRBool) ((left != aMargin.left) || (top != aMargin.top) ||
-                     (right != aMargin.right) || (bottom != aMargin.bottom));
-  }
-  nsIntMargin operator+(const nsIntMargin& aMargin) const {
-    return nsIntMargin(left + aMargin.left, top + aMargin.top,
-                    right + aMargin.right, bottom + aMargin.bottom);
-  }
-
-  PRBool IsZero() { return !left && !top && !right && !bottom; }
+  nsIntMargin() : Super() {}
+  nsIntMargin(const nsIntMargin& aMargin) : Super(aMargin) {}
+  nsIntMargin(PRInt32 aLeft,  PRInt32 aTop, PRInt32 aRight, PRInt32 aBottom)
+    : Super(aLeft, aTop, aRight, aBottom) {}
 };
 
 #endif /* NSMARGIN_H */

From a66b612e32a6412be77a55d9523241ca35da0a62 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:22 +1200
Subject: [PATCH 306/509] Bug 641426. Part 4.2: Rename BaseMargin::side to
 BaseMargin::Side. r=cjones

---
 gfx/src/BaseMargin.h                    | 10 +++++++---
 layout/base/nsCSSRendering.cpp          |  4 ++--
 layout/generic/nsFrame.cpp              |  4 ++--
 layout/generic/nsHTMLContainerFrame.cpp |  2 +-
 layout/generic/nsImageFrame.cpp         |  2 +-
 layout/style/nsComputedDOMStyle.cpp     |  8 ++++----
 layout/style/nsRuleNode.cpp             |  4 ++--
 layout/style/nsStyleStruct.cpp          |  6 +++---
 layout/style/nsStyleStruct.h            | 12 ++++++------
 layout/tables/nsTableCellFrame.cpp      |  2 +-
 layout/tables/nsTablePainter.cpp        |  2 +-
 11 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/gfx/src/BaseMargin.h b/gfx/src/BaseMargin.h
index 790a6b8f9fed..a38c3b36caf6 100644
--- a/gfx/src/BaseMargin.h
+++ b/gfx/src/BaseMargin.h
@@ -48,8 +48,10 @@ namespace mozilla {
  */
 template <class T, class Sub>
 struct BaseMargin {
-  typedef mozilla::css::Side Side;
+  typedef mozilla::css::Side SideT;
 
+  // Do not change the layout of these members; the Side() methods below
+  // depend on this order.
   T top, right, bottom, left;
 
   // Constructors
@@ -65,12 +67,14 @@ struct BaseMargin {
   T LeftRight() const { return left + right; }
   T TopBottom() const { return top + bottom; }
 
-  T& side(Side aSide) {
+  T& Side(SideT aSide) {
     NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    // This is ugly!
     return *(&top + aSide);
   }
-  T side(Side aSide) const {
+  T Side(SideT aSide) const {
     NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    // This is ugly!
     return *(&top + aSide);
   }
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 4d9029f02a30..621b4060b890 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1468,7 +1468,7 @@ nsCSSRendering::PaintBackground(nsPresContext* aPresContext,
 static PRBool
 IsOpaqueBorderEdge(const nsStyleBorder& aBorder, mozilla::css::Side aSide)
 {
-  if (aBorder.GetActualBorder().side(aSide) == 0)
+  if (aBorder.GetActualBorder().Side(aSide) == 0)
     return PR_TRUE;
   switch (aBorder.GetBorderStyle(aSide)) {
   case NS_STYLE_BORDER_STYLE_SOLID:
@@ -2798,7 +2798,7 @@ DrawBorderImage(nsPresContext*       aPresContext,
       value = 0;
     if (value > imgDimension)
       value = imgDimension;
-    split.side(s) = NS_lround(value);
+    split.Side(s) = NS_lround(value);
   }
 
   nsMargin border(aStyleBorder.GetActualBorder());
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index ba8addbfdefa..b4c834138cf6 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -832,7 +832,7 @@ nsIFrame::ComputeBorderRadii(const nsStyleCorners& aBorderRadius,
 nsIFrame::InsetBorderRadii(nscoord aRadii[8], const nsMargin &aOffsets)
 {
   NS_FOR_CSS_SIDES(side) {
-    nscoord offset = aOffsets.side(side);
+    nscoord offset = aOffsets.Side(side);
     PRUint32 hc1 = NS_SIDE_TO_HALF_CORNER(side, PR_FALSE, PR_FALSE);
     PRUint32 hc2 = NS_SIDE_TO_HALF_CORNER(side, PR_TRUE, PR_FALSE);
     aRadii[hc1] = NS_MAX(0, aRadii[hc1] - offset);
@@ -844,7 +844,7 @@ nsIFrame::InsetBorderRadii(nscoord aRadii[8], const nsMargin &aOffsets)
 nsIFrame::OutsetBorderRadii(nscoord aRadii[8], const nsMargin &aOffsets)
 {
   NS_FOR_CSS_SIDES(side) {
-    nscoord offset = aOffsets.side(side);
+    nscoord offset = aOffsets.Side(side);
     PRUint32 hc1 = NS_SIDE_TO_HALF_CORNER(side, PR_FALSE, PR_FALSE);
     PRUint32 hc2 = NS_SIDE_TO_HALF_CORNER(side, PR_TRUE, PR_FALSE);
     if (aRadii[hc1] > 0)
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index cc7a6e111d56..572c1b997322 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -438,7 +438,7 @@ nsHTMLContainerFrame::PaintTextDecorationLine(
   PRIntn skip = GetSkipSides();
   NS_FOR_CSS_SIDES(side) {
     if (skip & (1 << side)) {
-      bp.side(side) = 0;
+      bp.Side(side) = 0;
     }
   }
   nscoord innerWidth = mRect.width - bp.left - bp.right;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 0ffc4509c8ca..bcbb104c37ab 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1034,7 +1034,7 @@ struct nsRecessedBorder : public nsStyleBorder {
       // Note: use SetBorderColor here because we want to make sure
       // the "special" flags are unset.
       SetBorderColor(side, NS_RGB(0, 0, 0));
-      mBorder.side(side) = aBorderWidth;
+      mBorder.Side(side) = aBorderWidth;
       // Note: use SetBorderStyle here because we want to affect
       // mComputedBorder
       SetBorderStyle(side, NS_STYLE_BORDER_STYLE_INSET);
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 0b7c86548b35..8ad15c4fffdf 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -2584,7 +2584,7 @@ nsComputedDOMStyle::DoGetBorderImage()
     NS_FOR_CSS_SIDES(side) {
       nsROCSSPrimitiveValue *borderWidth = GetROCSSPrimitiveValue();
       valueList->AppendCSSValue(borderWidth);
-      nscoord width = GetStyleBorder()->mBorderImageWidth.side(side);
+      nscoord width = GetStyleBorder()->mBorderImageWidth.Side(side);
       borderWidth->SetAppUnits(width);
     }
   }
@@ -3114,7 +3114,7 @@ nsComputedDOMStyle::GetPaddingWidthFor(mozilla::css::Side aSide)
   } else {
     AssertFlushedPendingReflows();
 
-    val->SetAppUnits(mInnerFrame->GetUsedPadding().side(aSide));
+    val->SetAppUnits(mInnerFrame->GetUsedPadding().Side(aSide));
   }
 
   return val;
@@ -3187,7 +3187,7 @@ nsComputedDOMStyle::GetBorderWidthFor(mozilla::css::Side aSide)
   nscoord width;
   if (mInnerFrame) {
     AssertFlushedPendingReflows();
-    width = mInnerFrame->GetUsedBorder().side(aSide);
+    width = mInnerFrame->GetUsedBorder().Side(aSide);
   } else {
     width = GetStyleBorder()->GetActualBorderWidth(aSide);
   }
@@ -3222,7 +3222,7 @@ nsComputedDOMStyle::GetMarginWidthFor(mozilla::css::Side aSide)
   } else {
     AssertFlushedPendingReflows();
 
-    val->SetAppUnits(mInnerFrame->GetUsedMargin().side(aSide));
+    val->SetAppUnits(mInnerFrame->GetUsedMargin().Side(aSide));
   }
 
   return val;
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 61364c209234..b74845bfd80f 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -5215,7 +5215,7 @@ nsRuleNode::ComputeBorderData(void* aStartStruct,
       else if (eCSSUnit_Inherit == value.GetUnit()) {
         canStoreInRuleTree = PR_FALSE;
         border->SetBorderWidth(side,
-                               parentBorder->GetComputedBorder().side(side));
+                               parentBorder->GetComputedBorder().Side(side));
       }
       else if (eCSSUnit_Initial == value.GetUnit()) {
         border->SetBorderWidth(side,
@@ -5476,7 +5476,7 @@ nsRuleNode::ComputeBorderData(void* aStartStruct,
   } else if (eCSSUnit_Inherit == borderImageValue->GetUnit()) {
     canStoreInRuleTree = PR_FALSE;
     NS_FOR_CSS_SIDES(side) {
-      border->SetBorderImageWidthOverride(side, parentBorder->mBorderImageWidth.side(side));
+      border->SetBorderImageWidthOverride(side, parentBorder->mBorderImageWidth.Side(side));
     }
     border->mBorderImageSplit = parentBorder->mBorderImageSplit;
     border->mBorderImageHFill = parentBorder->mBorderImageHFill;
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 10f3a11e4477..c8d4024c2990 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -281,7 +281,7 @@ void nsStyleMargin::RecalcData()
 {
   if (IsFixedData(mMargin, PR_FALSE)) {
     NS_FOR_CSS_SIDES(side) {
-      mCachedMargin.side(side) = CalcCoord(mMargin.Get(side), nsnull, 0);
+      mCachedMargin.Side(side) = CalcCoord(mMargin.Get(side), nsnull, 0);
     }
     mHasCachedMargin = PR_TRUE;
   }
@@ -345,7 +345,7 @@ void nsStylePadding::RecalcData()
   if (IsFixedData(mPadding, PR_FALSE)) {
     NS_FOR_CSS_SIDES(side) {
       // Clamp negative calc() to 0.
-      mCachedPadding.side(side) =
+      mCachedPadding.Side(side) =
         NS_MAX(CalcCoord(mPadding.Get(side), nsnull, 0), 0);
     }
     mHasCachedPadding = PR_TRUE;
@@ -388,7 +388,7 @@ nsStyleBorder::nsStyleBorder(nsPresContext* aPresContext)
   nscoord medium =
     (aPresContext->GetBorderWidthTable())[NS_STYLE_BORDER_WIDTH_MEDIUM];
   NS_FOR_CSS_SIDES(side) {
-    mBorder.side(side) = medium;
+    mBorder.Side(side) = medium;
     mBorderStyle[side] = NS_STYLE_BORDER_STYLE_NONE | BORDER_COLOR_FOREGROUND;
     mBorderColor[side] = NS_RGB(0, 0, 0);
   }
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 0e4cebbda152..f3b586b67511 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -802,14 +802,14 @@ struct nsStyleBorder {
   {
     nscoord roundedWidth =
       NS_ROUND_BORDER_TO_PIXELS(aBorderWidth, mTwipsPerPixel);
-    mBorder.side(aSide) = roundedWidth;
+    mBorder.Side(aSide) = roundedWidth;
     if (HasVisibleStyle(aSide))
-      mComputedBorder.side(aSide) = roundedWidth;
+      mComputedBorder.Side(aSide) = roundedWidth;
   }
 
   void SetBorderImageWidthOverride(mozilla::css::Side aSide, nscoord aBorderWidth)
   {
-    mBorderImageWidth.side(aSide) =
+    mBorderImageWidth.Side(aSide) =
       NS_ROUND_BORDER_TO_PIXELS(aBorderWidth, mTwipsPerPixel);
   }
 
@@ -834,7 +834,7 @@ struct nsStyleBorder {
   // value is rounded to the nearest device pixel by NS_ROUND_BORDER_TO_PIXELS.
   nscoord GetActualBorderWidth(mozilla::css::Side aSide) const
   {
-    return GetActualBorder().side(aSide);
+    return GetActualBorder().Side(aSide);
   }
 
   PRUint8 GetBorderStyle(mozilla::css::Side aSide) const
@@ -848,8 +848,8 @@ struct nsStyleBorder {
     NS_ASSERTION(aSide <= NS_SIDE_LEFT, "bad side");
     mBorderStyle[aSide] &= ~BORDER_STYLE_MASK;
     mBorderStyle[aSide] |= (aStyle & BORDER_STYLE_MASK);
-    mComputedBorder.side(aSide) =
-      (HasVisibleStyle(aSide) ? mBorder.side(aSide) : 0);
+    mComputedBorder.Side(aSide) =
+      (HasVisibleStyle(aSide) ? mBorder.Side(aSide) : 0);
   }
 
   // Defined in nsStyleStructInlines.h
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 90eb92f57fe6..3565f3dde932 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -1176,7 +1176,7 @@ nsBCTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
 #endif
 
   NS_FOR_CSS_SIDES(side) {
-    myBorder.SetBorderWidth(side, borderWidth.side(side));
+    myBorder.SetBorderWidth(side, borderWidth.Side(side));
   }
 
   nsRect rect(aPt, GetSize());
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index bd146a306b92..3fba4b5e35a7 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -221,7 +221,7 @@ TableBackgroundPainter::TableBackgroundData::SetBCBorder(nsMargin& aBorder,
   }
 
   NS_FOR_CSS_SIDES(side) {
-    mSynthBorder->SetBorderWidth(side, aBorder.side(side));
+    mSynthBorder->SetBorderWidth(side, aBorder.Side(side));
   }
   
   mBorder = mSynthBorder;

From a7b4f1246bbc527ee28c0168454c3e3a968caa65 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:23 +1200
Subject: [PATCH 307/509] Bug 641426. Part 5: Avoid operator== where possible
 to distinguish between 'equal edges' and 'equal areas' for rectangles.
 r=dbaron,sr=cjones

---
 docshell/base/nsDocShell.cpp                  |  2 +-
 dom/base/nsDOMWindowUtils.cpp                 |  2 +-
 gfx/layers/Layers.h                           |  4 +-
 gfx/layers/ThebesLayerBuffer.cpp              |  2 +-
 gfx/layers/basic/BasicLayers.cpp              |  2 +-
 gfx/layers/d3d10/ThebesLayerD3D10.cpp         |  4 +-
 gfx/layers/d3d9/ThebesLayerD3D9.cpp           |  4 +-
 gfx/layers/opengl/ThebesLayerOGL.cpp          |  2 +-
 gfx/src/nsRect.cpp                            |  4 +-
 gfx/src/nsRect.h                              | 74 +++++++++++--------
 gfx/src/nsRegion.cpp                          |  6 +-
 gfx/tests/TestRegion.cpp                      |  6 +-
 gfx/thebes/GLContext.h                        |  4 +-
 gfx/thebes/gfxBlur.cpp                        |  2 +-
 gfx/thebes/gfxImageSurface.cpp                |  2 +-
 gfx/thebes/gfxRect.h                          | 10 ++-
 gfx/thebes/gfxUtils.cpp                       |  2 +-
 gfx/thebes/gfxXlibNativeRenderer.cpp          |  2 +-
 layout/base/FrameLayerBuilder.cpp             |  2 +-
 layout/base/FrameLayerBuilder.h               |  4 +-
 layout/base/crashtests/crashtests.list        |  2 +-
 layout/base/nsDisplayList.cpp                 |  6 +-
 layout/base/nsImageLoader.cpp                 |  2 +-
 layout/base/nsPresContext.h                   |  2 +-
 layout/base/nsPresShell.cpp                   | 16 ++--
 layout/generic/crashtests/crashtests.list     |  2 +-
 layout/generic/nsBlockFrame.cpp               |  2 +-
 layout/generic/nsBlockReflowState.cpp         |  2 +-
 layout/generic/nsContainerFrame.cpp           |  2 +-
 layout/generic/nsFloatManager.cpp             |  2 +-
 layout/generic/nsFrame.cpp                    |  8 +-
 layout/generic/nsFrameUtil.cpp                |  2 +-
 layout/generic/nsGfxScrollFrame.cpp           | 20 ++---
 layout/generic/nsHTMLReflowMetrics.h          |  4 +-
 layout/generic/nsImageFrame.cpp               |  4 +-
 layout/generic/nsLineBox.cpp                  |  5 +-
 layout/generic/nsObjectFrame.cpp              |  2 +-
 layout/generic/nsSelection.cpp                |  2 +-
 layout/style/nsStyleStruct.cpp                |  6 +-
 layout/svg/base/src/nsSVGOuterSVGFrame.cpp    |  2 +-
 layout/xul/base/src/nsSliderFrame.cpp         |  2 +-
 layout/xul/base/src/nsSprocketLayout.cpp      |  4 +-
 layout/xul/base/src/nsStackLayout.cpp         |  4 +-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |  2 +-
 modules/libpr0n/src/RasterImage.cpp           |  2 +-
 modules/libpr0n/src/imgFrame.cpp              |  2 +-
 view/src/nsViewManager.cpp                    |  4 +-
 widget/src/os2/nsWindow.cpp                   |  2 +-
 widget/src/windows/nsWindow.cpp               |  2 +-
 widget/src/xpwidgets/PuppetWidget.cpp         |  2 +-
 50 files changed, 137 insertions(+), 122 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index ce9a614f1c2e..7bf77e198af9 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7289,7 +7289,7 @@ nsDocShell::RestoreFromHistory()
     // cached viewer size (skipping the resize if they are equal).
 
     if (newRootView) {
-        if (!newBounds.IsEmpty() && newBounds != oldBounds) {
+        if (!newBounds.IsEmpty() && !newBounds.IsEqualEdges(oldBounds)) {
 #ifdef DEBUG_PAGE_CACHE
             printf("resize widget(%d, %d, %d, %d)\n", newBounds.x,
                    newBounds.y, newBounds.width, newBounds.height);
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 1680e2ebda11..f6d77454d501 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -300,7 +300,7 @@ nsDOMWindowUtils::SetDisplayPortForElement(float aXPx, float aYPx,
 
   nsRect lastDisplayPort;
   if (nsLayoutUtils::GetDisplayPort(content, &lastDisplayPort) &&
-      displayport == lastDisplayPort) {
+      displayport.IsEqualInterior(lastDisplayPort)) {
     return NS_OK;
   }
 
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 09d1dddb0ef9..30c993ef36b7 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -108,9 +108,9 @@ public:
 
   PRBool operator==(const FrameMetrics& aOther) const
   {
-    return (mViewport == aOther.mViewport &&
+    return (mViewport.IsEqualEdges(aOther.mViewport) &&
             mViewportScrollOffset == aOther.mViewportScrollOffset &&
-            mDisplayPort == aOther.mDisplayPort &&
+            mDisplayPort.IsEqualEdges(aOther.mDisplayPort) &&
             mScrollId == aOther.mScrollId);
   }
 
diff --git a/gfx/layers/ThebesLayerBuffer.cpp b/gfx/layers/ThebesLayerBuffer.cpp
index 68860cc07f2b..bac12a9303fe 100644
--- a/gfx/layers/ThebesLayerBuffer.cpp
+++ b/gfx/layers/ThebesLayerBuffer.cpp
@@ -265,7 +265,7 @@ ThebesLayerBuffer::BeginPaint(ThebesLayer* aLayer, ContentType aContentType,
     }
 
     if ((aFlags & PAINT_WILL_RESAMPLE) &&
-        (neededRegion.GetBounds() != destBufferRect ||
+        (!neededRegion.GetBounds().IsEqualInterior(destBufferRect) ||
          neededRegion.GetNumRects() > 1)) {
       // The area we add to neededRegion might not be painted opaquely
       contentType = gfxASurface::CONTENT_COLOR_ALPHA;
diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index b7f1579aa04d..090dc97fa1fa 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -467,7 +467,7 @@ ClipToContain(gfxContext* aContext, const nsIntRect& aRect)
   aContext->Clip();
   aContext->SetMatrix(currentMatrix);
 
-  return aContext->DeviceToUser(deviceRect) == userRect;
+  return aContext->DeviceToUser(deviceRect).IsEqualInterior(userRect);
 }
 
 static nsIntRegion
diff --git a/gfx/layers/d3d10/ThebesLayerD3D10.cpp b/gfx/layers/d3d10/ThebesLayerD3D10.cpp
index d19f980601ab..3cc0c77ae518 100644
--- a/gfx/layers/d3d10/ThebesLayerD3D10.cpp
+++ b/gfx/layers/d3d10/ThebesLayerD3D10.cpp
@@ -194,7 +194,7 @@ ThebesLayerD3D10::Validate(ReadbackProcessor *aReadback)
   // doesn't fill the entire texture rect we need to make sure we draw all the
   // pixels in the texture rect anyway in case they get sampled.
   nsIntRegion neededRegion = mVisibleRegion;
-  if (neededRegion.GetBounds() != newTextureRect ||
+  if (!neededRegion.GetBounds().IsEqualInterior(newTextureRect) ||
       neededRegion.GetNumRects() > 1) {
     gfxMatrix transform2d;
     if (!GetEffectiveTransform().Is2D(&transform2d) ||
@@ -228,7 +228,7 @@ ThebesLayerD3D10::Validate(ReadbackProcessor *aReadback)
   }
 
   if (mTexture) {
-    if (mTextureRect != newTextureRect) {
+    if (!mTextureRect.IsEqualInterior(newTextureRect)) {
       nsRefPtr<ID3D10Texture2D> oldTexture = mTexture;
       mTexture = nsnull;
       nsRefPtr<ID3D10Texture2D> oldTextureOnWhite = mTextureOnWhite;
diff --git a/gfx/layers/d3d9/ThebesLayerD3D9.cpp b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
index 5aa8e81f2c9a..c679c48032d4 100644
--- a/gfx/layers/d3d9/ThebesLayerD3D9.cpp
+++ b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
@@ -138,7 +138,7 @@ ThebesLayerD3D9::UpdateTextures(SurfaceMode aMode)
   }
 
   if (HaveTextures(aMode)) {
-    if (mTextureRect != visibleRect) {
+    if (!mTextureRect.IsEqualInterior(visibleRect)) {
       nsRefPtr<IDirect3DTexture9> oldTexture = mTexture;
       nsRefPtr<IDirect3DTexture9> oldTextureOnWhite = mTextureOnWhite;
 
@@ -221,7 +221,7 @@ ThebesLayerD3D9::RenderThebesLayer(ReadbackProcessor* aReadback)
   // doesn't fill the entire texture rect we need to make sure we draw all the
   // pixels in the texture rect anyway in case they get sampled.
   nsIntRegion neededRegion = mVisibleRegion;
-  if (neededRegion.GetBounds() != newTextureRect ||
+  if (!neededRegion.GetBounds().IsEqualInterior(newTextureRect) ||
       neededRegion.GetNumRects() > 1) {
     gfxMatrix transform2d;
     if (!GetEffectiveTransform().Is2D(&transform2d) ||
diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp
index 2c39ce3c972c..412af7f17ef6 100644
--- a/gfx/layers/opengl/ThebesLayerOGL.cpp
+++ b/gfx/layers/opengl/ThebesLayerOGL.cpp
@@ -485,7 +485,7 @@ BasicBufferOGL::BeginPaint(ContentType aContentType,
     }
  
     if ((aFlags & PAINT_WILL_RESAMPLE) &&
-        (neededRegion.GetBounds() != destBufferRect ||
+        (!neededRegion.GetBounds().IsEqualInterior(destBufferRect) ||
          neededRegion.GetNumRects() > 1)) {
       // The area we add to neededRegion might not be painted opaquely
       if (mode == Layer::SURFACE_OPAQUE) {
diff --git a/gfx/src/nsRect.cpp b/gfx/src/nsRect.cpp
index 05ae2508c502..9f298990b6f8 100644
--- a/gfx/src/nsRect.cpp
+++ b/gfx/src/nsRect.cpp
@@ -124,13 +124,13 @@ PRBool nsRect::UnionRect(const nsRect &aRect1, const nsRect &aRect2)
     // aRect2 is empty so set the result to aRect1
     *this = aRect1;
   } else {
-    UnionRectIncludeEmpty(aRect1, aRect2);
+    UnionRectEdges(aRect1, aRect2);
   }
 
   return result;
 }
 
-void nsRect::UnionRectIncludeEmpty(const nsRect &aRect1, const nsRect &aRect2)
+void nsRect::UnionRectEdges(const nsRect &aRect1, const nsRect &aRect2)
 {
   nscoord xmost1 = aRect1.XMost();
   nscoord xmost2 = aRect2.XMost();
diff --git a/gfx/src/nsRect.h b/gfx/src/nsRect.h
index a7d1490d4fbb..a117e8c9afe2 100644
--- a/gfx/src/nsRect.h
+++ b/gfx/src/nsRect.h
@@ -85,37 +85,42 @@ struct NS_GFX nsRect {
   }
   void   Empty() {width = height = 0;}
 
-  // Containment
+  // Returns true if this rectangle contains the interior of aRect. Always
+  // returns true if aRect is empty, and always returns false is aRect is
+  // nonempty but this rect is empty.
   PRBool Contains(const nsRect& aRect) const;
+  // Returns true if this rectangle contains the given point; if the point
+  // is on the edge of the rectangle, this returns true.
   PRBool Contains(nscoord aX, nscoord aY) const;
   PRBool Contains(const nsPoint& aPoint) const {return Contains(aPoint.x, aPoint.y);}
 
-  // Intersection. Returns TRUE if the receiver overlaps aRect and
-  // FALSE otherwise
+  // Intersection. Returns TRUE if the receiver's area has non-empty
+  // intersection with aRect's area, and FALSE otherwise.
+  // Always returns false if aRect is empty or 'this' is empty.
   PRBool Intersects(const nsRect& aRect) const;
 
-  // Computes the area in which aRect1 and aRect2 overlap, and fills 'this' with
-  // the result. Returns FALSE if the rectangles don't intersect, and sets 'this'
-  // rect to be an empty rect.
+  // Sets 'this' to be a rectangle containing the intersection of the points
+  // (including edges) of aRect1 and aRect2, or 0,0,0,0 if that intersection is
+  // empty. Returns false if the resulting rectangle is empty.
   //
   // 'this' can be the same object as either aRect1 or aRect2
   PRBool IntersectRect(const nsRect& aRect1, const nsRect& aRect2);
 
-  // Computes the smallest rectangle that contains both aRect1 and aRect2 and
-  // fills 'this' with the result, ignoring empty input rectangles.
+  // Computes the smallest rectangle that contains both the area of both
+  // aRect1 and aRect2, and fills 'this' with the result.
+  // Thus, empty input rectangles are ignored.
   // Returns FALSE and sets 'this' rect to be an empty rect if both aRect1
   // and aRect2 are empty.
   //
   // 'this' can be the same object as either aRect1 or aRect2
   PRBool UnionRect(const nsRect& aRect1, const nsRect& aRect2);
 
-  // Computes the smallest rectangle that contains both aRect1 and aRect2,
-  // where empty input rectangles are allowed to affect the result; the
-  // top-left of an empty input rectangle will be inside or on the edge of
-  // the result.
+  // Computes the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
   //
   // 'this' can be the same object as either aRect1 or aRect2
-  void UnionRectIncludeEmpty(const nsRect& aRect1, const nsRect& aRect2);
+  void UnionRectEdges(const nsRect& aRect1, const nsRect& aRect2);
   
   // Accessors
   void SetRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) {
@@ -143,23 +148,19 @@ struct NS_GFX nsRect {
   void Deflate(const nsSize& aSize) {Deflate(aSize.width, aSize.height);}
   void Deflate(const nsMargin& aMargin);
 
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator.
-  PRBool  operator==(const nsRect& aRect) const {
-    return (PRBool) ((IsEmpty() && aRect.IsEmpty()) ||
-                     ((x == aRect.x) && (y == aRect.y) &&
-                      (width == aRect.width) && (height == aRect.height)));
-  }
-  PRBool  operator!=(const nsRect& aRect) const {
-    return (PRBool) !operator==(aRect);
-  }
-
-  // Useful when we care about the exact x/y/width/height values being
-  // equal (i.e. we care about differences in empty rectangles)
-  PRBool IsExactEqual(const nsRect& aRect) const {
+  // Return true if the rectangles contain the same set of points, including
+  // points on the edges.
+  // Use when we care about the exact x/y/width/height values being
+  // equal (i.e. we care about differences in empty rectangles).
+  PRBool IsEqualEdges(const nsRect& aRect) const {
     return x == aRect.x && y == aRect.y &&
            width == aRect.width && height == aRect.height;
   }
+  // Return true if the rectangles contain the same area of the plane.
+  // Use when we do not care about differences in empty rectangles.
+  PRBool IsEqualInterior(const nsRect& aRect) const {
+    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
+  }
 
   // Arithmetic with nsPoints
   nsRect  operator+(const nsPoint& aPoint) const {
@@ -265,12 +266,21 @@ struct NS_GFX nsIntRect {
   // Overloaded operators. Note that '=' isn't defined so we'll get the
   // compiler generated default assignment operator.
   PRBool operator==(const nsIntRect& aRect) const {
-    return (PRBool) ((IsEmpty() && aRect.IsEmpty()) ||
-                     ((x == aRect.x) && (y == aRect.y) &&
-                      (width == aRect.width) && (height == aRect.height)));
+    return IsEqualEdges(aRect);
   }
-  PRBool  operator!=(const nsIntRect& aRect) const {
-    return (PRBool) !operator==(aRect);
+
+  // Return true if the rectangles contain the same set of points, including
+  // points on the edges.
+  // Use when we care about the exact x/y/width/height values being
+  // equal (i.e. we care about differences in empty rectangles).
+  PRBool IsEqualEdges(const nsIntRect& aRect) const {
+    return x == aRect.x && y == aRect.y &&
+           width == aRect.width && height == aRect.height;
+  }
+  // Return true if the rectangles contain the same area of the plane.
+  // Use when we do not care about differences in empty rectangles.
+  PRBool IsEqualInterior(const nsIntRect& aRect) const {
+    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
   }
 
   nsIntRect  operator+(const nsIntPoint& aPoint) const {
diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index d25533f484de..adaa33e81289 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -1151,7 +1151,7 @@ void nsRegion::SubRect (const nsRectFast& aRect, nsRegion& aResult, nsRegion& aC
         {
           aResult.InsertInPlace (new RgnRect (ixm, ay, axm - ixm, ah));
         } else
-        if (*pSrcRect == aRect)         // 4. subset
+        if (pSrcRect->IsEqualInterior(aRect)) // 4. subset
         {                               // Current rectangle is equal to aRect
           pSrcRect = pSrcRect->next;    // don't add this one to the result, it's removed
           break;                        // No any other rectangle in region can intersect it
@@ -1261,10 +1261,10 @@ PRBool nsRegion::IsEqual (const nsRegion& aRegion) const
     return (mRectCount == 0) ? PR_TRUE : PR_FALSE;
 
   if (mRectCount == 1 && aRegion.mRectCount == 1) // Both regions are simple rectangles
-    return (*mRectListHead.next == *aRegion.mRectListHead.next);
+    return (mRectListHead.next->IsEqualInterior(*aRegion.mRectListHead.next));
   else                                            // At least one is complex region.
   {
-    if (mBoundRect != aRegion.mBoundRect)         // If regions are equal then bounding rectangles should match
+    if (!mBoundRect.IsEqualInterior(aRegion.mBoundRect)) // If regions are equal then bounding rectangles should match
       return PR_FALSE;
     else
     {
diff --git a/gfx/tests/TestRegion.cpp b/gfx/tests/TestRegion.cpp
index e9724aa71b19..b13dac0a116a 100644
--- a/gfx/tests/TestRegion.cpp
+++ b/gfx/tests/TestRegion.cpp
@@ -41,7 +41,7 @@
 class TestLargestRegion {
   static PRBool TestSingleRect(nsRect r) {
     nsRegion region(r);
-    if (region.GetLargestRectangle() != r) {
+    if (!region.GetLargestRectangle().IsEqualInterior(r)) {
       fail("largest rect of singleton %d %d %d %d", r.x, r.y, r.width, r.height);
       return PR_FALSE;
     }
@@ -134,7 +134,7 @@ class TestLargestRegion {
   static PRBool TestContainsSpecifiedRect() {
     nsRegion r(nsRect(0, 0, 100, 100));
     r.Or(r, nsRect(0, 300, 50, 50));
-    if (r.GetLargestRectangle(nsRect(0, 300, 10, 10)) != nsRect(0, 300, 50, 50)) {
+    if (!r.GetLargestRectangle(nsRect(0, 300, 10, 10)).IsEqualInterior(nsRect(0, 300, 50, 50))) {
       fail("Chose wrong rectangle");
       return PR_FALSE;
     }
@@ -143,7 +143,7 @@ class TestLargestRegion {
   static PRBool TestContainsSpecifiedOverflowingRect() {
     nsRegion r(nsRect(0, 0, 100, 100));
     r.Or(r, nsRect(0, 300, 50, 50));
-    if (r.GetLargestRectangle(nsRect(0, 290, 10, 20)) != nsRect(0, 300, 50, 50)) {
+    if (!r.GetLargestRectangle(nsRect(0, 290, 10, 20)).IsEqualInterior(nsRect(0, 300, 50, 50))) {
       fail("Chose wrong rectangle");
       return PR_FALSE;
     }
diff --git a/gfx/thebes/GLContext.h b/gfx/thebes/GLContext.h
index a9ba22a83795..3c46a8ed5e6c 100644
--- a/gfx/thebes/GLContext.h
+++ b/gfx/thebes/GLContext.h
@@ -1147,7 +1147,7 @@ public:
 
         nsIntRect thisRect = ScissorRect();
         mScissorStack.TruncateLength(mScissorStack.Length() - 1);
-        if (thisRect != ScissorRect()) {
+        if (!thisRect.IsEqualInterior(ScissorRect())) {
             raw_fScissor(ScissorRect().x, ScissorRect().y,
                               ScissorRect().width, ScissorRect().height);
         }
@@ -1198,7 +1198,7 @@ public:
 
         nsIntRect thisRect = ViewportRect();
         mViewportStack.TruncateLength(mViewportStack.Length() - 1);
-        if (thisRect != ViewportRect()) {
+        if (!thisRect.IsEqualInterior(ViewportRect())) {
             raw_fViewport(ViewportRect().x, ViewportRect().y,
                           ViewportRect().width, ViewportRect().height);
         }
diff --git a/gfx/thebes/gfxBlur.cpp b/gfx/thebes/gfxBlur.cpp
index cfd303ac9185..952fd1e6e1e1 100644
--- a/gfx/thebes/gfxBlur.cpp
+++ b/gfx/thebes/gfxBlur.cpp
@@ -95,7 +95,7 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
         nsIntRect shadowIntRect;
         gfxUtils::GfxRectToIntRect(rect, &shadowIntRect);
         mSkipRect.IntersectRect(mSkipRect, shadowIntRect);
-        if (mSkipRect == shadowIntRect)
+        if (mSkipRect.IsEqualInterior(shadowIntRect))
           return nsnull;
 
         mSkipRect -= shadowIntRect.TopLeft();
diff --git a/gfx/thebes/gfxImageSurface.cpp b/gfx/thebes/gfxImageSurface.cpp
index b5a65544b0ca..b978d543a53d 100644
--- a/gfx/thebes/gfxImageSurface.cpp
+++ b/gfx/thebes/gfxImageSurface.cpp
@@ -275,7 +275,7 @@ gfxImageSurface::MovePixels(const nsIntRect& aSourceRect,
                       source.Size() == dest.Size() &&
                       offset == (dest.TopLeft() - source.TopLeft()),
                       "Messed up clipping, crash or corruption will follow");
-    if (source.IsEmpty() || source == dest) {
+    if (source.IsEmpty() || source.IsEqualInterior(dest)) {
         return;
     }
 
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index 61340c35043a..64647e45e1f2 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -87,8 +87,14 @@ struct THEBES_API gfxRect
     int operator==(const gfxRect& s) const {
         return x == s.x && y == s.y && width == s.width && height == s.height;
     }
-    int operator!=(const gfxRect& s) const {
-        return !(*this == s);
+    PRBool IsEqualEdges(const gfxRect& aRect) const {
+      return x == aRect.x && y == aRect.y &&
+             width == aRect.width && height == aRect.height;
+    }
+    // Return true if the rectangles contain the same area of the plane.
+    // Use when we do not care about differences in empty rectangles.
+    PRBool IsEqualInterior(const gfxRect& aRect) const {
+      return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
     }
 
     void MoveTo(const gfxPoint& aPt) { x = aPt.x; y = aPt.y; }
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index e55ca157cd1b..2daf7e49ef8d 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -514,6 +514,6 @@ gfxUtils::GfxRectToIntRect(const gfxRect& aIn, nsIntRect* aOut)
 {
   *aOut = nsIntRect(PRInt32(aIn.X()), PRInt32(aIn.Y()),
   PRInt32(aIn.Width()), PRInt32(aIn.Height()));
-  return gfxRect(aOut->x, aOut->y, aOut->width, aOut->height) == aIn;
+  return gfxRect(aOut->x, aOut->y, aOut->width, aOut->height).IsEqualEdges(aIn);
 }
 
diff --git a/gfx/thebes/gfxXlibNativeRenderer.cpp b/gfx/thebes/gfxXlibNativeRenderer.cpp
index 8b4732a5a3f7..b7dfcbab5de7 100644
--- a/gfx/thebes/gfxXlibNativeRenderer.cpp
+++ b/gfx/thebes/gfxXlibNativeRenderer.cpp
@@ -130,7 +130,7 @@ _get_rectangular_clip (cairo_t *cr,
             goto FINISH;
         }
 
-        if (rect == bounds) {
+        if (rect.IsEqualInterior(bounds)) {
             /* the bounds are entirely inside the clip region so we don't need to clip. */
             *need_clip = PR_FALSE;
             goto FINISH;
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index a9c772ed3cdb..288fbaa290d5 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1651,7 +1651,7 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
   state.Finish(&flags);
 
   nsRect bounds = state.GetChildrenBounds();
-  NS_ASSERTION(bounds == aChildren.GetBounds(aBuilder), "Wrong bounds");
+  NS_ASSERTION(bounds.IsEqualInterior(aChildren.GetBounds(aBuilder)), "Wrong bounds");
   nsIntRect pixBounds = bounds.ToOutsidePixels(appUnitsPerDevPixel);
   containerLayer->SetVisibleRegion(pixBounds);
   // Make sure that rounding the visible region out didn't add any area
diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h
index 898c1cd27460..c91842064655 100644
--- a/layout/base/FrameLayerBuilder.h
+++ b/layout/base/FrameLayerBuilder.h
@@ -307,7 +307,7 @@ public:
       nscoord mRadii[8];
 
       bool operator==(const RoundedRect& aOther) const {
-        if (mRect != aOther.mRect) {
+        if (!mRect.IsEqualInterior(aOther.mRect)) {
           return false;
         }
 
@@ -354,7 +354,7 @@ public:
 
     bool operator==(const Clip& aOther) const {
       return mHaveClipRect == aOther.mHaveClipRect &&
-             (!mHaveClipRect || mClipRect == aOther.mClipRect) &&
+             (!mHaveClipRect || mClipRect.IsEqualInterior(aOther.mClipRect)) &&
              mRoundedClipRects == aOther.mRoundedClipRects;
     }
     bool operator!=(const Clip& aOther) const {
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 074ab55cd77a..014338507e93 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -38,7 +38,7 @@ load 254367-1.html
 load 265027-1.html
 load 265736-1.html
 load 265736-2.html
-asserts(4) load 265899-1.html # bug 575011
+asserts(2) load 265899-1.html # bug 575011
 load 265973-1.html
 asserts(8-12) load 265986-1.html # Bug 512405
 asserts(4) load 265999-1.html # bug 575011
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index abcc562d24c7..4ee024b394aa 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -443,7 +443,7 @@ nsDisplayList::ComputeVisibilityForSublist(nsDisplayListBuilder* aBuilder,
 #ifdef DEBUG
   nsRegion r;
   r.And(*aVisibleRegion, GetBounds(aBuilder));
-  NS_ASSERTION(r.GetBounds() == aListVisibleBounds,
+  NS_ASSERTION(r.GetBounds().IsEqualInterior(aListVisibleBounds),
                "bad aListVisibleBounds");
 #endif
   mVisibleRect = aListVisibleBounds;
@@ -1919,7 +1919,7 @@ PRBool nsDisplayClip::TryMerge(nsDisplayListBuilder* aBuilder,
   if (aItem->GetType() != TYPE_CLIP)
     return PR_FALSE;
   nsDisplayClip* other = static_cast<nsDisplayClip*>(aItem);
-  if (other->mClip != mClip)
+  if (!other->mClip.IsEqualInterior(mClip))
     return PR_FALSE;
   mList.AppendToBottom(&other->mList);
   return PR_TRUE;
@@ -2015,7 +2015,7 @@ PRBool nsDisplayClipRoundedRect::TryMerge(nsDisplayListBuilder* aBuilder, nsDisp
     return PR_FALSE;
   nsDisplayClipRoundedRect* other =
     static_cast<nsDisplayClipRoundedRect*>(aItem);
-  if (mClip != other->mClip ||
+  if (!mClip.IsEqualInterior(other->mClip) ||
       memcmp(mRadii, other->mRadii, sizeof(mRadii)) != 0)
     return PR_FALSE;
   mList.AppendToBottom(&other->mList);
diff --git a/layout/base/nsImageLoader.cpp b/layout/base/nsImageLoader.cpp
index de3956edac22..76dc20ee3ce5 100644
--- a/layout/base/nsImageLoader.cpp
+++ b/layout/base/nsImageLoader.cpp
@@ -204,7 +204,7 @@ NS_IMETHODIMP nsImageLoader::FrameChanged(imgIContainer *aContainer,
     return NS_OK;
   }
 
-  nsRect r = (*aDirtyRect == nsIntRect::GetMaxSizedIntRect()) ?
+  nsRect r = aDirtyRect->IsEqualInterior(nsIntRect::GetMaxSizedIntRect()) ?
     nsRect(nsPoint(0, 0), mFrame->GetSize()) :
     aDirtyRect->ToAppUnits(nsPresContext::AppUnitsPerCSSPixel());
 
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index a1a6e26b6ca9..a13a3baf5091 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -483,7 +483,7 @@ public:
    * nscoord units (as scaled by the device context).
    */
   void SetVisibleArea(const nsRect& r) {
-    if (!r.IsExactEqual(mVisibleArea)) {
+    if (!r.IsEqualEdges(mVisibleArea)) {
       mVisibleArea = r;
       // Visible area does not affect media queries when paginated.
       if (!IsPaginated() && HasCachedStyleData())
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 01186f643746..5d0124873f6c 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4026,7 +4026,7 @@ AccumulateFrameBounds(nsIFrame* aContainerFrame,
     // We can't use nsRect::UnionRect since it drops empty rects on
     // the floor, and we need to include them.  (Thus we need
     // aHaveRect to know when to drop the initial value on the floor.)
-    aRect.UnionRectIncludeEmpty(aRect, frameBounds);
+    aRect.UnionRectEdges(aRect, frameBounds);
   } else {
     aHaveRect = PR_TRUE;
     aRect = frameBounds;
@@ -7723,13 +7723,13 @@ PresShell::DoReflow(nsIFrame* target, PRBool aInterruptible)
                 desiredSize.height == size.height),
                "non-root frame's desired size changed during an "
                "incremental reflow");
-  NS_ASSERTION(desiredSize.VisualOverflow() ==
+  NS_ASSERTION(desiredSize.VisualOverflow().IsEqualInterior(
                  nsRect(nsPoint(0, 0),
-                        nsSize(desiredSize.width, desiredSize.height)),
+                        nsSize(desiredSize.width, desiredSize.height))),
                "reflow roots must not have visible overflow");
-  NS_ASSERTION(desiredSize.ScrollableOverflow() ==
+  NS_ASSERTION(desiredSize.ScrollableOverflow().IsEqualEdges(
                  nsRect(nsPoint(0, 0),
-                        nsSize(desiredSize.width, desiredSize.height)),
+                        nsSize(desiredSize.width, desiredSize.height))),
                "reflow roots must not have scrollable overflow");
   NS_ASSERTION(status == NS_FRAME_COMPLETE,
                "reflow roots should never split");
@@ -8193,7 +8193,7 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
       }
       else if (nsnull != k1) {
         // Verify that the frames are the same size
-        if (k1->GetRect() != k2->GetRect()) {
+        if (!k1->GetRect().IsEqualInterior(k2->GetRect())) {
           ok = PR_FALSE;
           LogVerifyMessage(k1, k2, "(frame rects)", k1->GetRect(), k2->GetRect());
         }
@@ -8210,7 +8210,7 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
           LogVerifyMessage(k1, k2, "child views are not matched\n");
         }
         else if (nsnull != v1) {
-          if (v1->GetBounds() != v2->GetBounds()) {
+          if (!v1->GetBounds().IsEqualInterior(v2->GetBounds())) {
             LogVerifyMessage(k1, k2, "(view rects)", v1->GetBounds(), v2->GetBounds());
           }
 
@@ -8224,7 +8224,7 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
           else if (nsnull != w1) {
             w1->GetBounds(r1);
             w2->GetBounds(r2);
-            if (r1 != r2) {
+            if (!r1.IsEqualEdges(r2)) {
               LogVerifyMessage(k1, k2, "(widget rects)", r1, r2);
             }
           }
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 29ea9ffea0e2..eeb518f7b4c9 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -254,7 +254,7 @@ load 461294-1.html
 load 463350-1.html
 load 463350-2.html
 load 463350-3.html
-asserts(6-8) load 463741-1.html # Bug 575011
+load 463741-1.html
 load 465651-1.html
 load 467137-1.html
 load 467213-1.html
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 60b85e2e76ac..a10d10197d2f 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -5917,7 +5917,7 @@ nsBlockFrame::ReflowPushedFloats(nsBlockReflowState& aState,
 
       // Invalidate if there was a position or size change
       nsRect rect = f->GetRect();
-      if (rect != oldRect) {
+      if (!rect.IsEqualInterior(oldRect)) {
         nsRect dirtyRect = oldOverflow;
         dirtyRect.MoveBy(oldRect.x, oldRect.y);
         Invalidate(dirtyRect);
diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index d93ced1a185a..adc6f7c0e719 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -886,7 +886,7 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
 
   // If the float's dimensions have changed, note the damage in the
   // float manager.
-  if (region != oldRegion) {
+  if (!region.IsEqualEdges(oldRegion)) {
     // XXXwaterson conservative: we could probably get away with noting
     // less damage; e.g., if only height has changed, then only note the
     // area into which the float has grown or from which the float has
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 462105f09fe0..070480c927f3 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -941,7 +941,7 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext*           aPres
 
       // Invalidate if there was a position or size change
       nsRect rect = frame->GetRect();
-      if (rect != oldRect) {
+      if (!rect.IsEqualInterior(oldRect)) {
         nsRect dirtyRect = oldOverflow;
         dirtyRect.MoveBy(oldRect.x, oldRect.y);
         Invalidate(dirtyRect);
diff --git a/layout/generic/nsFloatManager.cpp b/layout/generic/nsFloatManager.cpp
index 1aa4da693ca9..78288a896010 100644
--- a/layout/generic/nsFloatManager.cpp
+++ b/layout/generic/nsFloatManager.cpp
@@ -345,7 +345,7 @@ nsFloatManager::StoreRegionFor(nsIFrame* aFloat,
   nsresult rv = NS_OK;
   nsRect rect = aFloat->GetRect();
   FrameProperties props = aFloat->Properties();
-  if (aRegion == rect) {
+  if (aRegion.IsEqualEdges(rect)) {
     props.Delete(FloatRegionProperty());
   }
   else {
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index b4c834138cf6..4c95ea732714 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6127,7 +6127,7 @@ nsIFrame::SetOverflowAreas(const nsOverflowAreas& aOverflowAreas)
            t = -vis.y, // top: positive is upwards
            r = vis.XMost() - mRect.width, // right: positive is rightwards
            b = vis.YMost() - mRect.height; // bottom: positive is downwards
-  if (aOverflowAreas.ScrollableOverflow() == nsRect(nsPoint(0, 0), GetSize()) &&
+  if (aOverflowAreas.ScrollableOverflow().IsEqualEdges(nsRect(nsPoint(0, 0), GetSize())) &&
       l <= NS_FRAME_OVERFLOW_DELTA_MAX &&
       t <= NS_FRAME_OVERFLOW_DELTA_MAX &&
       r <= NS_FRAME_OVERFLOW_DELTA_MAX &&
@@ -6202,7 +6202,7 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
   if (aNewSize.width != 0 || !IsInlineFrame(this)) {
     NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
       nsRect& o = aOverflowAreas.Overflow(otype);
-      o.UnionRectIncludeEmpty(o, bounds);
+      o.UnionRectEdges(o, bounds);
     }
   }
 
@@ -6216,7 +6216,7 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
                             disp->mAppearance, &r)) {
       NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
         nsRect& o = aOverflowAreas.Overflow(otype);
-        o.UnionRectIncludeEmpty(o, r);
+        o.UnionRectEdges(o, r);
       }
     }
   }
@@ -6260,7 +6260,7 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
   }
 
   PRBool visualOverflowChanged =
-    GetVisualOverflowRect() != aOverflowAreas.VisualOverflow();
+    !GetVisualOverflowRect().IsEqualInterior(aOverflowAreas.VisualOverflow());
 
   if (aOverflowAreas != nsOverflowAreas(bounds, bounds)) {
     SetOverflowAreas(aOverflowAreas);
diff --git a/layout/generic/nsFrameUtil.cpp b/layout/generic/nsFrameUtil.cpp
index 1a406f40dc01..afcd2592629e 100644
--- a/layout/generic/nsFrameUtil.cpp
+++ b/layout/generic/nsFrameUtil.cpp
@@ -606,7 +606,7 @@ nsFrameUtil::CompareTrees(Node* tree1, Node* tree2)
       DumpNode(tree2, stdout, 1);
       result = PR_FALSE; // we have a non-critical failure, so remember that but continue
     }
-    if (tree1->bbox != tree2->bbox) {
+    if (tree1->bbox.IsEqualInterior(tree2->bbox)) {
       printf("frame bbox mismatch: %d,%d,%d,%d vs. %d,%d,%d,%d\n",
              tree1->bbox.x, tree1->bbox.y,
              tree1->bbox.width, tree1->bbox.height,
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index aa00fe819a8e..158e35f02a1e 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -219,7 +219,7 @@ nsHTMLScrollFrame::InvalidateInternal(const nsRect& aDamageRect,
         // can contain content outside the scrollport that may need to be
         // invalidated.
         nsRect thebesLayerDamage = damage + GetScrollPosition() - mInner.mScrollPosAtLastPaint;
-        if (parentDamage == thebesLayerDamage) {
+        if (parentDamage.IsEqualInterior(thebesLayerDamage)) {
           // This single call will take care of both rects
           nsHTMLContainerFrame::InvalidateInternal(parentDamage, 0, 0, aForChild, aFlags);
         } else {
@@ -239,7 +239,7 @@ nsHTMLScrollFrame::InvalidateInternal(const nsRect& aDamageRect,
         }
       }
 
-      if (mInner.mIsRoot && parentDamage != damage) {
+      if (mInner.mIsRoot && !parentDamage.IsEqualInterior(damage)) {
         // Make sure we notify our prescontext about invalidations outside
         // viewport clipping.
         // This is important for things that are snapshotting the viewport,
@@ -719,8 +719,8 @@ nsHTMLScrollFrame::PlaceScrollArea(const ScrollReflowState& aState,
   // Preserve the width or height of empty rects
   nsSize portSize = mInner.mScrollPort.Size();
   nsRect scrolledRect = mInner.GetScrolledRectInternal(aState.mContentsOverflowArea, portSize);
-  scrolledArea.UnionRectIncludeEmpty(scrolledRect,
-                                     nsRect(nsPoint(0,0), portSize));
+  scrolledArea.UnionRectEdges(scrolledRect,
+                              nsRect(nsPoint(0,0), portSize));
 
   // Store the new overflow area. Note that this changes where an outline
   // of the scrolled frame would be painted, but scrolled frames can't have
@@ -902,8 +902,8 @@ nsHTMLScrollFrame::Reflow(nsPresContext*           aPresContext,
       (GetStateBits() & NS_FRAME_IS_DIRTY) ||
       didHaveHScrollbar != state.mShowHScrollbar ||
       didHaveVScrollbar != state.mShowVScrollbar ||
-      oldScrollAreaBounds != newScrollAreaBounds ||
-      oldScrolledAreaBounds != newScrolledAreaBounds) {
+      !oldScrollAreaBounds.IsEqualEdges(newScrollAreaBounds) ||
+      !oldScrolledAreaBounds.IsEqualEdges(newScrolledAreaBounds)) {
     if (!mInner.mSupppressScrollbarUpdate) {
       mInner.mSkippedScrollbarLayout = PR_FALSE;
       mInner.SetScrollbarVisibility(mInner.mHScrollbarBox, state.mShowHScrollbar);
@@ -934,7 +934,7 @@ nsHTMLScrollFrame::Reflow(nsPresContext*           aPresContext,
     mInner.mHadNonInitialReflow = PR_TRUE;
   }
 
-  if (mInner.mIsRoot && oldScrolledAreaBounds != newScrolledAreaBounds) {
+  if (mInner.mIsRoot && !oldScrolledAreaBounds.IsEqualEdges(newScrolledAreaBounds)) {
     mInner.PostScrolledAreaEvent();
   }
 
@@ -1138,7 +1138,7 @@ nsXULScrollFrame::InvalidateInternal(const nsRect& aDamageRect,
       // can contain content outside the scrollport that may need to be
       // invalidated.
       nsRect thebesLayerDamage = damage + GetScrollPosition() - mInner.mScrollPosAtLastPaint;
-      if (parentDamage == thebesLayerDamage) {
+      if (parentDamage.IsEqualInterior(thebesLayerDamage)) {
         // This single call will take care of both rects
         nsBoxFrame::InvalidateInternal(parentDamage, 0, 0, aForChild, aFlags);
       } else {
@@ -2829,7 +2829,7 @@ nsXULScrollFrame::LayoutScrollArea(nsBoxLayoutState& aState,
     mInner.mScrolledFrame->Invalidate(
       originalVisOverflow + originalRect.TopLeft() - finalRect.TopLeft());
     mInner.mScrolledFrame->Invalidate(finalVisOverflow);
-  } else if (!originalVisOverflow.IsExactEqual(finalVisOverflow)) {
+  } else if (!originalVisOverflow.IsEqualInterior(finalVisOverflow)) {
     // If the overflow rect changed then invalidate the difference between the
     // old and new overflow rects.
     mInner.mScrolledFrame->CheckInvalidateSizeChange(
@@ -3238,7 +3238,7 @@ static void LayoutAndInvalidate(nsBoxLayoutState& aState,
   // to invalidate the scrollbar area here.
   // But we also need to invalidate the scrollbar itself in case it has
   // its own layer; we need to ensure that layer is updated.
-  PRBool rectChanged = aBox->GetRect() != aRect;
+  PRBool rectChanged = !aBox->GetRect().IsEqualInterior(aRect);
   if (rectChanged) {
     if (aScrollbarIsBeingHidden) {
       aBox->GetParent()->Invalidate(aBox->GetVisualOverflowRect() +
diff --git a/layout/generic/nsHTMLReflowMetrics.h b/layout/generic/nsHTMLReflowMetrics.h
index 4c6913492bc4..e0a0da5f9ab7 100644
--- a/layout/generic/nsHTMLReflowMetrics.h
+++ b/layout/generic/nsHTMLReflowMetrics.h
@@ -111,8 +111,8 @@ public:
   bool operator==(const nsOverflowAreas& aOther) const {
     // Scrollable overflow is a point-set rectangle and visual overflow
     // is a pixel-set rectangle.
-    return VisualOverflow() == aOther.VisualOverflow() &&
-           ScrollableOverflow().IsExactEqual(aOther.ScrollableOverflow());
+    return VisualOverflow().IsEqualInterior(aOther.VisualOverflow()) &&
+           ScrollableOverflow().IsEqualEdges(aOther.ScrollableOverflow());
   }
 
   bool operator!=(const nsOverflowAreas& aOther) const {
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index bcbb104c37ab..aa35cac48343 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -595,7 +595,7 @@ nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
 
   // XXX We really need to round this out, now that we're doing better
   // image scaling!
-  nsRect r = (*aRect == nsIntRect::GetMaxSizedIntRect()) ?
+  nsRect r = aRect->IsEqualInterior(nsIntRect::GetMaxSizedIntRect()) ?
     GetInnerArea() :
     SourceRectToDest(*aRect);
 
@@ -679,7 +679,7 @@ nsImageFrame::FrameChanged(imgIContainer *aContainer,
     return NS_OK;
   }
 
-  nsRect r = (*aDirtyRect == nsIntRect::GetMaxSizedIntRect()) ?
+  nsRect r = aDirtyRect->IsEqualInterior(nsIntRect::GetMaxSizedIntRect()) ?
     GetInnerArea() :
     SourceRectToDest(*aDirtyRect);
 
diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
index 052e29dbfebd..81ff15de359b 100644
--- a/layout/generic/nsLineBox.cpp
+++ b/layout/generic/nsLineBox.cpp
@@ -503,9 +503,8 @@ nsLineBox::SetOverflowAreas(const nsOverflowAreas& aOverflowAreas)
     NS_ASSERTION(aOverflowAreas.Overflow(otype).height >= 0,
                  "illegal height for combined area");
   }
-  // REVIEW: should this use IsExactEqual?
-  if (aOverflowAreas.VisualOverflow() != mBounds ||
-      aOverflowAreas.ScrollableOverflow() != mBounds) {
+  if (!aOverflowAreas.VisualOverflow().IsEqualInterior(mBounds) ||
+      !aOverflowAreas.ScrollableOverflow().IsEqualEdges(mBounds)) {
     if (!mData) {
       if (IsInline()) {
         mInlineData = new ExtraInlineData(mBounds);
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 76c59a392a3e..242d3b806290 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -2395,7 +2395,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
         nsIntPoint origin = GetWindowOriginInPixels(PR_TRUE);
         nsIntRect winlessRect = nsIntRect(origin, nsIntSize(window->width, window->height));
 
-        if (mWindowlessRect != winlessRect) {
+        if (!mWindowlessRect.IsEqualEdges(winlessRect)) {
           mWindowlessRect = winlessRect;
 
           WINDOWPOS winpos;
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 13f848b3ab17..e40d355f7930 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -5556,7 +5556,7 @@ nsTypedSelection::GetSelectionAnchorGeometry(SelectionRegion aRegion,
   // make focusRect relative to anchorFrame
   focusRect += focusFrame->GetOffsetTo(anchorFrame);
 
-  aRect->UnionRectIncludeEmpty(anchorRect, focusRect);
+  aRect->UnionRectEdges(anchorRect, focusRect);
   return anchorFrame;
 }
 
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index c8d4024c2990..0b787b5039b8 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -699,7 +699,7 @@ nsChangeHint nsStyleList::CalcDifference(const nsStyleList& aOther) const
     return NS_STYLE_HINT_FRAMECHANGE;
   if (EqualImages(mListStyleImage, aOther.mListStyleImage) &&
       mListStyleType == aOther.mListStyleType) {
-    if (mImageRegion == aOther.mImageRegion)
+    if (mImageRegion.IsEqualInterior(aOther.mImageRegion))
       return NS_STYLE_HINT_NONE;
     if (mImageRegion.width == aOther.mImageRegion.width &&
         mImageRegion.height == aOther.mImageRegion.height)
@@ -1599,7 +1599,7 @@ nsStyleImage::ComputeActualCropRect(nsIntRect& aActualCropRect,
   aActualCropRect.IntersectRect(imageRect, cropRect);
 
   if (aIsEntireImage)
-    *aIsEntireImage = (aActualCropRect == imageRect);
+    *aIsEntireImage = aActualCropRect.IsEqualInterior(imageRect);
   return PR_TRUE;
 }
 
@@ -2128,7 +2128,7 @@ nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
       || mBreakBefore != aOther.mBreakBefore
       || mBreakAfter != aOther.mBreakAfter
       || mAppearance != aOther.mAppearance
-      || mClipFlags != aOther.mClipFlags || mClip != aOther.mClip)
+      || mClipFlags != aOther.mClipFlags || !mClip.IsEqualInterior(aOther.mClip))
     NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame, nsChangeHint_RepaintFrame));
 
   if (mOpacity != aOther.mOpacity) {
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 2fafffcd999b..5b39a348b7aa 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -658,7 +658,7 @@ nsSVGOuterSVGFrame::UpdateAndInvalidateCoveredRegion(nsIFrame *aFrame)
   Invalidate(nsSVGUtils::FindFilterInvalidation(aFrame, oldRegion));
   svgFrame->UpdateCoveredRegion();
   nsRect newRegion = svgFrame->GetCoveredRegion();
-  if (oldRegion == newRegion)
+  if (oldRegion.IsEqualInterior(newRegion))
     return PR_FALSE;
 
   Invalidate(nsSVGUtils::FindFilterInvalidation(aFrame, newRegion));
diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index b31169ae1dd4..d36b4a5cf981 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -439,7 +439,7 @@ nsSliderFrame::DoLayout(nsBoxLayoutState& aState)
   SyncLayout(aState);
 
   // Redraw only if thumb changed size.
-  if (oldThumbRect != thumbRect)
+  if (!oldThumbRect.IsEqualInterior(thumbRect))
     Redraw(aState);
 
   return NS_OK;
diff --git a/layout/xul/base/src/nsSprocketLayout.cpp b/layout/xul/base/src/nsSprocketLayout.cpp
index 5c258c34e6d2..885fa5eb28d2 100644
--- a/layout/xul/base/src/nsSprocketLayout.cpp
+++ b/layout/xul/base/src/nsSprocketLayout.cpp
@@ -524,7 +524,7 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
       // We have to check for this.
       nsRect newChildRect(child->GetRect());
 
-      if (newChildRect != childRect) {
+      if (!newChildRect.IsEqualEdges(childRect)) {
 #ifdef DEBUG_GROW
         child->DumpBox(stdout);
         printf(" GREW from (%d,%d) -> (%d,%d)\n", childRect.width, childRect.height, newChildRect.width, newChildRect.height);
@@ -1163,7 +1163,7 @@ nsSprocketLayout::ChildResized(nsIBox* aBox,
       if (recompute)
             ComputeChildSizes(aBox, aState, containingWidth, aBoxSizes, aComputedBoxSizes);
 
-      if (childCurrentRect != aChildActualRect) {
+      if (!childCurrentRect.IsEqualEdges(aChildActualRect)) {
         // the childRect includes the margin
         // make sure we remove it before setting 
         // the bounds.
diff --git a/layout/xul/base/src/nsStackLayout.cpp b/layout/xul/base/src/nsStackLayout.cpp
index f67e3f0a80bf..80a55205a0b9 100644
--- a/layout/xul/base/src/nsStackLayout.cpp
+++ b/layout/xul/base/src/nsStackLayout.cpp
@@ -308,7 +308,7 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
         childRect.height = 0;
 
       nsRect oldRect(child->GetRect());
-      PRBool sizeChanged = !oldRect.IsExactEqual(childRect);
+      PRBool sizeChanged = !oldRect.IsEqualEdges(childRect);
 
       // only lay out dirty children or children whose sizes have changed
       if (sizeChanged || NS_SUBTREE_DIRTY(child)) {
@@ -388,7 +388,7 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
             }
           }
 
-          if (childRectNoMargin != oldRect)
+          if (!childRectNoMargin.IsEqualInterior(oldRect))
           {
             // redraw the new and old positions if the 
             // child moved or resized.
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 765ac9d7b441..95de11be518d 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -411,7 +411,7 @@ nsTreeBodyFrame::SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRec
                            PRBool aRemoveOverflowArea)
 {
   nscoord horzWidth = CalcHorzWidth(GetScrollParts());
-  if ((aRect != mRect || mHorzWidth != horzWidth) && !mReflowCallbackPosted) {
+  if ((!aRect.IsEqualEdges(mRect) || mHorzWidth != horzWidth) && !mReflowCallbackPosted) {
     mReflowCallbackPosted = PR_TRUE;
     PresContext()->PresShell()->PostReflowCallback(this);
   }
diff --git a/modules/libpr0n/src/RasterImage.cpp b/modules/libpr0n/src/RasterImage.cpp
index 569eec4985f8..30ba66970255 100644
--- a/modules/libpr0n/src/RasterImage.cpp
+++ b/modules/libpr0n/src/RasterImage.cpp
@@ -523,7 +523,7 @@ RasterImage::GetCurrentFrameIsOpaque(PRBool *aIsOpaque)
     // We are also transparent if the current frame's size doesn't cover our
     // entire area.
     nsIntRect framerect = curframe->GetRect();
-    *aIsOpaque = *aIsOpaque && (framerect != nsIntRect(0, 0, mSize.width, mSize.height));
+    *aIsOpaque = *aIsOpaque && framerect.IsEqualInterior(nsIntRect(0, 0, mSize.width, mSize.height));
   }
 
   return NS_OK;
diff --git a/modules/libpr0n/src/imgFrame.cpp b/modules/libpr0n/src/imgFrame.cpp
index 12b975ad7fb4..b0a2d1a57904 100644
--- a/modules/libpr0n/src/imgFrame.cpp
+++ b/modules/libpr0n/src/imgFrame.cpp
@@ -764,7 +764,7 @@ void imgFrame::SetBlendMethod(PRInt32 aBlendMethod)
 
 PRBool imgFrame::ImageComplete() const
 {
-  return mDecoded == nsIntRect(mOffset, mSize);
+  return mDecoded.IsEqualInterior(nsIntRect(mOffset, mSize));
 }
 
 // A hint from the image decoders that this image has no alpha, even
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index d63021efe2da..74288c1cb71b 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -302,7 +302,7 @@ void nsViewManager::DoSetWindowDimensions(nscoord aWidth, nscoord aHeight)
   nsRect newDim(0, 0, aWidth, aHeight);
   mRootView->GetDimensions(oldDim);
   // We care about resizes even when one dimension is already zero.
-  if (!oldDim.IsExactEqual(newDim)) {
+  if (!oldDim.IsEqualEdges(newDim)) {
     // Don't resize the widget. It is already being set elsewhere.
     mRootView->SetDimensions(newDim, PR_TRUE, PR_FALSE);
     if (mObserver)
@@ -1352,7 +1352,7 @@ NS_IMETHODIMP nsViewManager::ResizeView(nsIView *aView, const nsRect &aRect, PRB
   nsRect oldDimensions;
 
   view->GetDimensions(oldDimensions);
-  if (!oldDimensions.IsExactEqual(aRect)) {
+  if (!oldDimensions.IsEqualEdges(aRect)) {
     // resize the view.
     // Prevent Invalidation of hidden views 
     if (view->GetVisibility() == nsViewVisibility_kHide) {  
diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp
index d392bc6f1027..23fe7bb98726 100644
--- a/widget/src/os2/nsWindow.cpp
+++ b/widget/src/os2/nsWindow.cpp
@@ -1045,7 +1045,7 @@ void nsWindow::SetPluginClipRegion(const Configuration& aConfiguration)
 
   // If nothing has changed, exit.
   if (!StoreWindowClipRegion(aConfiguration.mClipRegion) &&
-      mBounds == aConfiguration.mBounds) {
+      mBounds.IsEqualInterior(aConfiguration.mBounds)) {
     return;
   }
 
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 6f7a8f36b531..51b0953da20d 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1537,7 +1537,7 @@ NS_METHOD nsWindow::Move(PRInt32 aX, PRInt32 aY)
     if (mWindowType == eWindowType_plugin &&
         (!mLayerManager || mLayerManager->GetBackendType() == LayerManager::LAYERS_D3D9) &&
         mClipRects &&
-        (mClipRectCount != 1 || mClipRects[0] != nsIntRect(0, 0, mBounds.width, mBounds.height))) {
+        (mClipRectCount != 1 || !mClipRects[0].IsEqualInterior(nsIntRect(0, 0, mBounds.width, mBounds.height)))) {
       flags |= SWP_NOCOPYBITS;
     }
     VERIFY(::SetWindowPos(mWnd, NULL, aX, aY, 0, 0, flags));
diff --git a/widget/src/xpwidgets/PuppetWidget.cpp b/widget/src/xpwidgets/PuppetWidget.cpp
index 6701ca88cde9..89f8cdfbbbe1 100644
--- a/widget/src/xpwidgets/PuppetWidget.cpp
+++ b/widget/src/xpwidgets/PuppetWidget.cpp
@@ -215,7 +215,7 @@ PuppetWidget::Resize(PRInt32 aWidth,
     InvalidateRegion(this, dirty);
   }
 
-  if (oldBounds != mBounds) {
+  if (!oldBounds.IsEqualEdges(mBounds)) {
     DispatchResizeEvent();
   }
 

From fc7faceefc08b4cff3818e482ee3aef499a69755 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:23 +1200
Subject: [PATCH 308/509] Bug 641426. Part 6: Rename Empty to SetEmpty.
 r=cjones

---
 accessible/src/html/nsHyperTextAccessible.cpp  | 2 +-
 dom/plugins/ipc/PluginInstanceChild.cpp        | 2 +-
 gfx/layers/ThebesLayerBuffer.h                 | 2 +-
 gfx/src/nsRect.h                               | 4 ++--
 layout/base/nsCaret.cpp                        | 2 +-
 layout/base/nsDisplayList.cpp                  | 2 +-
 layout/forms/nsFieldSetFrame.cpp               | 2 +-
 layout/generic/nsFrame.cpp                     | 2 +-
 layout/generic/nsObjectFrame.cpp               | 2 +-
 layout/svg/base/src/nsSVGGlyphFrame.cpp        | 2 +-
 layout/svg/base/src/nsSVGImageFrame.cpp        | 2 +-
 layout/svg/base/src/nsSVGPathGeometryFrame.cpp | 2 +-
 layout/tables/nsTablePainter.cpp               | 2 +-
 modules/libpr0n/src/Decoder.cpp                | 2 +-
 widget/src/android/AndroidJavaWrappers.cpp     | 4 ++--
 widget/src/cocoa/nsMenuItemIconX.mm            | 2 +-
 xpfe/appshell/src/nsWebShellWindow.cpp         | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index 601e5b145e18..912641c32301 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -310,7 +310,7 @@ nsHyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
     *aEndFrame = nsnull;
   }
   if (aBoundsRect) {
-    aBoundsRect->Empty();
+    aBoundsRect->SetEmpty();
   }
   if (aStartAcc)
     *aStartAcc = nsnull;
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
index a6b3f25d02f0..527fdd774345 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -2930,7 +2930,7 @@ PluginInstanceChild::ShowPluginFrame()
     // Clear accRect here to be able to pass
     // test_invalidate_during_plugin_paint  test
     nsIntRect rect = mAccumulatedInvalidRect;
-    mAccumulatedInvalidRect.Empty();
+    mAccumulatedInvalidRect.SetEmpty();
 
     // Fix up old invalidations that might have been made when our
     // surface was a different size
diff --git a/gfx/layers/ThebesLayerBuffer.h b/gfx/layers/ThebesLayerBuffer.h
index d3516226ba8c..9cea379c9c70 100644
--- a/gfx/layers/ThebesLayerBuffer.h
+++ b/gfx/layers/ThebesLayerBuffer.h
@@ -101,7 +101,7 @@ public:
   {
     mBuffer = nsnull;
     mBufferDims.SizeTo(0, 0);
-    mBufferRect.Empty();
+    mBufferRect.SetEmpty();
   }
 
   /**
diff --git a/gfx/src/nsRect.h b/gfx/src/nsRect.h
index a117e8c9afe2..21866034d83b 100644
--- a/gfx/src/nsRect.h
+++ b/gfx/src/nsRect.h
@@ -83,7 +83,7 @@ struct NS_GFX nsRect {
   PRBool IsEmpty() const {
     return (PRBool) ((height <= 0) || (width <= 0));
   }
-  void   Empty() {width = height = 0;}
+  void SetEmpty() {width = height = 0;}
 
   // Returns true if this rectangle contains the interior of aRect. Always
   // returns true if aRect is empty, and always returns false is aRect is
@@ -121,7 +121,7 @@ struct NS_GFX nsRect {
   //
   // 'this' can be the same object as either aRect1 or aRect2
   void UnionRectEdges(const nsRect& aRect1, const nsRect& aRect2);
-  
+
   // Accessors
   void SetRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) {
     x = aX; y = aY; width = aWidth; height = aHeight;
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 42ed4eed5467..4a10ec7ca885 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -1094,7 +1094,7 @@ nsCaret::UpdateCaretRects(nsIFrame* aFrame, PRInt32 aFrameOffset)
     mCaretRect.x -= mCaretRect.width;
 
 #ifdef IBMBIDI
-  mHookRect.Empty();
+  mHookRect.SetEmpty();
 
   // Simon -- make a hook to draw to the left or right of the caret to show keyboard language direction
   PRBool isCaretRTL = PR_FALSE;
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 4ee024b394aa..5d0b8d5d75da 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1387,7 +1387,7 @@ ComputeDisjointRectangles(const nsRegion& aRegion,
 
     if (!accumulated.IsEmpty()) {
       aRects->AppendElement(accumulated);
-      accumulated.Empty();
+      accumulated.SetEmpty();
     }
 
     if (!r)
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 29fc0104cce5..fb7d6c9c6519 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -497,7 +497,7 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
     FinishReflowChild(mLegendFrame, aPresContext, &legendReflowState, 
                       legendDesiredSize, 0, 0, NS_FRAME_NO_MOVE_FRAME);    
   } else if (!mLegendFrame) {
-    mLegendRect.Empty();
+    mLegendRect.SetEmpty();
     mLegendSpace = 0;
   } else {
     // mLegendSpace and mLegendRect haven't changed, but we need
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 4c95ea732714..78b08323cae4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1636,7 +1636,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
       // The out-of-flow frame did not intersect the dirty area. We may still
       // need to traverse into it, since it may contain placeholders we need
       // to enter to reach other out-of-flow frames that are visible.
-      dirty.Empty();
+      dirty.SetEmpty();
     }
     pseudoStackingContext = PR_TRUE;
   } else if (aBuilder->GetSelectedFramesOnly() &&
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 242d3b806290..27e58cd4d6e3 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -2951,7 +2951,7 @@ nsObjectFrame::StopPluginInternal(PRBool aDelayedStop)
 
   // Make sure that our windowless rect has been zeroed out, so if we
   // get reinstantiated we'll send the right messages to the plug-in.
-  mWindowlessRect.Empty();
+  mWindowlessRect.SetEmpty();
 
   PRBool oldVal = mPreventInstantiation;
   mPreventInstantiation = PR_TRUE;
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index e8d1af66a510..808b8601db69 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -474,7 +474,7 @@ nsSVGGlyphFrame::GetCoveredRegion()
 NS_IMETHODIMP
 nsSVGGlyphFrame::UpdateCoveredRegion()
 {
-  mRect.Empty();
+  mRect.SetEmpty();
 
   gfxMatrix matrix = GetCanvasTM();
   if (matrix.IsSingular()) {
diff --git a/layout/svg/base/src/nsSVGImageFrame.cpp b/layout/svg/base/src/nsSVGImageFrame.cpp
index 629dc075b30b..db080fd589b2 100644
--- a/layout/svg/base/src/nsSVGImageFrame.cpp
+++ b/layout/svg/base/src/nsSVGImageFrame.cpp
@@ -443,7 +443,7 @@ nsSVGImageFrame::GetType() const
 NS_IMETHODIMP
 nsSVGImageFrame::UpdateCoveredRegion()
 {
-  mRect.Empty();
+  mRect.SetEmpty();
 
   gfxContext context(gfxPlatform::GetPlatform()->ScreenReferenceSurface());
 
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index 63034158e058..d1b5f3b0d743 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -246,7 +246,7 @@ nsSVGPathGeometryFrame::GetCoveredRegion()
 NS_IMETHODIMP
 nsSVGPathGeometryFrame::UpdateCoveredRegion()
 {
-  mRect.Empty();
+  mRect.SetEmpty();
 
   nsRefPtr<gfxContext> context =
     new gfxContext(gfxPlatform::GetPlatform()->ScreenReferenceSurface());
diff --git a/layout/tables/nsTablePainter.cpp b/layout/tables/nsTablePainter.cpp
index 3fba4b5e35a7..e75b4439046e 100644
--- a/layout/tables/nsTablePainter.cpp
+++ b/layout/tables/nsTablePainter.cpp
@@ -161,7 +161,7 @@ TableBackgroundPainter::TableBackgroundData::Destroy(nsPresContext* aPresContext
 void
 TableBackgroundPainter::TableBackgroundData::Clear()
 {
-  mRect.Empty();
+  mRect.SetEmpty();
   mFrame = nsnull;
   mBorder = nsnull;
   mVisible = PR_FALSE;
diff --git a/modules/libpr0n/src/Decoder.cpp b/modules/libpr0n/src/Decoder.cpp
index 160a0b49fa77..97087621b0c2 100644
--- a/modules/libpr0n/src/Decoder.cpp
+++ b/modules/libpr0n/src/Decoder.cpp
@@ -175,7 +175,7 @@ Decoder::FlushInvalidations()
   }
 
   // Clear the invalidation rectangle
-  mInvalidRect.Empty();
+  mInvalidRect.SetEmpty();
 }
 
 /*
diff --git a/widget/src/android/AndroidJavaWrappers.cpp b/widget/src/android/AndroidJavaWrappers.cpp
index c6314c2037b1..c86d9a98ea90 100644
--- a/widget/src/android/AndroidJavaWrappers.cpp
+++ b/widget/src/android/AndroidJavaWrappers.cpp
@@ -321,7 +321,7 @@ AndroidGeckoEvent::ReadRectField(JNIEnv *jenv)
                       r.Right() - r.Left(),
                       r.Bottom() - r.Top());
     } else {
-        mRect.Empty();
+        mRect.SetEmpty();
     }
 }
 
@@ -438,7 +438,7 @@ void
 AndroidGeckoEvent::Init(int x1, int y1, int x2, int y2)
 {
     mType = DRAW;
-    mRect.Empty();
+    mRect.SetEmpty();
 }
 
 void
diff --git a/widget/src/cocoa/nsMenuItemIconX.mm b/widget/src/cocoa/nsMenuItemIconX.mm
index 378026e92a2a..343d5b551ffd 100644
--- a/widget/src/cocoa/nsMenuItemIconX.mm
+++ b/widget/src/cocoa/nsMenuItemIconX.mm
@@ -240,7 +240,7 @@ nsMenuItemIconX::GetIconURI(nsIURI** aIconURI)
   // Empty the mImageRegionRect initially as the image region CSS could
   // have been changed and now have an error or have been removed since the
   // last GetIconURI call.
-  mImageRegionRect.Empty();
+  mImageRegionRect.SetEmpty();
 
   // If this menu item shouldn't have an icon, the string will be empty,
   // and NS_NewURI will fail.
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 090b7cd94a46..2ffe677d7354 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -170,7 +170,7 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
                                   &mOpenerScreenRect.width,
                                   &mOpenerScreenRect.height);
     if (NS_FAILED(rv)) {
-      mOpenerScreenRect.Empty();
+      mOpenerScreenRect.SetEmpty();
     } else {
       initialX = mOpenerScreenRect.x;
       initialY = mOpenerScreenRect.y;

From 2c059fb8c230fc041d653e7314515b7a8587599d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:48 +1200
Subject: [PATCH 309/509] Bug 641426. Part 7: Create Rect template.
 r=joe,sr=cjones

---
 gfx/src/BaseRect.h                       | 314 +++++++++++++++++++++++
 gfx/src/Makefile.in                      |   1 +
 gfx/src/nsRect.cpp                       | 240 -----------------
 gfx/src/nsRect.h                         | 296 +++------------------
 gfx/thebes/gfxRect.cpp                   |  48 ----
 gfx/thebes/gfxRect.h                     | 127 ++-------
 layout/base/nsLayoutUtils.cpp            |   6 +-
 layout/generic/nsObjectFrame.cpp         |   2 +-
 layout/xul/base/src/nsMenuPopupFrame.cpp |   2 +-
 layout/xul/base/src/nsResizerFrame.cpp   |   4 +-
 10 files changed, 380 insertions(+), 660 deletions(-)
 create mode 100644 gfx/src/BaseRect.h

diff --git a/gfx/src/BaseRect.h b/gfx/src/BaseRect.h
new file mode 100644
index 000000000000..425168787320
--- /dev/null
+++ b/gfx/src/BaseRect.h
@@ -0,0 +1,314 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASERECT_H_
+#define MOZILLA_BASERECT_H_
+
+#include "nsAlgorithm.h"
+
+namespace mozilla {
+
+/**
+ * Rectangles have two interpretations: a set of (zero-size) points,
+ * and a rectangular area of the plane. Most rectangle operations behave
+ * the same no matter what interpretation is being used, but some operations
+ * differ:
+ * -- Equality tests behave differently. When a rectangle represents an area,
+ * all zero-width and zero-height rectangles are equal to each other since they
+ * represent the empty area. But when a rectangle represents a set of
+ * mathematical points, zero-width and zero-height rectangles can be unequal.
+ * -- The union operation can behave differently. When rectangles represent
+ * areas, taking the union of a zero-width or zero-height rectangle with
+ * another rectangle can just ignore the empty rectangle. But when rectangles
+ * represent sets of mathematical points, we may need to extend the latter
+ * rectangle to include the points of a zero-width or zero-height rectangle.
+ *
+ * To ensure that these interpretations are explicitly disambiguated, we
+ * deny access to the == and != operators and require use of IsEqualEdges and
+ * IsEqualInterior instead. Similarly we provide separate Union and UnionEdges
+ * methods.
+ *
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass.
+ */
+template <class T, class Sub, class Point, class SizeT, class Margin>
+struct BaseRect {
+  T x, y, width, height;
+
+  // Constructors
+  BaseRect() : x(0), y(0), width(0), height(0) {}
+  BaseRect(const Point& aOrigin, const SizeT &aSize) :
+      x(aOrigin.x), y(aOrigin.y), width(aSize.width), height(aSize.height)
+  {
+  }
+  BaseRect(T aX, T aY, T aWidth, T aHeight) :
+      x(aX), y(aY), width(aWidth), height(aHeight)
+  {
+  }
+
+  // Emptiness. An empty rect is one that has no area, i.e. its height or width
+  // is <= 0
+  bool IsEmpty() const { return height <= 0 || width <= 0; }
+  void SetEmpty() { width = height = 0; }
+
+  // Returns true if this rectangle contains the interior of aRect. Always
+  // returns true if aRect is empty, and always returns false is aRect is
+  // nonempty but this rect is empty.
+  bool Contains(const Sub& aRect) const
+  {
+    return aRect.IsEmpty() ||
+           (x <= aRect.x && aRect.XMost() <= XMost() &&
+            y <= aRect.y && aRect.YMost() <= YMost());
+  }
+  // Returns true if this rectangle contains the rectangle (aX,aY,1,1).
+  bool Contains(T aX, T aY) const
+  {
+    return x <= aX && aX + 1 <= XMost() &&
+           y <= aY && aY + 1 <= YMost();
+  }
+  // Returns true if this rectangle contains the rectangle (aPoint.x,aPoint.y,1,1).
+  bool Contains(const Point& aPoint) const { return Contains(aPoint.x, aPoint.y); }
+
+  // Intersection. Returns TRUE if the receiver's area has non-empty
+  // intersection with aRect's area, and FALSE otherwise.
+  // Always returns false if aRect is empty or 'this' is empty.
+  bool Intersects(const Sub& aRect) const
+  {
+    return x < aRect.XMost() && aRect.x < XMost() &&
+           y < aRect.YMost() && aRect.y < YMost();
+  }
+  // Returns the rectangle containing the intersection of the points
+  // (including edges) of *this and aRect. If there are no points in that
+  // intersection, returns an empty rectangle with x/y set to the max of the x/y
+  // of *this and aRect.
+  Sub Intersect(const Sub& aRect) const
+  {
+    Sub result;
+    result.x = NS_MAX(x, aRect.x);
+    result.y = NS_MAX(y, aRect.y);
+    result.width = NS_MIN(XMost(), aRect.XMost()) - result.x;
+    result.height = NS_MIN(YMost(), aRect.YMost()) - result.y;
+    if (result.width < 0 || result.height < 0) {
+      result.SizeTo(0, 0);
+    }
+    return result;
+  }
+  // Sets *this to be the rectangle containing the intersection of the points
+  // (including edges) of *this and aRect. If there are no points in that
+  // intersection, sets *this to be an empty rectangle with x/y set to the max
+  // of the x/y of *this and aRect.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  bool IntersectRect(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.Intersect(aRect2);
+    return !IsEmpty();
+  }
+
+  // Returns the smallest rectangle that contains both the area of both
+  // this and aRect2.
+  // Thus, empty input rectangles are ignored.
+  // If both rectangles are empty, returns this.
+  Sub Union(const Sub& aRect) const
+  {
+    if (IsEmpty()) {
+      return aRect;
+    } else if (aRect.IsEmpty()) {
+      return *static_cast<const Sub*>(this);
+    } else {
+      return UnionEdges(aRect);
+    }
+  }
+  // Returns the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
+  Sub UnionEdges(const Sub& aRect) const
+  {
+    Sub result;
+    result.x = NS_MIN(x, aRect.x);
+    result.y = NS_MIN(y, aRect.y);
+    result.width = NS_MAX(XMost(), aRect.XMost()) - result.x;
+    result.height = NS_MAX(YMost(), aRect.YMost()) - result.y;
+    return result;
+  }
+  // Computes the smallest rectangle that contains both the area of both
+  // aRect1 and aRect2, and fills 'this' with the result.
+  // Thus, empty input rectangles are ignored.
+  // If both rectangles are empty, sets 'this' to aRect2.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  void UnionRect(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.Union(aRect2);
+  }
+
+  // Computes the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  void UnionRectEdges(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.UnionEdges(aRect2);
+  }
+
+  void SetRect(T aX, T aY, T aWidth, T aHeight)
+  {
+    x = aX; y = aY; width = aWidth; height = aHeight;
+  }
+  void SetRect(const Point& aPt, const SizeT& aSize)
+  {
+    SetRect(aPt.x, aPt.y, aSize.width, aSize.height);
+  }
+  void MoveTo(T aX, T aY) { x = aX; y = aY; }
+  void MoveTo(const Point& aPoint) { x = aPoint.x; y = aPoint.y; }
+  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
+  void MoveBy(const Point& aPoint) { x += aPoint.x; y += aPoint.y; }
+  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
+  void SizeTo(const SizeT& aSize) { width = aSize.width; height = aSize.height; }
+
+  void Inflate(T aDx, T aDy)
+  {
+    x -= aDx;
+    y -= aDy;
+    width += 2 * aDx;
+    height += 2 * aDy;
+  }
+  void Inflate(const Margin& aMargin)
+  {
+    x -= aMargin.left;
+    y -= aMargin.top;
+    width += aMargin.LeftRight();
+    height += aMargin.TopBottom();
+  }
+
+  void Deflate(T aDx, T aDy)
+  {
+    x += aDx;
+    y += aDy;
+    width = NS_MAX(T(0), width - 2 * aDx);
+    height = NS_MAX(T(0), height - 2 * aDy);
+  }
+  void Deflate(const Margin& aMargin)
+  {
+    x += aMargin.left;
+    y += aMargin.top;
+    width = NS_MAX(T(0), width - aMargin.LeftRight());
+    height = NS_MAX(T(0), height - aMargin.TopBottom());
+  }
+
+  // Return true if the rectangles contain the same set of points, including
+  // points on the edges.
+  // Use when we care about the exact x/y/width/height values being
+  // equal (i.e. we care about differences in empty rectangles).
+  bool IsEqualEdges(const Sub& aRect) const
+  {
+    return x == aRect.x && y == aRect.y &&
+           width == aRect.width && height == aRect.height;
+  }
+  // Return true if the rectangles contain the same area of the plane.
+  // Use when we do not care about differences in empty rectangles.
+  bool IsEqualInterior(const Sub& aRect) const
+  {
+    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
+  }
+
+  Sub operator+(const Point& aPoint) const
+  {
+    return Sub(x + aPoint.x, y + aPoint.y, width, height);
+  }
+  Sub operator-(const Point& aPoint) const
+  {
+    return Sub(x - aPoint.x, y - aPoint.y, width, height);
+  }
+  Sub& operator+=(const Point& aPoint)
+  {
+    MoveBy(aPoint);
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Point& aPoint)
+  {
+    MoveBy(-aPoint);
+    return *static_cast<Sub*>(this);
+  }
+
+  // Find difference as a Margin
+  Margin operator-(const Sub& aRect) const
+  {
+    return Margin(aRect.x - x, aRect.y - y,
+                  XMost() - aRect.XMost(), YMost() - aRect.YMost());
+  }
+
+  // Helpers for accessing the vertices
+  Point TopLeft() const { return Point(x, y); }
+  Point TopRight() const { return Point(XMost(), y); }
+  Point BottomLeft() const { return Point(x, YMost()); }
+  Point BottomRight() const { return Point(XMost(), YMost()); }
+  Point Center() const { return Point(x, y) + Point(width, height)/2; }
+  SizeT Size() const { return SizeT(width, height); }
+
+  // Helper methods for computing the extents
+  T X() const { return x; }
+  T Y() const { return y; }
+  T Width() const { return width; }
+  T Height() const { return height; }
+  T XMost() const { return x + width; }
+  T YMost() const { return y + height; }
+
+  // Scale 'this' by aScale, converting coordinates to integers so that the result is
+  // the smallest integer-coordinate rectangle containing the unrounded result.
+  void ScaleRoundOut(double aScale) { ScaleRoundOut(aScale, aScale); }
+  void ScaleRoundOut(double aXScale, double aYScale)
+  {
+    T right = static_cast<T>(NS_ceil(double(XMost()) * aXScale));
+    T bottom = static_cast<T>(NS_ceil(double(YMost()) * aYScale));
+    x = static_cast<T>(NS_floor(double(x) * aXScale));
+    y = static_cast<T>(NS_floor(double(y) * aYScale));
+    width = right - x;
+    height = bottom - y;
+  }
+
+private:
+  // Do not use the default operator== or operator!= !
+  // Use IsEqualEdges or IsEqualInterior explicitly.
+  bool operator==(const Sub& aRect) const { return false; }
+  bool operator!=(const Sub& aRect) const { return false; }
+};
+
+}
+
+#endif /* MOZILLA_BASERECT_H_ */
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 40d36195ca18..b7b98e72a074 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -64,6 +64,7 @@ EXPORTS_NAMESPACES = mozilla
 EXPORTS_mozilla = \
 	BaseMargin.h \
 	BasePoint.h \
+	BaseRect.h \
 	BaseSize.h \
 	$(NULL)
 
diff --git a/gfx/src/nsRect.cpp b/gfx/src/nsRect.cpp
index 9f298990b6f8..b200ce945c63 100644
--- a/gfx/src/nsRect.cpp
+++ b/gfx/src/nsRect.cpp
@@ -44,167 +44,9 @@
 // the mozilla::css::Side sequence must match the nsMargin nscoord sequence
 PR_STATIC_ASSERT((NS_SIDE_TOP == 0) && (NS_SIDE_RIGHT == 1) && (NS_SIDE_BOTTOM == 2) && (NS_SIDE_LEFT == 3));
 
-
 /* static */
 const nsIntRect nsIntRect::kMaxSizedIntRect(0, 0, INT_MAX, INT_MAX);
 
-// Containment
-PRBool nsRect::Contains(nscoord aX, nscoord aY) const
-{
-  return (PRBool) ((aX >= x) && (aY >= y) &&
-                   (aX < XMost()) && (aY < YMost()));
-}
-
-//Also Returns true if aRect is Empty
-PRBool nsRect::Contains(const nsRect &aRect) const
-{
-  return aRect.IsEmpty() ||
-          ((PRBool) ((aRect.x >= x) && (aRect.y >= y) &&
-                    (aRect.XMost() <= XMost()) && (aRect.YMost() <= YMost())));
-}
-
-// Intersection. Returns TRUE if the receiver overlaps aRect and
-// FALSE otherwise
-PRBool nsRect::Intersects(const nsRect &aRect) const
-{
-  return (PRBool) ((x < aRect.XMost()) && (y < aRect.YMost()) &&
-                   (aRect.x < XMost()) && (aRect.y < YMost()));
-}
-
-// Computes the area in which aRect1 and aRect2 overlap and fills 'this' with
-// the result. Returns FALSE if the rectangles don't intersect.
-PRBool nsRect::IntersectRect(const nsRect &aRect1, const nsRect &aRect2)
-{
-  nscoord  xmost1 = aRect1.XMost();
-  nscoord  ymost1 = aRect1.YMost();
-  nscoord  xmost2 = aRect2.XMost();
-  nscoord  ymost2 = aRect2.YMost();
-  nscoord  temp;
-
-  x = PR_MAX(aRect1.x, aRect2.x);
-  y = PR_MAX(aRect1.y, aRect2.y);
-
-  // Compute the destination width
-  temp = PR_MIN(xmost1, xmost2);
-  if (temp <= x) {
-    width = 0;
-  } else {
-    width = temp - x;
-  }
-
-  // Compute the destination height
-  temp = PR_MIN(ymost1, ymost2);
-  if (temp <= y) {
-    height = 0;
-  } else {
-    height = temp - y;
-  }
-
-  return !IsEmpty();
-}
-
-// Computes the smallest rectangle that contains both aRect1 and aRect2 and
-// fills 'this' with the result. Returns FALSE if both aRect1 and aRect2 are
-// empty and TRUE otherwise
-PRBool nsRect::UnionRect(const nsRect &aRect1, const nsRect &aRect2)
-{
-  PRBool  result = PR_TRUE;
-
-  // Is aRect1 empty?
-  if (aRect1.IsEmpty()) {
-    if (aRect2.IsEmpty()) {
-      // Both rectangles are empty which is an error
-      Empty();
-      result = PR_FALSE;
-    } else {
-      // aRect1 is empty so set the result to aRect2
-      *this = aRect2;
-    }
-  } else if (aRect2.IsEmpty()) {
-    // aRect2 is empty so set the result to aRect1
-    *this = aRect1;
-  } else {
-    UnionRectEdges(aRect1, aRect2);
-  }
-
-  return result;
-}
-
-void nsRect::UnionRectEdges(const nsRect &aRect1, const nsRect &aRect2)
-{
-  nscoord xmost1 = aRect1.XMost();
-  nscoord xmost2 = aRect2.XMost();
-  nscoord ymost1 = aRect1.YMost();
-  nscoord ymost2 = aRect2.YMost();
-
-  // Compute the origin
-  x = PR_MIN(aRect1.x, aRect2.x);
-  y = PR_MIN(aRect1.y, aRect2.y);
-
-  // Compute the size
-  width = PR_MAX(xmost1, xmost2) - x;
-  height = PR_MAX(ymost1, ymost2) - y;
-}
-
-// Inflate the rect by the specified width and height
-void nsRect::Inflate(nscoord aDx, nscoord aDy)
-{
-  x -= aDx;
-  y -= aDy;
-  width += 2 * aDx;
-  height += 2 * aDy;
-}
-
-// Inflate the rect by the specified margin
-void nsRect::Inflate(const nsMargin &aMargin)
-{
-  x -= aMargin.left;
-  y -= aMargin.top;
-  width += aMargin.left + aMargin.right;
-  height += aMargin.top + aMargin.bottom;
-}
-
-// Deflate the rect by the specified width and height
-void nsRect::Deflate(nscoord aDx, nscoord aDy)
-{
-  x += aDx;
-  y += aDy;
-  width = PR_MAX(0, width - 2 * aDx);
-  height = PR_MAX(0, height - 2 * aDy);
-}
-
-// Deflate the rect by the specified margin
-void nsRect::Deflate(const nsMargin &aMargin)
-{
-  x += aMargin.left;
-  y += aMargin.top;
-  width = PR_MAX(0, width - aMargin.LeftRight());
-  height = PR_MAX(0, height - aMargin.TopBottom());
-}
-
-// Find difference between rects as an nsMargin
-nsMargin nsRect::operator-(const nsRect& aRect) const
-{
-  nsMargin margin;
-  margin.left = aRect.x - x;
-  margin.right = XMost() - aRect.XMost();
-  margin.top = aRect.y - y;
-  margin.bottom = YMost() - aRect.YMost();
-  return margin;
-}
-
-// scale the rect but round to smallest containing rect
-nsRect& nsRect::ScaleRoundOut(float aXScale, float aYScale)
-{
-  nscoord right = NSToCoordCeil(float(XMost()) * aXScale);
-  nscoord bottom = NSToCoordCeil(float(YMost()) * aYScale);
-  x = NSToCoordFloor(float(x) * aXScale);
-  y = NSToCoordFloor(float(y) * aYScale);
-  width = (right - x);
-  height = (bottom - y);
-  return *this;
-}
-
 #ifdef DEBUG
 static bool IsFloatInteger(float aFloat)
 {
@@ -259,85 +101,3 @@ FILE* operator<<(FILE* out, const nsRect& rect)
 }
 
 #endif // DEBUG
-
-// Computes the area in which aRect1 and aRect2 overlap and fills 'this' with
-// the result. Returns FALSE if the rectangles don't intersect.
-PRBool nsIntRect::IntersectRect(const nsIntRect &aRect1, const nsIntRect &aRect2)
-{
-  PRInt32  xmost1 = aRect1.XMost();
-  PRInt32  ymost1 = aRect1.YMost();
-  PRInt32  xmost2 = aRect2.XMost();
-  PRInt32  ymost2 = aRect2.YMost();
-  PRInt32  temp;
-
-  x = PR_MAX(aRect1.x, aRect2.x);
-  y = PR_MAX(aRect1.y, aRect2.y);
-
-  // Compute the destination width
-  temp = PR_MIN(xmost1, xmost2);
-  if (temp <= x) {
-    Empty();
-    return PR_FALSE;
-  }
-  width = temp - x;
-
-  // Compute the destination height
-  temp = PR_MIN(ymost1, ymost2);
-  if (temp <= y) {
-    Empty();
-    return PR_FALSE;
-  }
-  height = temp - y;
-
-  return PR_TRUE;
-}
-
-// Computes the smallest rectangle that contains both aRect1 and aRect2 and
-// fills 'this' with the result. Returns FALSE if both aRect1 and aRect2 are
-// empty and TRUE otherwise
-PRBool nsIntRect::UnionRect(const nsIntRect &aRect1, const nsIntRect &aRect2)
-{
-  PRBool  result = PR_TRUE;
-
-  // Is aRect1 empty?
-  if (aRect1.IsEmpty()) {
-    if (aRect2.IsEmpty()) {
-      // Both rectangles are empty which is an error
-      Empty();
-      result = PR_FALSE;
-    } else {
-      // aRect1 is empty so set the result to aRect2
-      *this = aRect2;
-    }
-  } else if (aRect2.IsEmpty()) {
-    // aRect2 is empty so set the result to aRect1
-    *this = aRect1;
-  } else {
-    PRInt32 xmost1 = aRect1.XMost();
-    PRInt32 xmost2 = aRect2.XMost();
-    PRInt32 ymost1 = aRect1.YMost();
-    PRInt32 ymost2 = aRect2.YMost();
-
-    // Compute the origin
-    x = PR_MIN(aRect1.x, aRect2.x);
-    y = PR_MIN(aRect1.y, aRect2.y);
-
-    // Compute the size
-    width = PR_MAX(xmost1, xmost2) - x;
-    height = PR_MAX(ymost1, ymost2) - y;
-  }
-
-  return result;
-}
-
-// scale the rect but round to smallest containing rect
-nsIntRect& nsIntRect::ScaleRoundOut(float aXScale, float aYScale)
-{
-  nscoord right = NSToCoordCeil(float(XMost()) * aXScale);
-  nscoord bottom = NSToCoordCeil(float(YMost()) * aYScale);
-  x = NSToCoordFloor(float(x) * aXScale);
-  y = NSToCoordFloor(float(y) * aYScale);
-  width = (right - x);
-  height = (bottom - y);
-  return *this;
-}
diff --git a/gfx/src/nsRect.h b/gfx/src/nsRect.h
index 21866034d83b..c55576331233 100644
--- a/gfx/src/nsRect.h
+++ b/gfx/src/nsRect.h
@@ -46,30 +46,33 @@
 #include "nsMargin.h"
 #include "gfxCore.h"
 #include "nsTraceRefcnt.h"
+#include "mozilla/BaseRect.h"
 
 struct nsIntRect;
 
-struct NS_GFX nsRect {
-  nscoord x, y;
-  nscoord width, height;
+struct NS_GFX nsRect :
+  public mozilla::BaseRect<nscoord, nsRect, nsPoint, nsSize, nsMargin> {
+  typedef mozilla::BaseRect<nscoord, nsRect, nsPoint, nsSize, nsMargin> Super;
+
+  static void VERIFY_COORD(nscoord aValue) { ::VERIFY_COORD(aValue); }
 
   // Constructors
-  nsRect() : x(0), y(0), width(0), height(0) {
+  nsRect() : Super()
+  {
     MOZ_COUNT_CTOR(nsRect);
   }
-  nsRect(const nsRect& aRect) {
+  nsRect(const nsRect& aRect) : Super(aRect)
+  {
     MOZ_COUNT_CTOR(nsRect);
-    *this = aRect;
   }
-  nsRect(const nsPoint& aOrigin, const nsSize &aSize) {
+  nsRect(const nsPoint& aOrigin, const nsSize &aSize) : Super(aOrigin, aSize)
+  {
     MOZ_COUNT_CTOR(nsRect);
-    x = aOrigin.x; y = aOrigin.y;
-    width = aSize.width; height = aSize.height;
   }
-  nsRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) {
+  nsRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) :
+      Super(aX, aY, aWidth, aHeight)
+  {
     MOZ_COUNT_CTOR(nsRect);
-    x = aX; y = aY; width = aWidth; height = aHeight;
-    VERIFY_COORD(x); VERIFY_COORD(y); VERIFY_COORD(width); VERIFY_COORD(height);
   }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
@@ -77,114 +80,8 @@ struct NS_GFX nsRect {
     MOZ_COUNT_DTOR(nsRect);
   }
 #endif
-  
-  // Emptiness. An empty rect is one that has no area, i.e. its height or width
-  // is <= 0
-  PRBool IsEmpty() const {
-    return (PRBool) ((height <= 0) || (width <= 0));
-  }
-  void SetEmpty() {width = height = 0;}
 
-  // Returns true if this rectangle contains the interior of aRect. Always
-  // returns true if aRect is empty, and always returns false is aRect is
-  // nonempty but this rect is empty.
-  PRBool Contains(const nsRect& aRect) const;
-  // Returns true if this rectangle contains the given point; if the point
-  // is on the edge of the rectangle, this returns true.
-  PRBool Contains(nscoord aX, nscoord aY) const;
-  PRBool Contains(const nsPoint& aPoint) const {return Contains(aPoint.x, aPoint.y);}
-
-  // Intersection. Returns TRUE if the receiver's area has non-empty
-  // intersection with aRect's area, and FALSE otherwise.
-  // Always returns false if aRect is empty or 'this' is empty.
-  PRBool Intersects(const nsRect& aRect) const;
-
-  // Sets 'this' to be a rectangle containing the intersection of the points
-  // (including edges) of aRect1 and aRect2, or 0,0,0,0 if that intersection is
-  // empty. Returns false if the resulting rectangle is empty.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  PRBool IntersectRect(const nsRect& aRect1, const nsRect& aRect2);
-
-  // Computes the smallest rectangle that contains both the area of both
-  // aRect1 and aRect2, and fills 'this' with the result.
-  // Thus, empty input rectangles are ignored.
-  // Returns FALSE and sets 'this' rect to be an empty rect if both aRect1
-  // and aRect2 are empty.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  PRBool UnionRect(const nsRect& aRect1, const nsRect& aRect2);
-
-  // Computes the smallest rectangle that contains both the points (including
-  // edges) of both aRect1 and aRect2.
-  // Thus, empty input rectangles are allowed to affect the result.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  void UnionRectEdges(const nsRect& aRect1, const nsRect& aRect2);
-
-  // Accessors
-  void SetRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) {
-    x = aX; y = aY; width = aWidth; height = aHeight;
-  }
-  void SetRect(const nsPoint& aPt, const nsSize& aSize) {
-    SetRect(aPt.x, aPt.y, aSize.width, aSize.height);
-  }
-  void MoveTo(nscoord aX, nscoord aY) {x = aX; y = aY;}
-  void MoveTo(const nsPoint& aPoint) {x = aPoint.x; y = aPoint.y;}
-  void MoveBy(nscoord aDx, nscoord aDy) {x += aDx; y += aDy;}
-  void MoveBy(const nsPoint& aPoint) {x += aPoint.x; y += aPoint.y;}
-  void SizeTo(nscoord aWidth, nscoord aHeight) {width = aWidth; height = aHeight;}
-  void SizeTo(const nsSize& aSize) {SizeTo(aSize.width, aSize.height);}
-  void SizeBy(nscoord aDeltaWidth, nscoord aDeltaHeight) {width += aDeltaWidth;
-                                                          height += aDeltaHeight;}
-
-  // Inflate the rect by the specified width/height or margin
-  void Inflate(nscoord aDx, nscoord aDy);
-  void Inflate(const nsSize& aSize) {Inflate(aSize.width, aSize.height);}
-  void Inflate(const nsMargin& aMargin);
-
-  // Deflate the rect by the specified width/height or margin
-  void Deflate(nscoord aDx, nscoord aDy);
-  void Deflate(const nsSize& aSize) {Deflate(aSize.width, aSize.height);}
-  void Deflate(const nsMargin& aMargin);
-
-  // Return true if the rectangles contain the same set of points, including
-  // points on the edges.
-  // Use when we care about the exact x/y/width/height values being
-  // equal (i.e. we care about differences in empty rectangles).
-  PRBool IsEqualEdges(const nsRect& aRect) const {
-    return x == aRect.x && y == aRect.y &&
-           width == aRect.width && height == aRect.height;
-  }
-  // Return true if the rectangles contain the same area of the plane.
-  // Use when we do not care about differences in empty rectangles.
-  PRBool IsEqualInterior(const nsRect& aRect) const {
-    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
-  }
-
-  // Arithmetic with nsPoints
-  nsRect  operator+(const nsPoint& aPoint) const {
-    return nsRect(x + aPoint.x, y + aPoint.y, width, height);
-  }
-  nsRect  operator-(const nsPoint& aPoint) const {
-    return nsRect(x - aPoint.x, y - aPoint.y, width, height);
-  }
-  nsRect& operator+=(const nsPoint& aPoint) {x += aPoint.x; y += aPoint.y; return *this;}
-  nsRect& operator-=(const nsPoint& aPoint) {x -= aPoint.x; y -= aPoint.y; return *this;}
-
-  // Arithmetic with nsMargins
-  nsMargin operator-(const nsRect& aRect) const; // Find difference as nsMargin
-  nsRect& operator+=(const nsMargin& aMargin) { Inflate(aMargin); return *this; }
-  nsRect& operator-=(const nsMargin& aMargin) { Deflate(aMargin); return *this; }
-  nsRect  operator+(const nsMargin& aMargin) const { return nsRect(*this) += aMargin; }
-  nsRect  operator-(const nsMargin& aMargin) const { return nsRect(*this) -= aMargin; }
-
-  // Scale by aScale, converting coordinates to integers so that the result is
-  // the smallest integer-coordinate rectangle containing the unrounded result.
-  nsRect& ScaleRoundOut(float aScale) { return ScaleRoundOut(aScale, aScale); }
-  nsRect& ScaleRoundOut(float aXScale, float aYScale);
-
-  // Extend the rect outwards such that the edges are on integer boundaries
+  // Extend the rect outwards such that the edges are on integer boundaries
   // and the edges scaled by aXMult/aYMult are also on integer boundaries.
   // aXMult/aYMult must be N or 1/N for integer N.
   nsRect& ExtendForScaling(float aXMult, float aYMult);
@@ -196,169 +93,42 @@ struct NS_GFX nsRect {
   inline nsRect ConvertAppUnitsRoundOut(PRInt32 aFromAPP, PRInt32 aToAPP) const;
   inline nsRect ConvertAppUnitsRoundIn(PRInt32 aFromAPP, PRInt32 aToAPP) const;
 
-  // Helpers for accessing the vertices
-  nsPoint TopLeft() const { return nsPoint(x, y); }
-  nsPoint TopRight() const { return nsPoint(XMost(), y); }
-  nsPoint BottomLeft() const { return nsPoint(x, YMost()); }
-  nsPoint BottomRight() const { return nsPoint(XMost(), YMost()); }
-
-  nsSize Size() const { return nsSize(width, height); }
-
-  // Helper methods for computing the extents
-  nscoord XMost() const {return x + width;}
-  nscoord YMost() const {return y + height;}
-
   inline nsIntRect ToNearestPixels(nscoord aAppUnitsPerPixel) const;
   inline nsIntRect ToOutsidePixels(nscoord aAppUnitsPerPixel) const;
   inline nsIntRect ToInsidePixels(nscoord aAppUnitsPerPixel) const;
 };
 
-struct NS_GFX nsIntRect {
-  PRInt32 x, y;
-  PRInt32 width, height;
+struct NS_GFX nsIntRect :
+  public mozilla::BaseRect<PRInt32, nsIntRect, nsIntPoint, nsIntSize, nsIntMargin> {
+  typedef mozilla::BaseRect<PRInt32, nsIntRect, nsIntPoint, nsIntSize, nsIntMargin> Super;
 
   // Constructors
-  nsIntRect() : x(0), y(0), width(0), height(0) {}
-  nsIntRect(const nsIntRect& aRect) {*this = aRect;}
-  nsIntRect(const nsIntPoint& aOrigin, const nsIntSize &aSize) {
-    x = aOrigin.x; y = aOrigin.y;
-    width = aSize.width; height = aSize.height;
-  }
-  nsIntRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight) {
-    x = aX; y = aY; width = aWidth; height = aHeight;
-  }
-
-  // Emptiness. An empty rect is one that has no area, i.e. its height or width
-  // is <= 0
-  PRBool IsEmpty() const {
-    return (PRBool) ((height <= 0) || (width <= 0));
-  }
-  void Empty() {width = height = 0;}
-
-  // Inflate the rect by the specified width/height or margin
-  void Inflate(PRInt32 aDx, PRInt32 aDy) {
-    x -= aDx;
-    y -= aDy;
-    width += aDx*2;
-    height += aDy*2;
-  }
-  void Inflate(const nsIntMargin &aMargin) {
-    x -= aMargin.left;
-    y -= aMargin.top;
-    width += aMargin.left + aMargin.right;
-    height += aMargin.top + aMargin.bottom;
-  }
-
-  // Deflate the rect by the specified width/height or margin
-  void Deflate(PRInt32 aDx, PRInt32 aDy) {
-    x += aDx;
-    y += aDy;
-    width -= aDx*2;
-    height -= aDy*2;
-  }
-  void Deflate(const nsIntMargin &aMargin) {
-    x += aMargin.left;
-    y += aMargin.top;
-    width -= (aMargin.left + aMargin.right);
-    height -= (aMargin.top + aMargin.bottom);
-  }
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator.
-  PRBool operator==(const nsIntRect& aRect) const {
-    return IsEqualEdges(aRect);
-  }
-
-  // Return true if the rectangles contain the same set of points, including
-  // points on the edges.
-  // Use when we care about the exact x/y/width/height values being
-  // equal (i.e. we care about differences in empty rectangles).
-  PRBool IsEqualEdges(const nsIntRect& aRect) const {
-    return x == aRect.x && y == aRect.y &&
-           width == aRect.width && height == aRect.height;
-  }
-  // Return true if the rectangles contain the same area of the plane.
-  // Use when we do not care about differences in empty rectangles.
-  PRBool IsEqualInterior(const nsIntRect& aRect) const {
-    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
-  }
-
-  nsIntRect  operator+(const nsIntPoint& aPoint) const {
-    return nsIntRect(x + aPoint.x, y + aPoint.y, width, height);
-  }
-  nsIntRect  operator-(const nsIntPoint& aPoint) const {
-    return nsIntRect(x - aPoint.x, y - aPoint.y, width, height);
-  }
-  nsIntRect& operator+=(const nsIntPoint& aPoint) {x += aPoint.x; y += aPoint.y; return *this;}
-  nsIntRect& operator-=(const nsIntPoint& aPoint) {x -= aPoint.x; y -= aPoint.y; return *this;}
-
-  void SetRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight) {
-    x = aX; y = aY; width = aWidth; height = aHeight;
-  }
-
-  void MoveTo(PRInt32 aX, PRInt32 aY) {x = aX; y = aY;}
-  void MoveTo(const nsIntPoint& aPoint) {x = aPoint.x; y = aPoint.y;}
-  void MoveBy(PRInt32 aDx, PRInt32 aDy) {x += aDx; y += aDy;}
-  void MoveBy(const nsIntPoint& aPoint) {x += aPoint.x; y += aPoint.y;}
-  void SizeTo(PRInt32 aWidth, PRInt32 aHeight) {width = aWidth; height = aHeight;}
-  void SizeTo(const nsIntSize& aSize) {SizeTo(aSize.width, aSize.height);}
-  void SizeBy(PRInt32 aDeltaWidth, PRInt32 aDeltaHeight) {width += aDeltaWidth;
-                                                          height += aDeltaHeight;}
-
-  PRBool Contains(const nsIntRect& aRect) const
+  nsIntRect() : Super()
   {
-    return aRect.IsEmpty() ||
-        (PRBool) ((aRect.x >= x) && (aRect.y >= y) &&
-                  (aRect.XMost() <= XMost()) && (aRect.YMost() <= YMost()));
   }
-  PRBool Contains(PRInt32 aX, PRInt32 aY) const
+  nsIntRect(const nsIntRect& aRect) : Super(aRect)
   {
-    return (PRBool) ((aX >= x) && (aY >= y) &&
-                     (aX < XMost()) && (aY < YMost()));
   }
-  PRBool Contains(const nsIntPoint& aPoint) const { return Contains(aPoint.x, aPoint.y); }
-
-  // Intersection. Returns TRUE if the receiver overlaps aRect and
-  // FALSE otherwise
-  PRBool Intersects(const nsIntRect& aRect) const {
-    return (PRBool) ((x < aRect.XMost()) && (y < aRect.YMost()) &&
-                     (aRect.x < XMost()) && (aRect.y < YMost()));
+  nsIntRect(const nsIntPoint& aOrigin, const nsIntSize &aSize) : Super(aOrigin, aSize)
+  {
+  }
+  nsIntRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight) :
+      Super(aX, aY, aWidth, aHeight)
+  {
   }
-
-  // Computes the area in which aRect1 and aRect2 overlap, and fills 'this' with
-  // the result. Returns FALSE if the rectangles don't intersect, and sets 'this'
-  // rect to be an empty rect.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  PRBool IntersectRect(const nsIntRect& aRect1, const nsIntRect& aRect2);
-
-  // Computes the smallest rectangle that contains both aRect1 and aRect2 and
-  // fills 'this' with the result. Returns FALSE and sets 'this' rect to be an
-  // empty rect if both aRect1 and aRect2 are empty
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  PRBool UnionRect(const nsIntRect& aRect1, const nsIntRect& aRect2);
-
-  // Helpers for accessing the vertices
-  nsIntPoint TopLeft() const { return nsIntPoint(x, y); }
-  nsIntPoint TopRight() const { return nsIntPoint(XMost(), y); }
-  nsIntPoint BottomLeft() const { return nsIntPoint(x, YMost()); }
-  nsIntPoint BottomRight() const { return nsIntPoint(XMost(), YMost()); }
-
-  nsIntSize Size() const { return nsIntSize(width, height); }
-
-  // Helper methods for computing the extents
-  PRInt32 XMost() const {return x + width;}
-  PRInt32 YMost() const {return y + height;}
 
   inline nsRect ToAppUnits(nscoord aAppUnitsPerPixel) const;
 
-  nsIntRect& ScaleRoundOut(float aXScale, float aYScale);
-
   // Returns a special nsIntRect that's used in some places to signify
   // "all available space".
   static const nsIntRect& GetMaxSizedIntRect() { return kMaxSizedIntRect; }
 
+  // This is here only to keep IPDL-generated code happy. DO NOT USE.
+  bool operator==(const nsIntRect& aRect) const
+  {
+    return IsEqualEdges(aRect);
+  }
+
 protected:
   static const nsIntRect kMaxSizedIntRect;
 };
diff --git a/gfx/thebes/gfxRect.cpp b/gfx/thebes/gfxRect.cpp
index 42bee2032c10..210c1e67dda1 100644
--- a/gfx/thebes/gfxRect.cpp
+++ b/gfx/thebes/gfxRect.cpp
@@ -39,54 +39,6 @@
 
 #include "nsMathUtils.h"
 
-gfxRect
-gfxRect::Intersect(const gfxRect& aRect) const
-{
-  gfxRect result(0,0,0,0);
-
-  gfxFloat x = PR_MAX(aRect.X(), X());
-  gfxFloat xmost = PR_MIN(aRect.XMost(), XMost());
-  if (x >= xmost)
-    return result;
-
-  gfxFloat y = PR_MAX(aRect.Y(), Y());
-  gfxFloat ymost = PR_MIN(aRect.YMost(), YMost());
-  if (y >= ymost)
-    return result;
-
-  result = gfxRect(x, y, xmost - x, ymost - y);
-  return result;
-}
-
-gfxRect
-gfxRect::Union(const gfxRect& aRect) const
-{
-  if (IsEmpty())
-    return aRect;
-  if (aRect.IsEmpty())
-    return *this;
-
-  gfxFloat x = PR_MIN(aRect.X(), X());
-  gfxFloat xmost = PR_MAX(aRect.XMost(), XMost());
-  gfxFloat y = PR_MIN(aRect.Y(), Y());
-  gfxFloat ymost = PR_MAX(aRect.YMost(), YMost());
-  return gfxRect(x, y, xmost - x, ymost - y);
-}
-
-PRBool
-gfxRect::Contains(const gfxRect& aRect) const
-{
-  return aRect.X() >= X() && aRect.XMost() <= XMost() &&
-         aRect.Y() >= Y() && aRect.YMost() <= YMost();
-}
-
-PRBool
-gfxRect::Contains(const gfxPoint& aPoint) const
-{
-  return aPoint.x >= X() && aPoint.x <= XMost() &&
-         aPoint.y >= Y() && aPoint.y <= YMost();
-}
-
 static PRBool
 WithinEpsilonOfInteger(gfxFloat aX, gfxFloat aEpsilon)
 {
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index 64647e45e1f2..a7b5e9f39aa5 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -41,7 +41,19 @@
 #include "gfxTypes.h"
 #include "gfxPoint.h"
 #include "gfxCore.h"
-#include "nsDebug.h" 
+#include "nsDebug.h"
+#include "mozilla/BaseMargin.h"
+#include "mozilla/BaseRect.h"
+
+struct gfxMargin : public mozilla::BaseMargin<gfxFloat, gfxMargin> {
+  typedef mozilla::BaseMargin<gfxFloat, gfxMargin> Super;
+
+  // Constructors
+  gfxMargin() : Super() {}
+  gfxMargin(const gfxMargin& aMargin) : Super(aMargin) {}
+  gfxMargin(gfxFloat aLeft,  gfxFloat aTop, gfxFloat aRight, gfxFloat aBottom)
+    : Super(aLeft, aTop, aRight, aBottom) {}
+};
 
 namespace mozilla {
     namespace css {
@@ -73,77 +85,15 @@ static inline mozilla::css::Corner operator++(mozilla::css::Corner& corner, int)
     return corner;
 }
 
-struct THEBES_API gfxRect
-{
-    gfxFloat x, y;
-    gfxFloat width, height;
+struct THEBES_API gfxRect :
+    public mozilla::BaseRect<gfxFloat, gfxRect, gfxPoint, gfxSize, gfxMargin> {
+    typedef mozilla::BaseRect<gfxFloat, gfxRect, gfxPoint, gfxSize, gfxMargin> Super;
 
-    gfxRect() {}
-    gfxRect(const gfxPoint& _pos, const gfxSize& _size) :
-        x(_pos.x), y(_pos.y), width(_size.width), height(_size.height) {}
-    gfxRect(gfxFloat _x, gfxFloat _y, gfxFloat _width, gfxFloat _height) :
-        x(_x), y(_y), width(_width), height(_height) {}
-
-    int operator==(const gfxRect& s) const {
-        return x == s.x && y == s.y && width == s.width && height == s.height;
-    }
-    PRBool IsEqualEdges(const gfxRect& aRect) const {
-      return x == aRect.x && y == aRect.y &&
-             width == aRect.width && height == aRect.height;
-    }
-    // Return true if the rectangles contain the same area of the plane.
-    // Use when we do not care about differences in empty rectangles.
-    PRBool IsEqualInterior(const gfxRect& aRect) const {
-      return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
-    }
-
-    void MoveTo(const gfxPoint& aPt) { x = aPt.x; y = aPt.y; }
-    const gfxRect& MoveBy(const gfxPoint& aPt) {
-        x += aPt.x;
-        y += aPt.y;
-        return *this;
-    }
-    void SizeTo(const gfxSize& aSize) { width = aSize.width; height = aSize.height; }
-
-    gfxRect operator+(const gfxPoint& aPt) const {
-        return gfxRect(x + aPt.x, y + aPt.y, width, height);
-    }
-    gfxRect operator-(const gfxPoint& aPt) const {
-        return gfxRect(x - aPt.x, y - aPt.y, width, height);
-    }
-    gfxRect operator+(const gfxSize& aSize) const {
-        return gfxRect(x + aSize.width, y + aSize.height, width, height);
-    }
-    gfxRect operator-(const gfxSize& aSize) const {
-        return gfxRect(x - aSize.width, y - aSize.height, width, height);
-    }
-    gfxRect operator*(const gfxFloat aScale) const {
-        return gfxRect(x * aScale, y * aScale, width * aScale, height * aScale);
-    }
-
-    const gfxRect& operator+=(const gfxPoint& aPt) {
-        x += aPt.x;
-        y += aPt.y;
-        return *this;
-    }
-    const gfxRect& operator-=(const gfxPoint& aPt) {
-        x -= aPt.x;
-        y -= aPt.y;
-        return *this;
-    }
-
-    gfxFloat Width() const { return width; }
-    gfxFloat Height() const { return height; }
-    gfxFloat X() const { return x; }
-    gfxFloat Y() const { return y; }
-    gfxFloat XMost() const { return x + width; }
-    gfxFloat YMost() const { return y + height; }
-
-    PRBool IsEmpty() const { return width <= 0 || height <= 0; }
-    gfxRect Intersect(const gfxRect& aRect) const;
-    gfxRect Union(const gfxRect& aRect) const;
-    PRBool Contains(const gfxRect& aRect) const;
-    PRBool Contains(const gfxPoint& aPoint) const;
+    gfxRect() : Super() {}
+    gfxRect(const gfxPoint& aPos, const gfxSize& aSize) :
+        Super(aPos, aSize) {}
+    gfxRect(gfxFloat aX, gfxFloat aY, gfxFloat aWidth, gfxFloat aHeight) :
+        Super(aX, aY, aWidth, aHeight) {}
 
     /**
      * Return true if all components of this rect are within
@@ -153,20 +103,12 @@ struct THEBES_API gfxRect
      */
     PRBool WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const;
 
-    gfxSize Size() const { return gfxSize(width, height); }
-
     void Inset(gfxFloat k) {
-        x += k;
-        y += k;
-        width = PR_MAX(0.0, width - k * 2.0);
-        height = PR_MAX(0.0, height - k * 2.0);
+        Deflate(k, k);
     }
 
     void Inset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        x += left;
-        y += top;
-        width = PR_MAX(0.0, width - (right+left));
-        height = PR_MAX(0.0, height - (bottom+top));
+        Deflate(gfxMargin(left, top, right, bottom));
     }
 
     void Inset(const gfxFloat *sides) {
@@ -174,25 +116,15 @@ struct THEBES_API gfxRect
     }
 
     void Inset(const gfxIntSize& aSize) {
-        Inset(aSize.height, aSize.width, aSize.height, aSize.width);
+        Deflate(aSize.width, aSize.height);
     }
 
     void Outset(gfxFloat k) {
-        x -= k;
-        y -= k;
-        width = PR_MAX(0.0, width + k * 2.0);
-        height = PR_MAX(0.0, height + k * 2.0);
+        Inflate(k, k);
     }
 
     void Outset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        x -= left;
-        y -= top;
-        width = PR_MAX(0.0, width + (right+left));
-        height = PR_MAX(0.0, height + (bottom+top));
-    }
-
-    void Outset(const gfxFloat *sides) {
-        Outset(sides[0], sides[1], sides[2], sides[3]);
+        Inflate(gfxMargin(left, top, right, bottom));
     }
 
     void Outset(const gfxIntSize& aSize) {
@@ -220,13 +152,6 @@ struct THEBES_API gfxRect
     // resulting rectangle contains the original rectangle.
     void RoundOut();
 
-    // grabbing specific points
-    gfxPoint TopLeft() const { return gfxPoint(x, y); }
-    gfxPoint TopRight() const { return gfxPoint(x, y) + gfxPoint(width, 0.0); }
-    gfxPoint BottomLeft() const { return gfxPoint(x, y) + gfxPoint(0.0, height); }
-    gfxPoint BottomRight() const { return gfxPoint(x, y) + gfxPoint(width, height); }
-    gfxPoint Center() const { return gfxPoint(x, y) + gfxPoint(width, height)/2.0; }
-
     gfxPoint AtCorner(mozilla::css::Corner corner) const {
         switch (corner) {
             case NS_CORNER_TOP_LEFT: return TopLeft();
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 958be61583a2..8f939f85a6c0 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1009,10 +1009,8 @@ nsRect
 nsLayoutUtils::RoundGfxRectToAppRect(const gfxRect &aRect, float aFactor)
 {
   /* Get a new gfxRect whose units are app units by scaling by the specified factor. */
-  gfxRect scaledRect = aRect * aFactor;
-
-  /* Round outward. */
-  scaledRect.RoundOut();
+  gfxRect scaledRect = aRect;
+  scaledRect.ScaleRoundOut(aFactor);
 
   /* We now need to constrain our results to the max and min values for coords. */
   ConstrainToCoordValues(scaledRect.x);
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 27e58cd4d6e3..8a0f0811683a 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1746,7 +1746,7 @@ nsObjectFrame::PrintPlugin(nsRenderingContext& aRenderingContext,
   window.clipRect.bottom = window.height;
   window.type = NPWindowTypeDrawable;
 
-  Rect gwBounds;
+  ::Rect gwBounds;
   ::SetRect(&gwBounds, 0, 0, window.width, window.height);
 
   nsTArray<char> buffer(window.width * window.height * 4);
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 419ab7ce5aee..8c9712b3b75a 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1356,7 +1356,7 @@ nsMenuPopupFrame::GetConstraintRect(const nsRect& aAnchorRect,
   }
 
   // keep a 3 pixel margin to the right and bottom of the screen for the WinXP dropshadow
-  screenRectPixels.SizeBy(-3, -3);
+  screenRectPixels.SizeTo(screenRectPixels.width - 3, screenRectPixels.height - 3);
 
   nsRect screenRect = screenRectPixels.ToAppUnits(presContext->AppUnitsPerDevPixel());
   if (mInContentShell) {
diff --git a/layout/xul/base/src/nsResizerFrame.cpp b/layout/xul/base/src/nsResizerFrame.cpp
index f77978ac7a5e..5ac7bcb5157e 100644
--- a/layout/xul/base/src/nsResizerFrame.cpp
+++ b/layout/xul/base/src/nsResizerFrame.cpp
@@ -112,9 +112,9 @@ nsResizerFrame::HandleEvent(nsPresContext* aPresContext,
           nsRect rect = frameToResize->GetScreenRectInAppUnits();
           switch (frameToResize->GetStylePosition()->mBoxSizing) {
             case NS_STYLE_BOX_SIZING_CONTENT:
-              rect -= frameToResize->GetUsedPadding();
+              rect.Deflate(frameToResize->GetUsedPadding());
             case NS_STYLE_BOX_SIZING_PADDING:
-              rect -= frameToResize->GetUsedBorder();
+              rect.Deflate(frameToResize->GetUsedBorder());
             default:
               break;
           }

From 92fcae3d0b1ba16c8c5b19591338cddf06a0106f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 19 Apr 2011 15:07:51 +1200
Subject: [PATCH 310/509] Bug 641426. Part 8: Replace gfxRect::Outset/Inset
 with Inflate/Deflate. Also slip in a conversion constructor from nsIntRect to
 gfxRect. r=tnikkel

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  5 ++-
 gfx/src/BaseRect.h                            |  4 +++
 gfx/thebes/gfxBlur.cpp                        |  6 ++--
 gfx/thebes/gfxRect.h                          | 31 ++----------------
 gfx/thebes/gfxUtils.cpp                       |  2 +-
 gfx/thebes/gfxXlibNativeRenderer.cpp          |  4 +--
 layout/base/nsCSSRendering.cpp                | 11 ++++---
 layout/base/nsCSSRenderingBorders.cpp         | 32 ++++++++++---------
 layout/mathml/nsMathMLmencloseFrame.cpp       |  2 +-
 layout/svg/base/src/nsSVGUtils.cpp            |  2 +-
 10 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 8e757c48e797..1c69271fc1be 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -1792,8 +1792,7 @@ nsCanvasRenderingContext2D::ShadowInitialize(const gfxRect& extents, gfxAlphaBox
     mThebes->SetMatrix(matrix);
     // outset by the blur radius so that blurs can leak onto the canvas even
     // when the shape is outside the clipping area
-    clipExtents.Outset(blurRadius.height, blurRadius.width,
-                       blurRadius.height, blurRadius.width);
+    clipExtents.Inflate(blurRadius.width, blurRadius.height);
     drawExtents = drawExtents.Intersect(clipExtents - CurrentState().shadowOffset);
 
     gfxContext* ctx = blur.Init(drawExtents, gfxIntSize(0,0), blurRadius, nsnull, nsnull);
@@ -2795,7 +2794,7 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
 
     if (doDrawShadow) {
         // for some reason the box is too tight, probably rounding error
-        processor.mBoundingBox.Outset(2.0);
+        processor.mBoundingBox.Inflate(2.0);
 
         // this is unnecessarily big is max-width scaling is involved, but it
         // will still produce correct output
diff --git a/gfx/src/BaseRect.h b/gfx/src/BaseRect.h
index 425168787320..09f9cdc9b4ce 100644
--- a/gfx/src/BaseRect.h
+++ b/gfx/src/BaseRect.h
@@ -201,6 +201,7 @@ struct BaseRect {
   void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
   void SizeTo(const SizeT& aSize) { width = aSize.width; height = aSize.height; }
 
+  void Inflate(T aD) { Inflate(aD, aD); }
   void Inflate(T aDx, T aDy)
   {
     x -= aDx;
@@ -215,7 +216,9 @@ struct BaseRect {
     width += aMargin.LeftRight();
     height += aMargin.TopBottom();
   }
+  void Inflate(const SizeT& aSize) { Inflate(aSize.width, aSize.height); }
 
+  void Deflate(T aD) { Deflate(aD, aD); }
   void Deflate(T aDx, T aDy)
   {
     x += aDx;
@@ -230,6 +233,7 @@ struct BaseRect {
     width = NS_MAX(T(0), width - aMargin.LeftRight());
     height = NS_MAX(T(0), height - aMargin.TopBottom());
   }
+  void Deflate(const SizeT& aSize) { Deflate(aSize.width, aSize.height); }
 
   // Return true if the rectangles contain the same set of points, including
   // points on the edges.
diff --git a/gfx/thebes/gfxBlur.cpp b/gfx/thebes/gfxBlur.cpp
index 952fd1e6e1e1..613c6957e3e5 100644
--- a/gfx/thebes/gfxBlur.cpp
+++ b/gfx/thebes/gfxBlur.cpp
@@ -63,7 +63,7 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
     mBlurRadius = aBlurRadius;
 
     gfxRect rect(aRect);
-    rect.Outset(aBlurRadius + aSpreadRadius);
+    rect.Inflate(aBlurRadius + aSpreadRadius);
     rect.RoundOut();
 
     if (aDirtyRect) {
@@ -72,7 +72,7 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
         mHasDirtyRect = PR_TRUE;
         mDirtyRect = *aDirtyRect;
         gfxRect requiredBlurArea = mDirtyRect.Intersect(rect);
-        requiredBlurArea.Outset(aBlurRadius + aSpreadRadius);
+        requiredBlurArea.Inflate(aBlurRadius + aSpreadRadius);
         rect = requiredBlurArea.Intersect(rect);
     } else {
         mHasDirtyRect = PR_FALSE;
@@ -90,7 +90,7 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
         // expensive int<->float conversions if we were to use gfxRect instead.
         gfxRect skipRect = *aSkipRect;
         skipRect.RoundIn();
-        skipRect.Inset(aBlurRadius + aSpreadRadius);
+        skipRect.Deflate(aBlurRadius + aSpreadRadius);
         gfxUtils::GfxRectToIntRect(skipRect, &mSkipRect);
         nsIntRect shadowIntRect;
         gfxUtils::GfxRectToIntRect(rect, &shadowIntRect);
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index a7b5e9f39aa5..ed376e41a39d 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -44,6 +44,7 @@
 #include "nsDebug.h"
 #include "mozilla/BaseMargin.h"
 #include "mozilla/BaseRect.h"
+#include "nsRect.h"
 
 struct gfxMargin : public mozilla::BaseMargin<gfxFloat, gfxMargin> {
   typedef mozilla::BaseMargin<gfxFloat, gfxMargin> Super;
@@ -94,6 +95,8 @@ struct THEBES_API gfxRect :
         Super(aPos, aSize) {}
     gfxRect(gfxFloat aX, gfxFloat aY, gfxFloat aWidth, gfxFloat aHeight) :
         Super(aX, aY, aWidth, aHeight) {}
+    gfxRect(const nsIntRect& aRect) :
+        Super(aRect.x, aRect.y, aRect.width, aRect.height) {}
 
     /**
      * Return true if all components of this rect are within
@@ -103,34 +106,6 @@ struct THEBES_API gfxRect :
      */
     PRBool WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const;
 
-    void Inset(gfxFloat k) {
-        Deflate(k, k);
-    }
-
-    void Inset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        Deflate(gfxMargin(left, top, right, bottom));
-    }
-
-    void Inset(const gfxFloat *sides) {
-        Inset(sides[0], sides[1], sides[2], sides[3]);
-    }
-
-    void Inset(const gfxIntSize& aSize) {
-        Deflate(aSize.width, aSize.height);
-    }
-
-    void Outset(gfxFloat k) {
-        Inflate(k, k);
-    }
-
-    void Outset(gfxFloat top, gfxFloat right, gfxFloat bottom, gfxFloat left) {
-        Inflate(gfxMargin(left, top, right, bottom));
-    }
-
-    void Outset(const gfxIntSize& aSize) {
-        Outset(aSize.height, aSize.width, aSize.height, aSize.width);
-    }
-
     // Round the rectangle edges to integer coordinates, such that the rounded
     // rectangle has the same set of pixel centers as the original rectangle.
     // Edges at offset 0.5 round up.
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index 2daf7e49ef8d..74e5b27e97c9 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -251,7 +251,7 @@ CreateSamplingRestrictedDrawable(gfxDrawable* aDrawable,
         aUserSpaceToImageSpace.TransformBounds(userSpaceClipExtents);
     // Inflate by one pixel because bilinear filtering will sample at most
     // one pixel beyond the computed image pixel coordinate.
-    imageSpaceClipExtents.Outset(1.0);
+    imageSpaceClipExtents.Inflate(1.0);
 
     gfxRect needed = imageSpaceClipExtents.Intersect(aSourceRect);
     needed = needed.Intersect(aSubimage);
diff --git a/gfx/thebes/gfxXlibNativeRenderer.cpp b/gfx/thebes/gfxXlibNativeRenderer.cpp
index b7dfcbab5de7..d6bc3230b087 100644
--- a/gfx/thebes/gfxXlibNativeRenderer.cpp
+++ b/gfx/thebes/gfxXlibNativeRenderer.cpp
@@ -502,7 +502,7 @@ gfxXlibNativeRenderer::Draw(gfxContext* ctx, nsIntSize size,
     if (!matrixIsIntegerTranslation) {
         // The filter footprint means that the affected rectangle is a
         // little larger than the drawingRect;
-        affectedRect.Outset(filterRadius);
+        affectedRect.Inflate(filterRadius);
 
         NATIVE_DRAWING_NOTE("FALLBACK: matrix not integer translation");
     } else if (!canDrawOverBackground) {
@@ -531,7 +531,7 @@ gfxXlibNativeRenderer::Draw(gfxContext* ctx, nsIntSize size,
     if (!matrixIsIntegerTranslation) {
         // The source surface may need to be a little larger than the clip
         // extents due to the filter footprint.
-        clipExtents.Outset(filterRadius);
+        clipExtents.Inflate(filterRadius);
     }
     clipExtents.RoundOut();
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 621b4060b890..1329ba78d9bf 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1127,9 +1127,9 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
       aForFrame->GetPaddingRect() - aForFrame->GetPosition() + aFrameArea.TopLeft();
     skipGfxRect = nsLayoutUtils::RectToGfxRect(paddingRect, twipsPerPixel);
   } else if (hasBorderRadius) {
-    skipGfxRect.Inset(
-        PR_MAX(borderRadii[C_TL].height, borderRadii[C_TR].height), 0,
-        PR_MAX(borderRadii[C_BL].height, borderRadii[C_BR].height), 0);
+    skipGfxRect.Deflate(gfxMargin(
+        0, PR_MAX(borderRadii[C_TL].height, borderRadii[C_TR].height),
+        0, PR_MAX(borderRadii[C_BL].height, borderRadii[C_BR].height)));
   }
 
   for (PRUint32 i = shadows->Length(); i > 0; --i) {
@@ -1366,8 +1366,9 @@ nsCSSRendering::PaintBoxShadowInner(nsPresContext* aPresContext,
     skipRect.Deflate(blurMargin);
     gfxRect skipGfxRect = nsLayoutUtils::RectToGfxRect(skipRect, twipsPerPixel);
     if (hasBorderRadius) {
-      skipGfxRect.Inset(PR_MAX(clipRectRadii[C_TL].height, clipRectRadii[C_TR].height), 0,
-                        PR_MAX(clipRectRadii[C_BL].height, clipRectRadii[C_BR].height), 0);
+      skipGfxRect.Deflate(
+          gfxMargin(0, PR_MAX(clipRectRadii[C_TL].height, clipRectRadii[C_TR].height),
+                    0, PR_MAX(clipRectRadii[C_BL].height, clipRectRadii[C_BR].height)));
     }
 
     // When there's a blur radius, gfxAlphaBoxBlur leaves the skiprect area
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index f16c7295ccf4..d9581913abf2 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -188,10 +188,11 @@ nsCSSBorderRenderer::nsCSSBorderRenderer(PRInt32 aAppUnitsPerPixel,
   }
 
   mInnerRect = mOuterRect;
-  mInnerRect.Inset(mBorderStyles[0] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[0] : 0,
-                   mBorderStyles[1] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[1] : 0,
-                   mBorderStyles[2] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[2] : 0,
-                   mBorderStyles[3] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[3] : 0);
+  mInnerRect.Deflate(
+      gfxMargin(mBorderStyles[3] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[3] : 0,
+                mBorderStyles[0] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[0] : 0,
+                mBorderStyles[1] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[1] : 0,
+                mBorderStyles[2] != NS_STYLE_BORDER_STYLE_NONE ? mBorderWidths[2] : 0));
 
   ComputeBorderCornerDimensions(mOuterRect, mInnerRect, mBorderRadii, &mBorderCornerDimensions);
 
@@ -563,7 +564,7 @@ nsCSSBorderRenderer::FillSolidBorder(const gfxRect& aOuterRect,
       CheckFourFloatsEqual(aBorderSizes, aBorderSizes[0]))
   {
     gfxRect r(aOuterRect);
-    r.Inset(aBorderSizes[0] / 2.0);
+    r.Deflate(aBorderSizes[0] / 2.0);
     mContext->SetLineWidth(aBorderSizes[0]);
 
     mContext->NewPath();
@@ -707,7 +708,7 @@ nsCSSBorderRenderer::DrawBorderSidesCompositeColors(PRIntn aSides, const nsBorde
     gfxRGBA lineColor = ComputeCompositeColorForLine(i, aCompositeColors);
 
     gfxRect siRect = soRect;
-    siRect.Inset(1.0, 1.0, 1.0, 1.0);
+    siRect.Deflate(1.0);
 
     // now cap the rects to the real mInnerRect
     gfxPoint tl = siRect.TopLeft();
@@ -904,7 +905,8 @@ nsCSSBorderRenderer::DrawBorderSides(PRIntn aSides)
   for (unsigned int i = 0; i < borderColorStyleCount; i++) {
     // walk siRect inwards at the start of the loop to get the
     // correct inner rect.
-    siRect.Inset(borderWidths[i]);
+    siRect.Deflate(gfxMargin(borderWidths[i][3], borderWidths[i][0],
+                             borderWidths[i][1], borderWidths[i][2]));
 
     if (borderColorStyle[i] != BorderColorStyleNone) {
       gfxRGBA color = ComputeColorForLine(i,
@@ -1113,7 +1115,7 @@ nsCSSBorderRenderer::DrawSingleWidthSolidBorder()
   // Easy enough to deal with.
   mContext->SetLineWidth(1);
   gfxRect rect = mOuterRect;
-  rect.Inset(0.5);
+  rect.Deflate(0.5);
 
   const twoFloats cornerAdjusts[4] = { { +0.5,  0   },
                                        {    0, +0.5 },
@@ -1158,8 +1160,8 @@ nsCSSBorderRenderer::DrawNoCompositeColorSolidBorder()
   ComputeInnerRadii(mBorderRadii, mBorderWidths, &innerRadii);
 
   gfxRect strokeRect = mOuterRect;
-  strokeRect.Inset(mBorderWidths[0] / 2.0, mBorderWidths[1] / 2.0,
-                    mBorderWidths[2] / 2.0, mBorderWidths[3] / 2.0);
+  strokeRect.Deflate(gfxMargin(mBorderWidths[3] / 2.0, mBorderWidths[0] / 2.0,
+                               mBorderWidths[1] / 2.0, mBorderWidths[2] / 2.0));
 
   NS_FOR_CSS_CORNERS(i) {
       // the corner index -- either 1 2 3 0 (cw) or 0 3 2 1 (ccw)
@@ -1292,7 +1294,7 @@ nsCSSBorderRenderer::DrawRectangularCompositeColors()
   mContext->SetLineWidth(1);
   memcpy(currentColors, mCompositeColors, sizeof(nsBorderColors*) * 4);
   gfxRect rect = mOuterRect;
-  rect.Inset(0.5);
+  rect.Deflate(0.5);
 
   const twoFloats cornerAdjusts[4] = { { +0.5,  0   },
                                         {    0, +0.5 },
@@ -1347,7 +1349,7 @@ nsCSSBorderRenderer::DrawRectangularCompositeColors()
     if (currentColors[0] && currentColors[0]->mNext) {
       currentColors[0] = currentColors[0]->mNext;
     }
-    rect.Inset(1);
+    rect.Deflate(1);
   }
 }
 
@@ -1419,7 +1421,7 @@ nsCSSBorderRenderer::DrawBorders()
     // Very simple case.
     SetupStrokeStyle(NS_SIDE_TOP);
     gfxRect rect = mOuterRect;
-    rect.Inset(mBorderWidths[0] / 2.0);
+    rect.Deflate(mBorderWidths[0] / 2.0);
     mContext->NewPath();
     mContext->Rectangle(rect);
     mContext->Stroke();
@@ -1441,7 +1443,7 @@ nsCSSBorderRenderer::DrawBorders()
     mContext->SetDash(&dash, 1, 0.5);
     mContext->SetAntialiasMode(gfxContext::MODE_ALIASED);
     gfxRect rect = mOuterRect;
-    rect.Inset(mBorderWidths[0] / 2.0);
+    rect.Deflate(mBorderWidths[0] / 2.0);
     mContext->NewPath();
     mContext->Rectangle(rect);
     mContext->Stroke();
@@ -1469,7 +1471,7 @@ nsCSSBorderRenderer::DrawBorders()
     if (noCornerOutsideCenter) {
       // Relatively simple case.
       SetupStrokeStyle(NS_SIDE_TOP);
-      mOuterRect.Inset(mBorderWidths[0] / 2.0);
+      mOuterRect.Deflate(mBorderWidths[0] / 2.0);
       NS_FOR_CSS_CORNERS(corner) {
         if (mBorderRadii.sizes[corner].height == 0 || mBorderRadii.sizes[corner].width == 0) {
           continue;
diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
index 23ff471dcc56..4b8d4e9ebf03 100644
--- a/layout/mathml/nsMathMLmencloseFrame.cpp
+++ b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -777,7 +777,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder,
   gfxFloat e = presContext->AppUnitsToGfxUnits(mThickness);
   gfxCtx->SetLineWidth(e);
 
-  rect.Inset(e / 2.0);
+  rect.Deflate(e / 2.0);
 
   gfxCtx->NewPath();
 
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 2eeab42b2be9..c0344788219b 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1438,7 +1438,7 @@ nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
   double dy = style_expansion * (fabs(ctm.yy) + fabs(ctm.yx));
 
   gfxRect strokeExtents = aPathExtents;
-  strokeExtents.Outset(dy, dx, dy, dx);
+  strokeExtents.Inflate(dx, dy);
   return strokeExtents;
 }
 

From 59778de6fdcc7c3307d7d6c54085e1b4a488b763 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 18 Apr 2011 19:34:46 -0700
Subject: [PATCH 311/509] Bug 651014 - Put test filename in "can't drawWindow
 remote content" error message, r=dbaron

---
 layout/tools/reftest/reftest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 0344ea832e65..fbb9fd75bd3f 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -959,7 +959,7 @@ function DoDrawWindow(ctx, x, y, w, h)
         // browser element
         flags |= ctx.DRAWWINDOW_USE_WIDGET_LAYERS;
     } else if (gBrowserIsRemote) {
-        gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | | can't drawWindow remote content\n");
+        gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | " + gCurrentURL + " | can't drawWindow remote content\n");
         ++gTestResults.Exception;
     }
 

From 9e0a01650b647e109fc2921a6fe19204d6d3aafc Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 18 Apr 2011 20:56:36 -0700
Subject: [PATCH 312/509] Bug 651006 - Increase timeout for browser_addons.js
 since Tegras burn half the time just getting going, r=mfinkle

---
 mobile/chrome/tests/browser_addons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 015131406a4e..b29a429a7f0f 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -70,6 +70,7 @@ var gCurrentTab = null;
 
 function test() {
   waitForExplicitFinish();
+  requestLongerTimeout(2);
   Services.prefs.setCharPref(PREF_GETADDONS_GETRECOMMENDED,      TESTROOT + "browser_install.xml");
   Services.prefs.setCharPref(PREF_GETADDONS_BROWSERECOMMENDED,   TESTROOT + "browser_install.xml");
   Services.prefs.setCharPref(PREF_GETADDONS_BROWSESEARCHRESULTS, TESTROOT + "browser_install.xml");

From 5382ac4a454f1eb8a2c4944e3f93fc9e5d57c110 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Tue, 19 Apr 2011 10:10:48 +0300
Subject: [PATCH 313/509] Bug 650501 - Avoid assuming that a parser object has
 a non-null content sink when an attempt to execute a script is made.
 r=Olli.Pettay.

---
 content/base/src/nsScriptElement.cpp          | 14 +++++++-----
 .../tests/crashtests/650501-1.xhtml           | 22 +++++++++++++++++++
 .../tests/crashtests/crashtests.list          |  1 +
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 parser/htmlparser/tests/crashtests/650501-1.xhtml

diff --git a/content/base/src/nsScriptElement.cpp b/content/base/src/nsScriptElement.cpp
index 436d056ff6ba..5b93e65d7488 100644
--- a/content/base/src/nsScriptElement.cpp
+++ b/content/base/src/nsScriptElement.cpp
@@ -166,13 +166,15 @@ nsScriptElement::MaybeProcessScript()
   mAlreadyStarted = PR_TRUE;
 
   nsIDocument* ownerDoc = cont->GetOwnerDoc();
-  nsCOMPtr<nsIParser> parser = ((nsIScriptElement*)this)->GetCreatorParser();
+  nsCOMPtr<nsIParser> parser = ((nsIScriptElement*) this)->GetCreatorParser();
   if (parser) {
-    nsCOMPtr<nsIDocument> parserDoc =
-        do_QueryInterface(parser->GetContentSink()->GetTarget());
-    if (ownerDoc != parserDoc) {
-      // Willful violation of HTML5 as of 2010-12-01
-      return NS_OK;
+    nsCOMPtr<nsIContentSink> sink = parser->GetContentSink();
+    if (sink) {
+      nsCOMPtr<nsIDocument> parserDoc = do_QueryInterface(sink->GetTarget());
+      if (ownerDoc != parserDoc) {
+        // Willful violation of HTML5 as of 2010-12-01
+        return NS_OK;
+      }
     }
   }
 
diff --git a/parser/htmlparser/tests/crashtests/650501-1.xhtml b/parser/htmlparser/tests/crashtests/650501-1.xhtml
new file mode 100644
index 000000000000..c701a0c76c40
--- /dev/null
+++ b/parser/htmlparser/tests/crashtests/650501-1.xhtml
@@ -0,0 +1,22 @@
+
+<html xmlns="http://www.w3.org/1999/xhtml"> 
+<head> 
+<script> 
+<![CDATA[
+ 
+function boom()
+{
+  var a = document.createElement("div");
+  a.innerHTML = "<script>1;<\/script>";
+ 
+  var b = document.createElement("div")
+  try { b.innerHTML = "<"; } catch (invalidXML) { }
+ 
+  document.documentElement.appendChild(a);
+}
+ 
+]]>
+</script> 
+</head> 
+<body onload="boom();"></body> 
+</html>
diff --git a/parser/htmlparser/tests/crashtests/crashtests.list b/parser/htmlparser/tests/crashtests/crashtests.list
index 4d3b740dbb56..972766e6301b 100644
--- a/parser/htmlparser/tests/crashtests/crashtests.list
+++ b/parser/htmlparser/tests/crashtests/crashtests.list
@@ -46,3 +46,4 @@ load 563514-1.html
 load 574884-1.html
 load 574884-2.html
 load 591330-1.html
+load 650501-1.xhtml

From 00fe250c83cd33c2ef48a3c604f79752c7cc93fc Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Tue, 19 Apr 2011 08:51:31 +0100
Subject: [PATCH 314/509] bug 650499 - limit length covered by PropertyProvider
 to the text actually included in the textRun. r=roc

---
 layout/generic/nsTextFrameThebes.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index fae48353841e..11a11484205b 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -6040,15 +6040,9 @@ nsTextFrame::AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
   PRBool hyphenating = frag->GetLength() > 0 &&
     (mTextRun->GetFlags() & gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS) != 0;
   if (hyphenating) {
-    len = GetContentOffset() + GetInFlowContentLength() - iter.GetOriginalOffset();
-#ifdef DEBUG
-    // check that the length we're going to pass to PropertyProvider matches
-    // the expected range of text in the run
-    gfxSkipCharsIterator tmpIter(iter);
-    tmpIter.AdvanceOriginal(len);
-    NS_ASSERTION(tmpIter.GetSkippedOffset() == flowEndInTextRun,
-                 "nsTextFragment length mismatch?");
-#endif
+    gfxSkipCharsIterator tmp(iter);
+    len = PR_MIN(GetContentOffset() + GetInFlowContentLength(),
+                 tmp.ConvertSkippedToOriginal(flowEndInTextRun)) - iter.GetOriginalOffset();
   }
   PropertyProvider provider(mTextRun, textStyle, frag, this,
                             iter, len, nsnull, 0);

From a85e8f27b5606df8be5d2dc2442628cf5b17d5f0 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Tue, 19 Apr 2011 08:51:35 +0100
Subject: [PATCH 315/509] bug 650499 - add testcase. r=roc

---
 layout/generic/crashtests/650499-1.html   | 15 +++++++++++++++
 layout/generic/crashtests/crashtests.list |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 layout/generic/crashtests/650499-1.html

diff --git a/layout/generic/crashtests/650499-1.html b/layout/generic/crashtests/650499-1.html
new file mode 100644
index 000000000000..012643f52d2c
--- /dev/null
+++ b/layout/generic/crashtests/650499-1.html
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script>
+
+function boom()
+{
+  document.documentElement.offsetHeight;
+  document.body.appendChild(document.createElement("span"));
+}
+
+</script>
+</head>
+<body style="max-width: -moz-min-content; white-space: pre;" onload="boom();">&#x00AD;
+R</body>
+</html>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index eeb518f7b4c9..a42bddf71259 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -358,3 +358,4 @@ load 645072-2.html
 load 646561-1.html
 load 646983-1.html
 load 647332-1.html
+load 650499-1.html

From 79769e213385780366e5ec4acde66628c7c39832 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Tue, 19 Apr 2011 09:01:21 +0100
Subject: [PATCH 316/509] bug 589682 - ignore GDEF table in italic faces of
 times new roman, to work around font bug. r=jdaggett

---
 gfx/thebes/gfxFont.h             | 11 +++++++++++
 gfx/thebes/gfxHarfBuzzShaper.cpp | 12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index aa2f4e81120d..962dccf7ade8 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -209,6 +209,7 @@ public:
         mIsBadUnderlineFont(PR_FALSE), mIsUserFont(PR_FALSE),
         mIsLocalUserFont(PR_FALSE), mStandardFace(aIsStandardFace),
         mSymbolFont(PR_FALSE),
+        mIgnoreGDEF(PR_FALSE),
         mWeight(500), mStretch(NS_FONT_STRETCH_NORMAL),
         mHasCmapTable(PR_FALSE),
         mCmapInitialized(PR_FALSE),
@@ -234,6 +235,7 @@ public:
     PRBool IsItalic() const { return mItalic; }
     PRBool IsBold() const { return mWeight >= 600; } // bold == weights 600 and above
     PRBool IsSymbolFont() const { return mSymbolFont; }
+    PRBool IgnoreGDEF() const { return mIgnoreGDEF; }
 
     inline PRBool HasCmapTable() {
         if (!mCmapInitialized) {
@@ -309,6 +311,7 @@ public:
     PRPackedBool     mIsLocalUserFont  : 1;
     PRPackedBool     mStandardFace : 1;
     PRPackedBool     mSymbolFont  : 1;
+    PRPackedBool     mIgnoreGDEF  : 1;
 
     PRUint16         mWeight;
     PRInt16          mStretch;
@@ -338,6 +341,7 @@ protected:
         mIsLocalUserFont(PR_FALSE),
         mStandardFace(PR_FALSE),
         mSymbolFont(PR_FALSE),
+        mIgnoreGDEF(PR_FALSE),
         mWeight(500), mStretch(NS_FONT_STRETCH_NORMAL),
         mHasCmapTable(PR_FALSE),
         mCmapInitialized(PR_FALSE),
@@ -489,6 +493,13 @@ public:
     nsTArray<nsRefPtr<gfxFontEntry> >& GetFontList() { return mAvailableFonts; }
     
     void AddFontEntry(nsRefPtr<gfxFontEntry> aFontEntry) {
+        // bug 589682 - set the IgnoreGDEF flag on entries for Italic faces
+        // of Times New Roman, because of buggy table in those fonts
+        if (aFontEntry->IsItalic() && !aFontEntry->IsUserFont() &&
+            Name().EqualsLiteral("Times New Roman"))
+        {
+            aFontEntry->mIgnoreGDEF = PR_TRUE;
+        }
         mAvailableFonts.AppendElement(aFontEntry);
         aFontEntry->SetFamily(this);
     }
diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
index 883a03880e68..4cf7892d9be0 100644
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -105,7 +105,17 @@ static hb_blob_t *
 HBGetTable(hb_tag_t aTag, void *aUserData)
 {
     gfxHarfBuzzShaper *shaper = static_cast<gfxHarfBuzzShaper*>(aUserData);
-    return shaper->GetFont()->GetFontTable(aTag);
+    gfxFont *font = shaper->GetFont();
+
+    // bug 589682 - ignore the GDEF table in buggy fonts (applies to
+    // Italic and BoldItalic faces of Times New Roman)
+    if (aTag == TRUETYPE_TAG('G','D','E','F') &&
+        font->GetFontEntry()->IgnoreGDEF())
+    {
+        return nsnull;
+    }
+
+    return font->GetFontTable(aTag);
 }
 
 /*

From 8420ce3dca78cc4bcdf9ad04f33934ea279623fa Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Tue, 19 Apr 2011 09:01:28 +0100
Subject: [PATCH 317/509] bug 589682 - reftest for double-quote bug workaround
 in times new roman italic. r=jdaggett

---
 layout/reftests/bugs/589682-1-notref.html | 18 ++++++++++++++++++
 layout/reftests/bugs/589682-1.html        | 18 ++++++++++++++++++
 layout/reftests/bugs/reftest.list         |  1 +
 3 files changed, 37 insertions(+)
 create mode 100644 layout/reftests/bugs/589682-1-notref.html
 create mode 100644 layout/reftests/bugs/589682-1.html

diff --git a/layout/reftests/bugs/589682-1-notref.html b/layout/reftests/bugs/589682-1-notref.html
new file mode 100644
index 000000000000..ee17fc4bf3b4
--- /dev/null
+++ b/layout/reftests/bugs/589682-1-notref.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+<style type="text/css">
+body {
+  font-family: Times New Roman, serif;
+  font-style: italic;
+}
+.white {
+  color: white;
+}
+</style>
+</head>
+<body>
+<!-- bug 589682 - check that double-quote in TNR Italic has width -->
+<p>foo <span class="white">foobar</span> bar</p>
+</body>
+</html>
+ 
diff --git a/layout/reftests/bugs/589682-1.html b/layout/reftests/bugs/589682-1.html
new file mode 100644
index 000000000000..881ce2787540
--- /dev/null
+++ b/layout/reftests/bugs/589682-1.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+<style type="text/css">
+body {
+  font-family: Times New Roman, serif;
+  font-style: italic;
+}
+.white {
+  color: white;
+}
+</style>
+</head>
+<body>
+<!-- bug 589682 - check that double-quote in TNR Italic has width -->
+<p>foo <span class="white">foo&quot;bar</span> bar</p>
+</body>
+</html>
+ 
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 8d09c226d08c..7dbe7eaedad9 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1563,6 +1563,7 @@ fails-if(Android) fails-if(cocoaWidget) == 586683-1.html 586683-1-ref.html
 == 589615-1a.xhtml 589615-1-ref.html
 == 589615-1b.html 589615-1-ref.html
 == 589672-1.html 589672-1-ref.html
+!= 589682-1.html 589682-1-notref.html
 skip-if(!browserIsRemote) == 593243-1.html 593243-1-ref.html # bug 593168
 skip-if(!browserIsRemote) == 593243-2.html 593243-2-ref.html # bug 593168
 == 593544-1.html 593544-1-ref.html

From 4a9fb9c8d64b39ab1c510032b3d9c9b9b8560824 Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
Date: Tue, 19 Apr 2011 12:00:48 +0200
Subject: [PATCH 318/509] Bug 650476 - Fix build --with-libxul-sdk. r=glandium

---
 config/config.mk        | 2 +-
 js/src/config/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index f52607b39aa0..a56b7db47e7a 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index f52607b39aa0..a56b7db47e7a 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -450,7 +450,7 @@ XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
-XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
 
 # Java macros
 JAVA_GEN_DIR  = _javagen

From cf0539dfb01d83bad05885069dd7b106a4dc2134 Mon Sep 17 00:00:00 2001
From: Andrew Paprocki <andrew@ishiboo.com>
Date: Wed, 20 Apr 2011 01:25:07 +0200
Subject: [PATCH 319/509] Bug 621031 - Fix jsstr.cpp #pragma pack for AIX.
 r=mrbkap

---
 js/src/jsstr.cpp | 54 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 8f0350dc16aa..2242389d96bd 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -3290,21 +3290,37 @@ static JSFunctionSpec string_methods[] = {
       offsetof(JSString::Data, inlineStorage)) },                             \
     { {(c), 0x00} } }
 
-#ifdef __SUNPRO_CC
+/*
+ * For all the pragma pack usage in this file, the following logic applies:
+ *          To apply:       To reset:
+ * Sun CC:  pack(#)       / pack(0)
+ * IBM xlC: pack(#)       / pack(pop)
+ * HP aCC:  pack #        / pack
+ * Others:  pack(push, #) / pack(pop)
+ * The -Dlint case is explicitly excluded because GCC will error out when
+ * pack pragmas are used on unsupported platforms. If GCC is being used
+ * simply for error checking, these errors will be avoided.
+ */
+
+#if defined(__SUNPRO_CC) || defined(__xlC__)
 #pragma pack(8)
-#else
+#elif defined(__HP_aCC)
+#pragma pack 8
+#elif !defined(lint)
 #pragma pack(push, 8)
 #endif
 
 const JSString::Data JSAtom::unitStaticTable[]
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__xlC__)
 __attribute__ ((aligned (8)))
 #endif
 = { R8(0) };
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC)
 #pragma pack(0)
-#else
+#elif defined(__HP_aCC)
+#pragma pack
+#elif !defined(lint)
 #pragma pack(pop)
 #endif
 
@@ -3350,21 +3366,25 @@ const jschar JSAtom::fromSmallChar[] = { R6(0) };
       offsetof(JSString::Data, inlineStorage)) },                             \
     { {FROM_SMALL_CHAR((c) >> 6), FROM_SMALL_CHAR((c) & 0x3F), 0x00} } }
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC) || defined(__xlC__)
 #pragma pack(8)
-#else
+#elif defined(__HP_aCC)
+#pragma pack 8
+#elif !defined(lint)
 #pragma pack(push, 8)
 #endif
 
 const JSString::Data JSAtom::length2StaticTable[]
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__xlC__)
 __attribute__ ((aligned (8)))
 #endif
 = { R12(0) };
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC)
 #pragma pack(0)
-#else
+#elif defined(__HP_aCC)
+#pragma pack
+#elif !defined(lint)
 #pragma pack(pop)
 #endif
 
@@ -3386,14 +3406,16 @@ __attribute__ ((aligned (8)))
 
 JS_STATIC_ASSERT(100 + (1 << 7) + (1 << 4) + (1 << 3) + (1 << 2) == 256);
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC) || defined(__xlC__)
 #pragma pack(8)
-#else
+#elif defined(__HP_aCC)
+#pragma pack 8
+#elif !defined(lint)
 #pragma pack(push, 8)
 #endif
 
 const JSString::Data JSAtom::hundredStaticTable[]
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__xlC__)
 __attribute__ ((aligned (8)))
 #endif
 = { R7(100), /* 100 through 227 */
@@ -3414,9 +3436,11 @@ const JSString::Data *const JSAtom::intStaticTable[] = { R8(0) };
 
 #undef R
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC)
 #pragma pack(0)
-#else
+#elif defined(__HP_aCC)
+#pragma pack
+#elif !defined(lint)
 #pragma pack(pop)
 #endif
 

From 127e9587a753450fd2da5346f02ceb8384a25a20 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 20 Apr 2011 01:28:21 +0200
Subject: [PATCH 320/509] Bug 650987: Remove unused variable
 gOfflineCacheUpdateService from OfflineCacheUpdateParent.cpp and
 OfflineCacheUpdateChild.cpp. r=biesi

---
 uriloader/prefetch/OfflineCacheUpdateChild.cpp  | 4 +---
 uriloader/prefetch/OfflineCacheUpdateParent.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.cpp b/uriloader/prefetch/OfflineCacheUpdateChild.cpp
index b59575eab678..e68e8ae7c7f5 100644
--- a/uriloader/prefetch/OfflineCacheUpdateChild.cpp
+++ b/uriloader/prefetch/OfflineCacheUpdateChild.cpp
@@ -62,8 +62,6 @@
 #include "prlog.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 
-static nsOfflineCacheUpdateService *gOfflineCacheUpdateService = nsnull;
-
 #if defined(PR_LOGGING)
 //
 // To enable logging (see prlog.h for full details):
@@ -528,4 +526,4 @@ OfflineCacheUpdateChild::RecvFinish(const bool &succeeded,
 }
 
 }
-}
\ No newline at end of file
+}
diff --git a/uriloader/prefetch/OfflineCacheUpdateParent.cpp b/uriloader/prefetch/OfflineCacheUpdateParent.cpp
index c8dbd4320a37..29d21b1cf0a6 100644
--- a/uriloader/prefetch/OfflineCacheUpdateParent.cpp
+++ b/uriloader/prefetch/OfflineCacheUpdateParent.cpp
@@ -40,8 +40,6 @@
 #include "nsOfflineCacheUpdate.h"
 #include "nsIApplicationCache.h"
 
-static nsOfflineCacheUpdateService *gOfflineCacheUpdateService = nsnull;
-
 #if defined(PR_LOGGING)
 //
 // To enable logging (see prlog.h for full details):
@@ -179,4 +177,4 @@ OfflineCacheUpdateParent::ApplicationCacheAvailable(nsIApplicationCache *aApplic
 }
 
 } // docshell
-} // mozilla
\ No newline at end of file
+} // mozilla

From d583908c8e30569ac0622baddfe63ed821d44415 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 20 Apr 2011 01:28:38 +0200
Subject: [PATCH 321/509] Bug 650871: Use unsigned int as loop counter in 
 nsHttpConnectionMgr::OnMsgReclaimConnection, to fix GCC warning. r=biesi
 r=mcmanus

---
 netwerk/protocol/http/nsHttpConnectionMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index 773b4ddd7920..35f741b8d55a 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -1060,7 +1060,7 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(PRInt32, void *param)
             // The linear search is ok here because the number of idleconns
             // in a single entry is generally limited to a small number (i.e. 6)
 
-            PRInt32 idx;
+            PRUint32 idx;
             for (idx = 0; idx < ent->mIdleConns.Length(); idx++) {
                 nsHttpConnection *idleConn = ent->mIdleConns[idx];
                 if (idleConn->MaxBytesRead() < conn->MaxBytesRead())

From 30e1d4cd4b740390f860cd0f1bcf84f00186cc00 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 20 Apr 2011 01:27:26 +0200
Subject: [PATCH 322/509] Bug 650742 - Define AVMPLUS_UNIX for OpenBSD. r=khuey

---
 js/src/configure.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/src/configure.in b/js/src/configure.in
index 6b6878096527..efb441b438a3 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2950,6 +2950,9 @@ case "$target" in
 *-freebsd*|*-kfreebsd*)
     AC_DEFINE(AVMPLUS_UNIX)
     ;;
+*-openbsd*)
+    AC_DEFINE(AVMPLUS_UNIX)
+    ;;
 *-gnu*)
     AC_DEFINE(AVMPLUS_UNIX)
     ;;

From 54a8bd9f7c6d4e351ece6bc2e751ea97f00b9999 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 19 Apr 2011 18:54:02 +0200
Subject: [PATCH 323/509] Bug 648882 - TabPriorityQueue updates tabItems when
 UI is busy [f=raymond, r=ian]

---
 browser/base/content/tabview/tabitems.js      |  8 +-
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug648882.js | 84 +++++++++++++++++++
 3 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug648882.js

diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index ed53f449444e..439c4d85dc24 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -1143,9 +1143,15 @@ let TabItems = {
   _checkHeartbeat: function TabItems__checkHeartbeat() {
     this._heartbeat = null;
 
-    if (this.isPaintingPaused() || !UI.isIdle)
+    if (this.isPaintingPaused())
       return;
 
+    // restart the heartbeat to update all waiting tabs once the UI becomes idle
+    if (!UI.isIdle()) {
+      this.startHeartbeat();
+      return;
+    }
+
     let accumTime = 0;
     let items = this._tabsWaitingForUpdate.getItems();
     // Do as many updates as we can fit into a "perceived" amount
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 8b447d14f761..1318f50646d7 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -130,6 +130,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug641802.js \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
+                 browser_tabview_bug648882.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug648882.js b/browser/base/content/test/tabview/browser_tabview_bug648882.js
new file mode 100644
index 000000000000..887abf932245
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug648882.js
@@ -0,0 +1,84 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  testHeartbeatAfterBusyUI(function () {
+    testTabUpdatesWithBusyUI(finish);
+  });
+}
+
+function testHeartbeatAfterBusyUI(callback) {
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    let cw = win.TabView.getContentWindow();
+    let tab = win.gBrowser.tabs[0];
+    let tabItem = tab._tabViewTabItem;
+
+    cw.TabItems.pausePainting();
+
+    tabItem.addSubscriber(tabItem, "updated", function () {
+      tabItem.removeSubscriber(tabItem, "updated");
+      callback();
+    });
+
+    cw.TabItems.update(tab);
+
+    cw.UI.isIdle = function () {
+      cw.UI.isIdle = function () true;
+      return false;
+    }
+
+    cw.TabItems.resumePainting();
+  });
+}
+
+function testTabUpdatesWithBusyUI(callback) {
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    let cw = win.TabView.getContentWindow();
+    let tab = win.gBrowser.tabs[0];
+    let tabItem = tab._tabViewTabItem;
+    let groupItem = cw.GroupItems.groupItems[0];
+    let container = groupItem.container;
+    let resizer = groupItem.$resizer[0];
+
+    let intervalID;
+    let isIdle = false;
+    let numLoops = 10;
+    let interval = cw.UI._maxInteractiveWait / 2;
+
+    let simulateBusyUI = function () {
+      let target = 5 < numLoops-- ? container : resizer;
+
+      EventUtils.synthesizeMouse(target, 5, 5, {type: "mousedown"}, cw);
+      EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
+      EventUtils.synthesizeMouse(target, 20, 20, {type: "mouseup"}, cw);
+
+      win.setTimeout(function () {
+        if (numLoops)
+          simulateBusyUI();
+        else
+          isIdle = true;
+      }, interval);
+    };
+
+    SimpleTest.waitForFocus(function () {
+      cw.TabItems.pausePainting();
+      cw.TabItems.update(tab);
+
+      tabItem.addSubscriber(tabItem, "updated", function () {
+        tabItem.removeSubscriber(tabItem, "updated");
+        ok(isIdle, "tabItem is updated only when UI is idle");
+        callback();
+      });
+
+      simulateBusyUI();
+      win.setTimeout(simulateBusyUI, interval);
+      cw.TabItems.resumePainting();
+    }, cw);
+  });
+}

From b12a86604c68ecd5d3afdcc10d47a019cd0ddaab Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Wed, 20 Apr 2011 10:35:50 +1200
Subject: [PATCH 324/509] Bug 645268 - Try to fix randomly failing
 browser_webconsole_bug_595934_message_categories.js by properly capturing a
 variable value in a closure r=ehsan

---
 .../browser_webconsole_bug_595934_message_categories.js        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
index d0e7173009f6..32b0d4742e42 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
@@ -157,9 +157,10 @@ function testNext() {
   pos++;
   if (pos < TESTS.length) {
     if (TESTS[pos].onload) {
+      let position = pos;
       browser.addEventListener("load", function(aEvent) {
         browser.removeEventListener(aEvent.type, arguments.callee, true);
-        TESTS[pos].onload(aEvent);
+        TESTS[position].onload(aEvent);
       }, true);
     }
 

From 0ae934d33e08d17bf4e5fe9afb6091c4e16378c4 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 19 Apr 2011 19:31:41 -0400
Subject: [PATCH 325/509] Bug 625222 - Disable test_chromeWorkerJSM.xul because
 the code in question has problems, and is being rewritten DONTBUILD

---
 dom/src/threads/test/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/src/threads/test/Makefile.in b/dom/src/threads/test/Makefile.in
index e2311aa4d717..c139fb90be74 100644
--- a/dom/src/threads/test/Makefile.in
+++ b/dom/src/threads/test/Makefile.in
@@ -131,7 +131,7 @@ _SUBDIR_TEST_FILES = \
 _CHROME_TEST_FILES = \
   test_chromeWorker.xul \
   test_chromeWorkerComponent.xul \
-  test_chromeWorkerJSM.xul \
+  $(warning test_chromeWorkerJSM.xul disabled because the respective code has major problems and is being rewritten, see bug 625222) \
   chromeWorker_worker.js \
   chromeWorker_subworker.js \
   $(NULL)

From 499fb6802ee22ec2a3ad011d91cae4bdcc1e8347 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 19 Apr 2011 19:38:55 -0400
Subject: [PATCH 326/509] Bug 650676 - browser_autocompletesearch.js throws
 getting ProfD, then times out, on Android (more fixes) [r=vingtetun]

---
 mobile/chrome/tests/browser_autocompletesearch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/chrome/tests/browser_autocompletesearch.js b/mobile/chrome/tests/browser_autocompletesearch.js
index a16016a5ad0b..e7129eafe8ec 100644
--- a/mobile/chrome/tests/browser_autocompletesearch.js
+++ b/mobile/chrome/tests/browser_autocompletesearch.js
@@ -56,7 +56,7 @@ function saveMockCache() {
     let fileName = fileHandler.getFileFromURLSpec(mockCacheURI.JARFile.spec);
     zReader.open(fileName);
 
-    let extract = mockCacheURI.JARFile.spec.split("!")[1];
+    let extract = mockCacheURI.spec.split("!")[1];
     extract = extract.substring(1, extract.lastIndexOf("/") + 1);
     extract += "mock_autocomplete.json";
     info("extract path: " + extract);

From dbd35b00d8ef4fbdc2a7beab65978f759a7069ca Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Wed, 20 Apr 2011 13:16:40 +1200
Subject: [PATCH 327/509] Bug 593305 - Don't assert that media load isn't
 delaying the document load event at start of resource load. r=roc

---
 content/html/content/src/nsHTMLMediaElement.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 4f257d55dc6b..81b302c1473e 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -629,8 +629,6 @@ static PRBool HasPotentialResource(nsIContent *aElement)
 
 void nsHTMLMediaElement::SelectResource()
 {
-  NS_ASSERTION(!mDelayingLoadEvent,
-    "Load event should not be delayed at start of resource selection.");
   if (!HasPotentialResource(this)) {
     // The media element has neither a src attribute nor any source
     // element children, abort the load.

From b570f6fe2a18f52067764f7bf48d5bab08c8fa48 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Wed, 20 Apr 2011 14:05:29 +1200
Subject: [PATCH 328/509] Bug 651036 - SMIL: Make discrete to-animations behave
 consistently with discrete from-to animations r=dholbert

---
 content/smil/nsSMILAnimationFunction.cpp      | 45 ++++++++++---------
 content/smil/test/test_smilKeyTimes.xhtml     | 30 ++++++++-----
 .../reftests/svg/smil/anim-discrete-to-1.svg  |  4 +-
 .../reftests/svg/smil/anim-discrete-to-2.svg  |  4 +-
 .../svg/smil/anim-feFuncR-tableValues-01.svg  |  4 +-
 .../svg/smil/anim-fill-overpaintserver-2.svg  | 10 +++--
 .../svg/smil/anim-indefinite-to-2.svg         |  8 ++--
 .../svg/smil/anim-indefinite-to-3.svg         |  6 +--
 layout/reftests/svg/smil/anim-path-d-01.svg   |  2 +-
 .../svg/smil/anim-polygon-points-01.svg       |  2 +-
 .../svg/smil/anim-polyline-points-01.svg      |  2 +-
 .../reftests/svg/smil/anim-text-rotate-01.svg |  4 +-
 12 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/content/smil/nsSMILAnimationFunction.cpp b/content/smil/nsSMILAnimationFunction.cpp
index 23b05a3f3c22..7183731a675a 100644
--- a/content/smil/nsSMILAnimationFunction.cpp
+++ b/content/smil/nsSMILAnimationFunction.cpp
@@ -395,6 +395,10 @@ nsSMILAnimationFunction::InterpolateResult(const nsSMILValueArray& aValues,
     return NS_ERROR_FAILURE;
   }
 
+  if (IsToAnimation() && aBaseValue.IsNull()) {
+    return NS_ERROR_FAILURE;
+  }
+
   // Get the normalised progress through the simple duration.
   //
   // If we have an indefinite simple duration, just set the progress to be
@@ -428,19 +432,15 @@ nsSMILAnimationFunction::InterpolateResult(const nsSMILValueArray& aValues,
     // NS_ABORT_IF_FALSE that tests that intervalProgress is in range will fail.
     double intervalProgress = -1.f;
     if (IsToAnimation()) {
-      if (aBaseValue.IsNull()) {
-        rv = NS_ERROR_FAILURE;
+      from = &aBaseValue;
+      to = &aValues[0];
+      if (calcMode == CALC_PACED) {
+        // Note: key[Times/Splines/Points] are ignored for calcMode="paced"
+        intervalProgress = simpleProgress;
       } else {
-        from = &aBaseValue;
-        to = &aValues[0];
-        if (calcMode == CALC_PACED) {
-          // Note: key[Times/Splines/Points] are ignored for calcMode="paced"
-          intervalProgress = simpleProgress;
-        } else {
-          double scaledSimpleProgress =
-            ScaleSimpleProgress(simpleProgress, calcMode);
-          intervalProgress = ScaleIntervalProgress(scaledSimpleProgress, 0);
-        }
+        double scaledSimpleProgress =
+          ScaleSimpleProgress(simpleProgress, calcMode);
+        intervalProgress = ScaleIntervalProgress(scaledSimpleProgress, 0);
       }
     } else if (calcMode == CALC_PACED) {
       rv = ComputePacedPosition(aValues, simpleProgress,
@@ -474,13 +474,16 @@ nsSMILAnimationFunction::InterpolateResult(const nsSMILValueArray& aValues,
   // Note: If interpolation failed (isn't supported for this type), the SVG
   // spec says to force discrete mode.
   if (calcMode == CALC_DISCRETE || NS_FAILED(rv)) {
+    double scaledSimpleProgress =
+      ScaleSimpleProgress(simpleProgress, CALC_DISCRETE);
     if (IsToAnimation()) {
-      // SMIL 3, 12.6.4: Since a to animation has only 1 value, a discrete to
-      // animation will simply set the to value for the simple duration.
-      aResult = aValues[0];
+      // We don't follow SMIL 3, 12.6.4, where discrete to animations
+      // are the same as <set> animations.  Instead, we treat it as a
+      // discrete animation with two values (the underlying value and
+      // the to="" value), and honor keyTimes="" as well.
+      PRUint32 index = (PRUint32)floor(scaledSimpleProgress * 2);
+      aResult = index == 0 ? aBaseValue : aValues[0];
     } else {
-      double scaledSimpleProgress =
-        ScaleSimpleProgress(simpleProgress, CALC_DISCRETE);
       PRUint32 index = (PRUint32)floor(scaledSimpleProgress * aValues.Length());
       aResult = aValues[index];
     }
@@ -865,11 +868,9 @@ nsSMILAnimationFunction::CheckKeyTimes(PRUint32 aNumValues)
   }
 
   // no. keyTimes == no. values
-  // For to-animation the number of values is considered to be 2 unless it's
-  // discrete to-animation in which case either 1 or 2 is acceptable.
-  PRBool matchingNumOfValues = IsToAnimation() ?
-      calcMode == CALC_DISCRETE ? numKeyTimes <= 2 : numKeyTimes == 2 :
-      numKeyTimes == aNumValues;
+  // For to-animation the number of values is considered to be 2.
+  PRBool matchingNumOfValues =
+    numKeyTimes == (IsToAnimation() ? 2 : aNumValues);
   if (!matchingNumOfValues) {
     SetKeyTimesErrorFlag(PR_TRUE);
     return;
diff --git a/content/smil/test/test_smilKeyTimes.xhtml b/content/smil/test/test_smilKeyTimes.xhtml
index 8130d91205b6..9dace99cc9c8 100644
--- a/content/smil/test/test_smilKeyTimes.xhtml
+++ b/content/smil/test/test_smilKeyTimes.xhtml
@@ -152,26 +152,36 @@ function main()
     'times': [ [ 2, -100 ] ]
   });
 
-  // to calcMode=discrete two keyTimes
-  // (technically, for discrete to-animation there is only ONE animation value
-  // but we allow two keyTimes to be specified since they're not going to have
-  // any effect anyway and this part of the spec is somewhat counter-intuitive.
-  // See bug 544855)
+  // unfrozen to calcMode=discrete two keyTimes
+  testCases.push({
+    'attr' : { 'to': '100',
+               'calcMode': 'discrete',
+               'keyTimes': '0.0; 1.0',
+               'fill': 'remove' },
+    'times': [ [ 0, -100 ],
+               [ 7, -100 ],
+               [ 10, -100 ],
+               [ 12, -100 ]]
+  });
+
+  // frozen to calcMode=discrete two keyTimes
   testCases.push({
     'attr' : { 'to': '100',
                'calcMode': 'discrete',
                'keyTimes': '0.0; 1.0' },
-    'times': [ [ 0, 100 ],
-               [ 7, 100 ] ]
+    'times': [ [ 0, -100 ],
+               [ 7, -100 ],
+               [ 10, 100 ],
+               [ 12, 100 ] ]
   });
 
-  // to calcMode=discrete one keyTime
+  // to calcMode=discrete -- bad number of keyTimes (one, expecting two)
   testCases.push({
     'attr' : { 'to': '100',
                'calcMode': 'discrete',
                'keyTimes': '0' },
-    'times': [ [ 0, 100 ],
-               [ 7, 100 ] ]
+    'times': [ [ 0, -100 ],
+               [ 7, -100 ] ]
   });
 
   // values calcMode=discrete
diff --git a/layout/reftests/svg/smil/anim-discrete-to-1.svg b/layout/reftests/svg/smil/anim-discrete-to-1.svg
index 29f8b34a9477..41a078764c33 100644
--- a/layout/reftests/svg/smil/anim-discrete-to-1.svg
+++ b/layout/reftests/svg/smil/anim-discrete-to-1.svg
@@ -3,8 +3,8 @@
      class="reftest-wait"
      onload="setTimeAndSnapshot(0.0, true)">
   <script xlink:href="smil-util.js" type="text/javascript"/>
-  <rect x="15" y="15" width="200" height="100" fill="blue">
+  <rect x="15" y="15" width="200" height="200" fill="blue">
     <animate attributeName="height" calcMode="discrete"
-             to="200" dur="2s"/>
+             to="100" dur="2s"/>
   </rect>
 </svg>
diff --git a/layout/reftests/svg/smil/anim-discrete-to-2.svg b/layout/reftests/svg/smil/anim-discrete-to-2.svg
index d163103782c4..e64d5d9d0fee 100644
--- a/layout/reftests/svg/smil/anim-discrete-to-2.svg
+++ b/layout/reftests/svg/smil/anim-discrete-to-2.svg
@@ -3,8 +3,8 @@
      class="reftest-wait"
      onload="setTimeAndSnapshot(0.99, true)">
   <script xlink:href="smil-util.js" type="text/javascript"/>
-  <rect x="15" y="15" width="200" height="100" fill="blue">
+  <rect x="15" y="15" width="200" height="200" fill="blue">
     <animate attributeName="height" calcMode="discrete"
-             to="200" dur="2s"/>
+             to="100" dur="2s"/>
   </rect>
 </svg>
diff --git a/layout/reftests/svg/smil/anim-feFuncR-tableValues-01.svg b/layout/reftests/svg/smil/anim-feFuncR-tableValues-01.svg
index 374da8417629..512e1ab07450 100644
--- a/layout/reftests/svg/smil/anim-feFuncR-tableValues-01.svg
+++ b/layout/reftests/svg/smil/anim-feFuncR-tableValues-01.svg
@@ -85,10 +85,10 @@
     <feComponentTransfer>
       <feFuncR type="table" tableValues="0 0 0 0">
 
-        <!-- The value should be "0 2 2 0" immediately. -->
+        <!-- The value should be "0 2 2 0" from 1s onwards. -->
         <animate attributeName="tableValues"
                  calcMode="discrete"
-                 begin="0s" dur="3s"
+                 begin="0s" dur="2s"
                  to="0 2 2 0"
                  fill="freeze"/>
 
diff --git a/layout/reftests/svg/smil/anim-fill-overpaintserver-2.svg b/layout/reftests/svg/smil/anim-fill-overpaintserver-2.svg
index c9b62cbef314..e3ee0536364b 100644
--- a/layout/reftests/svg/smil/anim-fill-overpaintserver-2.svg
+++ b/layout/reftests/svg/smil/anim-fill-overpaintserver-2.svg
@@ -1,14 +1,18 @@
-<svg xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     class="reftest-wait" onload="setTimeAndSnapshot(2, true)">
+  <script xlink:href="smil-util.js" type="text/javascript"/>
   <!-- In this test we will attempt to interpolate since fill is interpolatable
        but fail since the base value can't be converted to an RGB color value
        and hence should fall back to discrete calcMode which, in the case of
-       to-animation, sets the to value for the entire simple duration. -->
+       to-animation, sets the to value for the second half of the simple
+       duration. -->
   <defs>
     <linearGradient id="red">
       <stop offset="0.0" stop-color="#f00"/>
     </linearGradient>
   </defs>
   <rect width="100%" height="100%" fill="url(#red)">
-    <animate attributeName="fill" to="lime" dur="500s"/>
+    <animate attributeName="fill" to="lime" dur="3s"/>
   </rect>
 </svg>
diff --git a/layout/reftests/svg/smil/anim-indefinite-to-2.svg b/layout/reftests/svg/smil/anim-indefinite-to-2.svg
index 2ba1425ae670..3de1aecad7bf 100644
--- a/layout/reftests/svg/smil/anim-indefinite-to-2.svg
+++ b/layout/reftests/svg/smil/anim-indefinite-to-2.svg
@@ -1,8 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <!-- Test that an indefinite to-animation with discrete calcMode still applies
-       the to-value for the whole time. -->
-  <rect x="15" y="15" width="200" height="100" fill="blue">
-    <animate attributeName="height" to="200" dur="indefinite"
+  <!-- Test that an indefinite to-animation with discrete calcMode applies
+       the underlying value for the whole time. -->
+  <rect x="15" y="15" width="200" height="200" fill="blue">
+    <animate attributeName="height" to="100" dur="indefinite"
       calcMode="discrete"/>
   </rect>
 </svg>
diff --git a/layout/reftests/svg/smil/anim-indefinite-to-3.svg b/layout/reftests/svg/smil/anim-indefinite-to-3.svg
index 6ec82f4b6c25..e4e7d22f86d2 100644
--- a/layout/reftests/svg/smil/anim-indefinite-to-3.svg
+++ b/layout/reftests/svg/smil/anim-indefinite-to-3.svg
@@ -1,8 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg">
   <!-- Test that an indefinite to-animation that falls back to discrete calcMode
-       because the property is not interpolatable, still applies the to-value
+       because the property is not interpolatable, applies the underlying value
        for the whole time. -->
-  <rect x="15" y="15" width="200" height="200" fill="blue" visibility="hidden">
-    <animate attributeName="visibility" to="visible" dur="indefinite"/>
+  <rect x="15" y="15" width="200" height="200" fill="blue" visibility="visible">
+    <animate attributeName="visibility" to="hidden" dur="indefinite"/>
   </rect>
 </svg>
diff --git a/layout/reftests/svg/smil/anim-path-d-01.svg b/layout/reftests/svg/smil/anim-path-d-01.svg
index d798b7c6018d..53e6b690593d 100644
--- a/layout/reftests/svg/smil/anim-path-d-01.svg
+++ b/layout/reftests/svg/smil/anim-path-d-01.svg
@@ -302,7 +302,7 @@
           ">
     <animate attributeName="d"
              calcMode="discrete"
-             begin="0s" dur="20s"
+             begin="0s" dur="2s"
              to="M10,10
                  L40,10
                  l-30,60
diff --git a/layout/reftests/svg/smil/anim-polygon-points-01.svg b/layout/reftests/svg/smil/anim-polygon-points-01.svg
index a7d2bf68b2a0..1f4f9e6432ae 100644
--- a/layout/reftests/svg/smil/anim-polygon-points-01.svg
+++ b/layout/reftests/svg/smil/anim-polygon-points-01.svg
@@ -65,7 +65,7 @@
            points="10,10 70,70 110,10 160,10 210,10">
     <animate attributeName="points"
              calcMode="discrete"
-             begin="0s" dur="20s"
+             begin="0s" dur="2s"
              to="10,10 70,10 110,10 160,70 210,10"
              fill="freeze"/>
   </polygon>
diff --git a/layout/reftests/svg/smil/anim-polyline-points-01.svg b/layout/reftests/svg/smil/anim-polyline-points-01.svg
index 8d2a2e9d6285..89dc2f3b1e8a 100644
--- a/layout/reftests/svg/smil/anim-polyline-points-01.svg
+++ b/layout/reftests/svg/smil/anim-polyline-points-01.svg
@@ -65,7 +65,7 @@
             points="10,10 70,70 110,10 160,10 210,10">
     <animate attributeName="points"
              calcMode="discrete"
-             begin="0s" dur="20s"
+             begin="0s" dur="2s"
              to="10,10 70,10 110,10 160,70 210,10"
              fill="freeze"/>
   </polyline>
diff --git a/layout/reftests/svg/smil/anim-text-rotate-01.svg b/layout/reftests/svg/smil/anim-text-rotate-01.svg
index 49bd7826f155..828ed8779988 100644
--- a/layout/reftests/svg/smil/anim-text-rotate-01.svg
+++ b/layout/reftests/svg/smil/anim-text-rotate-01.svg
@@ -61,10 +61,10 @@
 
   <text transform="translate(320, 20)" rotate="10 20 30">JKL
 
-    <!-- The value should be "310 320 330" immediately. -->
+    <!-- The value should be "310 320 330" at 3s. -->
     <animate attributeName="rotate"
              calcMode="discrete"
-             begin="0s" dur="30s"
+             begin="0s" dur="6s"
              to="310 320 330"
              fill="freeze"/>
 

From f69222ff51414b5242e35b0503f2b586e45bd974 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 19 Apr 2011 21:22:39 -0700
Subject: [PATCH 329/509] Don't hold nsProxyObjectManager's lock while calling
 delete on an nsProxyEventObject.  (Bug 650674)  r=bsmedberg

---
 xpcom/proxy/src/nsProxyEvent.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/xpcom/proxy/src/nsProxyEvent.cpp b/xpcom/proxy/src/nsProxyEvent.cpp
index d3963eb3f669..acb58a9f5b05 100644
--- a/xpcom/proxy/src/nsProxyEvent.cpp
+++ b/xpcom/proxy/src/nsProxyEvent.cpp
@@ -427,7 +427,9 @@ nsresult
 nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
 {
     // This method is only called when the global lock is held.
-    // XXX assert this
+#ifdef DEBUG
+    nsProxyObjectManager::GetInstance()->GetLock().AssertCurrentThreadOwns();
+#endif
 
     nsProxyEventObject *peo;
 
@@ -442,8 +444,8 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
     nsProxyEventObject *newpeo;
 
     // Both GetClass and QueryInterface call out to XPCOM, so we unlock for them
+    nsProxyObjectManager* pom = nsProxyObjectManager::GetInstance();
     {
-        nsProxyObjectManager* pom = nsProxyObjectManager::GetInstance();
         MutexAutoUnlock unlock(pom->GetLock());
 
         nsProxyEventClass *pec;
@@ -473,7 +475,13 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
     // linked-list check.
     for (peo = mFirst; peo; peo = peo->mNext) {
         if (peo->GetClass()->GetProxiedIID().Equals(aIID)) {
-            delete newpeo;
+            {
+                // Deleting an nsProxyEventObject can call Release on an
+                // nsProxyObject, which can only happen when not holding
+                // the lock.
+                MutexAutoUnlock unlock(pom->GetLock());
+                delete newpeo;
+            }
             *aResult = static_cast<nsISupports*>(peo->mXPTCStub);
             peo->LockedAddRef();
             return NS_OK;

From 6f5580985e8e466b8f234aeb7b9e219bce0d02b3 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 19 Apr 2011 21:22:39 -0700
Subject: [PATCH 330/509] Make nsIFrame::GetOrdinal accept all values that the
 CSS parser accepts (which currently adds no values).  (Bug 644514 patch 1) 
 r=bzbarsky

---
 layout/xul/base/src/nsBox.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index 1b52e30168c3..486e34e2434d 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -514,8 +514,9 @@ nsBox::GetFlex(nsBoxLayoutState& aState)
 PRUint32
 nsIFrame::GetOrdinal(nsBoxLayoutState& aState)
 {
-  PRUint32 ordinal = DEFAULT_ORDINAL_GROUP;
+  PRUint32 ordinal = GetStyleXUL()->mBoxOrdinal;
 
+  // When present, attribute value overrides CSS.
   nsIContent* content = GetContent();
   if (content) {
     PRInt32 error;
@@ -525,14 +526,6 @@ nsIFrame::GetOrdinal(nsBoxLayoutState& aState)
     if (!value.IsEmpty()) {
       ordinal = value.ToInteger(&error);
     }
-    else {
-      // No attribute value.  Check CSS.
-      const nsStyleXUL* boxInfo = GetStyleXUL();
-      if (boxInfo->mBoxOrdinal > 1) {
-        // The ordinal group was defined in CSS.
-        ordinal = (nscoord)boxInfo->mBoxOrdinal;
-      }
-    }
   }
 
   return ordinal;

From 5dbeea895aabe7c7090ad0a0f15801f1735e595c Mon Sep 17 00:00:00 2001
From: Bjarne <bjarne@runitsoft.com>
Date: Wed, 20 Apr 2011 21:42:09 +0200
Subject: [PATCH 331/509] Bug 648485 - Third attempt to fix intermittent
 failure in content/base/test/test_bug482935.html. r=ehsan

---
 content/base/test/test_bug482935.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/base/test/test_bug482935.html b/content/base/test/test_bug482935.html
index 28baea933c28..e80fa786b950 100644
--- a/content/base/test/test_bug482935.html
+++ b/content/base/test/test_bug482935.html
@@ -42,7 +42,7 @@ function testCancelInPhase4() {
             testCancelBeforePhase4();
           }, false);
 
-          xhr2.open("GET", url, false); // note : synch-request
+          xhr2.open("GET", url);
           xhr2.setRequestHeader("X-Request", "1", false);
 
           try { xhr2.send(); }
@@ -87,7 +87,7 @@ function testCancelBeforePhase4() {
             SimpleTest.finish();
           }, false);
 
-          xhr2.open("GET", url, false); // note : synch-request
+          xhr2.open("GET", url);
           xhr2.setRequestHeader("X-Request", "1", false);
 
           try { xhr2.send(); }

From 732897cc3f1daba72d7eb3f2b3638b5ebf3a910c Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Wed, 20 Apr 2011 21:42:33 +0200
Subject: [PATCH 332/509] Bug 610305: decom nsEventStateManager r=smaug

---
 accessible/src/base/AccEvent.cpp              |   4 +-
 .../src/base/nsAccessibilityService.cpp       |   2 +-
 accessible/src/base/nsAccessible.cpp          |   2 +-
 accessible/src/base/nsCoreUtils.cpp           |  10 +-
 accessible/src/base/nsCoreUtils.h             |   2 +-
 accessible/src/base/nsDocAccessible.cpp       |   2 +-
 accessible/src/html/nsHTMLLinkAccessible.cpp  |   2 +-
 accessible/src/xul/nsXULMenuAccessible.cpp    |   2 +-
 content/base/public/nsIContent.h              |   2 +-
 content/base/src/Link.cpp                     |   2 +-
 content/base/src/nsDocument.cpp               |   1 -
 content/base/src/nsGenConImageContent.cpp     |   2 +-
 content/base/src/nsGenericElement.cpp         |   7 +-
 content/base/src/nsImageLoadingContent.cpp    |   2 +-
 content/base/src/nsObjectLoadingContent.cpp   |   2 +-
 content/events/public/Makefile.in             |   1 -
 content/events/public/nsIEventStateManager.h  | 167 ------------------
 content/events/src/Makefile.in                |   4 +
 content/events/src/nsDOMDragEvent.cpp         |   1 -
 content/events/src/nsDOMEvent.cpp             |   3 +-
 content/events/src/nsDOMMouseEvent.cpp        |   1 -
 content/events/src/nsDOMMouseScrollEvent.cpp  |   1 -
 content/events/src/nsDOMUIEvent.cpp           |   9 +-
 content/events/src/nsEventListenerManager.cpp |   1 -
 content/events/src/nsEventStateManager.cpp    | 114 +++++-------
 content/events/src/nsEventStateManager.h      | 110 ++++++++----
 .../html/content/src/nsGenericHTMLElement.cpp |   9 +-
 .../html/content/src/nsHTMLAnchorElement.cpp  |   1 -
 .../html/content/src/nsHTMLAreaElement.cpp    |   1 -
 .../html/content/src/nsHTMLButtonElement.cpp  |   3 +-
 .../html/content/src/nsHTMLFormElement.cpp    |   1 -
 .../html/content/src/nsHTMLInputElement.cpp   |   2 +-
 .../html/content/src/nsHTMLLabelElement.cpp   |   1 -
 .../html/content/src/nsHTMLLegendElement.cpp  |   1 -
 .../content/src/nsHTMLOptGroupElement.cpp     |   2 +-
 .../html/content/src/nsHTMLOptionElement.cpp  |   2 +-
 .../html/content/src/nsHTMLOutputElement.cpp  |   2 +-
 .../html/content/src/nsHTMLSelectElement.cpp  |   2 +-
 .../content/src/nsHTMLTextAreaElement.cpp     |   2 +-
 content/html/content/src/nsRadioVisitor.cpp   |   2 +-
 content/html/document/src/nsHTMLDocument.cpp  |   1 -
 .../mathml/content/src/nsMathMLElement.cpp    |   2 +-
 content/xtf/src/nsXTFElementWrapper.cpp       |   4 +-
 content/xul/content/src/nsXULElement.cpp      |   2 +-
 .../xul/content/src/nsXULPopupListener.cpp    |   3 +-
 docshell/base/nsDocShell.cpp                  |   2 +-
 dom/base/nsDOMWindowUtils.cpp                 |   1 -
 dom/base/nsFocusManager.cpp                   |   2 +-
 dom/base/nsGlobalWindow.cpp                   |   2 +-
 dom/base/nsWindowRoot.cpp                     |   1 -
 .../libeditor/base/nsEditorEventListener.cpp  |   1 -
 editor/libeditor/html/nsHTMLEditor.cpp        |   1 -
 .../components/find/src/nsWebBrowserFind.cpp  |   1 -
 .../spellcheck/src/mozInlineSpellChecker.cpp  |   1 -
 layout/base/nsCSSFrameConstructor.cpp         |   2 +-
 layout/base/nsDocumentViewer.cpp              |   1 -
 layout/base/nsPresContext.h                   |   2 +-
 layout/base/nsPresShell.cpp                   |   7 +-
 layout/forms/nsButtonFrameRenderer.cpp        |   2 +-
 layout/forms/nsFileControlFrame.cpp           |   2 +-
 layout/forms/nsFormControlFrame.cpp           |   9 +-
 layout/forms/nsListControlFrame.cpp           |   8 +-
 layout/forms/nsTextControlFrame.cpp           |   1 -
 layout/generic/nsContainerFrame.cpp           |   1 -
 layout/generic/nsFrame.cpp                    |   4 +-
 layout/generic/nsImageFrame.cpp               |   3 +-
 layout/inspector/src/inDOMUtils.cpp           |   5 +-
 layout/inspector/src/inDOMUtils.h             |   2 +-
 layout/inspector/src/inLayoutUtils.cpp        |   2 +-
 layout/inspector/src/inLayoutUtils.h          |   4 +-
 layout/printing/nsPrintPreviewListener.cpp    |   1 -
 layout/style/nsCSSRuleProcessor.cpp           |   2 +-
 layout/style/nsHTMLStyleSheet.cpp             |   2 +-
 layout/style/nsIStyleRuleProcessor.h          |   2 +-
 layout/style/nsStyleSet.cpp                   |   2 +-
 layout/xul/base/src/nsBoxFrame.cpp            |  13 +-
 layout/xul/base/src/nsButtonBoxFrame.cpp      |   6 +-
 layout/xul/base/src/nsMenuBarListener.cpp     |   2 -
 layout/xul/base/src/nsMenuPopupFrame.cpp      |   4 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  12 +-
 layout/xul/base/src/nsXULLabelFrame.cpp       |  11 +-
 .../base/src/tree/src/nsTreeContentView.cpp   |   2 +-
 toolkit/components/places/History.cpp         |   1 -
 .../typeaheadfind/nsTypeAheadFind.cpp         |   1 -
 widget/src/cocoa/nsNativeThemeCocoa.mm        |   2 +-
 widget/src/qt/nsNativeThemeQt.cpp             |   1 -
 widget/src/windows/nsNativeThemeWin.cpp       |   2 +-
 widget/src/xpwidgets/nsBaseDragService.cpp    |   1 -
 widget/src/xpwidgets/nsNativeTheme.cpp        |   4 +-
 widget/src/xpwidgets/nsNativeTheme.h          |   2 +-
 90 files changed, 224 insertions(+), 415 deletions(-)
 delete mode 100644 content/events/public/nsIEventStateManager.h

diff --git a/accessible/src/base/AccEvent.cpp b/accessible/src/base/AccEvent.cpp
index 2ff4733ae1b6..1e6d70c96934 100644
--- a/accessible/src/base/AccEvent.cpp
+++ b/accessible/src/base/AccEvent.cpp
@@ -50,7 +50,7 @@
 #include "nsAccEvent.h"
 
 #include "nsIDOMDocument.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIServiceManager.h"
 #ifdef MOZ_XUL
 #include "nsIDOMXULMultSelectCntrlEl.h"
@@ -203,7 +203,7 @@ AccEvent::CaptureIsFromUserInput(EIsFromUserInput aIsFromUserInput)
     return;
   }
 
-  nsIEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
+  nsEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
   if (!esm) {
     NS_NOTREACHED("There should always be an ESM for an event");
     return;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 4accb5a3a1b2..545ece530d91 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -75,7 +75,7 @@
 #include "nsRootAccessibleWrap.h"
 #include "nsTextFragment.h"
 #include "mozilla/Services.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #ifdef MOZ_XUL
 #include "nsXULAlertAccessible.h"
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index 97d453a36318..cfa89b13eb17 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -99,7 +99,7 @@
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
 #include "nsNetUtil.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #ifdef NS_DEBUG
 #include "nsIDOMCharacterData.h"
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index d4a3b02fe2bb..f7d660f6c849 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -60,7 +60,7 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsIScrollableFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsISelection2.h"
 #include "nsISelectionController.h"
 #include "nsPIDOMWindow.h"
@@ -206,7 +206,7 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
 
   // Accesskeys are registered by @accesskey attribute only. At first check
   // whether it is presented on the given element to avoid the slow
-  // nsIEventStateManager::GetRegisteredAccessKey() method.
+  // nsEventStateManager::GetRegisteredAccessKey() method.
   if (!aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey))
     return 0;
 
@@ -222,13 +222,11 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
   if (!presContext)
     return 0;
 
-  nsIEventStateManager *esm = presContext->EventStateManager();
+  nsEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return 0;
 
-  PRUint32 key = 0;
-  esm->GetRegisteredAccessKey(aContent, &key);
-  return key;
+  return esm->GetRegisteredAccessKey(aContent);
 }
 
 nsIContent *
diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h
index 66a2aa446ac9..613c535d0033 100644
--- a/accessible/src/base/nsCoreUtils.h
+++ b/accessible/src/base/nsCoreUtils.h
@@ -110,7 +110,7 @@ public:
 
   /**
    * Return an accesskey registered on the given element by
-   * nsIEventStateManager or 0 if there is no registered accesskey.
+   * nsEventStateManager or 0 if there is no registered accesskey.
    *
    * @param aContent - the given element.
    */
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index a40473134893..08ac96e66718 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -61,7 +61,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMXULPopupElement.h"
 #include "nsIEditingSession.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsHTMLSelectAccessible.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp
index c7fdda1335d8..040114a49dae 100644
--- a/accessible/src/html/nsHTMLLinkAccessible.cpp
+++ b/accessible/src/html/nsHTMLLinkAccessible.cpp
@@ -42,7 +42,7 @@
 #include "States.h"
 #include "nsCoreUtils.h"
 
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLLinkAccessible
diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp
index 5de0cc1c9077..60d37d413791 100644
--- a/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -401,7 +401,7 @@ nsXULMenuitemAccessible::GetKeyboardShortcut(nsAString& aAccessKey)
   static PRInt32 gMenuAccesskeyModifier = -1;  // magic value of -1 indicates unitialized state
 
   // We do not use nsCoreUtils::GetAccesskeyFor() because accesskeys for
-  // menu are't registered by nsIEventStateManager.
+  // menu are't registered by nsEventStateManager.
   nsAutoString accesskey;
   mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey,
                     accesskey);
diff --git a/content/base/public/nsIContent.h b/content/base/public/nsIContent.h
index 190c013d4f45..b405eb664e36 100644
--- a/content/base/public/nsIContent.h
+++ b/content/base/public/nsIContent.h
@@ -789,7 +789,7 @@ public:
   /**
    * Method to get the _intrinsic_ content state of this content node.  This is
    * the state that is independent of the node's presentation.  To get the full
-   * content state, use nsIEventStateManager.  Also see nsIEventStateManager
+   * content state, use nsEventStateManager.  Also see nsEventStateManager
    * for the possible bits that could be set here.
    */
   virtual nsEventStates IntrinsicState() const;
diff --git a/content/base/src/Link.cpp b/content/base/src/Link.cpp
index 3fa567801eaa..67429bfa063b 100644
--- a/content/base/src/Link.cpp
+++ b/content/base/src/Link.cpp
@@ -39,7 +39,7 @@
 
 #include "Link.h"
 
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIURL.h"
 
 #include "nsContentUtils.h"
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 1471888200ca..1c2f7f13df7a 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -59,7 +59,6 @@
 #include "nsDocument.h"
 #include "nsUnicharUtils.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentList.h"
 #include "nsIObserver.h"
 #include "nsIBaseWindow.h"
diff --git a/content/base/src/nsGenConImageContent.cpp b/content/base/src/nsGenConImageContent.cpp
index 801be5590e3f..ea43820ba459 100644
--- a/content/base/src/nsGenConImageContent.cpp
+++ b/content/base/src/nsGenConImageContent.cpp
@@ -46,7 +46,7 @@
 #include "nsXMLElement.h"
 #include "nsImageLoadingContent.h"
 #include "imgIRequest.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 class nsGenConImageContent : public nsXMLElement,
                              public nsImageLoadingContent
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 333131d9ec84..10df002985a5 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -66,7 +66,7 @@
 #include "nsStyleConsts.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsDOMCID.h"
@@ -110,7 +110,6 @@
 
 #include "nsIServiceManager.h"
 #include "nsIDOMEventListener.h"
-#include "nsEventStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
 
@@ -5379,10 +5378,8 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
                                nsIFocusManager::FLAG_NOSCROLL);
           }
 
-          nsIEventStateManager* esm =
-            aVisitor.mPresContext->EventStateManager();
           nsEventStateManager::SetActiveManager(
-            static_cast<nsEventStateManager*>(esm), this);
+            aVisitor.mPresContext->EventStateManager(), this);
         }
       }
     }
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index 196e4069b550..c499adbd4ee7 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -62,7 +62,7 @@
 #include "nsPLDOMEvent.h"
 
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsGUIEvent.h"
 
 #include "nsIChannel.h"
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 6e168d2648ff..5410a27e5a09 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -53,7 +53,7 @@
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIExternalProtocolHandler.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIObjectFrame.h"
 #include "nsIPluginDocument.h"
 #include "nsIPluginHost.h"
diff --git a/content/events/public/Makefile.in b/content/events/public/Makefile.in
index 96dab6511518..59ca27a9abb1 100644
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@@ -48,7 +48,6 @@ XPIDL_MODULE	= content_events
 EXPORTS		= \
 		nsMutationEvent.h \
 		nsIEventListenerManager.h \
-		nsIEventStateManager.h \
 		nsIPrivateDOMEvent.h \
 		nsIPrivateTextEvent.h \
 		nsIPrivateTextRange.h \
diff --git a/content/events/public/nsIEventStateManager.h b/content/events/public/nsIEventStateManager.h
deleted file mode 100644
index bffd0f855ddc..000000000000
--- a/content/events/public/nsIEventStateManager.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIEventStateManager_h__
-#define nsIEventStateManager_h__
-
-#include "nsEvent.h"
-#include "nsISupports.h"
-#include "nsEventStates.h"
-
-class nsIContent;
-class nsIDocument;
-class nsPresContext;
-class nsIDOMEvent;
-class nsIFrame;
-class nsIView;
-class nsIWidget;
-class imgIContainer;
-
-/*
- * Event state manager interface.
- */
-#define NS_IEVENTSTATEMANAGER_IID \
-{0x69ab5b16, 0x6690, 0x42fc, \
-  { 0xa9, 0xe5, 0xa3, 0xb4, 0xf8, 0x0f, 0xcb, 0xa6 } }
-
-#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
-
-class nsIEventStateManager : public nsISupports {
-
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
-
-  NS_IMETHOD Init() = 0;
-
-  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext, 
-                            nsEvent *aEvent, 
-                            nsIFrame* aTargetFrame,
-                            nsEventStatus* aStatus,
-                            nsIView* aView) = 0;
-
-  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext, 
-                             nsEvent *aEvent, 
-                             nsIFrame* aTargetFrame,
-                             nsEventStatus* aStatus,
-                             nsIView* aView) = 0;
-
-  NS_IMETHOD SetPresContext(nsPresContext* aPresContext) = 0;
-  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
-
-  NS_IMETHOD GetEventTarget(nsIFrame **aFrame) = 0;
-  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent) = 0;
-
-  /**
-   * Returns the content state of aContent.
-   * @param aContent      The control whose state is requested.
-   * @param aFollowLabels Whether to reflect a label's content state on its
-   *                      associated control. If aFollowLabels is true and
-   *                      aContent is a control which has a label that has the 
-   *                      hover or active content state set, GetContentState
-   *                      will pretend that those states are also set on aContent.
-   * @return              The content state.
-   */
-  virtual nsEventStates GetContentState(nsIContent *aContent,
-                                        PRBool aFollowLabels = PR_FALSE) = 0;
-
-  /**
-   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
-   * @param aContent Content which has changed states.  This may be null to
-   *                 indicate that nothing is in this state anymore.
-   * @param aState   One of NS_EVENT_STATE_ACTIVE, NS_EVENT_STATE_HOVER,
-   *                 NS_EVENT_STATE_DRAGOVER, NS_EVENT_STATE_URLTARGET.  Don't
-   *                 pass anything else!  Passing in a state object that has
-   *                 more than one of those states set is not supported.
-   * @return  Whether the content was able to change all states. Returns PR_FALSE
-   *                  if a resulting DOM event causes the content node passed in
-   *                  to not change states. Note, the frame for the content may
-   *                  change as a result of the content state change, because of
-   *                  frame reconstructions that may occur, but this does not
-   *                  affect the return value.
-   */
-  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState) = 0;
-
-  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent) = 0;
-  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK) = 0;
-
-  // Access Key Registration
-
-  /**
-   * Register accesskey on the given element. When accesskey is activated then
-   * the element will be notified via nsIContent::PerformAccesskey() method.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
-
-  /**
-   * Unregister accesskey for the given element.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
-
-  /**
-   * Get accesskey registered on the given element or 0 if there is none.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      registered accesskey
-   * @return           NS_OK
-   */
-  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey) = 0;
-
-  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
-                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
-                       nsIWidget* aWidget, PRBool aLockCursor) = 0;
-
-  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext) = 0;
-  
-  /**
-   * Returns true if the current code is being executed as a result of user input.
-   * This includes timers or anything else that is initiated from user input.
-   * However, mouse hover events are not counted as user input, nor are
-   * page load events. If this method is called from asynchronously executed code,
-   * such as during layout reflows, it will return false.
-   */
-  NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventStateManager, NS_IEVENTSTATEMANAGER_IID)
-
-#endif // nsIEventStateManager_h__
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index de878f4749ee..28475d9017bc 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -46,6 +46,10 @@ MODULE		= content
 LIBRARY_NAME	= gkconevents_s
 LIBXUL_LIBRARY  = 1
 
+EXPORTS		= \
+		nsEventStateManager.h \
+		$(NULL)
+		
 CPPSRCS		= \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index cf290d94052e..3622ed48cbab 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -39,7 +39,6 @@
 #include "nsIServiceManager.h"
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
-#include "nsIEventStateManager.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIDragService.h"
 
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 4767f13862ce..920f5b376ae3 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -316,8 +316,7 @@ nsDOMEvent::GetTargetFromFrame()
   if (!mPresContext) { return nsnull; }
 
   // Get the target frame (have to get the ESM first)
-  nsIFrame* targetFrame = nsnull;
-  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   if (!targetFrame) { return nsnull; }
 
   // get the real content
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
index e38270d4ade5..dbedcde48bea 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -40,7 +40,6 @@
 #include "nsDOMMouseEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseEvent::nsDOMMouseEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index a9e2bfa9f87d..34bda3a5ddea 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -38,7 +38,6 @@
 #include "nsDOMMouseScrollEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index a3c1406a77f8..07bcba00a9d3 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOMNode.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsIScrollableFrame.h"
@@ -258,7 +258,7 @@ nsDOMUIEvent::GetRangeParent(nsIDOMNode** aRangeParent)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   }
 
   *aRangeParent = nsnull;
@@ -286,7 +286,7 @@ nsDOMUIEvent::GetRangeOffset(PRInt32* aRangeOffset)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   }
 
   if (targetFrame) {
@@ -334,8 +334,7 @@ nsDOMUIEvent::GetLayerPoint()
     return mLayerPoint;
   }
   // XXX I'm not really sure this is correct; it's my best shot, though
-  nsIFrame* targetFrame;
-  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   if (!targetFrame)
     return mLayerPoint;
   nsIFrame* layer = nsLayoutUtils::GetClosestLayer(targetFrame);
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index b98f081a457f..0f78a1346d9a 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -56,7 +56,6 @@
 #ifdef MOZ_SVG
 #include "nsGkAtoms.h"
 #endif // MOZ_SVG
-#include "nsIEventStateManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIJSEventListener.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index f62c71c4ad3e..b87f2f04ad39 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -811,7 +811,7 @@ nsEventStateManager::UpdateUserActivityTimer(void)
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::Init()
 {
   nsCOMPtr<nsIObserverService> observerService =
@@ -996,8 +996,7 @@ nsEventStateManager::Observe(nsISupports *aSubject,
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsEventStateManager)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventStateManager)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEventStateManager)
-   NS_INTERFACE_MAP_ENTRY(nsIEventStateManager)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
    NS_INTERFACE_MAP_ENTRY(nsIObserver)
    NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
@@ -1047,8 +1046,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsEventStateManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mAccessKeys);
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
                                     nsEvent *aEvent,
                                     nsIFrame* aTargetFrame,
@@ -2818,7 +2816,7 @@ NodeAllowsClickThrough(nsINode* aNode)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
                                      nsEvent *aEvent,
                                      nsIFrame* aTargetFrame,
@@ -2993,8 +2991,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
       ClearGlobalActiveContent(this);
       if (IsMouseEventReal(aEvent)) {
         if (!mCurrentTarget) {
-          nsIFrame* targ;
-          GetEventTarget(&targ);
+          GetEventTarget();
         }
         if (mCurrentTarget) {
           ret = CheckForAndDispatchClick(presContext, (nsMouseEvent*)aEvent,
@@ -3356,28 +3353,24 @@ nsEventStateManager::IsTargetCrossProcess(nsGUIEvent *aEvent)
   return TabParent::GetIMETabParent() != nsnull;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::NotifyDestroyPresContext(nsPresContext* aPresContext)
 {
   nsIMEStateManager::OnDestroyPresContext(aPresContext);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::SetPresContext(nsPresContext* aPresContext)
 {
   mPresContext = aPresContext;
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
 {
   if (aFrame && aFrame == mCurrentTarget) {
     mCurrentTargetContent = aFrame->GetContent();
   }
-
-  return NS_OK;
 }
 
 void
@@ -3436,7 +3429,7 @@ nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
   }
 }
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
                                PRBool aHaveHotspot,
                                float aHotspotX, float aHotspotY,
@@ -3698,8 +3691,7 @@ nsEventStateManager::NotifyMouseOut(nsGUIEvent* aEvent, nsIContent* aMovingInto)
         docshell->GetPresContext(getter_AddRefs(presContext));
 
         if (presContext) {
-          nsEventStateManager* kidESM =
-            static_cast<nsEventStateManager*>(presContext->EventStateManager());
+          nsEventStateManager* kidESM = presContext->EventStateManager();
           // Not moving into any element in this subdocument
           kidESM->NotifyMouseOut(aEvent, nsnull);
         }
@@ -3757,9 +3749,7 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent)
     if (docContent) {
       nsIPresShell *parentShell = parentDoc->GetShell();
       if (parentShell) {
-        nsEventStateManager* parentESM =
-          static_cast<nsEventStateManager*>
-                     (parentShell->GetPresContext()->EventStateManager());
+        nsEventStateManager* parentESM = parentShell->GetPresContext()->EventStateManager();
         parentESM->NotifyMouseOver(aEvent, docContent);
       }
     }
@@ -3804,8 +3794,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
   case NS_MOUSE_MOVE:
     {
       // Get the target content target (mousemove target == mouseover target)
-      nsCOMPtr<nsIContent> targetElement;
-      GetEventTargetContent(aEvent, getter_AddRefs(targetElement));
+      nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aEvent);
       if (!targetElement) {
         // We're always over the document root, even if we're only
         // over dead space in a page (whose frame is not associated with
@@ -4093,8 +4082,7 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
 
     nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
     if (presShell) {
-      nsCOMPtr<nsIContent> mouseContent;
-      GetEventTargetContent(aEvent, getter_AddRefs(mouseContent));
+      nsCOMPtr<nsIContent> mouseContent = GetEventTargetContent(aEvent);
 
       ret = presShell->HandleEventWithTarget(&event, mCurrentTarget,
                                              mouseContent, aStatus);
@@ -4120,61 +4108,56 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
   return ret;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
+nsIFrame*
+nsEventStateManager::GetEventTarget()
 {
   nsIPresShell *shell;
   if (mCurrentTarget ||
       !mPresContext ||
       !(shell = mPresContext->GetPresShell())) {
-    *aFrame = mCurrentTarget;
-    return NS_OK;
+    return mCurrentTarget;
   }
 
   if (mCurrentTargetContent) {
     mCurrentTarget = mPresContext->GetPrimaryFrameFor(mCurrentTargetContent);
     if (mCurrentTarget) {
-      *aFrame = mCurrentTarget;
-      return NS_OK;
+      return mCurrentTarget;
     }
   }
 
   nsIFrame* frame = shell->GetEventTargetFrame();
-  *aFrame = mCurrentTarget = frame;
-  return NS_OK;
+  return (mCurrentTarget = frame);
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetEventTargetContent(nsEvent* aEvent,
-                                           nsIContent** aContent)
+already_AddRefed<nsIContent>
+nsEventStateManager::GetEventTargetContent(nsEvent* aEvent)
 {
   if (aEvent &&
       (aEvent->message == NS_FOCUS_CONTENT ||
        aEvent->message == NS_BLUR_CONTENT)) {
-    NS_IF_ADDREF(*aContent = GetFocusedContent());
-    return NS_OK;
+    nsCOMPtr<nsIContent> content = GetFocusedContent();
+    return content.forget();
   }
 
   if (mCurrentTargetContent) {
-    *aContent = mCurrentTargetContent;
-    NS_IF_ADDREF(*aContent);
-    return NS_OK;
+    nsCOMPtr<nsIContent> content = mCurrentTargetContent;
+    return content.forget();
   }
 
-  *aContent = nsnull;
+  nsIContent *content = nsnull;
 
   nsIPresShell *presShell = mPresContext->GetPresShell();
   if (presShell) {
-    *aContent = presShell->GetEventTargetContent(aEvent).get();
+    content = presShell->GetEventTargetContent(aEvent).get();
   }
 
   // Some events here may set mCurrentTarget but not set the corresponding
   // event target in the PresShell.
-  if (!*aContent && mCurrentTarget) {
-    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, aContent);
+  if (!content && mCurrentTarget) {
+    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, &content);
   }
 
-  return NS_OK;
+  return content;
 }
 
 static already_AddRefed<nsIContent>
@@ -4419,7 +4402,7 @@ nsEventStateManager::SetContentState(nsIContent *aContent, nsEventStates aState)
   return PR_TRUE;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 {
   // inform the focus manager that the content is being removed. If this
@@ -4452,59 +4435,44 @@ nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent
     // See bug 292146 for why we want to null this out
     mLastMouseOverElement = nsnull;
   }
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK)
+PRBool
+nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent)
 {
-  *aOK = PR_TRUE;
-  if (aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
-    if (!sNormalLMouseEventInProcess) {
-      *aOK = PR_FALSE;
-    }
-  }
-  return NS_OK;
+  return !(aEvent->message == NS_MOUSE_BUTTON_DOWN &&
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton  && 
+      !sNormalLMouseEventInProcess);
 }
 
 //-------------------------------------------
 // Access Key Registration
 //-------------------------------------------
-NS_IMETHODIMP
+void
 nsEventStateManager::RegisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent && mAccessKeys.IndexOf(aContent) == -1)
     mAccessKeys.AppendObject(aContent);
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent)
     mAccessKeys.RemoveObject(aContent);
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent,
-                                            PRUint32* aKey)
+PRUint32
+nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent)
 {
   NS_ENSURE_ARG(aContent);
-  NS_ENSURE_ARG_POINTER(aKey);
-  *aKey = 0;
 
   if (mAccessKeys.IndexOf(aContent) == -1)
-    return NS_OK;
+    return 0;
 
   nsAutoString accessKey;
   aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
-  *aKey = accessKey.First();
-  return NS_OK;
+  return accessKey.First();
 }
 
 void
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 357559ad52a5..5d64ea9a2680 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -39,7 +39,6 @@
 #ifndef nsEventStateManager_h__
 #define nsEventStateManager_h__
 
-#include "nsIEventStateManager.h"
 #include "nsEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
@@ -56,6 +55,7 @@
 #include "nsIScrollableFrame.h"
 #include "nsFocusManager.h"
 #include "nsIDocument.h"
+#include "nsEventStates.h"
 
 class nsIPresShell;
 class nsIDocShell;
@@ -75,7 +75,6 @@ class TabParent;
  */
 
 class nsEventStateManager : public nsSupportsWeakReference,
-                            public nsIEventStateManager,
                             public nsIObserver
 {
   friend class nsMouseWheelTransaction;
@@ -86,7 +85,7 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
-  NS_IMETHOD Init();
+  nsresult Init();
   nsresult Shutdown();
 
   /* The PreHandleEvent method is called before event dispatch to either
@@ -96,44 +95,86 @@ public:
    * PostHandleEvent.  Any centralized event processing which must occur before
    * DOM or frame event handling should occur here as well.
    */
-  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext,
-                         nsEvent *aEvent,
-                         nsIFrame* aTargetFrame,
-                         nsEventStatus* aStatus,
-                         nsIView* aView);
+  nsresult PreHandleEvent(nsPresContext* aPresContext,
+                          nsEvent *aEvent,
+                          nsIFrame* aTargetFrame,
+                          nsEventStatus* aStatus,
+                          nsIView* aView);
 
   /* The PostHandleEvent method should contain all system processing which
    * should occur conditionally based on DOM or frame processing.  It should
    * also contain any centralized event processing which must occur after
    * DOM and frame processing.
    */
-  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext,
-                             nsEvent *aEvent,
-                             nsIFrame* aTargetFrame,
-                             nsEventStatus* aStatus,
-                             nsIView* aView);
+  nsresult PostHandleEvent(nsPresContext* aPresContext,
+                           nsEvent *aEvent,
+                           nsIFrame* aTargetFrame,
+                           nsEventStatus* aStatus,
+                           nsIView* aView);
 
-  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext);
-  NS_IMETHOD SetPresContext(nsPresContext* aPresContext);
-  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
+  void NotifyDestroyPresContext(nsPresContext* aPresContext);
+  void SetPresContext(nsPresContext* aPresContext);
+  void ClearFrameRefs(nsIFrame* aFrame);
 
-  NS_IMETHOD GetEventTarget(nsIFrame **aFrame);
-  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent);
+  nsIFrame* GetEventTarget();
+  already_AddRefed<nsIContent> GetEventTargetContent(nsEvent* aEvent);
 
+  /**
+   * Returns the content state of aContent.
+   * @param aContent      The control whose state is requested.
+   * @param aFollowLabels Whether to reflect a label's content state on its
+   *                      associated control. If aFollowLabels is true and
+   *                      aContent is a control which has a label that has the 
+   *                      hover or active content state set, GetContentState
+   *                      will pretend that those states are also set on aContent.
+   * @return              The content state.
+   */
   virtual nsEventStates GetContentState(nsIContent *aContent,
                                         PRBool aFollowLabels = PR_FALSE);
-  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
-  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
-  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK);
 
-  // Access Key Registration
-  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey);
+  /**
+   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
+   * @param aContent Content which has changed states
+   * @param aState   Corresponding state flags such as NS_EVENT_STATE_FOCUS
+   * @return  Whether the content was able to change all states. Returns PR_FALSE
+   *                  if a resulting DOM event causes the content node passed in
+   *                  to not change states. Note, the frame for the content may
+   *                  change as a result of the content state change, because of
+   *                  frame reconstructions that may occur, but this does not
+   *                  affect the return value.
+   */
+  PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
+  void ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
+  PRBool EventStatusOK(nsGUIEvent* aEvent);
 
-  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
-                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
-                       nsIWidget* aWidget, PRBool aLockCursor);
+  /**
+   * Register accesskey on the given element. When accesskey is activated then
+   * the element will be notified via nsIContent::PerformAccesskey() method.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  void RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+
+  /**
+   * Unregister accesskey for the given element.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  void UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+
+  /**
+   * Get accesskey registered on the given element or 0 if there is none.
+   *
+   * @param  aContent  the given element
+   * @return           registered accesskey
+   */
+  PRUint32 GetRegisteredAccessKey(nsIContent* aContent);
+
+  nsresult SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
+                     PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
+                     nsIWidget* aWidget, PRBool aLockCursor); 
 
   static void StartHandlingUserInput()
   {
@@ -150,16 +191,23 @@ public:
     return sUserInputEventDepth > 0;
   }
 
+  /**
+   * Returns true if the current code is being executed as a result of user input.
+   * This includes timers or anything else that is initiated from user input.
+   * However, mouse hover events are not counted as user input, nor are
+   * page load events. If this method is called from asynchronously executed code,
+   * such as during layout reflows, it will return false.
+   */
   NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() { return IsHandlingUserInput(); }
   
   nsPresContext* GetPresContext() { return mPresContext; }
 
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsEventStateManager,
-                                           nsIEventStateManager)
+                                           nsIObserver)
 
   static nsIDocument* sMouseOverDocument;
 
-  static nsIEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
+  static nsEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
 
   // Sets aNewESM to be the active event state manager, and
   // if aContent is non-null, marks the object as active.
@@ -489,4 +537,6 @@ private:
   static void operator delete(void* /*memory*/) {}
 };
 
+#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
+
 #endif // nsEventStateManager_h__
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 6948487f4f1e..9355521ed2a2 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -86,7 +86,7 @@
 #include "nsString.h"
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsDOMCSSDeclaration.h"
@@ -1056,9 +1056,8 @@ nsGenericHTMLElement::CheckHandleEventForAnchorsPreconditions(nsEventChainVisito
   //Need to check if we hit an imagemap area and if so see if we're handling
   //the event on that map or on a link farther up the tree.  If we're on a
   //link farther up, do nothing.
-  nsCOMPtr<nsIContent> target;
-  aVisitor.mPresContext->EventStateManager()->
-    GetEventTargetContent(aVisitor.mEvent, getter_AddRefs(target));
+  nsCOMPtr<nsIContent> target = aVisitor.mPresContext->EventStateManager()->
+    GetEventTargetContent(aVisitor.mEvent);
 
   return !target || !IsArea(target) || IsArea(this);
 }
@@ -3353,7 +3352,7 @@ nsGenericHTMLElement::RegUnRegAccessKey(PRBool aDoReg)
   nsPresContext *presContext = GetPresContext();
 
   if (presContext) {
-    nsIEventStateManager *esm = presContext->EventStateManager();
+    nsEventStateManager *esm = presContext->EventStateManager();
 
     // Register or unregister as appropriate.
     if (aDoReg) {
diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp
index 8602bad4a079..2e70258345dd 100644
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -47,7 +47,6 @@
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 
 #include "nsHTMLDNSPrefetch.h"
 
diff --git a/content/html/content/src/nsHTMLAreaElement.cpp b/content/html/content/src/nsHTMLAreaElement.cpp
index 2f5e85a1d064..63c3e015e0da 100644
--- a/content/html/content/src/nsHTMLAreaElement.cpp
+++ b/content/html/content/src/nsHTMLAreaElement.cpp
@@ -41,7 +41,6 @@
 #include "nsILink.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
-#include "nsIEventStateManager.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 6804fa70edd8..70ca60d95eb1 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -50,7 +50,6 @@
 #include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDocument.h"
@@ -377,7 +376,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                   nsMouseEvent::eLeftButton) {
               if (NS_IS_TRUSTED_EVENT(aVisitor.mEvent)) {
-                nsIEventStateManager* esm =
+                nsEventStateManager* esm =
                   aVisitor.mPresContext->EventStateManager();
                 nsEventStateManager::SetActiveManager(
                   static_cast<nsEventStateManager*>(esm), this);
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 357c12b2ed74..5dea27259821 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -81,7 +81,6 @@
 #include "nsIHTMLCollection.h"
 
 #include "nsIConstraintValidation.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIDOMHTMLButtonElement.h"
 
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 09214bebe747..0b0ebff0abf0 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -63,7 +63,7 @@
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
 #include "nsIFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIServiceManager.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsDOMError.h"
diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index 76f678036296..b626925d8b7d 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -47,7 +47,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDocument.h"
 #include "nsGUIEvent.h"
-#include "nsIEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp
index 1750e588caa7..8a41cdd33c64 100644
--- a/content/html/content/src/nsHTMLLegendElement.cpp
+++ b/content/html/content/src/nsHTMLLegendElement.cpp
@@ -42,7 +42,6 @@
 #include "nsStyleConsts.h"
 #include "nsIForm.h"
 #include "nsIFormControl.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp
index e354bdd4f8da..53ea9a6453e7 100644
--- a/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -41,7 +41,7 @@
 #include "nsStyleConsts.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index 013f6770ef41..21a5336e9fd3 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -59,7 +59,7 @@
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsContentCreatorFunctions.h"
diff --git a/content/html/content/src/nsHTMLOutputElement.cpp b/content/html/content/src/nsHTMLOutputElement.cpp
index 3adc2382bf6d..e838ca9a69ff 100644
--- a/content/html/content/src/nsHTMLOutputElement.cpp
+++ b/content/html/content/src/nsHTMLOutputElement.cpp
@@ -41,7 +41,7 @@
 #include "nsDOMSettableTokenList.h"
 #include "nsStubMutationObserver.h"
 #include "nsIConstraintValidation.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "mozAutoDocUpdate.h"
 #include "nsHTMLFormElement.h"
 
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index 1474d4004354..eb885e90edbf 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -52,7 +52,7 @@
 
 #include "nsIDOMHTMLOptGroupElement.h"
 #include "nsHTMLOptionElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsGUIEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIBoxObject.h"
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 6271080e8fed..88f9dcfe530a 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -58,7 +58,7 @@
 #include "nsMappedAttributes.h"
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsLinebreakConverter.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
diff --git a/content/html/content/src/nsRadioVisitor.cpp b/content/html/content/src/nsRadioVisitor.cpp
index d931fdd13bf6..4859bdfd0b70 100644
--- a/content/html/content/src/nsRadioVisitor.cpp
+++ b/content/html/content/src/nsRadioVisitor.cpp
@@ -38,7 +38,7 @@
 #include "nsRadioVisitor.h"
 #include "nsAutoPtr.h"
 #include "nsHTMLInputElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIConstraintValidation.h"
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index af2c5284987c..a25f0377651d 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -124,7 +124,6 @@
 #include "nsIMutableArray.h"
 #include "nsArrayUtils.h"
 #include "nsIEffectiveTLDService.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIPrompt.h"
 //AHMED 12-2
diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp
index 78d29877b292..d36cc861a103 100644
--- a/content/mathml/content/src/nsMathMLElement.cpp
+++ b/content/mathml/content/src/nsMathMLElement.cpp
@@ -47,7 +47,7 @@
 #include "nsMappedAttributes.h"
 #include "nsStyleConsts.h"
 #include "nsIDocument.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsDOMClassInfoID.h"
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index 52c627924112..4f0d45fc62d5 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -48,7 +48,7 @@
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMEvent.h"
 #include "nsGUIEvent.h"
@@ -974,7 +974,7 @@ nsXTFElementWrapper::RegUnregAccessKey(PRBool aDoReg)
   if (!presContext)
     return;
 
-  nsIEventStateManager *esm = presContext->EventStateManager();
+  nsEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return;
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index dafd9f7f3bc6..635240649c6a 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -83,7 +83,7 @@
 #include "nsIDOMXULSelectCntrlItemEl.h"
 #include "nsIDocument.h"
 #include "nsIEventListenerManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsIFastLoadService.h"
 #include "nsHTMLStyleSheet.h"
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 9a012f8bb176..736f06ce3af2 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -74,7 +74,6 @@
 // for event firing in context menus
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIViewManager.h"
@@ -301,7 +300,7 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
       }
     }
 
-    nsIEventStateManager *esm = context->EventStateManager();
+    nsEventStateManager *esm = context->EventStateManager();
     nsCOMPtr<nsIContent> focusableContent = do_QueryInterface(element);
     esm->SetContentState(focusableContent, NS_EVENT_STATE_ACTIVE);
   }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7bf77e198af9..0a48832e1772 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -201,7 +201,7 @@
 #include "nsIGlobalHistory3.h"
 
 #ifdef DEBUG_DOCSHELL_FOCUS
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #endif
 
 #include "nsIFrame.h"
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index f6d77454d501..b36379adc171 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -46,7 +46,6 @@
 #include "nsGlobalWindow.h"
 #include "nsIDocument.h"
 #include "nsFocusManager.h"
-#include "nsIEventStateManager.h"
 #include "nsEventStateManager.h"
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index bf20c8ff794b..2a2b31ac8f46 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -68,7 +68,7 @@
 #include "nsFrameTraversal.h"
 #include "nsObjectFrame.h"
 #include "nsEventDispatcher.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIMEStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsCaret.h"
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 6f167ea9ac66..0a15c85ee02d 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -126,7 +126,7 @@
 #include "nsDOMString.h"
 #include "nsIEmbeddingSiteWindow2.h"
 #include "nsThreadUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIHttpProtocolHandler.h"
 #include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 67e3295a9b02..ca96c27eabc5 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -47,7 +47,6 @@
 #include "nsPresContext.h"
 #include "nsLayoutCID.h"
 #include "nsContentCID.h"
-#include "nsIEventStateManager.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsString.h"
diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp
index bb761239c3fa..844048dc13ee 100644
--- a/editor/libeditor/base/nsEditorEventListener.cpp
+++ b/editor/libeditor/base/nsEditorEventListener.cpp
@@ -71,7 +71,6 @@
 #include "nsIDOMNSRange.h"
 #include "nsEditorUtils.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIEventStateManager.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIFocusManager.h"
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 725613294ff8..512943255496 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -98,7 +98,6 @@
 
 #include "nsIFrame.h"
 #include "nsIParserService.h"
-#include "nsIEventStateManager.h"
 
 // Some utilities to handle annoying overloading of "A" tag for link and named anchor
 static char hrefText[] = "href";
diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp
index 8c667e508314..596b375cbf75 100644
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -56,7 +56,6 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsISelectionController.h"
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index 739ab2fbd508..c535bfe956a0 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -95,7 +95,6 @@
 #include "nsThreadUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsGUIEvent.h"
 
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 43b63fa319e6..b6377399f54f 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -66,7 +66,7 @@
 #include "nsUnicharUtils.h"
 #include "nsStyleSet.h"
 #include "nsIViewManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsStyleConsts.h"
 #include "nsTableOuterFrame.h"
 #include "nsIDOMXULElement.h"
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 3ef28eb3e7f7..a88fdad95e8a 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -58,7 +58,6 @@
 #include "nsIDocument.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
 #include "nsStyleSet.h"
 #include "nsIStyleSheet.h"
 #include "nsCSSStyleSheet.h"
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 09f399357933..0b7c334f8208 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -89,7 +89,7 @@ class nsFrameManager;
 class nsILinkHandler;
 class nsStyleContext;
 class nsIAtom;
-class nsIEventStateManager;
+class nsEventStateManager;
 class nsIURI;
 class nsILookAndFeel;
 class nsICSSPseudoComparator;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 465ff7879c67..00e4ee8725c5 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -118,6 +118,7 @@
 #include "nsViewsCID.h"
 #include "nsPresArena.h"
 #include "nsFrameManager.h"
+#include "nsEventStateManager.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsILayoutHistoryState.h"
@@ -3777,7 +3778,7 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
   }
   
   // Hold a reference to the ESM in case event dispatch tears us down.
-  nsCOMPtr<nsIEventStateManager> esm = mPresContext->EventStateManager();
+  nsRefPtr<nsEventStateManager> esm = mPresContext->EventStateManager();
 
   if (aAnchorName.IsEmpty()) {
     NS_ASSERTION(!aScroll, "can't scroll to empty anchor name");
@@ -6508,7 +6509,7 @@ PresShell::HandleEvent(nsIView         *aView,
     //
     // Note, currently for backwards compatibility we don't forward mouse events
     // to the active document when mouse is over some subdocument.
-    nsIEventStateManager* activeESM =
+    nsEventStateManager* activeESM =
       nsEventStateManager::GetActiveEventStateManager();
     if (activeESM && NS_IS_MOUSE_EVENT(aEvent) &&
         activeESM != shell->GetPresContext()->EventStateManager() &&
@@ -6794,7 +6795,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
   }
 #endif
 
-  nsCOMPtr<nsIEventStateManager> manager = mPresContext->EventStateManager();
+  nsRefPtr<nsEventStateManager> manager = mPresContext->EventStateManager();
   nsresult rv = NS_OK;
 
   if (!NS_EVENT_NEEDS_FRAME(aEvent) || GetCurrentEventFrame()) {
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 1d61068b6336..80f39c94e303 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -44,7 +44,7 @@
 #include "nsDisplayList.h"
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #define ACTIVE   "active"
 #define HOVER    "hover"
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index f6a818c624f4..65c9c65a4d91 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -91,7 +91,7 @@
 #include "nsICapturePicker.h"
 #include "nsIFileURL.h"
 #include "nsDOMFile.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 namespace dom = mozilla::dom;
 
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 45378ebb9eb3..09fbaeff8e1a 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -38,7 +38,7 @@
 #include "nsFormControlFrame.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMHTMLInputElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsILookAndFeel.h"
 
 //#define FCF_NOISY
@@ -128,12 +128,13 @@ nsFormControlFrame::RegUnRegAccessKey(nsIFrame * aFrame, PRBool aDoReg)
   nsIContent* content = aFrame->GetContent();
   content->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
   if (!accessKey.IsEmpty()) {
-    nsIEventStateManager *stateManager = presContext->EventStateManager();
+    nsEventStateManager *stateManager = presContext->EventStateManager();
     if (aDoReg) {
-      return stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
+      stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
     } else {
-      return stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
+      stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
     }
+    return NS_OK;
   }
   return NS_ERROR_FAILURE;
 }
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index db185a994499..f9e128870a4f 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsHTMLParts.h"
 #include "nsIDOMEventTarget.h"
 #include "nsEventDispatcher.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMMouseEvent.h"
@@ -87,7 +87,6 @@
 #include "nsIDOMKeyListener.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayList.h"
-#include "nsIEventStateManager.h"
 
 // Constants
 const nscoord kMaxDropDownRows          = 20; // This matches the setting for 4.x browsers
@@ -2072,9 +2071,8 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
     }
   }
 
-  nsCOMPtr<nsIContent> content;
-  PresContext()->EventStateManager()->
-    GetEventTargetContent(nsnull, getter_AddRefs(content));
+  nsCOMPtr<nsIContent> content = PresContext()->EventStateManager()->
+    GetEventTargetContent(nsnull);
 
   nsCOMPtr<nsIContent> optionContent = GetOptionFromContent(content);
   if (optionContent) {
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 22c543c7b157..20c6c00bf359 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -92,7 +92,6 @@
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMNSUIEvent.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIDOMFocusListener.h" //onchange events
 #include "nsIDOMCharacterData.h" //for selection setting helper func
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 4564a68f928e..cbed44bacec3 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -66,7 +66,6 @@
 #include "nsLayoutErrors.h"
 #include "nsDisplayList.h"
 #include "nsContentErrors.h"
-#include "nsIEventStateManager.h"
 #include "nsListControlFrame.h"
 #include "nsIBaseWindow.h"
 #include "nsThemeConstants.h"
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 6c35419a67b4..dcbffd451066 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2076,9 +2076,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
   //We often get out of sync state issues with mousedown events that
   //get interrupted by alerts/dialogs.
   //Check with the ESM to see if we should process this one
-  PRBool eventOK;
-  aPresContext->EventStateManager()->EventStatusOK(aEvent, &eventOK);
-  if (!eventOK) 
+  if (!aPresContext->EventStateManager()->EventStatusOK(aEvent)) 
     return NS_OK;
 
   nsresult rv;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 55fed2703b39..0eebef01f47d 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -88,7 +88,6 @@
 #include "imgIContainer.h"
 #include "imgILoader.h"
 
-#include "nsContentPolicyUtils.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsIPrefBranch2.h"
 #include "nsIPrefService.h"
@@ -96,7 +95,7 @@
 
 #include "nsIContentPolicy.h"
 #include "nsContentPolicyUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsLayoutErrors.h"
 #include "nsBidiUtils.h"
 #include "nsBidiPresUtils.h"
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 6a332d6590ce..25dfe94cf9eb 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -57,6 +57,7 @@
 #include "nsIMutableArray.h"
 #include "nsBindingManager.h"
 #include "nsComputedDOMStyle.h"
+#include "nsEventStateManager.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -236,7 +237,7 @@ inDOMUtils::SetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 {
   NS_ENSURE_ARG_POINTER(aElement);
   
-  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
@@ -254,7 +255,7 @@ inDOMUtils::GetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 
   NS_ENSURE_ARG_POINTER(aElement);
 
-  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
diff --git a/layout/inspector/src/inDOMUtils.h b/layout/inspector/src/inDOMUtils.h
index 27d77949d924..f589da4a324b 100644
--- a/layout/inspector/src/inDOMUtils.h
+++ b/layout/inspector/src/inDOMUtils.h
@@ -40,11 +40,11 @@
 
 #include "inIDOMUtils.h"
 
-#include "nsIEventStateManager.h"
 #include "nsISupportsArray.h"
 
 class nsRuleNode;
 class nsStyleContext;
+class nsIContent;
 
 class inDOMUtils : public inIDOMUtils
 {
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 9c31fad73fed..111b2bf4febd 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -90,7 +90,7 @@ inLayoutUtils::GetFrameFor(nsIDOMElement* aElement)
   return content->GetPrimaryFrame();
 }
 
-nsIEventStateManager*
+nsEventStateManager*
 inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement)
 {
   NS_PRECONDITION(aElement, "Passing in a null element is bad");
diff --git a/layout/inspector/src/inLayoutUtils.h b/layout/inspector/src/inLayoutUtils.h
index 1ff0a7bfa4d7..00d7b01f94f2 100644
--- a/layout/inspector/src/inLayoutUtils.h
+++ b/layout/inspector/src/inLayoutUtils.h
@@ -43,7 +43,7 @@ class nsIDOMDocument;
 class nsIDOMElement;
 class nsIDOMNode;
 class nsIDOMWindowInternal;
-class nsIEventStateManager;
+class nsEventStateManager;
 class nsIFrame;
 class nsIPresShell;
 class nsISupports;
@@ -55,7 +55,7 @@ public:
   static nsIDOMWindowInternal* GetWindowFor(nsIDOMDocument* aDoc);
   static nsIPresShell* GetPresShellFor(nsISupports* aThing);
   static nsIFrame* GetFrameFor(nsIDOMElement* aElement);
-  static nsIEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
+  static nsEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
   static nsBindingManager* GetBindingManagerFor(nsIDOMNode* aNode);
   static nsIDOMDocument* GetSubDocumentFor(nsIDOMNode* aNode);
   static nsIDOMNode* GetContainerFor(nsIDOMDocument* aDoc);
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 04703a80d5d4..6ca21fa986b0 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -47,7 +47,6 @@
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsLiteralString.h"
 
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 452e5a8cb61f..d315bece1dba 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -62,7 +62,7 @@
 #include "mozilla/css/GroupRule.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsGkAtoms.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index 316358052bc7..66fb3a42ee81 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -59,7 +59,7 @@
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsStyleConsts.h"
diff --git a/layout/style/nsIStyleRuleProcessor.h b/layout/style/nsIStyleRuleProcessor.h
index f64897b3c8d3..db292a1cb091 100644
--- a/layout/style/nsIStyleRuleProcessor.h
+++ b/layout/style/nsIStyleRuleProcessor.h
@@ -124,7 +124,7 @@ public:
    * test is used for optimization only, and may err on the side of
    * reporting more dependencies than really exist.
    *
-   * Event states are defined in nsIEventStateManager.h.
+   * Event states are defined in nsEventStates.h.
    */
   virtual nsRestyleHint
     HasStateDependentStyle(StateRuleProcessorData* aData) = 0;
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 0bd1c56e5ff2..06747f43caec 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -62,7 +62,7 @@
 #ifdef MOZ_CSS_ANIMATIONS
 #include "nsAnimationManager.h"
 #endif
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "mozilla/dom/Element.h"
 
 using namespace mozilla::dom;
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index fc5d46d26949..6faa8a97720c 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -85,12 +85,11 @@
 #include "nsWidgetsCID.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsITheme.h"
 #include "nsTransform2D.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
@@ -1930,17 +1929,15 @@ nsBoxFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
-
-  nsresult rv;
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    rv = esm->RegisterAccessKey(mContent, key);
+    esm->RegisterAccessKey(mContent, key);
   else
-    rv = esm->UnregisterAccessKey(mContent, key);
+    esm->UnregisterAccessKey(mContent, key);
 
-  return rv;
+  return NS_OK;
 }
 
 PRBool
diff --git a/layout/xul/base/src/nsButtonBoxFrame.cpp b/layout/xul/base/src/nsButtonBoxFrame.cpp
index 227e46890286..5ea91feb7784 100644
--- a/layout/xul/base/src/nsButtonBoxFrame.cpp
+++ b/layout/xul/base/src/nsButtonBoxFrame.cpp
@@ -48,7 +48,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsGUIEvent.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMElement.h"
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
@@ -92,7 +92,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
       if (NS_KEY_EVENT == aEvent->eventStructType) {
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
-          nsIEventStateManager *esm = aPresContext->EventStateManager();
+          nsEventStateManager *esm = aPresContext->EventStateManager();
           // :hover:active state
           esm->SetContentState(mContent, NS_EVENT_STATE_HOVER);
           esm->SetContentState(mContent, NS_EVENT_STATE_ACTIVE);
@@ -121,7 +121,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
           // only activate on keyup if we're already in the :hover:active state
-          nsIEventStateManager *esm = aPresContext->EventStateManager();
+          nsEventStateManager *esm = aPresContext->EventStateManager();
           nsEventStates buttonState = esm->GetContentState(mContent);
           if (buttonState.HasAllStates(NS_EVENT_STATE_ACTIVE |
                                        NS_EVENT_STATE_HOVER)) {
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index 835ba2fdea37..d49db84cb70b 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -57,8 +57,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 
-#include "nsIEventStateManager.h"
-
 #include "nsContentUtils.h"
 
 /*
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index e003fea79f2c..dacb4367b322 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -73,7 +73,7 @@
 #include "nsLayoutUtils.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIBoxLayout.h"
 #include "nsIPopupBoxObject.h"
 #include "nsPIWindowRoot.h"
@@ -833,7 +833,7 @@ nsMenuPopupFrame::HidePopup(PRBool aDeselectMenu, nsPopupState aNewState)
   // XXX, bug 137033, In Windows, if mouse is outside the window when the menupopup closes, no
   // mouse_enter/mouse_exit event will be fired to clear current hover state, we should clear it manually.
   // This code may not the best solution, but we can leave it here until we find the better approach.
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   nsEventStates state = esm->GetContentState(mContent);
 
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 4b62be4d3c52..806ea7b1b7fe 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -62,7 +62,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMXULLabelElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsITheme.h"
 #include "nsUnicharUtils.h"
 #include "nsContentUtils.h"
@@ -1151,17 +1151,15 @@ nsTextBoxFrame::RegUnregAccessKey(PRBool aDoReg)
     if (accessKey.IsEmpty())
         return NS_OK;
 
-    nsresult rv;
-
     // With a valid PresContext we can get the ESM 
     // and (un)register the access key
-    nsIEventStateManager *esm = PresContext()->EventStateManager();
+    nsEventStateManager *esm = PresContext()->EventStateManager();
 
     PRUint32 key = accessKey.First();
     if (aDoReg)
-        rv = esm->RegisterAccessKey(mContent, key);
+        esm->RegisterAccessKey(mContent, key);
     else
-        rv = esm->UnregisterAccessKey(mContent, key);
+        esm->UnregisterAccessKey(mContent, key);
 
-    return rv;
+    return NS_OK;
 }
diff --git a/layout/xul/base/src/nsXULLabelFrame.cpp b/layout/xul/base/src/nsXULLabelFrame.cpp
index 8c7b9e63c51b..548bed1c23cb 100644
--- a/layout/xul/base/src/nsXULLabelFrame.cpp
+++ b/layout/xul/base/src/nsXULLabelFrame.cpp
@@ -40,7 +40,7 @@
 #include "nsXULLabelFrame.h"
 #include "nsHTMLParts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 
 nsIFrame*
 NS_NewXULLabelFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -80,16 +80,15 @@ nsXULLabelFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
-  nsresult rv;
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    rv = esm->RegisterAccessKey(mContent, key);
+    esm->RegisterAccessKey(mContent, key);
   else
-    rv = esm->UnregisterAccessKey(mContent, key);
+    esm->UnregisterAccessKey(mContent, key);
 
-  return rv;
+  return NS_OK;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/tree/src/nsTreeContentView.cpp b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
index b80d994c712f..f069772b1092 100644
--- a/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -42,7 +42,7 @@
 #include "nsTreeContentView.h"
 #include "nsChildIterator.h"
 #include "nsIDOMClassInfo.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINodeInfo.h"
 #include "nsIXULSortService.h"
 #include "nsContentUtils.h"
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index cb964faee212..a7c32afc7164 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -51,7 +51,6 @@
 #include "mozilla/storage.h"
 #include "mozilla/dom/Link.h"
 #include "nsDocShellCID.h"
-#include "nsIEventStateManager.h"
 #include "mozilla/Services.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index d05e17fe7036..3f2204f42fc8 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -69,7 +69,6 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsISelection.h"
 #include "nsILink.h"
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index c4fd03d2ff58..cbb326e2383a 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -52,7 +52,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIAtom.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINameSpaceManager.h"
 #include "nsPresContext.h"
 #include "nsILookAndFeel.h"
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 894232fcde87..618bc594524d 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -61,7 +61,6 @@
 #include "nsThemeConstants.h"
 #include "nsILookAndFeel.h"
 #include "nsIServiceManager.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMHTMLInputElement.h"
 #include <malloc.h>
 
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 936a4f9d54d0..d86a481a8546 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -51,7 +51,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINameSpaceManager.h"
 #include "nsILookAndFeel.h"
 #include "nsIDOMHTMLInputElement.h"
diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp
index f3e413686922..bd6f97644045 100644
--- a/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -59,7 +59,6 @@
 #include "nsISelectionPrivate.h"
 #include "nsPresContext.h"
 #include "nsIDOMDataTransfer.h"
-#include "nsIEventStateManager.h"
 #include "nsICanvasElementExternal.h"
 #include "nsIImageLoadingContent.h"
 #include "imgIContainer.h"
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index d5a48421efd7..5e7a035e3166 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -43,7 +43,7 @@
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIDOMHTMLInputElement.h"
@@ -91,7 +91,7 @@ nsNativeTheme::GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType)
   if (!shell)
     return nsEventStates();
 
-  nsIEventStateManager* esm = shell->GetPresContext()->EventStateManager();
+  nsEventStateManager* esm = shell->GetPresContext()->EventStateManager();
   nsEventStates flags = esm->GetContentState(aFrame->GetContent(), PR_TRUE);
   
   if (isXULCheckboxRadio && aWidgetType == NS_THEME_RADIO) {
diff --git a/widget/src/xpwidgets/nsNativeTheme.h b/widget/src/xpwidgets/nsNativeTheme.h
index 72abbce13651..63c49b0db991 100644
--- a/widget/src/xpwidgets/nsNativeTheme.h
+++ b/widget/src/xpwidgets/nsNativeTheme.h
@@ -76,7 +76,7 @@ class nsNativeTheme : public nsITimerCallback
 
   nsNativeTheme();
 
-  // Returns the content state (hover, focus, etc), see nsIEventStateManager.h
+  // Returns the content state (hover, focus, etc), see nsEventStateManager.h
   nsEventStates GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType);
 
   // Returns whether the widget is already styled by content

From 2af4853be5dfbb2f6927856e833a09c863abf6c9 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 22:26:06 +0200
Subject: [PATCH 333/509] Backed out changeset c1a7c1bc1aeb due to busted
 build.

---
 accessible/src/base/AccEvent.cpp              |   4 +-
 .../src/base/nsAccessibilityService.cpp       |   2 +-
 accessible/src/base/nsAccessible.cpp          |   2 +-
 accessible/src/base/nsCoreUtils.cpp           |  10 +-
 accessible/src/base/nsCoreUtils.h             |   2 +-
 accessible/src/base/nsDocAccessible.cpp       |   2 +-
 accessible/src/html/nsHTMLLinkAccessible.cpp  |   2 +-
 accessible/src/xul/nsXULMenuAccessible.cpp    |   2 +-
 content/base/public/nsIContent.h              |   2 +-
 content/base/src/Link.cpp                     |   2 +-
 content/base/src/nsDocument.cpp               |   1 +
 content/base/src/nsGenConImageContent.cpp     |   2 +-
 content/base/src/nsGenericElement.cpp         |   7 +-
 content/base/src/nsImageLoadingContent.cpp    |   2 +-
 content/base/src/nsObjectLoadingContent.cpp   |   2 +-
 content/events/public/Makefile.in             |   1 +
 content/events/public/nsIEventStateManager.h  | 167 ++++++++++++++++++
 content/events/src/Makefile.in                |   4 -
 content/events/src/nsDOMDragEvent.cpp         |   1 +
 content/events/src/nsDOMEvent.cpp             |   3 +-
 content/events/src/nsDOMMouseEvent.cpp        |   1 +
 content/events/src/nsDOMMouseScrollEvent.cpp  |   1 +
 content/events/src/nsDOMUIEvent.cpp           |   9 +-
 content/events/src/nsEventListenerManager.cpp |   1 +
 content/events/src/nsEventStateManager.cpp    | 114 +++++++-----
 content/events/src/nsEventStateManager.h      | 110 ++++--------
 .../html/content/src/nsGenericHTMLElement.cpp |   9 +-
 .../html/content/src/nsHTMLAnchorElement.cpp  |   1 +
 .../html/content/src/nsHTMLAreaElement.cpp    |   1 +
 .../html/content/src/nsHTMLButtonElement.cpp  |   3 +-
 .../html/content/src/nsHTMLFormElement.cpp    |   1 +
 .../html/content/src/nsHTMLInputElement.cpp   |   2 +-
 .../html/content/src/nsHTMLLabelElement.cpp   |   1 +
 .../html/content/src/nsHTMLLegendElement.cpp  |   1 +
 .../content/src/nsHTMLOptGroupElement.cpp     |   2 +-
 .../html/content/src/nsHTMLOptionElement.cpp  |   2 +-
 .../html/content/src/nsHTMLOutputElement.cpp  |   2 +-
 .../html/content/src/nsHTMLSelectElement.cpp  |   2 +-
 .../content/src/nsHTMLTextAreaElement.cpp     |   2 +-
 content/html/content/src/nsRadioVisitor.cpp   |   2 +-
 content/html/document/src/nsHTMLDocument.cpp  |   1 +
 .../mathml/content/src/nsMathMLElement.cpp    |   2 +-
 content/xtf/src/nsXTFElementWrapper.cpp       |   4 +-
 content/xul/content/src/nsXULElement.cpp      |   2 +-
 .../xul/content/src/nsXULPopupListener.cpp    |   3 +-
 docshell/base/nsDocShell.cpp                  |   2 +-
 dom/base/nsDOMWindowUtils.cpp                 |   1 +
 dom/base/nsFocusManager.cpp                   |   2 +-
 dom/base/nsGlobalWindow.cpp                   |   2 +-
 dom/base/nsWindowRoot.cpp                     |   1 +
 .../libeditor/base/nsEditorEventListener.cpp  |   1 +
 editor/libeditor/html/nsHTMLEditor.cpp        |   1 +
 .../components/find/src/nsWebBrowserFind.cpp  |   1 +
 .../spellcheck/src/mozInlineSpellChecker.cpp  |   1 +
 layout/base/nsCSSFrameConstructor.cpp         |   2 +-
 layout/base/nsDocumentViewer.cpp              |   1 +
 layout/base/nsPresContext.h                   |   2 +-
 layout/base/nsPresShell.cpp                   |   7 +-
 layout/forms/nsButtonFrameRenderer.cpp        |   2 +-
 layout/forms/nsFileControlFrame.cpp           |   2 +-
 layout/forms/nsFormControlFrame.cpp           |   9 +-
 layout/forms/nsListControlFrame.cpp           |   8 +-
 layout/forms/nsTextControlFrame.cpp           |   1 +
 layout/generic/nsContainerFrame.cpp           |   1 +
 layout/generic/nsFrame.cpp                    |   4 +-
 layout/generic/nsImageFrame.cpp               |   3 +-
 layout/inspector/src/inDOMUtils.cpp           |   5 +-
 layout/inspector/src/inDOMUtils.h             |   2 +-
 layout/inspector/src/inLayoutUtils.cpp        |   2 +-
 layout/inspector/src/inLayoutUtils.h          |   4 +-
 layout/printing/nsPrintPreviewListener.cpp    |   1 +
 layout/style/nsCSSRuleProcessor.cpp           |   2 +-
 layout/style/nsHTMLStyleSheet.cpp             |   2 +-
 layout/style/nsIStyleRuleProcessor.h          |   2 +-
 layout/style/nsStyleSet.cpp                   |   2 +-
 layout/xul/base/src/nsBoxFrame.cpp            |  13 +-
 layout/xul/base/src/nsButtonBoxFrame.cpp      |   6 +-
 layout/xul/base/src/nsMenuBarListener.cpp     |   2 +
 layout/xul/base/src/nsMenuPopupFrame.cpp      |   4 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  12 +-
 layout/xul/base/src/nsXULLabelFrame.cpp       |  11 +-
 .../base/src/tree/src/nsTreeContentView.cpp   |   2 +-
 toolkit/components/places/History.cpp         |   1 +
 .../typeaheadfind/nsTypeAheadFind.cpp         |   1 +
 widget/src/cocoa/nsNativeThemeCocoa.mm        |   2 +-
 widget/src/qt/nsNativeThemeQt.cpp             |   1 +
 widget/src/windows/nsNativeThemeWin.cpp       |   2 +-
 widget/src/xpwidgets/nsBaseDragService.cpp    |   1 +
 widget/src/xpwidgets/nsNativeTheme.cpp        |   4 +-
 widget/src/xpwidgets/nsNativeTheme.h          |   2 +-
 90 files changed, 415 insertions(+), 224 deletions(-)
 create mode 100644 content/events/public/nsIEventStateManager.h

diff --git a/accessible/src/base/AccEvent.cpp b/accessible/src/base/AccEvent.cpp
index 1e6d70c96934..2ff4733ae1b6 100644
--- a/accessible/src/base/AccEvent.cpp
+++ b/accessible/src/base/AccEvent.cpp
@@ -50,7 +50,7 @@
 #include "nsAccEvent.h"
 
 #include "nsIDOMDocument.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIServiceManager.h"
 #ifdef MOZ_XUL
 #include "nsIDOMXULMultSelectCntrlEl.h"
@@ -203,7 +203,7 @@ AccEvent::CaptureIsFromUserInput(EIsFromUserInput aIsFromUserInput)
     return;
   }
 
-  nsEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
+  nsIEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
   if (!esm) {
     NS_NOTREACHED("There should always be an ESM for an event");
     return;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 545ece530d91..4accb5a3a1b2 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -75,7 +75,7 @@
 #include "nsRootAccessibleWrap.h"
 #include "nsTextFragment.h"
 #include "mozilla/Services.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULAlertAccessible.h"
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index cfa89b13eb17..97d453a36318 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -99,7 +99,7 @@
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
 #include "nsNetUtil.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 #ifdef NS_DEBUG
 #include "nsIDOMCharacterData.h"
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index f7d660f6c849..d4a3b02fe2bb 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -60,7 +60,7 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsIScrollableFrame.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsISelection2.h"
 #include "nsISelectionController.h"
 #include "nsPIDOMWindow.h"
@@ -206,7 +206,7 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
 
   // Accesskeys are registered by @accesskey attribute only. At first check
   // whether it is presented on the given element to avoid the slow
-  // nsEventStateManager::GetRegisteredAccessKey() method.
+  // nsIEventStateManager::GetRegisteredAccessKey() method.
   if (!aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey))
     return 0;
 
@@ -222,11 +222,13 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
   if (!presContext)
     return 0;
 
-  nsEventStateManager *esm = presContext->EventStateManager();
+  nsIEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return 0;
 
-  return esm->GetRegisteredAccessKey(aContent);
+  PRUint32 key = 0;
+  esm->GetRegisteredAccessKey(aContent, &key);
+  return key;
 }
 
 nsIContent *
diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h
index 613c535d0033..66a2aa446ac9 100644
--- a/accessible/src/base/nsCoreUtils.h
+++ b/accessible/src/base/nsCoreUtils.h
@@ -110,7 +110,7 @@ public:
 
   /**
    * Return an accesskey registered on the given element by
-   * nsEventStateManager or 0 if there is no registered accesskey.
+   * nsIEventStateManager or 0 if there is no registered accesskey.
    *
    * @param aContent - the given element.
    */
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 08ac96e66718..a40473134893 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -61,7 +61,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMXULPopupElement.h"
 #include "nsIEditingSession.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsHTMLSelectAccessible.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp
index 040114a49dae..c7fdda1335d8 100644
--- a/accessible/src/html/nsHTMLLinkAccessible.cpp
+++ b/accessible/src/html/nsHTMLLinkAccessible.cpp
@@ -42,7 +42,7 @@
 #include "States.h"
 #include "nsCoreUtils.h"
 
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLLinkAccessible
diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp
index 60d37d413791..5de0cc1c9077 100644
--- a/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -401,7 +401,7 @@ nsXULMenuitemAccessible::GetKeyboardShortcut(nsAString& aAccessKey)
   static PRInt32 gMenuAccesskeyModifier = -1;  // magic value of -1 indicates unitialized state
 
   // We do not use nsCoreUtils::GetAccesskeyFor() because accesskeys for
-  // menu are't registered by nsEventStateManager.
+  // menu are't registered by nsIEventStateManager.
   nsAutoString accesskey;
   mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey,
                     accesskey);
diff --git a/content/base/public/nsIContent.h b/content/base/public/nsIContent.h
index b405eb664e36..190c013d4f45 100644
--- a/content/base/public/nsIContent.h
+++ b/content/base/public/nsIContent.h
@@ -789,7 +789,7 @@ public:
   /**
    * Method to get the _intrinsic_ content state of this content node.  This is
    * the state that is independent of the node's presentation.  To get the full
-   * content state, use nsEventStateManager.  Also see nsEventStateManager
+   * content state, use nsIEventStateManager.  Also see nsIEventStateManager
    * for the possible bits that could be set here.
    */
   virtual nsEventStates IntrinsicState() const;
diff --git a/content/base/src/Link.cpp b/content/base/src/Link.cpp
index 67429bfa063b..3fa567801eaa 100644
--- a/content/base/src/Link.cpp
+++ b/content/base/src/Link.cpp
@@ -39,7 +39,7 @@
 
 #include "Link.h"
 
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIURL.h"
 
 #include "nsContentUtils.h"
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 1c2f7f13df7a..1471888200ca 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -59,6 +59,7 @@
 #include "nsDocument.h"
 #include "nsUnicharUtils.h"
 #include "nsIPrivateDOMEvent.h"
+#include "nsIEventStateManager.h"
 #include "nsContentList.h"
 #include "nsIObserver.h"
 #include "nsIBaseWindow.h"
diff --git a/content/base/src/nsGenConImageContent.cpp b/content/base/src/nsGenConImageContent.cpp
index ea43820ba459..801be5590e3f 100644
--- a/content/base/src/nsGenConImageContent.cpp
+++ b/content/base/src/nsGenConImageContent.cpp
@@ -46,7 +46,7 @@
 #include "nsXMLElement.h"
 #include "nsImageLoadingContent.h"
 #include "imgIRequest.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 class nsGenConImageContent : public nsXMLElement,
                              public nsImageLoadingContent
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 10df002985a5..333131d9ec84 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -66,7 +66,7 @@
 #include "nsStyleConsts.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsDOMCID.h"
@@ -110,6 +110,7 @@
 
 #include "nsIServiceManager.h"
 #include "nsIDOMEventListener.h"
+#include "nsEventStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
 
@@ -5378,8 +5379,10 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
                                nsIFocusManager::FLAG_NOSCROLL);
           }
 
+          nsIEventStateManager* esm =
+            aVisitor.mPresContext->EventStateManager();
           nsEventStateManager::SetActiveManager(
-            aVisitor.mPresContext->EventStateManager(), this);
+            static_cast<nsEventStateManager*>(esm), this);
         }
       }
     }
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index c499adbd4ee7..196e4069b550 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -62,7 +62,7 @@
 #include "nsPLDOMEvent.h"
 
 #include "nsIPresShell.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsGUIEvent.h"
 
 #include "nsIChannel.h"
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 5410a27e5a09..6e168d2648ff 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -53,7 +53,7 @@
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIExternalProtocolHandler.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIObjectFrame.h"
 #include "nsIPluginDocument.h"
 #include "nsIPluginHost.h"
diff --git a/content/events/public/Makefile.in b/content/events/public/Makefile.in
index 59ca27a9abb1..96dab6511518 100644
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@@ -48,6 +48,7 @@ XPIDL_MODULE	= content_events
 EXPORTS		= \
 		nsMutationEvent.h \
 		nsIEventListenerManager.h \
+		nsIEventStateManager.h \
 		nsIPrivateDOMEvent.h \
 		nsIPrivateTextEvent.h \
 		nsIPrivateTextRange.h \
diff --git a/content/events/public/nsIEventStateManager.h b/content/events/public/nsIEventStateManager.h
new file mode 100644
index 000000000000..bffd0f855ddc
--- /dev/null
+++ b/content/events/public/nsIEventStateManager.h
@@ -0,0 +1,167 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsIEventStateManager_h__
+#define nsIEventStateManager_h__
+
+#include "nsEvent.h"
+#include "nsISupports.h"
+#include "nsEventStates.h"
+
+class nsIContent;
+class nsIDocument;
+class nsPresContext;
+class nsIDOMEvent;
+class nsIFrame;
+class nsIView;
+class nsIWidget;
+class imgIContainer;
+
+/*
+ * Event state manager interface.
+ */
+#define NS_IEVENTSTATEMANAGER_IID \
+{0x69ab5b16, 0x6690, 0x42fc, \
+  { 0xa9, 0xe5, 0xa3, 0xb4, 0xf8, 0x0f, 0xcb, 0xa6 } }
+
+#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
+
+class nsIEventStateManager : public nsISupports {
+
+public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
+
+  NS_IMETHOD Init() = 0;
+
+  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext, 
+                            nsEvent *aEvent, 
+                            nsIFrame* aTargetFrame,
+                            nsEventStatus* aStatus,
+                            nsIView* aView) = 0;
+
+  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext, 
+                             nsEvent *aEvent, 
+                             nsIFrame* aTargetFrame,
+                             nsEventStatus* aStatus,
+                             nsIView* aView) = 0;
+
+  NS_IMETHOD SetPresContext(nsPresContext* aPresContext) = 0;
+  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
+
+  NS_IMETHOD GetEventTarget(nsIFrame **aFrame) = 0;
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent) = 0;
+
+  /**
+   * Returns the content state of aContent.
+   * @param aContent      The control whose state is requested.
+   * @param aFollowLabels Whether to reflect a label's content state on its
+   *                      associated control. If aFollowLabels is true and
+   *                      aContent is a control which has a label that has the 
+   *                      hover or active content state set, GetContentState
+   *                      will pretend that those states are also set on aContent.
+   * @return              The content state.
+   */
+  virtual nsEventStates GetContentState(nsIContent *aContent,
+                                        PRBool aFollowLabels = PR_FALSE) = 0;
+
+  /**
+   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
+   * @param aContent Content which has changed states.  This may be null to
+   *                 indicate that nothing is in this state anymore.
+   * @param aState   One of NS_EVENT_STATE_ACTIVE, NS_EVENT_STATE_HOVER,
+   *                 NS_EVENT_STATE_DRAGOVER, NS_EVENT_STATE_URLTARGET.  Don't
+   *                 pass anything else!  Passing in a state object that has
+   *                 more than one of those states set is not supported.
+   * @return  Whether the content was able to change all states. Returns PR_FALSE
+   *                  if a resulting DOM event causes the content node passed in
+   *                  to not change states. Note, the frame for the content may
+   *                  change as a result of the content state change, because of
+   *                  frame reconstructions that may occur, but this does not
+   *                  affect the return value.
+   */
+  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState) = 0;
+
+  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent) = 0;
+  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK) = 0;
+
+  // Access Key Registration
+
+  /**
+   * Register accesskey on the given element. When accesskey is activated then
+   * the element will be notified via nsIContent::PerformAccesskey() method.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
+
+  /**
+   * Unregister accesskey for the given element.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
+
+  /**
+   * Get accesskey registered on the given element or 0 if there is none.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      registered accesskey
+   * @return           NS_OK
+   */
+  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey) = 0;
+
+  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
+                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
+                       nsIWidget* aWidget, PRBool aLockCursor) = 0;
+
+  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext) = 0;
+  
+  /**
+   * Returns true if the current code is being executed as a result of user input.
+   * This includes timers or anything else that is initiated from user input.
+   * However, mouse hover events are not counted as user input, nor are
+   * page load events. If this method is called from asynchronously executed code,
+   * such as during layout reflows, it will return false.
+   */
+  NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() = 0;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventStateManager, NS_IEVENTSTATEMANAGER_IID)
+
+#endif // nsIEventStateManager_h__
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index 28475d9017bc..de878f4749ee 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -46,10 +46,6 @@ MODULE		= content
 LIBRARY_NAME	= gkconevents_s
 LIBXUL_LIBRARY  = 1
 
-EXPORTS		= \
-		nsEventStateManager.h \
-		$(NULL)
-		
 CPPSRCS		= \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index 3622ed48cbab..cf290d94052e 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -39,6 +39,7 @@
 #include "nsIServiceManager.h"
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
+#include "nsIEventStateManager.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIDragService.h"
 
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 920f5b376ae3..4767f13862ce 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -316,7 +316,8 @@ nsDOMEvent::GetTargetFromFrame()
   if (!mPresContext) { return nsnull; }
 
   // Get the target frame (have to get the ESM first)
-  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
+  nsIFrame* targetFrame = nsnull;
+  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
   if (!targetFrame) { return nsnull; }
 
   // get the real content
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
index dbedcde48bea..e38270d4ade5 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -40,6 +40,7 @@
 #include "nsDOMMouseEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
+#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseEvent::nsDOMMouseEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index 34bda3a5ddea..a9e2bfa9f87d 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -38,6 +38,7 @@
 #include "nsDOMMouseScrollEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
+#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index 07bcba00a9d3..a3c1406a77f8 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOMNode.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsIScrollableFrame.h"
@@ -258,7 +258,7 @@ nsDOMUIEvent::GetRangeParent(nsIDOMNode** aRangeParent)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
+    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
   }
 
   *aRangeParent = nsnull;
@@ -286,7 +286,7 @@ nsDOMUIEvent::GetRangeOffset(PRInt32* aRangeOffset)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
+    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
   }
 
   if (targetFrame) {
@@ -334,7 +334,8 @@ nsDOMUIEvent::GetLayerPoint()
     return mLayerPoint;
   }
   // XXX I'm not really sure this is correct; it's my best shot, though
-  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
+  nsIFrame* targetFrame;
+  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
   if (!targetFrame)
     return mLayerPoint;
   nsIFrame* layer = nsLayoutUtils::GetClosestLayer(targetFrame);
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 0f78a1346d9a..b98f081a457f 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -56,6 +56,7 @@
 #ifdef MOZ_SVG
 #include "nsGkAtoms.h"
 #endif // MOZ_SVG
+#include "nsIEventStateManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIJSEventListener.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index b87f2f04ad39..f62c71c4ad3e 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -811,7 +811,7 @@ nsEventStateManager::UpdateUserActivityTimer(void)
   return NS_OK;
 }
 
-nsresult
+NS_IMETHODIMP
 nsEventStateManager::Init()
 {
   nsCOMPtr<nsIObserverService> observerService =
@@ -996,7 +996,8 @@ nsEventStateManager::Observe(nsISupports *aSubject,
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsEventStateManager)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventStateManager)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEventStateManager)
+   NS_INTERFACE_MAP_ENTRY(nsIEventStateManager)
    NS_INTERFACE_MAP_ENTRY(nsIObserver)
    NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
@@ -1046,7 +1047,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsEventStateManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mAccessKeys);
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-nsresult
+
+NS_IMETHODIMP
 nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
                                     nsEvent *aEvent,
                                     nsIFrame* aTargetFrame,
@@ -2816,7 +2818,7 @@ NodeAllowsClickThrough(nsINode* aNode)
 }
 #endif
 
-nsresult
+NS_IMETHODIMP
 nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
                                      nsEvent *aEvent,
                                      nsIFrame* aTargetFrame,
@@ -2991,7 +2993,8 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
       ClearGlobalActiveContent(this);
       if (IsMouseEventReal(aEvent)) {
         if (!mCurrentTarget) {
-          GetEventTarget();
+          nsIFrame* targ;
+          GetEventTarget(&targ);
         }
         if (mCurrentTarget) {
           ret = CheckForAndDispatchClick(presContext, (nsMouseEvent*)aEvent,
@@ -3353,24 +3356,28 @@ nsEventStateManager::IsTargetCrossProcess(nsGUIEvent *aEvent)
   return TabParent::GetIMETabParent() != nsnull;
 }
 
-void
+NS_IMETHODIMP
 nsEventStateManager::NotifyDestroyPresContext(nsPresContext* aPresContext)
 {
   nsIMEStateManager::OnDestroyPresContext(aPresContext);
+  return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsEventStateManager::SetPresContext(nsPresContext* aPresContext)
 {
   mPresContext = aPresContext;
+  return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
 {
   if (aFrame && aFrame == mCurrentTarget) {
     mCurrentTargetContent = aFrame->GetContent();
   }
+
+  return NS_OK;
 }
 
 void
@@ -3429,7 +3436,7 @@ nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
   }
 }
 
-nsresult
+NS_IMETHODIMP
 nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
                                PRBool aHaveHotspot,
                                float aHotspotX, float aHotspotY,
@@ -3691,7 +3698,8 @@ nsEventStateManager::NotifyMouseOut(nsGUIEvent* aEvent, nsIContent* aMovingInto)
         docshell->GetPresContext(getter_AddRefs(presContext));
 
         if (presContext) {
-          nsEventStateManager* kidESM = presContext->EventStateManager();
+          nsEventStateManager* kidESM =
+            static_cast<nsEventStateManager*>(presContext->EventStateManager());
           // Not moving into any element in this subdocument
           kidESM->NotifyMouseOut(aEvent, nsnull);
         }
@@ -3749,7 +3757,9 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent)
     if (docContent) {
       nsIPresShell *parentShell = parentDoc->GetShell();
       if (parentShell) {
-        nsEventStateManager* parentESM = parentShell->GetPresContext()->EventStateManager();
+        nsEventStateManager* parentESM =
+          static_cast<nsEventStateManager*>
+                     (parentShell->GetPresContext()->EventStateManager());
         parentESM->NotifyMouseOver(aEvent, docContent);
       }
     }
@@ -3794,7 +3804,8 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
   case NS_MOUSE_MOVE:
     {
       // Get the target content target (mousemove target == mouseover target)
-      nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aEvent);
+      nsCOMPtr<nsIContent> targetElement;
+      GetEventTargetContent(aEvent, getter_AddRefs(targetElement));
       if (!targetElement) {
         // We're always over the document root, even if we're only
         // over dead space in a page (whose frame is not associated with
@@ -4082,7 +4093,8 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
 
     nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
     if (presShell) {
-      nsCOMPtr<nsIContent> mouseContent = GetEventTargetContent(aEvent);
+      nsCOMPtr<nsIContent> mouseContent;
+      GetEventTargetContent(aEvent, getter_AddRefs(mouseContent));
 
       ret = presShell->HandleEventWithTarget(&event, mCurrentTarget,
                                              mouseContent, aStatus);
@@ -4108,56 +4120,61 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
   return ret;
 }
 
-nsIFrame*
-nsEventStateManager::GetEventTarget()
+NS_IMETHODIMP
+nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
 {
   nsIPresShell *shell;
   if (mCurrentTarget ||
       !mPresContext ||
       !(shell = mPresContext->GetPresShell())) {
-    return mCurrentTarget;
+    *aFrame = mCurrentTarget;
+    return NS_OK;
   }
 
   if (mCurrentTargetContent) {
     mCurrentTarget = mPresContext->GetPrimaryFrameFor(mCurrentTargetContent);
     if (mCurrentTarget) {
-      return mCurrentTarget;
+      *aFrame = mCurrentTarget;
+      return NS_OK;
     }
   }
 
   nsIFrame* frame = shell->GetEventTargetFrame();
-  return (mCurrentTarget = frame);
+  *aFrame = mCurrentTarget = frame;
+  return NS_OK;
 }
 
-already_AddRefed<nsIContent>
-nsEventStateManager::GetEventTargetContent(nsEvent* aEvent)
+NS_IMETHODIMP
+nsEventStateManager::GetEventTargetContent(nsEvent* aEvent,
+                                           nsIContent** aContent)
 {
   if (aEvent &&
       (aEvent->message == NS_FOCUS_CONTENT ||
        aEvent->message == NS_BLUR_CONTENT)) {
-    nsCOMPtr<nsIContent> content = GetFocusedContent();
-    return content.forget();
+    NS_IF_ADDREF(*aContent = GetFocusedContent());
+    return NS_OK;
   }
 
   if (mCurrentTargetContent) {
-    nsCOMPtr<nsIContent> content = mCurrentTargetContent;
-    return content.forget();
+    *aContent = mCurrentTargetContent;
+    NS_IF_ADDREF(*aContent);
+    return NS_OK;
   }
 
-  nsIContent *content = nsnull;
+  *aContent = nsnull;
 
   nsIPresShell *presShell = mPresContext->GetPresShell();
   if (presShell) {
-    content = presShell->GetEventTargetContent(aEvent).get();
+    *aContent = presShell->GetEventTargetContent(aEvent).get();
   }
 
   // Some events here may set mCurrentTarget but not set the corresponding
   // event target in the PresShell.
-  if (!content && mCurrentTarget) {
-    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, &content);
+  if (!*aContent && mCurrentTarget) {
+    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, aContent);
   }
 
-  return content;
+  return NS_OK;
 }
 
 static already_AddRefed<nsIContent>
@@ -4402,7 +4419,7 @@ nsEventStateManager::SetContentState(nsIContent *aContent, nsEventStates aState)
   return PR_TRUE;
 }
 
-void
+NS_IMETHODIMP
 nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 {
   // inform the focus manager that the content is being removed. If this
@@ -4435,44 +4452,59 @@ nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent
     // See bug 292146 for why we want to null this out
     mLastMouseOverElement = nsnull;
   }
+
+  return NS_OK;
 }
 
-PRBool
-nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent)
+NS_IMETHODIMP
+nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK)
 {
-  return !(aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton  && 
-      !sNormalLMouseEventInProcess);
+  *aOK = PR_TRUE;
+  if (aEvent->message == NS_MOUSE_BUTTON_DOWN &&
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
+    if (!sNormalLMouseEventInProcess) {
+      *aOK = PR_FALSE;
+    }
+  }
+  return NS_OK;
 }
 
 //-------------------------------------------
 // Access Key Registration
 //-------------------------------------------
-void
+NS_IMETHODIMP
 nsEventStateManager::RegisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent && mAccessKeys.IndexOf(aContent) == -1)
     mAccessKeys.AppendObject(aContent);
+
+  return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsEventStateManager::UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent)
     mAccessKeys.RemoveObject(aContent);
+
+  return NS_OK;
 }
 
-PRUint32
-nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent)
+NS_IMETHODIMP
+nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent,
+                                            PRUint32* aKey)
 {
   NS_ENSURE_ARG(aContent);
+  NS_ENSURE_ARG_POINTER(aKey);
+  *aKey = 0;
 
   if (mAccessKeys.IndexOf(aContent) == -1)
-    return 0;
+    return NS_OK;
 
   nsAutoString accessKey;
   aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
-  return accessKey.First();
+  *aKey = accessKey.First();
+  return NS_OK;
 }
 
 void
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 5d64ea9a2680..357559ad52a5 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -39,6 +39,7 @@
 #ifndef nsEventStateManager_h__
 #define nsEventStateManager_h__
 
+#include "nsIEventStateManager.h"
 #include "nsEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
@@ -55,7 +56,6 @@
 #include "nsIScrollableFrame.h"
 #include "nsFocusManager.h"
 #include "nsIDocument.h"
-#include "nsEventStates.h"
 
 class nsIPresShell;
 class nsIDocShell;
@@ -75,6 +75,7 @@ class TabParent;
  */
 
 class nsEventStateManager : public nsSupportsWeakReference,
+                            public nsIEventStateManager,
                             public nsIObserver
 {
   friend class nsMouseWheelTransaction;
@@ -85,7 +86,7 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
-  nsresult Init();
+  NS_IMETHOD Init();
   nsresult Shutdown();
 
   /* The PreHandleEvent method is called before event dispatch to either
@@ -95,86 +96,44 @@ public:
    * PostHandleEvent.  Any centralized event processing which must occur before
    * DOM or frame event handling should occur here as well.
    */
-  nsresult PreHandleEvent(nsPresContext* aPresContext,
-                          nsEvent *aEvent,
-                          nsIFrame* aTargetFrame,
-                          nsEventStatus* aStatus,
-                          nsIView* aView);
+  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext,
+                         nsEvent *aEvent,
+                         nsIFrame* aTargetFrame,
+                         nsEventStatus* aStatus,
+                         nsIView* aView);
 
   /* The PostHandleEvent method should contain all system processing which
    * should occur conditionally based on DOM or frame processing.  It should
    * also contain any centralized event processing which must occur after
    * DOM and frame processing.
    */
-  nsresult PostHandleEvent(nsPresContext* aPresContext,
-                           nsEvent *aEvent,
-                           nsIFrame* aTargetFrame,
-                           nsEventStatus* aStatus,
-                           nsIView* aView);
+  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext,
+                             nsEvent *aEvent,
+                             nsIFrame* aTargetFrame,
+                             nsEventStatus* aStatus,
+                             nsIView* aView);
 
-  void NotifyDestroyPresContext(nsPresContext* aPresContext);
-  void SetPresContext(nsPresContext* aPresContext);
-  void ClearFrameRefs(nsIFrame* aFrame);
+  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext);
+  NS_IMETHOD SetPresContext(nsPresContext* aPresContext);
+  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
 
-  nsIFrame* GetEventTarget();
-  already_AddRefed<nsIContent> GetEventTargetContent(nsEvent* aEvent);
+  NS_IMETHOD GetEventTarget(nsIFrame **aFrame);
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent);
 
-  /**
-   * Returns the content state of aContent.
-   * @param aContent      The control whose state is requested.
-   * @param aFollowLabels Whether to reflect a label's content state on its
-   *                      associated control. If aFollowLabels is true and
-   *                      aContent is a control which has a label that has the 
-   *                      hover or active content state set, GetContentState
-   *                      will pretend that those states are also set on aContent.
-   * @return              The content state.
-   */
   virtual nsEventStates GetContentState(nsIContent *aContent,
                                         PRBool aFollowLabels = PR_FALSE);
+  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
+  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
+  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK);
 
-  /**
-   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
-   * @param aContent Content which has changed states
-   * @param aState   Corresponding state flags such as NS_EVENT_STATE_FOCUS
-   * @return  Whether the content was able to change all states. Returns PR_FALSE
-   *                  if a resulting DOM event causes the content node passed in
-   *                  to not change states. Note, the frame for the content may
-   *                  change as a result of the content state change, because of
-   *                  frame reconstructions that may occur, but this does not
-   *                  affect the return value.
-   */
-  PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
-  void ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
-  PRBool EventStatusOK(nsGUIEvent* aEvent);
+  // Access Key Registration
+  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey);
 
-  /**
-   * Register accesskey on the given element. When accesskey is activated then
-   * the element will be notified via nsIContent::PerformAccesskey() method.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  void RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-
-  /**
-   * Unregister accesskey for the given element.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  void UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-
-  /**
-   * Get accesskey registered on the given element or 0 if there is none.
-   *
-   * @param  aContent  the given element
-   * @return           registered accesskey
-   */
-  PRUint32 GetRegisteredAccessKey(nsIContent* aContent);
-
-  nsresult SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
-                     PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
-                     nsIWidget* aWidget, PRBool aLockCursor); 
+  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
+                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
+                       nsIWidget* aWidget, PRBool aLockCursor);
 
   static void StartHandlingUserInput()
   {
@@ -191,23 +150,16 @@ public:
     return sUserInputEventDepth > 0;
   }
 
-  /**
-   * Returns true if the current code is being executed as a result of user input.
-   * This includes timers or anything else that is initiated from user input.
-   * However, mouse hover events are not counted as user input, nor are
-   * page load events. If this method is called from asynchronously executed code,
-   * such as during layout reflows, it will return false.
-   */
   NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() { return IsHandlingUserInput(); }
   
   nsPresContext* GetPresContext() { return mPresContext; }
 
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsEventStateManager,
-                                           nsIObserver)
+                                           nsIEventStateManager)
 
   static nsIDocument* sMouseOverDocument;
 
-  static nsEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
+  static nsIEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
 
   // Sets aNewESM to be the active event state manager, and
   // if aContent is non-null, marks the object as active.
@@ -537,6 +489,4 @@ private:
   static void operator delete(void* /*memory*/) {}
 };
 
-#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
-
 #endif // nsEventStateManager_h__
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 9355521ed2a2..6948487f4f1e 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -86,7 +86,7 @@
 #include "nsString.h"
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsDOMCSSDeclaration.h"
@@ -1056,8 +1056,9 @@ nsGenericHTMLElement::CheckHandleEventForAnchorsPreconditions(nsEventChainVisito
   //Need to check if we hit an imagemap area and if so see if we're handling
   //the event on that map or on a link farther up the tree.  If we're on a
   //link farther up, do nothing.
-  nsCOMPtr<nsIContent> target = aVisitor.mPresContext->EventStateManager()->
-    GetEventTargetContent(aVisitor.mEvent);
+  nsCOMPtr<nsIContent> target;
+  aVisitor.mPresContext->EventStateManager()->
+    GetEventTargetContent(aVisitor.mEvent, getter_AddRefs(target));
 
   return !target || !IsArea(target) || IsArea(this);
 }
@@ -3352,7 +3353,7 @@ nsGenericHTMLElement::RegUnRegAccessKey(PRBool aDoReg)
   nsPresContext *presContext = GetPresContext();
 
   if (presContext) {
-    nsEventStateManager *esm = presContext->EventStateManager();
+    nsIEventStateManager *esm = presContext->EventStateManager();
 
     // Register or unregister as appropriate.
     if (aDoReg) {
diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp
index 2e70258345dd..8602bad4a079 100644
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -47,6 +47,7 @@
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
+#include "nsIEventStateManager.h"
 
 #include "nsHTMLDNSPrefetch.h"
 
diff --git a/content/html/content/src/nsHTMLAreaElement.cpp b/content/html/content/src/nsHTMLAreaElement.cpp
index 63c3e015e0da..2f5e85a1d064 100644
--- a/content/html/content/src/nsHTMLAreaElement.cpp
+++ b/content/html/content/src/nsHTMLAreaElement.cpp
@@ -41,6 +41,7 @@
 #include "nsILink.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
+#include "nsIEventStateManager.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 70ca60d95eb1..6804fa70edd8 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -50,6 +50,7 @@
 #include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDocument.h"
@@ -376,7 +377,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                   nsMouseEvent::eLeftButton) {
               if (NS_IS_TRUSTED_EVENT(aVisitor.mEvent)) {
-                nsEventStateManager* esm =
+                nsIEventStateManager* esm =
                   aVisitor.mPresContext->EventStateManager();
                 nsEventStateManager::SetActiveManager(
                   static_cast<nsEventStateManager*>(esm), this);
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 5dea27259821..357c12b2ed74 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -81,6 +81,7 @@
 #include "nsIHTMLCollection.h"
 
 #include "nsIConstraintValidation.h"
+#include "nsIEventStateManager.h"
 
 #include "nsIDOMHTMLButtonElement.h"
 
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 0b0ebff0abf0..09214bebe747 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -63,7 +63,7 @@
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
 #include "nsIFrame.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIServiceManager.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsDOMError.h"
diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index b626925d8b7d..76f678036296 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -47,6 +47,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDocument.h"
 #include "nsGUIEvent.h"
+#include "nsIEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp
index 8a41cdd33c64..1750e588caa7 100644
--- a/content/html/content/src/nsHTMLLegendElement.cpp
+++ b/content/html/content/src/nsHTMLLegendElement.cpp
@@ -42,6 +42,7 @@
 #include "nsStyleConsts.h"
 #include "nsIForm.h"
 #include "nsIFormControl.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp
index 53ea9a6453e7..e354bdd4f8da 100644
--- a/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -41,7 +41,7 @@
 #include "nsStyleConsts.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index 21a5336e9fd3..013f6770ef41 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -59,7 +59,7 @@
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsContentCreatorFunctions.h"
diff --git a/content/html/content/src/nsHTMLOutputElement.cpp b/content/html/content/src/nsHTMLOutputElement.cpp
index e838ca9a69ff..3adc2382bf6d 100644
--- a/content/html/content/src/nsHTMLOutputElement.cpp
+++ b/content/html/content/src/nsHTMLOutputElement.cpp
@@ -41,7 +41,7 @@
 #include "nsDOMSettableTokenList.h"
 #include "nsStubMutationObserver.h"
 #include "nsIConstraintValidation.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "mozAutoDocUpdate.h"
 #include "nsHTMLFormElement.h"
 
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index eb885e90edbf..1474d4004354 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -52,7 +52,7 @@
 
 #include "nsIDOMHTMLOptGroupElement.h"
 #include "nsHTMLOptionElement.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsGUIEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIBoxObject.h"
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 88f9dcfe530a..6271080e8fed 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -58,7 +58,7 @@
 #include "nsMappedAttributes.h"
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsLinebreakConverter.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
diff --git a/content/html/content/src/nsRadioVisitor.cpp b/content/html/content/src/nsRadioVisitor.cpp
index 4859bdfd0b70..d931fdd13bf6 100644
--- a/content/html/content/src/nsRadioVisitor.cpp
+++ b/content/html/content/src/nsRadioVisitor.cpp
@@ -38,7 +38,7 @@
 #include "nsRadioVisitor.h"
 #include "nsAutoPtr.h"
 #include "nsHTMLInputElement.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIConstraintValidation.h"
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index a25f0377651d..af2c5284987c 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -124,6 +124,7 @@
 #include "nsIMutableArray.h"
 #include "nsArrayUtils.h"
 #include "nsIEffectiveTLDService.h"
+#include "nsIEventStateManager.h"
 
 #include "nsIPrompt.h"
 //AHMED 12-2
diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp
index d36cc861a103..78d29877b292 100644
--- a/content/mathml/content/src/nsMathMLElement.cpp
+++ b/content/mathml/content/src/nsMathMLElement.cpp
@@ -47,7 +47,7 @@
 #include "nsMappedAttributes.h"
 #include "nsStyleConsts.h"
 #include "nsIDocument.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsDOMClassInfoID.h"
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index 4f0d45fc62d5..52c627924112 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -48,7 +48,7 @@
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMEvent.h"
 #include "nsGUIEvent.h"
@@ -974,7 +974,7 @@ nsXTFElementWrapper::RegUnregAccessKey(PRBool aDoReg)
   if (!presContext)
     return;
 
-  nsEventStateManager *esm = presContext->EventStateManager();
+  nsIEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return;
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 635240649c6a..dafd9f7f3bc6 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -83,7 +83,7 @@
 #include "nsIDOMXULSelectCntrlItemEl.h"
 #include "nsIDocument.h"
 #include "nsIEventListenerManager.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsIFastLoadService.h"
 #include "nsHTMLStyleSheet.h"
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 736f06ce3af2..9a012f8bb176 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -74,6 +74,7 @@
 // for event firing in context menus
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
+#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIViewManager.h"
@@ -300,7 +301,7 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
       }
     }
 
-    nsEventStateManager *esm = context->EventStateManager();
+    nsIEventStateManager *esm = context->EventStateManager();
     nsCOMPtr<nsIContent> focusableContent = do_QueryInterface(element);
     esm->SetContentState(focusableContent, NS_EVENT_STATE_ACTIVE);
   }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 0a48832e1772..7bf77e198af9 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -201,7 +201,7 @@
 #include "nsIGlobalHistory3.h"
 
 #ifdef DEBUG_DOCSHELL_FOCUS
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #endif
 
 #include "nsIFrame.h"
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index b36379adc171..f6d77454d501 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -46,6 +46,7 @@
 #include "nsGlobalWindow.h"
 #include "nsIDocument.h"
 #include "nsFocusManager.h"
+#include "nsIEventStateManager.h"
 #include "nsEventStateManager.h"
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 2a2b31ac8f46..bf20c8ff794b 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -68,7 +68,7 @@
 #include "nsFrameTraversal.h"
 #include "nsObjectFrame.h"
 #include "nsEventDispatcher.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIMEStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsCaret.h"
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0a15c85ee02d..6f167ea9ac66 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -126,7 +126,7 @@
 #include "nsDOMString.h"
 #include "nsIEmbeddingSiteWindow2.h"
 #include "nsThreadUtils.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIHttpProtocolHandler.h"
 #include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index ca96c27eabc5..67e3295a9b02 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -47,6 +47,7 @@
 #include "nsPresContext.h"
 #include "nsLayoutCID.h"
 #include "nsContentCID.h"
+#include "nsIEventStateManager.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsString.h"
diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp
index 844048dc13ee..bb761239c3fa 100644
--- a/editor/libeditor/base/nsEditorEventListener.cpp
+++ b/editor/libeditor/base/nsEditorEventListener.cpp
@@ -71,6 +71,7 @@
 #include "nsIDOMNSRange.h"
 #include "nsEditorUtils.h"
 #include "nsIDOMEventTarget.h"
+#include "nsIEventStateManager.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIFocusManager.h"
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 512943255496..725613294ff8 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -98,6 +98,7 @@
 
 #include "nsIFrame.h"
 #include "nsIParserService.h"
+#include "nsIEventStateManager.h"
 
 // Some utilities to handle annoying overloading of "A" tag for link and named anchor
 static char hrefText[] = "href";
diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp
index 596b375cbf75..8c667e508314 100644
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -56,6 +56,7 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsISelectionController.h"
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index c535bfe956a0..739ab2fbd508 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -95,6 +95,7 @@
 #include "nsThreadUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIContent.h"
+#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsGUIEvent.h"
 
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index b6377399f54f..43b63fa319e6 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -66,7 +66,7 @@
 #include "nsUnicharUtils.h"
 #include "nsStyleSet.h"
 #include "nsIViewManager.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsStyleConsts.h"
 #include "nsTableOuterFrame.h"
 #include "nsIDOMXULElement.h"
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index a88fdad95e8a..3ef28eb3e7f7 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -58,6 +58,7 @@
 #include "nsIDocument.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
+#include "nsIEventStateManager.h"
 #include "nsStyleSet.h"
 #include "nsIStyleSheet.h"
 #include "nsCSSStyleSheet.h"
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 0b7c334f8208..09f399357933 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -89,7 +89,7 @@ class nsFrameManager;
 class nsILinkHandler;
 class nsStyleContext;
 class nsIAtom;
-class nsEventStateManager;
+class nsIEventStateManager;
 class nsIURI;
 class nsILookAndFeel;
 class nsICSSPseudoComparator;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 00e4ee8725c5..465ff7879c67 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -118,7 +118,6 @@
 #include "nsViewsCID.h"
 #include "nsPresArena.h"
 #include "nsFrameManager.h"
-#include "nsEventStateManager.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsILayoutHistoryState.h"
@@ -3778,7 +3777,7 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
   }
   
   // Hold a reference to the ESM in case event dispatch tears us down.
-  nsRefPtr<nsEventStateManager> esm = mPresContext->EventStateManager();
+  nsCOMPtr<nsIEventStateManager> esm = mPresContext->EventStateManager();
 
   if (aAnchorName.IsEmpty()) {
     NS_ASSERTION(!aScroll, "can't scroll to empty anchor name");
@@ -6509,7 +6508,7 @@ PresShell::HandleEvent(nsIView         *aView,
     //
     // Note, currently for backwards compatibility we don't forward mouse events
     // to the active document when mouse is over some subdocument.
-    nsEventStateManager* activeESM =
+    nsIEventStateManager* activeESM =
       nsEventStateManager::GetActiveEventStateManager();
     if (activeESM && NS_IS_MOUSE_EVENT(aEvent) &&
         activeESM != shell->GetPresContext()->EventStateManager() &&
@@ -6795,7 +6794,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
   }
 #endif
 
-  nsRefPtr<nsEventStateManager> manager = mPresContext->EventStateManager();
+  nsCOMPtr<nsIEventStateManager> manager = mPresContext->EventStateManager();
   nsresult rv = NS_OK;
 
   if (!NS_EVENT_NEEDS_FRAME(aEvent) || GetCurrentEventFrame()) {
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 80f39c94e303..1d61068b6336 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -44,7 +44,7 @@
 #include "nsDisplayList.h"
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 #define ACTIVE   "active"
 #define HOVER    "hover"
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index 65c9c65a4d91..f6a818c624f4 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -91,7 +91,7 @@
 #include "nsICapturePicker.h"
 #include "nsIFileURL.h"
 #include "nsDOMFile.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 
 namespace dom = mozilla::dom;
 
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 09fbaeff8e1a..45378ebb9eb3 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -38,7 +38,7 @@
 #include "nsFormControlFrame.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMHTMLInputElement.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsILookAndFeel.h"
 
 //#define FCF_NOISY
@@ -128,13 +128,12 @@ nsFormControlFrame::RegUnRegAccessKey(nsIFrame * aFrame, PRBool aDoReg)
   nsIContent* content = aFrame->GetContent();
   content->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
   if (!accessKey.IsEmpty()) {
-    nsEventStateManager *stateManager = presContext->EventStateManager();
+    nsIEventStateManager *stateManager = presContext->EventStateManager();
     if (aDoReg) {
-      stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
+      return stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
     } else {
-      stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
+      return stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
     }
-    return NS_OK;
   }
   return NS_ERROR_FAILURE;
 }
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index f9e128870a4f..db185a994499 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsHTMLParts.h"
 #include "nsIDOMEventTarget.h"
 #include "nsEventDispatcher.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMMouseEvent.h"
@@ -87,6 +87,7 @@
 #include "nsIDOMKeyListener.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayList.h"
+#include "nsIEventStateManager.h"
 
 // Constants
 const nscoord kMaxDropDownRows          = 20; // This matches the setting for 4.x browsers
@@ -2071,8 +2072,9 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
     }
   }
 
-  nsCOMPtr<nsIContent> content = PresContext()->EventStateManager()->
-    GetEventTargetContent(nsnull);
+  nsCOMPtr<nsIContent> content;
+  PresContext()->EventStateManager()->
+    GetEventTargetContent(nsnull, getter_AddRefs(content));
 
   nsCOMPtr<nsIContent> optionContent = GetOptionFromContent(content);
   if (optionContent) {
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 20c6c00bf359..22c543c7b157 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -92,6 +92,7 @@
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMNSUIEvent.h"
+#include "nsIEventStateManager.h"
 
 #include "nsIDOMFocusListener.h" //onchange events
 #include "nsIDOMCharacterData.h" //for selection setting helper func
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index cbed44bacec3..4564a68f928e 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -66,6 +66,7 @@
 #include "nsLayoutErrors.h"
 #include "nsDisplayList.h"
 #include "nsContentErrors.h"
+#include "nsIEventStateManager.h"
 #include "nsListControlFrame.h"
 #include "nsIBaseWindow.h"
 #include "nsThemeConstants.h"
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index dcbffd451066..6c35419a67b4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2076,7 +2076,9 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
   //We often get out of sync state issues with mousedown events that
   //get interrupted by alerts/dialogs.
   //Check with the ESM to see if we should process this one
-  if (!aPresContext->EventStateManager()->EventStatusOK(aEvent)) 
+  PRBool eventOK;
+  aPresContext->EventStateManager()->EventStatusOK(aEvent, &eventOK);
+  if (!eventOK) 
     return NS_OK;
 
   nsresult rv;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 0eebef01f47d..55fed2703b39 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -88,6 +88,7 @@
 #include "imgIContainer.h"
 #include "imgILoader.h"
 
+#include "nsContentPolicyUtils.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsIPrefBranch2.h"
 #include "nsIPrefService.h"
@@ -95,7 +96,7 @@
 
 #include "nsIContentPolicy.h"
 #include "nsContentPolicyUtils.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsLayoutErrors.h"
 #include "nsBidiUtils.h"
 #include "nsBidiPresUtils.h"
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 25dfe94cf9eb..6a332d6590ce 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -57,7 +57,6 @@
 #include "nsIMutableArray.h"
 #include "nsBindingManager.h"
 #include "nsComputedDOMStyle.h"
-#include "nsEventStateManager.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -237,7 +236,7 @@ inDOMUtils::SetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 {
   NS_ENSURE_ARG_POINTER(aElement);
   
-  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
@@ -255,7 +254,7 @@ inDOMUtils::GetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 
   NS_ENSURE_ARG_POINTER(aElement);
 
-  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
diff --git a/layout/inspector/src/inDOMUtils.h b/layout/inspector/src/inDOMUtils.h
index f589da4a324b..27d77949d924 100644
--- a/layout/inspector/src/inDOMUtils.h
+++ b/layout/inspector/src/inDOMUtils.h
@@ -40,11 +40,11 @@
 
 #include "inIDOMUtils.h"
 
+#include "nsIEventStateManager.h"
 #include "nsISupportsArray.h"
 
 class nsRuleNode;
 class nsStyleContext;
-class nsIContent;
 
 class inDOMUtils : public inIDOMUtils
 {
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 111b2bf4febd..9c31fad73fed 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -90,7 +90,7 @@ inLayoutUtils::GetFrameFor(nsIDOMElement* aElement)
   return content->GetPrimaryFrame();
 }
 
-nsEventStateManager*
+nsIEventStateManager*
 inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement)
 {
   NS_PRECONDITION(aElement, "Passing in a null element is bad");
diff --git a/layout/inspector/src/inLayoutUtils.h b/layout/inspector/src/inLayoutUtils.h
index 00d7b01f94f2..1ff0a7bfa4d7 100644
--- a/layout/inspector/src/inLayoutUtils.h
+++ b/layout/inspector/src/inLayoutUtils.h
@@ -43,7 +43,7 @@ class nsIDOMDocument;
 class nsIDOMElement;
 class nsIDOMNode;
 class nsIDOMWindowInternal;
-class nsEventStateManager;
+class nsIEventStateManager;
 class nsIFrame;
 class nsIPresShell;
 class nsISupports;
@@ -55,7 +55,7 @@ public:
   static nsIDOMWindowInternal* GetWindowFor(nsIDOMDocument* aDoc);
   static nsIPresShell* GetPresShellFor(nsISupports* aThing);
   static nsIFrame* GetFrameFor(nsIDOMElement* aElement);
-  static nsEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
+  static nsIEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
   static nsBindingManager* GetBindingManagerFor(nsIDOMNode* aNode);
   static nsIDOMDocument* GetSubDocumentFor(nsIDOMNode* aNode);
   static nsIDOMNode* GetContainerFor(nsIDOMDocument* aDoc);
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 6ca21fa986b0..04703a80d5d4 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -47,6 +47,7 @@
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
 #include "nsPresContext.h"
+#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsLiteralString.h"
 
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index d315bece1dba..452e5a8cb61f 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -62,7 +62,7 @@
 #include "mozilla/css/GroupRule.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsGkAtoms.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index 66fb3a42ee81..316358052bc7 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -59,7 +59,7 @@
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsStyleConsts.h"
diff --git a/layout/style/nsIStyleRuleProcessor.h b/layout/style/nsIStyleRuleProcessor.h
index db292a1cb091..f64897b3c8d3 100644
--- a/layout/style/nsIStyleRuleProcessor.h
+++ b/layout/style/nsIStyleRuleProcessor.h
@@ -124,7 +124,7 @@ public:
    * test is used for optimization only, and may err on the side of
    * reporting more dependencies than really exist.
    *
-   * Event states are defined in nsEventStates.h.
+   * Event states are defined in nsIEventStateManager.h.
    */
   virtual nsRestyleHint
     HasStateDependentStyle(StateRuleProcessorData* aData) = 0;
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 06747f43caec..0bd1c56e5ff2 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -62,7 +62,7 @@
 #ifdef MOZ_CSS_ANIMATIONS
 #include "nsAnimationManager.h"
 #endif
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "mozilla/dom/Element.h"
 
 using namespace mozilla::dom;
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 6faa8a97720c..fc5d46d26949 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -85,11 +85,12 @@
 #include "nsWidgetsCID.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsHTMLContainerFrame.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsITheme.h"
 #include "nsTransform2D.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
@@ -1929,15 +1930,17 @@ nsBoxFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsEventStateManager *esm = PresContext()->EventStateManager();
+  nsIEventStateManager *esm = PresContext()->EventStateManager();
+
+  nsresult rv;
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    esm->RegisterAccessKey(mContent, key);
+    rv = esm->RegisterAccessKey(mContent, key);
   else
-    esm->UnregisterAccessKey(mContent, key);
+    rv = esm->UnregisterAccessKey(mContent, key);
 
-  return NS_OK;
+  return rv;
 }
 
 PRBool
diff --git a/layout/xul/base/src/nsButtonBoxFrame.cpp b/layout/xul/base/src/nsButtonBoxFrame.cpp
index 5ea91feb7784..227e46890286 100644
--- a/layout/xul/base/src/nsButtonBoxFrame.cpp
+++ b/layout/xul/base/src/nsButtonBoxFrame.cpp
@@ -48,7 +48,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsGUIEvent.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMElement.h"
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
@@ -92,7 +92,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
       if (NS_KEY_EVENT == aEvent->eventStructType) {
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
-          nsEventStateManager *esm = aPresContext->EventStateManager();
+          nsIEventStateManager *esm = aPresContext->EventStateManager();
           // :hover:active state
           esm->SetContentState(mContent, NS_EVENT_STATE_HOVER);
           esm->SetContentState(mContent, NS_EVENT_STATE_ACTIVE);
@@ -121,7 +121,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
           // only activate on keyup if we're already in the :hover:active state
-          nsEventStateManager *esm = aPresContext->EventStateManager();
+          nsIEventStateManager *esm = aPresContext->EventStateManager();
           nsEventStates buttonState = esm->GetContentState(mContent);
           if (buttonState.HasAllStates(NS_EVENT_STATE_ACTIVE |
                                        NS_EVENT_STATE_HOVER)) {
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index d49db84cb70b..835ba2fdea37 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -57,6 +57,8 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 
+#include "nsIEventStateManager.h"
+
 #include "nsContentUtils.h"
 
 /*
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index dacb4367b322..e003fea79f2c 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -73,7 +73,7 @@
 #include "nsLayoutUtils.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIBoxLayout.h"
 #include "nsIPopupBoxObject.h"
 #include "nsPIWindowRoot.h"
@@ -833,7 +833,7 @@ nsMenuPopupFrame::HidePopup(PRBool aDeselectMenu, nsPopupState aNewState)
   // XXX, bug 137033, In Windows, if mouse is outside the window when the menupopup closes, no
   // mouse_enter/mouse_exit event will be fired to clear current hover state, we should clear it manually.
   // This code may not the best solution, but we can leave it here until we find the better approach.
-  nsEventStateManager *esm = PresContext()->EventStateManager();
+  nsIEventStateManager *esm = PresContext()->EventStateManager();
 
   nsEventStates state = esm->GetContentState(mContent);
 
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 806ea7b1b7fe..4b62be4d3c52 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -62,7 +62,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMXULLabelElement.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsITheme.h"
 #include "nsUnicharUtils.h"
 #include "nsContentUtils.h"
@@ -1151,15 +1151,17 @@ nsTextBoxFrame::RegUnregAccessKey(PRBool aDoReg)
     if (accessKey.IsEmpty())
         return NS_OK;
 
+    nsresult rv;
+
     // With a valid PresContext we can get the ESM 
     // and (un)register the access key
-    nsEventStateManager *esm = PresContext()->EventStateManager();
+    nsIEventStateManager *esm = PresContext()->EventStateManager();
 
     PRUint32 key = accessKey.First();
     if (aDoReg)
-        esm->RegisterAccessKey(mContent, key);
+        rv = esm->RegisterAccessKey(mContent, key);
     else
-        esm->UnregisterAccessKey(mContent, key);
+        rv = esm->UnregisterAccessKey(mContent, key);
 
-    return NS_OK;
+    return rv;
 }
diff --git a/layout/xul/base/src/nsXULLabelFrame.cpp b/layout/xul/base/src/nsXULLabelFrame.cpp
index 548bed1c23cb..8c7b9e63c51b 100644
--- a/layout/xul/base/src/nsXULLabelFrame.cpp
+++ b/layout/xul/base/src/nsXULLabelFrame.cpp
@@ -40,7 +40,7 @@
 #include "nsXULLabelFrame.h"
 #include "nsHTMLParts.h"
 #include "nsINameSpaceManager.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 
 nsIFrame*
 NS_NewXULLabelFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -80,15 +80,16 @@ nsXULLabelFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsEventStateManager *esm = PresContext()->EventStateManager();
+  nsIEventStateManager *esm = PresContext()->EventStateManager();
+  nsresult rv;
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    esm->RegisterAccessKey(mContent, key);
+    rv = esm->RegisterAccessKey(mContent, key);
   else
-    esm->UnregisterAccessKey(mContent, key);
+    rv = esm->UnregisterAccessKey(mContent, key);
 
-  return NS_OK;
+  return rv;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/tree/src/nsTreeContentView.cpp b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
index f069772b1092..b80d994c712f 100644
--- a/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -42,7 +42,7 @@
 #include "nsTreeContentView.h"
 #include "nsChildIterator.h"
 #include "nsIDOMClassInfo.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsINodeInfo.h"
 #include "nsIXULSortService.h"
 #include "nsContentUtils.h"
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index a7c32afc7164..cb964faee212 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -51,6 +51,7 @@
 #include "mozilla/storage.h"
 #include "mozilla/dom/Link.h"
 #include "nsDocShellCID.h"
+#include "nsIEventStateManager.h"
 #include "mozilla/Services.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index 3f2204f42fc8..d05e17fe7036 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -69,6 +69,7 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
+#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsISelection.h"
 #include "nsILink.h"
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index cbb326e2383a..c4fd03d2ff58 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -52,7 +52,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIAtom.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsINameSpaceManager.h"
 #include "nsPresContext.h"
 #include "nsILookAndFeel.h"
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 618bc594524d..894232fcde87 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -61,6 +61,7 @@
 #include "nsThemeConstants.h"
 #include "nsILookAndFeel.h"
 #include "nsIServiceManager.h"
+#include "nsIEventStateManager.h"
 #include "nsIDOMHTMLInputElement.h"
 #include <malloc.h>
 
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index d86a481a8546..936a4f9d54d0 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -51,7 +51,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
-#include "nsEventStates.h"
+#include "nsIEventStateManager.h"
 #include "nsINameSpaceManager.h"
 #include "nsILookAndFeel.h"
 #include "nsIDOMHTMLInputElement.h"
diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp
index bd6f97644045..f3e413686922 100644
--- a/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -59,6 +59,7 @@
 #include "nsISelectionPrivate.h"
 #include "nsPresContext.h"
 #include "nsIDOMDataTransfer.h"
+#include "nsIEventStateManager.h"
 #include "nsICanvasElementExternal.h"
 #include "nsIImageLoadingContent.h"
 #include "imgIContainer.h"
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index 5e7a035e3166..d5a48421efd7 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -43,7 +43,7 @@
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsEventStateManager.h"
+#include "nsIEventStateManager.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIDOMHTMLInputElement.h"
@@ -91,7 +91,7 @@ nsNativeTheme::GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType)
   if (!shell)
     return nsEventStates();
 
-  nsEventStateManager* esm = shell->GetPresContext()->EventStateManager();
+  nsIEventStateManager* esm = shell->GetPresContext()->EventStateManager();
   nsEventStates flags = esm->GetContentState(aFrame->GetContent(), PR_TRUE);
   
   if (isXULCheckboxRadio && aWidgetType == NS_THEME_RADIO) {
diff --git a/widget/src/xpwidgets/nsNativeTheme.h b/widget/src/xpwidgets/nsNativeTheme.h
index 63c49b0db991..72abbce13651 100644
--- a/widget/src/xpwidgets/nsNativeTheme.h
+++ b/widget/src/xpwidgets/nsNativeTheme.h
@@ -76,7 +76,7 @@ class nsNativeTheme : public nsITimerCallback
 
   nsNativeTheme();
 
-  // Returns the content state (hover, focus, etc), see nsEventStateManager.h
+  // Returns the content state (hover, focus, etc), see nsIEventStateManager.h
   nsEventStates GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType);
 
   // Returns whether the widget is already styled by content

From dfa6fff6403a055827755b05e5b35470365a781a Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Wed, 20 Apr 2011 22:27:22 +0200
Subject: [PATCH 334/509] Bug 634609 - Include pthread_np.h on OpenBSD too for
 pthread_stackseg_np(). r=gal

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

diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index f33026462040..9627d84a5ef8 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -50,7 +50,7 @@
 #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
 # include <pthread.h>
 
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__OpenBSD__)
 #  include <pthread_np.h>
 # endif
 

From 66ca5b065c41dc5680d4f1decf38d9c5be47bf07 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 20 Apr 2011 15:20:13 -0700
Subject: [PATCH 335/509] Bug 651578 - Aurora About Dialog channel switcher
 should have left-aligned, not centered text. r=gavin

---
 browser/base/content/aboutDialog.css |  5 ++++-
 browser/base/content/aboutDialog.xul | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
index bfb96b616ec2..703e54527c15 100644
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -134,13 +134,16 @@
   margin-top: 10px;
 }
 
+#channelSelectorStart {
+  -moz-margin-start: 0;
+}
+
 #channelMenulist {
   margin: 0;
 }
 
 .channel-description {
   margin: 10px 0;
-  text-align: center;
 }
 
 #detailsBox,
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index 66abc54a05f5..848e25e3d806 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -127,8 +127,8 @@
           </vbox>
 
           <vbox id="channelSelector">
-            <hbox pack="center" align="center">
-              <label>&channel.selector.start;</label>
+            <hbox pack="start" align="center">
+              <label id="channelSelectorStart">&channel.selector.start;</label>
               <menulist id="channelMenulist" onselect="gChannelSelector.selectChannel(this.selectedItem);">
                 <menupopup>
                   <menuitem id="releaseMenuitem" label="Release" value="release"/>
@@ -146,9 +146,14 @@
               <description id="auroraDescription" class="channel-description">&channel.aurora.description;</description>
             </deck>
 
-            <hbox id="channelSelectorButtons" pack="center">
+            <hbox id="channelSelectorButtons" pack="end">
+#ifdef XP_UNIX
+              <button oncommand="gChannelSelector.cancel();" label="&channel.selector.cancelButton;"/>
+              <button oncommand="gChannelSelector.apply();" label="&channel.selector.applyButton;"/>
+#else
               <button oncommand="gChannelSelector.apply();" label="&channel.selector.applyButton;"/>
               <button oncommand="gChannelSelector.cancel();" label="&channel.selector.cancelButton;"/>
+#endif
             </hbox>
           </vbox>
         </deck>

From 7b44ff8cc2853818704be1ae0ccb705513658212 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 21 Apr 2011 08:54:43 +0900
Subject: [PATCH 336/509] Bug 347185 Plugin events should be handled by focused
 DOM window r=smaug+roc

---
 widget/public/nsGUIEvent.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 4956a0aee311..b3f413129ba7 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -1826,7 +1826,8 @@ inline PRBool NS_IsEventUsingCoordinates(nsEvent* aEvent)
 inline PRBool NS_IsEventTargetedAtFocusedWindow(nsEvent* aEvent)
 {
   return NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_RELATED_EVENT(aEvent) ||
-         NS_IS_CONTEXT_MENU_KEY(aEvent) || NS_IS_CONTENT_COMMAND_EVENT(aEvent);
+         NS_IS_CONTEXT_MENU_KEY(aEvent) ||
+         NS_IS_CONTENT_COMMAND_EVENT(aEvent) || NS_IS_PLUGIN_EVENT(aEvent);
 }
 
 /**

From 1f33181162d4bbdb8f03343e56c11f419b0b94d7 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 21 Apr 2011 08:54:43 +0900
Subject: [PATCH 337/509] Bug 347185 Adding automated tests r=roc

---
 layout/generic/nsObjectFrame.cpp              |  4 +-
 modules/plugin/test/testplugin/README         |  7 +++
 modules/plugin/test/testplugin/nptest.cpp     | 19 +++++-
 modules/plugin/test/testplugin/nptest.h       |  1 +
 .../plugin/test/testplugin/nptest_windows.cpp | 21 +++++++
 widget/src/windows/nsWindow.cpp               | 20 ++++--
 widget/src/windows/nsWindow.h                 |  4 +-
 widget/src/windows/nsWindowDefs.h             | 12 ++++
 widget/tests/Makefile.in                      |  1 +
 widget/tests/test_plugin_input_event.html     | 63 +++++++++++++++++++
 10 files changed, 144 insertions(+), 8 deletions(-)
 create mode 100644 widget/tests/test_plugin_input_event.html

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 0be218f4bed8..94934d2e3e57 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -446,8 +446,10 @@ public:
   PRBool SendNativeEvents()
   {
 #ifdef XP_WIN
+    // XXX we should remove the plugin name check
     return mPluginWindow->type == NPWindowTypeDrawable &&
-           MatchPluginName("Shockwave Flash");
+           (MatchPluginName("Shockwave Flash") ||
+            MatchPluginName("Test Plug-in"));
 #elif defined(MOZ_X11) || defined(XP_MACOSX)
     return PR_TRUE;
 #else
diff --git a/modules/plugin/test/testplugin/README b/modules/plugin/test/testplugin/README
index c623d94a9d25..876cdebafeb6 100644
--- a/modules/plugin/test/testplugin/README
+++ b/modules/plugin/test/testplugin/README
@@ -225,6 +225,13 @@ getClipRegionRectCount(), this will throw an error. The coordinates are
 the same as for getEdge. See getClipRegionRectCount() above for
 notes on platform plugin limitations.
 
+== Keyboard events ==
+
+* getLastKeyText()
+Returns the text which was inputted by last keyboard events. This is cleared at
+every keydown event.
+NOTE: Currently, this is implemented only on Windows.
+
 == Mouse events ==
 
 The test plugin supports the following scriptable methods:
diff --git a/modules/plugin/test/testplugin/nptest.cpp b/modules/plugin/test/testplugin/nptest.cpp
index b7e6e7c46bca..5d0e404401c0 100644
--- a/modules/plugin/test/testplugin/nptest.cpp
+++ b/modules/plugin/test/testplugin/nptest.cpp
@@ -165,6 +165,7 @@ static bool getWindowPosition(NPObject* npobj, const NPVariant* args, uint32_t a
 static bool constructObject(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool setSitesWithData(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 static bool setSitesWithDataCapabilities(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
+static bool getLastKeyText(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
 
 static const NPUTF8* sPluginMethodIdentifierNames[] = {
   "npnEvaluateTest",
@@ -221,7 +222,8 @@ static const NPUTF8* sPluginMethodIdentifierNames[] = {
   "getWindowPosition",
   "constructObject",
   "setSitesWithData",
-  "setSitesWithDataCapabilities"
+  "setSitesWithDataCapabilities",
+  "getLastKeyText"
 };
 static NPIdentifier sPluginMethodIdentifiers[ARRAY_LENGTH(sPluginMethodIdentifierNames)];
 static const ScriptableFunction sPluginMethodFunctions[] = {
@@ -279,7 +281,8 @@ static const ScriptableFunction sPluginMethodFunctions[] = {
   getWindowPosition,
   constructObject,
   setSitesWithData,
-  setSitesWithDataCapabilities
+  setSitesWithDataCapabilities,
+  getLastKeyText
 };
 
 STATIC_ASSERT(ARRAY_LENGTH(sPluginMethodIdentifierNames) ==
@@ -3436,3 +3439,15 @@ bool setSitesWithDataCapabilities(NPObject* npobj, const NPVariant* args, uint32
   return true;
 }
 
+bool getLastKeyText(NPObject* npobj, const NPVariant* args, uint32_t argCount,
+                    NPVariant* result)
+{
+  if (argCount != 0) {
+    return false;
+  }
+
+  NPP npp = static_cast<TestNPObject*>(npobj)->npp;
+  InstanceData* id = static_cast<InstanceData*>(npp->pdata);
+  STRINGZ_TO_NPVARIANT(NPN_StrDup(id->lastKeyText.c_str()), *result);
+  return true;
+}
diff --git a/modules/plugin/test/testplugin/nptest.h b/modules/plugin/test/testplugin/nptest.h
index a198d07fd474..d91975b31e5e 100644
--- a/modules/plugin/test/testplugin/nptest.h
+++ b/modules/plugin/test/testplugin/nptest.h
@@ -138,6 +138,7 @@ typedef struct InstanceData {
   int32_t focusEventCount;
   int32_t eventModel;
   bool closeStream;
+  std::string lastKeyText;
 } InstanceData;
 
 void notifyDidPaint(InstanceData* instanceData);
diff --git a/modules/plugin/test/testplugin/nptest_windows.cpp b/modules/plugin/test/testplugin/nptest_windows.cpp
index 6816c7fca0ee..0c4c2e2bee1e 100644
--- a/modules/plugin/test/testplugin/nptest_windows.cpp
+++ b/modules/plugin/test/testplugin/nptest_windows.cpp
@@ -458,6 +458,27 @@ handleEventInternal(InstanceData* instanceData, NPEvent* pe, LRESULT* result)
       return true;
     }
 
+    case WM_KEYDOWN:
+      instanceData->lastKeyText.erase();
+      *result = 0;
+      return true;
+
+    case WM_CHAR: {
+      *result = 0;
+      wchar_t uniChar = static_cast<wchar_t>(pe->wParam);
+      if (!uniChar) {
+        return true;
+      }
+      char utf8Char[6];
+      int len =
+        ::WideCharToMultiByte(CP_UTF8, 0, &uniChar, 1, utf8Char, 6, NULL, NULL);
+      if (len == 0 || len > 6) {
+        return true;
+      }
+      instanceData->lastKeyText.append(utf8Char, len);
+      return true;
+    }
+
     default:
       return false;
   }
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 8953adb17be7..2ee73beada00 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -3993,10 +3993,17 @@ PRBool nsWindow::DispatchPluginEvent(UINT aMessage,
 }
 
 void nsWindow::RemoveMessageAndDispatchPluginEvent(UINT aFirstMsg,
-                                                   UINT aLastMsg)
+                 UINT aLastMsg, nsFakeCharMessage* aFakeCharMessage)
 {
   MSG msg;
-  ::GetMessageW(&msg, mWnd, aFirstMsg, aLastMsg);
+  if (aFakeCharMessage) {
+    if (aFirstMsg > WM_CHAR || aLastMsg < WM_CHAR) {
+      return;
+    }
+    msg = aFakeCharMessage->GetCharMessage(mWnd);
+  } else {
+    ::GetMessageW(&msg, mWnd, aFirstMsg, aLastMsg);
+  }
   DispatchPluginEvent(msg);
 }
 
@@ -6986,6 +6993,8 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
     PRBool anyCharMessagesRemoved = PR_FALSE;
 
     if (aFakeCharMessage) {
+      RemoveMessageAndDispatchPluginEvent(WM_KEYFIRST, WM_KEYLAST,
+                                          aFakeCharMessage);
       anyCharMessagesRemoved = PR_TRUE;
     } else {
       while (gotMsg && (msg.message == WM_CHAR || msg.message == WM_SYSCHAR))
@@ -7010,9 +7019,12 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
   else if (gotMsg &&
            (aFakeCharMessage ||
             msg.message == WM_CHAR || msg.message == WM_SYSCHAR || msg.message == WM_DEADCHAR)) {
-    if (aFakeCharMessage)
+    if (aFakeCharMessage) {
+      MSG msg = aFakeCharMessage->GetCharMessage(mWnd);
       return OnCharRaw(aFakeCharMessage->mCharCode,
-                       aFakeCharMessage->mScanCode, aModKeyState, extraFlags);
+                       aFakeCharMessage->mScanCode,
+                       aModKeyState, extraFlags, &msg);
+    }
 
     // If prevent default set for keydown, do same for keypress
     ::GetMessageW(&msg, mWnd, msg.message, msg.message);
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index d145343d0cc9..63ec62311ba9 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -355,7 +355,9 @@ protected:
   PRBool                  DispatchCommandEvent(PRUint32 aEventCommand);
   void                    RelayMouseEvent(UINT aMsg, WPARAM wParam, LPARAM lParam);
   static void             RemoveNextCharMessage(HWND aWnd);
-  void                    RemoveMessageAndDispatchPluginEvent(UINT aFirstMsg, UINT aLastMsg);
+  void                    RemoveMessageAndDispatchPluginEvent(UINT aFirstMsg,
+                            UINT aLastMsg,
+                            nsFakeCharMessage* aFakeCharMessage = nsnull);
   static MSG              InitMSG(UINT aMessage, WPARAM wParam, LPARAM lParam);
   virtual PRBool          ProcessMessage(UINT msg, WPARAM &wParam,
                                          LPARAM &lParam, LRESULT *aRetValue);
diff --git a/widget/src/windows/nsWindowDefs.h b/widget/src/windows/nsWindowDefs.h
index 1dc97098a804..fb06e3a2d714 100644
--- a/widget/src/windows/nsWindowDefs.h
+++ b/widget/src/windows/nsWindowDefs.h
@@ -244,6 +244,18 @@ struct nsAlternativeCharCode; // defined in nsGUIEvent.h
 struct nsFakeCharMessage {
   UINT mCharCode;
   UINT mScanCode;
+
+  MSG GetCharMessage(HWND aWnd)
+  {
+    MSG msg;
+    msg.hwnd = aWnd;
+    msg.message = WM_CHAR;
+    msg.wParam = static_cast<WPARAM>(mCharCode);
+    msg.lParam = static_cast<LPARAM>(mScanCode);
+    msg.time = 0;
+    msg.pt.x = msg.pt.y = 0;
+    return msg;
+  }
 };
 
 // Used in char processing
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index ff94397e759b..5b3775a3a859 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -113,6 +113,7 @@ _CHROME_FILES  += taskbar_previews.xul \
 		window_state_windows.xul \
 		taskbar_progress.xul \
 		test_chrome_context_menus_win.xul \
+		test_plugin_input_event.html \
 		chrome_context_menus_win.xul \
 		$(NULL)
 
diff --git a/widget/tests/test_plugin_input_event.html b/widget/tests/test_plugin_input_event.html
new file mode 100644
index 000000000000..f8bfc8067220
--- /dev/null
+++ b/widget/tests/test_plugin_input_event.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for plugin input event</title>
+  <script type="text/javascript"
+          src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css"
+          href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display">
+  <embed id="plugin" type="application/x-test" wmode="opaque">
+</p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+
+<script type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+
+var gPlugin = document.getElementById("plugin");
+
+var gUtils = window.
+      QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+      getInterface(Components.interfaces.nsIDOMWindowUtils);
+
+function doTest() {
+  gPlugin.focus();
+
+  is(gUtils.IMEStatus, gUtils.IME_STATUS_PLUGIN,
+     "Plugin failed to get focus");
+
+  is(gPlugin.getLastKeyText(), "", "Must be empty before first key test");
+
+  gUtils.sendNativeKeyEvent(0x409 /* US */,
+                            0x41, 0,
+                            "a", "a");
+  is(gPlugin.getLastKeyText(), "a", "Invalid character was inputted");
+
+  gUtils.sendNativeKeyEvent(0x407 /* German */,
+                            0xBB, 0,
+                            "+", "+");
+  is(gPlugin.getLastKeyText(), "+", "Invalid character was inputted");
+
+  gUtils.sendNativeKeyEvent(0x407 /* German */,
+                            0xBB, 0x1400 /* Ctrl + Alt (AltGr) */,
+                            "~", "+");
+  is(gPlugin.getLastKeyText(), "~", "Invalid character was inputted");
+
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForFocus(doTest);
+
+</script>
+</body>
+</html>

From b9cfb5f20550fcaed05a1f13a31e4e088242706b Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Thu, 21 Apr 2011 07:29:50 +0100
Subject: [PATCH 338/509] bug 642589 - expose prefs for tweaking
 DirectWrite/D2D antialiasing behavior. r=jdaggett

---
 gfx/cairo/cairo/src/cairo-d2d-private.h    |   2 +-
 gfx/cairo/cairo/src/cairo-d2d-surface.cpp  | 184 ++++++++++++++-------
 gfx/cairo/cairo/src/cairo-dwrite-font.cpp  | 109 +++++++++---
 gfx/cairo/cairo/src/cairo-dwrite-private.h |  37 +++++
 gfx/cairo/cairo/src/cairo-win32.h          |   3 +
 gfx/thebes/gfxDWriteFonts.cpp              | 157 ++++++++----------
 gfx/thebes/gfxDWriteFonts.h                |   2 +
 gfx/thebes/gfxFont.cpp                     |   1 -
 gfx/thebes/gfxHarfBuzzShaper.cpp           |  12 +-
 gfx/thebes/gfxWindowsPlatform.cpp          |  72 ++++++++
 gfx/thebes/gfxWindowsPlatform.h            |   4 +
 modules/libpref/src/init/all.js            |  33 ++++
 12 files changed, 436 insertions(+), 180 deletions(-)

diff --git a/gfx/cairo/cairo/src/cairo-d2d-private.h b/gfx/cairo/cairo/src/cairo-d2d-private.h
index 4a132371e5e2..80e480ff0f23 100644
--- a/gfx/cairo/cairo/src/cairo-d2d-private.h
+++ b/gfx/cairo/cairo/src/cairo-d2d-private.h
@@ -80,7 +80,7 @@ typedef struct _cairo_d2d_device cairo_d2d_device_t;
 
 struct _cairo_d2d_surface {
     _cairo_d2d_surface() : d2d_clip(NULL), clipping(false), isDrawing(false),
-	textRenderingInit(true)
+	textRenderingInit(false)
     {
 	_cairo_clip_init (&this->clip);
     }
diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
index b460a7d29f9f..066533a96c44 100644
--- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
@@ -176,7 +176,7 @@ cairo_d2d_create_device_from_d3d10device(ID3D10Device1 *d3d10device)
     CD3D10_BUFFER_DESC bufferDesc(sizeof(vertices), D3D10_BIND_VERTEX_BUFFER);
     D3D10_SUBRESOURCE_DATA data;
     CD3D10_TEXTURE2D_DESC textDesc(DXGI_FORMAT_B8G8R8A8_UNORM,
-	                           TEXT_TEXTURE_WIDTH,
+				   TEXT_TEXTURE_WIDTH,
 				   TEXT_TEXTURE_HEIGHT,
 				   1, 1);
 
@@ -352,10 +352,10 @@ cairo_release_device(cairo_device_t *device)
     if (!newrefcnt) {
 	// Call the correct destructor
 	cairo_d2d_device_t *d2d_device = reinterpret_cast<cairo_d2d_device_t*>(device);
-        HMODULE d3d10_1 = d2d_device->mD3D10_1;
+	HMODULE d3d10_1 = d2d_device->mD3D10_1;
 	delete d2d_device;
 	_cairo_d2d_release_factory();
-        FreeLibrary(d3d10_1);
+	FreeLibrary(d3d10_1);
     }
     return newrefcnt;
 }
@@ -779,7 +779,7 @@ _cairo_d2d_get_buffer_texture(cairo_d2d_surface_t *surface)
 	surface->surface->QueryInterface(&surf);
 	surf->GetDesc(&surfDesc);
 	CD3D10_TEXTURE2D_DESC softDesc(surfDesc.Format, surfDesc.Width, surfDesc.Height);
-        softDesc.MipLevels = 1;
+	softDesc.MipLevels = 1;
 	softDesc.Usage = D3D10_USAGE_DEFAULT;
 	softDesc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE;
 	surface->device->mD3D10Device->CreateTexture2D(&softDesc, NULL, &surface->bufferTexture);
@@ -1158,9 +1158,9 @@ _cairo_d2d_create_strokestyle_for_stroke_style(const cairo_stroke_style_t *style
 							       (FLOAT)style->miter_limit,
 							       dashStyle,
 							       (FLOAT)style->dash_offset),
-							        dashes,
-							        style->num_dashes,
-							        &strokeStyle);
+							       dashes,
+							       style->num_dashes,
+							       &strokeStyle);
     delete [] dashes;
     return strokeStyle;
 }
@@ -1225,7 +1225,7 @@ static void _d2d_snapshot_detached(cairo_surface_t *surface)
     }
     if (!--existingBitmap->refs) {
 	cache_usage -= _d2d_compute_bitmap_mem_size(existingBitmap->bitmap);
-        delete existingBitmap;
+	delete existingBitmap;
     }
     cairo_surface_destroy(surface);
 }
@@ -1463,8 +1463,8 @@ _cairo_d2d_create_radial_gradient_brush(cairo_d2d_surface_t *d2dsurf,
     } else if (source_pattern->base.base.extend == CAIRO_EXTEND_NONE) {
 	float offset_factor = (outer_radius - inner_radius) / outer_radius;
 	float global_offset = inner_radius / outer_radius;
-        
-        num_stops++; // Add a stop on the outer radius.
+
+	num_stops++; // Add a stop on the outer radius.
 	if (inner_radius != 0) {
 	    num_stops++; // Add a stop on the inner radius.
 	}
@@ -1572,11 +1572,11 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 
 	double max_dist, min_dist;
 	max_dist = MAX(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)),
-	               _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1)));
+		       _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1)));
 	max_dist = MAX(max_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1)));
 	max_dist = MAX(max_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1)));
 	min_dist = MIN(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)),
-	               _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1)));
+		       _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1)));
 	min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1)));
 	min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1)));
 
@@ -1758,7 +1758,7 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
 		 */
 		return NULL;
 	    }
-            if (srcSurf->device != d2dsurf->device) {
+	    if (srcSurf->device != d2dsurf->device) {
 		/* This code does not work if the source surface does not use
 		 * the same device. Some work could be done to do something
 		 * fairly efficient here, for now, fallback.
@@ -1830,7 +1830,7 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
 		/* First we check which part of the image is inside the viewable area. */
   		_cairo_d2d_calculate_visible_rect(d2dsurf, srcSurf, &mat, &xoffset, &yoffset, &width, &height);
 
-	        cairo_matrix_translate(&mat, xoffset, yoffset);
+		cairo_matrix_translate(&mat, xoffset, yoffset);
 
 		if (width > maxSize || height > maxSize) {
 		    /*
@@ -1840,11 +1840,11 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
 		     * We need to size it to at least the diagonal size of this surface, in order to prevent ever
 		     * upsampling this again when drawing it to the surface. We want the resized surface
 		     * to be as small as possible to limit pixman required fill rate.
-                     *
-                     * Note this isn't necessarily perfect. Imagine having a 5x5 pixel destination and
-                     * a 10x5 image containing a line of blackpixels, white pixels, black pixels, if you rotate
-                     * this by 45 degrees and scale it to a size of 5x5 pixels and composite it to the destination,
-                     * the composition will require all 10 original columns to do the best possible sampling.
+		     *
+		     * Note this isn't necessarily perfect. Imagine having a 5x5 pixel destination and
+		     * a 10x5 image containing a line of blackpixels, white pixels, black pixels, if you rotate
+		     * this by 45 degrees and scale it to a size of 5x5 pixels and composite it to the destination,
+		     * the composition will require all 10 original columns to do the best possible sampling.
 		     */
 		    RefPtr<IDXGISurface> surf;
 		    d2dsurf->surface->QueryInterface(&surf);
@@ -1978,10 +1978,10 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
 		    cachebitmap->dirty = false;
 		    cachebitmap->bitmap = sourceBitmap;
 		    cachebitmap->device = d2dsurf->device;
-                    /*
-                     * This will start out with two references, one on the snapshot
-                     * and one more in the user data structure.
-                     */
+		    /*
+		     * This will start out with two references, one on the snapshot
+		     * and one more in the user data structure.
+		     */
 		    cachebitmap->refs = 2;
 		    cairo_surface_set_user_data(surfacePattern->surface,
 						key,
@@ -2272,7 +2272,7 @@ _cairo_d2d_clear (cairo_d2d_surface_t *d2dsurf,
 
 	    d2dsurf->rt->PushAxisAlignedClip(
 		    D2D1::RectF((FLOAT)rect.x,
-			        (FLOAT)rect.y,
+				(FLOAT)rect.y,
 				(FLOAT)rect.x + rect.width,
 				(FLOAT)rect.y + rect.height),
 		    D2D1_ANTIALIAS_MODE_ALIASED);
@@ -2288,7 +2288,7 @@ _cairo_d2d_clear (cairo_d2d_surface_t *d2dsurf,
 }
 
 static cairo_operator_t _cairo_d2d_simplify_operator(cairo_operator_t op,
-					             const cairo_pattern_t *source)
+						     const cairo_pattern_t *source)
 {
     if (op == CAIRO_OPERATOR_SOURCE) {
 	/** Operator over is easier for D2D! If the source if opaque, change */
@@ -2655,7 +2655,7 @@ _cairo_d2d_copy_surface(cairo_d2d_surface_t *dst,
 	src->device->mD3D10Device->CopyResource(srcResource, src->surface);
     } else {
 	// Need to flush the source too if it's a different surface.
-        _cairo_d2d_flush(src);
+	_cairo_d2d_flush(src);
     }
 
     // One copy for each rectangle in the final clipping region.
@@ -2705,7 +2705,7 @@ _cairo_d2d_blend_surface(cairo_d2d_surface_t *dst,
 		 	 const cairo_matrix_t *transform,
 			 cairo_box_t *box,
 			 cairo_clip_t *clip,
-                         cairo_filter_t filter,
+			 cairo_filter_t filter,
 			 float opacity)
 {
     if (dst == src) {
@@ -2804,12 +2804,12 @@ _cairo_d2d_blend_surface(cairo_d2d_surface_t *dst,
  */
 static cairo_int_status_t
 _cairo_d2d_try_fastblit(cairo_d2d_surface_t *dst,
-		        cairo_surface_t *src,
-		        cairo_box_t *box,
-		        const cairo_matrix_t *matrix,
-		        cairo_clip_t *clip,
-		        cairo_operator_t op,
-                        cairo_filter_t filter,
+			cairo_surface_t *src,
+			cairo_box_t *box,
+			const cairo_matrix_t *matrix,
+			cairo_clip_t *clip,
+			cairo_operator_t op,
+			cairo_filter_t filter,
 			float opacity = 1.0f)
 {
     if (op == CAIRO_OPERATOR_OVER && src->content == CAIRO_CONTENT_COLOR) {
@@ -3102,8 +3102,8 @@ _cairo_d2d_paint(void			*surface,
 	    reinterpret_cast<const cairo_surface_pattern_t*>(source);
 
 	status = _cairo_d2d_try_fastblit(d2dsurf, surf_pattern->surface,
-				         NULL, &source->matrix, clip,
-                                         op, source->filter);
+					 NULL, &source->matrix, clip,
+					 op, source->filter);
 
 	if (status != CAIRO_INT_STATUS_UNSUPPORTED) {
 	    return status;
@@ -3230,7 +3230,7 @@ _cairo_d2d_mask(void			*surface,
 							    &source->matrix,
 							    clip,
 							    op,
-                                                            source->filter,
+							    source->filter,
 							    solidAlphaValue);
 	    if (rv != CAIRO_INT_STATUS_UNSUPPORTED) {
 		return rv;
@@ -3432,8 +3432,8 @@ _cairo_d2d_fill(void			*surface,
 	const cairo_surface_pattern_t *surf_pattern = 
 	    reinterpret_cast<const cairo_surface_pattern_t*>(source);
 	cairo_int_status_t rv = _cairo_d2d_try_fastblit(d2dsurf, surf_pattern->surface,
-						        &box, &source->matrix, clip, op,
-                                                        source->filter);
+							&box, &source->matrix, clip, op,
+							source->filter);
 
 	if (rv != CAIRO_INT_STATUS_UNSUPPORTED) {
 	    return rv;
@@ -3583,7 +3583,11 @@ _cairo_dwrite_manual_show_glyphs_on_d2d_surface(void			    *surface,
     }
 
     // Deal with rendering modes CreateGlyphRunAnalysis doesn't accept.
-    if (renderMode == DWRITE_RENDERING_MODE_DEFAULT) {
+    switch (renderMode) {
+    case DWRITE_RENDERING_MODE_ALIASED:
+	// ClearType texture creation will fail in this mode, so bail out
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    case DWRITE_RENDERING_MODE_DEFAULT:
 	// As per DWRITE_RENDERING_MODE documentation, pick Natural for font
 	// sizes under 16 ppem
 	if (scaled_font->base.font_matrix.yy < 16.0f) {
@@ -3591,15 +3595,24 @@ _cairo_dwrite_manual_show_glyphs_on_d2d_surface(void			    *surface,
 	} else {
 	    renderMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;
 	}
-    } else if (renderMode == DWRITE_RENDERING_MODE_OUTLINE) {
+	break;
+    case DWRITE_RENDERING_MODE_OUTLINE:
 	renderMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;
+	break;
+    default:
+	break;
     }
 
+    DWRITE_MEASURING_MODE measureMode =
+	renderMode <= DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC ? DWRITE_MEASURING_MODE_GDI_CLASSIC :
+	renderMode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL ? DWRITE_MEASURING_MODE_GDI_NATURAL :
+	DWRITE_MEASURING_MODE_NATURAL;
+
     hr = DWriteFactory::Instance()->CreateGlyphRunAnalysis(&run,
 						      1.0f,
 						      transform ? &dwmat : 0,
 						      renderMode,
-						      DWRITE_MEASURING_MODE_NATURAL,
+						      measureMode,
 						      0,
 						      0,
 						      &analysis);
@@ -3799,7 +3812,7 @@ _cairo_dwrite_manual_show_glyphs_on_d2d_surface(void			    *surface,
     ID3D10EffectVectorVariable *textColor = effect->GetVariableByName("TextColor")->AsVector();
 
     float colorVal[] = { float(source->color.red   * source->color.alpha),
-	                 float(source->color.green * source->color.alpha),
+			 float(source->color.green * source->color.alpha),
 			 float(source->color.blue  * source->color.alpha),
 			 float(source->color.alpha) };
     textColor->SetFloatVector(colorVal);
@@ -3919,18 +3932,62 @@ _cairo_dwrite_show_glyphs_on_d2d_surface(void			*surface,
 	cleartype_quality = D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;
     }
 
-    switch (dwritesf->antialias_mode) {
-	case CAIRO_ANTIALIAS_NONE:
-	    target_rt->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_ALIASED);
-	    break;
-	case CAIRO_ANTIALIAS_GRAY:
-	    target_rt->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE);
-	    break;
-	case CAIRO_ANTIALIAS_SUBPIXEL:
-	    target_rt->SetTextAntialiasMode(cleartype_quality);
-	    break;
+    RefPtr<IDWriteRenderingParams> params;
+    target_rt->GetTextRenderingParams(&params);
+
+    DWRITE_RENDERING_MODE renderMode = DWRITE_RENDERING_MODE_DEFAULT;
+    if (params) {
+	HRESULT hr = dwriteff->dwriteface->GetRecommendedRenderingMode(
+						      (FLOAT)dwritesf->base.font_matrix.yy,
+						      1.0f,
+						      DWRITE_MEASURING_MODE_NATURAL,
+						      params,
+						      &renderMode);
+	if (FAILED(hr)) {
+	    // this probably never happens, but let's play it safe
+	    renderMode = DWRITE_RENDERING_MODE_DEFAULT;
+	}
     }
 
+    // Deal with rendering modes CreateGlyphRunAnalysis doesn't accept
+    switch (renderMode) {
+    case DWRITE_RENDERING_MODE_DEFAULT:
+	// As per DWRITE_RENDERING_MODE documentation, pick Natural for font
+	// sizes under 16 ppem
+  	if (dwritesf->base.font_matrix.yy < 16.0f) {
+	    renderMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL;
+	} else {
+	    renderMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;
+	}
+	break;
+    case DWRITE_RENDERING_MODE_OUTLINE:
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    default:
+	break;
+    }
+
+    switch (dwritesf->antialias_mode) {
+    case CAIRO_ANTIALIAS_NONE:
+	cleartype_quality = D2D1_TEXT_ANTIALIAS_MODE_ALIASED;
+	break;
+    case CAIRO_ANTIALIAS_GRAY:
+	cleartype_quality = D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;
+	break;
+    case CAIRO_ANTIALIAS_SUBPIXEL:
+	break;
+    }
+
+    if (renderMode == DWRITE_RENDERING_MODE_ALIASED) {
+	cleartype_quality = D2D1_TEXT_ANTIALIAS_MODE_ALIASED;
+    }
+
+    target_rt->SetTextAntialiasMode(cleartype_quality);
+
+    DWRITE_MEASURING_MODE measureMode =
+	renderMode <= DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC ? DWRITE_MEASURING_MODE_GDI_CLASSIC :
+	renderMode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL ? DWRITE_MEASURING_MODE_GDI_NATURAL :
+	DWRITE_MEASURING_MODE_NATURAL;
+
     cairo_bool_t transform = FALSE;
 
     DWRITE_GLYPH_RUN run;
@@ -3949,8 +4006,8 @@ _cairo_dwrite_show_glyphs_on_d2d_surface(void			*surface,
 	DWriteFactory::Instance()->CreateGlyphRunAnalysis(&run,
 							  1.0f,
 							  transform ? &dwmat : 0,
-							  DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC,
-							  DWRITE_MEASURING_MODE_NATURAL,
+							  renderMode,
+							  measureMode,
 							  0,
 							  0,
 							  &analysis);
@@ -3987,7 +4044,7 @@ _cairo_dwrite_show_glyphs_on_d2d_surface(void			*surface,
 	brush->SetTransform(&mat_brush);
     }
     
-    target_rt->DrawGlyphRun(D2D1::Point2F(0, 0), &run, brush, dwritesf->measuring_mode);
+    target_rt->DrawGlyphRun(D2D1::Point2F(0, 0), &run, brush, measureMode);
     
     if (transform) {
 	target_rt->SetTransform(D2D1::Matrix3x2F::Identity());
@@ -4019,14 +4076,13 @@ _cairo_d2d_show_glyphs (void			*surface,
     }
     cairo_d2d_surface_t *d2dsurf = static_cast<cairo_d2d_surface_t*>(surface);
     if (!d2dsurf->textRenderingInit) {
-	RefPtr<IDWriteRenderingParams> params;
-	DWriteFactory::Instance()->CreateRenderingParams(&params);
+	RefPtr<IDWriteRenderingParams> params = DWriteFactory::RenderingParams();
 	d2dsurf->rt->SetTextRenderingParams(params);
 	d2dsurf->textRenderingInit = true;
     }
     cairo_int_status_t status = CAIRO_INT_STATUS_UNSUPPORTED;
     if (scaled_font->backend->type == CAIRO_FONT_TYPE_DWRITE) {
-        status = (cairo_int_status_t)
+	status = (cairo_int_status_t)
 	    _cairo_dwrite_show_glyphs_on_d2d_surface(surface, op, source, glyphs, num_glyphs, scaled_font, clip);
     }
 
@@ -4131,7 +4187,7 @@ cairo_d2d_surface_create_for_hwnd(cairo_device_t *cairo_device,
     }
     /** Get the backbuffer surface from the swap chain */
     hr = newSurf->dxgiChain->GetBuffer(0,
-	                               IID_PPV_ARGS(&newSurf->surface));
+				       IID_PPV_ARGS(&newSurf->surface));
 
     if (FAILED(hr)) {
 	goto FAIL_HWND;
@@ -4176,8 +4232,8 @@ FAIL_HWND:
 cairo_surface_t *
 cairo_d2d_surface_create(cairo_device_t *device,
 			 cairo_format_t format,
-                         int width,
-                         int height)
+			 int width,
+			 int height)
 {
     if (width == 0 || height == 0) {
 	return _cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_SIZE));
@@ -4474,7 +4530,7 @@ FAIL_CREATE:
 void cairo_d2d_scroll(cairo_surface_t *surface, int x, int y, cairo_rectangle_t *clip)
 {
     if (surface->type != CAIRO_SURFACE_TYPE_D2D) {
-        return;
+	return;
     }
     cairo_d2d_surface_t *d2dsurf = reinterpret_cast<cairo_d2d_surface_t*>(surface);
 
@@ -4537,7 +4593,7 @@ HDC
 cairo_d2d_get_dc(cairo_surface_t *surface, cairo_bool_t retain_contents)
 {
     if (surface->type != CAIRO_SURFACE_TYPE_D2D) {
-        return NULL;
+	return NULL;
     }
     cairo_d2d_surface_t *d2dsurf = reinterpret_cast<cairo_d2d_surface_t*>(surface);
 
@@ -4578,7 +4634,7 @@ void
 cairo_d2d_release_dc(cairo_surface_t *surface, const cairo_rectangle_int_t *updated_rect)
 {
     if (surface->type != CAIRO_SURFACE_TYPE_D2D) {
-        return;
+	return;
     }
     cairo_d2d_surface_t *d2dsurf = reinterpret_cast<cairo_d2d_surface_t*>(surface);
 
diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
index e89d0edfedda..f53f7fa502e7 100644
--- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
+++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
@@ -119,6 +119,13 @@ private:
 
 IDWriteFactory *DWriteFactory::mFactoryInstance = NULL;
 IDWriteFontCollection *DWriteFactory::mSystemCollection = NULL;
+IDWriteRenderingParams *DWriteFactory::mRenderingParams = NULL;
+FLOAT DWriteFactory::mGamma = -1.0;
+FLOAT DWriteFactory::mEnhancedContrast = -1.0;
+FLOAT DWriteFactory::mClearTypeLevel = -1.0;
+int DWriteFactory::mPixelGeometry = -1;
+int DWriteFactory::mRenderingMode = -1;
+
 ID2D1Factory *D2DFactory::mFactoryInstance = NULL;
 ID2D1DCRenderTarget *D2DFactory::mRenderTarget = NULL;
 
@@ -298,7 +305,6 @@ _cairo_dwrite_font_face_create_for_toy (cairo_toy_font_face_t   *toy_face,
     if (SUCCEEDED(hr)) {
 	// Cannot use C++ style new since cairo deallocates this.
 	*font_face = (cairo_font_face_t*)face;
-        
 	_cairo_font_face_init (&(*(_cairo_dwrite_font_face**)font_face)->base, &_cairo_dwrite_font_face_backend);
     } else {
 	free(face);
@@ -349,7 +355,7 @@ _cairo_dwrite_glyph_run_from_glyphs(cairo_glyph_t *glyphs,
 	scaled_font->mat.xx == scaled_font->base.font_matrix.xx && 
 	scaled_font->mat.yy == scaled_font->base.font_matrix.yy) {
 	// Fast route, don't actually use a transform but just
-        // set the correct font size.
+	// set the correct font size.
 	*transformed = 0;
 
 	run->fontEmSize = (FLOAT)scaled_font->base.font_matrix.yy;
@@ -371,14 +377,14 @@ _cairo_dwrite_glyph_run_from_glyphs(cairo_glyph_t *glyphs,
 	    cairo_matrix_transform_point(&scaled_font->mat_inverse, &x, &y);
 	    // Since we will multiply by our ctm matrix later for rotation effects
 	    // and such, adjust positions by the inverse matrix now. Y-axis is
-            // inverted! Therefor the offset is -y.
+	    // inverted! Therefor the offset is -y.
 	    offsets[i].ascenderOffset = -(FLOAT)y;
 	    offsets[i].advanceOffset = (FLOAT)x;
 	    advances[i] = 0.0;
 	}
 	// The font matrix takes care of the scaling if we have a transform,
 	// emSize should be 1.
-        run->fontEmSize = 1.0f;
+	run->fontEmSize = 1.0f;
     }
 }
 
@@ -715,22 +721,22 @@ _cairo_dwrite_scaled_font_init_glyph_metrics(cairo_dwrite_scaled_font_t *scaled_
 
     // TODO: Treat swap_xy.
     extents.width = (FLOAT)(metrics.advanceWidth - metrics.leftSideBearing - metrics.rightSideBearing) /
-        fontMetrics.designUnitsPerEm;
+	fontMetrics.designUnitsPerEm;
     extents.height = (FLOAT)(metrics.advanceHeight - metrics.topSideBearing - metrics.bottomSideBearing) /
-        fontMetrics.designUnitsPerEm;
+	fontMetrics.designUnitsPerEm;
     extents.x_advance = (FLOAT)metrics.advanceWidth / fontMetrics.designUnitsPerEm;
     extents.x_bearing = (FLOAT)metrics.leftSideBearing / fontMetrics.designUnitsPerEm;
     extents.y_advance = 0.0;
     extents.y_bearing = (FLOAT)(metrics.topSideBearing - metrics.verticalOriginY) /
-        fontMetrics.designUnitsPerEm;
+	fontMetrics.designUnitsPerEm;
 
     // We pad the extents here because GetDesignGlyphMetrics returns "ideal" metrics
     // for the glyph outline, without accounting for hinting/gridfitting/antialiasing,
     // and therefore it does not always cover all pixels that will actually be touched.
     if (scaled_font->base.options.antialias != CAIRO_ANTIALIAS_NONE &&
-        extents.width > 0 && extents.height > 0) {
-        extents.width += scaled_font->mat_inverse.xx * 2;
-        extents.x_bearing -= scaled_font->mat_inverse.xx;
+	extents.width > 0 && extents.height > 0) {
+	extents.width += scaled_font->mat_inverse.xx * 2;
+	extents.x_bearing -= scaled_font->mat_inverse.xx;
     }
 
     _cairo_scaled_glyph_set_metrics (scaled_glyph,
@@ -753,22 +759,22 @@ public:
     // IUnknown interface
     IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject)
     {
-        if (iid != __uuidof(IDWriteGeometrySink))
-            return E_NOINTERFACE;
+	if (iid != __uuidof(IDWriteGeometrySink))
+	    return E_NOINTERFACE;
 
 	*ppObject = static_cast<IDWriteGeometrySink*>(this);
 
-        return S_OK;
+	return S_OK;
     }
 
     IFACEMETHOD_(ULONG, AddRef)()
     {
-        return 1;
+	return 1;
     }
 
     IFACEMETHOD_(ULONG, Release)()
     {
-        return 1;
+	return 1;
     }
 
     IFACEMETHODIMP_(void) SetFillMode(D2D1_FILL_MODE fillMode)
@@ -822,7 +828,7 @@ public:
 
     IFACEMETHODIMP_(void) AddBeziers(
 	const D2D1_BEZIER_SEGMENT *beziers,
-        UINT beziersCount)
+	UINT beziersCount)
     {
 	for (unsigned int i = 0; i < beziersCount; i++) {
 	    cairo_status_t status = _cairo_path_fixed_curve_to(mCairoPath,
@@ -837,7 +843,7 @@ public:
 
     IFACEMETHODIMP_(void) AddLines(
 	const D2D1_POINT_2F *points,
-        UINT pointsCount)
+	UINT pointsCount)
     {
 	for (unsigned int i = 0; i < pointsCount; i++) {
 	    cairo_status_t status = _cairo_path_fixed_line_to(mCairoPath, 
@@ -853,7 +859,7 @@ private:
 
 cairo_int_status_t 
 _cairo_dwrite_scaled_font_init_glyph_path(cairo_dwrite_scaled_font_t *scaled_font, 
-				          cairo_scaled_glyph_t *scaled_glyph)
+					  cairo_scaled_glyph_t *scaled_glyph)
 {
     cairo_path_fixed_t *path;
     path = _cairo_path_fixed_create();
@@ -999,8 +1005,8 @@ _cairo_dwrite_scaled_font_init_glyph_surface(cairo_dwrite_scaled_font_t *scaled_
 
     cairo_surface_set_device_offset (image, -x1, -y1);
     _cairo_scaled_glyph_set_surface (scaled_glyph,
-                                     &scaled_font->base,
-                                     (cairo_image_surface_t *) image);
+				     &scaled_font->base,
+				     (cairo_image_surface_t *) image);
 
   FAIL:
     cairo_surface_destroy (&surface->base);
@@ -1009,7 +1015,7 @@ _cairo_dwrite_scaled_font_init_glyph_surface(cairo_dwrite_scaled_font_t *scaled_
 }
 
 cairo_int_status_t
-_cairo_dwrite_load_truetype_table(void		   *scaled_font,
+_cairo_dwrite_load_truetype_table(void                 *scaled_font,
 				  unsigned long         tag,
 				  long                  offset,
 				  unsigned char        *buffer,
@@ -1070,6 +1076,13 @@ cairo_dwrite_scaled_font_allow_manual_show_glyphs(void* dwrite_scaled_font, cair
     font->manual_show_glyphs_allowed = allowed;
 }
 
+void
+cairo_dwrite_set_cleartype_params(FLOAT gamma, FLOAT contrast, FLOAT level,
+				  int geometry, int mode)
+{
+    DWriteFactory::SetRenderingParams(gamma, contrast, level, geometry, mode);
+}
+
 cairo_int_status_t
 _dwrite_draw_glyphs_to_gdi_surface_gdi(cairo_win32_surface_t *surface,
 				       DWRITE_MATRIX *transform,
@@ -1081,8 +1094,7 @@ _dwrite_draw_glyphs_to_gdi_surface_gdi(cairo_win32_surface_t *surface,
     DWriteFactory::Instance()->GetGdiInterop(&gdiInterop);
     IDWriteBitmapRenderTarget *rt;
 
-    IDWriteRenderingParams *params;
-    DWriteFactory::Instance()->CreateRenderingParams(&params);
+    IDWriteRenderingParams *params = DWriteFactory::RenderingParams();
 
     gdiInterop->CreateBitmapRenderTarget(surface->dc, 
 					 area.right - area.left, 
@@ -1304,7 +1316,7 @@ _cairo_dwrite_show_glyphs_on_surface(void			*surface,
 	    offsets[i].advanceOffset = (FLOAT)(glyphs[i].x - fontArea.left);
 	    advances[i] = 0.0;
 	}
-        run.fontEmSize = (FLOAT)scaled_font->font_matrix.yy;
+	run.fontEmSize = (FLOAT)scaled_font->font_matrix.yy;
     } else {
 	transform = TRUE;
 
@@ -1314,10 +1326,10 @@ _cairo_dwrite_show_glyphs_on_surface(void			*surface,
 	    double y = glyphs[i].y - fontArea.top;
 	    cairo_matrix_transform_point(&dwritesf->mat_inverse, &x, &y);
 	    /**
-             * Since we will multiply by our ctm matrix later for rotation effects
+	     * Since we will multiply by our ctm matrix later for rotation effects
 	     * and such, adjust positions by the inverse matrix now. The Y-axis
-             * is inverted so the offset becomes negative.
-             */
+	     * is inverted so the offset becomes negative.
+	     */
 	    offsets[i].ascenderOffset = -(FLOAT)y;
 	    offsets[i].advanceOffset = (FLOAT)x;
 	    advances[i] = 0.0;
@@ -1370,6 +1382,49 @@ _cairo_dwrite_show_glyphs_on_surface(void			*surface,
     return CAIRO_INT_STATUS_SUCCESS;
 }
 
+#define ENHANCED_CONTRAST_REGISTRY_KEY \
+    HKEY_CURRENT_USER, "Software\\Microsoft\\Avalon.Graphics\\DISPLAY1\\EnhancedContrastLevel"
+
+void
+DWriteFactory::CreateRenderingParams()
+{
+    if (!Instance()) {
+	return;
+    }
+
+    RefPtr<IDWriteRenderingParams> defaultParams;
+    Instance()->CreateRenderingParams(&defaultParams);
+
+    // For EnhancedContrast, we override the default if the user has not set it
+    // in the registry (by using the ClearType Tuner).
+    FLOAT contrast;
+    if (mEnhancedContrast >= 0.0 && mEnhancedContrast <= 10.0) {
+	contrast = mEnhancedContrast;
+    } else {
+	HKEY hKey;
+	if (RegOpenKeyExA(ENHANCED_CONTRAST_REGISTRY_KEY,
+			  0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	{
+	    contrast = defaultParams->GetEnhancedContrast();
+	    RegCloseKey(hKey);
+	} else {
+	    contrast = 1.0;
+	}
+    }
+
+    // For parameters that have not been explicitly set via the SetRenderingParams API,
+    // we copy values from default params (or our overridden value for contrast)
+    Instance()->CreateCustomRenderingParams(
+	mGamma >= 1.0 && mGamma <= 2.2 ? mGamma : defaultParams->GetGamma(),
+	contrast,
+	mClearTypeLevel >= 0.0 && mClearTypeLevel <= 1.0 ? mClearTypeLevel : defaultParams->GetClearTypeLevel(),
+	mPixelGeometry >= DWRITE_PIXEL_GEOMETRY_FLAT && mPixelGeometry <= DWRITE_PIXEL_GEOMETRY_BGR ?
+	    (DWRITE_PIXEL_GEOMETRY)mPixelGeometry : defaultParams->GetPixelGeometry(),
+	mRenderingMode >= DWRITE_RENDERING_MODE_DEFAULT && mRenderingMode <= DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC ?
+	    (DWRITE_RENDERING_MODE)mRenderingMode : defaultParams->GetRenderingMode(), 
+	&mRenderingParams);
+}
+
 // Helper for _cairo_win32_printing_surface_show_glyphs to create a win32 equivalent
 // of a dwrite scaled_font so that we can print using ExtTextOut instead of drawing
 // paths or blitting glyph bitmaps.
diff --git a/gfx/cairo/cairo/src/cairo-dwrite-private.h b/gfx/cairo/cairo/src/cairo-dwrite-private.h
index 428ffc4ec348..fc31da4d310c 100644
--- a/gfx/cairo/cairo/src/cairo-dwrite-private.h
+++ b/gfx/cairo/cairo/src/cairo-dwrite-private.h
@@ -92,9 +92,46 @@ public:
 	return family;
     }
 
+    static IDWriteRenderingParams *RenderingParams()
+    {
+	if (!mRenderingParams) {
+	    CreateRenderingParams();
+	}
+	if (mRenderingParams) {
+	    mRenderingParams->AddRef();
+	}
+	return mRenderingParams;
+    }
+
+    static void SetRenderingParams(FLOAT aGamma,
+				   FLOAT aEnhancedContrast,
+				   FLOAT aClearTypeLevel,
+				   int aPixelGeometry,
+				   int aRenderingMode)
+    {
+	mGamma = aGamma;
+	mEnhancedContrast = aEnhancedContrast;
+	mClearTypeLevel = aClearTypeLevel;
+        mPixelGeometry = aPixelGeometry;
+        mRenderingMode = aRenderingMode;
+	// discard any current RenderingParams object
+	if (mRenderingParams) {
+	    mRenderingParams->Release();
+	    mRenderingParams = NULL;
+	}
+    }
+
 private:
+    static void CreateRenderingParams();
+
     static IDWriteFactory *mFactoryInstance;
     static IDWriteFontCollection *mSystemCollection;
+    static IDWriteRenderingParams *mRenderingParams;
+    static FLOAT mGamma;
+    static FLOAT mEnhancedContrast;
+    static FLOAT mClearTypeLevel;
+    static int mPixelGeometry;
+    static int mRenderingMode;
 };
 
 /* cairo_font_face_t implementation */
diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h
index c9ea0b6fa34e..c77866bb93f1 100644
--- a/gfx/cairo/cairo/src/cairo-win32.h
+++ b/gfx/cairo/cairo/src/cairo-win32.h
@@ -126,6 +126,9 @@ cairo_dwrite_font_face_create_for_dwrite_fontface(void *dwrite_font, void *dwrit
 void
 cairo_dwrite_scaled_font_allow_manual_show_glyphs(void *dwrite_scaled_font, cairo_bool_t allowed);
 
+void
+cairo_dwrite_set_cleartype_params(FLOAT gamma, FLOAT contrast, FLOAT level, int geometry, int mode);
+
 #endif /* CAIRO_HAS_DWRITE_FONT */
 
 #if CAIRO_HAS_D2D_SURFACE
diff --git a/gfx/thebes/gfxDWriteFonts.cpp b/gfx/thebes/gfxDWriteFonts.cpp
index 1b995a4cab71..84fb6164d18b 100644
--- a/gfx/thebes/gfxDWriteFonts.cpp
+++ b/gfx/thebes/gfxDWriteFonts.cpp
@@ -149,7 +149,10 @@ gfxDWriteFont::gfxDWriteFont(gfxFontEntry *aFontEntry,
         return;
     }
 
-    if ((anAAOption == gfxFont::kAntialiasDefault && UsingClearType()) ||
+    if ((anAAOption == gfxFont::kAntialiasDefault &&
+         UsingClearType() &&
+         (gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode() ==
+          DWRITE_MEASURING_MODE_NATURAL)) ||
         anAAOption == gfxFont::kAntialiasSubpixel)
     {
         mUseSubpixelPositions = PR_TRUE;
@@ -248,16 +251,12 @@ gfxDWriteFont::ComputeMetrics()
     mMetrics = new gfxFont::Metrics;
     ::memset(mMetrics, 0, sizeof(*mMetrics));
 
-    mMetrics->xHeight =
-        ((gfxFloat)fontMetrics.xHeight /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
+    mFUnitsConvFactor = float(mAdjustedSize / fontMetrics.designUnitsPerEm);
 
-    mMetrics->maxAscent = 
-        ceil(((gfxFloat)fontMetrics.ascent /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize);
-    mMetrics->maxDescent = 
-        ceil(((gfxFloat)fontMetrics.descent /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize);
+    mMetrics->xHeight = fontMetrics.xHeight * mFUnitsConvFactor;
+
+    mMetrics->maxAscent = ceil(fontMetrics.ascent * mFUnitsConvFactor);
+    mMetrics->maxDescent = ceil(fontMetrics.descent * mFUnitsConvFactor);
     mMetrics->maxHeight = mMetrics->maxAscent + mMetrics->maxDescent;
 
     mMetrics->emHeight = mAdjustedSize;
@@ -282,88 +281,72 @@ gfxDWriteFont::ComputeMetrics()
         if (exists && len >= sizeof(mozilla::HheaTable)) {
             const mozilla::HheaTable* hhea =
                 reinterpret_cast<const mozilla::HheaTable*>(tableData);
-            mMetrics->maxAdvance = ((gfxFloat)PRUint16(hhea->advanceWidthMax) /
-                       fontMetrics.designUnitsPerEm) * mAdjustedSize;
+            mMetrics->maxAdvance =
+                PRUint16(hhea->advanceWidthMax) * mFUnitsConvFactor;
         }
         mFontFace->ReleaseFontTable(tableContext);
     }
 
     mMetrics->internalLeading = NS_MAX(mMetrics->maxHeight - mMetrics->emHeight, 0.0);
-    mMetrics->externalLeading = 
-        ceil(((gfxFloat)fontMetrics.lineGap /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize);
+    mMetrics->externalLeading = ceil(fontMetrics.lineGap * mFUnitsConvFactor);
 
     UINT16 glyph = (PRUint16)GetSpaceGlyph();
-    DWRITE_GLYPH_METRICS metrics;
-    mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics);
-    mMetrics->spaceWidth = 
-        ((gfxFloat)metrics.advanceWidth /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
+    mMetrics->spaceWidth = MeasureGlyphWidth(glyph);
 
     // try to get aveCharWidth from the OS/2 table, fall back to measuring 'x'
-    // if the table is not available
-    mMetrics->aveCharWidth = 0;
-    hr = mFontFace->TryGetFontTable(DWRITE_MAKE_OPENTYPE_TAG('O', 'S', '/', '2'),
-                                    (const void**)&tableData,
-                                    &len,
-                                    &tableContext,
-                                    &exists);
-    if (SUCCEEDED(hr)) {
-        if (exists && len >= 4) {
-            // Not checking against sizeof(mozilla::OS2Table) here because older
-            // versions of the table have different sizes; we only need the first
-            // two 16-bit fields here.
-            const mozilla::OS2Table* os2 =
-                reinterpret_cast<const mozilla::OS2Table*>(tableData);
-            mMetrics->aveCharWidth = ((gfxFloat)PRInt16(os2->xAvgCharWidth) /
-                       fontMetrics.designUnitsPerEm) * mAdjustedSize;
+    // if the table is not available or if using hinted/pixel-snapped widths
+    if (mUseSubpixelPositions) {
+        mMetrics->aveCharWidth = 0;
+        hr = mFontFace->TryGetFontTable(DWRITE_MAKE_OPENTYPE_TAG('O', 'S', '/', '2'),
+                                        (const void**)&tableData,
+                                        &len,
+                                        &tableContext,
+                                        &exists);
+        if (SUCCEEDED(hr)) {
+            if (exists && len >= 4) {
+                // Not checking against sizeof(mozilla::OS2Table) here because older
+                // versions of the table have different sizes; we only need the first
+                // two 16-bit fields here.
+                const mozilla::OS2Table* os2 =
+                    reinterpret_cast<const mozilla::OS2Table*>(tableData);
+                mMetrics->aveCharWidth =
+                    PRInt16(os2->xAvgCharWidth) * mFUnitsConvFactor;
+            }
+            mFontFace->ReleaseFontTable(tableContext);
         }
-        mFontFace->ReleaseFontTable(tableContext);
     }
 
     UINT32 ucs;
     if (mMetrics->aveCharWidth < 1) {
         ucs = L'x';
-        if (SUCCEEDED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph)) &&
-            SUCCEEDED(mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics))) {    
-            mMetrics->aveCharWidth = 
-                ((gfxFloat)metrics.advanceWidth /
-                           fontMetrics.designUnitsPerEm) * mAdjustedSize;
-        } else {
+        if (SUCCEEDED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph))) {
+            mMetrics->aveCharWidth = MeasureGlyphWidth(glyph);
+        }
+        if (mMetrics->aveCharWidth < 1) {
             // Let's just assume the X is square.
-            mMetrics->aveCharWidth = 
-                ((gfxFloat)fontMetrics.xHeight /
-                           fontMetrics.designUnitsPerEm) * mAdjustedSize;
+            mMetrics->aveCharWidth = fontMetrics.xHeight * mFUnitsConvFactor;
         }
     }
 
     ucs = L'0';
-    if (SUCCEEDED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph)) &&
-        SUCCEEDED(mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics))) {
-        mMetrics->zeroOrAveCharWidth = 
-            ((gfxFloat)metrics.advanceWidth /
-                       fontMetrics.designUnitsPerEm) * mAdjustedSize;
-    } else {
+    if (SUCCEEDED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph))) {
+        mMetrics->zeroOrAveCharWidth = MeasureGlyphWidth(glyph);
+    }
+    if (mMetrics->zeroOrAveCharWidth < 1) {
         mMetrics->zeroOrAveCharWidth = mMetrics->aveCharWidth;
     }
 
-    mMetrics->underlineOffset = 
-        ((gfxFloat)fontMetrics.underlinePosition /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
+    mMetrics->underlineOffset =
+        fontMetrics.underlinePosition * mFUnitsConvFactor;
     mMetrics->underlineSize = 
-        ((gfxFloat)fontMetrics.underlineThickness /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
-    mMetrics->strikeoutOffset = 
-        ((gfxFloat)fontMetrics.strikethroughPosition /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
-    mMetrics->strikeoutSize = 
-        ((gfxFloat)fontMetrics.strikethroughThickness /
-                   fontMetrics.designUnitsPerEm) * mAdjustedSize;
+        fontMetrics.underlineThickness * mFUnitsConvFactor;
+    mMetrics->strikeoutOffset =
+        fontMetrics.strikethroughPosition * mFUnitsConvFactor;
+    mMetrics->strikeoutSize =
+        fontMetrics.strikethroughThickness * mFUnitsConvFactor;
     mMetrics->superscriptOffset = 0;
     mMetrics->subscriptOffset = 0;
 
-    mFUnitsConvFactor = float(mAdjustedSize / fontMetrics.designUnitsPerEm);
-
     SanitizeMetrics(mMetrics, GetFontEntry()->mIsBadUnderlineFont);
 
 #if 0
@@ -697,26 +680,30 @@ gfxDWriteFont::GetGlyphWidth(gfxContext *aCtx, PRUint16 aGID)
         return width;
     }
 
-    DWRITE_GLYPH_METRICS glyphMetrics;
-    HRESULT hr;
-    if (mUseSubpixelPositions) {
-        hr = mFontFace->GetDesignGlyphMetrics(
-                  &aGID, 1, &glyphMetrics, FALSE);
-        if (SUCCEEDED(hr)) {
-            width =
-                NS_lround(glyphMetrics.advanceWidth * mFUnitsConvFactor *
-                          65536.0);
-        }
-    } else {
-        hr = mFontFace->GetGdiCompatibleGlyphMetrics(
-                  FLOAT(mAdjustedSize), 1.0f, nsnull, FALSE,
-                  &aGID, 1, &glyphMetrics, FALSE);
-        if (SUCCEEDED(hr)) {
-            width =
-                NS_lround(glyphMetrics.advanceWidth * mFUnitsConvFactor) << 16;
-        }
-    }
-
+    width = NS_lround(MeasureGlyphWidth(aGID) * 65536.0);
     mGlyphWidths.Put(aGID, width);
     return width;
 }
+
+gfxFloat
+gfxDWriteFont::MeasureGlyphWidth(PRUint16 aGlyph)
+{
+    DWRITE_GLYPH_METRICS metrics;
+    HRESULT hr;
+    if (mUseSubpixelPositions) {
+        hr = mFontFace->GetDesignGlyphMetrics(&aGlyph, 1, &metrics, FALSE);
+        if (SUCCEEDED(hr)) {
+            return metrics.advanceWidth * mFUnitsConvFactor;
+        }
+    } else {
+        hr = mFontFace->GetGdiCompatibleGlyphMetrics(
+                  FLOAT(mAdjustedSize), 1.0f, nsnull,
+                  gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode() ==
+                      DWRITE_MEASURING_MODE_GDI_NATURAL,
+                  &aGlyph, 1, &metrics, FALSE);
+        if (SUCCEEDED(hr)) {
+            return NS_lround(metrics.advanceWidth * mFUnitsConvFactor);
+        }
+    }
+    return 0;
+}
diff --git a/gfx/thebes/gfxDWriteFonts.h b/gfx/thebes/gfxDWriteFonts.h
index 538ba866d080..6b328f0757d7 100644
--- a/gfx/thebes/gfxDWriteFonts.h
+++ b/gfx/thebes/gfxDWriteFonts.h
@@ -98,6 +98,8 @@ protected:
 
     cairo_scaled_font_t *CairoScaledFont();
 
+    gfxFloat MeasureGlyphWidth(PRUint16 aGlyph);
+
     static void DestroyBlobFunc(void* userArg);
 
     nsRefPtr<IDWriteFontFace> mFontFace;
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index e0d3c0559cc6..457d5df22449 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -2666,7 +2666,6 @@ gfxFontGroup::GetGeneration()
 void
 gfxFontGroup::UpdateFontList()
 {
-    // if user font set is set, check to see if font list needs updating
     if (mUserFontSet && mCurrGeneration != GetGeneration()) {
         // xxx - can probably improve this to detect when all fonts were found, so no need to update list
         mFonts.Clear();
diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
index 4cf7892d9be0..7105b07fb72d 100644
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -58,6 +58,10 @@
 #include "nsUnicodeRange.h"
 #include "nsCRT.h"
 
+#if defined(XP_WIN)
+#include "gfxWindowsPlatform.h"
+#endif
+
 #define FloatToFixed(f) (65536 * (f))
 #define FixedToFloat(f) ((f) * (1.0 / 65536.0))
 // Right shifts of negative (signed) integers are undefined, as are overflows
@@ -946,8 +950,12 @@ GetRoundOffsetsToPixels(gfxContext *aContext,
 #if CAIRO_HAS_DWRITE_FONT // dwrite backend is not in std cairo releases yet
         case CAIRO_FONT_TYPE_DWRITE:
             // show_glyphs is implemented on the font and so is used for
-            // all surface types.
-            return;
+            // all surface types; however, it may pixel-snap depending on
+            // the dwrite rendering mode
+            if (gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode() ==
+                DWRITE_MEASURING_MODE_NATURAL) {
+                return;
+            }
 #endif
         case CAIRO_FONT_TYPE_QUARTZ:
             // Quartz surfaces implement show_glyphs for Quartz fonts
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index a975fbfca4e2..d4d3589cf963 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -158,6 +158,13 @@ NS_IMPL_ISUPPORTS1(D2DVRAMReporter, nsIMemoryReporter)
 #define GFX_USE_CLEARTYPE_ALWAYS "gfx.font_rendering.cleartype.always_use_for_content"
 #define GFX_DOWNLOADABLE_FONTS_USE_CLEARTYPE "gfx.font_rendering.cleartype.use_for_downloadable_fonts"
 
+#define GFX_CLEARTYPE_PARAMS           "gfx.font_rendering.cleartype_params."
+#define GFX_CLEARTYPE_PARAMS_GAMMA     "gfx.font_rendering.cleartype_params.gamma"
+#define GFX_CLEARTYPE_PARAMS_CONTRAST  "gfx.font_rendering.cleartype_params.enhanced_contrast"
+#define GFX_CLEARTYPE_PARAMS_LEVEL     "gfx.font_rendering.cleartype_params.cleartype_level"
+#define GFX_CLEARTYPE_PARAMS_STRUCTURE "gfx.font_rendering.cleartype_params.pixel_structure"
+#define GFX_CLEARTYPE_PARAMS_MODE      "gfx.font_rendering.cleartype_params.rendering_mode"
+
 #ifdef MOZ_FT2_FONTS
 static FT_Library gPlatformFTLibrary = NULL;
 #endif
@@ -343,6 +350,8 @@ gfxWindowsPlatform::UpdateRenderMode()
             mDWriteFactory = factory;
             factory->Release();
 
+            SetupClearTypeParams(pref);
+
             if (hr == S_OK)
               reporter.SetSuccessful();
         }
@@ -790,6 +799,8 @@ gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aP
         mUseClearTypeForDownloadableFonts = UNINITIALIZED_VALUE;
     } else if (!strcmp(GFX_USE_CLEARTYPE_ALWAYS, aPref)) {
         mUseClearTypeAlways = UNINITIALIZED_VALUE;
+    } else if (!strncmp(GFX_CLEARTYPE_PARAMS, aPref, strlen(GFX_CLEARTYPE_PARAMS))) {
+        SetupClearTypeParams(aPrefBranch);
     } else {
         clearTextFontCaches = PR_FALSE;
     }
@@ -803,6 +814,67 @@ gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aP
     }
 }
 
+void
+gfxWindowsPlatform::SetupClearTypeParams(nsIPrefBranch *aPrefBranch)
+{
+#if CAIRO_HAS_DWRITE_FONT
+    if (GetDWriteFactory()) {
+        // any missing prefs will default to invalid (-1) and be ignored;
+        // out-of-range values will also be ignored
+        FLOAT gamma = -1.0;
+        FLOAT contrast = -1.0;
+        FLOAT level = -1.0;
+        int geometry = -1;
+        int mode = -1;
+        PRInt32 value;
+        if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_GAMMA,
+                                                 &value))) {
+            if (value >= 1000 && value <= 2200) {
+                gamma = (FLOAT)value / 1000.0;
+            }
+        }
+        if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_CONTRAST,
+                                                 &value))) {
+            if (value >= 0 && value <= 1000) {
+                contrast = (FLOAT)value / 100.0;
+            }
+        }
+        if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_LEVEL,
+                                                 &value))) {
+            if (value >= 0 && value <= 100) {
+                level = (FLOAT)value / 100.0;
+            }
+        }
+        if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_STRUCTURE,
+                                                 &value))) {
+            if (value >= 0 && value <= 2) {
+                geometry = value;
+            }
+        }
+        if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_MODE,
+                                                 &value))) {
+            if (value >= 0 && value <= 5) {
+                mode = value;
+            }
+        }
+        cairo_dwrite_set_cleartype_params(gamma, contrast, level, geometry, mode);
+
+        switch (mode) {
+        case DWRITE_RENDERING_MODE_ALIASED:
+        case DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC:
+            mMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC;
+            break;
+        case DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL:
+            mMeasuringMode = DWRITE_MEASURING_MODE_GDI_NATURAL;
+            break;
+        default:
+            mMeasuringMode = DWRITE_MEASURING_MODE_NATURAL;
+            break;
+        }
+    }
+#endif
+}
+
 bool
 gfxWindowsPlatform::IsOptimus()
 {
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index 641d66220237..35cdc5ae16d3 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -238,9 +238,12 @@ public:
 
     virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);
 
+    void SetupClearTypeParams(nsIPrefBranch *aPrefBranch);
+
 #ifdef CAIRO_HAS_DWRITE_FONT
     IDWriteFactory *GetDWriteFactory() { return mDWriteFactory; }
     inline PRBool DWriteEnabled() { return mUseDirectWrite; }
+    inline DWRITE_MEASURING_MODE DWriteMeasuringMode() { return mMeasuringMode; }
 #else
     inline PRBool DWriteEnabled() { return PR_FALSE; }
 #endif
@@ -270,6 +273,7 @@ private:
 
 #ifdef CAIRO_HAS_DWRITE_FONT
     nsRefPtr<IDWriteFactory> mDWriteFactory;
+    DWRITE_MEASURING_MODE mMeasuringMode;
 #endif
 #ifdef CAIRO_HAS_D2D_SURFACE
     cairo_device_t *mD2DDevice;
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 7740c152e82a..530497d22de3 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1753,6 +1753,39 @@ pref("gfx.font_rendering.cleartype.use_for_downloadable_fonts", true);
 // use cleartype rendering for all fonts always (win xp only)
 pref("gfx.font_rendering.cleartype.always_use_for_content", false);
 
+// ClearType tuning parameters for directwrite/d2d.
+//
+// Allows overriding of underlying registry values in:
+//   HKCU/Software/Microsoft/Avalon.Graphics/<display> (contrast and level)
+//   HKLM/Software/Microsoft/Avalon.Graphics/<display> (gamma, pixel structure)
+// and selection of the ClearType/antialiasing mode.
+//
+// A value of -1 implies use the default value, otherwise value ranges 
+// follow registry settings:
+//   gamma [1000, 2200]  default: based on screen, typically 2200 (== 2.2)
+//   enhanced contrast [0, 1000] default: 50
+//   cleartype level [0, 100] default: 100
+//   pixel structure [0, 2] default: 0 (flat/RGB/BGR)
+//   rendering mode [0, 5] default: 0
+//     0 = use default for font & size;
+//     1 = aliased;
+//     2 = GDI Classic;
+//     3 = GDI Natural Widths;
+//     4 = Natural;
+//     5 = Natural Symmetric
+//
+// See:
+//   http://msdn.microsoft.com/en-us/library/aa970267.aspx
+//   http://msdn.microsoft.com/en-us/library/dd368190%28v=VS.85%29.aspx
+// Note: DirectWrite uses the "Enhanced Contrast Level" value rather than the 
+// "Text Contrast Level" value
+
+pref("gfx.font_rendering.cleartype_params.gamma", -1);
+pref("gfx.font_rendering.cleartype_params.enhanced_contrast", -1);
+pref("gfx.font_rendering.cleartype_params.cleartype_level", -1);
+pref("gfx.font_rendering.cleartype_params.pixel_structure", -1);
+pref("gfx.font_rendering.cleartype_params.rendering_mode", -1);
+
 pref("ui.key.menuAccessKeyFocuses", true);
 
 // override double-click word selection behavior.

From 62c420f4f48b5ba8ab9544975cc0e1d2c8ba47c2 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Thu, 21 Apr 2011 07:39:47 +0100
Subject: [PATCH 339/509] bug 642589 followup - adjust reftest manifests for
 newly-passing/failing tests on Win7/d2d with tweaked subpixel-AA.

---
 layout/reftests/bidi/reftest.list | 4 ++--
 layout/reftests/bugs/reftest.list | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 5598ac596d46..60ca7d8119d7 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -62,8 +62,8 @@ fails-if(Android) == 386339.html 386339-ref.html
 == 409375.html 409375-ref.html
 == 413542-1.html 413542-1-ref.html
 == 413542-2.html 413542-2-ref.html
-fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 413928-1.html 413928-1-ref.html
-fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 413928-2.html 413928-2-ref.html
+== 413928-1.html 413928-1-ref.html
+== 413928-2.html 413928-2-ref.html
 == 425338-1a.html 425338-1-ref.html
 == 425338-1b.html 425338-1-ref.html
 == 489517-1.html 489517-1-ref.html
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 7dbe7eaedad9..4285b6bc4ae6 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -675,7 +675,7 @@ fails-if(Android) != 376532-3.html 376532-3-ref.html
 == 379178-html.html 379178-html-ref.html
 == 379178-svg.svg 379178-svg-ref.svg
 == 379316-1.html 379316-1-ref.html
-fails-if(Android) random-if(cocoaWidget) == 379316-2.html 379316-2-ref.html # bug 379786
+fails-if(Android) random-if(cocoaWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 379316-2.html 379316-2-ref.html # bug 379786
 == 379328-1.html 379328-1-ref.html
 == 379349-1a.xhtml 379349-1-ref.xhtml
 == 379349-1b.xhtml 379349-1-ref.xhtml

From 7b203984004b71ab6df61a6f66a1101cf423da43 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 21 Apr 2011 08:51:23 +0200
Subject: [PATCH 340/509] Bug 651623: fix DLL_SUFFIX value depending on
 SO_VERSION env var on OpenBSD. r=glandium

When using $(if) makefile idiom, it ends up in expandlib_config.py,
which is confused. Use a plain shell if block instead.
---
 configure.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index a3567e00c024..bddbe5a3b4f7 100644
--- a/configure.in
+++ b/configure.in
@@ -2456,7 +2456,11 @@ ia64*-hpux*)
 	;;
 
 *-openbsd*)
-    DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
+    if test "$SO_VERSION"; then
+        DLL_SUFFIX=".so.$SO_VERSION"
+    else
+        DLL_SUFFIX=".so.1.0"
+    fi
     MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'

From bf53ae4bf511a49b5db8b18957a50df3a7ef6d30 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 21 Apr 2011 08:53:19 +0200
Subject: [PATCH 341/509] Bug 650480 - Add libstdc++ 4.6 support to the
 libstdc++ compatibility hack. r=tglek

---
 build/stdc++compat.cpp | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/build/stdc++compat.cpp b/build/stdc++compat.cpp
index dce0e63bbe29..0de5ed30ce9a 100644
--- a/build/stdc++compat.cpp
+++ b/build/stdc++compat.cpp
@@ -61,7 +61,6 @@ namespace std {
 }
 
 namespace std __attribute__((visibility("default"))) {
-
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)
     /* Hack to avoid GLIBCXX_3.4.14 symbol versions */
     struct _List_node_base
@@ -73,35 +72,61 @@ namespace std __attribute__((visibility("default"))) {
         void transfer(_List_node_base * const __first,
                       _List_node_base * const __last) throw();
 
+/* Hack to avoid GLIBCXX_3.4.15 symbol versions */
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)
+        static void swap(_List_node_base& __x, _List_node_base& __y) throw ();
+    };
+
+    namespace __detail {
+
+    struct _List_node_base
+    {
+#endif
         void _M_hook(_List_node_base * const __position) throw ();
 
         void _M_unhook() throw ();
 
         void _M_transfer(_List_node_base * const __first,
                          _List_node_base * const __last) throw();
+
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)
+        static void swap(_List_node_base& __x, _List_node_base& __y) throw ();
+#endif
     };
 
     /* The functions actually have the same implementation */
     void
     _List_node_base::_M_hook(_List_node_base * const __position) throw ()
     {
-        hook(__position);
+        ((std::_List_node_base *)this)->hook((std::_List_node_base * const) __position);
     }
 
     void
     _List_node_base::_M_unhook() throw ()
     {
-        unhook();
+        ((std::_List_node_base *)this)->unhook();
     }
 
     void
     _List_node_base::_M_transfer(_List_node_base * const __first,
                                  _List_node_base * const __last) throw ()
     {
-        transfer(__first, __last);
+        ((std::_List_node_base *)this)->transfer((std::_List_node_base * const)__first,
+                                                 (std::_List_node_base * const)__last);
     }
+
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)
+    void
+    _List_node_base::swap(_List_node_base& __x, _List_node_base& __y) throw ()
+    {
+        std::_List_node_base::swap(*((std::_List_node_base *) &__x),
+                                   *((std::_List_node_base *) &__y));
+    }
+}
 #endif
 
+#endif /* (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5) */
+
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)
     /* Hack to avoid GLIBCXX_3.4.11 symbol versions
        An inline definition of ctype<char>::_M_widen_init() used to be in

From a0b813679fb3171730abff4f8a7b0b33d5b80277 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Thu, 21 Apr 2011 19:35:52 +0200
Subject: [PATCH 342/509] Bug 610305: decom nsEventStateManager r=smaug

---
 accessible/src/base/AccEvent.cpp              |   4 +-
 .../src/base/nsAccessibilityService.cpp       |   2 +-
 accessible/src/base/nsAccessible.cpp          |   2 +-
 accessible/src/base/nsCoreUtils.cpp           |  10 +-
 accessible/src/base/nsCoreUtils.h             |   2 +-
 accessible/src/base/nsDocAccessible.cpp       |   2 +-
 accessible/src/html/nsHTMLLinkAccessible.cpp  |   2 +-
 accessible/src/xul/nsXULMenuAccessible.cpp    |   2 +-
 content/base/public/nsIContent.h              |   2 +-
 content/base/src/Link.cpp                     |   2 +-
 content/base/src/nsDocument.cpp               |   1 -
 content/base/src/nsGenConImageContent.cpp     |   2 +-
 content/base/src/nsGenericElement.cpp         |   7 +-
 content/base/src/nsImageLoadingContent.cpp    |   2 +-
 content/base/src/nsObjectLoadingContent.cpp   |   2 +-
 content/events/public/Makefile.in             |   1 -
 content/events/public/nsIEventStateManager.h  | 167 ------------------
 content/events/src/Makefile.in                |   4 +
 content/events/src/nsDOMDragEvent.cpp         |   1 -
 content/events/src/nsDOMEvent.cpp             |   3 +-
 content/events/src/nsDOMMouseEvent.cpp        |   1 -
 content/events/src/nsDOMMouseScrollEvent.cpp  |   1 -
 content/events/src/nsDOMUIEvent.cpp           |   9 +-
 content/events/src/nsEventListenerManager.cpp |   1 -
 content/events/src/nsEventStateManager.cpp    | 114 +++++-------
 content/events/src/nsEventStateManager.h      | 110 ++++++++----
 .../html/content/src/nsGenericHTMLElement.cpp |   9 +-
 .../html/content/src/nsHTMLAnchorElement.cpp  |   1 -
 .../html/content/src/nsHTMLAreaElement.cpp    |   1 -
 .../html/content/src/nsHTMLButtonElement.cpp  |   3 +-
 .../html/content/src/nsHTMLFormElement.cpp    |   1 -
 .../html/content/src/nsHTMLInputElement.cpp   |   2 +-
 .../html/content/src/nsHTMLLabelElement.cpp   |   1 -
 .../html/content/src/nsHTMLLegendElement.cpp  |   1 -
 .../content/src/nsHTMLOptGroupElement.cpp     |   2 +-
 .../html/content/src/nsHTMLOptionElement.cpp  |   2 +-
 .../html/content/src/nsHTMLOutputElement.cpp  |   2 +-
 .../html/content/src/nsHTMLSelectElement.cpp  |   2 +-
 .../content/src/nsHTMLTextAreaElement.cpp     |   2 +-
 content/html/content/src/nsRadioVisitor.cpp   |   2 +-
 content/html/document/src/nsHTMLDocument.cpp  |   1 -
 .../mathml/content/src/nsMathMLElement.cpp    |   2 +-
 content/xtf/src/nsXTFElementWrapper.cpp       |   4 +-
 content/xul/content/src/nsXULElement.cpp      |   2 +-
 .../xul/content/src/nsXULPopupListener.cpp    |   3 +-
 docshell/base/nsDocShell.cpp                  |   2 +-
 dom/base/nsDOMWindowUtils.cpp                 |   1 -
 dom/base/nsFocusManager.cpp                   |   2 +-
 dom/base/nsGlobalWindow.cpp                   |   2 +-
 dom/base/nsWindowRoot.cpp                     |   1 -
 .../libeditor/base/nsEditorEventListener.cpp  |   1 -
 editor/libeditor/html/nsHTMLEditor.cpp        |   1 -
 .../components/find/src/nsWebBrowserFind.cpp  |   1 -
 .../spellcheck/src/mozInlineSpellChecker.cpp  |   1 -
 layout/base/nsCSSFrameConstructor.cpp         |   2 +-
 layout/base/nsDocumentViewer.cpp              |   1 -
 layout/base/nsPresContext.cpp                 |   2 +-
 layout/base/nsPresContext.h                   |   6 +-
 layout/base/nsPresShell.cpp                   |   8 +-
 layout/forms/nsButtonFrameRenderer.cpp        |   2 +-
 layout/forms/nsComboboxControlFrame.cpp       |   1 -
 layout/forms/nsFileControlFrame.cpp           |   2 +-
 layout/forms/nsFormControlFrame.cpp           |   9 +-
 layout/forms/nsListControlFrame.cpp           |   8 +-
 layout/forms/nsTextControlFrame.cpp           |   1 -
 layout/generic/nsCanvasFrame.cpp              |   2 +-
 layout/generic/nsContainerFrame.cpp           |   1 -
 layout/generic/nsFrame.cpp                    |   6 +-
 layout/generic/nsImageFrame.cpp               |   3 +-
 layout/inspector/src/inDOMUtils.cpp           |   5 +-
 layout/inspector/src/inDOMUtils.h             |   2 +-
 layout/inspector/src/inLayoutUtils.cpp        |   2 +-
 layout/inspector/src/inLayoutUtils.h          |   4 +-
 layout/printing/nsPrintPreviewListener.cpp    |   1 -
 layout/style/nsCSSRuleProcessor.cpp           |   2 +-
 layout/style/nsHTMLStyleSheet.cpp             |   2 +-
 layout/style/nsIStyleRuleProcessor.h          |   2 +-
 layout/style/nsStyleSet.cpp                   |   2 +-
 layout/xul/base/src/nsBoxFrame.cpp            |  13 +-
 layout/xul/base/src/nsButtonBoxFrame.cpp      |   6 +-
 layout/xul/base/src/nsDocElementBoxFrame.cpp  |   1 -
 layout/xul/base/src/nsMenuBarListener.cpp     |   2 -
 layout/xul/base/src/nsMenuPopupFrame.cpp      |   4 +-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  12 +-
 layout/xul/base/src/nsXULLabelFrame.cpp       |  11 +-
 .../base/src/tree/src/nsTreeContentView.cpp   |   2 +-
 toolkit/components/places/History.cpp         |   1 -
 .../typeaheadfind/nsTypeAheadFind.cpp         |   1 -
 widget/src/cocoa/nsNativeThemeCocoa.mm        |   2 +-
 widget/src/gtk2/nsNativeThemeGTK.cpp          |   1 -
 widget/src/qt/nsNativeThemeQt.cpp             |   1 -
 widget/src/windows/nsNativeThemeWin.cpp       |   2 +-
 widget/src/xpwidgets/nsBaseDragService.cpp    |   1 -
 widget/src/xpwidgets/nsNativeTheme.cpp        |   4 +-
 widget/src/xpwidgets/nsNativeTheme.h          |   2 +-
 95 files changed, 229 insertions(+), 424 deletions(-)
 delete mode 100644 content/events/public/nsIEventStateManager.h

diff --git a/accessible/src/base/AccEvent.cpp b/accessible/src/base/AccEvent.cpp
index 2ff4733ae1b6..1e6d70c96934 100644
--- a/accessible/src/base/AccEvent.cpp
+++ b/accessible/src/base/AccEvent.cpp
@@ -50,7 +50,7 @@
 #include "nsAccEvent.h"
 
 #include "nsIDOMDocument.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIServiceManager.h"
 #ifdef MOZ_XUL
 #include "nsIDOMXULMultSelectCntrlEl.h"
@@ -203,7 +203,7 @@ AccEvent::CaptureIsFromUserInput(EIsFromUserInput aIsFromUserInput)
     return;
   }
 
-  nsIEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
+  nsEventStateManager *esm = presShell->GetPresContext()->EventStateManager();
   if (!esm) {
     NS_NOTREACHED("There should always be an ESM for an event");
     return;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 4accb5a3a1b2..545ece530d91 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -75,7 +75,7 @@
 #include "nsRootAccessibleWrap.h"
 #include "nsTextFragment.h"
 #include "mozilla/Services.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #ifdef MOZ_XUL
 #include "nsXULAlertAccessible.h"
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index 97d453a36318..cfa89b13eb17 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -99,7 +99,7 @@
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
 #include "nsNetUtil.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #ifdef NS_DEBUG
 #include "nsIDOMCharacterData.h"
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index d4a3b02fe2bb..f7d660f6c849 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -60,7 +60,7 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsIScrollableFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsISelection2.h"
 #include "nsISelectionController.h"
 #include "nsPIDOMWindow.h"
@@ -206,7 +206,7 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
 
   // Accesskeys are registered by @accesskey attribute only. At first check
   // whether it is presented on the given element to avoid the slow
-  // nsIEventStateManager::GetRegisteredAccessKey() method.
+  // nsEventStateManager::GetRegisteredAccessKey() method.
   if (!aContent->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey))
     return 0;
 
@@ -222,13 +222,11 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
   if (!presContext)
     return 0;
 
-  nsIEventStateManager *esm = presContext->EventStateManager();
+  nsEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return 0;
 
-  PRUint32 key = 0;
-  esm->GetRegisteredAccessKey(aContent, &key);
-  return key;
+  return esm->GetRegisteredAccessKey(aContent);
 }
 
 nsIContent *
diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h
index 66a2aa446ac9..613c535d0033 100644
--- a/accessible/src/base/nsCoreUtils.h
+++ b/accessible/src/base/nsCoreUtils.h
@@ -110,7 +110,7 @@ public:
 
   /**
    * Return an accesskey registered on the given element by
-   * nsIEventStateManager or 0 if there is no registered accesskey.
+   * nsEventStateManager or 0 if there is no registered accesskey.
    *
    * @param aContent - the given element.
    */
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index a40473134893..08ac96e66718 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -61,7 +61,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMXULPopupElement.h"
 #include "nsIEditingSession.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsHTMLSelectAccessible.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp
index c7fdda1335d8..040114a49dae 100644
--- a/accessible/src/html/nsHTMLLinkAccessible.cpp
+++ b/accessible/src/html/nsHTMLLinkAccessible.cpp
@@ -42,7 +42,7 @@
 #include "States.h"
 #include "nsCoreUtils.h"
 
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLLinkAccessible
diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp
index 5de0cc1c9077..60d37d413791 100644
--- a/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -401,7 +401,7 @@ nsXULMenuitemAccessible::GetKeyboardShortcut(nsAString& aAccessKey)
   static PRInt32 gMenuAccesskeyModifier = -1;  // magic value of -1 indicates unitialized state
 
   // We do not use nsCoreUtils::GetAccesskeyFor() because accesskeys for
-  // menu are't registered by nsIEventStateManager.
+  // menu are't registered by nsEventStateManager.
   nsAutoString accesskey;
   mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::accesskey,
                     accesskey);
diff --git a/content/base/public/nsIContent.h b/content/base/public/nsIContent.h
index 190c013d4f45..b405eb664e36 100644
--- a/content/base/public/nsIContent.h
+++ b/content/base/public/nsIContent.h
@@ -789,7 +789,7 @@ public:
   /**
    * Method to get the _intrinsic_ content state of this content node.  This is
    * the state that is independent of the node's presentation.  To get the full
-   * content state, use nsIEventStateManager.  Also see nsIEventStateManager
+   * content state, use nsEventStateManager.  Also see nsEventStateManager
    * for the possible bits that could be set here.
    */
   virtual nsEventStates IntrinsicState() const;
diff --git a/content/base/src/Link.cpp b/content/base/src/Link.cpp
index 3fa567801eaa..67429bfa063b 100644
--- a/content/base/src/Link.cpp
+++ b/content/base/src/Link.cpp
@@ -39,7 +39,7 @@
 
 #include "Link.h"
 
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIURL.h"
 
 #include "nsContentUtils.h"
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 1471888200ca..1c2f7f13df7a 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -59,7 +59,6 @@
 #include "nsDocument.h"
 #include "nsUnicharUtils.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentList.h"
 #include "nsIObserver.h"
 #include "nsIBaseWindow.h"
diff --git a/content/base/src/nsGenConImageContent.cpp b/content/base/src/nsGenConImageContent.cpp
index 801be5590e3f..ea43820ba459 100644
--- a/content/base/src/nsGenConImageContent.cpp
+++ b/content/base/src/nsGenConImageContent.cpp
@@ -46,7 +46,7 @@
 #include "nsXMLElement.h"
 #include "nsImageLoadingContent.h"
 #include "imgIRequest.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 class nsGenConImageContent : public nsXMLElement,
                              public nsImageLoadingContent
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 333131d9ec84..10df002985a5 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -66,7 +66,7 @@
 #include "nsStyleConsts.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsDOMCID.h"
@@ -110,7 +110,6 @@
 
 #include "nsIServiceManager.h"
 #include "nsIDOMEventListener.h"
-#include "nsEventStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsIBaseWindow.h"
 
@@ -5379,10 +5378,8 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
                                nsIFocusManager::FLAG_NOSCROLL);
           }
 
-          nsIEventStateManager* esm =
-            aVisitor.mPresContext->EventStateManager();
           nsEventStateManager::SetActiveManager(
-            static_cast<nsEventStateManager*>(esm), this);
+            aVisitor.mPresContext->EventStateManager(), this);
         }
       }
     }
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index 196e4069b550..c499adbd4ee7 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -62,7 +62,7 @@
 #include "nsPLDOMEvent.h"
 
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsGUIEvent.h"
 
 #include "nsIChannel.h"
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 6e168d2648ff..5410a27e5a09 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -53,7 +53,7 @@
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIExternalProtocolHandler.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIObjectFrame.h"
 #include "nsIPluginDocument.h"
 #include "nsIPluginHost.h"
diff --git a/content/events/public/Makefile.in b/content/events/public/Makefile.in
index 96dab6511518..59ca27a9abb1 100644
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@@ -48,7 +48,6 @@ XPIDL_MODULE	= content_events
 EXPORTS		= \
 		nsMutationEvent.h \
 		nsIEventListenerManager.h \
-		nsIEventStateManager.h \
 		nsIPrivateDOMEvent.h \
 		nsIPrivateTextEvent.h \
 		nsIPrivateTextRange.h \
diff --git a/content/events/public/nsIEventStateManager.h b/content/events/public/nsIEventStateManager.h
deleted file mode 100644
index bffd0f855ddc..000000000000
--- a/content/events/public/nsIEventStateManager.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIEventStateManager_h__
-#define nsIEventStateManager_h__
-
-#include "nsEvent.h"
-#include "nsISupports.h"
-#include "nsEventStates.h"
-
-class nsIContent;
-class nsIDocument;
-class nsPresContext;
-class nsIDOMEvent;
-class nsIFrame;
-class nsIView;
-class nsIWidget;
-class imgIContainer;
-
-/*
- * Event state manager interface.
- */
-#define NS_IEVENTSTATEMANAGER_IID \
-{0x69ab5b16, 0x6690, 0x42fc, \
-  { 0xa9, 0xe5, 0xa3, 0xb4, 0xf8, 0x0f, 0xcb, 0xa6 } }
-
-#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
-
-class nsIEventStateManager : public nsISupports {
-
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
-
-  NS_IMETHOD Init() = 0;
-
-  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext, 
-                            nsEvent *aEvent, 
-                            nsIFrame* aTargetFrame,
-                            nsEventStatus* aStatus,
-                            nsIView* aView) = 0;
-
-  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext, 
-                             nsEvent *aEvent, 
-                             nsIFrame* aTargetFrame,
-                             nsEventStatus* aStatus,
-                             nsIView* aView) = 0;
-
-  NS_IMETHOD SetPresContext(nsPresContext* aPresContext) = 0;
-  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
-
-  NS_IMETHOD GetEventTarget(nsIFrame **aFrame) = 0;
-  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent) = 0;
-
-  /**
-   * Returns the content state of aContent.
-   * @param aContent      The control whose state is requested.
-   * @param aFollowLabels Whether to reflect a label's content state on its
-   *                      associated control. If aFollowLabels is true and
-   *                      aContent is a control which has a label that has the 
-   *                      hover or active content state set, GetContentState
-   *                      will pretend that those states are also set on aContent.
-   * @return              The content state.
-   */
-  virtual nsEventStates GetContentState(nsIContent *aContent,
-                                        PRBool aFollowLabels = PR_FALSE) = 0;
-
-  /**
-   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
-   * @param aContent Content which has changed states.  This may be null to
-   *                 indicate that nothing is in this state anymore.
-   * @param aState   One of NS_EVENT_STATE_ACTIVE, NS_EVENT_STATE_HOVER,
-   *                 NS_EVENT_STATE_DRAGOVER, NS_EVENT_STATE_URLTARGET.  Don't
-   *                 pass anything else!  Passing in a state object that has
-   *                 more than one of those states set is not supported.
-   * @return  Whether the content was able to change all states. Returns PR_FALSE
-   *                  if a resulting DOM event causes the content node passed in
-   *                  to not change states. Note, the frame for the content may
-   *                  change as a result of the content state change, because of
-   *                  frame reconstructions that may occur, but this does not
-   *                  affect the return value.
-   */
-  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState) = 0;
-
-  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent) = 0;
-  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK) = 0;
-
-  // Access Key Registration
-
-  /**
-   * Register accesskey on the given element. When accesskey is activated then
-   * the element will be notified via nsIContent::PerformAccesskey() method.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
-
-  /**
-   * Unregister accesskey for the given element.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      accesskey
-   */
-  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey) = 0;
-
-  /**
-   * Get accesskey registered on the given element or 0 if there is none.
-   *
-   * @param  aContent  the given element
-   * @param  aKey      registered accesskey
-   * @return           NS_OK
-   */
-  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey) = 0;
-
-  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
-                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
-                       nsIWidget* aWidget, PRBool aLockCursor) = 0;
-
-  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext) = 0;
-  
-  /**
-   * Returns true if the current code is being executed as a result of user input.
-   * This includes timers or anything else that is initiated from user input.
-   * However, mouse hover events are not counted as user input, nor are
-   * page load events. If this method is called from asynchronously executed code,
-   * such as during layout reflows, it will return false.
-   */
-  NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventStateManager, NS_IEVENTSTATEMANAGER_IID)
-
-#endif // nsIEventStateManager_h__
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index 0fe7d18b3afc..f7e82fdd8bae 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -46,6 +46,10 @@ MODULE		= content
 LIBRARY_NAME	= gkconevents_s
 LIBXUL_LIBRARY  = 1
 
+EXPORTS		= \
+		nsEventStateManager.h \
+		$(NULL)
+		
 CPPSRCS		= \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index cf290d94052e..3622ed48cbab 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -39,7 +39,6 @@
 #include "nsIServiceManager.h"
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
-#include "nsIEventStateManager.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIDragService.h"
 
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 4767f13862ce..920f5b376ae3 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -316,8 +316,7 @@ nsDOMEvent::GetTargetFromFrame()
   if (!mPresContext) { return nsnull; }
 
   // Get the target frame (have to get the ESM first)
-  nsIFrame* targetFrame = nsnull;
-  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   if (!targetFrame) { return nsnull; }
 
   // get the real content
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
index e38270d4ade5..dbedcde48bea 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -40,7 +40,6 @@
 #include "nsDOMMouseEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseEvent::nsDOMMouseEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index a9e2bfa9f87d..34bda3a5ddea 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -38,7 +38,6 @@
 #include "nsDOMMouseScrollEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsContentUtils.h"
 
 nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index a3c1406a77f8..07bcba00a9d3 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOMNode.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsIScrollableFrame.h"
@@ -258,7 +258,7 @@ nsDOMUIEvent::GetRangeParent(nsIDOMNode** aRangeParent)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   }
 
   *aRangeParent = nsnull;
@@ -286,7 +286,7 @@ nsDOMUIEvent::GetRangeOffset(PRInt32* aRangeOffset)
   nsIFrame* targetFrame = nsnull;
 
   if (mPresContext) {
-    mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   }
 
   if (targetFrame) {
@@ -334,8 +334,7 @@ nsDOMUIEvent::GetLayerPoint()
     return mLayerPoint;
   }
   // XXX I'm not really sure this is correct; it's my best shot, though
-  nsIFrame* targetFrame;
-  mPresContext->EventStateManager()->GetEventTarget(&targetFrame);
+  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
   if (!targetFrame)
     return mLayerPoint;
   nsIFrame* layer = nsLayoutUtils::GetClosestLayer(targetFrame);
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index b98f081a457f..0f78a1346d9a 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -56,7 +56,6 @@
 #ifdef MOZ_SVG
 #include "nsGkAtoms.h"
 #endif // MOZ_SVG
-#include "nsIEventStateManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIJSEventListener.h"
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index f62c71c4ad3e..b87f2f04ad39 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -811,7 +811,7 @@ nsEventStateManager::UpdateUserActivityTimer(void)
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::Init()
 {
   nsCOMPtr<nsIObserverService> observerService =
@@ -996,8 +996,7 @@ nsEventStateManager::Observe(nsISupports *aSubject,
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsEventStateManager)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventStateManager)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEventStateManager)
-   NS_INTERFACE_MAP_ENTRY(nsIEventStateManager)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIObserver)
    NS_INTERFACE_MAP_ENTRY(nsIObserver)
    NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
@@ -1047,8 +1046,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsEventStateManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mAccessKeys);
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
                                     nsEvent *aEvent,
                                     nsIFrame* aTargetFrame,
@@ -2818,7 +2816,7 @@ NodeAllowsClickThrough(nsINode* aNode)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
                                      nsEvent *aEvent,
                                      nsIFrame* aTargetFrame,
@@ -2993,8 +2991,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
       ClearGlobalActiveContent(this);
       if (IsMouseEventReal(aEvent)) {
         if (!mCurrentTarget) {
-          nsIFrame* targ;
-          GetEventTarget(&targ);
+          GetEventTarget();
         }
         if (mCurrentTarget) {
           ret = CheckForAndDispatchClick(presContext, (nsMouseEvent*)aEvent,
@@ -3356,28 +3353,24 @@ nsEventStateManager::IsTargetCrossProcess(nsGUIEvent *aEvent)
   return TabParent::GetIMETabParent() != nsnull;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::NotifyDestroyPresContext(nsPresContext* aPresContext)
 {
   nsIMEStateManager::OnDestroyPresContext(aPresContext);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::SetPresContext(nsPresContext* aPresContext)
 {
   mPresContext = aPresContext;
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
 {
   if (aFrame && aFrame == mCurrentTarget) {
     mCurrentTargetContent = aFrame->GetContent();
   }
-
-  return NS_OK;
 }
 
 void
@@ -3436,7 +3429,7 @@ nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
   }
 }
 
-NS_IMETHODIMP
+nsresult
 nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
                                PRBool aHaveHotspot,
                                float aHotspotX, float aHotspotY,
@@ -3698,8 +3691,7 @@ nsEventStateManager::NotifyMouseOut(nsGUIEvent* aEvent, nsIContent* aMovingInto)
         docshell->GetPresContext(getter_AddRefs(presContext));
 
         if (presContext) {
-          nsEventStateManager* kidESM =
-            static_cast<nsEventStateManager*>(presContext->EventStateManager());
+          nsEventStateManager* kidESM = presContext->EventStateManager();
           // Not moving into any element in this subdocument
           kidESM->NotifyMouseOut(aEvent, nsnull);
         }
@@ -3757,9 +3749,7 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent)
     if (docContent) {
       nsIPresShell *parentShell = parentDoc->GetShell();
       if (parentShell) {
-        nsEventStateManager* parentESM =
-          static_cast<nsEventStateManager*>
-                     (parentShell->GetPresContext()->EventStateManager());
+        nsEventStateManager* parentESM = parentShell->GetPresContext()->EventStateManager();
         parentESM->NotifyMouseOver(aEvent, docContent);
       }
     }
@@ -3804,8 +3794,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
   case NS_MOUSE_MOVE:
     {
       // Get the target content target (mousemove target == mouseover target)
-      nsCOMPtr<nsIContent> targetElement;
-      GetEventTargetContent(aEvent, getter_AddRefs(targetElement));
+      nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aEvent);
       if (!targetElement) {
         // We're always over the document root, even if we're only
         // over dead space in a page (whose frame is not associated with
@@ -4093,8 +4082,7 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
 
     nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
     if (presShell) {
-      nsCOMPtr<nsIContent> mouseContent;
-      GetEventTargetContent(aEvent, getter_AddRefs(mouseContent));
+      nsCOMPtr<nsIContent> mouseContent = GetEventTargetContent(aEvent);
 
       ret = presShell->HandleEventWithTarget(&event, mCurrentTarget,
                                              mouseContent, aStatus);
@@ -4120,61 +4108,56 @@ nsEventStateManager::CheckForAndDispatchClick(nsPresContext* aPresContext,
   return ret;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
+nsIFrame*
+nsEventStateManager::GetEventTarget()
 {
   nsIPresShell *shell;
   if (mCurrentTarget ||
       !mPresContext ||
       !(shell = mPresContext->GetPresShell())) {
-    *aFrame = mCurrentTarget;
-    return NS_OK;
+    return mCurrentTarget;
   }
 
   if (mCurrentTargetContent) {
     mCurrentTarget = mPresContext->GetPrimaryFrameFor(mCurrentTargetContent);
     if (mCurrentTarget) {
-      *aFrame = mCurrentTarget;
-      return NS_OK;
+      return mCurrentTarget;
     }
   }
 
   nsIFrame* frame = shell->GetEventTargetFrame();
-  *aFrame = mCurrentTarget = frame;
-  return NS_OK;
+  return (mCurrentTarget = frame);
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetEventTargetContent(nsEvent* aEvent,
-                                           nsIContent** aContent)
+already_AddRefed<nsIContent>
+nsEventStateManager::GetEventTargetContent(nsEvent* aEvent)
 {
   if (aEvent &&
       (aEvent->message == NS_FOCUS_CONTENT ||
        aEvent->message == NS_BLUR_CONTENT)) {
-    NS_IF_ADDREF(*aContent = GetFocusedContent());
-    return NS_OK;
+    nsCOMPtr<nsIContent> content = GetFocusedContent();
+    return content.forget();
   }
 
   if (mCurrentTargetContent) {
-    *aContent = mCurrentTargetContent;
-    NS_IF_ADDREF(*aContent);
-    return NS_OK;
+    nsCOMPtr<nsIContent> content = mCurrentTargetContent;
+    return content.forget();
   }
 
-  *aContent = nsnull;
+  nsIContent *content = nsnull;
 
   nsIPresShell *presShell = mPresContext->GetPresShell();
   if (presShell) {
-    *aContent = presShell->GetEventTargetContent(aEvent).get();
+    content = presShell->GetEventTargetContent(aEvent).get();
   }
 
   // Some events here may set mCurrentTarget but not set the corresponding
   // event target in the PresShell.
-  if (!*aContent && mCurrentTarget) {
-    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, aContent);
+  if (!content && mCurrentTarget) {
+    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, &content);
   }
 
-  return NS_OK;
+  return content;
 }
 
 static already_AddRefed<nsIContent>
@@ -4419,7 +4402,7 @@ nsEventStateManager::SetContentState(nsIContent *aContent, nsEventStates aState)
   return PR_TRUE;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
 {
   // inform the focus manager that the content is being removed. If this
@@ -4452,59 +4435,44 @@ nsEventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent
     // See bug 292146 for why we want to null this out
     mLastMouseOverElement = nsnull;
   }
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK)
+PRBool
+nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent)
 {
-  *aOK = PR_TRUE;
-  if (aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
-    if (!sNormalLMouseEventInProcess) {
-      *aOK = PR_FALSE;
-    }
-  }
-  return NS_OK;
+  return !(aEvent->message == NS_MOUSE_BUTTON_DOWN &&
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton  && 
+      !sNormalLMouseEventInProcess);
 }
 
 //-------------------------------------------
 // Access Key Registration
 //-------------------------------------------
-NS_IMETHODIMP
+void
 nsEventStateManager::RegisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent && mAccessKeys.IndexOf(aContent) == -1)
     mAccessKeys.AppendObject(aContent);
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsEventStateManager::UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 {
   if (aContent)
     mAccessKeys.RemoveObject(aContent);
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent,
-                                            PRUint32* aKey)
+PRUint32
+nsEventStateManager::GetRegisteredAccessKey(nsIContent* aContent)
 {
   NS_ENSURE_ARG(aContent);
-  NS_ENSURE_ARG_POINTER(aKey);
-  *aKey = 0;
 
   if (mAccessKeys.IndexOf(aContent) == -1)
-    return NS_OK;
+    return 0;
 
   nsAutoString accessKey;
   aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
-  *aKey = accessKey.First();
-  return NS_OK;
+  return accessKey.First();
 }
 
 void
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 357559ad52a5..5d64ea9a2680 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -39,7 +39,6 @@
 #ifndef nsEventStateManager_h__
 #define nsEventStateManager_h__
 
-#include "nsIEventStateManager.h"
 #include "nsEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
@@ -56,6 +55,7 @@
 #include "nsIScrollableFrame.h"
 #include "nsFocusManager.h"
 #include "nsIDocument.h"
+#include "nsEventStates.h"
 
 class nsIPresShell;
 class nsIDocShell;
@@ -75,7 +75,6 @@ class TabParent;
  */
 
 class nsEventStateManager : public nsSupportsWeakReference,
-                            public nsIEventStateManager,
                             public nsIObserver
 {
   friend class nsMouseWheelTransaction;
@@ -86,7 +85,7 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
-  NS_IMETHOD Init();
+  nsresult Init();
   nsresult Shutdown();
 
   /* The PreHandleEvent method is called before event dispatch to either
@@ -96,44 +95,86 @@ public:
    * PostHandleEvent.  Any centralized event processing which must occur before
    * DOM or frame event handling should occur here as well.
    */
-  NS_IMETHOD PreHandleEvent(nsPresContext* aPresContext,
-                         nsEvent *aEvent,
-                         nsIFrame* aTargetFrame,
-                         nsEventStatus* aStatus,
-                         nsIView* aView);
+  nsresult PreHandleEvent(nsPresContext* aPresContext,
+                          nsEvent *aEvent,
+                          nsIFrame* aTargetFrame,
+                          nsEventStatus* aStatus,
+                          nsIView* aView);
 
   /* The PostHandleEvent method should contain all system processing which
    * should occur conditionally based on DOM or frame processing.  It should
    * also contain any centralized event processing which must occur after
    * DOM and frame processing.
    */
-  NS_IMETHOD PostHandleEvent(nsPresContext* aPresContext,
-                             nsEvent *aEvent,
-                             nsIFrame* aTargetFrame,
-                             nsEventStatus* aStatus,
-                             nsIView* aView);
+  nsresult PostHandleEvent(nsPresContext* aPresContext,
+                           nsEvent *aEvent,
+                           nsIFrame* aTargetFrame,
+                           nsEventStatus* aStatus,
+                           nsIView* aView);
 
-  NS_IMETHOD NotifyDestroyPresContext(nsPresContext* aPresContext);
-  NS_IMETHOD SetPresContext(nsPresContext* aPresContext);
-  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
+  void NotifyDestroyPresContext(nsPresContext* aPresContext);
+  void SetPresContext(nsPresContext* aPresContext);
+  void ClearFrameRefs(nsIFrame* aFrame);
 
-  NS_IMETHOD GetEventTarget(nsIFrame **aFrame);
-  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent);
+  nsIFrame* GetEventTarget();
+  already_AddRefed<nsIContent> GetEventTargetContent(nsEvent* aEvent);
 
+  /**
+   * Returns the content state of aContent.
+   * @param aContent      The control whose state is requested.
+   * @param aFollowLabels Whether to reflect a label's content state on its
+   *                      associated control. If aFollowLabels is true and
+   *                      aContent is a control which has a label that has the 
+   *                      hover or active content state set, GetContentState
+   *                      will pretend that those states are also set on aContent.
+   * @return              The content state.
+   */
   virtual nsEventStates GetContentState(nsIContent *aContent,
                                         PRBool aFollowLabels = PR_FALSE);
-  virtual PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
-  NS_IMETHOD ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
-  NS_IMETHOD EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK);
 
-  // Access Key Registration
-  NS_IMETHOD RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-  NS_IMETHOD UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
-  NS_IMETHOD GetRegisteredAccessKey(nsIContent* aContent, PRUint32* aKey);
+  /**
+   * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
+   * @param aContent Content which has changed states
+   * @param aState   Corresponding state flags such as NS_EVENT_STATE_FOCUS
+   * @return  Whether the content was able to change all states. Returns PR_FALSE
+   *                  if a resulting DOM event causes the content node passed in
+   *                  to not change states. Note, the frame for the content may
+   *                  change as a result of the content state change, because of
+   *                  frame reconstructions that may occur, but this does not
+   *                  affect the return value.
+   */
+  PRBool SetContentState(nsIContent *aContent, nsEventStates aState);
+  void ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
+  PRBool EventStatusOK(nsGUIEvent* aEvent);
 
-  NS_IMETHOD SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
-                       PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
-                       nsIWidget* aWidget, PRBool aLockCursor);
+  /**
+   * Register accesskey on the given element. When accesskey is activated then
+   * the element will be notified via nsIContent::PerformAccesskey() method.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  void RegisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+
+  /**
+   * Unregister accesskey for the given element.
+   *
+   * @param  aContent  the given element
+   * @param  aKey      accesskey
+   */
+  void UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey);
+
+  /**
+   * Get accesskey registered on the given element or 0 if there is none.
+   *
+   * @param  aContent  the given element
+   * @return           registered accesskey
+   */
+  PRUint32 GetRegisteredAccessKey(nsIContent* aContent);
+
+  nsresult SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
+                     PRBool aHaveHotspot, float aHotspotX, float aHotspotY,
+                     nsIWidget* aWidget, PRBool aLockCursor); 
 
   static void StartHandlingUserInput()
   {
@@ -150,16 +191,23 @@ public:
     return sUserInputEventDepth > 0;
   }
 
+  /**
+   * Returns true if the current code is being executed as a result of user input.
+   * This includes timers or anything else that is initiated from user input.
+   * However, mouse hover events are not counted as user input, nor are
+   * page load events. If this method is called from asynchronously executed code,
+   * such as during layout reflows, it will return false.
+   */
   NS_IMETHOD_(PRBool) IsHandlingUserInputExternal() { return IsHandlingUserInput(); }
   
   nsPresContext* GetPresContext() { return mPresContext; }
 
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsEventStateManager,
-                                           nsIEventStateManager)
+                                           nsIObserver)
 
   static nsIDocument* sMouseOverDocument;
 
-  static nsIEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
+  static nsEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
 
   // Sets aNewESM to be the active event state manager, and
   // if aContent is non-null, marks the object as active.
@@ -489,4 +537,6 @@ private:
   static void operator delete(void* /*memory*/) {}
 };
 
+#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_ACTIVATION_EVENT(event))
+
 #endif // nsEventStateManager_h__
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 6948487f4f1e..9355521ed2a2 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -86,7 +86,7 @@
 #include "nsString.h"
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsDOMCSSDeclaration.h"
@@ -1056,9 +1056,8 @@ nsGenericHTMLElement::CheckHandleEventForAnchorsPreconditions(nsEventChainVisito
   //Need to check if we hit an imagemap area and if so see if we're handling
   //the event on that map or on a link farther up the tree.  If we're on a
   //link farther up, do nothing.
-  nsCOMPtr<nsIContent> target;
-  aVisitor.mPresContext->EventStateManager()->
-    GetEventTargetContent(aVisitor.mEvent, getter_AddRefs(target));
+  nsCOMPtr<nsIContent> target = aVisitor.mPresContext->EventStateManager()->
+    GetEventTargetContent(aVisitor.mEvent);
 
   return !target || !IsArea(target) || IsArea(this);
 }
@@ -3353,7 +3352,7 @@ nsGenericHTMLElement::RegUnRegAccessKey(PRBool aDoReg)
   nsPresContext *presContext = GetPresContext();
 
   if (presContext) {
-    nsIEventStateManager *esm = presContext->EventStateManager();
+    nsEventStateManager *esm = presContext->EventStateManager();
 
     // Register or unregister as appropriate.
     if (aDoReg) {
diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp
index 8602bad4a079..2e70258345dd 100644
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -47,7 +47,6 @@
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 
 #include "nsHTMLDNSPrefetch.h"
 
diff --git a/content/html/content/src/nsHTMLAreaElement.cpp b/content/html/content/src/nsHTMLAreaElement.cpp
index 2f5e85a1d064..63c3e015e0da 100644
--- a/content/html/content/src/nsHTMLAreaElement.cpp
+++ b/content/html/content/src/nsHTMLAreaElement.cpp
@@ -41,7 +41,6 @@
 #include "nsILink.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
-#include "nsIEventStateManager.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 6804fa70edd8..70ca60d95eb1 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -50,7 +50,6 @@
 #include "nsEventStateManager.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDocument.h"
@@ -377,7 +376,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                   nsMouseEvent::eLeftButton) {
               if (NS_IS_TRUSTED_EVENT(aVisitor.mEvent)) {
-                nsIEventStateManager* esm =
+                nsEventStateManager* esm =
                   aVisitor.mPresContext->EventStateManager();
                 nsEventStateManager::SetActiveManager(
                   static_cast<nsEventStateManager*>(esm), this);
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 357c12b2ed74..5dea27259821 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -81,7 +81,6 @@
 #include "nsIHTMLCollection.h"
 
 #include "nsIConstraintValidation.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIDOMHTMLButtonElement.h"
 
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 09214bebe747..0b0ebff0abf0 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -63,7 +63,7 @@
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
 #include "nsIFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIServiceManager.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsDOMError.h"
diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index 76f678036296..b626925d8b7d 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -47,7 +47,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDocument.h"
 #include "nsGUIEvent.h"
-#include "nsIEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp
index 1750e588caa7..8a41cdd33c64 100644
--- a/content/html/content/src/nsHTMLLegendElement.cpp
+++ b/content/html/content/src/nsHTMLLegendElement.cpp
@@ -42,7 +42,6 @@
 #include "nsStyleConsts.h"
 #include "nsIForm.h"
 #include "nsIFormControl.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp
index e354bdd4f8da..53ea9a6453e7 100644
--- a/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -41,7 +41,7 @@
 #include "nsStyleConsts.h"
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 
 #include "nsEventDispatcher.h"
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index 013f6770ef41..21a5336e9fd3 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -59,7 +59,7 @@
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsContentCreatorFunctions.h"
diff --git a/content/html/content/src/nsHTMLOutputElement.cpp b/content/html/content/src/nsHTMLOutputElement.cpp
index 3adc2382bf6d..e838ca9a69ff 100644
--- a/content/html/content/src/nsHTMLOutputElement.cpp
+++ b/content/html/content/src/nsHTMLOutputElement.cpp
@@ -41,7 +41,7 @@
 #include "nsDOMSettableTokenList.h"
 #include "nsStubMutationObserver.h"
 #include "nsIConstraintValidation.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "mozAutoDocUpdate.h"
 #include "nsHTMLFormElement.h"
 
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index 1474d4004354..eb885e90edbf 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -52,7 +52,7 @@
 
 #include "nsIDOMHTMLOptGroupElement.h"
 #include "nsHTMLOptionElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsGUIEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIBoxObject.h"
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 6271080e8fed..88f9dcfe530a 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -58,7 +58,7 @@
 #include "nsMappedAttributes.h"
 #include "nsIFormControlFrame.h"
 #include "nsITextControlFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsLinebreakConverter.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
diff --git a/content/html/content/src/nsRadioVisitor.cpp b/content/html/content/src/nsRadioVisitor.cpp
index d931fdd13bf6..4859bdfd0b70 100644
--- a/content/html/content/src/nsRadioVisitor.cpp
+++ b/content/html/content/src/nsRadioVisitor.cpp
@@ -38,7 +38,7 @@
 #include "nsRadioVisitor.h"
 #include "nsAutoPtr.h"
 #include "nsHTMLInputElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIConstraintValidation.h"
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index af2c5284987c..a25f0377651d 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -124,7 +124,6 @@
 #include "nsIMutableArray.h"
 #include "nsArrayUtils.h"
 #include "nsIEffectiveTLDService.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIPrompt.h"
 //AHMED 12-2
diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp
index 78d29877b292..d36cc861a103 100644
--- a/content/mathml/content/src/nsMathMLElement.cpp
+++ b/content/mathml/content/src/nsMathMLElement.cpp
@@ -47,7 +47,7 @@
 #include "nsMappedAttributes.h"
 #include "nsStyleConsts.h"
 #include "nsIDocument.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsDOMClassInfoID.h"
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index 52c627924112..4f0d45fc62d5 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -48,7 +48,7 @@
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMEvent.h"
 #include "nsGUIEvent.h"
@@ -974,7 +974,7 @@ nsXTFElementWrapper::RegUnregAccessKey(PRBool aDoReg)
   if (!presContext)
     return;
 
-  nsIEventStateManager *esm = presContext->EventStateManager();
+  nsEventStateManager *esm = presContext->EventStateManager();
   if (!esm)
     return;
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index dafd9f7f3bc6..635240649c6a 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -83,7 +83,7 @@
 #include "nsIDOMXULSelectCntrlItemEl.h"
 #include "nsIDocument.h"
 #include "nsIEventListenerManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsIFastLoadService.h"
 #include "nsHTMLStyleSheet.h"
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 9a012f8bb176..736f06ce3af2 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -74,7 +74,6 @@
 // for event firing in context menus
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIViewManager.h"
@@ -301,7 +300,7 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
       }
     }
 
-    nsIEventStateManager *esm = context->EventStateManager();
+    nsEventStateManager *esm = context->EventStateManager();
     nsCOMPtr<nsIContent> focusableContent = do_QueryInterface(element);
     esm->SetContentState(focusableContent, NS_EVENT_STATE_ACTIVE);
   }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index f811192356d3..77b7e291d949 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -201,7 +201,7 @@
 #include "nsIGlobalHistory3.h"
 
 #ifdef DEBUG_DOCSHELL_FOCUS
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #endif
 
 #include "nsIFrame.h"
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index f6d77454d501..b36379adc171 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -46,7 +46,6 @@
 #include "nsGlobalWindow.h"
 #include "nsIDocument.h"
 #include "nsFocusManager.h"
-#include "nsIEventStateManager.h"
 #include "nsEventStateManager.h"
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 668482fa546c..855e7d682459 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -68,7 +68,7 @@
 #include "nsFrameTraversal.h"
 #include "nsObjectFrame.h"
 #include "nsEventDispatcher.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIMEStateManager.h"
 #include "nsIWebNavigation.h"
 #include "nsCaret.h"
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index b53adb5dcead..f4ed0c2eeea9 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -127,7 +127,7 @@
 #include "nsDOMString.h"
 #include "nsIEmbeddingSiteWindow2.h"
 #include "nsThreadUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIHttpProtocolHandler.h"
 #include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 67e3295a9b02..ca96c27eabc5 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -47,7 +47,6 @@
 #include "nsPresContext.h"
 #include "nsLayoutCID.h"
 #include "nsContentCID.h"
-#include "nsIEventStateManager.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsString.h"
diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp
index bb761239c3fa..844048dc13ee 100644
--- a/editor/libeditor/base/nsEditorEventListener.cpp
+++ b/editor/libeditor/base/nsEditorEventListener.cpp
@@ -71,7 +71,6 @@
 #include "nsIDOMNSRange.h"
 #include "nsEditorUtils.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIEventStateManager.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIFocusManager.h"
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 725613294ff8..512943255496 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -98,7 +98,6 @@
 
 #include "nsIFrame.h"
 #include "nsIParserService.h"
-#include "nsIEventStateManager.h"
 
 // Some utilities to handle annoying overloading of "A" tag for link and named anchor
 static char hrefText[] = "href";
diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp
index 8c667e508314..596b375cbf75 100644
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -56,7 +56,6 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsISelectionController.h"
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index 739ab2fbd508..c535bfe956a0 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -95,7 +95,6 @@
 #include "nsThreadUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsGUIEvent.h"
 
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 43b63fa319e6..b6377399f54f 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -66,7 +66,7 @@
 #include "nsUnicharUtils.h"
 #include "nsStyleSet.h"
 #include "nsIViewManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsStyleConsts.h"
 #include "nsTableOuterFrame.h"
 #include "nsIDOMXULElement.h"
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 3ef28eb3e7f7..a88fdad95e8a 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -58,7 +58,6 @@
 #include "nsIDocument.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIEventStateManager.h"
 #include "nsStyleSet.h"
 #include "nsIStyleSheet.h"
 #include "nsCSSStyleSheet.h"
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 38871ee87833..8946d209b003 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -349,7 +349,7 @@ TraverseImageLoader(const void * aKey, nsRefPtr<nsImageLoader>& aData,
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsPresContext)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocument);
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mDeviceContext); // not xpcom
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mEventManager);
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mEventManager, nsIObserver);
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mLookAndFeel); // a service
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mLanguage); // an atom
 
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 09f399357933..dbce17a69100 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -89,7 +89,7 @@ class nsFrameManager;
 class nsILinkHandler;
 class nsStyleContext;
 class nsIAtom;
-class nsIEventStateManager;
+class nsEventStateManager;
 class nsIURI;
 class nsILookAndFeel;
 class nsICSSPseudoComparator;
@@ -545,7 +545,7 @@ public:
   void SetPrintPreviewScale(float aScale) { mPPScale = aScale; }
 
   nsDeviceContext* DeviceContext() { return mDeviceContext; }
-  nsIEventStateManager* EventStateManager() { return mEventManager; }
+  nsEventStateManager* EventStateManager() { return mEventManager; }
   nsIAtom* GetLanguageFromCharset() { return mLanguage; }
 
   float TextZoom() { return mTextZoom; }
@@ -1053,7 +1053,7 @@ protected:
                                         // Cannot reintroduce cycles
                                         // since there is no dependency
                                         // from gfx back to layout.
-  nsIEventStateManager* mEventManager;  // [STRONG]
+  nsEventStateManager* mEventManager;   // [STRONG]
   nsILookAndFeel*       mLookAndFeel;   // [STRONG]
   nsRefPtr<nsRefreshDriver> mRefreshDriver;
   nsRefPtr<nsTransitionManager> mTransitionManager;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 465ff7879c67..c31829edfae0 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -84,7 +84,6 @@
 #include "nsHashtable.h"
 #include "nsIViewObserver.h"
 #include "nsContainerFrame.h"
-#include "nsEventStateManager.h"
 #include "nsDOMEvent.h"
 #include "nsGUIEvent.h"
 #include "nsHTMLParts.h"
@@ -118,6 +117,7 @@
 #include "nsViewsCID.h"
 #include "nsPresArena.h"
 #include "nsFrameManager.h"
+#include "nsEventStateManager.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsILayoutHistoryState.h"
@@ -3777,7 +3777,7 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
   }
   
   // Hold a reference to the ESM in case event dispatch tears us down.
-  nsCOMPtr<nsIEventStateManager> esm = mPresContext->EventStateManager();
+  nsRefPtr<nsEventStateManager> esm = mPresContext->EventStateManager();
 
   if (aAnchorName.IsEmpty()) {
     NS_ASSERTION(!aScroll, "can't scroll to empty anchor name");
@@ -6508,7 +6508,7 @@ PresShell::HandleEvent(nsIView         *aView,
     //
     // Note, currently for backwards compatibility we don't forward mouse events
     // to the active document when mouse is over some subdocument.
-    nsIEventStateManager* activeESM =
+    nsEventStateManager* activeESM =
       nsEventStateManager::GetActiveEventStateManager();
     if (activeESM && NS_IS_MOUSE_EVENT(aEvent) &&
         activeESM != shell->GetPresContext()->EventStateManager() &&
@@ -6794,7 +6794,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
   }
 #endif
 
-  nsCOMPtr<nsIEventStateManager> manager = mPresContext->EventStateManager();
+  nsRefPtr<nsEventStateManager> manager = mPresContext->EventStateManager();
   nsresult rv = NS_OK;
 
   if (!NS_EVENT_NEEDS_FRAME(aEvent) || GetCurrentEventFrame()) {
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 1d61068b6336..80f39c94e303 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -44,7 +44,7 @@
 #include "nsDisplayList.h"
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 #define ACTIVE   "active"
 #define HOVER    "hover"
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 36907a89fa6c..2172a4a4e1c7 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -59,7 +59,6 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsEventDispatcher.h"
-#include "nsIEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMNode.h"
 #include "nsIPrivateDOMEvent.h"
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index f6a818c624f4..65c9c65a4d91 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -91,7 +91,7 @@
 #include "nsICapturePicker.h"
 #include "nsIFileURL.h"
 #include "nsDOMFile.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 
 namespace dom = mozilla::dom;
 
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp
index 45378ebb9eb3..09fbaeff8e1a 100644
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -38,7 +38,7 @@
 #include "nsFormControlFrame.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMHTMLInputElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsILookAndFeel.h"
 
 //#define FCF_NOISY
@@ -128,12 +128,13 @@ nsFormControlFrame::RegUnRegAccessKey(nsIFrame * aFrame, PRBool aDoReg)
   nsIContent* content = aFrame->GetContent();
   content->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, accessKey);
   if (!accessKey.IsEmpty()) {
-    nsIEventStateManager *stateManager = presContext->EventStateManager();
+    nsEventStateManager *stateManager = presContext->EventStateManager();
     if (aDoReg) {
-      return stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
+      stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
     } else {
-      return stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
+      stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
     }
+    return NS_OK;
   }
   return NS_ERROR_FAILURE;
 }
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index db185a994499..f9e128870a4f 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsHTMLParts.h"
 #include "nsIDOMEventTarget.h"
 #include "nsEventDispatcher.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMMouseEvent.h"
@@ -87,7 +87,6 @@
 #include "nsIDOMKeyListener.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayList.h"
-#include "nsIEventStateManager.h"
 
 // Constants
 const nscoord kMaxDropDownRows          = 20; // This matches the setting for 4.x browsers
@@ -2072,9 +2071,8 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
     }
   }
 
-  nsCOMPtr<nsIContent> content;
-  PresContext()->EventStateManager()->
-    GetEventTargetContent(nsnull, getter_AddRefs(content));
+  nsCOMPtr<nsIContent> content = PresContext()->EventStateManager()->
+    GetEventTargetContent(nsnull);
 
   nsCOMPtr<nsIContent> optionContent = GetOptionFromContent(content);
   if (optionContent) {
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 22c543c7b157..20c6c00bf359 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -92,7 +92,6 @@
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMNSUIEvent.h"
-#include "nsIEventStateManager.h"
 
 #include "nsIDOMFocusListener.h" //onchange events
 #include "nsIDOMCharacterData.h" //for selection setting helper func
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index ffba73cceeb6..caeca99bf370 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -48,7 +48,7 @@
 #include "nsGUIEvent.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIPresShell.h"
 #include "nsIScrollPositionListener.h"
 #include "nsDisplayList.h"
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 4564a68f928e..cbed44bacec3 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -66,7 +66,6 @@
 #include "nsLayoutErrors.h"
 #include "nsDisplayList.h"
 #include "nsContentErrors.h"
-#include "nsIEventStateManager.h"
 #include "nsListControlFrame.h"
 #include "nsIBaseWindow.h"
 #include "nsThemeConstants.h"
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 6c35419a67b4..3125f9dd0c85 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -80,7 +80,7 @@
 #include "nsIDOMHTMLHRElement.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIEditorDocShell.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
 #include "nsFrameSelection.h"
@@ -2076,9 +2076,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
   //We often get out of sync state issues with mousedown events that
   //get interrupted by alerts/dialogs.
   //Check with the ESM to see if we should process this one
-  PRBool eventOK;
-  aPresContext->EventStateManager()->EventStatusOK(aEvent, &eventOK);
-  if (!eventOK) 
+  if (!aPresContext->EventStateManager()->EventStatusOK(aEvent)) 
     return NS_OK;
 
   nsresult rv;
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 55fed2703b39..0eebef01f47d 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -88,7 +88,6 @@
 #include "imgIContainer.h"
 #include "imgILoader.h"
 
-#include "nsContentPolicyUtils.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsIPrefBranch2.h"
 #include "nsIPrefService.h"
@@ -96,7 +95,7 @@
 
 #include "nsIContentPolicy.h"
 #include "nsContentPolicyUtils.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsLayoutErrors.h"
 #include "nsBidiUtils.h"
 #include "nsBidiPresUtils.h"
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 6a332d6590ce..25dfe94cf9eb 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -57,6 +57,7 @@
 #include "nsIMutableArray.h"
 #include "nsBindingManager.h"
 #include "nsComputedDOMStyle.h"
+#include "nsEventStateManager.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -236,7 +237,7 @@ inDOMUtils::SetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 {
   NS_ENSURE_ARG_POINTER(aElement);
   
-  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
@@ -254,7 +255,7 @@ inDOMUtils::GetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 
   NS_ENSURE_ARG_POINTER(aElement);
 
-  nsCOMPtr<nsIEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
+  nsRefPtr<nsEventStateManager> esm = inLayoutUtils::GetEventStateManagerFor(aElement);
   if (esm) {
     nsCOMPtr<nsIContent> content;
     content = do_QueryInterface(aElement);
diff --git a/layout/inspector/src/inDOMUtils.h b/layout/inspector/src/inDOMUtils.h
index 27d77949d924..f589da4a324b 100644
--- a/layout/inspector/src/inDOMUtils.h
+++ b/layout/inspector/src/inDOMUtils.h
@@ -40,11 +40,11 @@
 
 #include "inIDOMUtils.h"
 
-#include "nsIEventStateManager.h"
 #include "nsISupportsArray.h"
 
 class nsRuleNode;
 class nsStyleContext;
+class nsIContent;
 
 class inDOMUtils : public inIDOMUtils
 {
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 9c31fad73fed..111b2bf4febd 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -90,7 +90,7 @@ inLayoutUtils::GetFrameFor(nsIDOMElement* aElement)
   return content->GetPrimaryFrame();
 }
 
-nsIEventStateManager*
+nsEventStateManager*
 inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement)
 {
   NS_PRECONDITION(aElement, "Passing in a null element is bad");
diff --git a/layout/inspector/src/inLayoutUtils.h b/layout/inspector/src/inLayoutUtils.h
index 1ff0a7bfa4d7..00d7b01f94f2 100644
--- a/layout/inspector/src/inLayoutUtils.h
+++ b/layout/inspector/src/inLayoutUtils.h
@@ -43,7 +43,7 @@ class nsIDOMDocument;
 class nsIDOMElement;
 class nsIDOMNode;
 class nsIDOMWindowInternal;
-class nsIEventStateManager;
+class nsEventStateManager;
 class nsIFrame;
 class nsIPresShell;
 class nsISupports;
@@ -55,7 +55,7 @@ public:
   static nsIDOMWindowInternal* GetWindowFor(nsIDOMDocument* aDoc);
   static nsIPresShell* GetPresShellFor(nsISupports* aThing);
   static nsIFrame* GetFrameFor(nsIDOMElement* aElement);
-  static nsIEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
+  static nsEventStateManager* GetEventStateManagerFor(nsIDOMElement *aElement);
   static nsBindingManager* GetBindingManagerFor(nsIDOMNode* aNode);
   static nsIDOMDocument* GetSubDocumentFor(nsIDOMNode* aNode);
   static nsIDOMNode* GetContainerFor(nsIDOMDocument* aDoc);
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 04703a80d5d4..6ca21fa986b0 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -47,7 +47,6 @@
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
 #include "nsFocusManager.h"
 #include "nsLiteralString.h"
 
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 452e5a8cb61f..d315bece1dba 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -62,7 +62,7 @@
 #include "mozilla/css/GroupRule.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsGkAtoms.h"
 #include "nsString.h"
 #include "nsUnicharUtils.h"
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index 316358052bc7..66fb3a42ee81 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -59,7 +59,7 @@
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsStyleConsts.h"
diff --git a/layout/style/nsIStyleRuleProcessor.h b/layout/style/nsIStyleRuleProcessor.h
index f64897b3c8d3..db292a1cb091 100644
--- a/layout/style/nsIStyleRuleProcessor.h
+++ b/layout/style/nsIStyleRuleProcessor.h
@@ -124,7 +124,7 @@ public:
    * test is used for optimization only, and may err on the side of
    * reporting more dependencies than really exist.
    *
-   * Event states are defined in nsIEventStateManager.h.
+   * Event states are defined in nsEventStates.h.
    */
   virtual nsRestyleHint
     HasStateDependentStyle(StateRuleProcessorData* aData) = 0;
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 0bd1c56e5ff2..06747f43caec 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -62,7 +62,7 @@
 #ifdef MOZ_CSS_ANIMATIONS
 #include "nsAnimationManager.h"
 #endif
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "mozilla/dom/Element.h"
 
 using namespace mozilla::dom;
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index fc5d46d26949..6faa8a97720c 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -85,12 +85,11 @@
 #include "nsWidgetsCID.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsITheme.h"
 #include "nsTransform2D.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsEventDispatcher.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
@@ -1930,17 +1929,15 @@ nsBoxFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
-
-  nsresult rv;
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    rv = esm->RegisterAccessKey(mContent, key);
+    esm->RegisterAccessKey(mContent, key);
   else
-    rv = esm->UnregisterAccessKey(mContent, key);
+    esm->UnregisterAccessKey(mContent, key);
 
-  return rv;
+  return NS_OK;
 }
 
 PRBool
diff --git a/layout/xul/base/src/nsButtonBoxFrame.cpp b/layout/xul/base/src/nsButtonBoxFrame.cpp
index 227e46890286..5ea91feb7784 100644
--- a/layout/xul/base/src/nsButtonBoxFrame.cpp
+++ b/layout/xul/base/src/nsButtonBoxFrame.cpp
@@ -48,7 +48,7 @@
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsGUIEvent.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIDOMElement.h"
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
@@ -92,7 +92,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
       if (NS_KEY_EVENT == aEvent->eventStructType) {
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
-          nsIEventStateManager *esm = aPresContext->EventStateManager();
+          nsEventStateManager *esm = aPresContext->EventStateManager();
           // :hover:active state
           esm->SetContentState(mContent, NS_EVENT_STATE_HOVER);
           esm->SetContentState(mContent, NS_EVENT_STATE_ACTIVE);
@@ -121,7 +121,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
         nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
         if (NS_VK_SPACE == keyEvent->keyCode) {
           // only activate on keyup if we're already in the :hover:active state
-          nsIEventStateManager *esm = aPresContext->EventStateManager();
+          nsEventStateManager *esm = aPresContext->EventStateManager();
           nsEventStates buttonState = esm->GetContentState(mContent);
           if (buttonState.HasAllStates(NS_EVENT_STATE_ACTIVE |
                                        NS_EVENT_STATE_HOVER)) {
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
index bb05bfed6d41..3c618df71458 100644
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsIDOMEvent.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
-#include "nsIEventStateManager.h"
 #include "nsIPresShell.h"
 #include "nsBoxFrame.h"
 #include "nsStackLayout.h"
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index 835ba2fdea37..d49db84cb70b 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -57,8 +57,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 
-#include "nsIEventStateManager.h"
-
 #include "nsContentUtils.h"
 
 /*
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index e003fea79f2c..dacb4367b322 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -73,7 +73,7 @@
 #include "nsLayoutUtils.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsIBoxLayout.h"
 #include "nsIPopupBoxObject.h"
 #include "nsPIWindowRoot.h"
@@ -833,7 +833,7 @@ nsMenuPopupFrame::HidePopup(PRBool aDeselectMenu, nsPopupState aNewState)
   // XXX, bug 137033, In Windows, if mouse is outside the window when the menupopup closes, no
   // mouse_enter/mouse_exit event will be fired to clear current hover state, we should clear it manually.
   // This code may not the best solution, but we can leave it here until we find the better approach.
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   nsEventStates state = esm->GetContentState(mContent);
 
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 4b62be4d3c52..806ea7b1b7fe 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -62,7 +62,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMXULLabelElement.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsITheme.h"
 #include "nsUnicharUtils.h"
 #include "nsContentUtils.h"
@@ -1151,17 +1151,15 @@ nsTextBoxFrame::RegUnregAccessKey(PRBool aDoReg)
     if (accessKey.IsEmpty())
         return NS_OK;
 
-    nsresult rv;
-
     // With a valid PresContext we can get the ESM 
     // and (un)register the access key
-    nsIEventStateManager *esm = PresContext()->EventStateManager();
+    nsEventStateManager *esm = PresContext()->EventStateManager();
 
     PRUint32 key = accessKey.First();
     if (aDoReg)
-        rv = esm->RegisterAccessKey(mContent, key);
+        esm->RegisterAccessKey(mContent, key);
     else
-        rv = esm->UnregisterAccessKey(mContent, key);
+        esm->UnregisterAccessKey(mContent, key);
 
-    return rv;
+    return NS_OK;
 }
diff --git a/layout/xul/base/src/nsXULLabelFrame.cpp b/layout/xul/base/src/nsXULLabelFrame.cpp
index 8c7b9e63c51b..548bed1c23cb 100644
--- a/layout/xul/base/src/nsXULLabelFrame.cpp
+++ b/layout/xul/base/src/nsXULLabelFrame.cpp
@@ -40,7 +40,7 @@
 #include "nsXULLabelFrame.h"
 #include "nsHTMLParts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 
 nsIFrame*
 NS_NewXULLabelFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -80,16 +80,15 @@ nsXULLabelFrame::RegUnregAccessKey(PRBool aDoReg)
 
   // With a valid PresContext we can get the ESM 
   // and register the access key
-  nsIEventStateManager *esm = PresContext()->EventStateManager();
-  nsresult rv;
+  nsEventStateManager *esm = PresContext()->EventStateManager();
 
   PRUint32 key = accessKey.First();
   if (aDoReg)
-    rv = esm->RegisterAccessKey(mContent, key);
+    esm->RegisterAccessKey(mContent, key);
   else
-    rv = esm->UnregisterAccessKey(mContent, key);
+    esm->UnregisterAccessKey(mContent, key);
 
-  return rv;
+  return NS_OK;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/tree/src/nsTreeContentView.cpp b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
index b80d994c712f..f069772b1092 100644
--- a/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -42,7 +42,7 @@
 #include "nsTreeContentView.h"
 #include "nsChildIterator.h"
 #include "nsIDOMClassInfo.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINodeInfo.h"
 #include "nsIXULSortService.h"
 #include "nsContentUtils.h"
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index cb964faee212..a7c32afc7164 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -51,7 +51,6 @@
 #include "mozilla/storage.h"
 #include "mozilla/dom/Link.h"
 #include "nsDocShellCID.h"
-#include "nsIEventStateManager.h"
 #include "mozilla/Services.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index d05e17fe7036..3f2204f42fc8 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -69,7 +69,6 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIEventStateManager.h"
 #include "nsIDocument.h"
 #include "nsISelection.h"
 #include "nsILink.h"
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index c4fd03d2ff58..cbb326e2383a 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -52,7 +52,7 @@
 #include "nsIDocument.h"
 #include "nsIFrame.h"
 #include "nsIAtom.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINameSpaceManager.h"
 #include "nsPresContext.h"
 #include "nsILookAndFeel.h"
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 456f401bc92b..2198d7f8907d 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -49,7 +49,6 @@
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
-#include "nsIEventStateManager.h"
 #include "nsIViewManager.h"
 #include "nsINameSpaceManager.h"
 #include "nsILookAndFeel.h"
diff --git a/widget/src/qt/nsNativeThemeQt.cpp b/widget/src/qt/nsNativeThemeQt.cpp
index 894232fcde87..618bc594524d 100644
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -61,7 +61,6 @@
 #include "nsThemeConstants.h"
 #include "nsILookAndFeel.h"
 #include "nsIServiceManager.h"
-#include "nsIEventStateManager.h"
 #include "nsIDOMHTMLInputElement.h"
 #include <malloc.h>
 
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 936a4f9d54d0..d86a481a8546 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -51,7 +51,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIFrame.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStates.h"
 #include "nsINameSpaceManager.h"
 #include "nsILookAndFeel.h"
 #include "nsIDOMHTMLInputElement.h"
diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp
index f3e413686922..bd6f97644045 100644
--- a/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -59,7 +59,6 @@
 #include "nsISelectionPrivate.h"
 #include "nsPresContext.h"
 #include "nsIDOMDataTransfer.h"
-#include "nsIEventStateManager.h"
 #include "nsICanvasElementExternal.h"
 #include "nsIImageLoadingContent.h"
 #include "imgIContainer.h"
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index d5a48421efd7..5e7a035e3166 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -43,7 +43,7 @@
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
-#include "nsIEventStateManager.h"
+#include "nsEventStateManager.h"
 #include "nsString.h"
 #include "nsINameSpaceManager.h"
 #include "nsIDOMHTMLInputElement.h"
@@ -91,7 +91,7 @@ nsNativeTheme::GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType)
   if (!shell)
     return nsEventStates();
 
-  nsIEventStateManager* esm = shell->GetPresContext()->EventStateManager();
+  nsEventStateManager* esm = shell->GetPresContext()->EventStateManager();
   nsEventStates flags = esm->GetContentState(aFrame->GetContent(), PR_TRUE);
   
   if (isXULCheckboxRadio && aWidgetType == NS_THEME_RADIO) {
diff --git a/widget/src/xpwidgets/nsNativeTheme.h b/widget/src/xpwidgets/nsNativeTheme.h
index 72abbce13651..63c49b0db991 100644
--- a/widget/src/xpwidgets/nsNativeTheme.h
+++ b/widget/src/xpwidgets/nsNativeTheme.h
@@ -76,7 +76,7 @@ class nsNativeTheme : public nsITimerCallback
 
   nsNativeTheme();
 
-  // Returns the content state (hover, focus, etc), see nsIEventStateManager.h
+  // Returns the content state (hover, focus, etc), see nsEventStateManager.h
   nsEventStates GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType);
 
   // Returns whether the widget is already styled by content

From d5b22b24ca750d752e0a29768387cee9d89c0058 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 21 Apr 2011 19:39:12 +0200
Subject: [PATCH 343/509] Bug 646854 - Let the user change the filter in the
 file picker when opening a file on MacOS X. r=joshmoz

---
 .../en-US/chrome/global/filepicker.properties |   2 +-
 widget/src/cocoa/nsFilePicker.h               |  10 +-
 widget/src/cocoa/nsFilePicker.mm              | 110 +++++++++++++++---
 3 files changed, 100 insertions(+), 22 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/global/filepicker.properties b/toolkit/locales/en-US/chrome/global/filepicker.properties
index 32019d9d65e9..e5dc29fb1893 100644
--- a/toolkit/locales/en-US/chrome/global/filepicker.properties
+++ b/toolkit/locales/en-US/chrome/global/filepicker.properties
@@ -19,7 +19,7 @@ openButtonLabel=Open
 saveButtonLabel=Save
 selectFolderButtonLabel=Select
 noButtonLabel=No
-saveAsLabel=Save As:
+formatLabel=Format:
 
 errorOpenFileDoesntExistTitle=Error opening %S
 errorOpenFileDoesntExistMessage=File %S doesn't exist
diff --git a/widget/src/cocoa/nsFilePicker.h b/widget/src/cocoa/nsFilePicker.h
index 08732802ebb6..5af9f5b665ba 100644
--- a/widget/src/cocoa/nsFilePicker.h
+++ b/widget/src/cocoa/nsFilePicker.h
@@ -74,6 +74,13 @@ public:
   NS_IMETHOD Show(PRInt16 *_retval); 
   NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
 
+  /**
+   * Returns the current filter list in the format used by Cocoa's NSSavePanel
+   * and NSOpenPanel.
+   * Returns nil if no filter currently apply.
+   */
+  NSArray* GetFilterList();
+
 protected:
 
   virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle, PRInt16 aMode);
@@ -82,11 +89,10 @@ protected:
   // aFile is an existing but unspecified file. These functions must specify it.
   //
   // will return |returnCancel| or |returnOK| as result.
-  PRInt16 GetLocalFiles(const nsString& inTitle, const nsString& inDefaultName, PRBool inAllowMultiple, nsCOMArray<nsILocalFile>& outFiles);
+  PRInt16 GetLocalFiles(const nsString& inTitle, PRBool inAllowMultiple, nsCOMArray<nsILocalFile>& outFiles);
   PRInt16 GetLocalFolder(const nsString& inTitle, nsILocalFile** outFile);
   PRInt16 PutLocalFile(const nsString& inTitle, const nsString& inDefaultName, nsILocalFile** outFile);
 
-  NSArray  *GenerateFilterList();
   void     SetDialogTitle(const nsString& inTitle, id aDialog);
   NSString *PanelDefaultDirectory();
   NSView* GetAccessoryView();
diff --git a/widget/src/cocoa/nsFilePicker.mm b/widget/src/cocoa/nsFilePicker.mm
index fa2a615f4dac..d68f340023ab 100644
--- a/widget/src/cocoa/nsFilePicker.mm
+++ b/widget/src/cocoa/nsFilePicker.mm
@@ -56,6 +56,7 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsCocoaUtils.h"
+#include "nsToolkit.h"
 
 const float kAccessoryViewPadding = 5;
 const int   kSaveTypeControlTag = 1;
@@ -64,6 +65,21 @@ const char  kLastTypeIndexPref[] = "filepicker.lastTypeIndex";
 static PRBool gCallSecretHiddenFileAPI = PR_FALSE;
 const char kShowHiddenFilesPref[] = "filepicker.showHiddenFiles";
 
+/**
+ * This class is an observer of NSPopUpButton selection change.
+ */
+@interface NSPopUpButtonObserver : NSObject
+{
+  NSPopUpButton* mPopUpButton;
+  NSOpenPanel*   mOpenPanel;
+  nsFilePicker*  mFilePicker;
+}
+- (void) setPopUpButton:(NSPopUpButton*)aPopUpButton;
+- (void) setOpenPanel:(NSOpenPanel*)aOpenPanel;
+- (void) setFilePicker:(nsFilePicker*)aFilePicker;
+- (void) menuChangedItem:(NSNotification*)aSender;
+@end
+
 NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
 
 // We never want to call the secret show hidden files API unless the pref
@@ -145,16 +161,20 @@ NSView* nsFilePicker::GetAccessoryView()
 
   NSView* accessoryView = [[[NSView alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)] autorelease];
 
-  // get the localized string for "Save As:"
-  NSString* saveAsLabel = @"Save As:"; // backup in case we can't get a localized string
+  // Set a label's default value.
+  NSString* label = @"Format:";
+
+  // Try to get the localized string.
   nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
   nsCOMPtr<nsIStringBundle> bundle;
   nsresult rv = sbs->CreateBundle("chrome://global/locale/filepicker.properties", getter_AddRefs(bundle));
   if (NS_SUCCEEDED(rv)) {
-    nsXPIDLString label;
-    bundle->GetStringFromName(NS_LITERAL_STRING("saveAsLabel").get(), getter_Copies(label));
-    if (label)
-      saveAsLabel = [NSString stringWithCharacters:label.get() length:label.Length()];
+    nsXPIDLString locaLabel;
+    bundle->GetStringFromName(NS_LITERAL_STRING("formatLabel").get(),
+			      getter_Copies(locaLabel));
+    if (locaLabel) {
+      label = [NSString stringWithCharacters:locaLabel.get() length:locaLabel.Length()];
+    }
   }
 
   // set up label text field
@@ -165,7 +185,7 @@ NSView* nsFilePicker::GetAccessoryView()
   [textField setBezeled:NO];
   [textField setBordered:NO];
   [textField setFont:[NSFont labelFontOfSize:13.0]];
-  [textField setStringValue:saveAsLabel];
+  [textField setStringValue:label];
   [textField setTag:0];
   [textField sizeToFit];
 
@@ -243,11 +263,11 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
   switch (mMode)
   {
     case modeOpen:
-      userClicksOK = GetLocalFiles(mTitle, mDefault, PR_FALSE, mFiles);
+      userClicksOK = GetLocalFiles(mTitle, PR_FALSE, mFiles);
       break;
     
     case modeOpenMultiple:
-      userClicksOK = GetLocalFiles(mTitle, mDefault, PR_TRUE, mFiles);
+      userClicksOK = GetLocalFiles(mTitle, PR_TRUE, mFiles);
       break;
       
     case modeSave:
@@ -270,9 +290,41 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
   return NS_OK;
 }
 
+@implementation NSPopUpButtonObserver
+- (void) setPopUpButton:(NSPopUpButton*)aPopUpButton
+{
+  mPopUpButton = aPopUpButton;
+}
+
+- (void) setOpenPanel:(NSOpenPanel*)aOpenPanel
+{
+  mOpenPanel = aOpenPanel;
+}
+
+- (void) setFilePicker:(nsFilePicker*)aFilePicker
+{
+  mFilePicker = aFilePicker;
+}
+
+- (void) menuChangedItem:(NSNotification *)aSender
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
+  PRInt32 selectedItem = [mPopUpButton indexOfSelectedItem];
+  if (selectedItem < 0) {
+    return;
+  }
+
+  mFilePicker->SetFilterIndex(selectedItem);
+  NSArray* filters = mFilePicker->GetFilterList();
+  [mOpenPanel setAllowedFileTypes:filters];
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN();
+}
+@end
+
 // Use OpenPanel to do a GetFile. Returns |returnOK| if the user presses OK in the dialog. 
 PRInt16
-nsFilePicker::GetLocalFiles(const nsString& inTitle, const nsString& inDefaultName, PRBool inAllowMultiple, nsCOMArray<nsILocalFile>& outFiles)
+nsFilePicker::GetLocalFiles(const nsString& inTitle, PRBool inAllowMultiple, nsCOMArray<nsILocalFile>& outFiles)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
@@ -283,7 +335,7 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, const nsString& inDefaultNa
 
   // Get filters
   // filters may be null, if we should allow all file types.
-  NSArray *filters = GenerateFilterList();
+  NSArray *filters = GetFilterList();
 
   // Set the options for how the get file dialog will appear
   SetDialogTitle(inTitle, thePanel);
@@ -297,9 +349,6 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, const nsString& inDefaultNa
   if (!filters)
     [thePanel setTreatsFilePackagesAsDirectories:NO];       
 
-  // set up default file name
-  NSString* defaultFilename = [NSString stringWithCharacters:(const unichar*)inDefaultName.get() length:inDefaultName.Length()];
-
   // set up default directory
   NSString *theDir = PanelDefaultDirectory();
   
@@ -310,9 +359,34 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, const nsString& inDefaultNa
     theDir = @"/Applications/";
   }
 
+  // On 10.6+, we let users change the filters. Unfortunately, some methods
+  // are not available on 10.5 and without using them it happens to be buggy.
+  int result;
   nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int result = [thePanel runModalForDirectory:theDir file:defaultFilename
-                types:filters];
+  if (nsToolkit::OnSnowLeopardOrLater()) {
+    NSPopUpButtonObserver* observer = [[NSPopUpButtonObserver alloc] init];
+
+    NSView* accessoryView = GetAccessoryView();
+    [thePanel setAccessoryView:accessoryView];
+
+    [observer setPopUpButton:[accessoryView viewWithTag:kSaveTypeControlTag]];
+    [observer setOpenPanel:thePanel];
+    [observer setFilePicker:this];
+
+    [[NSNotificationCenter defaultCenter]
+      addObserver:observer
+      selector:@selector(menuChangedItem:)
+      name:NSMenuWillSendActionNotification object:nil];
+
+    [thePanel setDirectoryURL:[[NSURL alloc] initWithString:theDir]];
+    [thePanel setAllowedFileTypes:filters];
+    result = [thePanel runModal];
+
+    [[NSNotificationCenter defaultCenter] removeObserver:observer];
+    [observer release];
+  } else {
+    result = [thePanel runModalForDirectory:theDir file:nil types:filters];
+  }
   nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
   
   if (result == NSFileHandlingPanelCancelButton)
@@ -452,10 +526,8 @@ nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultNam
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
 }
 
-// Returns the current filter list in a format accepted by NSOpenPanel.
-// Returns nil if no filter currently apply.
 NSArray *
-nsFilePicker::GenerateFilterList()
+nsFilePicker::GetFilterList()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 

From abdbb5027af60c3578173949b288fe3e8dd57201 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 21 Apr 2011 19:54:24 +0200
Subject: [PATCH 344/509] Bug 649307 - focused tab is opened after naming a
 group and pressing enter [f=raymond, r=ian]

---
 browser/base/content/tabview/groupitems.js    |  8 ++--
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug649307.js | 43 +++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug649307.js

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 207675d86a5a..577d45e3979e 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -166,8 +166,10 @@ function GroupItem(listOfEls, options) {
   this.$titleShield = iQ('.title-shield', this.$titlebar);
   this.setTitle(options.title);
 
-  var handleKeyDown = function(e) {
-    if (e.which == 13 || e.which == 27) { // return & escape
+  var handleKeyPress = function (e) {
+    if (e.keyCode == KeyEvent.DOM_VK_ESCAPE ||
+        e.keyCode == KeyEvent.DOM_VK_RETURN ||
+        e.keyCode == KeyEvent.DOM_VK_ENTER) {
       (self.$title)[0].blur();
       self.$title
         .addClass("transparentBorder")
@@ -204,7 +206,7 @@ function GroupItem(listOfEls, options) {
     .mousedown(function(e) {
       e.stopPropagation();
     })
-    .keydown(handleKeyDown)
+    .keypress(handleKeyPress)
     .keyup(handleKeyUp);
 
   this.$titleShield
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 8b447d14f761..dea5fcd7f543 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -131,6 +131,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug644097.js \
                  browser_tabview_bug645653.js \
                  browser_tabview_bug649006.js \
+                 browser_tabview_bug649307.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
                  browser_tabview_expander.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649307.js b/browser/base/content/test/tabview/browser_tabview_bug649307.js
new file mode 100644
index 000000000000..141849615d45
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug649307.js
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  newWindowWithTabView(function (win) {
+    let cw = win.TabView.getContentWindow();
+
+    registerCleanupFunction(function () {
+      cw.gPrefBranch.clearUserPref("animate_zoom");
+      win.close();
+    });
+
+    cw.gPrefBranch.setBoolPref("animate_zoom", false);
+
+    let groupItem = cw.GroupItems.groupItems[0];
+    let shield = groupItem.$titleShield[0];
+    let keys = ["RETURN", "ENTER", "ESCAPE"];
+
+    ok(win.TabView.isVisible(), "tabview is visible");
+
+    let simulateKeyPress = function () {
+      let key = keys.shift();
+
+      if (!key) {
+        ok(win.TabView.isVisible(), "tabview is still visible");
+        finish();
+        return;
+      }
+
+      EventUtils.synthesizeMouseAtCenter(shield, {}, cw);
+      EventUtils.synthesizeKey("VK_" + key, {}, cw);
+
+      executeSoon(function () {
+        ok(win.TabView.isVisible(), "tabview is still visible [" + key + "]");
+        simulateKeyPress();
+      });
+    }
+
+    SimpleTest.waitForFocus(simulateKeyPress, cw);
+  });
+}

From 0f133018de4f2afcfd6fedd3342d78976c248241 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 22 Apr 2011 01:14:59 +0200
Subject: [PATCH 345/509] Bug 651622 - Remove WinCE code from browser/*
 r=dolske

---
 browser/app/Makefile.in                       |  21 +--
 browser/app/profile/firefox.js                |  53 ------
 browser/base/Makefile.in                      |   2 -
 browser/base/content/browser-menubar.inc      |   2 -
 browser/base/content/browser.js               |   2 -
 browser/base/content/browser.xul              |   9 -
 browser/components/Makefile.in                |   7 +-
 browser/components/build/Makefile.in          |   5 +-
 browser/components/build/nsModule.cpp         |  14 --
 browser/components/nsBrowserGlue.js           |  16 --
 .../shell/content/setDesktopBackground.xul    |   2 -
 browser/components/shell/public/Makefile.in   |   2 +-
 browser/components/shell/src/Makefile.in      |   2 +-
 .../shell/src/nsWindowsShellService.cpp       | 176 ------------------
 .../shell/src/nsWindowsShellService.h         |  12 --
 browser/installer/package-manifest.in         |  27 +--
 16 files changed, 8 insertions(+), 344 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 31e8a7751f02..d9d1515d8a00 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -84,7 +84,7 @@ include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
@@ -161,16 +161,8 @@ include $(topsrcdir)/config/config.mk
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
-
-ifdef WINCE
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,corelibc)
-endif
 
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-config.mk
@@ -189,7 +181,7 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 v
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_PHOENIX -I$(srcdir)
@@ -248,7 +240,7 @@ endif
 endif
 endif
 
-ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 
 $(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
@@ -290,13 +282,6 @@ libs::
 endif
 endif
 
-ifdef WINCE
-ifdef MOZ_FASTSTART
-libs::
-	cp -f $(DIST)/bin/faststartstub.exe $(DIST)/bin/$(MOZ_APP_NAME)faststart.exe
-endif
-endif
-
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 7cdde5cc8f31..69317ff38765 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -308,12 +308,7 @@ pref("browser.download.saveLinkAsFilenameTimeout", 1000);
 
 pref("browser.download.useDownloadDir", true);
 
-#ifdef WINCE
-pref("browser.download.folderList", 2);
-pref("browser.download.dir", "\\Storage Card");
-#else
 pref("browser.download.folderList", 1);
-#endif
 pref("browser.download.manager.showAlertOnComplete", true);
 pref("browser.download.manager.showAlertInterval", 2000);
 pref("browser.download.manager.retention", 2);
@@ -371,11 +366,7 @@ pref("browser.link.open_newwindow", 3);
 pref("browser.link.open_newwindow.restriction", 2);
 
 // Tabbed browser
-#ifndef WINCE
 pref("browser.tabs.autoHide", false);
-#else
-pref("browser.tabs.autoHide", true);
-#endif
 pref("browser.tabs.closeWindowWithLastTab", true);
 pref("browser.tabs.insertRelatedAfterCurrent", true);
 pref("browser.tabs.warnOnClose", true);
@@ -425,11 +416,6 @@ pref("javascript.options.showInConsole",          true);
 pref("general.warnOnAboutConfig",                 false);
 #endif
 
-#ifdef WINCE
-// Set the threshold higher to avoid some slow script warnings
-pref("dom.max_script_run_time",                   20);
-#endif
-
 // This is the pref to control the location bar, change this to true to 
 // force this - this makes the origin of popup windows more obvious to avoid
 // spoofing. We would rather not do it by default because it affects UE for web
@@ -775,11 +761,7 @@ pref("browser.rights.3.shown", false);
 pref("browser.rights.override", true);
 #endif
 
-#ifdef WINCE
-pref("browser.sessionstore.resume_from_crash", false);
-#else
 pref("browser.sessionstore.resume_from_crash", true);
-#endif
 pref("browser.sessionstore.resume_session_once", false);
 
 // minimal interval between two save operations in milliseconds
@@ -899,39 +881,6 @@ pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
 pref("geo.wifi.uri", "https://www.google.com/loc/json");
 pref("geo.wifi.protocol", 0);
 
-#ifdef WINCE
-
-// tweak awesomebar -- increase the delay until a search happens.
-pref("browser.urlbar.delay", 250);
-
-// disable safe browsing, due to perf hit
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// don't check for default browser
-pref("browser.shell.checkDefaultBrowser", false);
-
-// disable bfcache for memory
-pref("browser.sessionhistory.max_total_viewers", 0);
-
-pref("browser.sessionhistory.optimize_eviction", false);
-
-// tweak default content sink prefs
-pref("content.sink.interactive_deflect_count", 10); /* default 0 */
-pref("content.sink.perf_deflect_count", 50); /* default 200 */
-pref("content.sink.interactive_parse_time", 5000); /* default 3000 */
-pref("content.sink.perf_parse_time", 150000); /* default 360000 */
-pref("content.sink.pending_event_mode", 0); /* default 1 */
-pref("content.sink.event_probe_rate", 1); /* default 1 */
-pref("content.sink.interactive_time", 750000); /* default 750000 */
-pref("content.sink.initial_perf_time", 500000); /* default 2000000 */
-pref("content.sink.enable_perf_mode", 0); /* default 0; 0 == switch, 1 == stay interactive, 2 == stay perf */
-
-// Write sessionstore.js less often
-pref("browser.sessionstore.interval", 60000);
-
-#endif /* WINCE */
-
 // Whether to use a panel that looks like an OS X sheet for customization
 #ifdef XP_MACOSX
 pref("toolbar.customization.usesheet", true);
@@ -953,7 +902,6 @@ pref("dom.ipc.plugins.enabled", true);
 #endif
 
 #ifdef XP_WIN
-#ifndef WINCE
 pref("browser.taskbar.previews.enable", false);
 pref("browser.taskbar.previews.max", 20);
 pref("browser.taskbar.previews.cachetime", 5);
@@ -964,7 +912,6 @@ pref("browser.taskbar.lists.maxListItemCount", 7);
 pref("browser.taskbar.lists.tasks.enabled", true);
 pref("browser.taskbar.lists.refreshInSeconds", 120);
 #endif
-#endif
 
 #ifdef MOZ_SERVICES_SYNC
 // The sync engines to use.
diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 0031e91c7588..3a894429b065 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -75,10 +75,8 @@ DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
 
 ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
-ifneq ($(OS_ARCH),WINCE)
 DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
 endif
-endif
 
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 2f1c4674e029..33e66ef0fa59 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -91,7 +91,6 @@
                           accesskey="&sendPageCmd.accesskey;"
                           command="Browser:SendLink"/>
                 <menuseparator/>
-#ifndef WINCE
                 <menuitem id="menu_printSetup"
                           label="&printSetupCmd.label;"
                           accesskey="&printSetupCmd.accesskey;"
@@ -114,7 +113,6 @@
                           oncommand="BrowserImport();"/>
 #ifndef XP_MACOSX
                 <menuseparator/>
-#endif
 #endif
                 <menuitem id="goOfflineMenuitem"
                           label="&goOfflineCmd.label;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7d1cd26fcd6f..e1d2b2be0901 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,7 +188,6 @@ let gInitialPages = [
 
 XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
 #ifdef XP_WIN
-#ifndef WINCE
   const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
   if (WINTASKBAR_CONTRACTID in Cc &&
       Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available) {
@@ -204,7 +203,6 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
       }
     };
   }
-#endif
 #endif
   return null;
 });
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 36fc5aded7d5..b88cfc516b96 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -467,11 +467,7 @@
 
   <toolbox id="navigator-toolbox"
            defaultmode="icons" mode="icons"
-#ifdef WINCE
-           defaulticonsize="small" iconsize="small"
-#else
            iconsize="large"
-#endif
            tabsontop="true"
            persist="tabsontop">
     <!-- Menu -->
@@ -499,13 +495,8 @@
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
              fullscreentoolbar="true" mode="icons" customizable="true"
-#ifdef WINCE
-             iconsize="small" defaulticonsize="small"
-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
-#else
              iconsize="large"
              defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
-#endif
              context="toolbar-context-menu">
 
       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index df60cee116dc..f1b9d587fb59 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -70,17 +70,12 @@ PARALLEL_DIRS = \
   sessionstore \
   shell \
   sidebar \
+  migration \
   $(NULL)
 
-ifndef WINCE
-PARALLEL_DIRS += migration
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
-ifndef WINCE
 PARALLEL_DIRS += wintaskbar
 endif
-endif
 
 ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 3947a1fe8c5f..491465971af4 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -54,13 +54,10 @@ endif
 
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib)
 
-# migration requires mozreg, which doesn't build on WINCE; only include
-# it on non-CE
-ifndef WINCE
+# migration requires mozreg
 LOCAL_INCLUDES += -I$(srcdir)/../migration/src
 SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
-endif
 
 # This has to come after the above chunk, because mozreg_s has dependencies on
 # stuff in MOZ_COMPONENT_LIBS.
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index eb7b7b847ab3..f3a577c9f3c6 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -49,8 +49,6 @@
 #include "nsGNOMEShellService.h"
 #endif
 
-#ifndef WINCE
-
 #include "nsProfileMigrator.h"
 #include "nsDogbertProfileMigrator.h"
 #if !defined(XP_OS2)
@@ -68,8 +66,6 @@
 #include "nsICabProfileMigrator.h"
 #endif
 
-#endif // WINCE
-
 #include "rdf.h"
 #include "nsFeedSniffer.h"
 #include "AboutRedirector.h"
@@ -91,8 +87,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
 #endif
 
-#ifndef WINCE
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
 #if !defined(XP_OS2)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
@@ -110,8 +104,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCaminoProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsICabProfileMigrator)
 #endif
 
-#endif
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrivateBrowsingServiceWrapper, Init)
@@ -124,7 +116,6 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 #endif
 NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID);
 NS_DEFINE_NAMED_CID(NS_BROWSER_ABOUT_REDIRECTOR_CID);
-#ifndef WINCE
 NS_DEFINE_NAMED_CID(NS_FIREFOX_PROFILEMIGRATOR_CID);
 #if defined(XP_WIN) && !defined(__MINGW32__)
 NS_DEFINE_NAMED_CID(NS_WINIEPROFILEMIGRATOR_CID);
@@ -142,7 +133,6 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DOGBERTPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_PHOENIXPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID);
-#endif /* WINCE */
 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
@@ -154,7 +144,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 #endif
     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
-#ifndef WINCE
     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
 #if defined(XP_WIN) && !defined(__MINGW32__)
     { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
@@ -172,7 +161,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_DOGBERTPROFILEMIGRATOR_CID, false, NULL, nsDogbertProfileMigratorConstructor },
     { &kNS_PHOENIXPROFILEMIGRATOR_CID, false, NULL, nsPhoenixProfileMigratorConstructor },
     { &kNS_SEAMONKEYPROFILEMIGRATOR_CID, false, NULL, nsSeamonkeyProfileMigratorConstructor },
-#endif /* WINCE */
     { &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID, false, NULL, nsPrivateBrowsingServiceWrapperConstructor },
     { NULL }
 };
@@ -198,7 +186,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sync-tabs", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
 #endif
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "home", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
-#ifndef WINCE
     { NS_PROFILEMIGRATOR_CONTRACTID, &kNS_FIREFOX_PROFILEMIGRATOR_CID },
 #if defined(XP_WIN) && !defined(__MINGW32__)
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "ie", &kNS_WINIEPROFILEMIGRATOR_CID },
@@ -216,7 +203,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert", &kNS_DOGBERTPROFILEMIGRATOR_CID },
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "phoenix", &kNS_PHOENIXPROFILEMIGRATOR_CID },
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey", &kNS_SEAMONKEYPROFILEMIGRATOR_CID },
-#endif /* WINCE */
     { NS_PRIVATE_BROWSING_SERVICE_CONTRACTID, &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID },
     { NULL }
 };
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 48e66388a53d..a5202e126831 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -370,7 +370,6 @@ BrowserGlue.prototype = {
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded() {
 #ifdef XP_WIN
-#ifndef WINCE
     // For windows seven, initialize the jump list module.
     const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
     if (WINTASKBAR_CONTRACTID in Cc &&
@@ -379,26 +378,11 @@ BrowserGlue.prototype = {
       Cu.import("resource://gre/modules/WindowsJumpLists.jsm", temp);
       temp.WinTaskbarJumpList.startup();
     }
-#endif
 #endif
   },
 
   // profile shutdown handler (contains profile cleanup routines)
   _onProfileShutdown: function BG__onProfileShutdown() {
-#ifdef MOZ_UPDATER
-#ifdef WINCE
-    // If there's a pending update, clear cache to free up disk space.
-    try {
-      let um = Cc["@mozilla.org/updates/update-manager;1"].
-               getService(Ci.nsIUpdateManager);
-      if (um.activeUpdate && um.activeUpdate.state == "pending") {
-        let cacheService = Cc["@mozilla.org/network/cache-service;1"].
-                           getService(Ci.nsICacheService);
-        cacheService.evictEntries(Ci.nsICache.STORE_ANYWHERE);
-      }
-    } catch (e) { }
-#endif
-#endif
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
   },
diff --git a/browser/components/shell/content/setDesktopBackground.xul b/browser/components/shell/content/setDesktopBackground.xul
index fe74424f5297..cc96733bc19d 100644
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -77,9 +77,7 @@
         <menupopup>
           <menuitem label="&center.label;"  value="CENTER"/>
           <menuitem label="&tile.label;"    value="TILE"/>
-#ifndef WINCE
           <menuitem label="&stretch.label;" value="STRETCH"/>
-#endif
         </menupopup>
       </menulist>
       <spacer flex="1"/>
diff --git a/browser/components/shell/public/Makefile.in b/browser/components/shell/public/Makefile.in
index e7023c0f6bd9..a835fea5f9bf 100644
--- a/browser/components/shell/public/Makefile.in
+++ b/browser/components/shell/public/Makefile.in
@@ -47,7 +47,7 @@ XPIDL_MODULE  = shellservice
 
 XPIDLSRCS = nsIShellService.idl
 
-ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 XPIDLSRCS += nsIWindowsShellService.idl
 endif
 
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index a7a2efb67b9f..c9004a3dc3c2 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -50,7 +50,7 @@ USE_STATIC_LIBS = 1
 endif
 
 
-ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsWindowsShellService.cpp
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp
index dd890c3db141..3a3ba68ab2c1 100644
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -91,11 +91,7 @@
 
 #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
 
-#ifndef WINCE
 NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
-#else
-NS_IMPL_ISUPPORTS1(nsWindowsShellService, nsIShellService)
-#endif
 
 static nsresult
 OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
@@ -115,33 +111,6 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
   return NS_OK;
 }
 
-#ifdef WINCE
-static nsresult
-OpenKeyForWriting(HKEY aStartKey, const nsAString& aKeyName, HKEY* aKey)
-{
-  const nsString &flatName = PromiseFlatString(aKeyName);
-
-  DWORD dwDisp = 0;
-  DWORD res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                                0, KEY_READ | KEY_WRITE, NULL, aKey,
-                                &dwDisp);
-  switch (res) {
-  case ERROR_SUCCESS:
-    break;
-  case ERROR_ACCESS_DENIED:
-    return NS_ERROR_FILE_ACCESS_DENIED;
-  case ERROR_FILE_NOT_FOUND:
-    res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                            0, KEY_READ | KEY_WRITE, NULL, aKey,
-                            NULL);
-    if (res != ERROR_SUCCESS)
-      return NS_ERROR_FILE_ACCESS_DENIED;
-  }
-
-  return NS_OK;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // Default Browser Registry Settings
 //
@@ -217,23 +186,15 @@ typedef struct {
   char* valueData;
 } SETTING;
 
-#ifndef WINCE
 #define APP_REG_NAME L"Firefox"
 #define CLS_HTML "FirefoxHTML"
 #define CLS_URL "FirefoxURL"
 #define CPL_DESKTOP L"Control Panel\\Desktop"
 #define VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 #define VAL_FILE_ICON "%APPPATH%,1"
-#else
-#define CPL_DESKTOP L"ControlPanel\\Desktop"
-#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
-#define VAL_FILE_ICON "%APPPATH%,-2"
-#endif
-
 #define DI "\\DefaultIcon"
 #define SOP "\\shell\\open\\command"
 
-
 #define MAKE_KEY_NAME1(PREFIX, MID) \
   PREFIX MID
 
@@ -243,28 +204,11 @@ typedef struct {
 // Handlers. see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for
 // more info.
 static SETTING gSettings[] = {
-#ifndef WINCE
   // File Handler Class
   { MAKE_KEY_NAME1(CLS_HTML, SOP), "", VAL_OPEN },
 
   // Protocol Handler Class - for Vista and above
   { MAKE_KEY_NAME1(CLS_URL, SOP), "", VAL_OPEN },
-#else
-  { MAKE_KEY_NAME1("FTP", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("FTP", SOP), "", VAL_OPEN },
-
-  // File handlers for Windows CE
-  { MAKE_KEY_NAME1("bmpfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("bmpfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("giffile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("giffile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("jpegfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("jpegfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("pngfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("pngfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("htmlfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("htmlfile", SOP), "", VAL_OPEN },
-#endif
 
   // Protocol Handlers
   { MAKE_KEY_NAME1("HTTP", DI),    "", VAL_FILE_ICON },
@@ -273,7 +217,6 @@ static SETTING gSettings[] = {
   { MAKE_KEY_NAME1("HTTPS", SOP),  "", VAL_OPEN }
 };
 
-#if !defined(WINCE)
 nsresult
 GetHelperPath(nsAutoString& aPath)
 {
@@ -313,12 +256,10 @@ LaunchHelper(nsAutoString& aPath)
   CloseHandle(pi.hThread);
   return NS_OK;
 }
-#endif // !defined(WINCE)
 
 NS_IMETHODIMP
 nsWindowsShellService::ShortcutMaintenance()
 {
-#if !defined(WINCE)
   nsresult rv;
 
   // Launch helper.exe so it can update the application user model ids on
@@ -388,13 +329,8 @@ nsWindowsShellService::ShortcutMaintenance()
   appHelperPath.AppendLiteral(" /UpdateShortcutAppUserModelIds");
 
   return LaunchHelper(appHelperPath);
-#else
-  NS_NOTREACHED("ShortcutMaintenance not implemented on wince!");
-  return NS_OK;
-#endif // !defined(WINCE)
 }
 
-#ifndef WINCE
 PRBool
 nsWindowsShellService::IsDefaultBrowserVista(PRBool* aIsDefaultBrowser)
 {
@@ -418,7 +354,6 @@ nsWindowsShellService::IsDefaultBrowserVista(PRBool* aIsDefaultBrowser)
 #endif  
   return PR_FALSE;
 }
-#endif
 
 NS_IMETHODIMP
 nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
@@ -439,12 +374,10 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
   if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
     return NS_ERROR_FAILURE;
 
-#ifndef WINCE
   // Convert the path to a long path since GetModuleFileNameW returns the path
   // that was used to launch Firefox which is not necessarily a long path.
   if (!::GetLongPathNameW(exePath, exePath, MAX_BUF))
     return NS_ERROR_FAILURE;
-#endif
 
   nsAutoString appLongPath(exePath);
 
@@ -478,12 +411,10 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
     }
   }
 
-#ifndef WINCE
   // Only check if Firefox is the default browser on Vista if the previous
   // checks show that Firefox is the default browser.
   if (*aIsDefaultBrowser)
     IsDefaultBrowserVista(aIsDefaultBrowser);
-#endif
 
   return NS_OK;
 }
@@ -491,7 +422,6 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
 NS_IMETHODIMP
 nsWindowsShellService::SetDefaultBrowser(PRBool aClaimAllTypes, PRBool aForAllUsers)
 {
-#ifndef WINCE
   nsAutoString appHelperPath;
   if (NS_FAILED(GetHelperPath(appHelperPath)))
     return NS_ERROR_FAILURE;
@@ -503,91 +433,8 @@ nsWindowsShellService::SetDefaultBrowser(PRBool aClaimAllTypes, PRBool aForAllUs
   }
 
   return LaunchHelper(appHelperPath);
-#else
-  SETTING* settings;
-  SETTING* end = gSettings + sizeof(gSettings)/sizeof(SETTING);
-
-  PRUnichar exePath[MAX_BUF];
-  if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  nsAutoString appLongPath(exePath);
-
-  // The .png registry key isn't present by default so also add Content Type.
-  SetRegKey(NS_LITERAL_STRING(".png"), EmptyString(),
-            NS_LITERAL_STRING("pngfile"));
-  SetRegKey(NS_LITERAL_STRING(".png"), NS_LITERAL_STRING("Content Type"),
-            NS_LITERAL_STRING("image/png"));
-
-  // Set these keys to their default value for a clean install in case another
-  // app has changed these keys.
-  SetRegKey(NS_LITERAL_STRING(".htm"), EmptyString(),
-            NS_LITERAL_STRING("htmlfile"));
-  SetRegKey(NS_LITERAL_STRING(".html"), EmptyString(),
-            NS_LITERAL_STRING("htmlfile"));
-  SetRegKey(NS_LITERAL_STRING(".bmp"), EmptyString(),
-            NS_LITERAL_STRING("bmpfile"));
-  SetRegKey(NS_LITERAL_STRING(".gif"), EmptyString(),
-            NS_LITERAL_STRING("giffile"));
-  SetRegKey(NS_LITERAL_STRING(".jpe"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-  SetRegKey(NS_LITERAL_STRING(".jpg"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-  SetRegKey(NS_LITERAL_STRING(".jpeg"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-
-  for (settings = gSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    PRInt32 offset = dataLongPath.Find("%APPPATH%");
-    dataLongPath.Replace(offset, 9, appLongPath);
-    SetRegKey(key, value, dataLongPath);
-  }
-  // On Windows CE RegFlushKey can negatively impact performance if there are a
-  // lot of pending writes to the HKEY_CLASSES_ROOT registry hive but it is
-  // necessary to save the values in the case where the user performs a hard
-  // power off of the device.
-  ::RegFlushKey(HKEY_CLASSES_ROOT);
-#endif
-
-  return NS_OK;
 }
 
-#ifdef WINCE
-void
-nsWindowsShellService::SetRegKey(const nsString& aKeyName,
-                                 const nsString& aValueName,
-                                 const nsString& aValue)
-{
-  PRUnichar buf[MAX_BUF];
-  DWORD len = sizeof buf;
-
-  HKEY theKey;
-  nsresult rv = OpenKeyForWriting(HKEY_CLASSES_ROOT, aKeyName, &theKey);
-  if (NS_FAILED(rv))
-    return;
-
-  // Get the current value.
-  DWORD res = ::RegQueryValueExW(theKey, PromiseFlatString(aValueName).get(),
-                                 NULL, NULL, (LPBYTE)buf, &len);
-
-  // Set the new value if it doesn't exist or it is different than the current
-  // value.
-  nsAutoString current(buf);
-  if (REG_FAILED(res) || !current.Equals(aValue)) {
-    const nsString &flatValue = PromiseFlatString(aValue);
-
-    ::RegSetValueExW(theKey, PromiseFlatString(aValueName).get(),
-                     0, REG_SZ, (const BYTE *)flatValue.get(),
-                     (flatValue.Length() + 1) * sizeof(PRUnichar));
-  }
-
-  // Close the key we opened.
-  ::RegCloseKey(theKey);
-}
-#endif
-
 NS_IMETHODIMP
 nsWindowsShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
 {
@@ -768,7 +615,6 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                                    0, NULL, REG_OPTION_NON_VOLATILE,
                                    KEY_WRITE, NULL, &key, &dwDisp);
     if (REG_SUCCEEDED(res)) {
-#ifndef WINCE
       PRUnichar tile[2], style[2];
       switch (aPosition) {
         case BACKGROUND_TILE:
@@ -795,25 +641,9 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                        0, REG_SZ, (const BYTE *)style, size);
       ::SystemParametersInfoW(SPI_SETDESKWALLPAPER, 0, (PVOID)path.get(),
                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
-#else
-      DWORD tile = (aPosition == BACKGROUND_TILE);
-      ::RegSetValueExW(key, L"Tile",
-                       0, REG_DWORD, (const BYTE *)&tile, sizeof(DWORD));
-      // On WinCE SPI_SETDESKWALLPAPER isn't available, so set the registry
-      // entry ourselves and then broadcast UI change
-      PRInt32 size = (path.Length() + 1) * sizeof(PRUnichar);
-      ::RegSetValueExW(key, L"Wallpaper",
-                       0, REG_SZ, (const BYTE *)path.get(), size);
-      ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, 0);
-#endif
 
       // Close the key we opened.
       ::RegCloseKey(key);
-
-#ifdef WINCE
-      // Ensure that the writes are flushed in case of hard reboot
-      ::RegFlushKey(HKEY_CURRENT_USER);
-#endif
     }
   }
   return rv;
@@ -939,9 +769,6 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
 
   ::SetSysColors(sizeof(aParameters) / sizeof(int), aParameters, colors);
 
-  // SetSysColors is persisting across sessions on Windows CE, so no need to
-  // write to registry
-#ifndef WINCE
   PRBool result = PR_FALSE;
   DWORD  dwDisp = 0;
   HKEY   key;
@@ -963,11 +790,9 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
   
   // Close the key we opened.
   ::RegCloseKey(key);
-#endif
   return NS_OK;
 }
 
-#ifndef WINCE
 NS_IMETHODIMP
 nsWindowsShellService::GetUnreadMailCount(PRUint32* aCount)
 {
@@ -1027,7 +852,6 @@ nsWindowsShellService::GetMailAccountKey(HKEY* aResult)
   ::RegCloseKey(mailKey);
   return PR_FALSE;
 }
-#endif
 
 NS_IMETHODIMP
 nsWindowsShellService::OpenApplicationWithURI(nsILocalFile* aApplication,
diff --git a/browser/components/shell/src/nsWindowsShellService.h b/browser/components/shell/src/nsWindowsShellService.h
index dfea8e8d5fd0..d4b9da59c01d 100644
--- a/browser/components/shell/src/nsWindowsShellService.h
+++ b/browser/components/shell/src/nsWindowsShellService.h
@@ -46,11 +46,7 @@
 #include <windows.h>
 #include <ole2.h>
 
-#ifndef WINCE
 class nsWindowsShellService : public nsIWindowsShellService
-#else
-class nsWindowsShellService : public nsIShellService
-#endif
 {
 public:
   nsWindowsShellService() : mCheckedThisSession(PR_FALSE) {}; 
@@ -58,20 +54,12 @@ public:
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
-#ifndef WINCE
   NS_DECL_NSIWINDOWSSHELLSERVICE
-#endif
 
 protected:
-#ifndef WINCE
   PRBool    IsDefaultBrowserVista(PRBool* aIsDefaultBrowser);
 
   PRBool    GetMailAccountKey(HKEY* aResult);
-#else
-  void      SetRegKey(const nsString& aKeyName,
-                      const nsString& aValueName,
-                      const nsString& aValue);
-#endif
 
 private:
   PRBool    mCheckedThisSession;
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index a1b36bc1939f..27ddf7bcb909 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -37,10 +37,8 @@
 @BINPATH@/updater.ini
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
-#ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
-#endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
@@ -62,9 +60,7 @@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#ifdef WINCE
-@BINPATH@/mozce_shunt.dll
-#elifdef XP_WIN32
+#ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
@@ -200,9 +196,7 @@
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-#ifndef WINCE
 @BINPATH@/components/migration.xpt
-#endif
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt
 @BINPATH@/components/necko_about.xpt
@@ -563,25 +557,6 @@ bin/libfreebl_32int64_3.so
 bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 
-; [ActiveX]
-#ifdef WINCE
-#ifndef MOZ_NO_ACTIVEX_SUPPORT
-@BINPATH@/components/nsAxSecurityPolicy.js
-@BINPATH@/@PREF_DIR@/activex.js
-@BINPATH@/plugins/npmozax.dll
-@BINPATH@/plugins/nsIMozAxPlugin.xpt
-#endif
-#endif
-
-; [FastStart]
-#ifdef WINCE
-#ifdef MOZ_FASTSTART
-@BINPATH@/firefoxfaststart.exe
-@BINPATH@/components/FastStartup.manifest
-@BINPATH@/components/FastStartup.js
-#endif
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd

From 0b7ef49a81cb53e418cbcaf6bfbd5a1566f875a3 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 22 Apr 2011 01:15:44 +0200
Subject: [PATCH 346/509] Bug 646799. Clip the contents of iframes to
 border-radius. r=roc

---
 layout/generic/nsSubDocumentFrame.cpp           | 9 ++++++++-
 layout/reftests/border-radius/iframe-1-ref.html | 7 +++++++
 layout/reftests/border-radius/iframe-1.html     | 7 +++++++
 layout/reftests/border-radius/reftest.list      | 2 ++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/border-radius/iframe-1-ref.html
 create mode 100644 layout/reftests/border-radius/iframe-1.html

diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 40ae74cefa4a..8be040aed00f 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -419,10 +419,17 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
       childItems.AppendToTop(layerItem);
     }
 
+    nsDisplayList list;
     // Clip children to the child root frame's rectangle
-    rv = aLists.Content()->AppendNewToTop(
+    rv = list.AppendNewToTop(
         new (aBuilder) nsDisplayClip(aBuilder, this, &childItems,
                                      subdocBoundsInParentUnits));
+
+    if (mIsInline) {
+      WrapReplacedContentForBorderRadius(aBuilder, &list, aLists);
+    } else {
+      aLists.Content()->AppendToTop(&list);
+    }
   }
   // delete childItems in case of OOM
   childItems.DeleteAll();
diff --git a/layout/reftests/border-radius/iframe-1-ref.html b/layout/reftests/border-radius/iframe-1-ref.html
new file mode 100644
index 000000000000..360c443f046b
--- /dev/null
+++ b/layout/reftests/border-radius/iframe-1-ref.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<iframe style="position: absolute; left: 0px; top: 0px; width: 300px; height: 150px; border: none; border-radius: 50px; background: green;" src="data:text/html,<body>"></iframe>
+<div style="position: absolute; left: 10px; top: 0px; width: 280px; height: 150px; background: red;"></div>
+<div style="position: absolute; left: 0px; top: 10px; width: 300px; height: 130px; background: red;"></div>
+</body>
+</html>
diff --git a/layout/reftests/border-radius/iframe-1.html b/layout/reftests/border-radius/iframe-1.html
new file mode 100644
index 000000000000..b3fc86792cf6
--- /dev/null
+++ b/layout/reftests/border-radius/iframe-1.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<iframe style="position: absolute; left: 0px; top: 0px; width: 300px; height: 150px; border: none; border-radius: 50px; background: green;" src="data:text/html,<body bgcolor=green>"></iframe>
+<div style="position: absolute; left: 10px; top: 0px; width: 280px; height: 150px; background: red;"></div>
+<div style="position: absolute; left: 0px; top: 10px; width: 300px; height: 130px; background: red;"></div>
+</body>
+</html>
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index 7909b51d9586..64bf5d0a268a 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -77,3 +77,5 @@ random-if(winWidget) HTTP(..) == corner-joins-2.xhtml corner-joins-2-ref.xhtml
 == scroll-1.html scroll-1-ref.html # see bug 602892
 
 == zero-radius-clip-1.html zero-radius-clip-ref.html
+
+== iframe-1.html iframe-1-ref.html

From 1fa19bd7f2f75bbac219372664a39da37b6d8233 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Fri, 22 Apr 2011 01:16:48 +0200
Subject: [PATCH 347/509] Bug 651461 - Fix build failure in nsAudioStream.cpp
 due to conflicting types. r=roc

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

diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 624223c06d10..71b0a68d794b 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOffset()
 #if defined(XP_WIN)
   positionType = SA_POSITION_WRITE_HARDWARE;
 #endif
-  PRInt64 position = 0;
+  int64_t position = 0;
   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
                              positionType, &position) == SA_SUCCESS) {
     return position / sizeof(short);

From c52e471a70b5f14e664afa5426e217f0ef7fafa2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:30 -0700
Subject: [PATCH 348/509] Share code to count the length of the
 transition/animation property array.  (Bug 651801, patch 1)  r=bzbarsky

---
 layout/style/nsRuleNode.cpp | 196 +++++++++++++++++-------------------
 1 file changed, 90 insertions(+), 106 deletions(-)

diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 540a8ef73c89..471924096822 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -3630,6 +3630,85 @@ struct TransitionPropData {
   PRUint32 num;
 };
 
+static PRUint32
+CountTransitionProps(const TransitionPropInfo* aInfo,
+                     TransitionPropData* aData,
+                     size_t aLength,
+                     nsStyleDisplay* aDisplay,
+                     const nsStyleDisplay* aParentDisplay,
+                     const nsRuleData* aRuleData,
+                     PRBool& aCanStoreInRuleTree)
+{
+  // The four transition properties or eight animation properties are
+  // stored in nsCSSDisplay in a single array for all properties.  The
+  // number of transitions is equal to the number of items in the
+  // longest property's value.  Properties that have fewer values than
+  // the longest are filled in by repeating the list.  However, this
+  // repetition does not extend the computed value of that particular
+  // property (for purposes of inheritance, or, in our code, for when
+  // other properties are overridden by a more specific rule).
+
+  // But actually, since the spec isn't clear yet, we'll fully compute
+  // all of them (so we can switch easily later), but only care about
+  // the ones up to the number of items for 'transition-property', per
+  // http://lists.w3.org/Archives/Public/www-style/2009Aug/0109.html .
+
+  // Transitions are difficult to handle correctly because of this.  For
+  // example, we need to handle scenarios such as:
+  //  * a more general rule specifies transition-property: a, b, c;
+  //  * a more specific rule overrides as transition-property: d;
+  //
+  // If only the general rule applied, we would fill in the extra
+  // properties (duration, delay, etc) with initial values to create 3
+  // fully-specified transitions.  But when the more specific rule
+  // applies, we should only create a single transition.  In order to do
+  // this we need to remember which properties were explicitly specified
+  // and which ones were just filled in with initial values to get a
+  // fully-specified transition, which we do by remembering the number
+  // of values for each property.
+
+  PRUint32 numTransitions = 0;
+  for (size_t i = 0; i < aLength; ++i) {
+    const TransitionPropInfo& info = aInfo[i];
+    TransitionPropData& data = aData[i];
+
+    // cache whether any of the properties are specified as 'inherit' so
+    // we can use it below
+
+    const nsCSSValue& value = *aRuleData->ValueFor(info.property);
+    data.unit = value.GetUnit();
+    data.list = (value.GetUnit() == eCSSUnit_List ||
+                 value.GetUnit() == eCSSUnit_ListDep)
+                  ? value.GetListValue() : nsnull;
+
+    // General algorithm to determine how many total transitions we need
+    // to build.  For each property:
+    //  - if there is no value specified in for the property in
+    //    displayData, use the values from the start struct, but only if
+    //    they were explicitly specified
+    //  - if there is a value specified for the property in displayData:
+    //    - if the value is 'inherit', count the number of values for
+    //      that property are specified by the parent, but only those
+    //      that were explicitly specified
+    //    - otherwise, count the number of values specified in displayData
+
+
+    // calculate number of elements
+    if (data.unit == eCSSUnit_Inherit) {
+      data.num = aParentDisplay->*(info.sdCount);
+      aCanStoreInRuleTree = PR_FALSE;
+    } else if (data.list) {
+      data.num = ListLength(data.list);
+    } else {
+      data.num = aDisplay->*(info.sdCount);
+    }
+    if (data.num > numTransitions)
+      numTransitions = data.num;
+  }
+
+  return numTransitions;
+}
+
 const void*
 nsRuleNode::ComputeDisplayData(void* aStartStruct,
                                const nsRuleData* aRuleData,
@@ -3652,73 +3731,11 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
                                       for (PRUint32 var_ = 0; var_ < 4; ++var_)
 
   // CSS Transitions
-
-  // The four transition properties are stored in nsCSSDisplay in a
-  // single array for all properties.  The number of transitions is
-  // equal to the number of items in the longest property's value.
-  // Properties that have fewer values than the longest are filled in by
-  // repeating the list.  However, this repetition does not extend the
-  // computed value of that particular property (for purposes of
-  // inheritance, or, in our code, for when other properties are
-  // overridden by a more specific rule).
-
-  // But actually, since the spec isn't clear yet, we'll fully compute
-  // all of them (so we can switch easily later), but only care about
-  // the ones up to the number of items for 'transition-property', per
-  // http://lists.w3.org/Archives/Public/www-style/2009Aug/0109.html .
-
-  // Transitions are difficult to handle correctly because of this.  For
-  // example, we need to handle scenarios such as:
-  //  * a more general rule specifies transition-property: a, b, c;
-  //  * a more specific rule overrides as transition-property: d;
-  //
-  // If only the general rule applied, we would fill in the extra
-  // properties (duration, delay, etc) with initial values to create 3
-  // fully-specified transitions.  But when the more specific rule
-  // applies, we should only create a single transition.  In order to do
-  // this we need to remember which properties were explicitly specified
-  // and which ones were just filled in with initial values to get a
-  // fully-specified transition, which we do by remembering the number
-  // of values for each property.
-
-  PRUint32 numTransitions = 0;
-  FOR_ALL_TRANSITION_PROPS(p) {
-    const TransitionPropInfo& i = transitionPropInfo[p];
-    TransitionPropData& d = transitionPropData[p];
-
-    // cache whether any of the properties are specified as 'inherit' so
-    // we can use it below
-
-    const nsCSSValue& value = *aRuleData->ValueFor(i.property);
-    d.unit = value.GetUnit();
-    d.list = (value.GetUnit() == eCSSUnit_List ||
-              value.GetUnit() == eCSSUnit_ListDep)
-      ? value.GetListValue() : nsnull;
-
-    // General algorithm to determine how many total transitions we need
-    // to build.  For each property:
-    //  - if there is no value specified in for the property in
-    //    displayData, use the values from the start struct, but only if
-    //    they were explicitly specified
-    //  - if there is a value specified for the property in displayData:
-    //    - if the value is 'inherit', count the number of values for
-    //      that property are specified by the parent, but only those
-    //      that were explicitly specified
-    //    - otherwise, count the number of values specified in displayData
-
-
-    // calculate number of elements
-    if (d.unit == eCSSUnit_Inherit) {
-      d.num = parentDisplay->*(i.sdCount);
-      canStoreInRuleTree = PR_FALSE;
-    } else if (d.list) {
-      d.num = ListLength(d.list);
-    } else {
-      d.num = display->*(i.sdCount);
-    }
-    if (d.num > numTransitions)
-      numTransitions = d.num;
-  }
+  PRUint32 numTransitions =
+    CountTransitionProps(transitionPropInfo, transitionPropData,
+                         NS_ARRAY_LENGTH(transitionPropData),
+                         display, parentDisplay, aRuleData,
+                         canStoreInRuleTree);
 
   if (!display->mTransitions.SetLength(numTransitions)) {
     NS_WARNING("failed to allocate transitions array");
@@ -3913,46 +3930,13 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
 #define FOR_ALL_ANIMATION_PROPS(var_) \
     for (PRUint32 var_ = 0; var_ < 8; ++var_)
 
-  // CSS Animations.  See transitions, above.
+  // CSS Animations.
 
-  PRUint32 numAnimations = 0;
-  FOR_ALL_ANIMATION_PROPS(p) {
-    const TransitionPropInfo& i = animationPropInfo[p];
-    TransitionPropData& d = animationPropData[p];
-
-    // cache whether any of the properties are specified as 'inherit' so
-    // we can use it below
-
-    const nsCSSValue& value = *aRuleData->ValueFor(i.property);
-    d.unit = value.GetUnit();
-    d.list = (value.GetUnit() == eCSSUnit_List ||
-              value.GetUnit() == eCSSUnit_ListDep)
-      ? value.GetListValue() : nsnull;
-
-    // General algorithm to determine how many total animations we need
-    // to build.  For each property:
-    //  - if there is no value specified in for the property in
-    //    displayData, use the values from the start struct, but only if
-    //    they were explicitly specified
-    //  - if there is a value specified for the property in displayData:
-    //    - if the value is 'inherit', count the number of values for
-    //      that property are specified by the parent, but only those
-    //      that were explicitly specified
-    //    - otherwise, count the number of values specified in displayData
-
-
-    // calculate number of elements
-    if (d.unit == eCSSUnit_Inherit) {
-      d.num = parentDisplay->*(i.sdCount);
-      canStoreInRuleTree = PR_FALSE;
-    } else if (d.list) {
-      d.num = ListLength(d.list);
-    } else {
-      d.num = display->*(i.sdCount);
-    }
-    if (d.num > numAnimations)
-      numAnimations = d.num;
-  }
+  PRUint32 numAnimations =
+    CountTransitionProps(animationPropInfo, animationPropData,
+                         NS_ARRAY_LENGTH(animationPropData),
+                         display, parentDisplay, aRuleData,
+                         canStoreInRuleTree);
 
   if (!display->mAnimations.SetLength(numAnimations)) {
     NS_WARNING("failed to allocate animations array");

From 6242cc7dee2dfec6cf492076500bb14e4822c42c Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:30 -0700
Subject: [PATCH 349/509] Share code to compute timing functions.  (Bug 651801,
 patch 2)  r=bzbarsky

---
 layout/style/nsRuleNode.cpp  | 133 +++++++++++++----------------------
 layout/style/nsStyleStruct.h |  34 ++++++---
 2 files changed, 72 insertions(+), 95 deletions(-)

diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 471924096822..22c8cb3cbee3 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -3709,6 +3709,49 @@ CountTransitionProps(const TransitionPropInfo* aInfo,
   return numTransitions;
 }
 
+static void
+ComputeTimingFunction(const nsCSSValue& aValue, nsTimingFunction& aResult)
+{
+  switch (aValue.GetUnit()) {
+    case eCSSUnit_Enumerated:
+      aResult = nsTimingFunction(aValue.GetIntValue());
+      break;
+    case eCSSUnit_Cubic_Bezier:
+      {
+        nsCSSValue::Array* array = aValue.GetArrayValue();
+        NS_ASSERTION(array && array->Count() == 4,
+                     "Need 4 control points");
+        aResult = nsTimingFunction(array->Item(0).GetFloatValue(),
+                                   array->Item(1).GetFloatValue(),
+                                   array->Item(2).GetFloatValue(),
+                                   array->Item(3).GetFloatValue());
+      }
+      break;
+    case eCSSUnit_Steps:
+      {
+        nsCSSValue::Array* array = aValue.GetArrayValue();
+        NS_ASSERTION(array && array->Count() == 2,
+                     "Need 2 items");
+        NS_ASSERTION(array->Item(0).GetUnit() == eCSSUnit_Integer,
+                     "unexpected first value");
+        NS_ASSERTION(array->Item(1).GetUnit() == eCSSUnit_Enumerated &&
+                     (array->Item(1).GetIntValue() ==
+                       NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_START ||
+                      array->Item(1).GetIntValue() ==
+                       NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END),
+                     "unexpected second value");
+        nsTimingFunction::Type type =
+          (array->Item(1).GetIntValue() ==
+            NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END)
+            ? nsTimingFunction::StepEnd : nsTimingFunction::StepStart;
+        aResult = nsTimingFunction(type, array->Item(0).GetIntValue());
+      }
+      break;
+    default:
+      NS_NOTREACHED("Invalid transition property unit");
+  }
+}
+
 const void*
 nsRuleNode::ComputeDisplayData(void* aStartStruct,
                                const nsRuleData* aRuleData,
@@ -3856,49 +3899,8 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
       transition->SetTimingFunction(
         nsTimingFunction(NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE));
     } else if (timingFunction.list) {
-      switch (timingFunction.list->mValue.GetUnit()) {
-        case eCSSUnit_Enumerated:
-          transition->SetTimingFunction(
-            nsTimingFunction(timingFunction.list->mValue.GetIntValue()));
-          break;
-        case eCSSUnit_Cubic_Bezier:
-          {
-            nsCSSValue::Array* array =
-              timingFunction.list->mValue.GetArrayValue();
-            NS_ASSERTION(array && array->Count() == 4,
-                         "Need 4 control points");
-            transition->SetTimingFunction(
-              nsTimingFunction(array->Item(0).GetFloatValue(),
-                               array->Item(1).GetFloatValue(),
-                               array->Item(2).GetFloatValue(),
-                               array->Item(3).GetFloatValue()));
-          }
-          break;
-        case eCSSUnit_Steps:
-          {
-            nsCSSValue::Array* array =
-              timingFunction.list->mValue.GetArrayValue();
-            NS_ASSERTION(array && array->Count() == 2,
-                         "Need 2 items");
-            NS_ASSERTION(array->Item(0).GetUnit() == eCSSUnit_Integer,
-                         "unexpected first value");
-            NS_ASSERTION(array->Item(1).GetUnit() == eCSSUnit_Enumerated &&
-                         (array->Item(1).GetIntValue() ==
-                           NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_START ||
-                          array->Item(1).GetIntValue() ==
-                           NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END),
-                         "unexpected second value");
-            transition->SetTimingFunction(
-              nsTimingFunction((
-                array->Item(1).GetIntValue() ==
-                  NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END)
-                  ? nsTimingFunction::StepEnd : nsTimingFunction::StepStart,
-                array->Item(0).GetIntValue()));
-          }
-          break;
-        default:
-          NS_NOTREACHED("Invalid transition property unit");
-      }
+      ComputeTimingFunction(timingFunction.list->mValue,
+                            transition->TimingFunctionSlot());
     }
 
     FOR_ALL_TRANSITION_PROPS(p) {
@@ -4057,49 +4059,8 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
       animation->SetTimingFunction(
         nsTimingFunction(NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE));
     } else if (animTimingFunction.list) {
-      switch (animTimingFunction.list->mValue.GetUnit()) {
-        case eCSSUnit_Enumerated:
-          animation->SetTimingFunction(
-            nsTimingFunction(animTimingFunction.list->mValue.GetIntValue()));
-          break;
-        case eCSSUnit_Cubic_Bezier:
-          {
-            nsCSSValue::Array* array =
-              animTimingFunction.list->mValue.GetArrayValue();
-            NS_ASSERTION(array && array->Count() == 4,
-                         "Need 4 control points");
-            animation->SetTimingFunction(
-              nsTimingFunction(array->Item(0).GetFloatValue(),
-                               array->Item(1).GetFloatValue(),
-                               array->Item(2).GetFloatValue(),
-                               array->Item(3).GetFloatValue()));
-          }
-          break;
-        case eCSSUnit_Steps:
-          {
-            nsCSSValue::Array* array =
-              animTimingFunction.list->mValue.GetArrayValue();
-            NS_ASSERTION(array && array->Count() == 2,
-                         "Need 2 items");
-            NS_ASSERTION(array->Item(0).GetUnit() == eCSSUnit_Integer,
-                         "unexpected first value");
-            NS_ASSERTION(array->Item(1).GetUnit() == eCSSUnit_Enumerated &&
-                         (array->Item(1).GetIntValue() ==
-                           NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_START ||
-                          array->Item(1).GetIntValue() ==
-                           NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END),
-                         "unexpected second value");
-            animation->SetTimingFunction(
-              nsTimingFunction((
-                array->Item(1).GetIntValue() ==
-                  NS_STYLE_TRANSITION_TIMING_FUNCTION_STEP_END)
-                  ? nsTimingFunction::StepEnd : nsTimingFunction::StepStart,
-                array->Item(0).GetIntValue()));
-          }
-          break;
-        default:
-          NS_NOTREACHED("Invalid animation property unit");
-      }
+      ComputeTimingFunction(animTimingFunction.list->mValue,
+                            animation->TimingFunctionSlot());
     }
 
     if (i >= animDirection.num) {
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index f3b586b67511..3ca32d084e72 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1334,16 +1334,8 @@ struct nsTimingFunction {
   }
 
   nsTimingFunction(const nsTimingFunction& aOther)
-    : mType(aOther.mType)
   {
-    if (mType == Function) {
-      mFunc.mX1 = aOther.mFunc.mX1;
-      mFunc.mY1 = aOther.mFunc.mY1;
-      mFunc.mX2 = aOther.mFunc.mX2;
-      mFunc.mY2 = aOther.mFunc.mY2;
-    } else {
-      mSteps = aOther.mSteps;
-    }
+    *this = aOther;
   }
 
   Type mType;
@@ -1357,6 +1349,26 @@ struct nsTimingFunction {
     PRUint32 mSteps;
   };
 
+  nsTimingFunction&
+  operator=(const nsTimingFunction& aOther)
+  {
+    if (&aOther == this)
+      return *this;
+
+    mType = aOther.mType;
+
+    if (mType == Function) {
+      mFunc.mX1 = aOther.mFunc.mX1;
+      mFunc.mY1 = aOther.mFunc.mY1;
+      mFunc.mX2 = aOther.mFunc.mX2;
+      mFunc.mY2 = aOther.mFunc.mY2;
+    } else {
+      mSteps = aOther.mSteps;
+    }
+
+    return *this;
+  }
+
   bool operator==(const nsTimingFunction& aOther) const
   {
     if (mType != aOther.mType) {
@@ -1408,6 +1420,8 @@ struct nsTransition {
       mUnknownProperty = aOther.mUnknownProperty;
     }
 
+  nsTimingFunction& TimingFunctionSlot() { return mTimingFunction; }
+
 private:
   nsTimingFunction mTimingFunction;
   float mDuration;
@@ -1446,6 +1460,8 @@ struct nsAnimation {
   void SetIterationCount(float aIterationCount)
     { mIterationCount = aIterationCount; }
 
+  nsTimingFunction& TimingFunctionSlot() { return mTimingFunction; }
+
 private:
   nsTimingFunction mTimingFunction;
   float mDuration;

From a9d5f524ee329612fccd7bc18314e26abe28db93 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:31 -0700
Subject: [PATCH 350/509] Remove null-checks of nsCSSParser, since construction
 is infallible.  (Bug 542058, patch 1)  r=bzbarsky

Note that many callers already skipped the null-checks.
---
 content/base/src/nsGenericElement.cpp         |  1 -
 content/base/src/nsStyledElement.cpp          | 21 +++++++++----------
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  2 --
 content/svg/content/src/nsSVGElement.cpp      |  3 ---
 content/xul/content/src/nsXULElement.cpp      |  1 -
 layout/style/Loader.cpp                       |  6 ------
 layout/style/nsCSSParser.h                    |  5 -----
 layout/style/nsCSSRules.cpp                   |  3 ---
 layout/style/nsCSSStyleSheet.cpp              |  6 ------
 layout/style/nsStyleAnimation.cpp             |  3 +--
 10 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 333131d9ec84..33ded5d7aea2 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -5469,7 +5469,6 @@ ParseSelectorList(nsINode* aNode,
   NS_ENSURE_STATE(doc);
 
   nsCSSParser parser(doc->CSSLoader());
-  NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
 
   nsCSSSelectorList* selectorList;
   nsresult rv = parser.ParseSelectorString(aSelectorString,
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index 0ae2cbce8cb9..3c1a522db1f9 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -332,18 +332,17 @@ nsStyledElementNotElementCSSInlineStyle::ParseStyleAttribute(const nsAString& aV
     if (isCSS) {
       css::Loader* cssLoader = doc->CSSLoader();
       nsCSSParser cssParser(cssLoader);
-      if (cssParser) {
-        nsCOMPtr<nsIURI> baseURI = GetBaseURI();
 
-        nsRefPtr<css::StyleRule> rule;
-        cssParser.ParseStyleAttribute(aValue, doc->GetDocumentURI(),
-                                      baseURI,
-                                      NodePrincipal(),
-                                      getter_AddRefs(rule));
-        if (rule) {
-          aResult.SetTo(rule, &aValue);
-          return;
-        }
+      nsCOMPtr<nsIURI> baseURI = GetBaseURI();
+
+      nsRefPtr<css::StyleRule> rule;
+      cssParser.ParseStyleAttribute(aValue, doc->GetDocumentURI(),
+                                    baseURI,
+                                    NodePrincipal(),
+                                    getter_AddRefs(rule));
+      if (rule) {
+        aResult.SetTo(rule, &aValue);
+        return;
       }
     }
   }
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 518eba6806e2..7555761d6895 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -2210,7 +2210,6 @@ CreateFontStyleRule(const nsAString& aFont,
     // Pass the CSS Loader object to the parser, to allow parser error reports
     // to include the outer window ID.
     nsCSSParser parser(document->CSSLoader());
-    NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
 
     nsresult rv = parser.ParseStyleAttribute(EmptyString(), docURL, baseURL,
                                              principal, getter_AddRefs(rule));
@@ -3680,7 +3679,6 @@ nsCanvasRenderingContext2D::DrawWindow(nsIDOMWindow* aWindow, float aX, float aY
     // Pass the CSS Loader object to the parser, to allow parser error reports
     // to include the outer window ID.
     nsCSSParser parser(elementDoc ? elementDoc->CSSLoader() : nsnull);
-    NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
     nsresult rv = parser.ParseColorString(PromiseFlatString(aBGColor),
                                           nsnull, 0, &bgColor);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
index 8eebed142c33..6818d4f9a215 100644
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -1169,9 +1169,6 @@ MappedAttrParser::MappedAttrParser(css::Loader* aLoader,
   : mParser(aLoader), mDocURI(aDocURI), mBaseURI(aBaseURI),
     mNodePrincipal(aNodePrincipal), mDecl(nsnull)
 {
-  // mParser should successfully construct, now that we have infallible malloc.
-  NS_ABORT_IF_FALSE(mParser, "parser failed to initialize?");
-
   // SVG and CSS differ slightly in their interpretation of some of
   // the attributes.  SVG allows attributes of the form: font-size="5"
   // (style="font-size: 5" if using a style attribute)
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index dafd9f7f3bc6..f81023df865a 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -2876,7 +2876,6 @@ nsXULPrototypeElement::SetAttrAt(PRUint32 aPos, const nsAString& aValue,
         nsRefPtr<css::StyleRule> rule;
 
         nsCSSParser parser;
-        NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
 
         // XXX Get correct Base URI (need GetBaseURI on *prototype* element)
         parser.ParseStyleAttribute(aValue, aDocumentURI, aDocumentURI,
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index cde8f08d0e25..5af2cd3bcf64 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1168,7 +1168,6 @@ Loader::PrepareSheet(nsCSSStyleSheet* aSheet,
     NS_ENSURE_TRUE(mediaList, NS_ERROR_OUT_OF_MEMORY);
 
     nsCSSParser mediumParser(this);
-    NS_ENSURE_TRUE(mediumParser, NS_ERROR_OUT_OF_MEMORY);
 
     // We have aMediaString only when linked from link elements, style
     // elements, or PIs, so pass PR_TRUE.
@@ -1575,11 +1574,6 @@ Loader::ParseSheet(nsIUnicharInputStream* aStream,
   aCompleted = PR_FALSE;
 
   nsCSSParser parser(this, aLoadData->mSheet);
-  if (!parser) {
-    LOG_ERROR(("  Failed to get CSS parser"));
-    SheetComplete(aLoadData, NS_ERROR_OUT_OF_MEMORY);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
 
   // Push our load data on the stack so any kids can pick it up
   mParsingDatas.AppendElement(aLoadData);
diff --git a/layout/style/nsCSSParser.h b/layout/style/nsCSSParser.h
index 7832a111b9f9..696ea1b331ad 100644
--- a/layout/style/nsCSSParser.h
+++ b/layout/style/nsCSSParser.h
@@ -81,11 +81,6 @@ private:
   nsCSSParser& operator=(nsCSSParser const&);
 
 public:
-  // If this is false, memory allocation failed in the constructor
-  // and all other methods will crash.
-  operator bool() const
-  { return !!mImpl; }
-
   // Set a style sheet for the parser to fill in. The style sheet must
   // implement the nsCSSStyleSheet interface.  Null can be passed in to clear
   // out an existing stylesheet reference.
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 5ae3d7cdd17a..55cb92bfaf57 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -1895,7 +1895,6 @@ NS_IMETHODIMP
 nsCSSKeyframeRule::SetKeyText(const nsAString& aKeyText)
 {
   nsCSSParser parser;
-  NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
 
   nsTArray<float> newSelectors;
   // FIXME: pass filename and line number
@@ -2059,7 +2058,6 @@ nsCSSKeyframesRule::InsertRule(const nsAString& aRule)
   // which also turns out to match WebKit:
   // http://lists.w3.org/Archives/Public/www-style/2011Apr/0034.html
   nsCSSParser parser;
-  NS_ENSURE_TRUE(parser, NS_OK);
 
   // FIXME: pass filename and line number
   nsRefPtr<nsCSSKeyframeRule> rule =
@@ -2078,7 +2076,6 @@ PRUint32
 nsCSSKeyframesRule::FindRuleIndexForKey(const nsAString& aKey)
 {
   nsCSSParser parser;
-  NS_ENSURE_TRUE(parser, RULE_NOT_FOUND);
 
   nsTArray<float> keys;
   // FIXME: pass filename and line number
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index 30e4e0e1cfae..398e5993971d 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -577,7 +577,6 @@ nsresult
 nsMediaList::SetText(const nsAString& aMediaText)
 {
   nsCSSParser parser;
-  NS_ENSURE_TRUE(parser, NS_ERROR_OUT_OF_MEMORY);
 
   PRBool htmlMode = PR_FALSE;
   if (mStyleSheet) {
@@ -1781,8 +1780,6 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
   }
 
   nsCSSParser css(loader, this);
-  if (!css)
-    return NS_ERROR_OUT_OF_MEMORY;
 
   mozAutoDocUpdate updateBatch(mDocument, UPDATE_STYLE, PR_TRUE);
 
@@ -1991,9 +1988,6 @@ nsCSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
   }
 
   nsCSSParser css(loader, this);
-  if (!css) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
 
   // parse and grab the rule
   mozAutoDocUpdate updateBatch(mDocument, UPDATE_STYLE, PR_TRUE);
diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp
index a2f807cb69fe..6beea45e3909 100644
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -1807,8 +1807,7 @@ BuildStyleRule(nsCSSProperty aProperty,
 
   // Get a parser, parse the property, and check for CSS parsing errors.
   // If any of these steps fails, we bail out and delete the declaration.
-  if (!parser ||
-      NS_FAILED(parser.ParseProperty(aProperty, aSpecifiedValue,
+  if (NS_FAILED(parser.ParseProperty(aProperty, aSpecifiedValue,
                                      doc->GetDocumentURI(), baseURI,
                                      aTargetElement->NodePrincipal(),
                                      declaration, &changed, PR_FALSE)) ||

From a6378ab35afd17fc9fa8c38d89c75a907b3ffd5d Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:31 -0700
Subject: [PATCH 351/509] Allow null media query cache key in some places. 
 (Bug 542058, patch 2)  r=bzbarsky

---
 layout/style/nsCSSRules.cpp      |  2 +-
 layout/style/nsCSSStyleSheet.cpp | 10 ++++++----
 layout/style/nsIMediaList.h      |  9 +++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 55cb92bfaf57..5d0103d36c9d 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -888,7 +888,7 @@ MediaRule::UseForPresentation(nsPresContext* aPresContext,
                                    nsMediaQueryResultCacheKey& aKey)
 {
   if (mMedia) {
-    return mMedia->Matches(aPresContext, aKey);
+    return mMedia->Matches(aPresContext, &aKey);
   }
   return PR_TRUE;
 }
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index 398e5993971d..9cd133f66e9c 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -505,7 +505,7 @@ nsMediaQuery::Clone() const
 
 PRBool
 nsMediaQuery::Matches(nsPresContext* aPresContext,
-                      nsMediaQueryResultCacheKey& aKey) const
+                      nsMediaQueryResultCacheKey* aKey) const
 {
   if (mHadUnknownExpression)
     return PR_FALSE;
@@ -520,7 +520,9 @@ nsMediaQuery::Matches(nsPresContext* aPresContext,
     NS_ENSURE_SUCCESS(rv, PR_FALSE); // any better ideas?
 
     match = expr.Matches(aPresContext, actual);
-    aKey.AddExpression(&expr, match);
+    if (aKey) {
+      aKey->AddExpression(&expr, match);
+    }
   }
 
   return match == !mNegated;
@@ -591,7 +593,7 @@ nsMediaList::SetText(const nsAString& aMediaText)
 
 PRBool
 nsMediaList::Matches(nsPresContext* aPresContext,
-                     nsMediaQueryResultCacheKey& aKey)
+                     nsMediaQueryResultCacheKey* aKey)
 {
   for (PRInt32 i = 0, i_end = mArray.Length(); i < i_end; ++i) {
     if (mArray[i]->Matches(aPresContext, aKey)) {
@@ -1163,7 +1165,7 @@ nsCSSStyleSheet::UseForPresentation(nsPresContext* aPresContext,
                                     nsMediaQueryResultCacheKey& aKey) const
 {
   if (mMedia) {
-    return mMedia->Matches(aPresContext, aKey);
+    return mMedia->Matches(aPresContext, &aKey);
   }
   return PR_TRUE;
 }
diff --git a/layout/style/nsIMediaList.h b/layout/style/nsIMediaList.h
index 08e4d1f1211d..c8c748b0b1ab 100644
--- a/layout/style/nsIMediaList.h
+++ b/layout/style/nsIMediaList.h
@@ -162,8 +162,9 @@ public:
   nsMediaQuery* Clone() const;
 
   // Does this query apply to the presentation?
+  // If |aKey| is non-null, add cache information to it.
   PRBool Matches(nsPresContext* aPresContext,
-                 nsMediaQueryResultCacheKey& aKey) const;
+                 nsMediaQueryResultCacheKey* aKey) const;
 
 private:
   PRPackedBool mNegated;
@@ -184,8 +185,12 @@ public:
 
   nsresult GetText(nsAString& aMediaText);
   nsresult SetText(const nsAString& aMediaText);
+
+  // Does this query apply to the presentation?
+  // If |aKey| is non-null, add cache information to it.
   PRBool Matches(nsPresContext* aPresContext,
-                 nsMediaQueryResultCacheKey& aKey);
+                 nsMediaQueryResultCacheKey* aKey);
+
   nsresult SetStyleSheet(nsCSSStyleSheet* aSheet);
   nsresult AppendQuery(nsAutoPtr<nsMediaQuery>& aQuery) {
     // Takes ownership of aQuery (if it succeeds)

From eac95bc5f3fe99fc13dc6679bd2aa5c5372fae20 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:31 -0700
Subject: [PATCH 352/509] Implement window.matchMedia for matching of media
 queries and notification of media query changes.  (Bug 542058, patch 3) 
 r=bzbarsky

This is specified at:
http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
---
 dom/base/nsDOMClassInfo.cpp                   |   9 +
 dom/base/nsDOMClassInfoClasses.h              |   2 +
 dom/base/nsGlobalWindow.cpp                   |  27 ++
 dom/interfaces/base/Makefile.in               |   1 +
 dom/interfaces/base/nsIDOMMediaQueryList.idl  |  58 ++++
 dom/interfaces/base/nsIDOMWindowInternal.idl  |   8 +-
 layout/base/nsPresContext.cpp                 |  64 +++++
 layout/base/nsPresContext.h                   |  10 +
 layout/style/Makefile.in                      |   2 +
 layout/style/nsCSSStyleSheet.cpp              |   2 +-
 layout/style/nsDOMMediaQueryList.cpp          | 164 +++++++++++
 layout/style/nsDOMMediaQueryList.h            | 106 +++++++
 layout/style/test/Makefile.in                 |   1 +
 .../test/test_media_queries_dynamic.html      |  13 +-
 layout/style/test/test_media_query_list.html  | 259 ++++++++++++++++++
 xpcom/glue/nsCycleCollectionParticipant.h     |   9 +
 16 files changed, 724 insertions(+), 11 deletions(-)
 create mode 100644 dom/interfaces/base/nsIDOMMediaQueryList.idl
 create mode 100644 layout/style/nsDOMMediaQueryList.cpp
 create mode 100644 layout/style/nsDOMMediaQueryList.h
 create mode 100644 layout/style/test/test_media_query_list.html

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 38b0fd0e5280..6efc5de2ebc3 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -510,6 +510,8 @@
 #include "nsIIDBDatabaseException.h"
 #include "nsIDOMEventException.h"
 
+#include "nsIDOMMediaQueryList.h"
+
 using namespace mozilla::dom;
 
 static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -1502,6 +1504,9 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 #endif
+
+  NS_DEFINE_CLASSINFO_DATA(MediaQueryList, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 };
 
 // Objects that should be constructable through |new Name();|
@@ -4258,6 +4263,10 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_END
 #endif
 
+  DOM_CLASSINFO_MAP_BEGIN(MediaQueryList, nsIDOMMediaQueryList)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaQueryList)
+  DOM_CLASSINFO_MAP_END
+
 #ifdef NS_DEBUG
   {
     PRUint32 i = NS_ARRAY_LENGTH(sClassInfoData);
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index a98a48a1ee93..79da288db987 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -517,3 +517,5 @@ DOMCI_CLASS(EventException)
 DOMCI_CLASS(MozCSSKeyframeRule)
 DOMCI_CLASS(MozCSSKeyframesRule)
 #endif
+
+DOMCI_CLASS(MediaQueryList)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index b53adb5dcead..7bfdcf6e39db 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -86,6 +86,7 @@
 #include "nsCCUncollectableMarker.h"
 #include "nsDOMThreadService.h"
 #include "nsAutoJSValHolder.h"
+#include "nsDOMMediaQueryList.h"
 
 // Interfaces Needed
 #include "nsIFrame.h"
@@ -3923,6 +3924,32 @@ nsGlobalWindow::GetMozAnimationStartTime(PRInt64 *aTime)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsGlobalWindow::MatchMedia(const nsAString& aMediaQueryList,
+                           nsIDOMMediaQueryList** aResult)
+{
+  // FIXME: This whole forward-to-outer and then get a pres
+  // shell/context off the docshell dance is sort of silly; it'd make
+  // more sense to forward to the inner, but it's what everyone else
+  // (GetSelection, GetScrollXY, etc.) does around here.
+  FORWARD_TO_OUTER(MatchMedia, (aMediaQueryList, aResult),
+                   NS_ERROR_NOT_INITIALIZED);
+
+  *aResult = nsnull;
+
+  if (!mDocShell)
+    return NS_OK;
+
+  nsRefPtr<nsPresContext> presContext;
+  mDocShell->GetPresContext(getter_AddRefs(presContext));
+
+  if (!presContext)
+    return NS_OK;
+
+  presContext->MatchMedia(aMediaQueryList, aResult);
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::SetScreenX(PRInt32 aScreenX)
 {
diff --git a/dom/interfaces/base/Makefile.in b/dom/interfaces/base/Makefile.in
index 2b3f04a08b87..e9674e23bdeb 100644
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@@ -67,6 +67,7 @@ XPIDLSRCS =					\
 	nsIDOMCrypto.idl			\
 	nsIDOMHistory.idl			\
 	nsIDOMLocation.idl			\
+	nsIDOMMediaQueryList.idl		\
 	nsIDOMMimeType.idl			\
 	nsIDOMMimeTypeArray.idl			\
 	nsIDOMNavigator.idl			\
diff --git a/dom/interfaces/base/nsIDOMMediaQueryList.idl b/dom/interfaces/base/nsIDOMMediaQueryList.idl
new file mode 100644
index 000000000000..47b1b072eb92
--- /dev/null
+++ b/dom/interfaces/base/nsIDOMMediaQueryList.idl
@@ -0,0 +1,58 @@
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+interface nsIDOMMediaQueryListListener;
+
+/* see http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface */
+
+[scriptable, uuid(e0e49c52-915b-40f9-9cba-6026305cdf3e)]
+interface nsIDOMMediaQueryList : nsISupports
+{
+  readonly attribute DOMString media;
+  readonly attribute boolean matches;
+
+  void addListener(in nsIDOMMediaQueryListListener listener);
+  void removeListener(in nsIDOMMediaQueryListListener listener);
+};
+
+[scriptable, function, uuid(279a5cbd-5c15-475d-847b-e0de1624eb77)]
+interface nsIDOMMediaQueryListListener : nsISupports
+{
+  void handleChange(in nsIDOMMediaQueryList mql);
+};
diff --git a/dom/interfaces/base/nsIDOMWindowInternal.idl b/dom/interfaces/base/nsIDOMWindowInternal.idl
index a4fc9b6a24b0..114b39d40926 100644
--- a/dom/interfaces/base/nsIDOMWindowInternal.idl
+++ b/dom/interfaces/base/nsIDOMWindowInternal.idl
@@ -44,8 +44,9 @@ interface nsIControllers;
 interface nsIDOMLocation;
 interface nsIVariant;
 interface nsIAnimationFrameListener;
+interface nsIDOMMediaQueryList;
 
-[scriptable, uuid(9d6a1157-0719-46a7-b49f-7ffeaa0b5c86)]
+[scriptable, uuid(04eafa93-efbe-4254-9d65-91c344fa7ff2)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
@@ -232,6 +233,11 @@ interface nsIDOMWindowInternal : nsIDOMWindow2
    * The current animation start time in milliseconds since the epoch.
    */
   readonly attribute long long mozAnimationStartTime;
+
+  /**
+   * http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
+   */
+  nsIDOMMediaQueryList matchMedia(in DOMString media_query_list);
 };
 
 [scriptable, uuid(8fc58f56-f769-4368-a098-edd08550cf1a)]
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 38871ee87833..69ad151b07b8 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -100,6 +100,7 @@
 #include "mozilla/dom/Element.h"
 #include "nsIFrameMessageManager.h"
 #include "FrameLayerBuilder.h"
+#include "nsDOMMediaQueryList.h"
 
 #ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
@@ -254,6 +255,8 @@ nsPresContext::nsPresContext(nsIDocument* aDocument, nsPresContextType aType)
   NS_ASSERTION(mDocument, "Null document");
   mUserFontSet = nsnull;
   mUserFontSetDirty = PR_TRUE;
+
+  PR_INIT_CLIST(&mDOMMediaQueryLists);
 }
 
 nsPresContext::~nsPresContext()
@@ -261,6 +264,9 @@ nsPresContext::~nsPresContext()
   NS_PRECONDITION(!mShell, "Presshell forgot to clear our mShell pointer");
   SetShell(nsnull);
 
+  NS_ABORT_IF_FALSE(PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists),
+                    "must not have media query lists left");
+
   // Disconnect the refresh driver *after* the transition manager, which
   // needs it.
   if (mRefreshDriver && mRefreshDriver->PresContext() == this) {
@@ -1643,11 +1649,56 @@ nsPresContext::MediaFeatureValuesChanged(PRBool aCallerWillRebuildStyleData)
       !aCallerWillRebuildStyleData) {
     RebuildAllStyleData(nsChangeHint(0));
   }
+
+  if (!nsContentUtils::IsSafeToRunScript()) {
+    NS_ABORT_IF_FALSE(mDocument->IsBeingUsedAsImage(),
+                      "How did we get here?  Are we failing to notify "
+                      "listeners that we should notify?");
+    return;
+  }
+
+  // Media query list listeners should be notified from a queued task
+  // (in HTML5 terms), although we also want to notify them on certain
+  // flushes.  (We're already running off an event.)
+  //
+  // Note that we do this after the new style from media queries in
+  // style sheets has been computed.
+
+  if (!PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists)) {
+    // We build a list of all the notifications we're going to send
+    // before we send any of them.  (The spec says the notifications
+    // should be a queued task, so any removals that happen during the
+    // notifications shouldn't affect what gets notified.)  Furthermore,
+    // we hold strong pointers to everything we're going to make
+    // notification calls to, since each notification involves calling
+    // arbitrary script that might otherwise destroy these objects, or,
+    // for that matter, |this|.
+    //
+    // Note that we intentionally send the notifications to media query
+    // list in the order they were created and, for each list, to the
+    // listeners in the order added.
+    nsDOMMediaQueryList::NotifyList notifyList;
+    for (PRCList *l = PR_LIST_HEAD(&mDOMMediaQueryLists);
+         l != &mDOMMediaQueryLists; l = PR_NEXT_LINK(l)) {
+      nsDOMMediaQueryList *mql = static_cast<nsDOMMediaQueryList*>(l);
+      mql->MediumFeaturesChanged(notifyList);
+    }
+
+    for (PRUint32 i = 0, i_end = notifyList.Length(); i != i_end; ++i) {
+      nsDOMMediaQueryList::HandleChangeData &d = notifyList[i];
+      d.listener->HandleChange(d.mql);
+    }
+
+    // NOTE:  When |notifyList| goes out of scope, our destructor could run.
+  }
 }
 
 void
 nsPresContext::PostMediaFeatureValuesChangedEvent()
 {
+  // FIXME: We should probably replace this event with use of
+  // nsRefreshDriver::AddStyleFlushObserver (except the pres shell would
+  // need to track whether it's been added).
   if (!mPendingMediaFeatureValuesChanged) {
     nsCOMPtr<nsIRunnable> ev =
       NS_NewRunnableMethod(this, &nsPresContext::HandleMediaFeatureValuesChangedEvent);
@@ -1667,6 +1718,19 @@ nsPresContext::HandleMediaFeatureValuesChangedEvent()
   }
 }
 
+void
+nsPresContext::MatchMedia(const nsAString& aMediaQueryList,
+                          nsIDOMMediaQueryList** aResult)
+{
+  nsRefPtr<nsDOMMediaQueryList> result =
+    new nsDOMMediaQueryList(this, aMediaQueryList);
+
+  // Insert the new item at the end of the linked list.
+  PR_INSERT_BEFORE(result, &mDOMMediaQueryLists);
+
+  result.forget(aResult);
+}
+
 void
 nsPresContext::SetPaginatedScrolling(PRBool aPaginated)
 {
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 09f399357933..f808032d6b4f 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -73,6 +73,7 @@
 #include "nsIWidget.h"
 #include "mozilla/TimeStamp.h"
 #include "nsIContent.h"
+#include "prclist.h"
 
 class nsImageLoader;
 #ifdef IBMBIDI
@@ -107,6 +108,7 @@ class nsAnimationManager;
 #endif
 class nsRefreshDriver;
 class imgIContainer;
+class nsIDOMMediaQueryList;
 
 #ifdef MOZ_REFLOW_PERF
 class nsRenderingContext;
@@ -269,6 +271,12 @@ public:
       MediaFeatureValuesChanged(PR_FALSE);
   }
 
+  /**
+   * Support for window.matchMedia()
+   */
+  void MatchMedia(const nsAString& aMediaQueryList,
+                  nsIDOMMediaQueryList** aResult);
+
   /**
    * Access compatibility mode for this context.  This is the same as
    * our document's compatibility mode.
@@ -1077,6 +1085,8 @@ protected:
 
   nsWeakPtr             mContainer;
 
+  PRCList               mDOMMediaQueryLists;
+
   PRInt32               mMinFontSize;   // Min font size, defaults to 0
   float                 mTextZoom;      // Text zoom, defaults to 1.0
   float                 mFullZoom;      // Page zoom, defaults to 1.0
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index 24e4f282eeaf..c1b629537729 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -71,6 +71,7 @@ EXPORTS		= \
 		nsCSSValue.h \
 		nsDOMCSSAttrDeclaration.h \
 		nsDOMCSSDeclaration.h \
+		nsDOMMediaQueryList.h \
 		nsICSSDeclaration.h \
 		nsICSSLoaderObserver.h \
 		nsICSSPseudoComparator.h \
@@ -127,6 +128,7 @@ CPPSRCS		= \
 		nsDOMCSSRGBColor.cpp \
 		nsDOMCSSRect.cpp \
 		nsDOMCSSValueList.cpp \
+		nsDOMMediaQueryList.cpp \
 		nsFontFaceLoader.cpp \
 		nsHTMLCSSStyleSheet.cpp \
 		nsHTMLStyleSheet.cpp \
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index 9cd133f66e9c..d486f9b876df 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -587,7 +587,7 @@ nsMediaList::SetText(const nsAString& aMediaText)
     htmlMode = !!node;
   }
 
-  return parser.ParseMediaList(nsString(aMediaText), nsnull, 0,
+  return parser.ParseMediaList(aMediaText, nsnull, 0,
                                this, htmlMode);
 }
 
diff --git a/layout/style/nsDOMMediaQueryList.cpp b/layout/style/nsDOMMediaQueryList.cpp
new file mode 100644
index 000000000000..c1ed9fb8ddf2
--- /dev/null
+++ b/layout/style/nsDOMMediaQueryList.cpp
@@ -0,0 +1,164 @@
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is nsDOMMediaQueryList.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* implements DOM interface for querying and observing media queries */
+
+#include "nsDOMMediaQueryList.h"
+#include "nsPresContext.h"
+#include "nsIMediaList.h"
+#include "nsCSSParser.h"
+
+nsDOMMediaQueryList::nsDOMMediaQueryList(nsPresContext *aPresContext,
+                                         const nsAString &aMediaQueryList)
+  : mPresContext(aPresContext),
+    mMediaList(new nsMediaList),
+    mMatchesValid(PR_FALSE)
+{
+  PR_INIT_CLIST(this);
+
+  nsCSSParser parser;
+  parser.ParseMediaList(aMediaQueryList, nsnull, 0, mMediaList, PR_FALSE);
+}
+
+nsDOMMediaQueryList::~nsDOMMediaQueryList()
+{
+  if (mPresContext) {
+    PR_REMOVE_LINK(this);
+  }
+}
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMMediaQueryList)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMMediaQueryList)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPresContext)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSTARRAY_OF_NSCOMPTR(mListeners)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMMediaQueryList)
+if (tmp->mPresContext) {
+  PR_REMOVE_LINK(tmp);
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mPresContext)
+}
+NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mListeners)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+DOMCI_DATA(MediaQueryList, nsDOMMediaQueryList)
+
+NS_INTERFACE_MAP_BEGIN(nsDOMMediaQueryList)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMMediaQueryList)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+  NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMMediaQueryList)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MediaQueryList)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMMediaQueryList)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMMediaQueryList)
+
+NS_IMETHODIMP
+nsDOMMediaQueryList::GetMedia(nsAString &aMedia)
+{
+  mMediaList->GetText(aMedia);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMMediaQueryList::GetMatches(PRBool *aMatches)
+{
+  if (!mMatchesValid) {
+    NS_ABORT_IF_FALSE(mListeners.Length() == 0,
+                      "when listeners present, must keep mMatches current");
+    RecomputeMatches();
+  }
+
+  *aMatches = mMatches;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMMediaQueryList::AddListener(nsIDOMMediaQueryListListener *aListener)
+{
+  if (!mMatchesValid) {
+    NS_ABORT_IF_FALSE(mListeners.Length() == 0,
+                      "when listeners present, must keep mMatches current");
+    RecomputeMatches();
+  }
+
+  if (!mListeners.Contains(aListener)) {
+    mListeners.AppendElement(aListener);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMMediaQueryList::RemoveListener(nsIDOMMediaQueryListListener *aListener)
+{
+  mListeners.RemoveElement(aListener);
+  NS_ABORT_IF_FALSE(!mListeners.Contains(aListener),
+                    "duplicate occurrence of listeners");
+  return NS_OK;
+}
+
+void
+nsDOMMediaQueryList::RecomputeMatches()
+{
+  if (!mPresContext) {
+    return;
+  }
+
+  mMatches = mMediaList->Matches(mPresContext, nsnull);
+  mMatchesValid = PR_TRUE;
+}
+
+void
+nsDOMMediaQueryList::MediumFeaturesChanged(NotifyList &aListenersToNotify)
+{
+  mMatchesValid = PR_FALSE;
+
+  if (mListeners.Length()) {
+    PRPackedBool oldMatches = mMatches;
+    RecomputeMatches();
+    if (mMatches != oldMatches) {
+      for (PRUint32 i = 0, i_end = mListeners.Length(); i != i_end; ++i) {
+        HandleChangeData *d = aListenersToNotify.AppendElement();
+        if (d) {
+          d->mql = this;
+          d->listener = mListeners[i];
+        }
+      }
+    }
+  }
+}
diff --git a/layout/style/nsDOMMediaQueryList.h b/layout/style/nsDOMMediaQueryList.h
new file mode 100644
index 000000000000..76c76c6b7d9f
--- /dev/null
+++ b/layout/style/nsDOMMediaQueryList.h
@@ -0,0 +1,106 @@
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is nsDOMMediaQueryList.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* implements DOM interface for querying and observing media queries */
+
+#ifndef nsDOMMediaQueryList_h_
+#define nsDOMMediaQueryList_h_
+
+#include "nsIDOMMediaQueryList.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
+#include "prclist.h"
+
+class nsPresContext;
+class nsMediaList;
+
+class nsDOMMediaQueryList : public nsIDOMMediaQueryList,
+                            public PRCList
+{
+public:
+  // The caller who constructs is responsible for calling Evaluate
+  // before calling any other methods.
+  nsDOMMediaQueryList(nsPresContext *aPresContext,
+                      const nsAString &aMediaQueryList);
+private:
+  ~nsDOMMediaQueryList();
+
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMMediaQueryList)
+
+  NS_DECL_NSIDOMMEDIAQUERYLIST
+
+  struct HandleChangeData {
+    nsRefPtr<nsDOMMediaQueryList> mql;
+    nsCOMPtr<nsIDOMMediaQueryListListener> listener;
+  };
+
+  typedef FallibleTArray< nsCOMPtr<nsIDOMMediaQueryListListener> > ListenerList;
+  typedef FallibleTArray<HandleChangeData> NotifyList;
+
+  // Appends listeners that need notification to aListenersToNotify
+  void MediumFeaturesChanged(NotifyList &aListenersToNotify);
+
+private:
+  void RecomputeMatches();
+
+  // We only need a pointer to the pres context to support lazy
+  // reevaluation following dynamic changes.  However, this lazy
+  // reevaluation is perhaps somewhat important, since some usage
+  // patterns may involve the creation of large numbers of
+  // MediaQueryList objects which almost immediately become garbage
+  // (after a single call to the .matches getter).
+  //
+  // This pointer does make us a little more dependent on cycle
+  // collection.
+  //
+  // We have a non-null mPresContext for our entire lifetime except
+  // after cycle collection unlinking.  Having a non-null mPresContext
+  // is equivalent to being in that pres context's mDOMMediaQueryLists
+  // linked list.
+  nsRefPtr<nsPresContext> mPresContext;
+
+  nsRefPtr<nsMediaList> mMediaList;
+  PRPackedBool mMatches;
+  PRPackedBool mMatchesValid;
+  ListenerList mListeners;
+};
+
+#endif /* !defined(nsDOMMediaQueryList_h_) */
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 60b429014a0d..0059a2d77ae4 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -155,6 +155,7 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_media_queries.html \
 		test_media_queries_dynamic.html \
 		test_media_queries_dynamic_xbl.html \
+		test_media_query_list.html \
 		test_moz_device_pixel_ratio.html \
 		test_namespace_rule.html \
 		test_of_type_selectors.xhtml \
diff --git a/layout/style/test/test_media_queries_dynamic.html b/layout/style/test/test_media_queries_dynamic.html
index 5a67e077c988..c108963d5fe5 100644
--- a/layout/style/test/test_media_queries_dynamic.html
+++ b/layout/style/test/test_media_queries_dynamic.html
@@ -57,11 +57,6 @@ function run() {
     ok(!query_applies(cs), cs._originalQueryText + " should not apply");
   }
 
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-  const CI = Components.interfaces;
-  var iframe_docshell = subwin.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIWebNavigation).QueryInterface(CI.nsIDocShell);
-  var iframe_mudv = iframe_docshell.contentViewer.QueryInterface(CI.nsIMarkupDocumentViewer);
-
   var content_div = document.getElementById("content");
   content_div.style.font = "-moz-initial";
   var em_size =
@@ -95,26 +90,26 @@ function run() {
   should_apply(wh_queries[1]);
   should_apply(wh_queries[2]);
   should_not_apply(wh_queries[3]);
-  iframe_mudv.textZoom = 2.0;
+  SpecialPowers.setTextZoom(subwin, 2.0);
   isnot(wh_queries[0].fontSize, em_size + "px", "text zoom is not 1.0");
   should_not_apply(wh_queries[4]);
   should_apply(wh_queries[5]);
   should_apply(wh_queries[6]);
   should_not_apply(wh_queries[7]);
-  iframe_mudv.textZoom = 1.0;
+  SpecialPowers.setTextZoom(subwin, 1.0);
   is(wh_queries[0].fontSize, em_size + "px", "text zoom is 1.0");
   is(subwin.innerHeight, 228, "full zoom is 1.0");
   should_not_apply(wh_queries[0]);
   should_apply(wh_queries[1]);
   should_apply(wh_queries[2]);
   should_not_apply(wh_queries[3]);
-  iframe_mudv.fullZoom = 2.0;
+  SpecialPowers.setFullZoom(subwin, 2.0);
   isnot(subwin.innerHeight, 228, "full zoom is not 1.0");
   should_not_apply(wh_queries[4]);
   should_apply(wh_queries[5]);
   should_apply(wh_queries[6]);
   should_not_apply(wh_queries[7]);
-  iframe_mudv.fullZoom = 1.0;
+  SpecialPowers.setFullZoom(subwin, 1.0);
   is(subwin.innerHeight, 228, "full zoom is 1.0");
 
   SimpleTest.finish();
diff --git a/layout/style/test/test_media_query_list.html b/layout/style/test/test_media_query_list.html
new file mode 100644
index 000000000000..407555a4a50b
--- /dev/null
+++ b/layout/style/test/test_media_query_list.html
@@ -0,0 +1,259 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=542058
+-->
+<head>
+  <title>Test for MediaQueryList (Bug 542058)</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="run()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=542058">Mozilla Bug 542058</a>
+<iframe id="subdoc" src="about:blank"></iframe>
+<div id="content" style="display:none"></div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for MediaQueryList (Bug 542058) **/
+
+SimpleTest.waitForExplicitFinish();
+
+function run() {
+  var iframe = document.getElementById("subdoc");
+  var subdoc = iframe.contentDocument;
+  var subwin = iframe.contentWindow;
+  var subroot = subdoc.documentElement;
+
+  var content_div = document.getElementById("content");
+  content_div.style.font = "-moz-initial";
+  var em_size =
+    getComputedStyle(content_div, "").fontSize.match(/^(\d+)px$/)[1];
+
+  var w = Math.floor(em_size * 9.3);
+  var h = Math.floor(em_size * 4.2);
+  iframe.style.width = w + "px";
+  iframe.style.height = h + "px";
+  subroot.offsetWidth; // flush layout
+
+  function setup_mql(str) {
+    var obj = { str: str, mql: subwin.matchMedia(str), notifyCount: 0 }
+    obj.mql.addListener(function(mql) {
+                          is(mql, obj.mql,
+                             "correct argument to listener: " + obj.str);
+                          ++obj.notifyCount;
+                          // Test the last match result only on odd
+                          // notifications.
+                          if (obj.notifyCount & 1) {
+                            obj.lastOddMatchResult = mql.matches;
+                          }
+                        });
+    return obj;
+  }
+
+  var w_exact_w = setup_mql("(width: " + w + "px)");
+  var w_min_9em = setup_mql("(min-width : 9em)");
+  var w_min_10em = setup_mql("(  min-width: 10em ) ");
+  var w_max_9em = setup_mql("(max-width: 9em)");
+  var w_max_10em = setup_mql("(max-width: 10em)");
+
+  is(w_exact_w.mql.media, "(width: " + w + "px)", "serialization");
+  is(w_min_9em.mql.media, "(min-width: 9em)", "serialization");
+  is(w_min_10em.mql.media, "(min-width: 10em)", "serialization");
+  is(w_max_9em.mql.media, "(max-width: 9em)", "serialization");
+  is(w_max_10em.mql.media, "(max-width: 10em)", "serialization");
+
+  function check_match(obj, expected, desc) {
+    is(obj.mql.matches, expected,
+       obj.str + " media query list .matches " + desc);
+    if (obj.notifyCount & 1) { // odd notifications only
+      is(obj.lastOddMatchResult, expected,
+       obj.str + " media query list last notify result " + desc);
+    }
+  }
+  function check_notify(obj, expected, desc) {
+    is(obj.notifyCount, expected,
+       obj.str + " media query list .notify count " + desc);
+  }
+  check_match(w_exact_w, true, "initially");
+  check_notify(w_exact_w, 0, "initially");
+  check_match(w_min_9em, true, "initially");
+  check_notify(w_min_9em, 0, "initially");
+  check_match(w_min_10em, false, "initially");
+  check_notify(w_min_10em, 0, "initially");
+  check_match(w_max_9em, false, "initially");
+  check_notify(w_max_9em, 0, "initially");
+  check_match(w_max_10em, true, "initially");
+  check_notify(w_max_10em, 0, "initially");
+
+  var w2 = Math.floor(em_size * 10.3);
+  iframe.style.width = w2 + "px";
+  subroot.offsetWidth; // flush layout
+
+  check_match(w_exact_w, false, "after width increase to around 10.3em");
+  check_notify(w_exact_w, 1, "after width increase to around 10.3em");
+  check_match(w_min_9em, true, "after width increase to around 10.3em");
+  check_notify(w_min_9em, 0, "after width increase to around 10.3em");
+  check_match(w_min_10em, true, "after width increase to around 10.3em");
+  check_notify(w_min_10em, 1, "after width increase to around 10.3em");
+  check_match(w_max_9em, false, "after width increase to around 10.3em");
+  check_notify(w_max_9em, 0, "after width increase to around 10.3em");
+  check_match(w_max_10em, false, "after width increase to around 10.3em");
+  check_notify(w_max_10em, 1, "after width increase to around 10.3em");
+
+  var w3 = w * 2;
+  iframe.style.width = w3 + "px";
+  subroot.offsetWidth; // flush layout
+
+  check_match(w_exact_w, false, "after width double from original");
+  check_notify(w_exact_w, 1, "after width double from original");
+  check_match(w_min_9em, true, "after width double from original");
+  check_notify(w_min_9em, 0, "after width double from original");
+  check_match(w_min_10em, true, "after width double from original");
+  check_notify(w_min_10em, 1, "after width double from original");
+  check_match(w_max_9em, false, "after width double from original");
+  check_notify(w_max_9em, 0, "after width double from original");
+  check_match(w_max_10em, false, "after width double from original");
+  check_notify(w_max_10em, 1, "after width double from original");
+
+  SpecialPowers.setFullZoom(subwin, 2.0);
+  subroot.offsetWidth; // flush layout
+
+  check_match(w_exact_w, true, "after zoom");
+  check_notify(w_exact_w, 2, "after zoom");
+  check_match(w_min_9em, true, "after zoom");
+  check_notify(w_min_9em, 0, "after zoom");
+  check_match(w_min_10em, false, "after zoom");
+  check_notify(w_min_10em, 2, "after zoom");
+  check_match(w_max_9em, false, "after zoom");
+  check_notify(w_max_9em, 0, "after zoom");
+  check_match(w_max_10em, true, "after zoom");
+  check_notify(w_max_10em, 2, "after zoom");
+
+  SpecialPowers.setFullZoom(subwin, 1.0);
+
+  // Additional tests of listener mutation.
+  (function() {
+    var received = [];
+    var received_mql = [];
+    function listener1(mql) {
+      received.push(1);
+      received_mql.push(mql);
+    }
+    function listener2(mql) {
+      received.push(2);
+      received_mql.push(mql);
+    }
+
+    iframe.style.width = "200px";
+    subroot.offsetWidth; // flush layout
+
+    var mql = subwin.matchMedia("(min-width: 150px)");
+    mql.addListener(listener1);
+    mql.addListener(listener1);
+    mql.addListener(listener2);
+    is(JSON.stringify(received), "[]", "listeners before notification");
+
+    iframe.style.width = "100px";
+    subroot.offsetWidth; // flush layout
+
+    is(JSON.stringify(received), "[1,2]", "duplicate listeners removed");
+    received = [];
+    mql.removeListener(listener1);
+
+    iframe.style.width = "200px";
+    subroot.offsetWidth; // flush layout
+
+    is(JSON.stringify(received), "[2]", "listener removal");
+    received = [];
+    mql.addListener(listener1);
+
+    iframe.style.width = "100px";
+    subroot.offsetWidth; // flush layout
+
+    is(JSON.stringify(received), "[2,1]", "listeners notified in order");
+    received = [];
+    mql.addListener(listener2);
+
+    iframe.style.width = "200px";
+    subroot.offsetWidth; // flush layout
+
+    is(JSON.stringify(received), "[2,1]", "add of existing listener is no-op");
+    received = [];
+    mql.addListener(listener1);
+
+    iframe.style.width = "100px";
+    subroot.offsetWidth; // flush layout
+
+    is(JSON.stringify(received), "[2,1]", "add of existing listener is no-op");
+    mql.removeListener(listener2);
+    received = [];
+    received_mql = [];
+
+    var mql2 = subwin.matchMedia("(min-width: 160px)");
+    mql2.addListener(listener1);
+    mql.addListener(listener2);
+
+    iframe.style.width = "200px";
+    subroot.offsetWidth; // flush layout
+
+    // mql (1, 2), mql2 (1)
+    is(JSON.stringify(received), "[1,2,1]",
+       "notification of lists in order created");
+    is(received_mql[0], mql,
+       "notification of lists in order created");
+    is(received_mql[1], mql,
+       "notification of lists in order created");
+    is(received_mql[2], mql2,
+       "notification of lists in order created");
+    received = [];
+    received_mql = [];
+
+    function removing_listener(mql) {
+      received.push(3);
+      received_mql.push(mql);
+      mql.removeListener(listener2);
+      mql2.removeListener(listener1);
+    }
+
+    mql.addListener(removing_listener);
+    mql.removeListener(listener2);
+    mql.addListener(listener2); // after removing_listener (3)
+
+    iframe.style.width = "100px";
+    subroot.offsetWidth; // flush layout
+
+    // mql(1, 3, 2) mql2(1)
+    is(JSON.stringify(received), "[1,3,2,1]",
+       "listeners still notified after removed if change was before");
+    is(received_mql[0], mql,
+       "notification order (removal tests)");
+    is(received_mql[1], mql,
+       "notification order (removal tests)");
+    is(received_mql[2], mql,
+       "notification order (removal tests)");
+    is(received_mql[3], mql2,
+       "notification order (removal tests)");
+    received = [];
+    received_mql = [];
+
+    iframe.style.width = "200px";
+    subroot.offsetWidth; // flush layout
+
+    // mql(1, 3)
+    is(JSON.stringify(received), "[1,3]",
+       "listeners not notified for changes after their removal");
+    is(received_mql[0], mql,
+       "notification order (removal tests)");
+    is(received_mql[1], mql,
+       "notification order (removal tests)");
+  })();
+
+  SimpleTest.finish();
+}
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h
index cc195e9ac4b7..36c248aed4cb 100644
--- a/xpcom/glue/nsCycleCollectionParticipant.h
+++ b/xpcom/glue/nsCycleCollectionParticipant.h
@@ -400,6 +400,15 @@ public:
                                                      _name "[i]");             \
     }
 
+#define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSTARRAY_OF_NSCOMPTR(_field)         \
+    {                                                                          \
+      PRUint32 i, length = tmp->_field.Length();                               \
+      for (i = 0; i < length; ++i) {                                           \
+        NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, #_field "[i]");                 \
+        cb.NoteXPCOMChild(tmp->_field[i].get());                               \
+      }                                                                        \
+    }
+
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSTARRAY_MEMBER(_field,              \
                                                           _element_class)      \
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSTARRAY(tmp->_field, _element_class,    \

From 72447213b1d379d5dce429eebc2a58530eb87c5f Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:32 -0700
Subject: [PATCH 353/509] Remove parsing and storage code for CSS 2.0 aural
 properties.  (Bug 649119)  r=bzbarsky

---
 dom/interfaces/css/nsIDOMCSS2Properties.idl |  59 +------
 layout/style/Declaration.cpp                |  16 --
 layout/style/nsCSSKeywordList.h             |  32 ----
 layout/style/nsCSSParser.cpp                |  91 ----------
 layout/style/nsCSSPropList.h                | 131 ---------------
 layout/style/nsCSSProps.cpp                 |  93 -----------
 layout/style/nsCSSValue.cpp                 |   8 -
 layout/style/nsComputedDOMStyle.cpp         |  19 ---
 layout/style/test/property_database.js      | 175 --------------------
 layout/style/test/test_units_angle.html     |   4 +-
 layout/style/test/test_units_frequency.html |   7 +-
 layout/style/test/test_units_time.html      |  14 +-
 12 files changed, 14 insertions(+), 635 deletions(-)

diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl
index 219ba558d960..6a8c0634dbaf 100644
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@@ -50,12 +50,9 @@
  * http://www.w3.org/TR/DOM-Level-2-Style
  */
 
-[scriptable, uuid(cd0e6cfe-7278-49b2-a1d6-c2b87b6eb7e0)]
+[scriptable, uuid(f28df617-ac8b-48e0-8094-c4642ab43940)]
 interface nsIDOMCSS2Properties : nsISupports
 {
-           attribute DOMString        azimuth;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        background;
                                         // raises(DOMException) on setting
 
@@ -182,15 +179,6 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        counterReset;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        cue;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        cueAfter;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        cueBefore;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        cursor;
                                         // raises(DOMException) on setting
 
@@ -200,9 +188,6 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        display;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        elevation;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        emptyCells;
                                         // raises(DOMException) on setting
 
@@ -335,54 +320,18 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        pageBreakInside;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        pause;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        pauseAfter;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        pauseBefore;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        pitch;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        pitchRange;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        position;
                                         // raises(DOMException) on setting
 
            attribute DOMString        quotes;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        richness;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        right;
                                         // raises(DOMException) on setting
 
            attribute DOMString        size;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        speak;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        speakHeader;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        speakNumeral;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        speakPunctuation;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        speechRate;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        stress;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        tableLayout;
                                         // raises(DOMException) on setting
 
@@ -413,12 +362,6 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        visibility;
                                         // raises(DOMException) on setting
 
-           attribute DOMString        voiceFamily;
-                                        // raises(DOMException) on setting
-
-           attribute DOMString        volume;
-                                        // raises(DOMException) on setting
-
            attribute DOMString        whiteSpace;
                                         // raises(DOMException) on setting
 
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index e1362d0ec1cd..2b7aa829e563 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -483,14 +483,6 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
       AppendValueToString(eCSSProperty_background_color, aValue);
       break;
     }
-    case eCSSProperty_cue: {
-      if (AppendValueToString(eCSSProperty_cue_before, aValue)) {
-        aValue.Append(PRUnichar(' '));
-        if (!AppendValueToString(eCSSProperty_cue_after, aValue))
-          aValue.Truncate();
-      }
-      break;
-    }
     case eCSSProperty_font: {
       // systemFont might not be present; the others are guaranteed to be
       // based on the shorthand check at the beginning of the function
@@ -588,14 +580,6 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
         xValue.AppendToString(eCSSProperty_overflow_x, aValue);
       break;
     }
-    case eCSSProperty_pause: {
-      if (AppendValueToString(eCSSProperty_pause_before, aValue)) {
-        aValue.Append(PRUnichar(' '));
-        if (!AppendValueToString(eCSSProperty_pause_after, aValue))
-          aValue.Truncate();
-      }
-      break;
-    }
     case eCSSProperty_transition: {
       const nsCSSValue &transProp =
         *data->ValueFor(eCSSProperty_transition_property);
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index e685e6d63689..967a70496c4b 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -180,7 +180,6 @@ CSS_KEY(-moz-window, _moz_window)
 CSS_KEY(-moz-workspace, _moz_workspace)
 CSS_KEY(-moz-zoom-in, _moz_zoom_in)
 CSS_KEY(-moz-zoom-out, _moz_zoom_out)
-CSS_KEY(above, above)
 CSS_KEY(absolute, absolute)
 CSS_KEY(active, active)
 CSS_KEY(activeborder, activeborder)
@@ -197,8 +196,6 @@ CSS_KEY(avoid, avoid)
 CSS_KEY(background, background)
 CSS_KEY(backwards, backwards)
 CSS_KEY(baseline, baseline)
-CSS_KEY(behind, behind)
-CSS_KEY(below, below)
 CSS_KEY(bidi-override, bidi_override)
 CSS_KEY(blink, blink)
 CSS_KEY(block, block)
@@ -221,8 +218,6 @@ CSS_KEY(caption, caption)
 CSS_KEY(captiontext, captiontext)
 CSS_KEY(cell, cell)
 CSS_KEY(center, center)
-CSS_KEY(center-left, center_left)
-CSS_KEY(center-right, center_right)
 CSS_KEY(ch, ch)
 CSS_KEY(circle, circle)
 CSS_KEY(cjk-ideographic, cjk_ideographic)
@@ -230,7 +225,6 @@ CSS_KEY(close-quote, close_quote)
 CSS_KEY(closest-corner, closest_corner)
 CSS_KEY(closest-side, closest_side)
 CSS_KEY(cm, cm)
-CSS_KEY(code, code)
 CSS_KEY(col-resize, col_resize)
 CSS_KEY(collapse, collapse)
 CSS_KEY(condensed, condensed)
@@ -250,7 +244,6 @@ CSS_KEY(decimal-leading-zero, decimal_leading_zero)
 CSS_KEY(default, default)
 CSS_KEY(deg, deg)
 CSS_KEY(dialog, dialog)
-CSS_KEY(digits, digits)
 CSS_KEY(disabled, disabled)
 CSS_KEY(disc, disc)
 CSS_KEY(dotted, dotted)
@@ -273,12 +266,8 @@ CSS_KEY(expanded, expanded)
 CSS_KEY(extra-condensed, extra_condensed)
 CSS_KEY(extra-expanded, extra_expanded)
 CSS_KEY(ew-resize, ew_resize)
-CSS_KEY(far-left, far_left)
-CSS_KEY(far-right, far_right)
 CSS_KEY(farthest-side, farthest_side)
 CSS_KEY(farthest-corner, farthest_corner)
-CSS_KEY(fast, fast)
-CSS_KEY(faster, faster)
 CSS_KEY(fill, fill)
 CSS_KEY(fixed, fixed)
 CSS_KEY(forwards, forwards)
@@ -290,8 +279,6 @@ CSS_KEY(hebrew, hebrew)
 CSS_KEY(help, help)
 CSS_KEY(hidden, hidden)
 CSS_KEY(hide, hide)
-CSS_KEY(high, high)
-CSS_KEY(higher, higher)
 CSS_KEY(highlight, highlight)
 CSS_KEY(highlighttext, highlighttext)
 CSS_KEY(hiragana, hiragana)
@@ -328,17 +315,11 @@ CSS_KEY(landscape, landscape)
 CSS_KEY(large, large)
 CSS_KEY(larger, larger)
 CSS_KEY(left, left)
-CSS_KEY(left-side, left_side)
-CSS_KEY(leftwards, leftwards)
-CSS_KEY(level, level)
 CSS_KEY(lighter, lighter)
 CSS_KEY(line-through, line_through)
 CSS_KEY(linear, linear)
 CSS_KEY(list-item, list_item)
 CSS_KEY(logical, logical)
-CSS_KEY(loud, loud)
-CSS_KEY(low, low)
-CSS_KEY(lower, lower)
 CSS_KEY(lower-alpha, lower_alpha)
 CSS_KEY(lower-greek, lower_greek)
 CSS_KEY(lower-latin, lower_latin)
@@ -372,7 +353,6 @@ CSS_KEY(ns-resize, ns_resize)
 CSS_KEY(nw-resize, nw_resize)
 CSS_KEY(nwse-resize, nwse_resize)
 CSS_KEY(oblique, oblique)
-CSS_KEY(once, once)
 CSS_KEY(open-quote, open_quote)
 CSS_KEY(outset, outset)
 CSS_KEY(outside, outside)
@@ -401,8 +381,6 @@ CSS_KEY(repeat-y, repeat_y)
 CSS_KEY(reverse, reverse)
 CSS_KEY(ridge, ridge)
 CSS_KEY(right, right)
-CSS_KEY(right-side, right_side)
-CSS_KEY(rightwards, rightwards)
 CSS_KEY(rotate, rotate)
 CSS_KEY(round, round)
 CSS_KEY(row-resize, row_resize)
@@ -426,19 +404,15 @@ CSS_KEY(semi-condensed, semi_condensed)
 CSS_KEY(semi-expanded, semi_expanded)
 CSS_KEY(separate, separate)
 CSS_KEY(show, show)
-CSS_KEY(silent, silent)
 CSS_KEY(skew, skew)
 CSS_KEY(skewx, skewx)
 CSS_KEY(skewy, skewy)
-CSS_KEY(slow, slow)
-CSS_KEY(slower, slower)
 CSS_KEY(small, small)
 CSS_KEY(small-caps, small_caps)
 CSS_KEY(small-caption, small_caption)
 CSS_KEY(smaller, smaller)
 CSS_KEY(soft, soft)
 CSS_KEY(solid, solid)
-CSS_KEY(spell-out, spell_out)
 CSS_KEY(square, square)
 CSS_KEY(start, start)
 CSS_KEY(static, static)
@@ -499,14 +473,8 @@ CSS_KEY(window, window)
 CSS_KEY(windowframe, windowframe)
 CSS_KEY(windowtext, windowtext)
 CSS_KEY(write-only, write_only)
-CSS_KEY(x-fast, x_fast)
-CSS_KEY(x-high, x_high)
 CSS_KEY(x-large, x_large)
-CSS_KEY(x-loud, x_loud)
-CSS_KEY(x-low, x_low)
-CSS_KEY(x-slow, x_slow)
 CSS_KEY(x-small, x_small)
-CSS_KEY(x-soft, x_soft)
 CSS_KEY(xx-large, xx_large)
 CSS_KEY(xx-small, xx_small)
 
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 880d2c6507d6..abdcf648e8b5 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -453,7 +453,6 @@ protected:
   void InitBoxPropsAsPhysical(const nsCSSProperty *aSourceProperties);
 
   // Property specific parsing routines
-  PRBool ParseAzimuth(nsCSSValue& aValue);
   PRBool ParseBackground();
 
   struct BackgroundParseState {
@@ -506,7 +505,6 @@ protected:
   PRBool ParseRect(nsCSSProperty aPropID);
   PRBool ParseContent();
   PRBool ParseCounterData(nsCSSProperty aPropID);
-  PRBool ParseCue();
   PRBool ParseCursor();
   PRBool ParseFont();
   PRBool ParseFontWeight(nsCSSValue& aValue);
@@ -522,7 +520,6 @@ protected:
   PRBool ParseOutline();
   PRBool ParseOverflow();
   PRBool ParsePadding();
-  PRBool ParsePause();
   PRBool ParseQuotes();
   PRBool ParseSize();
   PRBool ParseTextDecoration(nsCSSValue& aValue);
@@ -5523,8 +5520,6 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
   case eCSSProperty_counter_increment:
   case eCSSProperty_counter_reset:
     return ParseCounterData(aPropID);
-  case eCSSProperty_cue:
-    return ParseCue();
   case eCSSProperty_cursor:
     return ParseCursor();
   case eCSSProperty_font:
@@ -5565,8 +5560,6 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
   case eCSSProperty_padding_start:
     return ParseDirectionalBoxProperty(eCSSProperty_padding_start,
                                        NS_BOXPROP_SOURCE_LOGICAL);
-  case eCSSProperty_pause:
-    return ParsePause();
   case eCSSProperty_quotes:
     return ParseQuotes();
   case eCSSProperty_size:
@@ -5624,10 +5617,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
 
   if (nsCSSProps::PropHasFlags(aPropID, CSS_PROPERTY_VALUE_PARSER_FUNCTION)) {
     switch (aPropID) {
-      case eCSSProperty_azimuth:
-        return ParseAzimuth(aValue);
       case eCSSProperty_font_family:
-      case eCSSProperty_voice_family:
         return ParseFamily(aValue);
       case eCSSProperty_font_weight:
         return ParseFontWeight(aValue);
@@ -5776,36 +5766,6 @@ CSSParserImpl::InitBoxPropsAsPhysical(const nsCSSProperty *aSourceProperties)
   }
 }
 
-PRBool
-CSSParserImpl::ParseAzimuth(nsCSSValue& aValue)
-{
-  if (ParseVariant(aValue, VARIANT_HK | VARIANT_ANGLE,
-                   nsCSSProps::kAzimuthKTable)) {
-    if (eCSSUnit_Enumerated == aValue.GetUnit()) {
-      PRInt32 intValue = aValue.GetIntValue();
-      if ((NS_STYLE_AZIMUTH_LEFT_SIDE <= intValue) &&
-          (intValue <= NS_STYLE_AZIMUTH_BEHIND)) {  // look for optional modifier
-        nsCSSValue  modifier;
-        if (ParseEnum(modifier, nsCSSProps::kAzimuthKTable)) {
-          PRInt32 enumValue = modifier.GetIntValue();
-          if (((intValue == NS_STYLE_AZIMUTH_BEHIND) &&
-               (NS_STYLE_AZIMUTH_LEFT_SIDE <= enumValue) && (enumValue <= NS_STYLE_AZIMUTH_RIGHT_SIDE)) ||
-              ((enumValue == NS_STYLE_AZIMUTH_BEHIND) &&
-               (NS_STYLE_AZIMUTH_LEFT_SIDE <= intValue) && (intValue <= NS_STYLE_AZIMUTH_RIGHT_SIDE))) {
-            aValue.SetIntValue(intValue | enumValue, eCSSUnit_Enumerated);
-            return PR_TRUE;
-          }
-          // Put the unknown identifier back and return
-          UngetToken();
-          return PR_FALSE;
-        }
-      }
-    }
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
 static nsCSSValue
 BoxPositionMaskToCSSValue(PRInt32 aMask, PRBool isX)
 {
@@ -7001,32 +6961,6 @@ CSSParserImpl::ParseCounterData(nsCSSProperty aPropID)
   return PR_TRUE;
 }
 
-PRBool
-CSSParserImpl::ParseCue()
-{
-  nsCSSValue before;
-  if (ParseSingleValueProperty(before, eCSSProperty_cue_before)) {
-    if (eCSSUnit_Inherit != before.GetUnit() &&
-        eCSSUnit_Initial != before.GetUnit()) {
-      nsCSSValue after;
-      if (ParseSingleValueProperty(after, eCSSProperty_cue_after)) {
-        if (ExpectEndProperty()) {
-          AppendValue(eCSSProperty_cue_before, before);
-          AppendValue(eCSSProperty_cue_after, after);
-          return PR_TRUE;
-        }
-        return PR_FALSE;
-      }
-    }
-    if (ExpectEndProperty()) {
-      AppendValue(eCSSProperty_cue_before, before);
-      AppendValue(eCSSProperty_cue_after, before);
-      return PR_TRUE;
-    }
-  }
-  return PR_FALSE;
-}
-
 PRBool
 CSSParserImpl::ParseCursor()
 {
@@ -7948,31 +7882,6 @@ CSSParserImpl::ParsePadding()
   return ParseBoxProperties(kPaddingSideIDs);
 }
 
-PRBool
-CSSParserImpl::ParsePause()
-{
-  nsCSSValue  before;
-  if (ParseSingleValueProperty(before, eCSSProperty_pause_before)) {
-    if (eCSSUnit_Inherit != before.GetUnit() && eCSSUnit_Initial != before.GetUnit()) {
-      nsCSSValue after;
-      if (ParseSingleValueProperty(after, eCSSProperty_pause_after)) {
-        if (ExpectEndProperty()) {
-          AppendValue(eCSSProperty_pause_before, before);
-          AppendValue(eCSSProperty_pause_after, after);
-          return PR_TRUE;
-        }
-        return PR_FALSE;
-      }
-    }
-    if (ExpectEndProperty()) {
-      AppendValue(eCSSProperty_pause_before, before);
-      AppendValue(eCSSProperty_pause_after, before);
-      return PR_TRUE;
-    }
-  }
-  return PR_FALSE;
-}
-
 PRBool
 CSSParserImpl::ParseQuotes()
 {
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index a17184fd5b74..d04f73e7e2e1 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -456,14 +456,6 @@ CSS_PROP_DISPLAY(
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 #endif
-CSS_PROP_BACKENDONLY(
-    azimuth,
-    azimuth,
-    Azimuth,
-    CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_PARSER_FUNCTION,
-    0,
-    kAzimuthKTable)
 CSS_PROP_SHORTHAND(
     background,
     background,
@@ -1332,25 +1324,6 @@ CSS_PROP_CONTENT(
     nsnull,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None) // XXX bug 137285
-CSS_PROP_SHORTHAND(
-    cue,
-    cue,
-    Cue,
-    CSS_PROPERTY_PARSE_FUNCTION)
-CSS_PROP_BACKENDONLY(
-    cue-after,
-    cue_after,
-    CueAfter,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HUO,
-    nsnull)
-CSS_PROP_BACKENDONLY(
-    cue-before,
-    cue_before,
-    CueBefore,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HUO,
-    nsnull)
 CSS_PROP_USERINTERFACE(
     cursor,
     cursor,
@@ -1381,13 +1354,6 @@ CSS_PROP_DISPLAY(
     kDisplayKTable,
     offsetof(nsStyleDisplay, mDisplay),
     eStyleAnimType_EnumU8)
-CSS_PROP_BACKENDONLY(
-    elevation,
-    elevation,
-    Elevation,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HK | VARIANT_ANGLE,
-    kElevationKTable)
 CSS_PROP_TABLEBORDER(
     empty-cells,
     empty_cells,
@@ -2091,39 +2057,6 @@ CSS_PROP_BACKENDONLY(
     CSS_PROPERTY_PARSE_VALUE,
     VARIANT_HK,
     kPageBreakInsideKTable)
-CSS_PROP_SHORTHAND(
-    pause,
-    pause,
-    Pause,
-    CSS_PROPERTY_PARSE_FUNCTION)
-CSS_PROP_BACKENDONLY(
-    pause-after,
-    pause_after,
-    PauseAfter,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HTP,
-    nsnull)
-CSS_PROP_BACKENDONLY(
-    pause-before,
-    pause_before,
-    PauseBefore,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HTP,
-    nsnull)
-CSS_PROP_BACKENDONLY(
-    pitch,
-    pitch,
-    Pitch,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HKF,
-    kPitchKTable)
-CSS_PROP_BACKENDONLY(
-    pitch-range,
-    pitch_range,
-    PitchRange,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HN,
-    nsnull)
 CSS_PROP_VISIBILITY(
     pointer-events,
     pointer_events,
@@ -2160,13 +2093,6 @@ CSS_PROP_DISPLAY(
     kResizeKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
-CSS_PROP_BACKENDONLY(
-    richness,
-    richness,
-    Richness,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HN,
-    nsnull)
 CSS_PROP_POSITION(
     right,
     right,
@@ -2184,48 +2110,6 @@ CSS_PROP_BACKENDONLY(
     CSS_PROPERTY_PARSE_FUNCTION,
     0,
     kPageSizeKTable)
-CSS_PROP_BACKENDONLY(
-    speak,
-    speak,
-    Speak,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HK,
-    kSpeakKTable)
-CSS_PROP_BACKENDONLY(
-    speak-header,
-    speak_header,
-    SpeakHeader,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HK,
-    kSpeakHeaderKTable)
-CSS_PROP_BACKENDONLY(
-    speak-numeral,
-    speak_numeral,
-    SpeakNumeral,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HK,
-    kSpeakNumeralKTable)
-CSS_PROP_BACKENDONLY(
-    speak-punctuation,
-    speak_punctuation,
-    SpeakPunctuation,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HK,
-    kSpeakPunctuationKTable)
-CSS_PROP_BACKENDONLY(
-    speech-rate,
-    speech_rate,
-    SpeechRate,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HN | VARIANT_KEYWORD,
-    kSpeechRateKTable)
-CSS_PROP_BACKENDONLY(
-    stress,
-    stress,
-    Stress,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HN,
-    nsnull)
 CSS_PROP_TABLE(
     table-layout,
     table_layout,
@@ -2452,21 +2336,6 @@ CSS_PROP_VISIBILITY(
     kVisibilityKTable,
     offsetof(nsStyleVisibility, mVisible),
     eStyleAnimType_EnumU8)  // reflow for collapse
-CSS_PROP_BACKENDONLY(
-    voice-family,
-    voice_family,
-    VoiceFamily,
-    CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_PARSER_FUNCTION,
-    0,
-    nsnull)
-CSS_PROP_BACKENDONLY(
-    volume,
-    volume,
-    Volume,
-    CSS_PROPERTY_PARSE_VALUE,
-    VARIANT_HPN | VARIANT_KEYWORD,
-    kVolumeKTable)
 CSS_PROP_TEXT(
     white-space,
     white_space,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index e7e3dc829571..59436116b540 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -582,23 +582,6 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-// Keyword id tables for variant/enum parsing
-const PRInt32 nsCSSProps::kAzimuthKTable[] = {
-  eCSSKeyword_left_side,    NS_STYLE_AZIMUTH_LEFT_SIDE,
-  eCSSKeyword_far_left,     NS_STYLE_AZIMUTH_FAR_LEFT,
-  eCSSKeyword_left,         NS_STYLE_AZIMUTH_LEFT,
-  eCSSKeyword_center_left,  NS_STYLE_AZIMUTH_CENTER_LEFT,
-  eCSSKeyword_center,       NS_STYLE_AZIMUTH_CENTER,
-  eCSSKeyword_center_right, NS_STYLE_AZIMUTH_CENTER_RIGHT,
-  eCSSKeyword_right,        NS_STYLE_AZIMUTH_RIGHT,
-  eCSSKeyword_far_right,    NS_STYLE_AZIMUTH_FAR_RIGHT,
-  eCSSKeyword_right_side,   NS_STYLE_AZIMUTH_RIGHT_SIDE,
-  eCSSKeyword_behind,       NS_STYLE_AZIMUTH_BEHIND,
-  eCSSKeyword_leftwards,    NS_STYLE_AZIMUTH_LEFTWARDS,
-  eCSSKeyword_rightwards,   NS_STYLE_AZIMUTH_RIGHTWARDS,
-  eCSSKeyword_UNKNOWN,-1
-};
-
 const PRInt32 nsCSSProps::kBackgroundAttachmentKTable[] = {
   eCSSKeyword_fixed, NS_STYLE_BG_ATTACHMENT_FIXED,
   eCSSKeyword_scroll, NS_STYLE_BG_ATTACHMENT_SCROLL,
@@ -887,15 +870,6 @@ const PRInt32 nsCSSProps::kDisplayKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-const PRInt32 nsCSSProps::kElevationKTable[] = {
-  eCSSKeyword_below,  NS_STYLE_ELEVATION_BELOW,
-  eCSSKeyword_level,  NS_STYLE_ELEVATION_LEVEL,
-  eCSSKeyword_above,  NS_STYLE_ELEVATION_ABOVE,
-  eCSSKeyword_higher, NS_STYLE_ELEVATION_HIGHER,
-  eCSSKeyword_lower,  NS_STYLE_ELEVATION_LOWER,
-  eCSSKeyword_UNKNOWN,-1
-};
-
 const PRInt32 nsCSSProps::kEmptyCellsKTable[] = {
   eCSSKeyword_show,                 NS_STYLE_TABLE_EMPTY_CELLS_SHOW,
   eCSSKeyword_hide,                 NS_STYLE_TABLE_EMPTY_CELLS_HIDE,
@@ -1138,15 +1112,6 @@ const PRInt32 nsCSSProps::kPageSizeKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-const PRInt32 nsCSSProps::kPitchKTable[] = {
-  eCSSKeyword_x_low, NS_STYLE_PITCH_X_LOW,
-  eCSSKeyword_low, NS_STYLE_PITCH_LOW,
-  eCSSKeyword_medium, NS_STYLE_PITCH_MEDIUM,
-  eCSSKeyword_high, NS_STYLE_PITCH_HIGH,
-  eCSSKeyword_x_high, NS_STYLE_PITCH_X_HIGH,
-  eCSSKeyword_UNKNOWN,-1
-};
-
 const PRInt32 nsCSSProps::kPointerEventsKTable[] = {
   eCSSKeyword_none, NS_STYLE_POINTER_EVENTS_NONE,
   eCSSKeyword_visiblepainted, NS_STYLE_POINTER_EVENTS_VISIBLEPAINTED,
@@ -1194,42 +1159,6 @@ const PRInt32 nsCSSProps::kResizeKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-const PRInt32 nsCSSProps::kSpeakKTable[] = {
-  eCSSKeyword_none,      NS_STYLE_SPEAK_NONE,
-  eCSSKeyword_normal,    NS_STYLE_SPEAK_NORMAL,
-  eCSSKeyword_spell_out, NS_STYLE_SPEAK_SPELL_OUT,
-  eCSSKeyword_UNKNOWN,-1
-};
-
-const PRInt32 nsCSSProps::kSpeakHeaderKTable[] = {
-  eCSSKeyword_once, NS_STYLE_SPEAK_HEADER_ONCE,
-  eCSSKeyword_always, NS_STYLE_SPEAK_HEADER_ALWAYS,
-  eCSSKeyword_UNKNOWN,-1
-};
-
-const PRInt32 nsCSSProps::kSpeakNumeralKTable[] = {
-  eCSSKeyword_digits, NS_STYLE_SPEAK_NUMERAL_DIGITS,
-  eCSSKeyword_continuous, NS_STYLE_SPEAK_NUMERAL_CONTINUOUS,
-  eCSSKeyword_UNKNOWN,-1
-};
-
-const PRInt32 nsCSSProps::kSpeakPunctuationKTable[] = {
-  eCSSKeyword_none, NS_STYLE_SPEAK_PUNCTUATION_NONE,
-  eCSSKeyword_code, NS_STYLE_SPEAK_PUNCTUATION_CODE,
-  eCSSKeyword_UNKNOWN,-1
-};
-
-const PRInt32 nsCSSProps::kSpeechRateKTable[] = {
-  eCSSKeyword_x_slow, NS_STYLE_SPEECH_RATE_X_SLOW,
-  eCSSKeyword_slow, NS_STYLE_SPEECH_RATE_SLOW,
-  eCSSKeyword_medium, NS_STYLE_SPEECH_RATE_MEDIUM,
-  eCSSKeyword_fast, NS_STYLE_SPEECH_RATE_FAST,
-  eCSSKeyword_x_fast, NS_STYLE_SPEECH_RATE_X_FAST,
-  eCSSKeyword_faster, NS_STYLE_SPEECH_RATE_FASTER,
-  eCSSKeyword_slower, NS_STYLE_SPEECH_RATE_SLOWER,
-  eCSSKeyword_UNKNOWN,-1
-};
-
 const PRInt32 nsCSSProps::kStackSizingKTable[] = {
   eCSSKeyword_ignore, NS_STYLE_STACK_SIZING_IGNORE,
   eCSSKeyword_stretch_to_fit, NS_STYLE_STACK_SIZING_STRETCH_TO_FIT,
@@ -1362,16 +1291,6 @@ const PRInt32 nsCSSProps::kVisibilityKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-const PRInt32 nsCSSProps::kVolumeKTable[] = {
-  eCSSKeyword_silent, NS_STYLE_VOLUME_SILENT,
-  eCSSKeyword_x_soft, NS_STYLE_VOLUME_X_SOFT,
-  eCSSKeyword_soft, NS_STYLE_VOLUME_SOFT,
-  eCSSKeyword_medium, NS_STYLE_VOLUME_MEDIUM,
-  eCSSKeyword_loud, NS_STYLE_VOLUME_LOUD,
-  eCSSKeyword_x_loud, NS_STYLE_VOLUME_X_LOUD,
-  eCSSKeyword_UNKNOWN,-1
-};
-
 const PRInt32 nsCSSProps::kWhitespaceKTable[] = {
   eCSSKeyword_normal, NS_STYLE_WHITESPACE_NORMAL,
   eCSSKeyword_pre, NS_STYLE_WHITESPACE_PRE,
@@ -1946,12 +1865,6 @@ static const nsCSSProperty gBorderEndWidthSubpropTable[] = {
   eCSSProperty_UNKNOWN
 };
 
-static const nsCSSProperty gCueSubpropTable[] = {
-  eCSSProperty_cue_after,
-  eCSSProperty_cue_before,
-  eCSSProperty_UNKNOWN
-};
-
 static const nsCSSProperty gFontSubpropTable[] = {
   eCSSProperty_font_family,
   eCSSProperty_font_style,
@@ -2091,12 +2004,6 @@ static const nsCSSProperty gPaddingEndSubpropTable[] = {
   eCSSProperty_UNKNOWN
 };
 
-static const nsCSSProperty gPauseSubpropTable[] = {
-  eCSSProperty_pause_after,
-  eCSSProperty_pause_before,
-  eCSSProperty_UNKNOWN
-};
-
 static const nsCSSProperty gTransitionSubpropTable[] = {
   eCSSProperty_transition_property,
   eCSSProperty_transition_duration,
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index f0f6c104a9e8..c1dcc567151f 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -806,14 +806,6 @@ nsCSSValue::AppendToString(nsCSSProperty aProperty, nsAString& aResult) const
           aResult);
       }
     }
-    else if (eCSSProperty_azimuth == aProperty) {
-      PRInt32 intValue = GetIntValue();
-      AppendASCIItoUTF16(nsCSSProps::LookupPropertyValue(aProperty, (intValue & ~NS_STYLE_AZIMUTH_BEHIND)), aResult);
-      if ((NS_STYLE_AZIMUTH_BEHIND & intValue) != 0) {
-        aResult.Append(PRUnichar(' '));
-        AppendASCIItoUTF16(nsCSSProps::LookupPropertyValue(aProperty, NS_STYLE_AZIMUTH_BEHIND), aResult);
-      }
-    }
     else if (eCSSProperty_marks == aProperty) {
       PRInt32 intValue = GetIntValue();
       if (intValue == NS_STYLE_PAGE_MARKS_NONE) {
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 8ad15c4fffdf..e8c00c470f25 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -4140,7 +4140,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
      * Implementations of CSS2 styles *
     \* ****************************** */
 
-    // COMPUTED_STYLE_MAP_ENTRY(azimuth,                    Azimuth),
     //// COMPUTED_STYLE_MAP_ENTRY(background,               Background),
     COMPUTED_STYLE_MAP_ENTRY(background_attachment,         BackgroundAttachment),
     COMPUTED_STYLE_MAP_ENTRY(background_color,              BackgroundColor),
@@ -4177,13 +4176,9 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(content,                       Content),
     COMPUTED_STYLE_MAP_ENTRY(counter_increment,             CounterIncrement),
     COMPUTED_STYLE_MAP_ENTRY(counter_reset,                 CounterReset),
-    //// COMPUTED_STYLE_MAP_ENTRY(cue,                      Cue),
-    // COMPUTED_STYLE_MAP_ENTRY(cue_after,                  CueAfter),
-    // COMPUTED_STYLE_MAP_ENTRY(cue_before,                 CueBefore),
     COMPUTED_STYLE_MAP_ENTRY(cursor,                        Cursor),
     COMPUTED_STYLE_MAP_ENTRY(direction,                     Direction),
     COMPUTED_STYLE_MAP_ENTRY(display,                       Display),
-    // COMPUTED_STYLE_MAP_ENTRY(elevation,                  Elevation),
     COMPUTED_STYLE_MAP_ENTRY(empty_cells,                   EmptyCells),
     COMPUTED_STYLE_MAP_ENTRY(float,                         CssFloat),
     //// COMPUTED_STYLE_MAP_ENTRY(font,                     Font),
@@ -4233,23 +4228,11 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(page_break_after,              PageBreakAfter),
     COMPUTED_STYLE_MAP_ENTRY(page_break_before,             PageBreakBefore),
     // COMPUTED_STYLE_MAP_ENTRY(page_break_inside,          PageBreakInside),
-    //// COMPUTED_STYLE_MAP_ENTRY(pause,                    Pause),
-    // COMPUTED_STYLE_MAP_ENTRY(pause_after,                PauseAfter),
-    // COMPUTED_STYLE_MAP_ENTRY(pause_before,               PauseBefore),
-    // COMPUTED_STYLE_MAP_ENTRY(pitch,                      Pitch),
-    // COMPUTED_STYLE_MAP_ENTRY(pitch_range,                PitchRange),
     COMPUTED_STYLE_MAP_ENTRY(pointer_events,                PointerEvents),
     COMPUTED_STYLE_MAP_ENTRY(position,                      Position),
     COMPUTED_STYLE_MAP_ENTRY(quotes,                        Quotes),
-    // COMPUTED_STYLE_MAP_ENTRY(richness,                   Richness),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(right,                  Right),
     //// COMPUTED_STYLE_MAP_ENTRY(size,                     Size),
-    // COMPUTED_STYLE_MAP_ENTRY(speak,                      Speak),
-    // COMPUTED_STYLE_MAP_ENTRY(speak_header,               SpeakHeader),
-    // COMPUTED_STYLE_MAP_ENTRY(speak_numeral,              SpeakNumeral),
-    // COMPUTED_STYLE_MAP_ENTRY(speak_punctuation,          SpeakPunctuation),
-    // COMPUTED_STYLE_MAP_ENTRY(speech_rate,                SpeechRate),
-    // COMPUTED_STYLE_MAP_ENTRY(stress,                     Stress),
     COMPUTED_STYLE_MAP_ENTRY(table_layout,                  TableLayout),
     COMPUTED_STYLE_MAP_ENTRY(text_align,                    TextAlign),
     COMPUTED_STYLE_MAP_ENTRY(text_decoration,               TextDecoration),
@@ -4260,8 +4243,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(unicode_bidi,                  UnicodeBidi),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(vertical_align,         VerticalAlign),
     COMPUTED_STYLE_MAP_ENTRY(visibility,                    Visibility),
-    // COMPUTED_STYLE_MAP_ENTRY(voice_family,               VoiceFamily),
-    // COMPUTED_STYLE_MAP_ENTRY(volume,                     Volume),
     COMPUTED_STYLE_MAP_ENTRY(white_space,                   WhiteSpace),
     // COMPUTED_STYLE_MAP_ENTRY(widows,                     Widows),
     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(width,                  Width),
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 6fd2c7a4008b..6282618c29c5 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -1006,15 +1006,6 @@ var gCSSProperties = {
 		other_values: [ "none", "menu", "tooltip", "sheet" ],
 		invalid_values: []
 	},
-	"azimuth": {
-		domProp: "azimuth",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "center", "0deg" ],
-		other_values: [ "center behind", "behind far-right", "left-side", "73deg", "90.1deg", "0.1deg" ],
-		invalid_values: [ "0deg behind", "behind 0deg", "90deg behind", "behind 90deg" ]
-	},
 	"background": {
 		domProp: "background",
 		inherited: false,
@@ -1745,34 +1736,6 @@ var gCSSProperties = {
 		other_values: [ "foo 1", "bar", "foo 3 bar baz 2", "\\32  1", "-\\32  1", "-c 1", "\\32 1", "-\\32 1", "\\2  1", "-\\2  1", "-c 1", "\\2 1", "-\\2 1" ],
 		invalid_values: []
 	},
-	"cue": {
-		domProp: "cue",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "cue-before", "cue-after" ],
-		initial_values: [ "none", "none none" ],
-		other_values: [ "url(404.wav)", "url(404.wav) none", "none url(404.wav)" ],
-		invalid_values: []
-	},
-	"cue-after": {
-		domProp: "cueAfter",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "none" ],
-		other_values: [ "url(404.wav)" ],
-		invalid_values: []
-	},
-	"cue-before": {
-		domProp: "cueBefore",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "none" ],
-		other_values: [ "url(404.wav)" ],
-		invalid_values: []
-	},
 	"cursor": {
 		domProp: "cursor",
 		inherited: true,
@@ -1799,15 +1762,6 @@ var gCSSProperties = {
 		other_values: [ "block", "list-item", "inline-block", "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none" ],
 		invalid_values: []
 	},
-	"elevation": {
-		domProp: "elevation",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "level", "0deg" ],
-		other_values: [ "below", "above", "60deg", "higher", "lower", "-79deg", "0.33deg" ],
-		invalid_values: []
-	},
 	"empty-cells": {
 		domProp: "emptyCells",
 		inherited: true,
@@ -2404,52 +2358,6 @@ var gCSSProperties = {
 		other_values: [ "avoid" ],
 		invalid_values: []
 	},
-	"pause": {
-		domProp: "pause",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "pause-before", "pause-after" ],
-		initial_values: [ "0s", "0ms", "0s 0ms" ],
-		other_values: [ "1s", "200ms", "-2s", "50%", "-10%", "10% 200ms", "-3s -5%" ],
-		invalid_values: [ "0", "0px", "0 0", "0ms 0" ]
-	},
-	"pause-after": {
-		domProp: "pauseAfter",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "0s", "0ms" ],
-		other_values: [ "1s", "200ms", "-2s", "50%", "-10%" ],
-		invalid_values: [ "0", "0px" ]
-	},
-	"pause-before": {
-		domProp: "pauseBefore",
-		inherited: false,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "0s", "0ms" ],
-		other_values: [ "1s", "200ms", "-2s", "50%", "-10%" ],
-		invalid_values: [ "0", "0px" ]
-	},
-	"pitch": {
-		domProp: "pitch",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "medium" ],
-		other_values: [ "x-low", "low", "high", "x-high" ],
-		invalid_values: []
-	},
-	"pitch-range": {
-		domProp: "pitchRange",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "50", "50.0" ],
-		other_values: [ "0", "100.0", "99.7", "47", "3.2" ],
-		invalid_values: [" -0.01", "100.2", "108", "-3" ]
-	},
 	"pointer-events": {
 		domProp: "pointerEvents",
 		inherited: true,
@@ -2476,15 +2384,6 @@ var gCSSProperties = {
 		other_values: [ "none", "'\"' '\"'" ],
 		invalid_values: []
 	},
-	"richness": {
-		domProp: "richness",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "50", "50.0" ],
-		other_values: [ "0", "100.0", "99.7", "47", "3.2" ],
-		invalid_values: [" -0.01", "100.2", "108", "-3" ]
-	},
 	"right": {
 		domProp: "right",
 		inherited: false,
@@ -2516,62 +2415,6 @@ var gCSSProperties = {
 			"100mm 100mm 100mm"
 		]
 	},
-	"speak": {
-		domProp: "speak",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "normal" ],
-		other_values: [ "none", "spell-out" ],
-		invalid_values: []
-	},
-	"speak-header": {
-		domProp: "speakHeader",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "once" ],
-		other_values: [ "always" ],
-		invalid_values: []
-	},
-	"speak-numeral": {
-		domProp: "speakNumeral",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "continuous" ],
-		other_values: [ "digits" ],
-		invalid_values: []
-	},
-	"speak-punctuation": {
-		domProp: "speakPunctuation",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "none" ],
-		other_values: [ "code" ],
-		invalid_values: []
-	},
-	"speech-rate": {
-		domProp: "speechRate",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "medium" ],
-		other_values: [ "x-slow", "slow", "fast", "x-fast", "faster", "slower", "80", "500", "73.2" ],
-		invalid_values: [
-			// "0", "-80" // unclear
-		]
-	},
-	"stress": {
-		domProp: "stress",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "50", "50.0" ],
-		other_values: [ "0", "100.0", "99.7", "47", "3.2" ],
-		invalid_values: [" -0.01", "100.2", "108", "-3" ]
-	},
 	"table-layout": {
 		domProp: "tableLayout",
 		inherited: false,
@@ -2750,24 +2593,6 @@ var gCSSProperties = {
 		other_values: [ "hidden", "collapse" ],
 		invalid_values: []
 	},
-	"voice-family": {
-		domProp: "voiceFamily",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "male" ], /* arbitrary guess */
-		other_values: [ "female", "child", "Bob, male", "Jane, Juliet, female" ],
-		invalid_values: []
-	},
-	"volume": {
-		domProp: "volume",
-		inherited: true,
-		backend_only: true,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "50", "50.0", "medium" ],
-		other_values: [ "0", "100.0", "99.7", "47", "3.2", "silent", "x-soft", "soft", "loud", "x-loud" ],
-		invalid_values: [" -0.01", "100.2", "108", "-3" ]
-	},
 	"white-space": {
 		domProp: "whiteSpace",
 		inherited: true,
diff --git a/layout/style/test/test_units_angle.html b/layout/style/test/test_units_angle.html
index 574b42de7b3d..ad1a21597b4d 100644
--- a/layout/style/test/test_units_angle.html
+++ b/layout/style/test/test_units_angle.html
@@ -31,8 +31,8 @@ var tests = {
 var p = document.getElementById("display");
 
 for (var test in tests) {
-  p.setAttribute("style", "elevation: " + test);
-  is(p.style.getPropertyValue("elevation"), test,
+  p.setAttribute("style", "-moz-transform: rotate(" + test + ")");
+  is(p.style.getPropertyValue("-moz-transform"), "rotate(" + test + ")",
      test + " serializes to exactly itself");
   // We can't test any equivalence since we don't have any properties
   // with angle values that we compute.  (-moz-transform doesn't help.)
diff --git a/layout/style/test/test_units_frequency.html b/layout/style/test/test_units_frequency.html
index 7ea904e347a7..6547e331c439 100644
--- a/layout/style/test/test_units_frequency.html
+++ b/layout/style/test/test_units_frequency.html
@@ -30,11 +30,16 @@ var tests = {
 var p = document.getElementById("display");
 
 for (var test in tests) {
+  // We can't test this because we no longer support any properties
+  // with frequency values.
+  todo(false, "no tests to run, for now");
+  /*
   p.setAttribute("style", "pitch: " + test);
   is(p.style.getPropertyValue("pitch"), test,
      test + " serializes to exactly itself");
+  */
   // We can't test any equivalence since we don't have any properties
-  // with angle values that we compute.
+  // with frequency values that we compute.
 /*
   var equiv = tests[test];
   if (equiv) {
diff --git a/layout/style/test/test_units_time.html b/layout/style/test/test_units_time.html
index ee16f19f9990..cc4ae3870ffc 100644
--- a/layout/style/test/test_units_time.html
+++ b/layout/style/test/test_units_time.html
@@ -30,20 +30,16 @@ var tests = {
 var p = document.getElementById("display");
 
 for (var test in tests) {
-  p.setAttribute("style", "pause-before: " + test);
-  is(p.style.getPropertyValue("pause-before"), test,
+  p.setAttribute("style", "-moz-transition-duration: " + test);
+  is(p.style.getPropertyValue("-moz-transition-duration"), test,
      test + " serializes to exactly itself");
-  // We can't test any equivalence since we don't have any properties
-  // with angle values that we compute.
-/*
   var equiv = tests[test];
   if (equiv) {
-    var cm1 = getComputedStyle(p, "").pauseBefore;
-    p.style.pauseBefore = equiv;
-    var cm2 = getComputedStyle(p, "").pauseBefore;
+    var cm1 = getComputedStyle(p, "").MozTransitionDuration;
+    p.style.MozTransitionDuration = equiv;
+    var cm2 = getComputedStyle(p, "").MozTransitionDuration;
     is(cm1, cm2, test + " should compute to the same as " + equiv);
   }
-*/
 }
 
 </script>

From 2eabd34794c30f8435a2bec0b0efd4d4059f1144 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:32 -0700
Subject: [PATCH 354/509] Ensure nsRefreshDriver::MostRecentRefresh tells the
 truth even when we stop and restart timers.  (Bug 650469)  r=bzbarsky

---
 layout/base/nsRefreshDriver.cpp | 32 ++++++++++++++++++++++----------
 layout/base/nsRefreshDriver.h   |  6 +++---
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index f0544954ddd3..65adc383e237 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -139,7 +139,7 @@ nsRefreshDriver::RestoreNormalRefresh()
 TimeStamp
 nsRefreshDriver::MostRecentRefresh() const
 {
-  const_cast<nsRefreshDriver*>(this)->EnsureTimerStarted();
+  const_cast<nsRefreshDriver*>(this)->EnsureTimerStarted(false);
 
   return mMostRecentRefresh;
 }
@@ -147,7 +147,7 @@ nsRefreshDriver::MostRecentRefresh() const
 PRInt64
 nsRefreshDriver::MostRecentRefreshEpochTime() const
 {
-  const_cast<nsRefreshDriver*>(this)->EnsureTimerStarted();
+  const_cast<nsRefreshDriver*>(this)->EnsureTimerStarted(false);
 
   return mMostRecentRefreshEpochTime;
 }
@@ -159,7 +159,7 @@ nsRefreshDriver::AddRefreshObserver(nsARefreshObserver *aObserver,
   ObserverArray& array = ArrayFor(aFlushType);
   PRBool success = array.AppendElement(aObserver) != nsnull;
 
-  EnsureTimerStarted();
+  EnsureTimerStarted(false);
 
   return success;
 }
@@ -173,7 +173,7 @@ nsRefreshDriver::RemoveRefreshObserver(nsARefreshObserver *aObserver,
 }
 
 void
-nsRefreshDriver::EnsureTimerStarted()
+nsRefreshDriver::EnsureTimerStarted(bool aAdjustingTimer)
 {
   if (mTimer || mFrozen || !mPresContext) {
     // It's already been started, or we don't want to start it now or
@@ -181,7 +181,15 @@ nsRefreshDriver::EnsureTimerStarted()
     return;
   }
 
-  UpdateMostRecentRefresh();
+  if (!aAdjustingTimer) {
+    // If we didn't already have a timer and aAdjustingTimer is false,
+    // then we just got our first observer (or an explicit call to
+    // MostRecentRefresh by a caller who's likely to add an observer
+    // shortly).  This means we should fake a most-recent-refresh time
+    // of now so that said observer gets a reasonable refresh time, so
+    // things behave as though the timer had always been running.
+    UpdateMostRecentRefresh();
+  }
 
   mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
   if (!mTimer) {
@@ -395,7 +403,7 @@ nsRefreshDriver::Notify(nsITimer *aTimer)
     // EnsureTimerStarted makes sure to not start the timer if it shouldn't be
     // started.
     StopTimer();
-    EnsureTimerStarted();
+    EnsureTimerStarted(true);
   }
 
   return NS_OK;
@@ -415,8 +423,12 @@ nsRefreshDriver::Thaw()
   NS_ASSERTION(mFrozen, "Thaw called on an unfrozen refresh driver");
   mFrozen = false;
   if (ObserverCount()) {
+    // FIXME: This isn't quite right, since our EnsureTimerStarted call
+    // updates our mMostRecentRefresh, but the DoRefresh call won't run
+    // and notify our observers until we get back to the event loop.
+    // Thus MostRecentRefresh() will lie between now and the DoRefresh.
     NS_DispatchToCurrentThread(NS_NewRunnableMethod(this, &nsRefreshDriver::DoRefresh));
-    EnsureTimerStarted();
+    EnsureTimerStarted(false);
   }
 }
 
@@ -429,7 +441,7 @@ nsRefreshDriver::SetThrottled(bool aThrottled)
       // We want to switch our timer type here, so just stop and
       // restart the timer.
       StopTimer();
-      EnsureTimerStarted();
+      EnsureTimerStarted(true);
     }
   }
 }
@@ -460,7 +472,7 @@ nsRefreshDriver::ScheduleBeforePaintEvent(nsIDocument* aDocument)
                mBeforePaintTargets.NoIndex,
                "Shouldn't have a paint event posted for this document");
   PRBool appended = mBeforePaintTargets.AppendElement(aDocument) != nsnull;
-  EnsureTimerStarted();
+  EnsureTimerStarted(false);
   return appended;
 }
 
@@ -473,7 +485,7 @@ nsRefreshDriver::ScheduleAnimationFrameListeners(nsIDocument* aDocument)
   mAnimationFrameListenerDocs.AppendElement(aDocument);
   // No need to worry about restarting our timer in precise mode if it's
   // already running; that will happen automatically when it fires.
-  EnsureTimerStarted();
+  EnsureTimerStarted(false);
 }
 
 void
diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index 13e8f3a7d0ca..485dc2ed3933 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -135,7 +135,7 @@ public:
     NS_ASSERTION(!mStyleFlushObservers.Contains(aShell),
 		 "Double-adding style flush observer");
     PRBool appended = mStyleFlushObservers.AppendElement(aShell) != nsnull;
-    EnsureTimerStarted();
+    EnsureTimerStarted(false);
     return appended;
   }
   void RemoveStyleFlushObserver(nsIPresShell* aShell) {
@@ -145,7 +145,7 @@ public:
     NS_ASSERTION(!IsLayoutFlushObserver(aShell),
 		 "Double-adding layout flush observer");
     PRBool appended = mLayoutFlushObservers.AppendElement(aShell) != nsnull;
-    EnsureTimerStarted();
+    EnsureTimerStarted(false);
     return appended;
   }
   void RemoveLayoutFlushObserver(nsIPresShell* aShell) {
@@ -219,7 +219,7 @@ public:
 private:
   typedef nsTObserverArray<nsARefreshObserver*> ObserverArray;
 
-  void EnsureTimerStarted();
+  void EnsureTimerStarted(bool aAdjustingTimer);
   void StopTimer();
   PRUint32 ObserverCount() const;
   void UpdateMostRecentRefresh();

From dad5a358cd9bb4943962b19f887dc6c103189a6c Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 21 Apr 2011 20:17:32 -0700
Subject: [PATCH 355/509] Add diagnostic for nested @-rules that are ignored. 
 (Bug 652014)  r=bzbarsky

---
 dom/locales/en-US/chrome/layout/css.properties | 1 +
 layout/style/nsCSSParser.cpp                   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dom/locales/en-US/chrome/layout/css.properties b/dom/locales/en-US/chrome/layout/css.properties
index 3ca2657b8edc..eb7b5659325f 100644
--- a/dom/locales/en-US/chrome/layout/css.properties
+++ b/dom/locales/en-US/chrome/layout/css.properties
@@ -55,6 +55,7 @@ PEImportNotURI=Expected URI in @import rule but found '%1$S'.
 PEImportBadURI=Invalid URI in @import rule: '%1$S'.
 PEImportUnexpected=Found unexpected '%1$S' within @import.
 PEGroupRuleEOF=end of @media or @-moz-document rule
+PEGroupRuleNestedAtRule=%1$S rule not allowed within @media or @-moz-document rule.
 PEMozDocRuleBadFunc=Expected url(), url-prefix(), or domain() in @-moz-document rule but found '%1$S'.
 PEMozDocRuleNotURI=Expected URI in @-moz-document rule but found '%1$S'.
 PEAtNSPrefixEOF=namespace prefix in @namespace rule
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index abdcf648e8b5..f7eeceb6cbaf 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2064,6 +2064,8 @@ CSSParserImpl::ParseGroupRule(css::GroupRule* aRule,
       break;
     }
     if (eCSSToken_AtKeyword == mToken.mType) {
+      REPORT_UNEXPECTED_TOKEN(PEGroupRuleNestedAtRule);
+      OUTPUT_ERROR();
       SkipAtRule(PR_TRUE); // group rules cannot contain @rules
       continue;
     }

From d1e2c6fe89ab9660eccad2ca5c72a46d5199241d Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 22 Apr 2011 10:31:59 +0200
Subject: [PATCH 356/509] Bug 650263 - Filter by toolkit instead of by OS to
 decide whether to go into modules/plugin/test. r=ted

---
 modules/plugin/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in
index 3b6145d5fb9f..0522c49b0d51 100644
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -53,7 +53,7 @@ DIRS = \
 #  buildable on other non-GTK unix builds
 
 ifdef ENABLE_TESTS
-ifneq (,$(filter WINNT Darwin Linux OS2 SunOS,$(OS_ARCH)))
+ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS += test
 endif
 endif

From ce2f8b602821a89ed967e74cf453b4be827ccfd9 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 22 Apr 2011 10:33:08 +0200
Subject: [PATCH 357/509] Bug 638056 - Avoid "The cacheFlush support is missing
 on this platform" error on exotic platforms. r=cdleary

---
 js/src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 139c9bf5d38c..9aaac3f3da1b 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -388,7 +388,7 @@ CPPSRCS += 	checks.cc \
 # END enclude sources for V8 dtoa
 #############################################
 
-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
 
 VPATH +=	$(srcdir)/assembler \
 		$(srcdir)/assembler/wtf \

From 4491925359b51625d864bd624b9941b826ce646c Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 22 Apr 2011 10:38:33 +0200
Subject: [PATCH 358/509] Bug 646184 - Crash [@
 nsGlobalWindow::GetLocalStorage] getting localStorage from removed frame;
 r=bz

---
 content/base/crashtests/646184.html     | 17 +++++++++++++++++
 content/base/crashtests/crashtests.list |  3 ++-
 dom/base/nsGlobalWindow.cpp             |  8 ++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 content/base/crashtests/646184.html

diff --git a/content/base/crashtests/646184.html b/content/base/crashtests/646184.html
new file mode 100644
index 000000000000..ef34d41a64bc
--- /dev/null
+++ b/content/base/crashtests/646184.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+  var f = document.getElementById("f");
+  var w = f.contentWindow;
+  f.parentNode.removeChild(f);
+  w.localStorage;
+}
+
+</script>
+</head>
+<body onload="boom();"><iframe id="f" src="data:text/html,1"></iframe></body>
+</html>
diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
index 21f9e3636d72..17db02d99676 100644
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -86,6 +86,7 @@ load 593302-2.html
 load 610571-1.html
 load 604262-1.html
 load 628599-1.html
-load 642022-1.html
 load 637214-1.svg
 load 637214-2.svg
+load 642022-1.html
+asserts(1) load 646184.html # Bug 651842
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 7bfdcf6e39db..de3482abf54a 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8044,7 +8044,9 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
     *aSessionStorage = nsnull;
 
     nsString documentURI;
-    mDocument->GetDocumentURI(documentURI);
+    if (mDocument) {
+      mDocument->GetDocumentURI(documentURI);
+    }
 
     nsresult rv = docShell->GetSessionStorageForPrincipal(principal,
                                                           documentURI,
@@ -8128,7 +8130,9 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsString documentURI;
-    mDocument->GetDocumentURI(documentURI);
+    if (mDocument) {
+      mDocument->GetDocumentURI(documentURI);
+    }
 
     rv = storageManager->GetLocalStorageForPrincipal(principal,
                                                      documentURI,

From cd690140345689f3d0e99e98ce3da044d3b5a961 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 22 Apr 2011 10:38:37 +0200
Subject: [PATCH 359/509] Bug 619998 - Remove support for
 Document.strictErrorChecking; r=sicking

---
 content/base/src/nsDocument.cpp              | 15 ---------------
 content/html/document/src/nsHTMLDocument.cpp | 12 ------------
 dom/interfaces/core/nsIDOMDocument.idl       |  4 +---
 dom/interfaces/core/nsIDOMXMLDocument.idl    |  2 +-
 dom/interfaces/html/nsIDOMHTMLDocument.idl   |  2 +-
 dom/interfaces/svg/nsIDOMSVGDocument.idl     |  2 +-
 6 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 1471888200ca..0913eb7d59c9 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -5919,21 +5919,6 @@ nsDocument::SetXmlVersion(const nsAString& aXmlVersion)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP
-nsDocument::GetStrictErrorChecking(PRBool *aStrictErrorChecking)
-{
-  // This attribute is true by default, and we don't really support it being false.
-  *aStrictErrorChecking = PR_TRUE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocument::SetStrictErrorChecking(PRBool aStrictErrorChecking)
-{
-  // We don't really support non-strict error checking, so just no-op for now.
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDocument::GetDocumentURI(nsAString& aDocumentURI)
 {
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index af2c5284987c..cfce4ecd3bea 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1368,18 +1368,6 @@ nsHTMLDocument::SetXmlVersion(const nsAString& aXmlVersion)
   return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::GetStrictErrorChecking(PRBool* aStrictErrorChecking)
-{
-  return nsDocument::GetStrictErrorChecking(aStrictErrorChecking);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::SetStrictErrorChecking(PRBool aStrictErrorChecking)
-{
-  return nsDocument::SetStrictErrorChecking(aStrictErrorChecking);
-}
-
 NS_IMETHODIMP
 nsHTMLDocument::GetDocumentURI(nsAString& aDocumentURI)
 {
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index 196e7aac4b3f..e9587254012b 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -52,7 +52,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(1ae51729-c57c-43cd-91f4-2ffee5c5d493)]
+[scriptable, uuid(2d305b95-a030-4d24-a12c-7fabf61a8c3c)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -101,8 +101,6 @@ interface nsIDOMDocument : nsIDOMNode
   // Introduced in DOM Level 3:
            attribute DOMString       xmlVersion;
                                         // raises(DOMException) on setting
-  // Introduced in DOM Level 3:
-           attribute boolean         strictErrorChecking;
   // Introduced in DOM Level 3:
            attribute DOMString       documentURI;
   // Introduced in DOM Level 3:
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 67a357468f05..224ba547c50e 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(38708cf6-d055-4618-9d8f-a8731834d63f)]
+[scriptable, uuid(f493687c-ea80-471b-965b-11467ebea24b)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index 90dcb7bdc992..53972ff95ae9 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(42de381d-1535-4223-b7d9-a9d7c250f9a7)]
+[scriptable, uuid(2d7a0f2e-6b1c-4e93-bbea-122eb0a8a513)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            title;
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index cf28037d219c..89aff8b4048f 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,7 +39,7 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(b0cb0f05-6fd4-4f2c-8a6c-aac63bc90cad)]
+[scriptable, uuid(dcac0765-b258-4e0b-9862-6470eb9876ba)]
 interface nsIDOMSVGDocument : nsIDOMDocument
                          /* , nsIDOMDocumentEvent */
 {

From 58cacf815b228974e3d5fe4215e1c7d1229ca0e7 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 22 Apr 2011 10:38:38 +0200
Subject: [PATCH 360/509] Bug 646799. Clip the contents of iframes to
 border-radius. r=roc

---
 layout/generic/nsSubDocumentFrame.cpp           | 9 ++++++++-
 layout/reftests/border-radius/iframe-1-ref.html | 7 +++++++
 layout/reftests/border-radius/iframe-1.html     | 7 +++++++
 layout/reftests/border-radius/reftest.list      | 2 ++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/border-radius/iframe-1-ref.html
 create mode 100644 layout/reftests/border-radius/iframe-1.html

diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 40ae74cefa4a..8be040aed00f 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -419,10 +419,17 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
       childItems.AppendToTop(layerItem);
     }
 
+    nsDisplayList list;
     // Clip children to the child root frame's rectangle
-    rv = aLists.Content()->AppendNewToTop(
+    rv = list.AppendNewToTop(
         new (aBuilder) nsDisplayClip(aBuilder, this, &childItems,
                                      subdocBoundsInParentUnits));
+
+    if (mIsInline) {
+      WrapReplacedContentForBorderRadius(aBuilder, &list, aLists);
+    } else {
+      aLists.Content()->AppendToTop(&list);
+    }
   }
   // delete childItems in case of OOM
   childItems.DeleteAll();
diff --git a/layout/reftests/border-radius/iframe-1-ref.html b/layout/reftests/border-radius/iframe-1-ref.html
new file mode 100644
index 000000000000..360c443f046b
--- /dev/null
+++ b/layout/reftests/border-radius/iframe-1-ref.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<iframe style="position: absolute; left: 0px; top: 0px; width: 300px; height: 150px; border: none; border-radius: 50px; background: green;" src="data:text/html,<body>"></iframe>
+<div style="position: absolute; left: 10px; top: 0px; width: 280px; height: 150px; background: red;"></div>
+<div style="position: absolute; left: 0px; top: 10px; width: 300px; height: 130px; background: red;"></div>
+</body>
+</html>
diff --git a/layout/reftests/border-radius/iframe-1.html b/layout/reftests/border-radius/iframe-1.html
new file mode 100644
index 000000000000..b3fc86792cf6
--- /dev/null
+++ b/layout/reftests/border-radius/iframe-1.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<iframe style="position: absolute; left: 0px; top: 0px; width: 300px; height: 150px; border: none; border-radius: 50px; background: green;" src="data:text/html,<body bgcolor=green>"></iframe>
+<div style="position: absolute; left: 10px; top: 0px; width: 280px; height: 150px; background: red;"></div>
+<div style="position: absolute; left: 0px; top: 10px; width: 300px; height: 130px; background: red;"></div>
+</body>
+</html>
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index 7909b51d9586..64bf5d0a268a 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -77,3 +77,5 @@ random-if(winWidget) HTTP(..) == corner-joins-2.xhtml corner-joins-2-ref.xhtml
 == scroll-1.html scroll-1-ref.html # see bug 602892
 
 == zero-radius-clip-1.html zero-radius-clip-ref.html
+
+== iframe-1.html iframe-1-ref.html

From dfc392e0660ad65a6b929cd70e495a592ed12656 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 22 Apr 2011 10:38:41 +0200
Subject: [PATCH 361/509] Bug 651622 - Remove WinCE code from browser/*;
 r=dolske

---
 browser/app/Makefile.in                       |  21 +--
 browser/app/profile/firefox.js                |  53 ------
 browser/base/Makefile.in                      |   2 -
 browser/base/content/browser-menubar.inc      |   2 -
 browser/base/content/browser.js               |   2 -
 browser/base/content/browser.xul              |   9 -
 browser/components/Makefile.in                |   7 +-
 browser/components/build/Makefile.in          |   5 +-
 browser/components/build/nsModule.cpp         |  14 --
 browser/components/nsBrowserGlue.js           |  16 --
 .../shell/content/setDesktopBackground.xul    |   2 -
 browser/components/shell/public/Makefile.in   |   2 +-
 browser/components/shell/src/Makefile.in      |   2 +-
 .../shell/src/nsWindowsShellService.cpp       | 176 ------------------
 .../shell/src/nsWindowsShellService.h         |  12 --
 browser/installer/package-manifest.in         |  27 +--
 16 files changed, 8 insertions(+), 344 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 31e8a7751f02..d9d1515d8a00 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -84,7 +84,7 @@ include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
@@ -161,16 +161,8 @@ include $(topsrcdir)/config/config.mk
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
-
-ifdef WINCE
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,corelibc)
-endif
 
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-config.mk
@@ -189,7 +181,7 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 v
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_PHOENIX -I$(srcdir)
@@ -248,7 +240,7 @@ endif
 endif
 endif
 
-ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 
 $(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
@@ -290,13 +282,6 @@ libs::
 endif
 endif
 
-ifdef WINCE
-ifdef MOZ_FASTSTART
-libs::
-	cp -f $(DIST)/bin/faststartstub.exe $(DIST)/bin/$(MOZ_APP_NAME)faststart.exe
-endif
-endif
-
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 283694783285..dd823523bed9 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -308,12 +308,7 @@ pref("browser.download.saveLinkAsFilenameTimeout", 1000);
 
 pref("browser.download.useDownloadDir", true);
 
-#ifdef WINCE
-pref("browser.download.folderList", 2);
-pref("browser.download.dir", "\\Storage Card");
-#else
 pref("browser.download.folderList", 1);
-#endif
 pref("browser.download.manager.showAlertOnComplete", true);
 pref("browser.download.manager.showAlertInterval", 2000);
 pref("browser.download.manager.retention", 2);
@@ -371,11 +366,7 @@ pref("browser.link.open_newwindow", 3);
 pref("browser.link.open_newwindow.restriction", 2);
 
 // Tabbed browser
-#ifndef WINCE
 pref("browser.tabs.autoHide", false);
-#else
-pref("browser.tabs.autoHide", true);
-#endif
 pref("browser.tabs.closeWindowWithLastTab", true);
 pref("browser.tabs.insertRelatedAfterCurrent", true);
 pref("browser.tabs.warnOnClose", true);
@@ -425,11 +416,6 @@ pref("javascript.options.showInConsole",          true);
 pref("general.warnOnAboutConfig",                 false);
 #endif
 
-#ifdef WINCE
-// Set the threshold higher to avoid some slow script warnings
-pref("dom.max_script_run_time",                   20);
-#endif
-
 // This is the pref to control the location bar, change this to true to 
 // force this - this makes the origin of popup windows more obvious to avoid
 // spoofing. We would rather not do it by default because it affects UE for web
@@ -775,11 +761,7 @@ pref("browser.rights.3.shown", false);
 pref("browser.rights.override", true);
 #endif
 
-#ifdef WINCE
-pref("browser.sessionstore.resume_from_crash", false);
-#else
 pref("browser.sessionstore.resume_from_crash", true);
-#endif
 pref("browser.sessionstore.resume_session_once", false);
 
 // minimal interval between two save operations in milliseconds
@@ -899,39 +881,6 @@ pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
 pref("geo.wifi.uri", "https://www.google.com/loc/json");
 pref("geo.wifi.protocol", 0);
 
-#ifdef WINCE
-
-// tweak awesomebar -- increase the delay until a search happens.
-pref("browser.urlbar.delay", 250);
-
-// disable safe browsing, due to perf hit
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// don't check for default browser
-pref("browser.shell.checkDefaultBrowser", false);
-
-// disable bfcache for memory
-pref("browser.sessionhistory.max_total_viewers", 0);
-
-pref("browser.sessionhistory.optimize_eviction", false);
-
-// tweak default content sink prefs
-pref("content.sink.interactive_deflect_count", 10); /* default 0 */
-pref("content.sink.perf_deflect_count", 50); /* default 200 */
-pref("content.sink.interactive_parse_time", 5000); /* default 3000 */
-pref("content.sink.perf_parse_time", 150000); /* default 360000 */
-pref("content.sink.pending_event_mode", 0); /* default 1 */
-pref("content.sink.event_probe_rate", 1); /* default 1 */
-pref("content.sink.interactive_time", 750000); /* default 750000 */
-pref("content.sink.initial_perf_time", 500000); /* default 2000000 */
-pref("content.sink.enable_perf_mode", 0); /* default 0; 0 == switch, 1 == stay interactive, 2 == stay perf */
-
-// Write sessionstore.js less often
-pref("browser.sessionstore.interval", 60000);
-
-#endif /* WINCE */
-
 // Whether to use a panel that looks like an OS X sheet for customization
 #ifdef XP_MACOSX
 pref("toolbar.customization.usesheet", true);
@@ -954,7 +903,6 @@ pref("dom.ipc.plugins.enabled", true);
 #endif
 
 #ifdef XP_WIN
-#ifndef WINCE
 pref("browser.taskbar.previews.enable", false);
 pref("browser.taskbar.previews.max", 20);
 pref("browser.taskbar.previews.cachetime", 5);
@@ -965,7 +913,6 @@ pref("browser.taskbar.lists.maxListItemCount", 7);
 pref("browser.taskbar.lists.tasks.enabled", true);
 pref("browser.taskbar.lists.refreshInSeconds", 120);
 #endif
-#endif
 
 #ifdef MOZ_SERVICES_SYNC
 // The sync engines to use.
diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 0031e91c7588..3a894429b065 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -75,10 +75,8 @@ DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
 
 ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
-ifneq ($(OS_ARCH),WINCE)
 DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
 endif
-endif
 
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 2f1c4674e029..33e66ef0fa59 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -91,7 +91,6 @@
                           accesskey="&sendPageCmd.accesskey;"
                           command="Browser:SendLink"/>
                 <menuseparator/>
-#ifndef WINCE
                 <menuitem id="menu_printSetup"
                           label="&printSetupCmd.label;"
                           accesskey="&printSetupCmd.accesskey;"
@@ -114,7 +113,6 @@
                           oncommand="BrowserImport();"/>
 #ifndef XP_MACOSX
                 <menuseparator/>
-#endif
 #endif
                 <menuitem id="goOfflineMenuitem"
                           label="&goOfflineCmd.label;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7d1cd26fcd6f..e1d2b2be0901 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,7 +188,6 @@ let gInitialPages = [
 
 XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
 #ifdef XP_WIN
-#ifndef WINCE
   const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
   if (WINTASKBAR_CONTRACTID in Cc &&
       Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available) {
@@ -204,7 +203,6 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
       }
     };
   }
-#endif
 #endif
   return null;
 });
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 36fc5aded7d5..b88cfc516b96 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -467,11 +467,7 @@
 
   <toolbox id="navigator-toolbox"
            defaultmode="icons" mode="icons"
-#ifdef WINCE
-           defaulticonsize="small" iconsize="small"
-#else
            iconsize="large"
-#endif
            tabsontop="true"
            persist="tabsontop">
     <!-- Menu -->
@@ -499,13 +495,8 @@
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
              fullscreentoolbar="true" mode="icons" customizable="true"
-#ifdef WINCE
-             iconsize="small" defaulticonsize="small"
-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
-#else
              iconsize="large"
              defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
-#endif
              context="toolbar-context-menu">
 
       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index df60cee116dc..f1b9d587fb59 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -70,17 +70,12 @@ PARALLEL_DIRS = \
   sessionstore \
   shell \
   sidebar \
+  migration \
   $(NULL)
 
-ifndef WINCE
-PARALLEL_DIRS += migration
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
-ifndef WINCE
 PARALLEL_DIRS += wintaskbar
 endif
-endif
 
 ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 3947a1fe8c5f..491465971af4 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -54,13 +54,10 @@ endif
 
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib)
 
-# migration requires mozreg, which doesn't build on WINCE; only include
-# it on non-CE
-ifndef WINCE
+# migration requires mozreg
 LOCAL_INCLUDES += -I$(srcdir)/../migration/src
 SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
-endif
 
 # This has to come after the above chunk, because mozreg_s has dependencies on
 # stuff in MOZ_COMPONENT_LIBS.
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index eb7b7b847ab3..f3a577c9f3c6 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -49,8 +49,6 @@
 #include "nsGNOMEShellService.h"
 #endif
 
-#ifndef WINCE
-
 #include "nsProfileMigrator.h"
 #include "nsDogbertProfileMigrator.h"
 #if !defined(XP_OS2)
@@ -68,8 +66,6 @@
 #include "nsICabProfileMigrator.h"
 #endif
 
-#endif // WINCE
-
 #include "rdf.h"
 #include "nsFeedSniffer.h"
 #include "AboutRedirector.h"
@@ -91,8 +87,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
 #endif
 
-#ifndef WINCE
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
 #if !defined(XP_OS2)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
@@ -110,8 +104,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCaminoProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsICabProfileMigrator)
 #endif
 
-#endif
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrivateBrowsingServiceWrapper, Init)
@@ -124,7 +116,6 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 #endif
 NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID);
 NS_DEFINE_NAMED_CID(NS_BROWSER_ABOUT_REDIRECTOR_CID);
-#ifndef WINCE
 NS_DEFINE_NAMED_CID(NS_FIREFOX_PROFILEMIGRATOR_CID);
 #if defined(XP_WIN) && !defined(__MINGW32__)
 NS_DEFINE_NAMED_CID(NS_WINIEPROFILEMIGRATOR_CID);
@@ -142,7 +133,6 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_DOGBERTPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_PHOENIXPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID);
-#endif /* WINCE */
 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
@@ -154,7 +144,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 #endif
     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
-#ifndef WINCE
     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
 #if defined(XP_WIN) && !defined(__MINGW32__)
     { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
@@ -172,7 +161,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_DOGBERTPROFILEMIGRATOR_CID, false, NULL, nsDogbertProfileMigratorConstructor },
     { &kNS_PHOENIXPROFILEMIGRATOR_CID, false, NULL, nsPhoenixProfileMigratorConstructor },
     { &kNS_SEAMONKEYPROFILEMIGRATOR_CID, false, NULL, nsSeamonkeyProfileMigratorConstructor },
-#endif /* WINCE */
     { &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID, false, NULL, nsPrivateBrowsingServiceWrapperConstructor },
     { NULL }
 };
@@ -198,7 +186,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sync-tabs", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
 #endif
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "home", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
-#ifndef WINCE
     { NS_PROFILEMIGRATOR_CONTRACTID, &kNS_FIREFOX_PROFILEMIGRATOR_CID },
 #if defined(XP_WIN) && !defined(__MINGW32__)
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "ie", &kNS_WINIEPROFILEMIGRATOR_CID },
@@ -216,7 +203,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert", &kNS_DOGBERTPROFILEMIGRATOR_CID },
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "phoenix", &kNS_PHOENIXPROFILEMIGRATOR_CID },
     { NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey", &kNS_SEAMONKEYPROFILEMIGRATOR_CID },
-#endif /* WINCE */
     { NS_PRIVATE_BROWSING_SERVICE_CONTRACTID, &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID },
     { NULL }
 };
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 48e66388a53d..a5202e126831 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -370,7 +370,6 @@ BrowserGlue.prototype = {
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded() {
 #ifdef XP_WIN
-#ifndef WINCE
     // For windows seven, initialize the jump list module.
     const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
     if (WINTASKBAR_CONTRACTID in Cc &&
@@ -379,26 +378,11 @@ BrowserGlue.prototype = {
       Cu.import("resource://gre/modules/WindowsJumpLists.jsm", temp);
       temp.WinTaskbarJumpList.startup();
     }
-#endif
 #endif
   },
 
   // profile shutdown handler (contains profile cleanup routines)
   _onProfileShutdown: function BG__onProfileShutdown() {
-#ifdef MOZ_UPDATER
-#ifdef WINCE
-    // If there's a pending update, clear cache to free up disk space.
-    try {
-      let um = Cc["@mozilla.org/updates/update-manager;1"].
-               getService(Ci.nsIUpdateManager);
-      if (um.activeUpdate && um.activeUpdate.state == "pending") {
-        let cacheService = Cc["@mozilla.org/network/cache-service;1"].
-                           getService(Ci.nsICacheService);
-        cacheService.evictEntries(Ci.nsICache.STORE_ANYWHERE);
-      }
-    } catch (e) { }
-#endif
-#endif
     this._shutdownPlaces();
     this._sanitizer.onShutdown();
   },
diff --git a/browser/components/shell/content/setDesktopBackground.xul b/browser/components/shell/content/setDesktopBackground.xul
index fe74424f5297..cc96733bc19d 100644
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -77,9 +77,7 @@
         <menupopup>
           <menuitem label="&center.label;"  value="CENTER"/>
           <menuitem label="&tile.label;"    value="TILE"/>
-#ifndef WINCE
           <menuitem label="&stretch.label;" value="STRETCH"/>
-#endif
         </menupopup>
       </menulist>
       <spacer flex="1"/>
diff --git a/browser/components/shell/public/Makefile.in b/browser/components/shell/public/Makefile.in
index e7023c0f6bd9..a835fea5f9bf 100644
--- a/browser/components/shell/public/Makefile.in
+++ b/browser/components/shell/public/Makefile.in
@@ -47,7 +47,7 @@ XPIDL_MODULE  = shellservice
 
 XPIDLSRCS = nsIShellService.idl
 
-ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 XPIDLSRCS += nsIWindowsShellService.idl
 endif
 
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index a7a2efb67b9f..c9004a3dc3c2 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -50,7 +50,7 @@ USE_STATIC_LIBS = 1
 endif
 
 
-ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsWindowsShellService.cpp
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp
index dd890c3db141..3a3ba68ab2c1 100644
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -91,11 +91,7 @@
 
 #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
 
-#ifndef WINCE
 NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
-#else
-NS_IMPL_ISUPPORTS1(nsWindowsShellService, nsIShellService)
-#endif
 
 static nsresult
 OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
@@ -115,33 +111,6 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
   return NS_OK;
 }
 
-#ifdef WINCE
-static nsresult
-OpenKeyForWriting(HKEY aStartKey, const nsAString& aKeyName, HKEY* aKey)
-{
-  const nsString &flatName = PromiseFlatString(aKeyName);
-
-  DWORD dwDisp = 0;
-  DWORD res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                                0, KEY_READ | KEY_WRITE, NULL, aKey,
-                                &dwDisp);
-  switch (res) {
-  case ERROR_SUCCESS:
-    break;
-  case ERROR_ACCESS_DENIED:
-    return NS_ERROR_FILE_ACCESS_DENIED;
-  case ERROR_FILE_NOT_FOUND:
-    res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                            0, KEY_READ | KEY_WRITE, NULL, aKey,
-                            NULL);
-    if (res != ERROR_SUCCESS)
-      return NS_ERROR_FILE_ACCESS_DENIED;
-  }
-
-  return NS_OK;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // Default Browser Registry Settings
 //
@@ -217,23 +186,15 @@ typedef struct {
   char* valueData;
 } SETTING;
 
-#ifndef WINCE
 #define APP_REG_NAME L"Firefox"
 #define CLS_HTML "FirefoxHTML"
 #define CLS_URL "FirefoxURL"
 #define CPL_DESKTOP L"Control Panel\\Desktop"
 #define VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 #define VAL_FILE_ICON "%APPPATH%,1"
-#else
-#define CPL_DESKTOP L"ControlPanel\\Desktop"
-#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
-#define VAL_FILE_ICON "%APPPATH%,-2"
-#endif
-
 #define DI "\\DefaultIcon"
 #define SOP "\\shell\\open\\command"
 
-
 #define MAKE_KEY_NAME1(PREFIX, MID) \
   PREFIX MID
 
@@ -243,28 +204,11 @@ typedef struct {
 // Handlers. see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for
 // more info.
 static SETTING gSettings[] = {
-#ifndef WINCE
   // File Handler Class
   { MAKE_KEY_NAME1(CLS_HTML, SOP), "", VAL_OPEN },
 
   // Protocol Handler Class - for Vista and above
   { MAKE_KEY_NAME1(CLS_URL, SOP), "", VAL_OPEN },
-#else
-  { MAKE_KEY_NAME1("FTP", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("FTP", SOP), "", VAL_OPEN },
-
-  // File handlers for Windows CE
-  { MAKE_KEY_NAME1("bmpfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("bmpfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("giffile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("giffile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("jpegfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("jpegfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("pngfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("pngfile", SOP), "", VAL_OPEN },
-  { MAKE_KEY_NAME1("htmlfile", DI), "", VAL_FILE_ICON },
-  { MAKE_KEY_NAME1("htmlfile", SOP), "", VAL_OPEN },
-#endif
 
   // Protocol Handlers
   { MAKE_KEY_NAME1("HTTP", DI),    "", VAL_FILE_ICON },
@@ -273,7 +217,6 @@ static SETTING gSettings[] = {
   { MAKE_KEY_NAME1("HTTPS", SOP),  "", VAL_OPEN }
 };
 
-#if !defined(WINCE)
 nsresult
 GetHelperPath(nsAutoString& aPath)
 {
@@ -313,12 +256,10 @@ LaunchHelper(nsAutoString& aPath)
   CloseHandle(pi.hThread);
   return NS_OK;
 }
-#endif // !defined(WINCE)
 
 NS_IMETHODIMP
 nsWindowsShellService::ShortcutMaintenance()
 {
-#if !defined(WINCE)
   nsresult rv;
 
   // Launch helper.exe so it can update the application user model ids on
@@ -388,13 +329,8 @@ nsWindowsShellService::ShortcutMaintenance()
   appHelperPath.AppendLiteral(" /UpdateShortcutAppUserModelIds");
 
   return LaunchHelper(appHelperPath);
-#else
-  NS_NOTREACHED("ShortcutMaintenance not implemented on wince!");
-  return NS_OK;
-#endif // !defined(WINCE)
 }
 
-#ifndef WINCE
 PRBool
 nsWindowsShellService::IsDefaultBrowserVista(PRBool* aIsDefaultBrowser)
 {
@@ -418,7 +354,6 @@ nsWindowsShellService::IsDefaultBrowserVista(PRBool* aIsDefaultBrowser)
 #endif  
   return PR_FALSE;
 }
-#endif
 
 NS_IMETHODIMP
 nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
@@ -439,12 +374,10 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
   if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
     return NS_ERROR_FAILURE;
 
-#ifndef WINCE
   // Convert the path to a long path since GetModuleFileNameW returns the path
   // that was used to launch Firefox which is not necessarily a long path.
   if (!::GetLongPathNameW(exePath, exePath, MAX_BUF))
     return NS_ERROR_FAILURE;
-#endif
 
   nsAutoString appLongPath(exePath);
 
@@ -478,12 +411,10 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
     }
   }
 
-#ifndef WINCE
   // Only check if Firefox is the default browser on Vista if the previous
   // checks show that Firefox is the default browser.
   if (*aIsDefaultBrowser)
     IsDefaultBrowserVista(aIsDefaultBrowser);
-#endif
 
   return NS_OK;
 }
@@ -491,7 +422,6 @@ nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck,
 NS_IMETHODIMP
 nsWindowsShellService::SetDefaultBrowser(PRBool aClaimAllTypes, PRBool aForAllUsers)
 {
-#ifndef WINCE
   nsAutoString appHelperPath;
   if (NS_FAILED(GetHelperPath(appHelperPath)))
     return NS_ERROR_FAILURE;
@@ -503,91 +433,8 @@ nsWindowsShellService::SetDefaultBrowser(PRBool aClaimAllTypes, PRBool aForAllUs
   }
 
   return LaunchHelper(appHelperPath);
-#else
-  SETTING* settings;
-  SETTING* end = gSettings + sizeof(gSettings)/sizeof(SETTING);
-
-  PRUnichar exePath[MAX_BUF];
-  if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  nsAutoString appLongPath(exePath);
-
-  // The .png registry key isn't present by default so also add Content Type.
-  SetRegKey(NS_LITERAL_STRING(".png"), EmptyString(),
-            NS_LITERAL_STRING("pngfile"));
-  SetRegKey(NS_LITERAL_STRING(".png"), NS_LITERAL_STRING("Content Type"),
-            NS_LITERAL_STRING("image/png"));
-
-  // Set these keys to their default value for a clean install in case another
-  // app has changed these keys.
-  SetRegKey(NS_LITERAL_STRING(".htm"), EmptyString(),
-            NS_LITERAL_STRING("htmlfile"));
-  SetRegKey(NS_LITERAL_STRING(".html"), EmptyString(),
-            NS_LITERAL_STRING("htmlfile"));
-  SetRegKey(NS_LITERAL_STRING(".bmp"), EmptyString(),
-            NS_LITERAL_STRING("bmpfile"));
-  SetRegKey(NS_LITERAL_STRING(".gif"), EmptyString(),
-            NS_LITERAL_STRING("giffile"));
-  SetRegKey(NS_LITERAL_STRING(".jpe"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-  SetRegKey(NS_LITERAL_STRING(".jpg"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-  SetRegKey(NS_LITERAL_STRING(".jpeg"), EmptyString(),
-            NS_LITERAL_STRING("jpegfile"));
-
-  for (settings = gSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    PRInt32 offset = dataLongPath.Find("%APPPATH%");
-    dataLongPath.Replace(offset, 9, appLongPath);
-    SetRegKey(key, value, dataLongPath);
-  }
-  // On Windows CE RegFlushKey can negatively impact performance if there are a
-  // lot of pending writes to the HKEY_CLASSES_ROOT registry hive but it is
-  // necessary to save the values in the case where the user performs a hard
-  // power off of the device.
-  ::RegFlushKey(HKEY_CLASSES_ROOT);
-#endif
-
-  return NS_OK;
 }
 
-#ifdef WINCE
-void
-nsWindowsShellService::SetRegKey(const nsString& aKeyName,
-                                 const nsString& aValueName,
-                                 const nsString& aValue)
-{
-  PRUnichar buf[MAX_BUF];
-  DWORD len = sizeof buf;
-
-  HKEY theKey;
-  nsresult rv = OpenKeyForWriting(HKEY_CLASSES_ROOT, aKeyName, &theKey);
-  if (NS_FAILED(rv))
-    return;
-
-  // Get the current value.
-  DWORD res = ::RegQueryValueExW(theKey, PromiseFlatString(aValueName).get(),
-                                 NULL, NULL, (LPBYTE)buf, &len);
-
-  // Set the new value if it doesn't exist or it is different than the current
-  // value.
-  nsAutoString current(buf);
-  if (REG_FAILED(res) || !current.Equals(aValue)) {
-    const nsString &flatValue = PromiseFlatString(aValue);
-
-    ::RegSetValueExW(theKey, PromiseFlatString(aValueName).get(),
-                     0, REG_SZ, (const BYTE *)flatValue.get(),
-                     (flatValue.Length() + 1) * sizeof(PRUnichar));
-  }
-
-  // Close the key we opened.
-  ::RegCloseKey(theKey);
-}
-#endif
-
 NS_IMETHODIMP
 nsWindowsShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
 {
@@ -768,7 +615,6 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                                    0, NULL, REG_OPTION_NON_VOLATILE,
                                    KEY_WRITE, NULL, &key, &dwDisp);
     if (REG_SUCCEEDED(res)) {
-#ifndef WINCE
       PRUnichar tile[2], style[2];
       switch (aPosition) {
         case BACKGROUND_TILE:
@@ -795,25 +641,9 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                        0, REG_SZ, (const BYTE *)style, size);
       ::SystemParametersInfoW(SPI_SETDESKWALLPAPER, 0, (PVOID)path.get(),
                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
-#else
-      DWORD tile = (aPosition == BACKGROUND_TILE);
-      ::RegSetValueExW(key, L"Tile",
-                       0, REG_DWORD, (const BYTE *)&tile, sizeof(DWORD));
-      // On WinCE SPI_SETDESKWALLPAPER isn't available, so set the registry
-      // entry ourselves and then broadcast UI change
-      PRInt32 size = (path.Length() + 1) * sizeof(PRUnichar);
-      ::RegSetValueExW(key, L"Wallpaper",
-                       0, REG_SZ, (const BYTE *)path.get(), size);
-      ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, NULL, 0);
-#endif
 
       // Close the key we opened.
       ::RegCloseKey(key);
-
-#ifdef WINCE
-      // Ensure that the writes are flushed in case of hard reboot
-      ::RegFlushKey(HKEY_CURRENT_USER);
-#endif
     }
   }
   return rv;
@@ -939,9 +769,6 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
 
   ::SetSysColors(sizeof(aParameters) / sizeof(int), aParameters, colors);
 
-  // SetSysColors is persisting across sessions on Windows CE, so no need to
-  // write to registry
-#ifndef WINCE
   PRBool result = PR_FALSE;
   DWORD  dwDisp = 0;
   HKEY   key;
@@ -963,11 +790,9 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
   
   // Close the key we opened.
   ::RegCloseKey(key);
-#endif
   return NS_OK;
 }
 
-#ifndef WINCE
 NS_IMETHODIMP
 nsWindowsShellService::GetUnreadMailCount(PRUint32* aCount)
 {
@@ -1027,7 +852,6 @@ nsWindowsShellService::GetMailAccountKey(HKEY* aResult)
   ::RegCloseKey(mailKey);
   return PR_FALSE;
 }
-#endif
 
 NS_IMETHODIMP
 nsWindowsShellService::OpenApplicationWithURI(nsILocalFile* aApplication,
diff --git a/browser/components/shell/src/nsWindowsShellService.h b/browser/components/shell/src/nsWindowsShellService.h
index dfea8e8d5fd0..d4b9da59c01d 100644
--- a/browser/components/shell/src/nsWindowsShellService.h
+++ b/browser/components/shell/src/nsWindowsShellService.h
@@ -46,11 +46,7 @@
 #include <windows.h>
 #include <ole2.h>
 
-#ifndef WINCE
 class nsWindowsShellService : public nsIWindowsShellService
-#else
-class nsWindowsShellService : public nsIShellService
-#endif
 {
 public:
   nsWindowsShellService() : mCheckedThisSession(PR_FALSE) {}; 
@@ -58,20 +54,12 @@ public:
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
-#ifndef WINCE
   NS_DECL_NSIWINDOWSSHELLSERVICE
-#endif
 
 protected:
-#ifndef WINCE
   PRBool    IsDefaultBrowserVista(PRBool* aIsDefaultBrowser);
 
   PRBool    GetMailAccountKey(HKEY* aResult);
-#else
-  void      SetRegKey(const nsString& aKeyName,
-                      const nsString& aValueName,
-                      const nsString& aValue);
-#endif
 
 private:
   PRBool    mCheckedThisSession;
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index a1b36bc1939f..27ddf7bcb909 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -37,10 +37,8 @@
 @BINPATH@/updater.ini
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
-#ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
-#endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
@@ -62,9 +60,7 @@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#ifdef WINCE
-@BINPATH@/mozce_shunt.dll
-#elifdef XP_WIN32
+#ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
@@ -200,9 +196,7 @@
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-#ifndef WINCE
 @BINPATH@/components/migration.xpt
-#endif
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt
 @BINPATH@/components/necko_about.xpt
@@ -563,25 +557,6 @@ bin/libfreebl_32int64_3.so
 bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 
-; [ActiveX]
-#ifdef WINCE
-#ifndef MOZ_NO_ACTIVEX_SUPPORT
-@BINPATH@/components/nsAxSecurityPolicy.js
-@BINPATH@/@PREF_DIR@/activex.js
-@BINPATH@/plugins/npmozax.dll
-@BINPATH@/plugins/nsIMozAxPlugin.xpt
-#endif
-#endif
-
-; [FastStart]
-#ifdef WINCE
-#ifdef MOZ_FASTSTART
-@BINPATH@/firefoxfaststart.exe
-@BINPATH@/components/FastStartup.manifest
-@BINPATH@/components/FastStartup.js
-#endif
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd

From 7a68d9ddf2016d3e5221a8d553112866e9e553a1 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Fri, 22 Apr 2011 10:38:42 +0200
Subject: [PATCH 362/509] Bug 651461 - Fix build failure in nsAudioStream.cpp
 due to conflicting types; r=roc

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

diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 624223c06d10..71b0a68d794b 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOffset()
 #if defined(XP_WIN)
   positionType = SA_POSITION_WRITE_HARDWARE;
 #endif
-  PRInt64 position = 0;
+  int64_t position = 0;
   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
                              positionType, &position) == SA_SUCCESS) {
     return position / sizeof(short);

From 271f7bebc5afe666280d5431cba77855e61d8182 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 22 Apr 2011 11:17:25 +0200
Subject: [PATCH 363/509] Bug 651079 - Use addLoadEvent instead of <body
 onload=""> in content/html/content/tests/. r=ehsa

---
 content/html/content/test/test_bug287465.html       | 3 ++-
 content/html/content/test/test_bug300691-2.html     | 6 ++++--
 content/html/content/test/test_bug372098.html       | 6 ++++--
 content/html/content/test/test_bug518122.html       | 3 ++-
 content/html/content/test/test_bug556645.html       | 3 ++-
 content/html/content/test/test_bug557087-5.html     | 3 ++-
 content/html/content/test/test_bug561636.html       | 3 ++-
 content/html/content/test/test_bug566046.html       | 5 ++++-
 content/html/content/test/test_bug566160.html       | 5 ++++-
 content/html/content/test/test_bug567938-2.html     | 3 ++-
 content/html/content/test/test_bug567938-3.html     | 3 ++-
 content/html/content/test/test_bug567938-4.html     | 3 ++-
 content/html/content/test/test_bug569955.html       | 9 ++++++---
 content/html/content/test/test_bug582412-1.html     | 5 ++++-
 content/html/content/test/test_bug582412-2.html     | 6 +++++-
 content/html/content/test/test_bug596350.html       | 3 ++-
 content/html/content/test/test_formSubmission2.html | 9 ++++++---
 17 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/content/html/content/test/test_bug287465.html b/content/html/content/test/test_bug287465.html
index cb7c54aa9ac5..4946b8c3ede5 100644
--- a/content/html/content/test/test_bug287465.html
+++ b/content/html/content/test/test_bug287465.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=287465
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="doTest()">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=287465">Mozilla Bug 287465</a>
 <p id="display"></p>
 <div id="content" style="display:none">
@@ -24,6 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=287465
 <script class="testbody" type="text/javascript">
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(doTest);
 
 function doTest() {
   function checkSVGDocument(id) {
diff --git a/content/html/content/test/test_bug300691-2.html b/content/html/content/test/test_bug300691-2.html
index 8ad49540f61e..3a00fe52a583 100644
--- a/content/html/content/test/test_bug300691-2.html
+++ b/content/html/content/test/test_bug300691-2.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=300691
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="done();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=300691">Mozilla Bug 300691</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -17,7 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=300691
 </div>
 <pre id="test">
 <script type="text/javascript">
-  SimpleTest.waitForExplicitFinish();
   // First, setup.  We'll be toggling these variables as we go.
   var test1Ran = false;
   var test2Ran = false;
@@ -134,6 +133,9 @@ function done() {
      "src attribute still got executed, so this shouldn't have been");
   SimpleTest.finish();
 }
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(done);
 </script>
 </pre>
 </body>
diff --git a/content/html/content/test/test_bug372098.html b/content/html/content/test/test_bug372098.html
index 1bcde948c586..1fd4feb7ff0b 100644
--- a/content/html/content/test/test_bug372098.html
+++ b/content/html/content/test/test_bug372098.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=372098
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <base target="bug372098"></base>
 </head>
-<body onload="handle_load();">
+<body>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=372098">Mozilla Bug 372098</a>
   <p id="display"></p>
   <div id="content" style="display:none;">
@@ -30,9 +30,11 @@ var area_passed = false;
 
 /* Start the test */
 
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(handle_load);
+
 function handle_load()
 {
-  SimpleTest.waitForExplicitFinish();
   sendMouseEvent({type:'click'}, 'a');
 }
 
diff --git a/content/html/content/test/test_bug518122.html b/content/html/content/test/test_bug518122.html
index ee77323be551..85f5458a8059 100644
--- a/content/html/content/test/test_bug518122.html
+++ b/content/html/content/test/test_bug518122.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=518122
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests()">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=518122">Mozilla Bug 518122</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -21,6 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=518122
 /** Test for Bug 518122 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 var simple_tests = [ ["foo", "foo"],
                      ["", ""],
diff --git a/content/html/content/test/test_bug556645.html b/content/html/content/test/test_bug556645.html
index 8fc40a9ad5fa..9f0af07b09f2 100644
--- a/content/html/content/test/test_bug556645.html
+++ b/content/html/content/test/test_bug556645.html
@@ -6,9 +6,10 @@
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="runTest()">
+<body>
 <script>
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTest);
 
 function runTest()
 {
diff --git a/content/html/content/test/test_bug557087-5.html b/content/html/content/test/test_bug557087-5.html
index d8c091560d7a..04891b5b4d59 100644
--- a/content/html/content/test/test_bug557087-5.html
+++ b/content/html/content/test/test_bug557087-5.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=557087
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTest();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=557087">Mozilla Bug 557087</a>
 <p id="display"></p>
 <div id="content">
@@ -30,6 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=557087
 /** Test for Bug 557087 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTest);
 
 var testResults = [
   "data:text/html,?",
diff --git a/content/html/content/test/test_bug561636.html b/content/html/content/test/test_bug561636.html
index a281ca8e628e..60b33fd01ab4 100644
--- a/content/html/content/test/test_bug561636.html
+++ b/content/html/content/test/test_bug561636.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=561636
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTest();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=561636">Mozilla Bug 561636</a>
 <p id="display"></p>
 <iframe style='width:50px; height: 50px;' name='t'></iframe>
@@ -41,6 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=561636
 /** Test for Bug 561636 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTest);
 
 function runTest()
 {
diff --git a/content/html/content/test/test_bug566046.html b/content/html/content/test/test_bug566046.html
index 2932363c0c8a..d1a5a6885baa 100644
--- a/content/html/content/test/test_bug566046.html
+++ b/content/html/content/test/test_bug566046.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566046
   <base target='frame2'>
   <base target=''>
 </head>
-<body onload="setTimeout(runTests);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566046">Mozilla Bug 566046</a>
 <p id="display"></p>
 <style>
@@ -82,6 +82,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566046
 /** Test for Bug 566046 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  setTimeout(runTests, 0);
+});
 
 var gTestResults = {
   frame1: "data:text/html,?foo=foo",
diff --git a/content/html/content/test/test_bug566160.html b/content/html/content/test/test_bug566160.html
index c11faaef65db..c8f435d51a7e 100644
--- a/content/html/content/test/test_bug566160.html
+++ b/content/html/content/test/test_bug566160.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="setTimeout(runTests);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566160">Mozilla Bug 566160</a>
 <p id="display"></p>
 <style>
@@ -69,6 +69,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
 /** Test for Bug 566160 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  setTimeout(runTests, 0);
+});
 
 var gTestResults = {
   frame1: "data:text/html,?foo=foo",
diff --git a/content/html/content/test/test_bug567938-2.html b/content/html/content/test/test_bug567938-2.html
index 4184756e3d0a..af3b0863d348 100644
--- a/content/html/content/test/test_bug567938-2.html
+++ b/content/html/content/test/test_bug567938-2.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=567938">Mozilla Bug 567938</a>
 <p id="display"></p>
 <iframe id='iframe' name="submit_frame" style="visibility: hidden;"></iframe>
@@ -24,6 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
 /** Test for Bug 567938 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 var gTestData = ["submit", "image"];
 var gCurrentTest = 0;
diff --git a/content/html/content/test/test_bug567938-3.html b/content/html/content/test/test_bug567938-3.html
index e62ba24e5418..d247c5ab5642 100644
--- a/content/html/content/test/test_bug567938-3.html
+++ b/content/html/content/test/test_bug567938-3.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=567938">Mozilla Bug 567938</a>
 <p id="display"></p>
 <iframe id='iframe' name="submit_frame" style="visibility: hidden;"></iframe>
@@ -24,6 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
 /** Test for Bug 567938 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 var gTestData = ["submit", "image"];
 var gCurrentTest = 0;
diff --git a/content/html/content/test/test_bug567938-4.html b/content/html/content/test/test_bug567938-4.html
index 2dc500892963..7a994890caa3 100644
--- a/content/html/content/test/test_bug567938-4.html
+++ b/content/html/content/test/test_bug567938-4.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=567938">Mozilla Bug 567938</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -22,6 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=567938
 /** Test for Bug 567938 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 function runTests()
 {
diff --git a/content/html/content/test/test_bug569955.html b/content/html/content/test/test_bug569955.html
index 2d206a774a17..ea6ac3df47d8 100644
--- a/content/html/content/test/test_bug569955.html
+++ b/content/html/content/test/test_bug569955.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=569955
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="SimpleTest.executeSoon(runTests);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=569955">Mozilla Bug 569955</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=569955
 
 /** Test for Bug 569955 **/
 
-SimpleTest.waitForExplicitFinish();
-
 function runTests()
 {
   isnot(document.activeElement, document.getElementById('i'),
@@ -29,6 +27,11 @@ function runTests()
   SimpleTest.finish();
 }
 
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  setTimeout(runTests, 0);
+});
+
 </script>
 </pre>
 </body>
diff --git a/content/html/content/test/test_bug582412-1.html b/content/html/content/test/test_bug582412-1.html
index 0ba10b7fd51e..d9c5c8112fcc 100644
--- a/content/html/content/test/test_bug582412-1.html
+++ b/content/html/content/test/test_bug582412-1.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="setTimeout(runTests);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566160">Mozilla Bug 566160</a>
 <p id="display"></p>
 <style>
@@ -84,6 +84,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
 /** Test for Bug 566160 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  setTimeout(runTests, 0);
+});
 
 var gTestResults = {
   frame1: "data:text/html,?foo=foo",
diff --git a/content/html/content/test/test_bug582412-2.html b/content/html/content/test/test_bug582412-2.html
index 2efba6148566..e9c6eea3a27d 100644
--- a/content/html/content/test/test_bug582412-2.html
+++ b/content/html/content/test/test_bug582412-2.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="setTimeout(runTests);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=566160">Mozilla Bug 566160</a>
 <p id="display"></p>
 <style>
@@ -84,6 +84,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=566160
 /** Test for Bug 566160 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  setTimeout(runTests, 0);
+});
+
 var gTestResults = {
   frame1: '[{\"headers\":{\"Content-Disposition\":\"form-data; name=\\\"foo\\\"\"},\"body\":\"foo\"}]',
   frame2: '[{\"headers\":{\"Content-Disposition\":\"form-data; name=\\\"bar\\\"\"},\"body\":\"bar\"},{\"headers\":{\"Content-Disposition\":\"form-data; name=\\\"x\\\"\"},\"body\":\"0\"},{\"headers\":{\"Content-Disposition\":\"form-data; name=\\\"y\\\"\"},\"body\":\"0\"}]',
diff --git a/content/html/content/test/test_bug596350.html b/content/html/content/test/test_bug596350.html
index e8a6ae736a13..43a70124a3d3 100644
--- a/content/html/content/test/test_bug596350.html
+++ b/content/html/content/test/test_bug596350.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=596350
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="runTests();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=596350">Mozilla Bug 596350</a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -23,6 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=596350
 /** Test for Bug 596350 **/
 
 SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTests);
 
 var testData = [
 // Object 0
diff --git a/content/html/content/test/test_formSubmission2.html b/content/html/content/test/test_formSubmission2.html
index 1cdf26494f49..e6dfdeced5e2 100644
--- a/content/html/content/test/test_formSubmission2.html
+++ b/content/html/content/test/test_formSubmission2.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=523771
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="gen.next();">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=523771">Mozilla Bug 523771</a>
 <p id="display"></p>
 <iframe name="target_iframe" id="target_iframe"></iframe>
@@ -67,10 +67,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=523771
 <pre id="test">
 <script class="testbody" type="text/javascript;version=1.8">
 
-SimpleTest.waitForExplicitFinish();
-
 var gen = runTest();
 
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  gen.next();
+});
+
 var expectedSub = [
   // Submit input
   [{ name: "n1_1", value: "v1_1" }],

From 5fa8e9094e6a55cf9359be3d6bad6d4d522980f5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 09:37:36 -0700
Subject: [PATCH 364/509] Bug 652050: diagnostic patch for android reftest
 permaorange (test-only)

---
 layout/reftests/svg/conditions-01.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/svg/conditions-01.svg b/layout/reftests/svg/conditions-01.svg
index 397cc35248ba..72325256579b 100644
--- a/layout/reftests/svg/conditions-01.svg
+++ b/layout/reftests/svg/conditions-01.svg
@@ -9,7 +9,7 @@
 
 	<rect width="100%" height="100%" fill="lime"/>
 	
-	<rect systemLanguage="foo" x="50" y="100" width="50" height="50" fill="red"/>
+	<rect systemLanguage="XXXdholbertThisIsNotALanguage" x="50" y="100" width="50" height="50" fill="red"/>
 
 	<rect x="200" y="100" width="50" height="50" fill="red"/>
 	<rect requiredFeatures="http://www.w3.org/TR/SVG11/feature#Gradient" x="200" y="100" width="50" height="50" fill="lime"/>

From e07a78dad07bfe1f242b63305120f3d107037562 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Fri, 22 Apr 2011 19:33:36 +0200
Subject: [PATCH 365/509] Bug 650699 - Sort out MSVC DLLs packaging in Debug
 builds; (Av1) In debug builds, don't warn nor package. r=ted.mielczarek.

---
 build/win32/Makefile.in | 2 ++
 configure.in            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index a52de81469f4..07a837b17f49 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -64,6 +64,7 @@ include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MEMORY
 ifdef WIN32_REDIST_DIR
+ifndef MOZ_DEBUG
 
 ifeq (1400,$(_MSC_VER))
 REDIST_FILES = \
@@ -96,5 +97,6 @@ libs::
 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
 endif
 
+endif # ! MOZ_DEBUG
 endif # WIN32_REDIST_DIR
 endif # ! MOZ_MEMORY
diff --git a/configure.in b/configure.in
index 56ca63dcaa3d..b617a522992a 100644
--- a/configure.in
+++ b/configure.in
@@ -7256,7 +7256,7 @@ fi
 if test -z "$MOZ_MEMORY"; then
   case "${target}" in
     *-mingw*)
-      if test -z "$WIN32_REDIST_DIR"; then
+      if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
         AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
       fi
       ;;

From 6e5d6edb6681436978254327913126927dbc2f60 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Fri, 22 Apr 2011 10:38:13 -0700
Subject: [PATCH 366/509] Bug 651980 - 'Intermittent
 dom/src/threads/test/test_chromeWorkerJSM.xul | Test timed out'. r=mrbkap.

---
 dom/src/threads/nsDOMWorker.cpp  | 24 +++++++++++++++++++-----
 dom/src/threads/test/Makefile.in |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dom/src/threads/nsDOMWorker.cpp b/dom/src/threads/nsDOMWorker.cpp
index 357e3d8de76f..a23e7585d0b1 100644
--- a/dom/src/threads/nsDOMWorker.cpp
+++ b/dom/src/threads/nsDOMWorker.cpp
@@ -1481,15 +1481,29 @@ NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP
 nsDOMWorker::PreCreate(nsISupports* aObject,
-                       JSContext* /* aCx */,
+                       JSContext* aCx,
                        JSObject* /* aPlannedParent */,
-                       JSObject** /* aParent */)
+                       JSObject** aParent)
 {
   nsCOMPtr<nsIWorker> iworker(do_QueryInterface(aObject));
-  if (iworker && static_cast<nsDOMWorker *>(iworker.get())->IsPrivileged()) {
-    return NS_SUCCESS_CHROME_ACCESS_ONLY;
+  NS_ENSURE_TRUE(iworker, NS_ERROR_UNEXPECTED);
+
+  nsCOMPtr<nsIXPConnectWrappedNative> wrappedNative;
+  {
+    MutexAutoLock lock(mLock);
+    wrappedNative = mWrappedNative;
   }
-  return NS_OK;
+
+  // Don't allow XPConnect to create multiple WrappedNatives for this object.
+  if (wrappedNative) {
+    JSObject* object;
+    nsresult rv = wrappedNative->GetJSObject(&object);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    *aParent = JS_GetParent(aCx, object);
+  }
+
+  return IsPrivileged() ? NS_SUCCESS_CHROME_ACCESS_ONLY : NS_OK;
 }
 
 NS_IMETHODIMP
diff --git a/dom/src/threads/test/Makefile.in b/dom/src/threads/test/Makefile.in
index c139fb90be74..e2311aa4d717 100644
--- a/dom/src/threads/test/Makefile.in
+++ b/dom/src/threads/test/Makefile.in
@@ -131,7 +131,7 @@ _SUBDIR_TEST_FILES = \
 _CHROME_TEST_FILES = \
   test_chromeWorker.xul \
   test_chromeWorkerComponent.xul \
-  $(warning test_chromeWorkerJSM.xul disabled because the respective code has major problems and is being rewritten, see bug 625222) \
+  test_chromeWorkerJSM.xul \
   chromeWorker_worker.js \
   chromeWorker_subworker.js \
   $(NULL)

From 85b3a12e07d62a4c1b39cc0e5060f81391062c4d Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Fri, 22 Apr 2011 10:55:46 -0700
Subject: [PATCH 367/509] Bug 650081 Fix ipc_channel_win.cpp WARNING about
 Connect called twice r=cjones

---
 ipc/chromium/src/chrome/common/ipc_channel_win.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ipc/chromium/src/chrome/common/ipc_channel_win.cc b/ipc/chromium/src/chrome/common/ipc_channel_win.cc
index 92afb1315e94..fdf44584b483 100644
--- a/ipc/chromium/src/chrome/common/ipc_channel_win.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_win.cc
@@ -175,7 +175,9 @@ bool Channel::ChannelImpl::CreatePipe(const std::wstring& channel_id,
 }
 
 bool Channel::ChannelImpl::Connect() {
+#ifndef CHROMIUM_MOZILLA_BUILD
   DLOG(WARNING) << "Connect called twice";
+#endif
 
   if (!thread_check_.get())
     thread_check_.reset(new NonThreadSafe());

From 2abd6838144cc6440eab59dc1c89fc8adecc1372 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 11:44:29 -0700
Subject: [PATCH 368/509] Bug 652050: revert diagnostic patch for android
 reftest permaorange (test-only) DONTBUILD

---
 layout/reftests/svg/conditions-01.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/svg/conditions-01.svg b/layout/reftests/svg/conditions-01.svg
index 72325256579b..397cc35248ba 100644
--- a/layout/reftests/svg/conditions-01.svg
+++ b/layout/reftests/svg/conditions-01.svg
@@ -9,7 +9,7 @@
 
 	<rect width="100%" height="100%" fill="lime"/>
 	
-	<rect systemLanguage="XXXdholbertThisIsNotALanguage" x="50" y="100" width="50" height="50" fill="red"/>
+	<rect systemLanguage="foo" x="50" y="100" width="50" height="50" fill="red"/>
 
 	<rect x="200" y="100" width="50" height="50" fill="red"/>
 	<rect requiredFeatures="http://www.w3.org/TR/SVG11/feature#Gradient" x="200" y="100" width="50" height="50" fill="lime"/>

From 260c051d6d17ea2042fea0d23a12a70a25c8dd31 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Fri, 22 Apr 2011 12:32:44 -0700
Subject: [PATCH 369/509] Fix bug 643839. r=brendan, a=clegnitto

---
 js/src/jsscope.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 197e84043d2a..f19181297b80 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -966,10 +966,8 @@ JSObject::putProperty(JSContext *cx, jsid id,
     if (hadSlot && !shape->hasSlot()) {
         if (oldSlot < shape->slotSpan)
             freeSlot(cx, oldSlot);
-#ifdef DEBUG
         else
             getSlotRef(oldSlot).setUndefined();
-#endif
         JS_ATOMIC_INCREMENT(&cx->runtime->propertyRemovals);
     }
 

From 19fa35fca8143a9c2aad6bf7647e7fdfb61ee74f Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 14:08:54 -0700
Subject: [PATCH 370/509] Bug 652050 diagnostic 2: Temporarily add printfs to
 verify presumed cause of mobile permaorange. r=dougt

---
 content/svg/content/src/nsSVGFeatures.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp
index 4a2b5d2b2769..742e8b65498f 100644
--- a/content/svg/content/src/nsSVGFeatures.cpp
+++ b/content/svg/content/src/nsSVGFeatures.cpp
@@ -223,9 +223,11 @@ nsSVGFeatures::PassesConditionalProcessingTests(nsIContent *aContent,
 
     // Get our language preferences
     if (!acceptLangs.IsEmpty()) {
+      printf("Bug 652050 diagnostic: intl.accept_languages is nonempty.\n");
       return MatchesLanguagePreferences(value, acceptLangs);
     } else {
       // For now, evaluate to true.
+      printf("Bug 652050 diagnostic: intl.accept_languages is EMPTY!\n");
       NS_WARNING("no default language specified for systemLanguage conditional test");
       return !value.IsEmpty();
     }

From 6c6676367c2a4b35541e62796d5c9c24a0d76ece Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Fri, 22 Apr 2011 17:10:17 -0400
Subject: [PATCH 371/509] Bug 647028 - Followup: Add comment. r=comment-only

--HG--
extra : rebase_source : ee50c484b7d7aa37345dc26ca749b39942cf7731
---
 browser/components/sessionstore/src/nsSessionStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index 393070b303cc..ed6d80549aac 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -2855,7 +2855,9 @@ SessionStoreService.prototype = {
     if (activeIndex >= tabData.entries.length)
       activeIndex = tabData.entries.length - 1;
 
-    // Reset currentURI.
+    // Reset currentURI.  This creates a new session history entry with a new
+    // doc identifier, so we need to explicitly save and restore the old doc
+    // identifier (corresponding to the SHEntry at activeIndex) below.
     browser.webNavigation.setCurrentURI(this._getURIFromString("about:blank"));
 
     // Attach data that will be restored on "load" event, after tab is restored.

From aa0b7411ef25b66eaf9107b00e9f614627ad1742 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 14 Apr 2011 13:58:36 -0700
Subject: [PATCH 372/509] Bug 647273 - Remove nsIContentUtils and
 nsIContentUtils2. r=sicking

--HG--
extra : rebase_source : 8a99a1401b7d7427bed4a136e0b38c475f6473a2
---
 content/base/public/Makefile.in               |  1 -
 content/base/public/nsContentUtils.h          | 13 +++
 content/base/public/nsIContentUtils.h         | 94 -------------------
 content/base/src/nsContentUtils.cpp           | 35 +------
 content/base/src/nsTextFragment.h             |  1 +
 docshell/base/nsDocShell.cpp                  | 14 +--
 docshell/base/nsWebNavigationInfo.cpp         | 22 ++---
 .../windowwatcher/src/nsWindowWatcher.cpp     |  5 +-
 layout/build/nsLayoutCID.h                    |  8 --
 layout/build/nsLayoutModule.cpp               | 10 --
 .../base/src/nsPluginStreamListenerPeer.cpp   |  6 +-
 widget/tests/Makefile.in                      |  8 +-
 widget/tests/TestChromeMargin.cpp             | 17 ++--
 xpfe/appshell/src/nsXULWindow.cpp             |  5 +-
 14 files changed, 47 insertions(+), 192 deletions(-)
 delete mode 100644 content/base/public/nsIContentUtils.h

diff --git a/content/base/public/Makefile.in b/content/base/public/Makefile.in
index 3bdf344e7456..3b06e370849d 100644
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -53,7 +53,6 @@ nsIContentIterator.h \
 nsContentErrors.h \
 nsContentPolicyUtils.h \
 nsContentUtils.h \
-nsIContentUtils.h \
 nsIDocument.h \
 nsIDocumentObserver.h \
 nsIMutationObserver.h \
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 5f74d6fcdabd..ed9e2d7bdd35 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -132,6 +132,7 @@ class nsPresContext;
 class nsIChannel;
 struct nsIntMargin;
 class nsPIDOMWindow;
+class nsIDocumentLoaderFactory;
 
 #ifndef have_PrefChangedFunc_typedef
 typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
@@ -1758,6 +1759,18 @@ public:
    */
   static bool AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal);
 
+  enum ContentViewerType
+  {
+      TYPE_UNSUPPORTED,
+      TYPE_CONTENT,
+      TYPE_PLUGIN,
+      TYPE_UNKNOWN
+  };
+
+  static already_AddRefed<nsIDocumentLoaderFactory>
+  FindInternalContentViewer(const char* aType,
+                            ContentViewerType* aLoaderType = nsnull);
+
 private:
   static PRBool InitializeEventTable();
 
diff --git a/content/base/public/nsIContentUtils.h b/content/base/public/nsIContentUtils.h
deleted file mode 100644
index df0552bd9091..000000000000
--- a/content/base/public/nsIContentUtils.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef nsIContentUtils_h__
-#define nsIContentUtils_h__
-
-#include "nsIDocumentLoaderFactory.h"
-#include "nsCOMPtr.h"
-#include "nsAString.h"
-#include "nsMargin.h"
-
-class nsIInterfaceRequestor;
-
-// {3682DD99-8560-44f4-9B8F-CCCE9D7B96FB}
-#define NS_ICONTENTUTILS_IID \
-{ 0x3682dd99, 0x8560, 0x44f4, \
-  { 0x9b, 0x8f, 0xcc, 0xce, 0x9d, 0x7b, 0x96, 0xfb } }
-
-class nsIContentUtils : public nsISupports
-{
-public:
-    NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS_IID)
-    NS_DECL_ISUPPORTS
-
-    virtual PRBool IsSafeToRunScript();
-    virtual PRBool ParseIntMarginValue(const nsAString& aString, nsIntMargin& result);
-
-    enum ContentViewerType
-    {
-        TYPE_UNSUPPORTED,
-        TYPE_CONTENT,
-        TYPE_PLUGIN,
-        TYPE_UNKNOWN
-    };
-
-    virtual already_AddRefed<nsIDocumentLoaderFactory>
-    FindInternalContentViewer(const char* aType,
-                              ContentViewerType* aLoaderType = NULL);
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils, NS_ICONTENTUTILS_IID)
-
-// {c7193287-3e3d-467f-b6da-47b914eb4c83}
-#define NS_ICONTENTUTILS2_IID \
-{ 0xc7193287, 0x3e3d, 0x467f, \
-{ 0xb6, 0xda, 0x47, 0xb9, 0x14, 0xeb, 0x4c, 0x83 } }
-
-class nsIContentUtils2 : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS2_IID)
-  NS_DECL_ISUPPORTS
-
-  virtual nsIInterfaceRequestor* GetSameOriginChecker();
-  // Returns NS_OK for same origin, error (NS_ERROR_DOM_BAD_URI) if not.
-  virtual nsresult CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel);
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils2, NS_ICONTENTUTILS2_IID)
-
-#endif /* nsIContentUtils_h__ */
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index bd81861ac6c2..cae96e74ac5c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -58,7 +58,6 @@
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsDOMCID.h"
 #include "nsContentUtils.h"
-#include "nsIContentUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"
@@ -6466,23 +6465,9 @@ nsContentUtils::AllowXULXBLForPrincipal(nsIPrincipal* aPrincipal)
           IsSitePermAllow(princURI, "allowXULXBL"));
 }
 
-NS_IMPL_ISUPPORTS1(nsIContentUtils, nsIContentUtils)
-
-PRBool
-nsIContentUtils::IsSafeToRunScript()
-{
-  return nsContentUtils::IsSafeToRunScript();
-}
-
-PRBool
-nsIContentUtils::ParseIntMarginValue(const nsAString& aString, nsIntMargin& result)
-{
-  return nsContentUtils::ParseIntMarginValue(aString, result);
-}
-
 already_AddRefed<nsIDocumentLoaderFactory>
-nsIContentUtils::FindInternalContentViewer(const char* aType,
-                                           ContentViewerType* aLoaderType)
+nsContentUtils::FindInternalContentViewer(const char* aType,
+                                          ContentViewerType* aLoaderType)
 {
   if (aLoaderType) {
     *aLoaderType = TYPE_UNSUPPORTED;
@@ -6506,7 +6491,7 @@ nsIContentUtils::FindInternalContentViewer(const char* aType,
         *aLoaderType = TYPE_PLUGIN;
       else
       *aLoaderType = TYPE_UNKNOWN;
-    }   
+    }
     return docFactory.forget();
   }
 
@@ -6544,17 +6529,3 @@ nsIContentUtils::FindInternalContentViewer(const char* aType,
 
   return NULL;
 }
-
-NS_IMPL_ISUPPORTS1(nsIContentUtils2, nsIContentUtils2)
-
-nsIInterfaceRequestor*
-nsIContentUtils2::GetSameOriginChecker()
-{
-  return nsContentUtils::GetSameOriginChecker();
-}
-
-nsresult
-nsIContentUtils2::CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel)
-{
-  return nsContentUtils::CheckSameOrigin(aOldChannel, aNewChannel);
-}
diff --git a/content/base/src/nsTextFragment.h b/content/base/src/nsTextFragment.h
index 4a5c27aca21e..c9510fc82feb 100644
--- a/content/base/src/nsTextFragment.h
+++ b/content/base/src/nsTextFragment.h
@@ -45,6 +45,7 @@
 #define nsTextFragment_h___
 
 #include "nsString.h"
+#include "nsReadableUtils.h"
 #include "nsTraceRefcnt.h"
 class nsString;
 class nsCString;
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 77b7e291d949..7223a4e6d338 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -49,7 +49,6 @@
 #include "nsIBrowserDOMWindow.h"
 #include "nsIComponentManager.h"
 #include "nsIContent.h"
-#include "nsIContentUtils.h"
 #include "mozilla/dom/Element.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
@@ -6491,11 +6490,9 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
   // too, of course.
   mFiredUnloadEvent = PR_FALSE;
 
-  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-  if (!cutils)
-      return NS_ERROR_FAILURE;
+  nsCOMPtr<nsIDocumentLoaderFactory> docFactory =
+      nsContentUtils::FindInternalContentViewer("text/html");
 
-  nsCOMPtr<nsIDocumentLoaderFactory> docFactory = cutils->FindInternalContentViewer("text/html");
   if (docFactory) {
     // generate (about:blank) document to load
     docFactory->CreateBlankDocument(mLoadGroup, aPrincipal,
@@ -7520,13 +7517,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
 {
     nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
 
-    nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-    if (!cutils) {
-        return NS_ERROR_FAILURE;
-    }
-
     nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-        cutils->FindInternalContentViewer(aContentType);
+        nsContentUtils::FindInternalContentViewer(aContentType);
     if (!docLoaderFactory) {
         return NS_ERROR_FAILURE;
     }
diff --git a/docshell/base/nsWebNavigationInfo.cpp b/docshell/base/nsWebNavigationInfo.cpp
index ed9ff71e66fb..2e30c0bd2df6 100644
--- a/docshell/base/nsWebNavigationInfo.cpp
+++ b/docshell/base/nsWebNavigationInfo.cpp
@@ -39,9 +39,9 @@
 #include "nsIWebNavigation.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
-#include "nsIContentUtils.h"
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIPluginHost.h"
+#include "nsContentUtils.h"
 
 NS_IMPL_ISUPPORTS1(nsWebNavigationInfo, nsIWebNavigationInfo)
 
@@ -110,29 +110,25 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
   NS_PRECONDITION(aIsSupported, "Null out param?");
 
 
-  nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
-  if (!cutils)
-      return NS_ERROR_FAILURE;
-
-  nsIContentUtils::ContentViewerType vtype = nsIContentUtils::TYPE_UNSUPPORTED;
+  nsContentUtils::ContentViewerType vtype = nsContentUtils::TYPE_UNSUPPORTED;
 
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-    cutils->FindInternalContentViewer(aType.get(), &vtype);
-  
+    nsContentUtils::FindInternalContentViewer(aType.get(), &vtype);
+
   switch (vtype) {
-  case nsIContentUtils::TYPE_UNSUPPORTED:
+  case nsContentUtils::TYPE_UNSUPPORTED:
     *aIsSupported = nsIWebNavigationInfo::UNSUPPORTED;
     break;
 
-  case nsIContentUtils::TYPE_PLUGIN:
+  case nsContentUtils::TYPE_PLUGIN:
     *aIsSupported = nsIWebNavigationInfo::PLUGIN;
     break;
 
-  case nsIContentUtils::TYPE_UNKNOWN:
+  case nsContentUtils::TYPE_UNKNOWN:
     *aIsSupported = nsIWebNavigationInfo::OTHER;
     break;
 
-  case nsIContentUtils::TYPE_CONTENT:
+  case nsContentUtils::TYPE_CONTENT:
     PRBool isImage = PR_FALSE;
     mImgLoader->SupportImageWithMimeType(aType.get(), &isImage);
     if (isImage) {
@@ -143,6 +139,6 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
     }
     break;
   }
-  
+
   return NS_OK;
 }
diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index 54d33e8d0d3a..5c15bba33522 100644
--- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -46,7 +46,6 @@
 #include "nsNetUtil.h"
 #include "nsWWJSUtils.h"
 #include "plstr.h"
-#include "nsIContentUtils.h"
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
@@ -512,9 +511,7 @@ nsWindowWatcher::OpenWindowJSInternal(nsIDOMWindow *aParent,
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = 0;
 
-  nsCOMPtr<nsIContentUtils> utils =
-    do_GetService("@mozilla.org/content/contentutils;1");
-  if (utils && !utils->IsSafeToRunScript()) {
+  if (!nsContentUtils::IsSafeToRunScript()) {
     return NS_ERROR_FAILURE;
   }
 
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
index 2b6e28445f91..847b58e308c9 100644
--- a/layout/build/nsLayoutCID.h
+++ b/layout/build/nsLayoutCID.h
@@ -238,14 +238,6 @@
 #define NS_FOCUSMANAGER_CID \
 { 0xcf7fd51f, 0xaba2, 0x44c1, { 0x9f, 0xf0, 0x11, 0xf7, 0x50, 0x8e, 0xfc, 0xd4 } }
 
-// {762C4AE7-B923-422F-B97E-B9BFC1EF7BF0}
-#define NS_ICONTENTUTILS_CID \
-{ 0x762C4AE7, 0xB923, 0x422F, { 0xB9, 0x7E, 0xB9, 0xBF, 0xC1, 0xEF, 0x7B, 0xF0 } }
-
-// {1802442d-a59b-43b8-b8fd-070da5549593}
-#define NS_ICONTENTUTILS2_CID \
-{ 0x1802442d, 0xa59b, 0x43b8, { 0xb8, 0xfd, 0x07, 0x0d, 0xa5, 0x54, 0x95, 0x93 } }
-
 // {1A26A7B7-D06E-4F45-8B45-D7AD60F7A9AB}
 #define INDEXEDDB_MANAGER_CID \
 { 0x1a26a7b7, 0xd06e, 0x4f45, { 0x8b, 0x45, 0xd7, 0xad, 0x60, 0xf7, 0xa9, 0xab } }
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 07e40583c71c..023e740ebd3d 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -94,7 +94,6 @@
 #include "nsStyleSheetService.h"
 #include "nsXULPopupManager.h"
 #include "nsFocusManager.h"
-#include "nsIContentUtils.h"
 #include "ThirdPartyUtil.h"
 #include "mozilla/Services.h"
 
@@ -580,9 +579,6 @@ MAKE_CTOR(CreateVideoDocument,            nsIDocument,                 NS_NewVid
 #endif
 MAKE_CTOR(CreateFocusManager,             nsIFocusManager,      NS_NewFocusManager)
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIContentUtils2)
-
 MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
 MAKE_CTOR(CreateCanvasRenderingContextWebGL, nsIDOMWebGLRenderingContext, NS_NewCanvasRenderingContextWebGL)
 
@@ -868,8 +864,6 @@ NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
 NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS_CID);
-NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS2_CID);
 NS_DEFINE_NAMED_CID(CSPSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_EVENTLISTENERSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GLOBALMESSAGEMANAGER_CID);
@@ -1019,8 +1013,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_GEOLOCATION_SERVICE_CID, false, NULL, nsGeolocationServiceConstructor },
   { &kNS_GEOLOCATION_CID, false, NULL, nsGeolocationConstructor },
   { &kNS_FOCUSMANAGER_CID, false, NULL, CreateFocusManager },
-  { &kNS_ICONTENTUTILS_CID, false, NULL, nsIContentUtilsConstructor },
-  { &kNS_ICONTENTUTILS2_CID, false, NULL, nsIContentUtils2Constructor },
   { &kCSPSERVICE_CID, false, NULL, CSPServiceConstructor },
   { &kNS_EVENTLISTENERSERVICE_CID, false, NULL, CreateEventListenerService },
   { &kNS_GLOBALMESSAGEMANAGER_CID, false, NULL, CreateGlobalMessageManager },
@@ -1164,8 +1156,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
   { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
   { "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID },
-  { "@mozilla.org/content/contentutils;1", &kNS_ICONTENTUTILS_CID },
-  { "@mozilla.org/content/contentutils2;1", &kNS_ICONTENTUTILS2_CID },
   { CSPSERVICE_CONTRACTID, &kCSPSERVICE_CID },
   { NS_EVENTLISTENERSERVICE_CONTRACTID, &kNS_EVENTLISTENERSERVICE_CID },
   { NS_GLOBALMESSAGEMANAGER_CONTRACTID, &kNS_GLOBALMESSAGEMANAGER_CID },
diff --git a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
index 03eb04e58838..f580927390c8 100644
--- a/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
+++ b/modules/plugin/base/src/nsPluginStreamListenerPeer.cpp
@@ -54,10 +54,10 @@
 #include "nsIMultiPartChannel.h"
 #include "nsIInputStreamTee.h"
 #include "nsPrintfCString.h"
-#include "nsIContentUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocument.h"
 #include "nsIWebNavigation.h"
+#include "nsContentUtils.h"
 
 #define MAGIC_REQUEST_CONTEXT 0x01020304
 
@@ -1423,9 +1423,7 @@ nsPluginStreamListenerPeer::AsyncOnChannelRedirect(nsIChannel *oldChannel, nsICh
         return rv;
       }
       if (method.EqualsLiteral("POST")) {
-        nsCOMPtr<nsIContentUtils2> contentUtils2 = do_GetService("@mozilla.org/content/contentutils2;1");
-        NS_ENSURE_TRUE(contentUtils2, NS_ERROR_FAILURE);
-        rv = contentUtils2->CheckSameOrigin(oldChannel, newChannel);
+        rv = nsContentUtils::CheckSameOrigin(oldChannel, newChannel);
         if (NS_FAILED(rv)) {
           return rv;
         }
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index 5b3775a3a859..b80064c7bf3b 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -47,13 +47,17 @@ MODULE          = test_widget
 XPCSHELL_TESTS  = unit
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+
 ifdef NS_ENABLE_TSF
 #Test disabled because it uses the internal string APIs incorrectly (see bug 582863)
 #CPP_UNIT_TESTS += TestWinTSF.cpp  \
 #                  $(NULL)
 endif
-CPP_UNIT_TESTS += TestChromeMargin.cpp  \
-                  $(NULL)
+
+# Test disabled because it requires the internal API.  Re-enabling this test is
+# bug 652123.
+#CPP_UNIT_TESTS += TestChromeMargin.cpp  \
+#                 $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/widget/tests/TestChromeMargin.cpp b/widget/tests/TestChromeMargin.cpp
index a06ae9726937..476555797fa3 100644
--- a/widget/tests/TestChromeMargin.cpp
+++ b/widget/tests/TestChromeMargin.cpp
@@ -37,11 +37,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* This tests the margin parsing functionality in nsAttrValue.cpp, which
- * is accessible via nsIContentUtils, and is used in setting chromemargins
+ * is accessible via nsContentUtils, and is used in setting chromemargins
  * to widget windows. It's located here due to linking issues in the
  * content directory.
  */
 
+/* This test no longer compiles now that we've removed nsIContentUtils (bug
+ * 647273).  We need to be internal code in order to include nsContentUtils.h,
+ * but defining MOZILLA_INTERNAL_API is not enough to make us internal.
+ */
+
 #include "TestHarness.h"
 
 #ifndef MOZILLA_INTERNAL_API
@@ -61,7 +66,7 @@ template<class T> class nsReadingIterator;
 #endif
 
 #include "nscore.h"
-#include "nsIContentUtils.h"
+#include "nsContentUtils.h"
 
 #ifndef MOZILLA_INTERNAL_API
 #undef nsString_h___
@@ -115,19 +120,13 @@ const DATA Data[] = {
 
 void DoAttrValueTest()
 {
-  nsCOMPtr<nsIContentUtils> utils =
-   do_GetService("@mozilla.org/content/contentutils;1");
-
-  if (!utils)
-    fail("No nsIContentUtils");
-
   int idx = -1;
   bool didFail = false;
   while (Data[++idx].margins) {
     nsAutoString str;
     str.AssignLiteral(Data[idx].margins);
     nsIntMargin values(99,99,99,99);
-    bool result = utils->ParseIntMarginValue(str, values);
+    bool result = nsContentUtils::ParseIntMarginValue(str, values);
 
     // if the parse fails
     if (!result) {
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index b6fc3983eec2..9d5f889aa67c 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -92,7 +92,6 @@
 #include "nsReadableUtils.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
-#include "nsIContentUtils.h"
 
 #include "nsWebShellWindow.h" // get rid of this one, too...
 
@@ -1392,10 +1391,8 @@ void nsXULWindow::SyncAttributesToWidget()
 
   // "chromemargin" attribute
   nsIntMargin margins;
-  nsCOMPtr<nsIContentUtils> cutils =
-    do_GetService("@mozilla.org/content/contentutils;1");
   rv = windowElement->GetAttribute(NS_LITERAL_STRING("chromemargin"), attr);
-  if (NS_SUCCEEDED(rv) && cutils && cutils->ParseIntMarginValue(attr, margins)) {
+  if (NS_SUCCEEDED(rv) && nsContentUtils::ParseIntMarginValue(attr, margins)) {
     mWindow->SetNonClientMargins(margins);
   }
 

From ec9003bb0a2d3562ba16e5322b215fd7e339ee34 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Thu, 21 Apr 2011 10:17:49 -0400
Subject: [PATCH 373/509] bug 606574 - bustage fix for unsupported platforms

---
 widget/public/Makefile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in
index 92dd0bbbd746..d49c051b4c9d 100644
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -46,13 +46,14 @@ MODULE		= widget
 XPIDL_MODULE	= widget
 GRE_MODULE	= 1
 
-EXPORTS_NAMESPACES = IPC mozilla
+EXPORTS_NAMESPACES = IPC
 
 EXPORTS_IPC = \
 		nsGUIEventIPC.h \
 		$(NULL)
 
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
+EXPORTS_NAMESPACES += mozilla
 EXPORTS_mozilla = \
   WidgetTraceEvent.h
 endif

From bc13895396534618e0490250219253110f03d252 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 21 Apr 2011 10:25:34 -0400
Subject: [PATCH 374/509] Bug 649797 - Rewrite the test for bug 600570 in a way
 that doesn't trigger the assertion which can never happen on the web; r=roc

--HG--
extra : rebase_source : 8f21974f360f1e9806a1b7cfefb7d1733513d22f
---
 .../libeditor/text/tests/test_bug600570.html  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/editor/libeditor/text/tests/test_bug600570.html b/editor/libeditor/text/tests/test_bug600570.html
index 2c3f49b31664..95130e42c735 100644
--- a/editor/libeditor/text/tests/test_bug600570.html
+++ b/editor/libeditor/text/tests/test_bug600570.html
@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=600570
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=600570">Mozilla Bug 600570</a>
 <p id="display"></p>
 <div id="content">
-<textarea>
+<textarea spellcheck="false">
 aaa
 [bbb]</textarea>
 </div>
@@ -45,17 +45,19 @@ SimpleTest.waitForFocus(function() {
       t.addEventListener("input", function() {
         t.removeEventListener("input", arguments.callee, false);
 
-        is(t.value, "[aaa\nbbb]", "The value of the textarea should be correct");
-        synthesizeKey("A", {accelKey: true});
-        is(t.selectionStart, 0, "Select all should set the selection start to the beginning of textarea");
-        is(t.selectionEnd, 9, "Select all should set the selection end to the end of textarea");
+        setTimeout(function() { // Avoid the assertion in bug 649797
+          is(t.value, "[aaa\nbbb]", "The value of the textarea should be correct");
+          synthesizeKey("A", {accelKey: true});
+          is(t.selectionStart, 0, "Select all should set the selection start to the beginning of textarea");
+          is(t.selectionEnd, 9, "Select all should set the selection end to the end of textarea");
 
-        var afterPaste = snapshotWindow(window);
+          var afterPaste = snapshotWindow(window);
 
-        var res = compareSnapshots(afterSetValue, afterPaste, true);
-        ok(res[0], "Pasting and setting the value directly should result in the same rendering");
+          var res = compareSnapshots(afterSetValue, afterPaste, true);
+          ok(res[0], "Pasting and setting the value directly should result in the same rendering");
 
-        SimpleTest.finish();
+          SimpleTest.finish();
+        }, 0);
       }, false);
       synthesizeKey("VK_RIGHT", {});
       synthesizeKey("V", {accelKey: true});

From 37eba27a786a254fe8a72185e2f98e6c66c93782 Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Thu, 21 Apr 2011 10:47:21 -0500
Subject: [PATCH 375/509] Bug 651618 - Add name of Apple's OS X 10.7 Java
 plugin to IPC prefs. r=josh

---
 browser/app/profile/firefox.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 7cdde5cc8f31..283694783285 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -946,6 +946,7 @@ pref("toolbar.customization.usesheet", false);
 pref("dom.ipc.plugins.enabled.i386", false);
 pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
+pref("dom.ipc.plugins.enabled.i386.javaappletplugin.plugin", true);
 // x86_64 ipc preferences
 pref("dom.ipc.plugins.enabled.x86_64", true);
 #else

From 5f410e5e8c2cbb44359b7f41d8d64c7c266d00c1 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Thu, 21 Apr 2011 08:48:02 -0700
Subject: [PATCH 376/509] Bug 628290: Click on "Get Add-ons" has to always load
 the initial Discovery pane. r=dtownsend

---
 .../mozapps/extensions/content/extensions.js  | 57 +++++++++++++-----
 .../test/browser/browser_bug562797.js         | 60 +++++++++++++++++++
 .../test/browser/browser_discovery.js         |  2 +-
 3 files changed, 104 insertions(+), 15 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index c38625660b44..0a4d90ac0f79 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -551,14 +551,23 @@ var gViewController = {
   },
 
   loadView: function(aViewId) {
-    if (aViewId == this.currentViewId)
-      return;
+    var isRefresh = false;
+    if (aViewId == this.currentViewId) {
+      if (this.isLoading)
+        return;
+      if (!("refresh" in this.currentViewObj))
+        return;
+      if (!this.currentViewObj.canRefresh())
+        return;
+      isRefresh = true;
+    }
 
     var state = {
       view: aViewId,
       previousView: this.currentViewId
     };
-    gHistory.pushState(state);
+    if (!isRefresh)
+      gHistory.pushState(state);
     this.loadViewInternal(aViewId, this.currentViewId, state);
   },
 
@@ -598,7 +607,7 @@ var gViewController = {
     if (!viewObj.node)
       throw new Error("Root node doesn't exist for '" + view.type + "' view");
 
-    if (this.currentViewObj) {
+    if (this.currentViewObj && aViewId != aPreviousView) {
       try {
         let canHide = this.currentViewObj.hide();
         if (canHide === false)
@@ -617,7 +626,11 @@ var gViewController = {
 
     this.viewPort.selectedPanel = this.currentViewObj.node;
     this.viewPort.selectedPanel.setAttribute("loading", "true");
-    this.currentViewObj.show(view.param, ++this.currentViewRequest, aState);
+
+    if (aViewId == aPreviousView)
+      this.currentViewObj.refresh(view.param, ++this.currentViewRequest, aState);
+    else
+      this.currentViewObj.show(view.param, ++this.currentViewRequest, aState);
   },
 
   // Moves back in the document history and removes the current history entry
@@ -1655,7 +1668,7 @@ var gDiscoverView = {
                                               Ci.nsIWebProgress.NOTIFY_STATE_ALL);
 
       if (self.loaded)
-        self._loadURL(self.homepageURL.spec, notifyInitialized);
+        self._loadURL(self.homepageURL.spec, false, notifyInitialized);
       else
         notifyInitialized();
     }
@@ -1689,7 +1702,7 @@ var gDiscoverView = {
     });
   },
 
-  show: function(aParam, aRequest, aState) {
+  show: function(aParam, aRequest, aState, aIsRefresh) {
     gViewController.updateCommands();
 
     // If we're being told to load a specific URL then just do that
@@ -1698,9 +1711,11 @@ var gDiscoverView = {
       this._loadURL(aState.url);
     }
 
-    // If the view has loaded before and the error page is not visible then
-    // there is nothing else to do
-    if (this.loaded && this.node.selectedPanel != this._error) {
+    // If the view has loaded before and still at the homepage (if refreshing),
+    // and the error page is not visible then there is nothing else to do
+    if (this.loaded && this.node.selectedPanel != this._error &&
+        (!aIsRefresh || (this._browser.currentURI &&
+         this._browser.currentURI.spec == this._browser.homePage))) {
       gViewController.notifyViewChanged();
       return;
     }
@@ -1714,9 +1729,20 @@ var gDiscoverView = {
       return;
     }
 
-    this._loadURL(this.homepageURL.spec,
+    this._loadURL(this.homepageURL.spec, aIsRefresh,
                   gViewController.notifyViewChanged.bind(gViewController));
   },
+  
+  canRefresh: function() {
+    if (this._browser.currentURI &&
+        this._browser.currentURI.spec == this._browser.homePage)
+      return false;
+    return true;
+  },
+
+  refresh: function(aParam, aRequest, aState) {
+    this.show(aParam, aRequest, aState, true);
+  },
 
   hide: function() { },
 
@@ -1724,7 +1750,7 @@ var gDiscoverView = {
     this.node.selectedPanel = this._error;
   },
 
-  _loadURL: function(aURL, aCallback) {
+  _loadURL: function(aURL, aKeepHistory, aCallback) {
     if (this._browser.currentURI.spec == aURL) {
       if (aCallback)
         aCallback();
@@ -1734,8 +1760,11 @@ var gDiscoverView = {
     if (aCallback)
       this._loadListeners.push(aCallback);
 
-    this._browser.loadURIWithFlags(aURL,
-                                   Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY);
+    var flags = 0;
+    if (!aKeepHistory)
+      flags |= Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY;
+
+    this._browser.loadURIWithFlags(aURL, flags);
   },
 
   onLocationChange: function(aWebProgress, aRequest, aLocation) {
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js b/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
index 4910ae7736f9..d9dc7ce7b310 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
@@ -844,3 +844,63 @@ add_test(function() {
     });
   }, true);
 });
+
+// Tests that refreshing the disicovery pane integrates properly with history
+add_test(function() {
+  open_manager("addons://list/plugin", function(aManager) {
+    is_in_list(aManager, "addons://list/plugin", false, false);
+
+    EventUtils.synthesizeMouseAtCenter(aManager.document.getElementById("category-discover"), { }, aManager);
+
+    wait_for_view_load(aManager, function(aManager) {
+      is_in_discovery(aManager, MAIN_URL, true, false);
+
+      clickLink(aManager, "link-good", function() {
+        is_in_discovery(aManager, SECOND_URL, true, false);
+
+        EventUtils.synthesizeMouseAtCenter(aManager.document.getElementById("category-discover"), { }, aManager);
+        
+        waitForLoad(aManager, function() {
+          is_in_discovery(aManager, MAIN_URL, true, false);
+
+          go_back(aManager);
+
+          waitForLoad(aManager, function() {
+            is_in_discovery(aManager, SECOND_URL, true, true);
+
+            go_back(aManager);
+
+            waitForLoad(aManager, function() {
+              is_in_discovery(aManager, MAIN_URL, true, true);
+
+              go_back(aManager);
+
+              wait_for_view_load(aManager, function(aManager) {
+                is_in_list(aManager, "addons://list/plugin", false, true);
+
+                go_forward(aManager);
+
+                wait_for_view_load(aManager, function(aManager) {
+                  is_in_discovery(aManager, MAIN_URL, true, true);
+
+                  waitForLoad(aManager, function() {
+                    is_in_discovery(aManager, SECOND_URL, true, true);
+
+                    waitForLoad(aManager, function() {
+                      is_in_discovery(aManager, MAIN_URL, true, false);
+
+                      close_manager(aManager, run_next_test);
+                    });
+                    go_forward(aManager);
+                  });
+
+                  go_forward(aManager);
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_discovery.js b/toolkit/mozapps/extensions/test/browser/browser_discovery.js
index ef3652572c5a..f67b8189a3df 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_discovery.js
@@ -410,7 +410,7 @@ add_test(function() {
 
       gCategoryUtilities.openType("extension", function() {
         gCategoryUtilities.openType("discover", function() {
-          is(getURL(browser), "https://example.com/" + RELATIVE_DIR + "releaseNotes.xhtml", "Should have loaded the right url");
+          is(getURL(browser), MAIN_URL, "Should have loaded the right url");
 
           close_manager(gManagerWindow, run_next_test);
         });

From 68289c6545485266ee5e694d599c8060d34a90cf Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 21 Apr 2011 09:36:44 -0700
Subject: [PATCH 377/509] Bug 566787: Use the windows API to get the home
 directory when possible. r=jimm, sr=bsmedberg

---
 xpcom/io/SpecialSystemDirectory.cpp | 12 +++++++++---
 xpcom/tests/unit/test_home.js       | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 xpcom/tests/unit/test_home.js

diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index adf89a0bcd99..df67c1baf44b 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -681,6 +681,10 @@ GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory,
 
         case Win_HomeDirectory:
         {
+            nsresult rv = GetWindowsFolder(CSIDL_PROFILE, aFile);
+            if (NS_SUCCEEDED(rv))
+                return rv;
+
             PRInt32 len;
             if ((len = ::GetEnvironmentVariableW(L"HOME", path, MAX_PATH)) > 0)
             {
@@ -691,9 +695,11 @@ GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory,
                 path[len]   = L'\\';
                 path[++len] = L'\0';
 
-                return NS_NewLocalFile(nsDependentString(path, len),
-                                       PR_TRUE,
-                                       aFile);
+                rv = NS_NewLocalFile(nsDependentString(path, len),
+                                     PR_TRUE,
+                                     aFile);
+                if (NS_SUCCEEDED(rv))
+                    return rv;
             }
 
             len = ::GetEnvironmentVariableW(L"HOMEDRIVE", path, MAX_PATH);
diff --git a/xpcom/tests/unit/test_home.js b/xpcom/tests/unit/test_home.js
new file mode 100644
index 000000000000..0592bb8dbf30
--- /dev/null
+++ b/xpcom/tests/unit/test_home.js
@@ -0,0 +1,24 @@
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+
+const CWD = do_get_cwd();
+function checkOS(os) {
+  const nsILocalFile_ = "nsILocalFile" + os;
+  return nsILocalFile_ in Components.interfaces &&
+         CWD instanceof Components.interfaces[nsILocalFile_];
+}
+
+const isWin = checkOS("Win");
+
+function run_test() {
+  var envVar = isWin ? "USERPROFILE" : "HOME";
+
+  var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
+  var homeDir = dirSvc.get("Home", Ci.nsIFile);
+
+  var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
+  var expected = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+  expected.initWithPath(env.get(envVar));
+
+  do_check_eq(homeDir.path, expected.path);
+}

From a32db38c017170b2e545b8913ccc74643f60fbd1 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 21 Apr 2011 09:40:25 -0700
Subject: [PATCH 378/509] Backout changeset 475ae5b49540 from bug 626998 due to
 it probably being obsoleted by bug 611755

---
 .../base/content/test/browser_bug553455.js    | 124 ++++++------------
 1 file changed, 41 insertions(+), 83 deletions(-)

diff --git a/browser/base/content/test/browser_bug553455.js b/browser/base/content/test/browser_bug553455.js
index b66124f05217..9bd87d5ae968 100644
--- a/browser/base/content/test/browser_bug553455.js
+++ b/browser/base/content/test/browser_bug553455.js
@@ -705,88 +705,6 @@ function test_renotify_installed() {
 },
 
 function test_cancel_restart() {
-  // If the XPI is already cached then the HTTP observer won't see the request
-  var cacheService = Cc["@mozilla.org/network/cache-service;1"].
-                     getService(Ci.nsICacheService);
-  try {
-    cacheService.evictEntries(Components.interfaces.nsICache.STORE_ANYWHERE);
-  } catch(ex) {}
-
-  // Must be registered before any request starts
-  var observerService = Cc["@mozilla.org/network/http-activity-distributor;1"].
-                        getService(Ci.nsIHttpActivityDistributor);
-  observerService.addObserver({
-    observeActivity: function(aChannel, aType, aSubtype, aTimestamp, aSizeData,
-                              aStringData) {
-      aChannel.QueryInterface(Ci.nsIChannel);
-
-      // Wait for the first event for the download
-      if (aChannel.URI.spec != TESTROOT + "unsigned.xpi" ||
-        aType != Ci.nsIHttpActivityObserver.ACTIVITY_TYPE_HTTP_TRANSACTION ||
-        aSubtype != Ci.nsIHttpActivityObserver.ACTIVITY_SUBTYPE_REQUEST_HEADER)
-        return;
-
-      observerService.removeObserver(this);
-
-      info("Replacing channel");
-      aChannel.QueryInterface(Ci.nsITraceableChannel);
-      var listener = aChannel.setNewListener({
-        onStartRequest: function(aRequest, aContext) {
-          listener.onStartRequest(aRequest, aContext);
-        },
-
-        onDataAvailable: function(aRequest, aContext, aInputStream, aOffset, aCount) {
-          listener.onDataAvailable(aRequest, aContext, aInputStream, aOffset, aCount);
-        },
-
-        onStopRequest: function(aRequest, aContext, aStatusCode) {
-          listener.onStopRequest(aRequest, aContext, aStatusCode);
-
-          // Request should have been cancelled
-          is(aStatusCode, Components.results.NS_BINDING_ABORTED, "Should have seen a cancelled request");
-
-          // Notification should have changed to cancelled
-          let notification = PopupNotifications.panel.childNodes[0];
-          is(notification.id, "addon-install-cancelled-notification", "Should have seen the cancelled notification");
-
-          // Wait for the install confirmation dialog
-          wait_for_install_dialog(function(aWindow) {
-            // Wait for the complete notification
-            wait_for_notification(function(aPanel) {
-              let notification = aPanel.childNodes[0];
-              is(notification.id, "addon-install-complete-notification", "Should have seen the install complete");
-              is(notification.button.label, "Restart Now", "Should have seen the right button");
-              is(notification.getAttribute("label"),
-                 "XPI Test will be installed after you restart " + gApp + ".",
-                 "Should have seen the right message");
-
-              AddonManager.getAllInstalls(function(aInstalls) {
-                is(aInstalls.length, 1, "Should be one pending install");
-                aInstalls[0].cancel();
-
-                Services.perms.remove("example.com", "install");
-                wait_for_notification_close(runNextTest);
-                gBrowser.removeTab(gBrowser.selectedTab);
-              });
-            });
-
-            aWindow.document.documentElement.acceptDialog();
-          });
-
-          // Restart the download
-          info("Restarting download");
-          EventUtils.synthesizeMouse(notification.button, 20, 10, {});
-
-          // Should be back to a progress notification
-          ok(PopupNotifications.isPanelOpen, "Notification should still be open");
-          is(PopupNotifications.panel.childNodes.length, 1, "Should be only one notification");
-          notification = PopupNotifications.panel.childNodes[0];
-          is(notification.id, "addon-progress-notification", "Should have seen the progress notification");
-        }
-      });
-    }
-  });
-
   // Wait for the progress notification
   wait_for_notification(function(aPanel) {
     let notification = aPanel.childNodes[0];
@@ -806,8 +724,48 @@ function test_cancel_restart() {
     let button = document.getAnonymousElementByAttribute(notification, "anonid", "cancel");
 
     // Cancel the download
-    info("Cancelling download");
     EventUtils.synthesizeMouse(button, 2, 2, {});
+
+    // Downloads cannot be restarted synchronously, bug 611755
+    executeSoon(function() {
+      // Notification should have changed to cancelled
+      notification = aPanel.childNodes[0];
+      is(notification.id, "addon-install-cancelled-notification", "Should have seen the cancelled notification");
+
+      // Wait for the install confirmation dialog
+      wait_for_install_dialog(function(aWindow) {
+        // Wait for the complete notification
+        wait_for_notification(function(aPanel) {
+          let notification = aPanel.childNodes[0];
+          is(notification.id, "addon-install-complete-notification", "Should have seen the install complete");
+          is(notification.button.label, "Restart Now", "Should have seen the right button");
+          is(notification.getAttribute("label"),
+             "XPI Test will be installed after you restart " + gApp + ".",
+             "Should have seen the right message");
+
+          AddonManager.getAllInstalls(function(aInstalls) {
+            is(aInstalls.length, 1, "Should be one pending install");
+            aInstalls[0].cancel();
+
+            Services.perms.remove("example.com", "install");
+            wait_for_notification_close(runNextTest);
+            gBrowser.removeTab(gBrowser.selectedTab);
+          });
+        });
+
+        aWindow.document.documentElement.acceptDialog();
+      });
+
+      // Restart the download
+      EventUtils.synthesizeMouse(notification.button, 20, 10, {});
+
+      // Should be back to a progress notification
+      ok(PopupNotifications.isPanelOpen, "Notification should still be open");
+      is(PopupNotifications.panel.childNodes.length, 1, "Should be only one notification");
+      notification = aPanel.childNodes[0];
+      is(notification.id, "addon-progress-notification", "Should have seen the progress notification");
+
+    });
   });
 
   var pm = Services.perms;

From 8ddaa487e5b5d998b3147e5afc7335e0c96fd2f4 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 21 Apr 2011 09:41:13 -0700
Subject: [PATCH 379/509] Bug 611755: Cannot restart a download during the
 onDownloadCancelled event. r=robstrong

---
 .../base/content/test/browser_bug553455.js    | 62 +++++++++---------
 toolkit/mozapps/extensions/XPIProvider.jsm    | 17 +++++
 .../extensions/test/xpcshell/test_install.js  | 63 ++++++++++++++++++-
 3 files changed, 108 insertions(+), 34 deletions(-)

diff --git a/browser/base/content/test/browser_bug553455.js b/browser/base/content/test/browser_bug553455.js
index 9bd87d5ae968..bd83866bad7e 100644
--- a/browser/base/content/test/browser_bug553455.js
+++ b/browser/base/content/test/browser_bug553455.js
@@ -726,46 +726,42 @@ function test_cancel_restart() {
     // Cancel the download
     EventUtils.synthesizeMouse(button, 2, 2, {});
 
-    // Downloads cannot be restarted synchronously, bug 611755
-    executeSoon(function() {
-      // Notification should have changed to cancelled
-      notification = aPanel.childNodes[0];
-      is(notification.id, "addon-install-cancelled-notification", "Should have seen the cancelled notification");
+    // Notification should have changed to cancelled
+    notification = aPanel.childNodes[0];
+    is(notification.id, "addon-install-cancelled-notification", "Should have seen the cancelled notification");
 
-      // Wait for the install confirmation dialog
-      wait_for_install_dialog(function(aWindow) {
-        // Wait for the complete notification
-        wait_for_notification(function(aPanel) {
-          let notification = aPanel.childNodes[0];
-          is(notification.id, "addon-install-complete-notification", "Should have seen the install complete");
-          is(notification.button.label, "Restart Now", "Should have seen the right button");
-          is(notification.getAttribute("label"),
-             "XPI Test will be installed after you restart " + gApp + ".",
-             "Should have seen the right message");
+    // Wait for the install confirmation dialog
+    wait_for_install_dialog(function(aWindow) {
+      // Wait for the complete notification
+      wait_for_notification(function(aPanel) {
+        let notification = aPanel.childNodes[0];
+        is(notification.id, "addon-install-complete-notification", "Should have seen the install complete");
+        is(notification.button.label, "Restart Now", "Should have seen the right button");
+        is(notification.getAttribute("label"),
+           "XPI Test will be installed after you restart " + gApp + ".",
+           "Should have seen the right message");
 
-          AddonManager.getAllInstalls(function(aInstalls) {
-            is(aInstalls.length, 1, "Should be one pending install");
-            aInstalls[0].cancel();
+        AddonManager.getAllInstalls(function(aInstalls) {
+          is(aInstalls.length, 1, "Should be one pending install");
+          aInstalls[0].cancel();
 
-            Services.perms.remove("example.com", "install");
-            wait_for_notification_close(runNextTest);
-            gBrowser.removeTab(gBrowser.selectedTab);
-          });
+          Services.perms.remove("example.com", "install");
+          wait_for_notification_close(runNextTest);
+          gBrowser.removeTab(gBrowser.selectedTab);
         });
-
-        aWindow.document.documentElement.acceptDialog();
       });
 
-      // Restart the download
-      EventUtils.synthesizeMouse(notification.button, 20, 10, {});
-
-      // Should be back to a progress notification
-      ok(PopupNotifications.isPanelOpen, "Notification should still be open");
-      is(PopupNotifications.panel.childNodes.length, 1, "Should be only one notification");
-      notification = aPanel.childNodes[0];
-      is(notification.id, "addon-progress-notification", "Should have seen the progress notification");
-
+      aWindow.document.documentElement.acceptDialog();
     });
+
+    // Restart the download
+    EventUtils.synthesizeMouse(notification.button, 20, 10, {});
+
+    // Should be back to a progress notification
+    ok(PopupNotifications.isPanelOpen, "Notification should still be open");
+    is(PopupNotifications.panel.childNodes.length, 1, "Should be only one notification");
+    notification = aPanel.childNodes[0];
+    is(notification.id, "addon-progress-notification", "Should have seen the progress notification");
   });
 
   var pm = Services.perms;
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index 562b49dfb578..5f6ce478265f 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -5125,6 +5125,7 @@ AddonInstall.prototype = {
   loadGroup: null,
   badCertHandler: null,
   listeners: null,
+  restartDownload: false,
 
   name: null,
   type: null,
@@ -5505,6 +5506,20 @@ AddonInstall.prototype = {
     if (this.state != AddonManager.STATE_DOWNLOADING)
       return;
 
+    if (this.channel) {
+      // A previous download attempt hasn't finished cleaning up yet, signal
+      // that it should restart when complete
+      LOG("Waiting for previous download to complete");
+      this.restartDownload = true;
+      return;
+    }
+
+    this.openChannel();
+  },
+
+  openChannel: function AI_openChannel() {
+    this.restartDownload = false;
+
     try {
       this.file = getTemporaryFile();
       this.ownsTempFile = true;
@@ -5650,6 +5665,8 @@ AddonInstall.prototype = {
     // If the download was cancelled then all events will have already been sent
     if (aStatus == Cr.NS_BINDING_ABORTED) {
       this.removeTemporaryFile();
+      if (this.restartDownload)
+        this.openChannel();
       return;
     }
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install.js b/toolkit/mozapps/extensions/test/xpcshell/test_install.js
index ba1df7372049..a31c89f1d153 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_install.js
@@ -1543,7 +1543,7 @@ function run_test_26() {
 
       observerService.removeObserver(this);
 
-      do_test_finished();
+      run_test_27();
     }
   });
 
@@ -1558,3 +1558,64 @@ function run_test_26() {
     aInstall.install();
   }, "application/x-xpinstall");
 }
+
+
+// Tests that an install can be restarted during onDownloadCancelled after being
+// cancelled in mid-download
+function run_test_27() {
+  prepare_test({ }, [
+    "onNewInstall"
+  ]);
+
+  let url = "http://localhost:4444/addons/test_install3.xpi";
+  AddonManager.getInstallForURL(url, function(aInstall) {
+    ensure_test_completed();
+
+    do_check_neq(aInstall, null);
+    do_check_eq(aInstall.state, AddonManager.STATE_AVAILABLE);
+
+    aInstall.addListener({
+      onDownloadProgress: function() {
+        aInstall.removeListener(this);
+        aInstall.cancel();
+      }
+    });
+
+    prepare_test({}, [
+      "onDownloadStarted",
+      "onDownloadCancelled",
+    ], check_test_27);
+    aInstall.install();
+  }, "application/x-xpinstall");
+}
+
+function check_test_27(aInstall) {
+  prepare_test({
+    "addon3@tests.mozilla.org": [
+      "onInstalling"
+    ]
+  }, [
+    "onDownloadStarted",
+    "onDownloadEnded",
+    "onInstallStarted",
+    "onInstallEnded"
+  ], finish_test_27);
+
+  aInstall.install();
+}
+
+function finish_test_27(aInstall) {
+  prepare_test({
+    "addon3@tests.mozilla.org": [
+      "onOperationCancelled"
+    ]
+  }, [
+    "onInstallCancelled"
+  ]);
+
+  aInstall.cancel();
+
+  ensure_test_completed();
+
+  do_test_finished();
+}

From 7f8221e72cb5d59a7deba6b4fb3c250f34ca369a Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 21 Apr 2011 10:08:05 -0700
Subject: [PATCH 380/509] Bug 651229: Remove unused variable from nsLineBox.
 r=smontagu

---
 layout/generic/nsLineBox.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
index 81ff15de359b..b301f4c20185 100644
--- a/layout/generic/nsLineBox.cpp
+++ b/layout/generic/nsLineBox.cpp
@@ -660,8 +660,6 @@ nsLineIterator::CheckLineOrder(PRInt32                  aLine,
     return NS_OK;
   }
   
-  nsPresContext* presContext = line->mFirstChild->PresContext();
-
   nsIFrame* leftmostFrame;
   nsIFrame* rightmostFrame;
   *aIsReordered = nsBidiPresUtils::CheckLineOrder(line->mFirstChild, line->GetChildCount(), &leftmostFrame, &rightmostFrame);

From a258b90bee90089b6f0fefaf5f1493d667f74a1e Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 21 Apr 2011 10:08:11 -0700
Subject: [PATCH 381/509] Bug 651567: Remove unused variable 'xHeight' from
 nsMathMLmunderFrame. r=karlt

---
 layout/mathml/nsMathMLmunderFrame.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp
index 793f08acb703..ba7033a9db6f 100644
--- a/layout/mathml/nsMathMLmunderFrame.cpp
+++ b/layout/mathml/nsMathMLmunderFrame.cpp
@@ -282,8 +282,6 @@ nsMathMLmunderFrame::Place(nsRenderingContext& aRenderingContext,
                             PresContext()->GetUserFontSet());
   nsFontMetrics* fm = aRenderingContext.FontMetrics();
 
-  nscoord xHeight = fm->XHeight();
-
   nscoord ruleThickness;
   GetRuleThickness (aRenderingContext, fm, ruleThickness);
 

From ddd27efe3d7d8d20d16db304f15eb2cc6ba30c1c Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Wed, 20 Apr 2011 14:45:57 -0700
Subject: [PATCH 382/509] Bug 610155 - Use SurfaceDescriptor for ImageLayer and
 CanvasLayer r=jones.chris.g

---
 gfx/layers/basic/BasicLayers.cpp      | 155 +++++++++++---------------
 gfx/layers/ipc/PLayers.ipdl           |   8 +-
 gfx/layers/ipc/ShadowLayers.cpp       |  24 ++--
 gfx/layers/ipc/ShadowLayers.h         |  28 +++--
 gfx/layers/ipc/ShadowLayersParent.cpp |  31 ++----
 gfx/layers/opengl/CanvasLayerOGL.cpp  |  38 ++++---
 gfx/layers/opengl/CanvasLayerOGL.h    |  12 +-
 gfx/layers/opengl/ImageLayerOGL.cpp   |  24 ++--
 gfx/layers/opengl/ImageLayerOGL.h     |  11 +-
 9 files changed, 162 insertions(+), 169 deletions(-)

diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 090dc97fa1fa..43c7aec55a6f 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -56,6 +56,9 @@
 #include "ThebesLayerBuffer.h"
 #include "nsIWidget.h"
 #include "ReadbackProcessor.h"
+#ifdef MOZ_X11
+#include "gfxXlibSurface.h"
+#endif
 
 #include "GLContext.h"
 
@@ -1624,12 +1627,6 @@ public:
     mShadow = aShadow;
   }
 
-  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
-  {
-    NS_RUNTIMEABORT("if this default impl is called, |aBuffer| leaks");
-  }
-
-  virtual PRBool SupportsSurfaceDescriptor() const { return PR_FALSE; }
   virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
   {
     NS_RUNTIMEABORT("if this default impl is called, |aBuffer| leaks");
@@ -1735,12 +1732,6 @@ BasicShadowableContainerLayer::RemoveChild(Layer* aChild)
   BasicContainerLayer::RemoveChild(aChild);
 }
 
-static PRBool
-IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface)
-{
-  return SurfaceDescriptor::T__None != aSurface.type();
-}
-
 class BasicShadowableThebesLayer : public BasicThebesLayer,
                                    public BasicShadowableLayer
 {
@@ -1770,8 +1761,6 @@ public:
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
   virtual bool MustRetainContent() { return HasShadow(); }
 
-  virtual PRBool SupportsSurfaceDescriptor() const { return PR_TRUE; }
-
   void SetBackBufferAndAttrs(const ThebesBuffer& aBuffer,
                              const nsIntRegion& aValidRegion,
                              float aXResolution, float aYResolution,
@@ -1955,8 +1944,8 @@ public:
   }
   virtual ~BasicShadowableImageLayer()
   {
-    if (mBackSurface) {
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackSurface);
+    if (IsSurfaceDescriptorValid(mBackBuffer)) {
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
     }
     MOZ_COUNT_DTOR(BasicShadowableImageLayer);
   }
@@ -1971,14 +1960,14 @@ public:
   virtual Layer* AsLayer() { return this; }
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
 
-  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
+  virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
   {
-    mBackSurface = aBuffer;
+    mBackBuffer = aBuffer;
   }
 
   virtual void Disconnect()
   {
-    mBackSurface = nsnull;
+    mBackBuffer = SurfaceDescriptor();
     BasicShadowableLayer::Disconnect();
   }
 
@@ -1988,7 +1977,7 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  nsRefPtr<gfxSharedImageSurface> mBackSurface;
+  SurfaceDescriptor mBackBuffer;
 };
  
 void
@@ -2000,20 +1989,18 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext)
     return;
 
   if (oldSize != mSize) {
-    if (mBackSurface) {
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackSurface);
-      mBackSurface = nsnull;
-
+    if (IsSurfaceDescriptorValid(mBackBuffer)) {
       BasicManager()->DestroyedImageBuffer(BasicManager()->Hold(this));
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
     }
 
-    nsRefPtr<gfxSharedImageSurface> tmpFrontSurface;
+    SurfaceDescriptor tmpFrontSurface;
     // XXX error handling?
     if (!BasicManager()->AllocDoubleBuffer(
           mSize,
           (GetContentFlags() & CONTENT_OPAQUE) ?
             gfxASurface::CONTENT_COLOR : gfxASurface::CONTENT_COLOR_ALPHA,
-          getter_AddRefs(tmpFrontSurface), getter_AddRefs(mBackSurface)))
+          &tmpFrontSurface, &mBackBuffer))
       NS_RUNTIMEABORT("creating ImageLayer 'front buffer' failed!");
 
     BasicManager()->CreatedImageBuffer(BasicManager()->Hold(this),
@@ -2021,13 +2008,15 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext)
                                        tmpFrontSurface);
   }
 
-  nsRefPtr<gfxContext> tmpCtx = new gfxContext(mBackSurface);
+  nsRefPtr<gfxASurface> backSurface =
+    BasicManager()->OpenDescriptor(mBackBuffer);
+  nsRefPtr<gfxContext> tmpCtx = new gfxContext(backSurface);
   PaintContext(pat,
                nsIntRegion(nsIntRect(0, 0, mSize.width, mSize.height)),
                nsnull, 1.0, tmpCtx);
 
   BasicManager()->PaintedImage(BasicManager()->Hold(this),
-                               mBackSurface);
+                               mBackBuffer);
 }
 
 
@@ -2070,8 +2059,8 @@ public:
   }
   virtual ~BasicShadowableCanvasLayer()
   {
-    if (mBackBuffer) {
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackBuffer);
+    if (IsSurfaceDescriptorValid(mBackBuffer)) {
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
     }
     MOZ_COUNT_DTOR(BasicShadowableCanvasLayer);
   }
@@ -2087,14 +2076,14 @@ public:
   virtual Layer* AsLayer() { return this; }
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
 
-  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
+  virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
   {
     mBackBuffer = aBuffer;
   }
- 
+
   virtual void Disconnect()
   {
-    mBackBuffer = nsnull;
+    mBackBuffer = SurfaceDescriptor();
     BasicShadowableLayer::Disconnect();
   }
 
@@ -2104,7 +2093,7 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  nsRefPtr<gfxSharedImageSurface> mBackBuffer;
+  SurfaceDescriptor mBackBuffer;
 };
 
 void
@@ -2116,20 +2105,20 @@ BasicShadowableCanvasLayer::Initialize(const Data& aData)
 
   // XXX won't get here currently; need to figure out what to do on
   // canvas resizes
-  if (mBackBuffer) {
-    BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackBuffer);
-    mBackBuffer = nsnull;
+
+  if (IsSurfaceDescriptorValid(mBackBuffer)) {
+    BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
 
     BasicManager()->DestroyedCanvasBuffer(BasicManager()->Hold(this));
   }
 
-  nsRefPtr<gfxSharedImageSurface> tmpFrontBuffer;
+  SurfaceDescriptor tmpFrontBuffer;
   // XXX error handling?
   if (!BasicManager()->AllocDoubleBuffer(
         gfxIntSize(aData.mSize.width, aData.mSize.height),
         (GetContentFlags() & CONTENT_OPAQUE) ?
           gfxASurface::CONTENT_COLOR : gfxASurface::CONTENT_COLOR_ALPHA,
-        getter_AddRefs(tmpFrontBuffer), getter_AddRefs(mBackBuffer)))
+        &tmpFrontBuffer, &mBackBuffer))
     NS_RUNTIMEABORT("creating CanvasLayer back buffer failed!");
 
   BasicManager()->CreatedCanvasBuffer(BasicManager()->Hold(this),
@@ -2149,7 +2138,9 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext)
   // changed areas, much like we do for Thebes layers, as well as
   // do all sorts of magic to swap out the surface underneath the
   // canvas' thebes/cairo context.
-  nsRefPtr<gfxContext> tmpCtx = new gfxContext(mBackBuffer);
+  nsRefPtr<gfxASurface> backSurface =
+    BasicManager()->OpenDescriptor(mBackBuffer);
+  nsRefPtr<gfxContext> tmpCtx = new gfxContext(backSurface);
   tmpCtx->SetOperator(gfxContext::OPERATOR_SOURCE);
 
   // call BasicCanvasLayer::Paint to draw to our tmp context, because
@@ -2442,17 +2433,15 @@ public:
     ShadowImageLayer::Disconnect();
   }
 
-  virtual PRBool Init(gfxSharedImageSurface* front, const nsIntSize& size);
+  virtual PRBool Init(const SurfaceDescriptor& front, const nsIntSize& size);
 
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* newFront);
+  virtual void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack);
 
   virtual void DestroyFrontBuffer()
   {
-    if (mFrontSurface) {
-      BasicManager()->ShadowLayerManager::DestroySharedSurface(mFrontSurface, mAllocator);
+    if (IsSurfaceDescriptorValid(mFrontBuffer)) {
+      BasicManager()->ShadowLayerManager::DestroySharedSurface(&mFrontBuffer, mAllocator);
     }
-    mFrontSurface = nsnull;
   }
 
   virtual void Paint(gfxContext* aContext);
@@ -2463,36 +2452,36 @@ protected:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  // XXX ShmemImage?
-  nsRefPtr<gfxSharedImageSurface> mFrontSurface;
+  SurfaceDescriptor mFrontBuffer;
   gfxIntSize mSize;
 };
 
 PRBool
-BasicShadowImageLayer::Init(gfxSharedImageSurface* front,
+BasicShadowImageLayer::Init(const SurfaceDescriptor& front,
                             const nsIntSize& size)
 {
-  mFrontSurface = front;
+  mFrontBuffer = front;
   mSize = gfxIntSize(size.width, size.height);
   return PR_TRUE;
 }
 
-already_AddRefed<gfxSharedImageSurface>
-BasicShadowImageLayer::Swap(gfxSharedImageSurface* newFront)
+void
+BasicShadowImageLayer::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
 {
-  already_AddRefed<gfxSharedImageSurface> tmp = mFrontSurface.forget();
-  mFrontSurface = newFront;
-  return tmp;
+  *aNewBack = mFrontBuffer;
+  mFrontBuffer = aNewFront;
 }
 
 void
 BasicShadowImageLayer::Paint(gfxContext* aContext)
 {
-  if (!mFrontSurface) {
+  if (!IsSurfaceDescriptorValid(mFrontBuffer)) {
     return;
   }
 
-  nsRefPtr<gfxPattern> pat = new gfxPattern(mFrontSurface);
+  nsRefPtr<gfxASurface> surface =
+    BasicManager()->OpenDescriptor(mFrontBuffer);
+  nsRefPtr<gfxPattern> pat = new gfxPattern(surface);
   pat->SetFilter(mFilter);
 
   // The visible region can extend outside the image.  If we're not
@@ -2546,16 +2535,15 @@ public:
   }
 
   virtual void Initialize(const Data& aData);
+  virtual void Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize);
 
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* newFront);
+  void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack);
 
   virtual void DestroyFrontBuffer()
   {
-    if (mFrontSurface) {
-      BasicManager()->ShadowLayerManager::DestroySharedSurface(mFrontSurface, mAllocator);
+    if (IsSurfaceDescriptorValid(mFrontSurface)) {
+      BasicManager()->ShadowLayerManager::DestroySharedSurface(&mFrontSurface, mAllocator);
     }
-    mFrontSurface = nsnull;
   }
 
   virtual void Paint(gfxContext* aContext);
@@ -2566,27 +2554,28 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  nsRefPtr<gfxSharedImageSurface> mFrontSurface;
+  SurfaceDescriptor mFrontSurface;
 };
 
 
 void
 BasicShadowCanvasLayer::Initialize(const Data& aData)
 {
-  NS_ASSERTION(mFrontSurface == nsnull,
-               "BasicCanvasLayer::Initialize called twice!");
-  NS_ASSERTION(aData.mSurface && !aData.mGLContext, "no comprende OpenGL!");
-
-  mFrontSurface = static_cast<gfxSharedImageSurface*>(aData.mSurface);
-  mBounds.SetRect(0, 0, aData.mSize.width, aData.mSize.height);
+  NS_RUNTIMEABORT("Incompatibe surface type");
 }
 
-already_AddRefed<gfxSharedImageSurface>
-BasicShadowCanvasLayer::Swap(gfxSharedImageSurface* newFront)
+void
+BasicShadowCanvasLayer::Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize)
 {
-  already_AddRefed<gfxSharedImageSurface> tmp = mFrontSurface.forget();
-  mFrontSurface = newFront;
-  return tmp;
+  mFrontSurface = aNewFront;
+  mBounds.SetRect(0, 0, aSize.width, aSize.height);
+}
+
+void
+BasicShadowCanvasLayer::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
+{
+  *aNewBack = mFrontSurface;
+  mFrontSurface = aNewFront;
 }
 
 void
@@ -2595,11 +2584,13 @@ BasicShadowCanvasLayer::Paint(gfxContext* aContext)
   NS_ASSERTION(BasicManager()->InDrawing(),
                "Can only draw in drawing phase");
 
-  if (!mFrontSurface) {
+  if (IsSurfaceDescriptorValid(mFrontSurface)) {
     return;
   }
 
-  nsRefPtr<gfxPattern> pat = new gfxPattern(mFrontSurface);
+  nsRefPtr<gfxASurface> surface =
+    BasicManager()->OpenDescriptor(mFrontSurface);
+  nsRefPtr<gfxPattern> pat = new gfxPattern(surface);
 
   pat->SetFilter(mFilter);
   pat->SetExtend(gfxPattern::EXTEND_PAD);
@@ -2830,17 +2821,7 @@ BasicShadowLayerManager::ForwardTransaction()
 
         const OpBufferSwap& obs = reply.get_OpBufferSwap();
         const SurfaceDescriptor& descr = obs.newBackBuffer();
-        BasicShadowableLayer* layer = GetBasicShadowable(obs);
-        if (layer->SupportsSurfaceDescriptor()) {
-          layer->SetBackBuffer(descr);
-        } else {
-          if (SurfaceDescriptor::TShmem != descr.type()) {
-            NS_RUNTIMEABORT("non-Shmem surface sent to a layer that expected one!");
-          }
-          nsRefPtr<gfxASurface> imageSurf = OpenDescriptor(descr);
-          layer->SetBackBufferImage(
-            static_cast<gfxSharedImageSurface*>(imageSurf.get()));
-        }
+        GetBasicShadowable(obs)->SetBackBuffer(descr);
         break;
       }
 
diff --git a/gfx/layers/ipc/PLayers.ipdl b/gfx/layers/ipc/PLayers.ipdl
index 0c88068b5df1..6fc877c62ef5 100644
--- a/gfx/layers/ipc/PLayers.ipdl
+++ b/gfx/layers/ipc/PLayers.ipdl
@@ -102,14 +102,14 @@ struct OpDestroyThebesFrontBuffer { PLayer layer; };
 struct OpCreateCanvasBuffer {
   PLayer layer;
   nsIntSize size;
-  Shmem initialFront;
+  SurfaceDescriptor initialFront;
 };
 struct OpDestroyCanvasFrontBuffer { PLayer layer; };
 
 struct OpCreateImageBuffer {
   PLayer layer;
   nsIntSize size;
-  Shmem initialFront;
+  SurfaceDescriptor initialFront;
 };
 struct OpDestroyImageFrontBuffer { PLayer layer; };
 
@@ -173,12 +173,12 @@ struct OpPaintThebesBuffer {
 
 struct OpPaintCanvas  {
   PLayer layer;
-  Shmem newFrontBuffer;
+  SurfaceDescriptor newFrontBuffer;
 };
 
 struct OpPaintImage  {
   PLayer layer;
-  Shmem newFrontBuffer;
+  SurfaceDescriptor newFrontBuffer;
 };
 
 
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 7876f35c5d93..6d026ee3643b 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -192,7 +192,7 @@ ShadowLayerForwarder::CreatedThebesBuffer(ShadowableLayer* aThebes,
                                           const SurfaceDescriptor& aTempFrontBuffer)
 {
   OptionalThebesBuffer buffer = null_t();
-  if (SurfaceDescriptor::T__None != aTempFrontBuffer.type()) {
+  if (IsSurfaceDescriptorValid(aTempFrontBuffer)) {
     buffer = ThebesBuffer(aTempFrontBuffer,
                           aBufferRect,
                           nsIntPoint(0, 0));
@@ -207,21 +207,21 @@ ShadowLayerForwarder::CreatedThebesBuffer(ShadowableLayer* aThebes,
 void
 ShadowLayerForwarder::CreatedImageBuffer(ShadowableLayer* aImage,
                                          nsIntSize aSize,
-                                         gfxSharedImageSurface* aTempFrontSurface)
+                                         const SurfaceDescriptor& aTempFrontSurface)
 {
   mTxn->AddEdit(OpCreateImageBuffer(NULL, Shadow(aImage),
                                     aSize,
-                                    aTempFrontSurface->GetShmem()));
+                                    aTempFrontSurface));
 }
 
 void
 ShadowLayerForwarder::CreatedCanvasBuffer(ShadowableLayer* aCanvas,
                                           nsIntSize aSize,
-                                          gfxSharedImageSurface* aTempFrontSurface)
+                                          const SurfaceDescriptor& aTempFrontSurface)
 {
   mTxn->AddEdit(OpCreateCanvasBuffer(NULL, Shadow(aCanvas),
                                      aSize,
-                                     aTempFrontSurface->GetShmem()));
+                                     aTempFrontSurface));
 }
 
 void
@@ -291,17 +291,17 @@ ShadowLayerForwarder::PaintedThebesBuffer(ShadowableLayer* aThebes,
 }
 void
 ShadowLayerForwarder::PaintedImage(ShadowableLayer* aImage,
-                                   gfxSharedImageSurface* aNewFrontSurface)
+                                   const SurfaceDescriptor& aNewFrontSurface)
 {
   mTxn->AddPaint(OpPaintImage(NULL, Shadow(aImage),
-                              aNewFrontSurface->GetShmem()));
+                              aNewFrontSurface));
 }
 void
 ShadowLayerForwarder::PaintedCanvas(ShadowableLayer* aCanvas,
-                                    gfxSharedImageSurface* aNewFrontSurface)
+                                    const SurfaceDescriptor& aNewFrontSurface)
 {
   mTxn->AddPaint(OpPaintCanvas(NULL, Shadow(aCanvas),
-                               aNewFrontSurface->GetShmem()));
+                               aNewFrontSurface));
 }
 
 PRBool
@@ -636,5 +636,11 @@ ShadowLayerManager::PlatformSyncBeforeReplyUpdate()
 
 #endif  // !defined(MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS)
 
+PRBool
+IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface)
+{
+  return SurfaceDescriptor::T__None != aSurface.type();
+}
+
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index ac349e4cfc21..5f560910d357 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -165,10 +165,10 @@ public:
    */
   void CreatedImageBuffer(ShadowableLayer* aImage,
                           nsIntSize aSize,
-                          gfxSharedImageSurface* aInitialFrontSurface);
+                          const SurfaceDescriptor& aInitialFrontSurface);
   void CreatedCanvasBuffer(ShadowableLayer* aCanvas,
                            nsIntSize aSize,
-                           gfxSharedImageSurface* aInitialFrontSurface);
+                           const SurfaceDescriptor& aInitialFrontSurface);
 
   /**
    * The specified layer is destroying its buffers.
@@ -225,9 +225,9 @@ public:
    * ImageLayers.  This is slow, and will be optimized.
    */
   void PaintedImage(ShadowableLayer* aImage,
-                    gfxSharedImageSurface* aNewFrontSurface);
+                    const SurfaceDescriptor& aNewFrontSurface);
   void PaintedCanvas(ShadowableLayer* aCanvas,
-                     gfxSharedImageSurface* aNewFrontSurface);
+                     const SurfaceDescriptor& aNewFrontSurface);
 
   /**
    * End the current transaction and forward it to ShadowLayerManager.
@@ -569,6 +569,17 @@ class ShadowCanvasLayer : public ShadowLayer,
                           public CanvasLayer
 {
 public:
+
+  /**
+   * CONSTRUCTION PHASE ONLY
+   *
+   * Initialize this with a (temporary) front surface with the given
+   * size.  This is expected to be followed with a Swap() in the same
+   * transaction to bring in real pixels.  Init() may only be called
+   * once.
+   */
+  virtual void Init(const SurfaceDescriptor& front, const nsIntSize& aSize) = 0;
+
   /**
    * CONSTRUCTION PHASE ONLY
    *
@@ -576,8 +587,7 @@ public:
    * out the old front surface (the new back surface for the remote
    * layer).
    */
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* aNewFront) = 0;
+  virtual void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
@@ -609,14 +619,13 @@ public:
    * transaction to bring in real pixels.  Init() may only be called
    * once.
    */
-  virtual PRBool Init(gfxSharedImageSurface* aFront, const nsIntSize& aSize) = 0;
+  virtual PRBool Init(const SurfaceDescriptor& front, const nsIntSize& aSize) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
    * @see ShadowCanvasLayer::Swap
    */
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* newFront) = 0;
+  virtual void Swap(const SurfaceDescriptor& aFront, SurfaceDescriptor* aNewBack) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
@@ -650,6 +659,7 @@ protected:
   {}
 };
 
+PRBool IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface);
 
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
index f7f050585b7f..b26eef44d832 100644
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -222,13 +222,8 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       const OpCreateCanvasBuffer& ocb = edit.get_OpCreateCanvasBuffer();
       ShadowCanvasLayer* canvas = static_cast<ShadowCanvasLayer*>(
         AsShadowLayer(ocb)->AsLayer());
-      nsRefPtr<gfxSharedImageSurface> front =
-        gfxSharedImageSurface::Open(ocb.initialFront());
-      CanvasLayer::Data data;
-      data.mSurface = front;
-      data.mSize = ocb.size();
 
-      canvas->Initialize(data);
+      canvas->Init(ocb.initialFront(), ocb.size());
 
       break;
     }
@@ -239,9 +234,7 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowImageLayer* image = static_cast<ShadowImageLayer*>(
         AsShadowLayer(ocb)->AsLayer());
 
-      nsRefPtr<gfxSharedImageSurface> surf =
-        gfxSharedImageSurface::Open(ocb.initialFront());
-      image->Init(surf, ocb.size());
+      image->Init(ocb.initialFront(), ocb.size());
 
       break;
     }
@@ -416,17 +409,17 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowCanvasLayer* canvas =
         static_cast<ShadowCanvasLayer*>(shadow->AsLayer());
 
-      nsRefPtr<gfxSharedImageSurface> newFront =
-        gfxSharedImageSurface::Open(op.newFrontBuffer());
-      nsRefPtr<gfxSharedImageSurface> newBack = canvas->Swap(newFront);
+      SurfaceDescriptor newFront = op.newFrontBuffer();
+      SurfaceDescriptor newBack;
+      canvas->Swap(op.newFrontBuffer(), &newBack);
       if (newFront == newBack) {
-        newFront.forget();
+        newFront = SurfaceDescriptor();
       }
 
       canvas->Updated();
 
       replyv.push_back(OpBufferSwap(shadow, NULL,
-                                    newBack->GetShmem()));
+                                    newBack));
 
       break;
     }
@@ -438,15 +431,15 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowImageLayer* image =
         static_cast<ShadowImageLayer*>(shadow->AsLayer());
 
-      nsRefPtr<gfxSharedImageSurface> newFront =
-        gfxSharedImageSurface::Open(op.newFrontBuffer());
-      nsRefPtr<gfxSharedImageSurface> newBack = image->Swap(newFront);
+      SurfaceDescriptor newFront = op.newFrontBuffer();
+      SurfaceDescriptor newBack;
+      image->Swap(op.newFrontBuffer(), &newBack);
       if (newFront == newBack) {
-        newFront.forget();
+        newFront = SurfaceDescriptor();
       }
 
       replyv.push_back(OpBufferSwap(shadow, NULL,
-                                    newBack->GetShmem()));
+                                    newBack));
 
       break;
     }
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 4e6337a6b676..1035e088160f 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -52,6 +52,10 @@
 #include <OpenGL/OpenGL.h>
 #endif
 
+#ifdef MOZ_X11
+#include "gfxXlibSurface.h"
+#endif
+
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::gl;
@@ -293,34 +297,40 @@ ShadowCanvasLayerOGL::~ShadowCanvasLayerOGL()
 void
 ShadowCanvasLayerOGL::Initialize(const Data& aData)
 {
-  mDeadweight = static_cast<gfxSharedImageSurface*>(aData.mSurface);
-  gfxSize sz = mDeadweight->GetSize();
-  mTexImage = gl()->CreateTextureImage(nsIntSize(sz.width, sz.height),
-                                       mDeadweight->GetContentType(),
+  NS_RUNTIMEABORT("Incompatibe surface type");
+}
+
+void
+ShadowCanvasLayerOGL::Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize)
+{
+  mDeadweight = aNewFront;
+  nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(mDeadweight);
+
+  mTexImage = gl()->CreateTextureImage(nsIntSize(aSize.width, aSize.height),
+                                       surf->GetContentType(),
                                        LOCAL_GL_CLAMP_TO_EDGE);
 }
 
-already_AddRefed<gfxSharedImageSurface>
-ShadowCanvasLayerOGL::Swap(gfxSharedImageSurface* aNewFront)
+void
+ShadowCanvasLayerOGL::Swap(const SurfaceDescriptor& aNewFront,
+                           SurfaceDescriptor* aNewBack)
 {
   if (!mDestroyed && mTexImage) {
-    // XXX this is always just ridiculously slow
-
-    gfxSize sz = aNewFront->GetSize();
+    nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aNewFront);
+    gfxSize sz = surf->GetSize();
     nsIntRegion updateRegion(nsIntRect(0, 0, sz.width, sz.height));
-    mTexImage->DirectUpdate(aNewFront, updateRegion);
+    mTexImage->DirectUpdate(surf, updateRegion);
   }
 
-  return aNewFront;
+  *aNewBack = aNewFront;
 }
 
 void
 ShadowCanvasLayerOGL::DestroyFrontBuffer()
 {
   mTexImage = nsnull;
-  if (mDeadweight) {
-    mOGLManager->DestroySharedSurface(mDeadweight, mAllocator);
-    mDeadweight = nsnull;
+  if (IsSurfaceDescriptorValid(mDeadweight)) {
+    mOGLManager->DestroySharedSurface(&mDeadweight, mAllocator);
   }
 }
 
diff --git a/gfx/layers/opengl/CanvasLayerOGL.h b/gfx/layers/opengl/CanvasLayerOGL.h
index ec4dc1f4b064..14a20c038c24 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.h
+++ b/gfx/layers/opengl/CanvasLayerOGL.h
@@ -110,12 +110,14 @@ public:
 
   // CanvasLayer impl
   virtual void Initialize(const Data& aData);
+  virtual void Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize);
+
   // This isn't meaningful for shadow canvas.
   virtual void Updated(const nsIntRect&) {}
 
   // ShadowCanvasLayer impl
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* aNewFront);
+  virtual void Swap(const SurfaceDescriptor& aNewFront,
+                    SurfaceDescriptor* aNewBack);
 
   virtual void DestroyFrontBuffer();
 
@@ -130,11 +132,7 @@ public:
 private:
   nsRefPtr<TextureImage> mTexImage;
 
-
-  // XXX FIXME holding to free
-  nsRefPtr<gfxSharedImageSurface> mDeadweight;
-
-
+  SurfaceDescriptor mDeadweight;
 };
 
 } /* layers */
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index 1d9804eac0e6..51eacfc40800 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -790,38 +790,38 @@ ShadowImageLayerOGL::~ShadowImageLayerOGL()
 {}
 
 PRBool
-ShadowImageLayerOGL::Init(gfxSharedImageSurface* aFront,
+ShadowImageLayerOGL::Init(const SurfaceDescriptor& aFront,
                           const nsIntSize& aSize)
 {
   mDeadweight = aFront;
-  gfxSize sz = mDeadweight->GetSize();
+  nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aFront);
+  gfxSize sz = surf->GetSize();
   mTexImage = gl()->CreateTextureImage(nsIntSize(sz.width, sz.height),
-                                       mDeadweight->GetContentType(),
+                                       surf->GetContentType(),
                                        LOCAL_GL_CLAMP_TO_EDGE);
   return PR_TRUE;
 }
 
-already_AddRefed<gfxSharedImageSurface>
-ShadowImageLayerOGL::Swap(gfxSharedImageSurface* aNewFront)
+void
+ShadowImageLayerOGL::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
 {
   if (!mDestroyed && mTexImage) {
+    nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aNewFront);
     // XXX this is always just ridiculously slow
-
-    gfxSize sz = aNewFront->GetSize();
+    gfxSize sz = surf->GetSize();
     nsIntRegion updateRegion(nsIntRect(0, 0, sz.width, sz.height));
-    mTexImage->DirectUpdate(aNewFront, updateRegion);
+    mTexImage->DirectUpdate(surf, updateRegion);
   }
 
-  return aNewFront;
+  *aNewBack = aNewFront;
 }
 
 void
 ShadowImageLayerOGL::DestroyFrontBuffer()
 {
   mTexImage = nsnull;
-  if (mDeadweight) {
-    mOGLManager->DestroySharedSurface(mDeadweight, mAllocator);
-    mDeadweight = nsnull;
+  if (IsSurfaceDescriptorValid(mDeadweight)) {
+    mOGLManager->DestroySharedSurface(&mDeadweight, mAllocator);
   }
 }
 
diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h
index 18832a4d6fb6..96ce9d61ee48 100644
--- a/gfx/layers/opengl/ImageLayerOGL.h
+++ b/gfx/layers/opengl/ImageLayerOGL.h
@@ -245,10 +245,9 @@ public:
   virtual ~ShadowImageLayerOGL();
 
   // ShadowImageLayer impl
-  virtual PRBool Init(gfxSharedImageSurface* aFront, const nsIntSize& aSize);
+  virtual PRBool Init(const SurfaceDescriptor& aFront, const nsIntSize& aSize);
 
-  virtual already_AddRefed<gfxSharedImageSurface>
-  Swap(gfxSharedImageSurface* aNewFront);
+  virtual void Swap(const SurfaceDescriptor& aFront, SurfaceDescriptor* aNewBack);
 
   virtual void DestroyFrontBuffer();
 
@@ -265,11 +264,7 @@ public:
 private:
   nsRefPtr<TextureImage> mTexImage;
 
-
-  // XXX FIXME holding to free
-  nsRefPtr<gfxSharedImageSurface> mDeadweight;
-
-
+  SurfaceDescriptor mDeadweight;
 };
 
 } /* layers */

From fe14259317364637a51c9fb4986d6d9ad3256b1a Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 21 Apr 2011 10:51:47 -0700
Subject: [PATCH 383/509] Bug 651429 - Wait for panning to end in test.
 r=mfinkle

---
 mobile/chrome/tests/browser_tapping.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/tests/browser_tapping.js b/mobile/chrome/tests/browser_tapping.js
index 148f553ca4b9..68bc1c53fb7e 100644
--- a/mobile/chrome/tests/browser_tapping.js
+++ b/mobile/chrome/tests/browser_tapping.js
@@ -223,7 +223,9 @@ gTests.push({
       ok(checkEvents([]), "Fired a pan + delay which should be seen as a non-event");
       clearEvents();
 
-      gCurrentTest.longTapPassTest();
+      window.addEventListener("PanFinished", function() {
+        setTimeout(gCurrentTest.longTapPassTest, 0);
+      }, true);
     }, 500);
   },
 

From d42b25dc760faac83cfa66a99066565fefc91a7a Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 21 Apr 2011 13:59:24 -0700
Subject: [PATCH 384/509] Bug 627892 - Remove (Safe Mode) string since it is no
 longer used. r=jmathies

---
 browser/locales/en-US/installer/custom.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/locales/en-US/installer/custom.properties b/browser/locales/en-US/installer/custom.properties
index d8c6434caa58..7de9fec83a11 100644
--- a/browser/locales/en-US/installer/custom.properties
+++ b/browser/locales/en-US/installer/custom.properties
@@ -53,7 +53,6 @@
 REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
 CONTEXT_OPTIONS=$BrandShortName &Options
 CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
-SAFE_MODE=Safe Mode
 OPTIONS_PAGE_TITLE=Setup Type
 OPTIONS_PAGE_SUBTITLE=Choose setup options
 SHORTCUTS_PAGE_TITLE=Set Up Shortcuts

From c98ac8a3c6d53cf1cecc7957337c63121ca0237f Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 21 Apr 2011 14:52:22 -0700
Subject: [PATCH 385/509] Back out 0736b014d4a5 (Bug 610155) for breaking
 canvas reftests on android

---
 gfx/layers/basic/BasicLayers.cpp      | 155 +++++++++++++++-----------
 gfx/layers/ipc/PLayers.ipdl           |   8 +-
 gfx/layers/ipc/ShadowLayers.cpp       |  24 ++--
 gfx/layers/ipc/ShadowLayers.h         |  28 ++---
 gfx/layers/ipc/ShadowLayersParent.cpp |  31 ++++--
 gfx/layers/opengl/CanvasLayerOGL.cpp  |  38 +++----
 gfx/layers/opengl/CanvasLayerOGL.h    |  12 +-
 gfx/layers/opengl/ImageLayerOGL.cpp   |  24 ++--
 gfx/layers/opengl/ImageLayerOGL.h     |  11 +-
 9 files changed, 169 insertions(+), 162 deletions(-)

diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 43c7aec55a6f..090dc97fa1fa 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -56,9 +56,6 @@
 #include "ThebesLayerBuffer.h"
 #include "nsIWidget.h"
 #include "ReadbackProcessor.h"
-#ifdef MOZ_X11
-#include "gfxXlibSurface.h"
-#endif
 
 #include "GLContext.h"
 
@@ -1627,6 +1624,12 @@ public:
     mShadow = aShadow;
   }
 
+  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
+  {
+    NS_RUNTIMEABORT("if this default impl is called, |aBuffer| leaks");
+  }
+
+  virtual PRBool SupportsSurfaceDescriptor() const { return PR_FALSE; }
   virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
   {
     NS_RUNTIMEABORT("if this default impl is called, |aBuffer| leaks");
@@ -1732,6 +1735,12 @@ BasicShadowableContainerLayer::RemoveChild(Layer* aChild)
   BasicContainerLayer::RemoveChild(aChild);
 }
 
+static PRBool
+IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface)
+{
+  return SurfaceDescriptor::T__None != aSurface.type();
+}
+
 class BasicShadowableThebesLayer : public BasicThebesLayer,
                                    public BasicShadowableLayer
 {
@@ -1761,6 +1770,8 @@ public:
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
   virtual bool MustRetainContent() { return HasShadow(); }
 
+  virtual PRBool SupportsSurfaceDescriptor() const { return PR_TRUE; }
+
   void SetBackBufferAndAttrs(const ThebesBuffer& aBuffer,
                              const nsIntRegion& aValidRegion,
                              float aXResolution, float aYResolution,
@@ -1944,8 +1955,8 @@ public:
   }
   virtual ~BasicShadowableImageLayer()
   {
-    if (IsSurfaceDescriptorValid(mBackBuffer)) {
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
+    if (mBackSurface) {
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackSurface);
     }
     MOZ_COUNT_DTOR(BasicShadowableImageLayer);
   }
@@ -1960,14 +1971,14 @@ public:
   virtual Layer* AsLayer() { return this; }
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
 
-  virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
+  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
   {
-    mBackBuffer = aBuffer;
+    mBackSurface = aBuffer;
   }
 
   virtual void Disconnect()
   {
-    mBackBuffer = SurfaceDescriptor();
+    mBackSurface = nsnull;
     BasicShadowableLayer::Disconnect();
   }
 
@@ -1977,7 +1988,7 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  SurfaceDescriptor mBackBuffer;
+  nsRefPtr<gfxSharedImageSurface> mBackSurface;
 };
  
 void
@@ -1989,18 +2000,20 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext)
     return;
 
   if (oldSize != mSize) {
-    if (IsSurfaceDescriptorValid(mBackBuffer)) {
+    if (mBackSurface) {
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackSurface);
+      mBackSurface = nsnull;
+
       BasicManager()->DestroyedImageBuffer(BasicManager()->Hold(this));
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
     }
 
-    SurfaceDescriptor tmpFrontSurface;
+    nsRefPtr<gfxSharedImageSurface> tmpFrontSurface;
     // XXX error handling?
     if (!BasicManager()->AllocDoubleBuffer(
           mSize,
           (GetContentFlags() & CONTENT_OPAQUE) ?
             gfxASurface::CONTENT_COLOR : gfxASurface::CONTENT_COLOR_ALPHA,
-          &tmpFrontSurface, &mBackBuffer))
+          getter_AddRefs(tmpFrontSurface), getter_AddRefs(mBackSurface)))
       NS_RUNTIMEABORT("creating ImageLayer 'front buffer' failed!");
 
     BasicManager()->CreatedImageBuffer(BasicManager()->Hold(this),
@@ -2008,15 +2021,13 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext)
                                        tmpFrontSurface);
   }
 
-  nsRefPtr<gfxASurface> backSurface =
-    BasicManager()->OpenDescriptor(mBackBuffer);
-  nsRefPtr<gfxContext> tmpCtx = new gfxContext(backSurface);
+  nsRefPtr<gfxContext> tmpCtx = new gfxContext(mBackSurface);
   PaintContext(pat,
                nsIntRegion(nsIntRect(0, 0, mSize.width, mSize.height)),
                nsnull, 1.0, tmpCtx);
 
   BasicManager()->PaintedImage(BasicManager()->Hold(this),
-                               mBackBuffer);
+                               mBackSurface);
 }
 
 
@@ -2059,8 +2070,8 @@ public:
   }
   virtual ~BasicShadowableCanvasLayer()
   {
-    if (IsSurfaceDescriptorValid(mBackBuffer)) {
-      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
+    if (mBackBuffer) {
+      BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackBuffer);
     }
     MOZ_COUNT_DTOR(BasicShadowableCanvasLayer);
   }
@@ -2076,14 +2087,14 @@ public:
   virtual Layer* AsLayer() { return this; }
   virtual ShadowableLayer* AsShadowableLayer() { return this; }
 
-  virtual void SetBackBuffer(const SurfaceDescriptor& aBuffer)
+  virtual void SetBackBufferImage(gfxSharedImageSurface* aBuffer)
   {
     mBackBuffer = aBuffer;
   }
-
+ 
   virtual void Disconnect()
   {
-    mBackBuffer = SurfaceDescriptor();
+    mBackBuffer = nsnull;
     BasicShadowableLayer::Disconnect();
   }
 
@@ -2093,7 +2104,7 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  SurfaceDescriptor mBackBuffer;
+  nsRefPtr<gfxSharedImageSurface> mBackBuffer;
 };
 
 void
@@ -2105,20 +2116,20 @@ BasicShadowableCanvasLayer::Initialize(const Data& aData)
 
   // XXX won't get here currently; need to figure out what to do on
   // canvas resizes
-
-  if (IsSurfaceDescriptorValid(mBackBuffer)) {
-    BasicManager()->ShadowLayerForwarder::DestroySharedSurface(&mBackBuffer);
+  if (mBackBuffer) {
+    BasicManager()->ShadowLayerForwarder::DestroySharedSurface(mBackBuffer);
+    mBackBuffer = nsnull;
 
     BasicManager()->DestroyedCanvasBuffer(BasicManager()->Hold(this));
   }
 
-  SurfaceDescriptor tmpFrontBuffer;
+  nsRefPtr<gfxSharedImageSurface> tmpFrontBuffer;
   // XXX error handling?
   if (!BasicManager()->AllocDoubleBuffer(
         gfxIntSize(aData.mSize.width, aData.mSize.height),
         (GetContentFlags() & CONTENT_OPAQUE) ?
           gfxASurface::CONTENT_COLOR : gfxASurface::CONTENT_COLOR_ALPHA,
-        &tmpFrontBuffer, &mBackBuffer))
+        getter_AddRefs(tmpFrontBuffer), getter_AddRefs(mBackBuffer)))
     NS_RUNTIMEABORT("creating CanvasLayer back buffer failed!");
 
   BasicManager()->CreatedCanvasBuffer(BasicManager()->Hold(this),
@@ -2138,9 +2149,7 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext)
   // changed areas, much like we do for Thebes layers, as well as
   // do all sorts of magic to swap out the surface underneath the
   // canvas' thebes/cairo context.
-  nsRefPtr<gfxASurface> backSurface =
-    BasicManager()->OpenDescriptor(mBackBuffer);
-  nsRefPtr<gfxContext> tmpCtx = new gfxContext(backSurface);
+  nsRefPtr<gfxContext> tmpCtx = new gfxContext(mBackBuffer);
   tmpCtx->SetOperator(gfxContext::OPERATOR_SOURCE);
 
   // call BasicCanvasLayer::Paint to draw to our tmp context, because
@@ -2433,15 +2442,17 @@ public:
     ShadowImageLayer::Disconnect();
   }
 
-  virtual PRBool Init(const SurfaceDescriptor& front, const nsIntSize& size);
+  virtual PRBool Init(gfxSharedImageSurface* front, const nsIntSize& size);
 
-  virtual void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack);
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* newFront);
 
   virtual void DestroyFrontBuffer()
   {
-    if (IsSurfaceDescriptorValid(mFrontBuffer)) {
-      BasicManager()->ShadowLayerManager::DestroySharedSurface(&mFrontBuffer, mAllocator);
+    if (mFrontSurface) {
+      BasicManager()->ShadowLayerManager::DestroySharedSurface(mFrontSurface, mAllocator);
     }
+    mFrontSurface = nsnull;
   }
 
   virtual void Paint(gfxContext* aContext);
@@ -2452,36 +2463,36 @@ protected:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  SurfaceDescriptor mFrontBuffer;
+  // XXX ShmemImage?
+  nsRefPtr<gfxSharedImageSurface> mFrontSurface;
   gfxIntSize mSize;
 };
 
 PRBool
-BasicShadowImageLayer::Init(const SurfaceDescriptor& front,
+BasicShadowImageLayer::Init(gfxSharedImageSurface* front,
                             const nsIntSize& size)
 {
-  mFrontBuffer = front;
+  mFrontSurface = front;
   mSize = gfxIntSize(size.width, size.height);
   return PR_TRUE;
 }
 
-void
-BasicShadowImageLayer::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
+already_AddRefed<gfxSharedImageSurface>
+BasicShadowImageLayer::Swap(gfxSharedImageSurface* newFront)
 {
-  *aNewBack = mFrontBuffer;
-  mFrontBuffer = aNewFront;
+  already_AddRefed<gfxSharedImageSurface> tmp = mFrontSurface.forget();
+  mFrontSurface = newFront;
+  return tmp;
 }
 
 void
 BasicShadowImageLayer::Paint(gfxContext* aContext)
 {
-  if (!IsSurfaceDescriptorValid(mFrontBuffer)) {
+  if (!mFrontSurface) {
     return;
   }
 
-  nsRefPtr<gfxASurface> surface =
-    BasicManager()->OpenDescriptor(mFrontBuffer);
-  nsRefPtr<gfxPattern> pat = new gfxPattern(surface);
+  nsRefPtr<gfxPattern> pat = new gfxPattern(mFrontSurface);
   pat->SetFilter(mFilter);
 
   // The visible region can extend outside the image.  If we're not
@@ -2535,15 +2546,16 @@ public:
   }
 
   virtual void Initialize(const Data& aData);
-  virtual void Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize);
 
-  void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack);
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* newFront);
 
   virtual void DestroyFrontBuffer()
   {
-    if (IsSurfaceDescriptorValid(mFrontSurface)) {
-      BasicManager()->ShadowLayerManager::DestroySharedSurface(&mFrontSurface, mAllocator);
+    if (mFrontSurface) {
+      BasicManager()->ShadowLayerManager::DestroySharedSurface(mFrontSurface, mAllocator);
     }
+    mFrontSurface = nsnull;
   }
 
   virtual void Paint(gfxContext* aContext);
@@ -2554,28 +2566,27 @@ private:
     return static_cast<BasicShadowLayerManager*>(mManager);
   }
 
-  SurfaceDescriptor mFrontSurface;
+  nsRefPtr<gfxSharedImageSurface> mFrontSurface;
 };
 
 
 void
 BasicShadowCanvasLayer::Initialize(const Data& aData)
 {
-  NS_RUNTIMEABORT("Incompatibe surface type");
+  NS_ASSERTION(mFrontSurface == nsnull,
+               "BasicCanvasLayer::Initialize called twice!");
+  NS_ASSERTION(aData.mSurface && !aData.mGLContext, "no comprende OpenGL!");
+
+  mFrontSurface = static_cast<gfxSharedImageSurface*>(aData.mSurface);
+  mBounds.SetRect(0, 0, aData.mSize.width, aData.mSize.height);
 }
 
-void
-BasicShadowCanvasLayer::Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize)
+already_AddRefed<gfxSharedImageSurface>
+BasicShadowCanvasLayer::Swap(gfxSharedImageSurface* newFront)
 {
-  mFrontSurface = aNewFront;
-  mBounds.SetRect(0, 0, aSize.width, aSize.height);
-}
-
-void
-BasicShadowCanvasLayer::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
-{
-  *aNewBack = mFrontSurface;
-  mFrontSurface = aNewFront;
+  already_AddRefed<gfxSharedImageSurface> tmp = mFrontSurface.forget();
+  mFrontSurface = newFront;
+  return tmp;
 }
 
 void
@@ -2584,13 +2595,11 @@ BasicShadowCanvasLayer::Paint(gfxContext* aContext)
   NS_ASSERTION(BasicManager()->InDrawing(),
                "Can only draw in drawing phase");
 
-  if (IsSurfaceDescriptorValid(mFrontSurface)) {
+  if (!mFrontSurface) {
     return;
   }
 
-  nsRefPtr<gfxASurface> surface =
-    BasicManager()->OpenDescriptor(mFrontSurface);
-  nsRefPtr<gfxPattern> pat = new gfxPattern(surface);
+  nsRefPtr<gfxPattern> pat = new gfxPattern(mFrontSurface);
 
   pat->SetFilter(mFilter);
   pat->SetExtend(gfxPattern::EXTEND_PAD);
@@ -2821,7 +2830,17 @@ BasicShadowLayerManager::ForwardTransaction()
 
         const OpBufferSwap& obs = reply.get_OpBufferSwap();
         const SurfaceDescriptor& descr = obs.newBackBuffer();
-        GetBasicShadowable(obs)->SetBackBuffer(descr);
+        BasicShadowableLayer* layer = GetBasicShadowable(obs);
+        if (layer->SupportsSurfaceDescriptor()) {
+          layer->SetBackBuffer(descr);
+        } else {
+          if (SurfaceDescriptor::TShmem != descr.type()) {
+            NS_RUNTIMEABORT("non-Shmem surface sent to a layer that expected one!");
+          }
+          nsRefPtr<gfxASurface> imageSurf = OpenDescriptor(descr);
+          layer->SetBackBufferImage(
+            static_cast<gfxSharedImageSurface*>(imageSurf.get()));
+        }
         break;
       }
 
diff --git a/gfx/layers/ipc/PLayers.ipdl b/gfx/layers/ipc/PLayers.ipdl
index 6fc877c62ef5..0c88068b5df1 100644
--- a/gfx/layers/ipc/PLayers.ipdl
+++ b/gfx/layers/ipc/PLayers.ipdl
@@ -102,14 +102,14 @@ struct OpDestroyThebesFrontBuffer { PLayer layer; };
 struct OpCreateCanvasBuffer {
   PLayer layer;
   nsIntSize size;
-  SurfaceDescriptor initialFront;
+  Shmem initialFront;
 };
 struct OpDestroyCanvasFrontBuffer { PLayer layer; };
 
 struct OpCreateImageBuffer {
   PLayer layer;
   nsIntSize size;
-  SurfaceDescriptor initialFront;
+  Shmem initialFront;
 };
 struct OpDestroyImageFrontBuffer { PLayer layer; };
 
@@ -173,12 +173,12 @@ struct OpPaintThebesBuffer {
 
 struct OpPaintCanvas  {
   PLayer layer;
-  SurfaceDescriptor newFrontBuffer;
+  Shmem newFrontBuffer;
 };
 
 struct OpPaintImage  {
   PLayer layer;
-  SurfaceDescriptor newFrontBuffer;
+  Shmem newFrontBuffer;
 };
 
 
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 6d026ee3643b..7876f35c5d93 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -192,7 +192,7 @@ ShadowLayerForwarder::CreatedThebesBuffer(ShadowableLayer* aThebes,
                                           const SurfaceDescriptor& aTempFrontBuffer)
 {
   OptionalThebesBuffer buffer = null_t();
-  if (IsSurfaceDescriptorValid(aTempFrontBuffer)) {
+  if (SurfaceDescriptor::T__None != aTempFrontBuffer.type()) {
     buffer = ThebesBuffer(aTempFrontBuffer,
                           aBufferRect,
                           nsIntPoint(0, 0));
@@ -207,21 +207,21 @@ ShadowLayerForwarder::CreatedThebesBuffer(ShadowableLayer* aThebes,
 void
 ShadowLayerForwarder::CreatedImageBuffer(ShadowableLayer* aImage,
                                          nsIntSize aSize,
-                                         const SurfaceDescriptor& aTempFrontSurface)
+                                         gfxSharedImageSurface* aTempFrontSurface)
 {
   mTxn->AddEdit(OpCreateImageBuffer(NULL, Shadow(aImage),
                                     aSize,
-                                    aTempFrontSurface));
+                                    aTempFrontSurface->GetShmem()));
 }
 
 void
 ShadowLayerForwarder::CreatedCanvasBuffer(ShadowableLayer* aCanvas,
                                           nsIntSize aSize,
-                                          const SurfaceDescriptor& aTempFrontSurface)
+                                          gfxSharedImageSurface* aTempFrontSurface)
 {
   mTxn->AddEdit(OpCreateCanvasBuffer(NULL, Shadow(aCanvas),
                                      aSize,
-                                     aTempFrontSurface));
+                                     aTempFrontSurface->GetShmem()));
 }
 
 void
@@ -291,17 +291,17 @@ ShadowLayerForwarder::PaintedThebesBuffer(ShadowableLayer* aThebes,
 }
 void
 ShadowLayerForwarder::PaintedImage(ShadowableLayer* aImage,
-                                   const SurfaceDescriptor& aNewFrontSurface)
+                                   gfxSharedImageSurface* aNewFrontSurface)
 {
   mTxn->AddPaint(OpPaintImage(NULL, Shadow(aImage),
-                              aNewFrontSurface));
+                              aNewFrontSurface->GetShmem()));
 }
 void
 ShadowLayerForwarder::PaintedCanvas(ShadowableLayer* aCanvas,
-                                    const SurfaceDescriptor& aNewFrontSurface)
+                                    gfxSharedImageSurface* aNewFrontSurface)
 {
   mTxn->AddPaint(OpPaintCanvas(NULL, Shadow(aCanvas),
-                               aNewFrontSurface));
+                               aNewFrontSurface->GetShmem()));
 }
 
 PRBool
@@ -636,11 +636,5 @@ ShadowLayerManager::PlatformSyncBeforeReplyUpdate()
 
 #endif  // !defined(MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS)
 
-PRBool
-IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface)
-{
-  return SurfaceDescriptor::T__None != aSurface.type();
-}
-
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index 5f560910d357..ac349e4cfc21 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -165,10 +165,10 @@ public:
    */
   void CreatedImageBuffer(ShadowableLayer* aImage,
                           nsIntSize aSize,
-                          const SurfaceDescriptor& aInitialFrontSurface);
+                          gfxSharedImageSurface* aInitialFrontSurface);
   void CreatedCanvasBuffer(ShadowableLayer* aCanvas,
                            nsIntSize aSize,
-                           const SurfaceDescriptor& aInitialFrontSurface);
+                           gfxSharedImageSurface* aInitialFrontSurface);
 
   /**
    * The specified layer is destroying its buffers.
@@ -225,9 +225,9 @@ public:
    * ImageLayers.  This is slow, and will be optimized.
    */
   void PaintedImage(ShadowableLayer* aImage,
-                    const SurfaceDescriptor& aNewFrontSurface);
+                    gfxSharedImageSurface* aNewFrontSurface);
   void PaintedCanvas(ShadowableLayer* aCanvas,
-                     const SurfaceDescriptor& aNewFrontSurface);
+                     gfxSharedImageSurface* aNewFrontSurface);
 
   /**
    * End the current transaction and forward it to ShadowLayerManager.
@@ -569,17 +569,6 @@ class ShadowCanvasLayer : public ShadowLayer,
                           public CanvasLayer
 {
 public:
-
-  /**
-   * CONSTRUCTION PHASE ONLY
-   *
-   * Initialize this with a (temporary) front surface with the given
-   * size.  This is expected to be followed with a Swap() in the same
-   * transaction to bring in real pixels.  Init() may only be called
-   * once.
-   */
-  virtual void Init(const SurfaceDescriptor& front, const nsIntSize& aSize) = 0;
-
   /**
    * CONSTRUCTION PHASE ONLY
    *
@@ -587,7 +576,8 @@ public:
    * out the old front surface (the new back surface for the remote
    * layer).
    */
-  virtual void Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack) = 0;
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* aNewFront) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
@@ -619,13 +609,14 @@ public:
    * transaction to bring in real pixels.  Init() may only be called
    * once.
    */
-  virtual PRBool Init(const SurfaceDescriptor& front, const nsIntSize& aSize) = 0;
+  virtual PRBool Init(gfxSharedImageSurface* aFront, const nsIntSize& aSize) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
    * @see ShadowCanvasLayer::Swap
    */
-  virtual void Swap(const SurfaceDescriptor& aFront, SurfaceDescriptor* aNewBack) = 0;
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* newFront) = 0;
 
   /**
    * CONSTRUCTION PHASE ONLY
@@ -659,7 +650,6 @@ protected:
   {}
 };
 
-PRBool IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface);
 
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
index b26eef44d832..f7f050585b7f 100644
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -222,8 +222,13 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       const OpCreateCanvasBuffer& ocb = edit.get_OpCreateCanvasBuffer();
       ShadowCanvasLayer* canvas = static_cast<ShadowCanvasLayer*>(
         AsShadowLayer(ocb)->AsLayer());
+      nsRefPtr<gfxSharedImageSurface> front =
+        gfxSharedImageSurface::Open(ocb.initialFront());
+      CanvasLayer::Data data;
+      data.mSurface = front;
+      data.mSize = ocb.size();
 
-      canvas->Init(ocb.initialFront(), ocb.size());
+      canvas->Initialize(data);
 
       break;
     }
@@ -234,7 +239,9 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowImageLayer* image = static_cast<ShadowImageLayer*>(
         AsShadowLayer(ocb)->AsLayer());
 
-      image->Init(ocb.initialFront(), ocb.size());
+      nsRefPtr<gfxSharedImageSurface> surf =
+        gfxSharedImageSurface::Open(ocb.initialFront());
+      image->Init(surf, ocb.size());
 
       break;
     }
@@ -409,17 +416,17 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowCanvasLayer* canvas =
         static_cast<ShadowCanvasLayer*>(shadow->AsLayer());
 
-      SurfaceDescriptor newFront = op.newFrontBuffer();
-      SurfaceDescriptor newBack;
-      canvas->Swap(op.newFrontBuffer(), &newBack);
+      nsRefPtr<gfxSharedImageSurface> newFront =
+        gfxSharedImageSurface::Open(op.newFrontBuffer());
+      nsRefPtr<gfxSharedImageSurface> newBack = canvas->Swap(newFront);
       if (newFront == newBack) {
-        newFront = SurfaceDescriptor();
+        newFront.forget();
       }
 
       canvas->Updated();
 
       replyv.push_back(OpBufferSwap(shadow, NULL,
-                                    newBack));
+                                    newBack->GetShmem()));
 
       break;
     }
@@ -431,15 +438,15 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowImageLayer* image =
         static_cast<ShadowImageLayer*>(shadow->AsLayer());
 
-      SurfaceDescriptor newFront = op.newFrontBuffer();
-      SurfaceDescriptor newBack;
-      image->Swap(op.newFrontBuffer(), &newBack);
+      nsRefPtr<gfxSharedImageSurface> newFront =
+        gfxSharedImageSurface::Open(op.newFrontBuffer());
+      nsRefPtr<gfxSharedImageSurface> newBack = image->Swap(newFront);
       if (newFront == newBack) {
-        newFront = SurfaceDescriptor();
+        newFront.forget();
       }
 
       replyv.push_back(OpBufferSwap(shadow, NULL,
-                                    newBack));
+                                    newBack->GetShmem()));
 
       break;
     }
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 1035e088160f..4e6337a6b676 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -52,10 +52,6 @@
 #include <OpenGL/OpenGL.h>
 #endif
 
-#ifdef MOZ_X11
-#include "gfxXlibSurface.h"
-#endif
-
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::gl;
@@ -297,40 +293,34 @@ ShadowCanvasLayerOGL::~ShadowCanvasLayerOGL()
 void
 ShadowCanvasLayerOGL::Initialize(const Data& aData)
 {
-  NS_RUNTIMEABORT("Incompatibe surface type");
-}
-
-void
-ShadowCanvasLayerOGL::Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize)
-{
-  mDeadweight = aNewFront;
-  nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(mDeadweight);
-
-  mTexImage = gl()->CreateTextureImage(nsIntSize(aSize.width, aSize.height),
-                                       surf->GetContentType(),
+  mDeadweight = static_cast<gfxSharedImageSurface*>(aData.mSurface);
+  gfxSize sz = mDeadweight->GetSize();
+  mTexImage = gl()->CreateTextureImage(nsIntSize(sz.width, sz.height),
+                                       mDeadweight->GetContentType(),
                                        LOCAL_GL_CLAMP_TO_EDGE);
 }
 
-void
-ShadowCanvasLayerOGL::Swap(const SurfaceDescriptor& aNewFront,
-                           SurfaceDescriptor* aNewBack)
+already_AddRefed<gfxSharedImageSurface>
+ShadowCanvasLayerOGL::Swap(gfxSharedImageSurface* aNewFront)
 {
   if (!mDestroyed && mTexImage) {
-    nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aNewFront);
-    gfxSize sz = surf->GetSize();
+    // XXX this is always just ridiculously slow
+
+    gfxSize sz = aNewFront->GetSize();
     nsIntRegion updateRegion(nsIntRect(0, 0, sz.width, sz.height));
-    mTexImage->DirectUpdate(surf, updateRegion);
+    mTexImage->DirectUpdate(aNewFront, updateRegion);
   }
 
-  *aNewBack = aNewFront;
+  return aNewFront;
 }
 
 void
 ShadowCanvasLayerOGL::DestroyFrontBuffer()
 {
   mTexImage = nsnull;
-  if (IsSurfaceDescriptorValid(mDeadweight)) {
-    mOGLManager->DestroySharedSurface(&mDeadweight, mAllocator);
+  if (mDeadweight) {
+    mOGLManager->DestroySharedSurface(mDeadweight, mAllocator);
+    mDeadweight = nsnull;
   }
 }
 
diff --git a/gfx/layers/opengl/CanvasLayerOGL.h b/gfx/layers/opengl/CanvasLayerOGL.h
index 14a20c038c24..ec4dc1f4b064 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.h
+++ b/gfx/layers/opengl/CanvasLayerOGL.h
@@ -110,14 +110,12 @@ public:
 
   // CanvasLayer impl
   virtual void Initialize(const Data& aData);
-  virtual void Init(const SurfaceDescriptor& aNewFront, const nsIntSize& aSize);
-
   // This isn't meaningful for shadow canvas.
   virtual void Updated(const nsIntRect&) {}
 
   // ShadowCanvasLayer impl
-  virtual void Swap(const SurfaceDescriptor& aNewFront,
-                    SurfaceDescriptor* aNewBack);
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* aNewFront);
 
   virtual void DestroyFrontBuffer();
 
@@ -132,7 +130,11 @@ public:
 private:
   nsRefPtr<TextureImage> mTexImage;
 
-  SurfaceDescriptor mDeadweight;
+
+  // XXX FIXME holding to free
+  nsRefPtr<gfxSharedImageSurface> mDeadweight;
+
+
 };
 
 } /* layers */
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index 51eacfc40800..1d9804eac0e6 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -790,38 +790,38 @@ ShadowImageLayerOGL::~ShadowImageLayerOGL()
 {}
 
 PRBool
-ShadowImageLayerOGL::Init(const SurfaceDescriptor& aFront,
+ShadowImageLayerOGL::Init(gfxSharedImageSurface* aFront,
                           const nsIntSize& aSize)
 {
   mDeadweight = aFront;
-  nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aFront);
-  gfxSize sz = surf->GetSize();
+  gfxSize sz = mDeadweight->GetSize();
   mTexImage = gl()->CreateTextureImage(nsIntSize(sz.width, sz.height),
-                                       surf->GetContentType(),
+                                       mDeadweight->GetContentType(),
                                        LOCAL_GL_CLAMP_TO_EDGE);
   return PR_TRUE;
 }
 
-void
-ShadowImageLayerOGL::Swap(const SurfaceDescriptor& aNewFront, SurfaceDescriptor* aNewBack)
+already_AddRefed<gfxSharedImageSurface>
+ShadowImageLayerOGL::Swap(gfxSharedImageSurface* aNewFront)
 {
   if (!mDestroyed && mTexImage) {
-    nsRefPtr<gfxASurface> surf = ShadowLayerForwarder::OpenDescriptor(aNewFront);
     // XXX this is always just ridiculously slow
-    gfxSize sz = surf->GetSize();
+
+    gfxSize sz = aNewFront->GetSize();
     nsIntRegion updateRegion(nsIntRect(0, 0, sz.width, sz.height));
-    mTexImage->DirectUpdate(surf, updateRegion);
+    mTexImage->DirectUpdate(aNewFront, updateRegion);
   }
 
-  *aNewBack = aNewFront;
+  return aNewFront;
 }
 
 void
 ShadowImageLayerOGL::DestroyFrontBuffer()
 {
   mTexImage = nsnull;
-  if (IsSurfaceDescriptorValid(mDeadweight)) {
-    mOGLManager->DestroySharedSurface(&mDeadweight, mAllocator);
+  if (mDeadweight) {
+    mOGLManager->DestroySharedSurface(mDeadweight, mAllocator);
+    mDeadweight = nsnull;
   }
 }
 
diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h
index 96ce9d61ee48..18832a4d6fb6 100644
--- a/gfx/layers/opengl/ImageLayerOGL.h
+++ b/gfx/layers/opengl/ImageLayerOGL.h
@@ -245,9 +245,10 @@ public:
   virtual ~ShadowImageLayerOGL();
 
   // ShadowImageLayer impl
-  virtual PRBool Init(const SurfaceDescriptor& aFront, const nsIntSize& aSize);
+  virtual PRBool Init(gfxSharedImageSurface* aFront, const nsIntSize& aSize);
 
-  virtual void Swap(const SurfaceDescriptor& aFront, SurfaceDescriptor* aNewBack);
+  virtual already_AddRefed<gfxSharedImageSurface>
+  Swap(gfxSharedImageSurface* aNewFront);
 
   virtual void DestroyFrontBuffer();
 
@@ -264,7 +265,11 @@ public:
 private:
   nsRefPtr<TextureImage> mTexImage;
 
-  SurfaceDescriptor mDeadweight;
+
+  // XXX FIXME holding to free
+  nsRefPtr<gfxSharedImageSurface> mDeadweight;
+
+
 };
 
 } /* layers */

From f6a8603b547fa205dba707ccffaedf46d3c7c471 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 21 Apr 2011 14:52:26 -0700
Subject: [PATCH 386/509] Bug 583608: add #ifdef guards around mac-only static
 functions in nsObjectFrame.cpp. r=josh

---
 layout/generic/nsObjectFrame.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 94934d2e3e57..44903f596b67 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1972,6 +1972,7 @@ nsPluginInstanceOwner::NotifyPaintWaiter(nsDisplayListBuilder* aBuilder)
   }
 }
 
+#ifdef XP_MACOSX
 static void DrawPlugin(ImageContainer* aContainer, void* aPluginInstanceOwner)
 {
   nsObjectFrame* frame = static_cast<nsPluginInstanceOwner*>(aPluginInstanceOwner)->GetOwner();
@@ -1985,6 +1986,7 @@ static void OnDestroyImage(void* aPluginInstanceOwner)
   nsPluginInstanceOwner* owner = static_cast<nsPluginInstanceOwner*>(aPluginInstanceOwner);
   NS_IF_RELEASE(owner);
 }
+#endif // XP_MACOSX
 
 void
 nsObjectFrame::UpdateImageLayer(ImageContainer* aContainer, const gfxRect& aRect)
@@ -2783,6 +2785,7 @@ private:
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsStopPluginRunnable, nsRunnable, nsITimerCallback)
 
+#if defined(XP_MACOSX) || defined (XP_WIN)
 static const char*
 GetMIMEType(nsIPluginInstance *aPluginInstance)
 {
@@ -2793,6 +2796,7 @@ GetMIMEType(nsIPluginInstance *aPluginInstance)
   }
   return "";
 }
+#endif // XP_MACOSX || XP_WIN
 
 static PRBool
 DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)

From cd33ee624ac3b7be1405d659d5aff2fec454b6cf Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 21 Apr 2011 15:14:58 -0700
Subject: [PATCH 387/509] Bug 644704: Stop using XUL persistence for saving the
 current view. r=Unfocused

---
 .../mozapps/extensions/content/extensions.js  | 64 ++++++++++---------
 .../mozapps/extensions/content/extensions.xul |  2 +-
 .../test/browser/browser_searching.js         |  3 +
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 0a4d90ac0f79..977a8d0be40a 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -55,6 +55,7 @@ const PREF_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";
 const PREF_AUTOUPDATE_DEFAULT = "extensions.update.autoUpdateDefault";
 const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
 const PREF_GETADDONS_CACHE_ID_ENABLED = "extensions.%ID%.getAddons.cache.enabled";
+const PREF_UI_LASTCATEGORY = "extensions.ui.lastCategory";
 
 const BRANCH_REGEXP = /^([^\.]+\.[0-9]+[a-z]*).*/gi;
 
@@ -111,9 +112,28 @@ function initialize() {
   gEventManager.initialize();
   Services.obs.addObserver(sendEMPong, "EM-ping", false);
   Services.obs.notifyObservers(window, "EM-loaded", "");
-  // Send this after the above notifications to give observers of them a chance
-  // to initialize us to a different view.
-  gViewController.updateState(window.history.state);
+
+  // If the initial view has already been selected (by a call to loadView from
+  // the above notifications) then bail out now
+  if (gViewController.initialViewSelected)
+    return;
+
+  // If there is a history state to restore then use that
+  if (window.history.state) {
+    gViewController.updateState(window.history.state);
+    return;
+  }
+
+  // Default to the last selected category
+  var view = gCategories.node.value;
+
+  // Allow passing in a view through the window arguments
+  if ("arguments" in window && window.arguments.length > 0 &&
+      "view" in window.arguments[0]) {
+    view = window.arguments[0].view;
+  }
+
+  gViewController.loadInitialView(view);
 }
 
 function notifyInitialized() {
@@ -515,29 +535,7 @@ var gViewController = {
   },
 
   updateState: function(state) {
-    // If this is a navigation to a previous state then load that state
-    if (state) {
-      this.loadViewInternal(state.view, state.previousView, state);
-      return;
-    }
-
-    // If the initial view has already been selected (by a call to loadView) then
-    // bail out now
-    if (this.initialViewSelected)
-      return;
-
-    // Otherwise load the default view
-    var view = VIEW_DEFAULT;
-    if (gCategories.node.selectedItem &&
-        gCategories.node.selectedItem.id != "category-search")
-      view = gCategories.node.selectedItem.value;
-
-    if ("arguments" in window && window.arguments.length > 0) {
-      if ("view" in window.arguments[0])
-        view = window.arguments[0].view;
-    }
-
-    this.loadInitialView(view);
+    this.loadViewInternal(state.view, state.previousView, state);
   },
 
   parseViewId: function(aViewId) {
@@ -1417,7 +1415,15 @@ var gCategories = {
     this.node = document.getElementById("categories");
     this._search = this.get("addons://search/");
 
-    this.maybeHideSearch();
+    try {
+      this.node.value = Services.prefs.getCharPref(PREF_UI_LASTCATEGORY);
+    } catch (e) { }
+
+    // If there was no last view or no existing category matched the last view
+    // then the list will default to selecting the search category and we never
+    // want to show that as the first view so switch to the default category
+    if (this.node.selectedItem == this._search)
+      this.node.value = VIEW_DEFAULT;
 
     var self = this;
     this.node.addEventListener("select", function() {
@@ -1508,6 +1514,8 @@ var gCategories = {
       view = gViewController.parseViewId(aPreviousView);
     }
 
+    Services.prefs.setCharPref(PREF_UI_LASTCATEGORY, aId);
+
     if (this.node.selectedItem &&
         this.node.selectedItem.value == aId) {
       this.node.selectedItem.hidden = false;
@@ -1527,8 +1535,6 @@ var gCategories = {
       this.node.selectedItem = item;
       this.node.suppressOnSelect = false;
       this.node.ensureElementIsVisible(item);
-      // When supressing onselect last-selected doesn't get updated
-      this.node.setAttribute("last-selected", item.id);
 
       this.maybeHideSearch();
     }
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 02f7478036e9..f5b32259e577 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -207,7 +207,7 @@
   <hbox flex="1">
 
     <!-- category list -->
-    <richlistbox id="categories" persist="last-selected">
+    <richlistbox id="categories">
       <richlistitem id="category-search" value="addons://search/"
                     class="category"
                     name="&view.search.label;"
diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.js b/toolkit/mozapps/extensions/test/browser/browser_searching.js
index 5eb97bb8206b..d5bffda77a9c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_searching.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_searching.js
@@ -595,6 +595,9 @@ add_test(function() {
     gManagerWindow = aWindow;
     gCategoryUtilities = new CategoryUtilities(gManagerWindow);
 
+    // We never restore to the search pane
+    is(gCategoryUtilities.selectedCategory, "discover", "View should have changed to discover");
+
     // Installed add-on is considered local on new search
     gAddonInstalled = true;
 

From d2b50fbb7286310957040d59836c498a10493751 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Fri, 22 Apr 2011 16:09:05 -0700
Subject: [PATCH 388/509] Bug 651554 permaorange: browser_tapping.js | Fired a
 good double tap r=wesj

---
 mobile/chrome/tests/browser_tapping.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mobile/chrome/tests/browser_tapping.js b/mobile/chrome/tests/browser_tapping.js
index 68bc1c53fb7e..594d51b150d6 100644
--- a/mobile/chrome/tests/browser_tapping.js
+++ b/mobile/chrome/tests/browser_tapping.js
@@ -144,7 +144,7 @@ gTests.push({
     // Should fire "TapSingle"
     info("Test good single tap");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 2, {});
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, {});
 
     // We wait a bit because of the delay allowed for double clicking on device
     // where it is not native
@@ -163,8 +163,8 @@ gTests.push({
     // Should fire "TapDouble"
     info("Test good double tap");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 2, {});
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 2, {});
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, {});
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, {});
 
     setTimeout(function() {
       ok(checkEvents(["TapDouble"]), "Fired a good double tap");
@@ -182,8 +182,8 @@ gTests.push({
     // Should fire "TapSingle", "TapSingle"
     info("Test two single taps in different locations");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 3, height / 3, {});
-    EventUtils.synthesizeMouse(inputHandler, width * 2 / 3, height * 2 / 3, {});
+    EventUtils.synthesizeMouse(document.documentElement, width / 3, height / 3, {});
+    EventUtils.synthesizeMouse(document.documentElement, width * 2 / 3, height * 2 / 3, {});
 
     setTimeout(function() {
       ok(checkEvents(["TapSingle", "TapSingle"]), "Fired two single taps in different places, not a double tap");
@@ -200,9 +200,9 @@ gTests.push({
 
     info("Test a pan - non-tap event");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 3, { type: "mousedown" });
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height * 2 / 3, { type: "mousemove" });
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height * 2 / 3, { type: "mouseup" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 3, { type: "mousedown" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height * 2 / 3, { type: "mousemove" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height * 2 / 3, { type: "mouseup" });
     ok(checkEvents([]), "Fired a pan which should be seen as a non event");
     clearEvents();
 
@@ -216,10 +216,10 @@ gTests.push({
 
     info("Test a long pan - non-tap event");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 3, { type: "mousedown" });
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height * 2 / 3, { type: "mousemove" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 3, { type: "mousedown" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height * 2 / 3, { type: "mousemove" });
     setTimeout(function() {
-      EventUtils.synthesizeMouse(inputHandler, width / 2, height * 2 / 3, { type: "mouseup" });
+      EventUtils.synthesizeMouse(document.documentElement, width / 2, height * 2 / 3, { type: "mouseup" });
       ok(checkEvents([]), "Fired a pan + delay which should be seen as a non-event");
       clearEvents();
 
@@ -237,7 +237,7 @@ gTests.push({
 
     window.addEventListener("TapLong", function() {
       window.removeEventListener("TapLong", arguments.callee, true);
-      EventUtils.synthesizeMouse(inputHandler, width / 2, height / 2, { type: "mouseup" });
+      EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, { type: "mouseup" });
       ok(checkEvents(["TapLong"]), "Fired a good long tap");
       clearEvents();
     }, true);
@@ -249,7 +249,7 @@ gTests.push({
 
     info("Test a good long pan");
     clearEvents();
-    EventUtils.synthesizeMouse(inputHandler, width / 2, height / 2, { type: "mousedown" });
+    EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, { type: "mousedown" });
   },
 
   contextPlainLinkTest: function() {

From 6823870e4c1d884f40c1d9462152330ca7f60031 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 22 Apr 2011 16:06:07 -0700
Subject: [PATCH 389/509] Bug 650965 - Test for removed addons after a delay.
 r=mfinkle

---
 mobile/chrome/tests/browser_addons.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index b29a429a7f0f..c50246a4c808 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -372,10 +372,14 @@ function installFromURLBar(aAddon) {
                     is(updateButton.disabled, false, "Update button is enabled");
 
                     ExtensionsView.uninstall(elt);
-                    elt = get_addon_element(aAddon.id);
-                    ok(!elt, "Addon element removed during uninstall");
-                    Browser.closeTab(gCurrentTab);
-                    close_manager(run_next_test);
+                    setTimeout(function() {
+                      elt = get_addon_element(aAddon.id);
+                      ok(!elt || !elt.addon, "Addon element removed during uninstall");
+                      if (elt && !elt.addon)
+                        info("Element is still visible in search area");
+                      Browser.closeTab(gCurrentTab);
+                      close_manager(run_next_test);
+                    }, 0);
                   } else {
                     ok(!elt, "Extension not in list");
                     AddonManager.getAllInstalls(function(aInstalls) {

From 2dc78594bff840581fac86cd50236061ab0f980b Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 22 Apr 2011 16:06:07 -0700
Subject: [PATCH 390/509] Bug 651534 - Use click events in test rather than a
 timeout. r=mfinkle

---
 mobile/chrome/tests/browser_click_content.js | 23 ++++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/mobile/chrome/tests/browser_click_content.js b/mobile/chrome/tests/browser_click_content.js
index b77856ed9525..f06428f90e2d 100644
--- a/mobile/chrome/tests/browser_click_content.js
+++ b/mobile/chrome/tests/browser_click_content.js
@@ -2,7 +2,6 @@ let testURL_click = chromeRoot + "browser_click_content.html";
 
 let currentTab;
 let element;
-let isClickFired = false;
 let clickPosition = { x: null, y: null};
 
 //------------------------------------------------------------------------------
@@ -24,7 +23,6 @@ function test() {
 }
 
 function clickFired(aEvent) {
-  isClickFired = true;
   let [x, y] = browserViewToClient(aEvent.clientX, aEvent.clientY);
   clickPosition.x = x;
   clickPosition.y = y;
@@ -37,29 +35,30 @@ function testClickAndPosition() {
 
   // Check click
   element = currentTab.browser.contentDocument.getElementById("iframe-1");
-  element.addEventListener("click", clickFired, true);
+  element.addEventListener("click", function(aEvent) {
+    element.removeEventListener("click", arguments.callee, true);
+    clickFired(aEvent);
+    is(aEvent.type, "click", "Click fired");
+    checkClick();
+  }, true);
 
   EventUtils.synthesizeMouseForContent(element, 1, 1, {}, window);
-  waitFor(checkClick, function() { return isClickFired });
 }
 
 function checkClick() {
-  ok(isClickFired, "Click handler fired");
-  element.removeEventListener("click", clickFired, true);
-
   // Check position
-  isClickFired = false;
   element = currentTab.browser.contentDocument.documentElement;
-  element.addEventListener("click", clickFired, true);
+  element.addEventListener("click", function(aEvent) {
+    element.removeEventListener("click", arguments.callee, true);
+    clickFired(aEvent);
+    checkPosition();
+  }, true);
 
   let rect = getBoundingContentRect(element);
   EventUtils.synthesizeMouse(element, 1, rect.height + 10, {}, window);
-  waitFor(checkPosition, function() { return isClickFired });
 }
 
 function checkPosition() {
-  element.removeEventListener("click", clickFired, true);
-
   let rect = getBoundingContentRect(element);
   is(clickPosition.x, 1, "X position is correct");
   is(clickPosition.y, rect.height + 10, "Y position is correct");

From c2a0cdd8c604fefb2637464b706ea3b3c5f80396 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 22 Apr 2011 16:06:07 -0700
Subject: [PATCH 391/509] Bug 652157 - Dont use dialog binding on internal
 dialogs. r=mfinkle

---
 mobile/chrome/content/browser.css | 2 +-
 mobile/chrome/content/browser.xul | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/chrome/content/browser.css b/mobile/chrome/content/browser.css
index 7ae2140cd35b..f18b8dcd22a1 100644
--- a/mobile/chrome/content/browser.css
+++ b/mobile/chrome/content/browser.css
@@ -226,7 +226,7 @@ richlistitem[type="message"]{
   -moz-binding: url("chrome://browser/content/bindings/console.xml#message");
 }
 
-dialog {
+dialog:not(.content-dialog) {
   -moz-binding: url("chrome://browser/content/bindings/dialog.xml#dialog");
 }
 
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 57c82eb042ae..d75a1e81c119 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -360,7 +360,7 @@
     </arrowbox>
 
     <box id="bookmark-container" class="perm-modal-block window-width window-height" hidden="true">
-      <dialog id="bookmark-dialog" flex="1">
+      <dialog id="bookmark-dialog" class="content-dialog" flex="1">
         <hbox id="bookmark-form-title" class="prompt-title">
           <description>&editBookmarkDialog.title;</description>
         </hbox>
@@ -523,7 +523,7 @@
 
 #ifdef MOZ_SERVICES_SYNC
     <box id="syncsetup-container" class="perm-modal-block window-width window-height" hidden="true">
-      <dialog id="syncsetup-dialog" flex="1">
+      <dialog id="syncsetup-dialog" class="content-dialog" flex="1">
         <hbox class="prompt-title">
           <description>&sync.setup.title;</description>
         </hbox>

From facde0c63232a0d1805662904e6af0a16a33a495 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 22 Apr 2011 16:06:07 -0700
Subject: [PATCH 392/509] Bug 649206 - Update scrollTo addons to take correct
 arguments. r=mfinkle

---
 mobile/chrome/content/extensions.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mobile/chrome/content/extensions.js b/mobile/chrome/content/extensions.js
index 8d2e93c0471d..2c2d34ae59e5 100644
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -546,7 +546,7 @@ var ExtensionsView = {
   appendSearchResults: function(aAddons, aShowRating, aShowCount) {
     let urlproperties = [ "iconURL", "homepageURL" ];
     let foundItem = false;
-    let appendedAddons = 0;
+    let appendedAddons = [];
     for (let i = 0; i < aAddons.length; i++) {
       let addon = aAddons[i];
 
@@ -564,7 +564,6 @@ var ExtensionsView = {
           continue;
       }
 
-      appendedAddons++;
       // Convert the numeric type to a string
       let types = {"2":"extension", "4":"theme", "8":"locale"};
       addon.type = types[addon.type];
@@ -579,7 +578,7 @@ var ExtensionsView = {
         listitem.setAttribute("rating", addon.averageRating);
 
       let item = this.addItem(listitem, "repo");
-
+      appendedAddons.push(listitem);
       // Hide any overflow add-ons. The user can see them later by pressing the
       // "See More" button
       aShowCount--;
@@ -656,7 +655,7 @@ var ExtensionsView = {
     // can see more by pressing the "Show More" button
     this.appendSearchResults(aRecommendedAddons, false, aRecommendedAddons.length);
     let minOverflow = (aRecommendedAddons.length >= kAddonPageSize ? 0 : kAddonPageSize);
-    let numAdded = this.appendSearchResults(aBrowseAddons, true, minOverflow);
+    let numAdded = this.appendSearchResults(aBrowseAddons, true, minOverflow).length;
 
     let totalAddons = aRecommendedAddons.length + numAdded;
 
@@ -688,10 +687,10 @@ var ExtensionsView = {
       return;
     }
 
-    let firstItem = this.appendSearchResults(aAddons, true);
-    if (aSelectFirstResult) {
-      this._list.selectItem(firstItem);
-      this._list.scrollBoxObject.scrollToElement(firstItem);
+    let firstAdded = this.appendSearchResults(aAddons, true)[0];
+    if (aSelectFirstResult && firstAdded) {
+      this._list.selectItem(firstAdded);
+      this._list.scrollBoxObject.scrollToElement(firstAdded);
     }
 
     let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
@@ -892,7 +891,7 @@ var AddonSearchResults = {
   selectFirstResult: false,
 
   searchSucceeded: function(aAddons, aAddonCount, aTotalResults) {
-    ExtensionsView.displaySearchResults(aAddons, aTotalResults, false, this.selectFirstResult);
+    ExtensionsView.displaySearchResults(aAddons, aTotalResults, this.selectFirstResult);
   },
 
   searchFailed: searchFailed

From b4bdc7d485340bf5b5383aa36a12862dcafdb122 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Fri, 22 Apr 2011 09:03:20 -0400
Subject: [PATCH 393/509] Bug 652110: Make nsFileDataURI inherit directly from
 nsSimpleURI. r=sicking

---
 content/base/src/Makefile.in                  |  1 +
 .../base/src/nsFileDataProtocolHandler.cpp    | 98 +++++++------------
 2 files changed, 35 insertions(+), 64 deletions(-)

diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index fc7010cf6692..972f5f436c81 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -206,6 +206,7 @@ INCLUDES	+= \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/js/src/xpconnect/src \
 		-I$(topsrcdir)/caps/include \
+		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/base/src/nsFileDataProtocolHandler.cpp b/content/base/src/nsFileDataProtocolHandler.cpp
index 917801372223..0713f42d075e 100644
--- a/content/base/src/nsFileDataProtocolHandler.cpp
+++ b/content/base/src/nsFileDataProtocolHandler.cpp
@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsFileDataProtocolHandler.h"
-#include "nsNetCID.h"
+#include "nsSimpleURI.h"
 #include "nsDOMError.h"
 #include "nsCOMPtr.h"
 #include "nsClassHashtable.h"
@@ -49,8 +49,6 @@
 #include "nsIObjectOutputStream.h"
 #include "nsIProgrammingLanguage.h"
 
-static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
-
 // -----------------------------------------------------------------------
 // Hash table
 struct FileDataInfo
@@ -132,47 +130,19 @@ GetFileDataInfo(const nsACString& aUri)
 
 static NS_DEFINE_CID(kFILEDATAURICID, NS_FILEDATAURI_CID);
 
-
-// Use an extra base object to avoid having to manually retype all the
-// nsIURI methods.  I wish we could just inherit from nsSimpleURI instead.
-class nsFileDataURI_base : public nsIURI,
-                           public nsIMutable
+class nsFileDataURI : public nsSimpleURI,
+                      public nsIURIWithPrincipal
 {
 public:
-  nsFileDataURI_base(nsIURI* aSimpleURI) :
-    mSimpleURI(aSimpleURI)
-  {
-    mMutable = do_QueryInterface(mSimpleURI);
-    NS_ASSERTION(aSimpleURI && mMutable, "This isn't going to work out");
-  }
-  virtual ~nsFileDataURI_base() {}
-
-  // For use only from deserialization
-  nsFileDataURI_base() {}
-  
-  NS_FORWARD_NSIURI(mSimpleURI->)
-  NS_FORWARD_NSIMUTABLE(mMutable->)
-
-protected:
-  nsCOMPtr<nsIURI> mSimpleURI;
-  nsCOMPtr<nsIMutable> mMutable;
-};
-
-class nsFileDataURI : public nsFileDataURI_base,
-                      public nsIURIWithPrincipal,
-                      public nsISerializable,
-                      public nsIClassInfo
-{
-public:
-  nsFileDataURI(nsIPrincipal* aPrincipal, nsIURI* aSimpleURI) :
-      nsFileDataURI_base(aSimpleURI), mPrincipal(aPrincipal)
+  nsFileDataURI(nsIPrincipal* aPrincipal) :
+      nsSimpleURI(), mPrincipal(aPrincipal)
   {}
   virtual ~nsFileDataURI() {}
 
   // For use only from deserialization
-  nsFileDataURI() : nsFileDataURI_base() {}
+  nsFileDataURI() : nsSimpleURI() {}
 
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIURIWITHPRINCIPAL
   NS_DECL_NSISERIALIZABLE
   NS_DECL_NSICLASSINFO
@@ -181,22 +151,21 @@ public:
   NS_IMETHOD Clone(nsIURI** aClone);
   NS_IMETHOD Equals(nsIURI* aOther, PRBool *aResult);
 
+  // Override StartClone to hand back a nsFileDataURI
+  virtual nsSimpleURI* StartClone()
+  { return new nsFileDataURI(); }
+
   nsCOMPtr<nsIPrincipal> mPrincipal;
 };
 
-NS_IMPL_ADDREF(nsFileDataURI)
-NS_IMPL_RELEASE(nsFileDataURI)
+NS_IMPL_ADDREF_INHERITED(nsFileDataURI, nsSimpleURI)
+NS_IMPL_RELEASE_INHERITED(nsFileDataURI, nsSimpleURI)
 NS_INTERFACE_MAP_BEGIN(nsFileDataURI)
-  NS_INTERFACE_MAP_ENTRY(nsIURI)
   NS_INTERFACE_MAP_ENTRY(nsIURIWithPrincipal)
-  NS_INTERFACE_MAP_ENTRY(nsISerializable)
-  NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-  NS_INTERFACE_MAP_ENTRY(nsIMutable)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURI)
   if (aIID.Equals(kFILEDATAURICID))
       foundInterface = static_cast<nsIURI*>(this);
   else
-NS_INTERFACE_MAP_END
+NS_INTERFACE_MAP_END_INHERITING(nsSimpleURI)
 
 // nsIURIWithPrincipal methods:
 
@@ -226,20 +195,16 @@ nsFileDataURI::GetPrincipalUri(nsIURI** aUri)
 NS_IMETHODIMP
 nsFileDataURI::Read(nsIObjectInputStream* aStream)
 {
-  nsresult rv = aStream->ReadObject(PR_TRUE, getter_AddRefs(mSimpleURI));
+  nsresult rv = nsSimpleURI::Read(aStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mMutable = do_QueryInterface(mSimpleURI);
-  NS_ENSURE_TRUE(mMutable, NS_ERROR_UNEXPECTED);
-
   return NS_ReadOptionalObject(aStream, PR_TRUE, getter_AddRefs(mPrincipal));
 }
 
 NS_IMETHODIMP
 nsFileDataURI::Write(nsIObjectOutputStream* aStream)
 {
-  nsresult rv = aStream->WriteCompoundObject(mSimpleURI, NS_GET_IID(nsIURI),
-                                             PR_TRUE);
+  nsresult rv = nsSimpleURI::Write(aStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_WriteOptionalCompoundObject(aStream, mPrincipal,
@@ -253,13 +218,21 @@ NS_IMETHODIMP
 nsFileDataURI::Clone(nsIURI** aClone)
 {
   nsCOMPtr<nsIURI> simpleClone;
-  nsresult rv = mSimpleURI->Clone(getter_AddRefs(simpleClone));
+  nsresult rv = nsSimpleURI::Clone(getter_AddRefs(simpleClone));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsIURI* newURI = new nsFileDataURI(mPrincipal, simpleClone);
-  NS_ENSURE_TRUE(newURI, NS_ERROR_OUT_OF_MEMORY);
+#ifdef DEBUG
+  nsRefPtr<nsFileDataURI> uriCheck;
+  rv = simpleClone->QueryInterface(kFILEDATAURICID, getter_AddRefs(uriCheck));
+  NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) && uriCheck,
+		    "Unexpected!");
+#endif
 
-  NS_ADDREF(*aClone = newURI);
+  nsFileDataURI* fileDataURI = static_cast<nsFileDataURI*>(simpleClone.get());
+
+  fileDataURI->mPrincipal = mPrincipal;
+
+  simpleClone.forget(aClone);
   return NS_OK;
 }
 
@@ -285,7 +258,7 @@ nsFileDataURI::Equals(nsIURI* aOther, PRBool *aResult)
     return NS_OK;
   }
 
-  return mSimpleURI->Equals(otherFileDataUri->mSimpleURI, aResult);
+  return nsSimpleURI::Equals(otherFileDataUri, aResult);
 }
 
 // nsIClassInfo methods:
@@ -391,17 +364,14 @@ nsFileDataProtocolHandler::NewURI(const nsACString& aSpec,
   FileDataInfo* info =
     GetFileDataInfo(aSpec);
 
-  nsCOMPtr<nsIURI> inner = do_CreateInstance(kSimpleURICID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = inner->SetSpec(aSpec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   nsRefPtr<nsFileDataURI> uri =
-    new nsFileDataURI(info ? info->mPrincipal.get() : nsnull, inner);
+    new nsFileDataURI(info ? info->mPrincipal.get() : nsnull);
+
+  rv = uri->SetSpec(aSpec);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   NS_TryToSetImmutable(uri);
-  *aResult = uri.forget().get();
+  uri.forget(aResult);
 
   return NS_OK;
 }

From 7946e96cb4bbd8e4ad1571e7d064660e574405c6 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 23 Apr 2011 02:04:15 +0200
Subject: [PATCH 394/509] Bug 651107 - Allow waitForClipboard to check for any
 custom flavor. r=ehsan,ted

---
 .../browser/browser_410196_paste_into_tags.js | 24 ++------
 testing/mochitest/browser-test.js             |  4 +-
 .../mochitest/tests/SimpleTest/SimpleTest.js  | 61 ++++++++++++-------
 3 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/browser/components/places/tests/browser/browser_410196_paste_into_tags.js b/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
index 940c0f05b009..81a42b7dd06c 100644
--- a/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
+++ b/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
@@ -39,8 +39,10 @@ function onLibraryReady() {
   tests.makeHistVisit();
   tests.makeTag();
   tests.focusTag();
-  tests.copyHistNode();
-  tests.waitForClipboard();
+  waitForClipboard(function(aData) !!aData,
+                   tests.copyHistNode,
+                   onClipboardReady,
+                   PlacesUtils.TYPE_X_MOZ_PLACE);
 }
 
 function onClipboardReady() {
@@ -114,24 +116,6 @@ let tests = {
     PlacesOrganizer._content.controller.copy();
   },
 
-  waitForClipboard: function (){
-    try {
-      let xferable = Cc["@mozilla.org/widget/transferable;1"].
-                     createInstance(Ci.nsITransferable);
-      xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_PLACE);
-      let clipboard = Cc["@mozilla.org/widget/clipboard;1"].
-                      getService(Ci.nsIClipboard);
-      clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard);
-      let data = { }, type = { };
-      xferable.getAnyTransferData(type, data, { });
-      // Data is in the clipboard
-      onClipboardReady();
-    } catch (ex) {
-      // check again after 100ms.
-      setTimeout(arguments.callee, 100);
-    }
-  },
-
   pasteToTag: function (){
     // paste history node into tag
     this.focusTag(true);
diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
index 62e8125f47bb..a5cb057de4e9 100644
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -396,8 +396,8 @@ function testScope(aTester, aTest) {
     self.SimpleTest.waitForFocus(callback, targetWindow, expectBlankPage);
   };
 
-  this.waitForClipboard = function test_waitForClipboard(expected, setup, success, failure) {
-    self.SimpleTest.waitForClipboard(expected, setup, success, failure);
+  this.waitForClipboard = function test_waitForClipboard(expected, setup, success, failure, flavor) {
+    self.SimpleTest.waitForClipboard(expected, setup, success, failure, flavor);
   };
 
   this.registerCleanupFunction = function test_registerCleanupFunction(aFunction) {
diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index 5139af3d03df..400a5411639f 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -433,8 +433,9 @@ SimpleTest.waitForClipboard_polls = 0;
  * on the clipboard. This only uses the global clipboard and only for text/unicode
  * values.
  *
- * @param aExpectedVal
- *        The string value that is expected to be on the clipboard
+ * @param aExpectedStringOrValidatorFn
+ *        The string value that is expected to be on the clipboard or a
+ *        validator function getting cripboard data and returning a bool.
  * @param aSetupFn
  *        A function responsible for setting the clipboard to the expected value,
  *        called after the known value setting succeeds.
@@ -443,8 +444,14 @@ SimpleTest.waitForClipboard_polls = 0;
  * @param aFailureFn
  *        A function called if the expected value isn't found on the clipboard
  *        within 5s. It can also be called if the known value can't be found.
+ * @param aFlavor [optional] The flavor to look for.  Defaults to "text/unicode".
  */
-SimpleTest.waitForClipboard = function(aExpectedVal, aSetupFn, aSuccessFn, aFailureFn) {
+SimpleTest.__waitForClipboardMonotonicCounter = 0;
+SimpleTest.__defineGetter__("_waitForClipboardMonotonicCounter", function () {
+  return SimpleTest.__waitForClipboardMonotonicCounter++;
+});
+SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
+                                       aSuccessFn, aFailureFn, aFlavor) {
     if (ipcMode) {
       //TODO: support waitForClipboard via events to chrome
       dump("E10S_TODO: bug 573735 addresses adding support for this");
@@ -456,18 +463,27 @@ SimpleTest.waitForClipboard = function(aExpectedVal, aSetupFn, aSuccessFn, aFail
     var cbSvc = Components.classes["@mozilla.org/widget/clipboard;1"].
                 getService(Components.interfaces.nsIClipboard);
 
+    var requestedFlavor = aFlavor || "text/unicode";
+
+    function dataToString(aData)
+      aData.QueryInterface(Components.interfaces.nsISupportsString).data;
+
+    // Build a default validator function for common string input.
+    var inputValidatorFn = typeof(aExpectedStringOrValidatorFn) == "string"
+        ? function(aData) aData && dataToString(aData) == aExpectedStringOrValidatorFn
+        : aExpectedStringOrValidatorFn;
+
     // reset for the next use
     function reset() {
         SimpleTest.waitForClipboard_polls = 0;
     }
 
-    function wait(expectedVal, successFn, failureFn) {
+    function wait(validatorFn, successFn, failureFn, flavor) {
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
         if (++SimpleTest.waitForClipboard_polls > 50) {
             // Log the failure.
-            SimpleTest.ok(false, "Timed out while polling clipboard for pasted data. " +
-                                 "Expected " + expectedVal);
+            SimpleTest.ok(false, "Timed out while polling clipboard for pasted data.");
             reset();
             failureFn();
             return;
@@ -475,36 +491,39 @@ SimpleTest.waitForClipboard = function(aExpectedVal, aSetupFn, aSuccessFn, aFail
 
         var xferable = Components.classes["@mozilla.org/widget/transferable;1"].
                        createInstance(Components.interfaces.nsITransferable);
-        xferable.addDataFlavor("text/unicode");
+        xferable.addDataFlavor(flavor);
         cbSvc.getData(xferable, cbSvc.kGlobalClipboard);
         var data = {};
         try {
-            xferable.getTransferData("text/unicode", data, {});
-            data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data;
+            xferable.getTransferData(flavor, data, {});
         } catch (e) {}
+        data = data.value || null;
 
-        if (data == expectedVal) {
+        if (validatorFn(data)) {
             // Don't show the success message when waiting for preExpectedVal
-            if (data != preExpectedVal)
-                SimpleTest.ok(true,
-                              "Clipboard has the correct value (" + expectedVal + ")");
+            if (preExpectedVal)
+                preExpectedVal = null;
+            else
+                SimpleTest.ok(true, "Clipboard has the correct value");
             reset();
             successFn();
         } else {
-            setTimeout(function() wait(expectedVal, successFn, failureFn), 100);
+            setTimeout(function() wait(validatorFn, successFn, failureFn, flavor), 100);
         }
     }
 
-    // First we wait for a known value != aExpectedVal
-    var preExpectedVal = aExpectedVal + "-waitForClipboard-known-value";
+    // First we wait for a known value different from the expected one.
+    var preExpectedVal = SimpleTest._waitForClipboardMonotonicCounter +
+                         "-waitForClipboard-known-value";
     var cbHelperSvc = Components.classes["@mozilla.org/widget/clipboardhelper;1"].
                       getService(Components.interfaces.nsIClipboardHelper);
     cbHelperSvc.copyString(preExpectedVal);
-    wait(preExpectedVal, function() {
-        // Call the original setup fn
-        aSetupFn();
-        wait(aExpectedVal, aSuccessFn, aFailureFn);
-    }, aFailureFn);
+    wait(function(aData) aData && dataToString(aData) == preExpectedVal,
+         function() {
+           // Call the original setup fn
+           aSetupFn();
+           wait(inputValidatorFn, aSuccessFn, aFailureFn, requestedFlavor);
+         }, aFailureFn, "text/unicode");
 }
 
 /**

From cbeda3c3258698fe211fc27d7f25b52f12640e4d Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 23 Apr 2011 02:05:33 +0200
Subject: [PATCH 395/509] Bug 641074 - Broken folder shortcuts should not
 interrupt a Places result. r=sdwilsh

---
 toolkit/components/places/nsNavHistory.cpp    | 70 +++++++++++--------
 .../unit/test_broken_folderShortcut_result.js | 44 ++++++++++++
 2 files changed, 84 insertions(+), 30 deletions(-)
 create mode 100644 toolkit/components/places/tests/unit/test_broken_folderShortcut_result.js

diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index a2c8cc5d0759..d3b3dac2a18e 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -2872,13 +2872,18 @@ nsNavHistory::ExecuteQueries(nsINavHistoryQuery** aQueries, PRUint32 aQueryCount
     nsRefPtr<nsNavHistoryResultNode> tempRootNode;
     rv = bookmarks->ResultNodeForContainer(folderId, options,
                                            getter_AddRefs(tempRootNode));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rootNode = tempRootNode->GetAsContainer();
-  } else {
-    // complex query
+    NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
+                     "Generating a generic empty node for a broken query!");
+    if (NS_SUCCEEDED(rv)) {
+      rootNode = tempRootNode->GetAsContainer();
+    }
+  }
+
+  if (!rootNode) {
+    // Either this is not a folder shortcut, or is a broken one.  In both cases
+    // just generate a query node.
     rootNode = new nsNavHistoryQueryResultNode(EmptyCString(), EmptyCString(),
                                                queries, options);
-    NS_ENSURE_TRUE(rootNode, NS_ERROR_OUT_OF_MEMORY);
   }
 
   // Create the result that will hold nodes.  Inject batching status into it.
@@ -6485,44 +6490,49 @@ nsNavHistory::QueryRowToResult(PRInt64 itemId, const nsACString& aURI,
   nsCOMPtr<nsNavHistoryQueryOptions> options;
   nsresult rv = QueryStringToQueryArray(aURI, &queries,
                                         getter_AddRefs(options));
-  if (NS_FAILED(rv)) {
-    // This was a query that did not parse, what do we do? We don't want to
-    // return failure since that will kill the whole query process. Instead
-    // make a query node with the query as a string. This way we have a valid
-    // node for the user to manipulate that will look like a query, but it will
-    // never populate since the query string is invalid.
-    *aNode = new nsNavHistoryQueryResultNode(aURI, aTitle, aFavicon);
-    if (! *aNode)
-      return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(*aNode);
-  } else {
+  // If this failed the query does not parse correctly, let the error pass and
+  // handle it later.
+  if (NS_SUCCEEDED(rv)) {
+    // Check if this is a folder shortcut, so we can take a faster path.
     PRInt64 folderId = GetSimpleBookmarksQueryFolder(queries, options);
     if (folderId) {
-      // simple bookmarks folder, magically generate a bookmarks folder node
       nsNavBookmarks *bookmarks = nsNavBookmarks::GetBookmarksService();
       NS_ENSURE_TRUE(bookmarks, NS_ERROR_OUT_OF_MEMORY);
 
-      // this addrefs for us
+      // This AddRefs for us.
       rv = bookmarks->ResultNodeForContainer(folderId, options, aNode);
-      NS_ENSURE_SUCCESS(rv, rv);
+      // If this failed the shortcut is pointing to nowhere, let the error pass
+      // and handle it later.
+      if (NS_SUCCEEDED(rv)) {
+        // This is the query itemId, and is what is exposed by node.itemId.
+        (*aNode)->GetAsFolder()->mQueryItemId = itemId;
 
-      // this is the query item-Id, and is what is exposed by node.itemId
-      (*aNode)->GetAsFolder()->mQueryItemId = itemId;
-
-      // Use the query item title, unless it's void (in that case,
-      // we keep the concrete folder title set)
-      if (!aTitle.IsVoid())
-        (*aNode)->mTitle = aTitle;
-    } else {
-      // regular query
+        // Use the query item title, unless it's void (in that case use the 
+        // concrete folder title).
+        if (!aTitle.IsVoid()) {
+          (*aNode)->mTitle = aTitle;
+        }
+      }
+    }
+    else {
+      // This is a regular query.
       *aNode = new nsNavHistoryQueryResultNode(aTitle, EmptyCString(), aTime,
                                                queries, options);
-      if (! *aNode)
-        return NS_ERROR_OUT_OF_MEMORY;
       (*aNode)->mItemId = itemId;
       NS_ADDREF(*aNode);
     }
   }
+
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Generating a generic empty node for a broken query!");
+    // This is a broken query, that either did not parse or points to not
+    // existing data.  We don't want to return failure since that will kill the
+    // whole result.  Instead make a generic empty query node.
+    *aNode = new nsNavHistoryQueryResultNode(aTitle, aFavicon, aURI);
+    (*aNode)->mItemId = itemId;
+    NS_ADDREF(*aNode);
+  }
+
   return NS_OK;
 }
 
diff --git a/toolkit/components/places/tests/unit/test_broken_folderShortcut_result.js b/toolkit/components/places/tests/unit/test_broken_folderShortcut_result.js
new file mode 100644
index 000000000000..c438efc7bdc7
--- /dev/null
+++ b/toolkit/components/places/tests/unit/test_broken_folderShortcut_result.js
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function run_test() {
+  PlacesUtils.bookmarks.insertBookmark(
+    PlacesUtils.unfiledBookmarksFolderId, NetUtil.newURI("http://1.moz.org/"),
+    PlacesUtils.bookmarks.DEFAULT_INDEX, "Bookmark 1"
+  );
+  let id = PlacesUtils.bookmarks.insertBookmark(
+    PlacesUtils.unfiledBookmarksFolderId, NetUtil.newURI("place:folder=1234"),
+    PlacesUtils.bookmarks.DEFAULT_INDEX, "Shortcut"
+  );
+  PlacesUtils.bookmarks.insertBookmark(
+    PlacesUtils.unfiledBookmarksFolderId, NetUtil.newURI("http://2.moz.org/"),
+    PlacesUtils.bookmarks.DEFAULT_INDEX, "Bookmark 2"
+  );
+
+  // Query containing a broken folder shortcuts among results.
+  let query = PlacesUtils.history.getNewQuery();
+  query.setFolders([PlacesUtils.unfiledBookmarksFolderId], 1);
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let root = PlacesUtils.history.executeQuery(query, options).root;
+  root.containerOpen = true;
+  do_check_eq(root.childCount, 3);
+  let shortcut = root.getChild(1);
+  do_check_eq(shortcut.uri, "place:folder=1234");
+  PlacesUtils.asContainer(shortcut);
+  shortcut.containerOpen = true;
+  do_check_eq(shortcut.childCount, 0);
+  shortcut.containerOpen = false;
+  // Remove the broken shortcut while the containing result is open.
+  PlacesUtils.bookmarks.removeItem(id);
+  do_check_eq(root.childCount, 2);
+  root.containerOpen = false;
+
+  // Broken folder shortcut as root node.
+  let query = PlacesUtils.history.getNewQuery();
+  query.setFolders([1234], 1);
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let root = PlacesUtils.history.executeQuery(query, options).root;
+  root.containerOpen = true;
+  do_check_eq(root.childCount, 0);
+  root.containerOpen = false;
+}

From f7b28e9a92d3602bd07f2a18de50ee425235e2e7 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Fri, 22 Apr 2011 20:06:31 -0400
Subject: [PATCH 396/509] Bug 622840: Part 1 - Remove WINCE icon code. rs=joe

---
 .../decoders/icon/win/nsIconChannel.cpp       | 108 ------------------
 1 file changed, 108 deletions(-)

diff --git a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
index 0d5e1728938b..a4c7ab9b5a99 100644
--- a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
+++ b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
@@ -66,10 +66,6 @@
 #define _WIN32_WINNT 0x0600
 #endif
 
-#ifdef WINCE
-#define SHGetFileInfoW SHGetFileInfo
-#endif
-
 // we need windows.h to read out registry information...
 #include <windows.h>
 #include <shellapi.h>
@@ -263,7 +259,6 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports
   return rv;
 }
 
-#ifndef WINCE
 static DWORD GetSpecialFolderIcon(nsIFile* aFile, int aFolder, SHFILEINFOW* aSFI, UINT aInfoFlags)
 {
   DWORD shellResult = 0;
@@ -297,17 +292,12 @@ static DWORD GetSpecialFolderIcon(nsIFile* aFile, int aFolder, SHFILEINFOW* aSFI
   }
   return shellResult;
 }
-#endif
 
 static UINT GetSizeInfoFlag(PRUint32 aDesiredImageSize)
 {
   UINT infoFlag;
   if (aDesiredImageSize > 16)
-#ifndef WINCE
     infoFlag = SHGFI_SHELLICONSIZE;
-#else
-    infoFlag = SHGFI_LARGEICON;
-#endif
   else
     infoFlag = SHGFI_SMALLICON;
 
@@ -316,10 +306,6 @@ static UINT GetSizeInfoFlag(PRUint32 aDesiredImageSize)
 
 nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
 {
-#ifdef WINCE_WINDOWS_MOBILE
-    // GetDIBits does not exist on windows mobile.
-  return NS_ERROR_NOT_AVAILABLE;
-#else
   nsXPIDLCString contentType;
   nsCString fileExt;
   nsCOMPtr<nsIFile> localFile; // file we want an icon for
@@ -341,15 +327,8 @@ nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
     NS_ENSURE_SUCCESS(rv, rv);
 
     localFile->GetPath(filePath);
-#ifndef WINCE
     if (filePath.Length() < 2 || filePath[1] != ':')
       return NS_ERROR_MALFORMED_URI; // UNC
-#else
-    // WinCE paths don't have drive letters
-    if (filePath.Length() < 2 ||
-        filePath[0] != '\\' || filePath[1] == '\\')
-      return NS_ERROR_MALFORMED_URI; // UNC
-#endif
 
     if (filePath.Last() == ':')
       filePath.Append('\\');
@@ -380,21 +359,12 @@ nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
     filePath = NS_LITERAL_STRING(".") + NS_ConvertUTF8toUTF16(defFileExt);
   }
 
-#ifndef WINCE
   // Is this the "Desktop" folder?
   DWORD shellResult = GetSpecialFolderIcon(localFile, CSIDL_DESKTOP, &sfi, infoFlags);
   if (!shellResult) {
     // Is this the "My Documents" folder?
     shellResult = GetSpecialFolderIcon(localFile, CSIDL_PERSONAL, &sfi, infoFlags);
   }
-#else
-  DWORD shellResult = 0;
-  // Fantastic. On WinCE, ::SHGetFileInfo (with a localFile) fails
-  // unless I also set another flag like this. We don't actually need
-  // the display name.
-  if (localFile)
-    infoFlags |= SHGFI_DISPLAYNAME;
-#endif
 
   // There are other "Special Folders" and Namespace entities that we are not 
   // fetching icons for, see: 
@@ -412,7 +382,6 @@ nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
     rv = NS_ERROR_NOT_AVAILABLE;
 
   return rv;
-#endif
 }
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
@@ -460,81 +429,6 @@ nsresult nsIconChannel::GetStockHIcon(nsIMozIconURI *aIconURI, HICON *hIcon)
 }
 #endif
 
-#ifdef WINCE
-int GetDIBits(HDC hdc,
-              HBITMAP hbmp,
-              UINT uStartScan,
-              UINT cScanLines,
-              LPVOID lpvBits,
-              LPBITMAPINFO lpbi,
-              UINT uUsage)
-{
-  // Enforce some assumptions this simplified implementation makes
-  if (!hdc || !hbmp || uStartScan != 0 ||
-      !lpbi || uUsage != DIB_RGB_COLORS ||
-      lpvBits == NULL && lpbi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER))
-    return 0;
-
-  BITMAP bmpInfo;
-  if (!::GetObject(hbmp, sizeof(BITMAP), &bmpInfo))
-    return 0;
-
-  lpbi->bmiHeader.biWidth         = bmpInfo.bmWidth;
-  lpbi->bmiHeader.biHeight        = bmpInfo.bmHeight;
-  lpbi->bmiHeader.biPlanes        = bmpInfo.bmPlanes;
-  lpbi->bmiHeader.biBitCount      = bmpInfo.bmBitsPixel;
-  lpbi->bmiHeader.biCompression   = BI_RGB; // 0
-  lpbi->bmiHeader.biSizeImage     = bmpInfo.bmWidthBytes * bmpInfo.bmHeight;
-  lpbi->bmiHeader.biXPelsPerMeter = 0;
-  lpbi->bmiHeader.biYPelsPerMeter = 0;
-  lpbi->bmiHeader.biClrUsed       = 0;
-  lpbi->bmiHeader.biClrImportant  = 0;
-
-  if (lpbi->bmiHeader.biBitCount == 1) {
-    // Need to set this or else the mask is inverted.
-    lpbi->bmiHeader.biClrUsed       = 2;
-    lpbi->bmiHeader.biClrImportant  = 2;
-    lpbi->bmiColors[0].rgbRed = lpbi->bmiColors[0].rgbGreen =
-      lpbi->bmiColors[0].rgbBlue = lpbi->bmiColors[0].rgbReserved = 0;
-    lpbi->bmiColors[1].rgbRed = lpbi->bmiColors[1].rgbGreen =
-      lpbi->bmiColors[1].rgbBlue = lpbi->bmiColors[1].rgbReserved = 255;
-  }
-
-  if (lpvBits == NULL)
-    return bmpInfo.bmHeight;
-
-  // We just want to pull out the image bits, but Windows CE makes
-  // this stupidly difficult to do...
-  HBITMAP hTargetBitmap;
-  void *pBuffer; 
-  HDC someDC = ::GetDC(NULL);
-  hTargetBitmap = ::CreateDIBSection(someDC, lpbi, DIB_RGB_COLORS,
-                                     (void**)&pBuffer, NULL, 0);
-  ::ReleaseDC(NULL, someDC);
-
-  HDC memDc    = ::CreateCompatibleDC(NULL);
-  HDC targetDc = ::CreateCompatibleDC(NULL);
-  if (!memDc || !targetDc)
-    return 0;
-
-  HBITMAP hOldMemBitmap = (HBITMAP)::SelectObject(memDc, hbmp);
-  HBITMAP hOldTgtBitmap = (HBITMAP)::SelectObject(targetDc, hTargetBitmap);
-
-  // BitBlt into the target bitmap, then copy the bits into our buffer.
-  ::BitBlt(targetDc, 0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight, memDc, 0, 0, SRCCOPY);
-  memcpy(lpvBits, pBuffer, lpbi->bmiHeader.biSizeImage);
-
-  // Cleanup
-  ::SelectObject(memDc, hOldMemBitmap);
-  ::SelectObject(targetDc, hOldTgtBitmap);
-  ::DeleteDC(memDc);
-  ::DeleteDC(targetDc); 
-  ::DeleteObject(hTargetBitmap); 
-
-  return bmpInfo.bmHeight;
-}
-#endif
-
 // Given a BITMAPINFOHEADER, returns the size of the color table.
 static int GetColorTableSize(BITMAPINFOHEADER* aHeader)
 {
@@ -599,7 +493,6 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
   nsresult rv = NS_ERROR_NOT_AVAILABLE;
 
   // GetDIBits does not exist on windows mobile.
-#ifndef WINCE_WINDOWS_MOBILE
   HICON hIcon = NULL;
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
@@ -728,7 +621,6 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
   // If we didn't make a stream, then fail.
   if (!*_retval && NS_SUCCEEDED(rv))
     rv = NS_ERROR_NOT_AVAILABLE;
-#endif
   return rv;
 }
 

From a8b6fd05ad2add5ca4dcf0f5eca9cbb1a79d0975 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Sat, 23 Apr 2011 02:06:34 +0200
Subject: [PATCH 397/509] Bug 641074 - Sync tests for Places query safety.
 r=philikon

---
 .../sync/tests/unit/test_bookmark_engine.js   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/services/sync/tests/unit/test_bookmark_engine.js b/services/sync/tests/unit/test_bookmark_engine.js
index e1a78e4fd818..622d6d39bca6 100644
--- a/services/sync/tests/unit/test_bookmark_engine.js
+++ b/services/sync/tests/unit/test_bookmark_engine.js
@@ -14,6 +14,36 @@ function makeEngine() {
 }
 var syncTesting = new SyncTestingInfrastructure(makeEngine);
 
+add_test(function bad_record_allIDs() {
+  _("Ensure that bad Places queries don't cause an error in getAllIDs.");
+  let engine = new BookmarksEngine();
+  let store = engine._store;
+  let badRecordID = Svc.Bookmark.insertBookmark(
+      Svc.Bookmark.toolbarFolder,
+      Utils.makeURI("place:folder=1138"),
+      Svc.Bookmark.DEFAULT_INDEX,
+      null);
+
+  do_check_true(badRecordID > 0);
+  _("Record is " + badRecordID);
+  _("Type: " + Svc.Bookmark.getItemType(badRecordID));
+
+  _("Fetching children.");
+  store._getChildren("toolbar", {});
+
+  _("Fetching all IDs.");
+  let all = store.getAllIDs();
+  
+  _("All IDs: " + JSON.stringify(all));
+  do_check_true("menu" in all);
+  do_check_true("toolbar" in all);
+  
+  _("Clean up.");
+  Svc.Bookmark.removeItem(badRecordID);
+  run_next_test();
+});
+  
+  
 add_test(function test_ID_caching() {
 
   _("Ensure that Places IDs are not cached.");

From 33266aada1e66d0491d7b594bc278cd61148c645 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 23 Apr 2011 02:08:01 +0200
Subject: [PATCH 398/509] Bug 641531 - Close Places containers after use
 (browser changes). r=sdwilsh

---
 browser/base/content/pageinfo/security.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/pageinfo/security.js b/browser/base/content/pageinfo/security.js
index 9d018e674074..2f2e4188e2ad 100644
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@@ -374,5 +374,7 @@ function previousVisitCount(host, endTimeReference) {
 
   var result = historyService.executeQuery(query, options);
   result.root.containerOpen = true;
-  return result.root.childCount;
+  var cc = result.root.childCount;
+  result.root.containerOpen = false;
+  return cc;
 }

From a9acca633680ce086e56197dfa0703b818bf9660 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 23 Apr 2011 02:08:36 +0200
Subject: [PATCH 399/509] Bug 641531 - Close Places containers after use (Sync
 changes) r=philikon

---
 services/sync/modules/engines/bookmarks.js    | 49 +++++++++++--------
 .../test_bookmark_places_query_rewriting.js   |  3 +-
 .../sync/tests/unit/test_bookmark_tracker.js  | 19 ++++---
 .../sync/tests/unit/test_history_store.js     |  1 +
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js
index e0b372f90efb..98796a874ffc 100644
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -529,22 +529,27 @@ BookmarksStore.prototype = {
     }
 
     tags.containerOpen = true;
-    for (let i = 0; i < tags.childCount; i++) {
-      let child = tags.getChild(i);
-      if (child.title == tag) {
-        // Found the tag, so fix up the query to use the right id.
-        this._log.debug("Tag query folder: " + tag + " = " + child.itemId);
-        
-        this._log.trace("Replacing folders in: " + uri);
-        for each (let q in queriesRef.value)
-          q.setFolders([child.itemId], 1);
-        
-        record.bmkUri = Svc.History.queriesToQueryString(queriesRef.value,
-                                                         queryCountRef.value,
-                                                         optionsRef.value);
-        return;
+    try {
+      for (let i = 0; i < tags.childCount; i++) {
+        let child = tags.getChild(i);
+        if (child.title == tag) {
+          // Found the tag, so fix up the query to use the right id.
+          this._log.debug("Tag query folder: " + tag + " = " + child.itemId);
+          
+          this._log.trace("Replacing folders in: " + uri);
+          for each (let q in queriesRef.value)
+            q.setFolders([child.itemId], 1);
+          
+          record.bmkUri = Svc.History.queriesToQueryString(queriesRef.value,
+                                                           queryCountRef.value,
+                                                           optionsRef.value);
+          return;
+        }
       }
     }
+    finally {
+      tags.containerOpen = false;
+    }
   },
   
   applyIncoming: function BStore_applyIncoming(record) {
@@ -1245,12 +1250,16 @@ BookmarksStore.prototype = {
         !this._ls.isLivemark(node.itemId)) {
       node.QueryInterface(Ci.nsINavHistoryQueryResultNode);
       node.containerOpen = true;
-
-      // Remember all the children GUIDs and recursively get more
-      for (let i = 0; i < node.childCount; i++) {
-        let child = node.getChild(i);
-        items[this.GUIDForId(child.itemId)] = true;
-        this._getChildren(child, items);
+      try {
+        // Remember all the children GUIDs and recursively get more
+        for (let i = 0; i < node.childCount; i++) {
+          let child = node.getChild(i);
+          items[this.GUIDForId(child.itemId)] = true;
+          this._getChildren(child, items);
+        }
+      }
+      finally {
+        node.containerOpen = false;
       }
     }
 
diff --git a/services/sync/tests/unit/test_bookmark_places_query_rewriting.js b/services/sync/tests/unit/test_bookmark_places_query_rewriting.js
index 0278d3045cd5..ca9232fa0c81 100644
--- a/services/sync/tests/unit/test_bookmark_places_query_rewriting.js
+++ b/services/sync/tests/unit/test_bookmark_places_query_rewriting.js
@@ -33,7 +33,8 @@ function run_test() {
     if (child.title == "bar")
       tagID = child.itemId;
   }
-      
+  tags.containerOpen = false;
+
   _("Tag ID: " + tagID);
   do_check_eq(tagRecord.bmkUri, uri.replace("499", tagID));
   
diff --git a/services/sync/tests/unit/test_bookmark_tracker.js b/services/sync/tests/unit/test_bookmark_tracker.js
index 63aad33633d1..1efb41b69492 100644
--- a/services/sync/tests/unit/test_bookmark_tracker.js
+++ b/services/sync/tests/unit/test_bookmark_tracker.js
@@ -147,13 +147,16 @@ function test_copying_places() {
     do_check_true(!!b1GUID);
 
     _("Make sure the destination folder is empty.");
-    do_check_eq(PlacesUtils.getFolderContents(f2, false, true).root.childCount, 0);
+    let root = PlacesUtils.getFolderContents(f2, false, true).root;
+    do_check_eq(root.childCount, 0);
+    root.containerOpen = false;
 
-    let f1Node = PlacesUtils.getFolderContents(f1, false, false);
-    _("Node to copy: " + f1Node.root.itemId);
+    let f1Node = PlacesUtils.getFolderContents(f1, false, false).root;
+    _("Node to copy: " + f1Node.itemId);
 
-    let serialized = PlacesUtils.wrapNode(f1Node.root, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER);
+    let serialized = PlacesUtils.wrapNode(f1Node, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER);
     _("Serialized to " + serialized);
+    f1Node.containerOpen = false;
 
     let raw = PlacesUtils.unwrapNodes(serialized, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER).shift();
     let transaction = getFolderCopyTransaction(raw, f2, Svc.Bookmark.DEFAULT_INDEX, true);
@@ -162,11 +165,11 @@ function test_copying_places() {
     ptm.doTransaction(transaction);
 
     _("Verify that items have been copied.");
-    let f2Node = PlacesUtils.getFolderContents(f2, false, true);
-    do_check_eq(f2Node.root.childCount, 1);
+    let f2Node = PlacesUtils.getFolderContents(f2, false, true).root;
+    do_check_eq(f2Node.childCount, 1);
 
     _("Verify that the copied folder has different GUIDs.");
-    let c0 = f2Node.root.getChild(0);
+    let c0 = f2Node.getChild(0);
     do_check_eq(c0.title, "Folder One");
     do_check_neq(c0.itemId, f1);
     do_check_neq(store.GUIDForId(c0.itemId), f1GUID);
@@ -183,6 +186,8 @@ function test_copying_places() {
     do_check_neq(b0.itemId, b1);
     do_check_neq(store.GUIDForId(b0.itemId), b1GUID);
 
+    c0.containerOpen = false;
+    f2Node.containerOpen = false;
   } finally {
     tracker.clearChangedIDs();
     Svc.Obs.notify("weave:engine:stop-tracking");
diff --git a/services/sync/tests/unit/test_history_store.js b/services/sync/tests/unit/test_history_store.js
index 489b4a4510d9..d71ecdb19c65 100644
--- a/services/sync/tests/unit/test_history_store.js
+++ b/services/sync/tests/unit/test_history_store.js
@@ -15,6 +15,7 @@ function queryPlaces(uri, options) {
   let results = [];
   for (let i = 0; i < res.root.childCount; i++)
     results.push(res.root.getChild(i));
+  res.root.containerOpen = false;
   return results;
 }
 

From 604caf65ce42ee926077c73be556cc8a57d0e31c Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 23 Apr 2011 02:09:13 +0200
Subject: [PATCH 400/509] Bug 641531 - Close Places containers after use
 (mechanical changes) rs=me

---
 .../places/tests/browser/browser_423515.js       |  2 ++
 .../places/tests/browser/browser_425884.js       |  2 ++
 docshell/test/browser/browser_bug503832.js       |  4 +++-
 .../places/tests/bookmarks/test_395101.js        |  4 ++++
 .../bookmarks/test_423515_forceCopyShortcuts.js  |  4 ++++
 .../places/tests/bookmarks/test_savedsearches.js |  6 ++++++
 .../places/tests/chrome/test_329534.xul          |  3 +++
 .../places/tests/queries/head_queries.js         | 10 ++++++++--
 .../tests/queries/test_excludeReadOnlyFolders.js |  2 ++
 .../tests/queries/test_results-as-visit.js       |  2 ++
 .../tests/queries/test_searchterms-domain.js     |  2 ++
 .../places/tests/queries/test_searchterms-uri.js |  2 ++
 .../components/places/tests/unit/test_331487.js  |  5 +++++
 .../components/places/tests/unit/test_415460.js  |  4 +++-
 .../components/places/tests/unit/test_415757.js  |  4 +++-
 .../components/places/tests/unit/test_419731.js  |  1 +
 .../tests/unit/test_429505_remove_shortcuts.js   |  2 ++
 .../tests/unit/test_433317_query_title_update.js |  2 ++
 .../tests/unit/test_433525_hasChildren_crash.js  |  1 +
 .../places/tests/unit/test_browserhistory.js     |  4 +++-
 .../places/tests/unit/test_dynamic_containers.js |  3 +++
 .../places/tests/unit/test_exclude_livemarks.js  |  2 ++
 .../components/places/tests/unit/test_history.js | 16 +++++++++++++++-
 .../places/tests/unit/test_history_import.js     |  4 +++-
 .../places/tests/unit/test_multi_word_tags.js    | 10 ++++++++++
 .../tests/unit/test_resolveNullBookmarkTitles.js |  1 +
 .../places/tests/unit/test_result_sort.js        |  1 +
 27 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/browser/components/places/tests/browser/browser_423515.js b/browser/components/places/tests/browser/browser_423515.js
index 08e286b7d3c0..b53664d70e56 100644
--- a/browser/components/places/tests/browser/browser_423515.js
+++ b/browser/components/places/tests/browser/browser_423515.js
@@ -237,6 +237,7 @@ function test() {
          false, "cannot move a child of a read-only folder");
       is(PlacesControllerDragHelper.canMoveNode(childFolder),
          false, "cannot move a child node of a read-only folder node");
+      readOnlyFolder.containerOpen = false;
     }
   });
 
@@ -246,5 +247,6 @@ function test() {
     aTest.validate();
   });
 
+  rootNode.containerOpen = false;
   PlacesUtils.bookmarks.removeItem(rootId);
 }
diff --git a/browser/components/places/tests/browser/browser_425884.js b/browser/components/places/tests/browser/browser_425884.js
index 2ddd01be64e3..b0247e6bfb08 100644
--- a/browser/components/places/tests/browser/browser_425884.js
+++ b/browser/components/places/tests/browser/browser_425884.js
@@ -78,6 +78,8 @@ function test() {
   var rawNode = PlacesUtils.unwrapNodes(serializedNode, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER).shift();
   // confirm serialization
   ok(rawNode.type, "confirm json node");
+  folderANode.containerOpen = false;
+
   var transaction = PlacesUIUtils.makeTransaction(rawNode,
                                                   PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER,
                                                   testRootId,
diff --git a/docshell/test/browser/browser_bug503832.js b/docshell/test/browser/browser_bug503832.js
index 8e94a207702f..614bb16ce391 100644
--- a/docshell/test/browser/browser_bug503832.js
+++ b/docshell/test/browser/browser_bug503832.js
@@ -67,7 +67,9 @@ function test() {
         if (!result.root.childCount) {
             return null;
         }
-        return result.root.getChild(0);
+        var node = result.root.getChild(0);
+        result.root.containerOpen = false;
+        return node;
     }
 
 
diff --git a/toolkit/components/places/tests/bookmarks/test_395101.js b/toolkit/components/places/tests/bookmarks/test_395101.js
index 824dfabb6d2e..c11ae2564484 100644
--- a/toolkit/components/places/tests/bookmarks/test_395101.js
+++ b/toolkit/components/places/tests/bookmarks/test_395101.js
@@ -89,6 +89,7 @@ function run_test() {
 
   do_check_eq(rootNode.childCount, 1);
   do_check_eq(rootNode.getChild(0).itemId, b1);
+  rootNode.containerOpen = false;
 
   // partial matches are okay
   query.searchTerms = "wal";
@@ -96,6 +97,7 @@ function run_test() {
   var rootNode = result.root;
   rootNode.containerOpen = true;
   do_check_eq(rootNode.childCount, 1);
+  rootNode.containerOpen = false;
 
   // case insensitive search term
   query.searchTerms = "WALRUS";
@@ -104,6 +106,7 @@ function run_test() {
   rootNode.containerOpen = true;
   do_check_eq(rootNode.childCount, 1);
   do_check_eq(rootNode.getChild(0).itemId, b1);
+  rootNode.containerOpen = false;
 
   // case insensitive tag
   query.searchTerms = "baboon";
@@ -112,4 +115,5 @@ function run_test() {
   rootNode.containerOpen = true;
   do_check_eq(rootNode.childCount, 1);
   do_check_eq(rootNode.getChild(0).itemId, b1);
+  rootNode.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/bookmarks/test_423515_forceCopyShortcuts.js b/toolkit/components/places/tests/bookmarks/test_423515_forceCopyShortcuts.js
index 62574a2bc5c1..bf45e4d95fa8 100644
--- a/toolkit/components/places/tests/bookmarks/test_423515_forceCopyShortcuts.js
+++ b/toolkit/components/places/tests/bookmarks/test_423515_forceCopyShortcuts.js
@@ -136,10 +136,14 @@ function run_test() {
   do_check_eq(queryNode.childCount, 1);
   var child = queryNode.getChild(0);
   do_check_true(bookmarkURI.equals(uri(child.uri)));
+  queryNode.containerOpen = false;
 
   var queryNode2 = root.getChild(root.childCount-1);
   do_check_eq(queryNode2.type, queryNode2.RESULT_TYPE_QUERY);
   queryNode2.QueryInterface(Ci.nsINavHistoryContainerResultNode);
   queryNode2.containerOpen = true;
   do_check_eq(queryNode2.childCount, 0);
+  queryNode.containerOpen = false;
+
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/bookmarks/test_savedsearches.js b/toolkit/components/places/tests/bookmarks/test_savedsearches.js
index 9f88bc807290..58a990293647 100644
--- a/toolkit/components/places/tests/bookmarks/test_savedsearches.js
+++ b/toolkit/components/places/tests/bookmarks/test_savedsearches.js
@@ -110,6 +110,7 @@ function run_test() {
       node.QueryInterface(Ci.nsINavHistoryContainerResultNode);
       do_check_eq(node.containerOpen, false);
     }
+    rootNode.containerOpen = false;
   }
   catch(ex) {
     do_throw("expandQueries=0 query error: " + ex);
@@ -162,6 +163,7 @@ function run_test() {
                            bmsvc.DEFAULT_INDEX, searchTerm + "blah");
       do_check_eq(node.childCount, 1);
     }
+    rootNode.containerOpen = false;
   }
   catch(ex) {
     do_throw("expandQueries=1 bookmarks query: " + ex);
@@ -222,6 +224,7 @@ function run_test() {
       // test live-update of query results - delete a history visit that matches the query
       bhist.removePage(uri("http://foo.com"));
       do_check_eq(node.childCount, 1);
+      node.containerOpen = false;
     }
 
     // test live-update of moved queries
@@ -243,6 +246,9 @@ function run_test() {
       var tmpFolderNode = root.getChild(1);
       do_throw("query was not removed");
     } catch(ex) {}
+
+    tmpFolderNode.containerOpen = false;
+    rootNode.containerOpen = false;
   }
   catch(ex) {
     do_throw("expandQueries=1 bookmarks query: " + ex);
diff --git a/toolkit/components/places/tests/chrome/test_329534.xul b/toolkit/components/places/tests/chrome/test_329534.xul
index 5a8198ded21f..0982cdb3ab92 100644
--- a/toolkit/components/places/tests/chrome/test_329534.xul
+++ b/toolkit/components/places/tests/chrome/test_329534.xul
@@ -121,6 +121,7 @@ function runTest1( folderId ) {
     var node = rootNode.getChild( 0 );
     ok( node.uri == firstURL,
         "first livemark item is invalid value "+node.uri);
+    rootNode.containerOpen = false;
 
     /* second folder has no item */
     options = histsvc.getNewQueryOptions();
@@ -131,6 +132,7 @@ function runTest1( folderId ) {
     rootNode.containerOpen = true;
     cc = rootNode.childCount;
     ok( cc == 0, "second livemark is not empty" );
+    rootNode.containerOpen = false;
   }
 }
 
@@ -152,6 +154,7 @@ function runTest2( folderId ) {
     var node = rootNode.getChild( 0 );
     ok( node.uri == secondURL,
         "second livemark item is invalid value "+node.uri);
+    rootNode.containerOpen = false;
 
     /* Check passed 2sec.
        We should check for 3s but are relaxing request to accomplish possible
diff --git a/toolkit/components/places/tests/queries/head_queries.js b/toolkit/components/places/tests/queries/head_queries.js
index 5d85ffad10de..946138c7a933 100644
--- a/toolkit/components/places/tests/queries/head_queries.js
+++ b/toolkit/components/places/tests/queries/head_queries.js
@@ -389,7 +389,8 @@ function compareArrayToResult(aArray, aRoot) {
 function isInResult(aQueryData, aRoot) {
   var rv = false;
   var uri;
-  if (!aRoot.containerOpen)
+  var wasOpen = aRoot.containerOpen;
+  if (!wasOpen)
     aRoot.containerOpen = true;
 
   // If we have an array, pluck out the first item. If an object, pluc out the
@@ -406,6 +407,8 @@ function isInResult(aQueryData, aRoot) {
       break;
     }
   }
+  if (!wasOpen)
+    aRoot.containerOpen = false;
   return rv;
 }
 
@@ -416,7 +419,8 @@ function isInResult(aQueryData, aRoot) {
  */
 function displayResultSet(aRoot) {
 
-  if (!aRoot.containerOpen)
+  var wasOpen = aRoot.containerOpen;
+  if (!wasOpen)
     aRoot.containerOpen = true;
 
   if (!aRoot.hasChildren) {
@@ -429,4 +433,6 @@ function displayResultSet(aRoot) {
     LOG("Result Set URI: " + aRoot.getChild(i).uri + "   Title: " +
         aRoot.getChild(i).title + "   Visit Time: " + aRoot.getChild(i).time);
   }
+  if (!wasOpen)
+    aRoot.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/queries/test_excludeReadOnlyFolders.js b/toolkit/components/places/tests/queries/test_excludeReadOnlyFolders.js
index f6baba717c24..7e558389891e 100644
--- a/toolkit/components/places/tests/queries/test_excludeReadOnlyFolders.js
+++ b/toolkit/components/places/tests/queries/test_excludeReadOnlyFolders.js
@@ -65,6 +65,8 @@ function run_test() {
   // Results
   var result = PlacesUtils.history.executeQuery(query, options);
   var root = result.root;
+  root.containerOpen = true;
+
   displayResultSet(root);
   // The readonly folder should not be in our result set.
   do_check_eq(1, root.childCount);
diff --git a/toolkit/components/places/tests/queries/test_results-as-visit.js b/toolkit/components/places/tests/queries/test_results-as-visit.js
index ab61ebfbf2ca..7fce7d23ef88 100644
--- a/toolkit/components/places/tests/queries/test_results-as-visit.js
+++ b/toolkit/components/places/tests/queries/test_results-as-visit.js
@@ -139,4 +139,6 @@ function createTestData() {
                     title: "mo,z" }];
    populateDB(change4);
    do_check_false(isInResult(change4, root));
+
+   root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/queries/test_searchterms-domain.js b/toolkit/components/places/tests/queries/test_searchterms-domain.js
index 413d6a67d48d..9aec4ff521b2 100644
--- a/toolkit/components/places/tests/queries/test_searchterms-domain.js
+++ b/toolkit/components/places/tests/queries/test_searchterms-domain.js
@@ -151,4 +151,6 @@ function run_test() {
                   title: "mo,z"}];
   populateDB(change4);
   do_check_false(isInResult(change4, root));
+
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/queries/test_searchterms-uri.js b/toolkit/components/places/tests/queries/test_searchterms-uri.js
index 90368a379e82..b020968581fe 100644
--- a/toolkit/components/places/tests/queries/test_searchterms-uri.js
+++ b/toolkit/components/places/tests/queries/test_searchterms-uri.js
@@ -148,4 +148,6 @@
                    title: "mo,z"}];
    populateDB(change4);
    do_check_false(isInResult(change4, root));
+
+   root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_331487.js b/toolkit/components/places/tests/unit/test_331487.js
index 1d008a44e454..65ed9338a727 100644
--- a/toolkit/components/places/tests/unit/test_331487.js
+++ b/toolkit/components/places/tests/unit/test_331487.js
@@ -102,6 +102,10 @@ function run_test() {
   do_check_eq(sf2Node.childCount, 1);
   do_check_eq(sf2Node.getChild(0).itemId, b3);
 
+  sf2Node.containerOpen = false;
+  sf1Node.containerOpen = false;
+  root.containerOpen = false;
+
   // bookmark query that should result in a flat list
   // because we specified max results
   var options = histsvc.getNewQueryOptions();
@@ -116,6 +120,7 @@ function run_test() {
   do_check_eq(root.getChild(0).itemId, b1);
   do_check_eq(root.getChild(1).itemId, b2);
   do_check_eq(root.getChild(2).itemId, b3);
+  root.containerOpen = false;
 
   // XXX TODO
   // test that if we have: more than one query, 
diff --git a/toolkit/components/places/tests/unit/test_415460.js b/toolkit/components/places/tests/unit/test_415460.js
index 75c0fd84d081..bdeaabc0c81c 100644
--- a/toolkit/components/places/tests/unit/test_415460.js
+++ b/toolkit/components/places/tests/unit/test_415460.js
@@ -57,7 +57,9 @@ function search_has_result(aTerms)
   var result = hs.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
-  return (root.childCount == 1);
+  var cc = root.childCount;
+  root.containerOpen = false;
+  return (cc == 1);
 }
 
 function run_test()
diff --git a/toolkit/components/places/tests/unit/test_415757.js b/toolkit/components/places/tests/unit/test_415757.js
index 5f5757a4983f..4a152d94bbaa 100644
--- a/toolkit/components/places/tests/unit/test_415757.js
+++ b/toolkit/components/places/tests/unit/test_415757.js
@@ -76,7 +76,9 @@ function uri_in_db(aURI) {
   var result = histsvc.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
-  return (root.childCount == 1);
+  var cc = root.childCount;
+  root.containerOpen = false;
+  return (cc == 1);
 }
 
 const TOTAL_SITES = 20;
diff --git a/toolkit/components/places/tests/unit/test_419731.js b/toolkit/components/places/tests/unit/test_419731.js
index 2c7bfa5ee168..41e5d0b99574 100644
--- a/toolkit/components/places/tests/unit/test_419731.js
+++ b/toolkit/components/places/tests/unit/test_419731.js
@@ -119,6 +119,7 @@ function run_test() {
   do_check_eq(theTag.childCount, 1);
   var node = theTag.getChild(0);
   do_check_eq(node.title, "new title 1");
+  theTag.containerOpen = false;
   root.containerOpen = false;
 
   // Change bookmark 2 title.
diff --git a/toolkit/components/places/tests/unit/test_429505_remove_shortcuts.js b/toolkit/components/places/tests/unit/test_429505_remove_shortcuts.js
index 5709e9b3559e..8b443516b5d5 100644
--- a/toolkit/components/places/tests/unit/test_429505_remove_shortcuts.js
+++ b/toolkit/components/places/tests/unit/test_429505_remove_shortcuts.js
@@ -63,4 +63,6 @@ function run_test() {
     PlacesUtils.bookmarks.removeItem(queryId);
 
     do_check_eq(root.childCount, oldCount-1);
+
+    root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_433317_query_title_update.js b/toolkit/components/places/tests/unit/test_433317_query_title_update.js
index 877262e95399..0cc5d6e2ed0f 100644
--- a/toolkit/components/places/tests/unit/test_433317_query_title_update.js
+++ b/toolkit/components/places/tests/unit/test_433317_query_title_update.js
@@ -65,4 +65,6 @@ function run_test() {
 
   // confirm the node was updated
   do_check_eq(queryNode.title, "foo");
+
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_433525_hasChildren_crash.js b/toolkit/components/places/tests/unit/test_433525_hasChildren_crash.js
index efee610b46d8..c879f9a7aa3d 100644
--- a/toolkit/components/places/tests/unit/test_433525_hasChildren_crash.js
+++ b/toolkit/components/places/tests/unit/test_433525_hasChildren_crash.js
@@ -80,4 +80,5 @@ function run_test() {
   do_check_eq(queryNode.title, "test query");
   queryNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
   do_check_eq(queryNode.hasChildren, true);
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_browserhistory.js b/toolkit/components/places/tests/unit/test_browserhistory.js
index 1aa84fbed32c..a7f978b1ea7f 100644
--- a/toolkit/components/places/tests/unit/test_browserhistory.js
+++ b/toolkit/components/places/tests/unit/test_browserhistory.js
@@ -87,7 +87,9 @@ function uri_in_db(aURI) {
   var result = histsvc.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
-  return (root.childCount == 1);
+  var cc = root.childCount;
+  root.containerOpen = false;
+  return (cc == 1);
 }
 
 // main
diff --git a/toolkit/components/places/tests/unit/test_dynamic_containers.js b/toolkit/components/places/tests/unit/test_dynamic_containers.js
index 146af727217d..82b53c8d3ef8 100644
--- a/toolkit/components/places/tests/unit/test_dynamic_containers.js
+++ b/toolkit/components/places/tests/unit/test_dynamic_containers.js
@@ -89,6 +89,9 @@ function run_test() {
   bmsvc.insertBookmark(exposedFolder, uri("http://uri2.tld"), bmsvc.DEFAULT_INDEX, "");
   do_check_eq(folder.childCount, 2);
 
+  folder.containerOpen = false;
+  rootNode.containerOpen = false;
+
   // Bug 457681
   // Make the dynamic container read-only and check that it appear in the result
   bmsvc.setFolderReadonly(remoteContainer, true);
diff --git a/toolkit/components/places/tests/unit/test_exclude_livemarks.js b/toolkit/components/places/tests/unit/test_exclude_livemarks.js
index 09bfacc6a979..6efc66016ad3 100644
--- a/toolkit/components/places/tests/unit/test_exclude_livemarks.js
+++ b/toolkit/components/places/tests/unit/test_exclude_livemarks.js
@@ -95,6 +95,7 @@ function run_test() {
   do_check_eq(node.itemId, livemarkItem);
   node = rootNode.getChild(1);
   do_check_eq(node.itemId, nonLivemarkItem);
+  rootNode.containerOpen = false;
 
   // exclude livemark items, search for "item", should get one result
   options = histsvc.getNewQueryOptions();
@@ -109,4 +110,5 @@ function run_test() {
   do_check_eq(cc, 1);
   var node = rootNode.getChild(0);
   do_check_eq(node.itemId, nonLivemarkItem);
+  rootNode.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_history.js b/toolkit/components/places/tests/unit/test_history.js
index 11b1eab9366d..b6b3e5f17a5c 100644
--- a/toolkit/components/places/tests/unit/test_history.js
+++ b/toolkit/components/places/tests/unit/test_history.js
@@ -82,7 +82,9 @@ function uri_in_db(aURI) {
   var result = histsvc.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
-  return (root.childCount == 1);
+  var cc = root.childCount;
+  root.containerOpen = false;
+  return (cc == 1);
 }
 
 // main
@@ -130,18 +132,22 @@ function run_test() {
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 2);
+  result.root.containerOpen = false;
   query.minVisits = 1;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 2);
+  result.root.containerOpen = false;
   query.minVisits = 2;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 1);
   query.minVisits = 3;
+  result.root.containerOpen = false;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 0);
+  result.root.containerOpen = false;
 
   // test maxVisits
   query.minVisits = -1;
@@ -149,22 +155,27 @@ function run_test() {
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 2);
+  result.root.containerOpen = false;
   query.maxVisits = 0;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 0);
+  result.root.containerOpen = false;
   query.maxVisits = 1;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 1);
+  result.root.containerOpen = false;
   query.maxVisits = 2;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 2);
+  result.root.containerOpen = false;
   query.maxVisits = 3;
   result = histsvc.executeQuery(query, options);
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 2);
+  result.root.containerOpen = false;
   
   // test annotation-based queries
   var annos = Cc["@mozilla.org/browser/annotation-service;1"].
@@ -176,6 +187,7 @@ function run_test() {
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 1);
   do_check_eq(result.root.getChild(0).uri, "http://mozilla.com/");
+  result.root.containerOpen = false;
 
   // test annotationIsNot
   query.annotationIsNot = true;
@@ -183,6 +195,7 @@ function run_test() {
   result.root.containerOpen = true;
   do_check_eq(result.root.childCount, 1);
   do_check_eq(result.root.getChild(0).uri, "http://google.com/");
+  result.root.containerOpen = false;
 
   // By default history is enabled.
   do_check_true(!histsvc.historyDisabled);
@@ -218,6 +231,7 @@ function run_test() {
   var root = result.root;
   root.containerOpen = true;
   do_check_true(root.childCount > 0);
+  root.containerOpen = false;
 
   // bug 400544 - testing that a referrer that is not in the DB gets added
   var referrerURI = uri("http://yahoo.com");
diff --git a/toolkit/components/places/tests/unit/test_history_import.js b/toolkit/components/places/tests/unit/test_history_import.js
index 338779dfca8c..eae114a0c693 100644
--- a/toolkit/components/places/tests/unit/test_history_import.js
+++ b/toolkit/components/places/tests/unit/test_history_import.js
@@ -56,7 +56,9 @@ function uri_in_db(aURI) {
   var result = hs.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
-  return (root.childCount == 1);
+  var cc = root.childCount;
+  root.containerOpen = false;
+  return (cc == 1);
 }
 
 // main
diff --git a/toolkit/components/places/tests/unit/test_multi_word_tags.js b/toolkit/components/places/tests/unit/test_multi_word_tags.js
index 777f0bbd8154..3d37bfaf544c 100644
--- a/toolkit/components/places/tests/unit/test_multi_word_tags.js
+++ b/toolkit/components/places/tests/unit/test_multi_word_tags.js
@@ -99,6 +99,7 @@ function run_test() {
   do_check_eq(root.getChild(0).uri, "http://site.tld/1");
   do_check_eq(root.getChild(1).uri, "http://site.tld/4");
   do_check_eq(root.getChild(2).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "bar";
   result = histsvc.executeQuery(query, options);
@@ -109,6 +110,7 @@ function run_test() {
   do_check_eq(root.getChild(1).uri, "http://site.tld/4");
   do_check_eq(root.getChild(2).uri, "http://site.tld/5");
   do_check_eq(root.getChild(3).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "cheese";
   result = histsvc.executeQuery(query, options);
@@ -118,6 +120,7 @@ function run_test() {
   do_check_eq(root.getChild(0).uri, "http://site.tld/3");
   do_check_eq(root.getChild(1).uri, "http://site.tld/5");
   do_check_eq(root.getChild(2).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "foo bar";
   result = histsvc.executeQuery(query, options);
@@ -126,6 +129,7 @@ function run_test() {
   do_check_eq(root.childCount, 2);
   do_check_eq(root.getChild(0).uri, "http://site.tld/4");
   do_check_eq(root.getChild(1).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "bar foo";
   result = histsvc.executeQuery(query, options);
@@ -134,6 +138,7 @@ function run_test() {
   do_check_eq(root.childCount, 2);
   do_check_eq(root.getChild(0).uri, "http://site.tld/4");
   do_check_eq(root.getChild(1).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "bar cheese";
   result = histsvc.executeQuery(query, options);
@@ -142,6 +147,7 @@ function run_test() {
   do_check_eq(root.childCount, 2);
   do_check_eq(root.getChild(0).uri, "http://site.tld/5");
   do_check_eq(root.getChild(1).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "cheese bar";
   result = histsvc.executeQuery(query, options);
@@ -150,6 +156,7 @@ function run_test() {
   do_check_eq(root.childCount, 2);
   do_check_eq(root.getChild(0).uri, "http://site.tld/5");
   do_check_eq(root.getChild(1).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "foo bar cheese";
   result = histsvc.executeQuery(query, options);
@@ -157,6 +164,7 @@ function run_test() {
   root.containerOpen = true;
   do_check_eq(root.childCount, 1);
   do_check_eq(root.getChild(0).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "cheese foo bar";
   result = histsvc.executeQuery(query, options);
@@ -164,6 +172,7 @@ function run_test() {
   root.containerOpen = true;
   do_check_eq(root.childCount, 1);
   do_check_eq(root.getChild(0).uri, "http://site.tld/6");
+  root.containerOpen = false;
 
   query.searchTerms = "cheese bar foo";
   result = histsvc.executeQuery(query, options);
@@ -171,4 +180,5 @@ function run_test() {
   root.containerOpen = true;
   do_check_eq(root.childCount, 1);
   do_check_eq(root.getChild(0).uri, "http://site.tld/6");
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js b/toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js
index cf8dce597d7d..83cdb32f612f 100644
--- a/toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js
+++ b/toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js
@@ -93,4 +93,5 @@ function run_test() {
   // so they are reversed
   do_check_eq(root.getChild(0).title, "bar title");
   do_check_eq(root.getChild(1).title, "foo title");
+  root.containerOpen = false;
 }
diff --git a/toolkit/components/places/tests/unit/test_result_sort.js b/toolkit/components/places/tests/unit/test_result_sort.js
index dc3d3db1cbcf..9c44d49afa30 100644
--- a/toolkit/components/places/tests/unit/test_result_sort.js
+++ b/toolkit/components/places/tests/unit/test_result_sort.js
@@ -159,6 +159,7 @@ function run_test() {
     result.sortingMode = NHQO.SORT_BY_FRECENCY_ASCENDING;
     checkOrder(id1, id3, id2);
 
+    root.containerOpen = false;
     do_test_finished();
   });
 }

From 5e31014564aa833bd6a124f9fa506f6d678aa2e6 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 17:10:50 -0700
Subject: [PATCH 401/509] Bug 652050 diagnostic 2 followup: use printf_stderr
 since android doesn't have printf. rs=dougt

---
 content/svg/content/src/nsSVGFeatures.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp
index 742e8b65498f..7adb232c7812 100644
--- a/content/svg/content/src/nsSVGFeatures.cpp
+++ b/content/svg/content/src/nsSVGFeatures.cpp
@@ -223,11 +223,16 @@ nsSVGFeatures::PassesConditionalProcessingTests(nsIContent *aContent,
 
     // Get our language preferences
     if (!acceptLangs.IsEmpty()) {
-      printf("Bug 652050 diagnostic: intl.accept_languages is nonempty.\n");
+      // XXXdholbert Temporary diagnostic to verify a theory in Bug 652050
+#ifdef ANDROID
+      printf_stderr("Bug 652050 diagnostic: intl.accept_languages is nonempty.\n");
+#endif
       return MatchesLanguagePreferences(value, acceptLangs);
     } else {
       // For now, evaluate to true.
-      printf("Bug 652050 diagnostic: intl.accept_languages is EMPTY!\n");
+#ifdef ANDROID
+      printf_stderr("Bug 652050 diagnostic: intl.accept_languages is EMPTY!\n");
+#endif
       NS_WARNING("no default language specified for systemLanguage conditional test");
       return !value.IsEmpty();
     }

From 341643b41d1f5e652268691498809b90dc9f8222 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 18:28:11 -0700
Subject: [PATCH 402/509] Bug 652050: revert diagnostic 2 (remove temporary
 debugging printfs)

---
 content/svg/content/src/nsSVGFeatures.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp
index 7adb232c7812..4a2b5d2b2769 100644
--- a/content/svg/content/src/nsSVGFeatures.cpp
+++ b/content/svg/content/src/nsSVGFeatures.cpp
@@ -223,16 +223,9 @@ nsSVGFeatures::PassesConditionalProcessingTests(nsIContent *aContent,
 
     // Get our language preferences
     if (!acceptLangs.IsEmpty()) {
-      // XXXdholbert Temporary diagnostic to verify a theory in Bug 652050
-#ifdef ANDROID
-      printf_stderr("Bug 652050 diagnostic: intl.accept_languages is nonempty.\n");
-#endif
       return MatchesLanguagePreferences(value, acceptLangs);
     } else {
       // For now, evaluate to true.
-#ifdef ANDROID
-      printf_stderr("Bug 652050 diagnostic: intl.accept_languages is EMPTY!\n");
-#endif
       NS_WARNING("no default language specified for systemLanguage conditional test");
       return !value.IsEmpty();
     }

From c4368f8055bcd346681db9b3036b736c518ed54e Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 22 Apr 2011 18:28:26 -0700
Subject: [PATCH 403/509] Bug 652050: Mark SVG language-detection tests as
 failing on android for now

---
 layout/reftests/svg/reftest.list | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 9e0b77fde0a8..d3d266ff8d7f 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -33,7 +33,7 @@ include svg-integration/reftest.list
 == clipPath-basic-05.svg pass.svg
 == clipPath-winding-01.svg pass.svg
 == clip-surface-clone-01.svg clip-surface-clone-01-ref.svg
-== conditions-01.svg pass.svg
+fails-if(Android) == conditions-01.svg pass.svg # bug 652050
 == conditions-02.svg pass.svg
 == conditions-03.svg pass.svg
 == conditions-04.svg pass.svg
@@ -45,7 +45,7 @@ include svg-integration/reftest.list
 == dynamic-attr-removal-2.svg pass.svg
 == dynamic-attr-change-1.svg pass.svg
 == dynamic-class-01.svg pass.svg
-== dynamic-conditions-01.svg pass.svg
+fails-if(Android) == dynamic-conditions-01.svg pass.svg # bug 652050
 == dynamic-conditions-02.svg about:blank
 == dynamic-conditions-03.svg pass.svg
 == dynamic-conditions-04.svg about:blank
@@ -81,7 +81,7 @@ include svg-integration/reftest.list
 == dynamic-reflow-01.svg dynamic-reflow-01-ref.svg
 == dynamic-small-object-scaled-up-01.svg pass.svg
 == dynamic-small-object-scaled-up-02.svg pass.svg
-== dynamic-switch-01.svg pass.svg
+fails-if(Android) == dynamic-switch-01.svg pass.svg # bug 652050
 == dynamic-text-01.svg dynamic-text-01-ref.svg
 == dynamic-text-02.svg dynamic-text-02-ref.svg
 == dynamic-text-03.svg dynamic-text-03-ref.svg
@@ -180,7 +180,7 @@ random-if(gtk2Widget) == objectBoundingBox-and-fePointLight-01.svg objectBoundin
 == svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml
 == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml
 random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713
-== switch-01.svg pass.svg
+fails-if(Android) == switch-01.svg pass.svg # bug 652050
 asserts(3) == symbol-01.svg symbol-01-ref.svg # see bug 563481
 == text-gradient-01.svg text-gradient-01-ref.svg
 random-if(winWidget) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101

From 9536083ea68de4980144bc54d75f8b5d95456863 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:23 -0700
Subject: [PATCH 404/509] Use saner index names in nsAnimationManager.  (Bug
 649400)  r=bzbarsky

---
 layout/style/nsAnimationManager.cpp | 40 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index a7f30a7a7561..98b6e5b3b5f7 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -186,8 +186,8 @@ ElementAnimations::EnsureStyleRuleFor(TimeStamp aRefreshTime,
     // Therefore, we iterate from last animation to first.
     nsCSSPropertySet properties;
 
-    for (PRUint32 i = mAnimations.Length(); i-- != 0; ) {
-      ElementAnimation &anim = mAnimations[i];
+    for (PRUint32 animIdx = mAnimations.Length(); animIdx-- != 0; ) {
+      ElementAnimation &anim = mAnimations[animIdx];
 
       if (anim.mSegments.Length() == 0 ||
           anim.mIterationDuration.ToMilliseconds() <= 0.0) {
@@ -314,9 +314,9 @@ ElementAnimations::EnsureStyleRuleFor(TimeStamp aRefreshTime,
       double valuePosition =
         segment->mTimingFunction.GetValue(positionInSegment);
 
-      for (PRUint32 j = 0, j_end = segment->mProperties.Length();
-           j != j_end; ++j) {
-        const AnimationSegmentProperty &prop = segment->mProperties[j];
+      for (PRUint32 propIdx = 0, propEnd = segment->mProperties.Length();
+           propIdx != propEnd; ++propIdx) {
+        const AnimationSegmentProperty &prop = segment->mProperties[propIdx];
         if (properties.HasProperty(prop.mProperty)) {
           // A later animation already set this property.
           continue;
@@ -476,9 +476,9 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
       // (or potentially optimize BuildAnimations to avoid rebuilding it
       // in the first place).
       if (!ea->mAnimations.IsEmpty()) {
-        for (PRUint32 i = 0, i_end = newAnimations.Length();
-             i != i_end; ++i) {
-          ElementAnimation *newAnim = &newAnimations[i];
+        for (PRUint32 newIdx = 0, newEnd = newAnimations.Length();
+             newIdx != newEnd; ++newIdx) {
+          ElementAnimation *newAnim = &newAnimations[newIdx];
 
           // Find the matching animation with this name in the old list
           // of animations.  Because of this code, they must all have
@@ -489,8 +489,8 @@ nsAnimationManager::CheckAnimationRule(nsStyleContext* aStyleContext,
           // We'll use the last one since it's more likely to be the one
           // doing something.
           const ElementAnimation *oldAnim = nsnull;
-          for (PRUint32 j = ea->mAnimations.Length(); j-- != 0; ) {
-            const ElementAnimation *a = &ea->mAnimations[j];
+          for (PRUint32 oldIdx = ea->mAnimations.Length(); oldIdx-- != 0; ) {
+            const ElementAnimation *a = &ea->mAnimations[oldIdx];
             if (a->mName == newAnim->mName) {
               oldAnim = a;
               break;
@@ -633,8 +633,9 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
 
   const nsStyleDisplay *disp = aStyleContext->GetStyleDisplay();
   TimeStamp now = mPresContext->RefreshDriver()->MostRecentRefresh();
-  for (PRUint32 i = 0, i_end = disp->mAnimations.Length(); i != i_end; ++i) {
-    const nsAnimation& aSrc = disp->mAnimations[i];
+  for (PRUint32 animIdx = 0, animEnd = disp->mAnimations.Length();
+       animIdx != animEnd; ++animIdx) {
+    const nsAnimation& aSrc = disp->mAnimations[animIdx];
     ElementAnimation& aDest = *aAnimations.AppendElement();
 
     aDest.mName = aSrc.GetName();
@@ -663,16 +664,18 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
     // earlier ones (no cascading).
     nsDataHashtable<PercentageHashKey, nsCSSKeyframeRule*> keyframes;
     keyframes.Init(16); // FIXME: make infallible!
-    for (PRUint32 j = 0, j_end = rule->StyleRuleCount(); j != j_end; ++j) {
-      nsICSSRule* cssRule = rule->GetStyleRuleAt(j);
+    for (PRUint32 ruleIdx = 0, ruleEnd = rule->StyleRuleCount();
+         ruleIdx != ruleEnd; ++ruleIdx) {
+      nsICSSRule* cssRule = rule->GetStyleRuleAt(ruleIdx);
       NS_ABORT_IF_FALSE(cssRule, "must have rule");
       NS_ABORT_IF_FALSE(cssRule->GetType() == nsICSSRule::KEYFRAME_RULE,
                         "must be keyframe rule");
       nsCSSKeyframeRule *kfRule = static_cast<nsCSSKeyframeRule*>(cssRule);
 
       const nsTArray<float> &keys = kfRule->GetKeys();
-      for (PRUint32 k = 0, k_end = keys.Length(); k != k_end; ++k) {
-        float key = keys[k];
+      for (PRUint32 keyIdx = 0, keyEnd = keys.Length();
+           keyIdx != keyEnd; ++keyIdx) {
+        float key = keys[keyIdx];
         // FIXME (spec):  The spec doesn't say what to do with
         // out-of-range keyframes.  We'll ignore them.
         // (And PercentageHashKey currently assumes we either ignore or
@@ -705,8 +708,9 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
                      fromKeyframe.mRule->Declaration());
     }
 
-    for (PRUint32 j = 1, j_end = sortedKeyframes.Length(); j != j_end; ++j) {
-      KeyframeData toKeyframe = sortedKeyframes[j];
+    for (PRUint32 kfIdx = 1, kfEnd = sortedKeyframes.Length();
+         kfIdx != kfEnd; ++kfIdx) {
+      KeyframeData toKeyframe = sortedKeyframes[kfIdx];
       nsRefPtr<nsStyleContext> toContext =
         resolvedStyles.Get(mPresContext, aStyleContext, toKeyframe.mRule);
 

From 4e3e6d88136c63e68d33eea26bd58b4e296e79cd Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:23 -0700
Subject: [PATCH 405/509] Fix css3-animations handling of properties that are
 not present in all keyframes to match WebKit and generally be more sensible. 
 (Bug 649400)  r=bzbarsky

This inverts the relationship between segments and properties in the
animation data structures:  now each property has a set of segments,
since the segments differ between properties.

Furthermore, we now handle inability to interpolate between values by
dropping the entire property rather than dropping a single segment.
---
 layout/style/Declaration.h             |   2 +
 layout/style/nsAnimationManager.cpp    | 258 ++++++++++++++-----------
 layout/style/nsAnimationManager.h      |   9 +-
 layout/style/test/test_animations.html |  67 +++++++
 4 files changed, 217 insertions(+), 119 deletions(-)

diff --git a/layout/style/Declaration.h b/layout/style/Declaration.h
index 220a4e849e9a..3a42dd7d2a12 100644
--- a/layout/style/Declaration.h
+++ b/layout/style/Declaration.h
@@ -251,10 +251,12 @@ private:
                                       nsAutoString& aValue,
                                       nsAString& aResult) const;
 
+public:
   nsCSSProperty OrderValueAt(PRUint32 aValue) const {
     return nsCSSProperty(mOrder.ElementAt(aValue));
   }
 
+private:
   nsAutoTArray<PRUint8, 8> mOrder;
 
   // never null, except while expanded, or before the first call to
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index 98b6e5b3b5f7..e90a8fad71d8 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -47,17 +47,17 @@
 
 using namespace mozilla;
 
-struct AnimationSegmentProperty
-{
-  nsCSSProperty mProperty;
-  nsStyleAnimation::Value mFromValue, mToValue;
-};
-
-struct AnimationSegment
+struct AnimationPropertySegment
 {
   float mFromKey, mToKey;
+  nsStyleAnimation::Value mFromValue, mToValue;
   css::ComputedTimingFunction mTimingFunction;
-  InfallibleTArray<AnimationSegmentProperty> mProperties;
+};
+
+struct AnimationProperty
+{
+  nsCSSProperty mProperty;
+  InfallibleTArray<AnimationPropertySegment> mSegments;
 };
 
 /**
@@ -102,7 +102,7 @@ struct ElementAnimation
   // whose start we last notified on.
   PRUint32 mLastNotification;
 
-  InfallibleTArray<AnimationSegment> mSegments;
+  InfallibleTArray<AnimationProperty> mProperties;
 };
 
 typedef nsAnimationManager::EventArray EventArray;
@@ -181,15 +181,14 @@ ElementAnimations::EnsureStyleRuleFor(TimeStamp aRefreshTime,
     mStyleRule = nsnull;
 
     // FIXME(spec): assume that properties in higher animations override
-    // those in lower ones (and that our |HasProperty| check in
-    // |BuildSegment| matches the definition of when they should do so.
+    // those in lower ones.
     // Therefore, we iterate from last animation to first.
     nsCSSPropertySet properties;
 
     for (PRUint32 animIdx = mAnimations.Length(); animIdx-- != 0; ) {
       ElementAnimation &anim = mAnimations[animIdx];
 
-      if (anim.mSegments.Length() == 0 ||
+      if (anim.mProperties.Length() == 0 ||
           anim.mIterationDuration.ToMilliseconds() <= 0.0) {
         // No animation data.
         continue;
@@ -278,51 +277,52 @@ ElementAnimations::EnsureStyleRuleFor(TimeStamp aRefreshTime,
                           positionInIteration <= 1.0,
                         "position should be in [0-1]");
 
-      NS_ABORT_IF_FALSE(anim.mSegments[0].mFromKey == 0.0,
-                        "incorrect first from key");
-      NS_ABORT_IF_FALSE(anim.mSegments[anim.mSegments.Length() - 1].mToKey
-                          == 1.0,
-                        "incorrect last to key");
+      for (PRUint32 propIdx = 0, propEnd = anim.mProperties.Length();
+           propIdx != propEnd; ++propIdx)
+      {
+        const AnimationProperty &prop = anim.mProperties[propIdx];
 
-      // FIXME: Maybe cache the current segment?
-      const AnimationSegment *segment = anim.mSegments.Elements();
-      while (segment->mToKey < positionInIteration) {
-        NS_ABORT_IF_FALSE(segment->mFromKey < segment->mToKey,
-                          "incorrect keys");
-        ++segment;
-        NS_ABORT_IF_FALSE(segment->mFromKey == (segment-1)->mToKey,
-                          "incorrect keys");
-      }
-      NS_ABORT_IF_FALSE(segment->mFromKey < segment->mToKey,
-                        "incorrect keys");
-      NS_ABORT_IF_FALSE(segment - anim.mSegments.Elements() <
-                          anim.mSegments.Length(),
-                        "ran off end");
+        NS_ABORT_IF_FALSE(prop.mSegments[0].mFromKey == 0.0,
+                          "incorrect first from key");
+        NS_ABORT_IF_FALSE(prop.mSegments[prop.mSegments.Length() - 1].mToKey
+                            == 1.0,
+                          "incorrect last to key");
 
-      if (segment->mProperties.IsEmpty()) {
-        // No animation data.
-        continue;
-      }
-
-      if (!mStyleRule) {
-        // Allocate the style rule now that we know we have animation data.
-        mStyleRule = new css::AnimValuesStyleRule();
-      }
-
-      double positionInSegment = (positionInIteration - segment->mFromKey) /
-                                 (segment->mToKey - segment->mFromKey);
-      double valuePosition =
-        segment->mTimingFunction.GetValue(positionInSegment);
-
-      for (PRUint32 propIdx = 0, propEnd = segment->mProperties.Length();
-           propIdx != propEnd; ++propIdx) {
-        const AnimationSegmentProperty &prop = segment->mProperties[propIdx];
         if (properties.HasProperty(prop.mProperty)) {
           // A later animation already set this property.
           continue;
         }
         properties.AddProperty(prop.mProperty);
 
+        NS_ABORT_IF_FALSE(prop.mSegments.Length() > 0,
+                          "property should not be in animations if it "
+                          "has no segments");
+
+        // FIXME: Maybe cache the current segment?
+        const AnimationPropertySegment *segment = prop.mSegments.Elements();
+        while (segment->mToKey < positionInIteration) {
+          NS_ABORT_IF_FALSE(segment->mFromKey < segment->mToKey,
+                            "incorrect keys");
+          ++segment;
+          NS_ABORT_IF_FALSE(segment->mFromKey == (segment-1)->mToKey,
+                            "incorrect keys");
+        }
+        NS_ABORT_IF_FALSE(segment->mFromKey < segment->mToKey,
+                          "incorrect keys");
+        NS_ABORT_IF_FALSE(segment - prop.mSegments.Elements() <
+                            prop.mSegments.Length(),
+                          "ran off end");
+
+        if (!mStyleRule) {
+          // Allocate the style rule now that we know we have animation data.
+          mStyleRule = new css::AnimValuesStyleRule();
+        }
+
+        double positionInSegment = (positionInIteration - segment->mFromKey) /
+                                   (segment->mToKey - segment->mFromKey);
+        double valuePosition =
+          segment->mTimingFunction.GetValue(positionInSegment);
+
         nsStyleAnimation::Value *val =
           mStyleRule->AddEmptyValue(prop.mProperty);
 
@@ -330,7 +330,7 @@ ElementAnimations::EnsureStyleRuleFor(TimeStamp aRefreshTime,
         PRBool result =
 #endif
           nsStyleAnimation::Interpolate(prop.mProperty,
-                                        prop.mFromValue, prop.mToValue,
+                                        segment->mFromValue, segment->mToValue,
                                         valuePosition, *val);
         NS_ABORT_IF_FALSE(result, "interpolate must succeed now");
       }
@@ -610,7 +610,7 @@ ResolvedStyleCache::Get(nsPresContext *aPresContext,
   // whether they are resolved relative to other animations:  I assume
   // that they're not, since that would prevent us from caching a lot of
   // data that we'd really like to cache (in particular, the
-  // nsStyleAnimation::Value values in AnimationSegmentProperty).
+  // nsStyleAnimation::Value values in AnimationPropertySegment).
   nsStyleContext *result = mCache.GetWeak(aKeyframe);
   if (!result) {
     nsCOMArray<nsIStyleRule> rules;
@@ -695,55 +695,111 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
       continue;
     }
 
-    KeyframeData fromKeyframe = sortedKeyframes[0];
-    nsRefPtr<nsStyleContext> fromContext =
-      resolvedStyles.Get(mPresContext, aStyleContext,
-                         fromKeyframe.mRule);
+    // Record the properties that are present in any keyframe rules we
+    // are using.
+    nsCSSPropertySet properties;
 
-    // If there's no rule for 0%, there's implicitly an empty rule.
-    if (fromKeyframe.mKey != 0.0f) {
-      BuildSegment(aDest.mSegments, aSrc,
-                   0.0f, aStyleContext, nsnull,
-                   fromKeyframe.mKey, fromContext,
-                     fromKeyframe.mRule->Declaration());
-    }
-
-    for (PRUint32 kfIdx = 1, kfEnd = sortedKeyframes.Length();
+    for (PRUint32 kfIdx = 0, kfEnd = sortedKeyframes.Length();
          kfIdx != kfEnd; ++kfIdx) {
-      KeyframeData toKeyframe = sortedKeyframes[kfIdx];
-      nsRefPtr<nsStyleContext> toContext =
-        resolvedStyles.Get(mPresContext, aStyleContext, toKeyframe.mRule);
-
-      BuildSegment(aDest.mSegments, aSrc,
-                   fromKeyframe.mKey, fromContext,
-                   fromKeyframe.mRule->Declaration(),
-                   toKeyframe.mKey, toContext,
-                   toKeyframe.mRule->Declaration());
-
-      fromContext = toContext;
-      fromKeyframe = toKeyframe;
+      css::Declaration *decl = sortedKeyframes[kfIdx].mRule->Declaration();
+      for (PRUint32 propIdx = 0, propEnd = decl->Count();
+           propIdx != propEnd; ++propIdx) {
+        properties.AddProperty(decl->OrderValueAt(propIdx));
+      }
     }
 
-    // If there's no rule for 100%, there's implicitly an empty rule.
-    if (fromKeyframe.mKey != 1.0f) {
-      BuildSegment(aDest.mSegments, aSrc,
-                   fromKeyframe.mKey, fromContext,
-                   fromKeyframe.mRule->Declaration(),
-                   1.0f, aStyleContext, nsnull);
+    for (nsCSSProperty prop = nsCSSProperty(0);
+         prop < eCSSProperty_COUNT_no_shorthands;
+         prop = nsCSSProperty(prop + 1)) {
+      if (!properties.HasProperty(prop) ||
+          nsCSSProps::kAnimTypeTable[prop] == eStyleAnimType_None) {
+        continue;
+      }
+
+      AnimationProperty &propData = *aDest.mProperties.AppendElement();
+      propData.mProperty = prop;
+
+      KeyframeData *fromKeyframe = nsnull;
+      nsRefPtr<nsStyleContext> fromContext;
+      bool interpolated = true;
+      for (PRUint32 kfIdx = 0, kfEnd = sortedKeyframes.Length();
+           kfIdx != kfEnd; ++kfIdx) {
+        KeyframeData &toKeyframe = sortedKeyframes[kfIdx];
+        if (!toKeyframe.mRule->Declaration()->HasProperty(prop)) {
+          continue;
+        }
+
+        nsRefPtr<nsStyleContext> toContext =
+          resolvedStyles.Get(mPresContext, aStyleContext, toKeyframe.mRule);
+
+        if (fromKeyframe) {
+          interpolated = interpolated &&
+            BuildSegment(propData.mSegments, prop, aSrc,
+                         fromKeyframe->mKey, fromContext,
+                         fromKeyframe->mRule->Declaration(),
+                         toKeyframe.mKey, toContext);
+        } else {
+          if (toKeyframe.mKey != 0.0f) {
+            // There's no data for this property at 0%, so use the
+            // cascaded value above us.
+            interpolated = interpolated &&
+              BuildSegment(propData.mSegments, prop, aSrc,
+                           0.0f, aStyleContext, nsnull,
+                           toKeyframe.mKey, toContext);
+          }
+        }
+
+        fromContext = toContext;
+        fromKeyframe = &toKeyframe;
+      }
+
+      if (fromKeyframe->mKey != 1.0f) {
+        // There's no data for this property at 100%, so use the
+        // cascaded value above us.
+        interpolated = interpolated &&
+          BuildSegment(propData.mSegments, prop, aSrc,
+                       fromKeyframe->mKey, fromContext,
+                       fromKeyframe->mRule->Declaration(),
+                       1.0f, aStyleContext);
+      }
+
+      // If we failed to build any segments due to inability to
+      // interpolate, remove the property from the animation.  (It's not
+      // clear if this is the right thing to do -- we could run some of
+      // the segments, but it's really not clear whether we should skip
+      // values (which?) or skip segments, so best to skip the whole
+      // thing for now.)
+      if (!interpolated) {
+        aDest.mProperties.RemoveElementAt(aDest.mProperties.Length() - 1);
+      }
     }
   }
 }
 
-void
-nsAnimationManager::BuildSegment(InfallibleTArray<AnimationSegment>& aSegments,
+bool
+nsAnimationManager::BuildSegment(InfallibleTArray<AnimationPropertySegment>&
+                                   aSegments,
+                                 nsCSSProperty aProperty,
                                  const nsAnimation& aAnimation,
                                  float aFromKey, nsStyleContext* aFromContext,
                                  mozilla::css::Declaration* aFromDeclaration,
-                                 float aToKey, nsStyleContext* aToContext,
-                                 mozilla::css::Declaration* aToDeclaration)
+                                 float aToKey, nsStyleContext* aToContext)
 {
-  AnimationSegment &segment = *aSegments.AppendElement();
+  nsStyleAnimation::Value fromValue, toValue, dummyValue;
+  if (!ExtractComputedValueForTransition(aProperty, aFromContext, fromValue) ||
+      !ExtractComputedValueForTransition(aProperty, aToContext, toValue) ||
+      // Check that we can interpolate between these values
+      // (If this is ever a performance problem, we could add a
+      // CanInterpolate method, but it seems fine for now.)
+      !nsStyleAnimation::Interpolate(aProperty, fromValue, toValue,
+                                    0.5, dummyValue)) {
+    return false;
+  }
 
+  AnimationPropertySegment &segment = *aSegments.AppendElement();
+
+  segment.mFromValue = fromValue;
+  segment.mToValue = toValue;
   segment.mFromKey = aFromKey;
   segment.mToKey = aToKey;
   const nsTimingFunction *tf;
@@ -755,33 +811,7 @@ nsAnimationManager::BuildSegment(InfallibleTArray<AnimationSegment>& aSegments,
   }
   segment.mTimingFunction.Init(*tf);
 
-  for (nsCSSProperty prop = nsCSSProperty(0);
-       prop < eCSSProperty_COUNT_no_shorthands;
-       prop = nsCSSProperty(prop + 1)) {
-    if (nsCSSProps::kAnimTypeTable[prop] == eStyleAnimType_None) {
-      continue;
-    }
-
-    if (!(aFromDeclaration && aFromDeclaration->HasProperty(prop)) &&
-        !(aToDeclaration && aToDeclaration->HasProperty(prop))) {
-      // Don't store an animation if neither declaration has the property.
-      continue;
-    }
-
-    nsStyleAnimation::Value fromValue, toValue, dummyValue;
-    if (ExtractComputedValueForTransition(prop, aFromContext, fromValue) &&
-        ExtractComputedValueForTransition(prop, aToContext, toValue) &&
-        // Check that we can interpolate between these values
-        // (If this is ever a performance problem, we could add a
-        // CanInterpolate method, but it seems fine for now.)
-        nsStyleAnimation::Interpolate(prop, fromValue, toValue,
-                                      0.5, dummyValue)) {
-      AnimationSegmentProperty &p = *segment.mProperties.AppendElement();
-      p.mProperty = prop;
-      p.mFromValue = fromValue;
-      p.mToValue = toValue;
-    }
-  }
+  return true;
 }
 
 nsIStyleRule*
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index 983326ed01b2..a53f59b12995 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -47,7 +47,7 @@
 #include "nsThreadUtils.h"
 
 class nsCSSKeyframesRule;
-struct AnimationSegment;
+struct AnimationPropertySegment;
 struct ElementAnimation;
 struct ElementAnimations;
 
@@ -135,12 +135,11 @@ private:
                                           PRBool aCreateIfNeeded);
   void BuildAnimations(nsStyleContext* aStyleContext,
                        InfallibleTArray<ElementAnimation>& aAnimations);
-  void BuildSegment(InfallibleTArray<AnimationSegment>& aSegments,
-                    const nsAnimation& aAnimation,
+  bool BuildSegment(InfallibleTArray<AnimationPropertySegment>& aSegments,
+                    nsCSSProperty aProperty, const nsAnimation& aAnimation,
                     float aFromKey, nsStyleContext* aFromContext,
                     mozilla::css::Declaration* aFromDeclaration,
-                    float aToKey, nsStyleContext* aToContext,
-                    mozilla::css::Declaration* aToDeclaration);
+                    float aToKey, nsStyleContext* aToContext);
   nsIStyleRule* GetAnimationRule(mozilla::dom::Element* aElement,
                                  nsCSSPseudoElements::Type aPseudoType);
 
diff --git a/layout/style/test/test_animations.html b/layout/style/test/test_animations.html
index ae79a1033663..fe79ed32f9d5 100644
--- a/layout/style/test/test_animations.html
+++ b/layout/style/test/test_animations.html
@@ -65,6 +65,24 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=435442
     content: "";
     -moz-animation: anim2 1s linear alternate infinite;
   }
+
+  @-moz-keyframes multiprop {
+    0% {
+      padding-top: 10px; padding-left: 30px;
+      -moz-animation-timing-function: ease;
+    }
+    25% {
+      padding-left: 50px;
+      -moz-animation-timing-function: ease-out;
+    }
+    50% {
+      padding-top: 40px;
+    }
+    75% {
+      padding-top: 80px; padding-left: 60px;
+      -moz-animation-timing-function: ease-in;
+    }
+  }
   </style>
 </head>
 <body>
@@ -1113,6 +1131,55 @@ is(cs_after.marginRight, "30px", ":after test at 2300ms");
 check_events([], "no events should be fired for animations on :after");
 done_div();
 
+/**
+ * Test handling of properties that are present in only some of the
+ * keyframes.
+ */
+new_div("-moz-animation: multiprop 1s ease-in-out alternate infinite");
+is(cs.paddingTop, "10px", "multiprop top at 0ms");
+is(cs.paddingLeft, "30px", "multiprop top at 0ms");
+advance_clock(100);
+is_approx(px_to_num(cs.paddingTop), 10 + 30 * gTF.ease(0.2), 0.01,
+          "multiprop top at 100ms");
+is_approx(px_to_num(cs.paddingLeft), 30 + 20 * gTF.ease(0.4), 0.01,
+          "multiprop left at 100ms");
+advance_clock(200);
+is_approx(px_to_num(cs.paddingTop), 10 + 30 * gTF.ease(0.6), 0.01,
+          "multiprop top at 300ms");
+is_approx(px_to_num(cs.paddingLeft), 50 + 10 * gTF.ease_out(0.1), 0.01,
+          "multiprop left at 300ms");
+advance_clock(300);
+is_approx(px_to_num(cs.paddingTop), 40 + 40 * gTF.ease_in_out(0.4), 0.01,
+          "multiprop top at 600ms");
+is_approx(px_to_num(cs.paddingLeft), 50 + 10 * gTF.ease_out(0.7), 0.01,
+          "multiprop left at 600ms");
+advance_clock(200);
+is_approx(px_to_num(cs.paddingTop), 80 - 80 * gTF.ease_in(0.2), 0.01,
+          "multiprop top at 800ms");
+is_approx(px_to_num(cs.paddingLeft), 60 - 60 * gTF.ease_in(0.2), 0.01,
+          "multiprop left at 800ms");
+advance_clock(400);
+is_approx(px_to_num(cs.paddingTop), 80 - 80 * gTF.ease_in(0.2), 0.01,
+          "multiprop top at 1200ms");
+is_approx(px_to_num(cs.paddingLeft), 60 - 60 * gTF.ease_in(0.2), 0.01,
+          "multiprop left at 1200ms");
+advance_clock(200);
+is_approx(px_to_num(cs.paddingTop), 40 + 40 * gTF.ease_in_out(0.4), 0.01,
+          "multiprop top at 1400ms");
+is_approx(px_to_num(cs.paddingLeft), 50 + 10 * gTF.ease_out(0.7), 0.01,
+          "multiprop left at 1400ms");
+advance_clock(300);
+is_approx(px_to_num(cs.paddingTop), 10 + 30 * gTF.ease(0.6), 0.01,
+          "multiprop top at 1700ms");
+is_approx(px_to_num(cs.paddingLeft), 50 + 10 * gTF.ease_out(0.1), 0.01,
+          "multiprop left at 1700ms");
+advance_clock(200);
+is_approx(px_to_num(cs.paddingTop), 10 + 30 * gTF.ease(0.2), 0.01,
+          "multiprop top at 1900ms");
+is_approx(px_to_num(cs.paddingLeft), 30 + 20 * gTF.ease(0.4), 0.01,
+          "multiprop left at 1900ms");
+done_div();
+
 SpecialPowers.DOMWindowUtils.restoreNormalRefresh();
 
 </script>

From db741ac71cfe448ff93cdd9a84053e329591607a Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:23 -0700
Subject: [PATCH 406/509] Make leaksoup not print static ctor/dtor warnings.

---
 tools/trace-malloc/leaksoup.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/trace-malloc/leaksoup.cpp b/tools/trace-malloc/leaksoup.cpp
index 4a3ea6d2cab2..26d4ff9b8f38 100644
--- a/tools/trace-malloc/leaksoup.cpp
+++ b/tools/trace-malloc/leaksoup.cpp
@@ -42,6 +42,7 @@
 
 #include "nsVoidArray.h"
 #include "nsQuickSort.h"
+#include "nsXPCOM.h"
 
 /*
  * Read in an allocation dump, presumably one taken at shutdown (using
@@ -132,6 +133,8 @@ int main(int argc, char **argv)
         return 1;
     }
 
+    NS_InitXPCOM2(NULL, NULL, NULL);
+
     ADLog log;
     if (!log.Read(argv[1])) {
         fprintf(stderr,
@@ -434,5 +437,7 @@ int main(int argc, char **argv)
     delete [] sorted_nodes;
     delete [] nodes;
 
+    NS_ShutdownXPCOM(NULL);
+
     return 0;
 }

From 2b6c0f50d8cb5b5f0436c39e426e90303b92a2a2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:23 -0700
Subject: [PATCH 407/509] Fix broken nsLineList::swap implementation.  (Bug
 652053)  r=roc

---
 layout/generic/nsLineBox.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/layout/generic/nsLineBox.h b/layout/generic/nsLineBox.h
index 606956c3df34..27ea5345d883 100644
--- a/layout/generic/nsLineBox.h
+++ b/layout/generic/nsLineBox.h
@@ -1379,6 +1379,16 @@ class nsLineList {
       link_type tmp(y.mLink);
       y.mLink = mLink;
       mLink = tmp;
+
+      if (!empty()) {
+        mLink._mNext->_mPrev = &mLink;
+        mLink._mPrev->_mNext = &mLink;
+      }
+
+      if (!y.empty()) {
+        y.mLink._mNext->_mPrev = &y.mLink;
+        y.mLink._mPrev->_mNext = &y.mLink;
+      }
     }
 
     void clear()

From 97743a8c706f4178df6d74d945b2c4e05f5880c0 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:23 -0700
Subject: [PATCH 408/509] Don't construct image loaders for null border-image. 
 (Bug 652052)  r=bzbarsky

---
 layout/base/nsImageLoader.cpp |  2 ++
 layout/base/nsPresContext.cpp | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/layout/base/nsImageLoader.cpp b/layout/base/nsImageLoader.cpp
index 76dc20ee3ce5..2817c2447f36 100644
--- a/layout/base/nsImageLoader.cpp
+++ b/layout/base/nsImageLoader.cpp
@@ -118,6 +118,8 @@ nsresult
 nsImageLoader::Load(imgIRequest *aImage)
 {
   NS_ASSERTION(!mRequest, "can't reuse image loaders");
+  NS_ASSERTION(mFrame, "not initialized");
+  NS_ASSERTION(aImage, "must have non-null image");
 
   if (!mFrame)
     return NS_ERROR_NOT_INITIALIZED;
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index edb225e144ad..d257a0a521a6 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1411,12 +1411,20 @@ void
 nsPresContext::SetupBorderImageLoaders(nsIFrame* aFrame,
                                        const nsStyleBorder* aStyleBorder)
 {
+  // We get called the first time we try to draw a border-image, and
+  // also when the border image changes (including when it changes from
+  // non-null to null).
+  imgIRequest *borderImage = aStyleBorder->GetBorderImage();
+  if (!borderImage) {
+    SetImageLoaders(aFrame, BORDER_IMAGE, nsnull);
+    return;
+  }
+
   PRUint32 actions = nsImageLoader::ACTION_REDRAW_ON_LOAD;
   if (aStyleBorder->ImageBorderDiffers())
     actions |= nsImageLoader::ACTION_REFLOW_ON_LOAD;
   nsRefPtr<nsImageLoader> loader =
-    nsImageLoader::Create(aFrame, aStyleBorder->GetBorderImage(),
-                          actions, nsnull);
+    nsImageLoader::Create(aFrame, borderImage, actions, nsnull);
   SetImageLoaders(aFrame, BORDER_IMAGE, loader);
 }
 

From 6f6871a557f1792885c9ae8761b65e215741fc88 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:24 -0700
Subject: [PATCH 409/509] Make nsBox more careful about accepting XUL
 attributes only on XUL elements.  (Bug 102440)  r=bzbarsky

---
 browser/base/content/urlbarBindings.xml       |  2 +-
 ...box-attributes-no-box-horizontal-ref.xhtml | 43 +++++++++++++++++++
 ...flexbox-attributes-no-box-horizontal.xhtml | 43 +++++++++++++++++++
 ...exbox-attributes-no-box-vertical-ref.xhtml | 43 +++++++++++++++++++
 .../flexbox-attributes-no-box-vertical.xhtml  | 43 +++++++++++++++++++
 ...x-attributes-no-input-horizontal-ref.xhtml | 37 ++++++++++++++++
 ...exbox-attributes-no-input-horizontal.xhtml | 37 ++++++++++++++++
 ...box-attributes-no-input-vertical-ref.xhtml | 37 ++++++++++++++++
 ...flexbox-attributes-no-input-vertical.xhtml | 37 ++++++++++++++++
 layout/reftests/flexbox/reftest.list          |  4 ++
 layout/reftests/reftest.list                  |  3 ++
 layout/xul/base/src/nsBox.cpp                 | 22 ++++------
 toolkit/content/menulist.css                  |  1 +
 toolkit/content/textbox.css                   |  2 +
 toolkit/content/widgets/autocomplete.xml      |  2 +-
 toolkit/content/widgets/datetimepicker.xml    | 16 +++----
 toolkit/content/widgets/menulist.xml          |  2 +-
 toolkit/content/widgets/numberbox.xml         |  2 +-
 toolkit/content/widgets/textbox.xml           |  6 +--
 .../resources/content/autocomplete.xml        |  2 +-
 20 files changed, 354 insertions(+), 30 deletions(-)
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-box-horizontal-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-box-horizontal.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-box-vertical-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-box-vertical.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-input-horizontal-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-input-horizontal.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-input-vertical-ref.xhtml
 create mode 100644 layout/reftests/flexbox/flexbox-attributes-no-input-vertical.xhtml
 create mode 100644 layout/reftests/flexbox/reftest.list

diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 4dd87b75a0d9..fd30267165a4 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -64,7 +64,7 @@
           <children/>
           <html:input anonid="input"
                       class="autocomplete-textbox urlbar-input textbox-input uri-element-right-align"
-                      flex="1" allowevents="true"
+                      allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
         </xul:hbox>
         <children includes="hbox"/>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal-ref.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal-ref.xhtml
new file mode 100644
index 000000000000..16c724e8a86d
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal-ref.xhtml
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: horizontal;
+}
+
+div > div {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border: 1px solid blue;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <div>2</div>
+  <div>1</div>
+  <div>width</div>
+  <div>height</div>
+  <div>minwidth</div>
+  <div>minheight</div>
+  <div>maxwidth</div>
+  <div>maxheight</div>
+  <div>flex</div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal.xhtml
new file mode 100644
index 000000000000..c5447e6db2b5
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-box-horizontal.xhtml
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: horizontal;
+}
+
+div > div {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border: 1px solid blue;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <div ordinal="2">2</div>
+  <div ordinal="1">1</div>
+  <div width="100">width</div>
+  <div height="100">height</div>
+  <div minwidth="100">minwidth</div>
+  <div minheight="100">minheight</div>
+  <div maxwidth="50">maxwidth</div>
+  <div maxheight="15">maxheight</div>
+  <div flex="100">flex</div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-box-vertical-ref.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-box-vertical-ref.xhtml
new file mode 100644
index 000000000000..69c92e698bd3
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-box-vertical-ref.xhtml
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+div > div {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border: 1px solid blue;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <div>2</div>
+  <div>1</div>
+  <div>width</div>
+  <div>height</div>
+  <div>minwidth</div>
+  <div>minheight</div>
+  <div>maxwidth</div>
+  <div>maxheight</div>
+  <div>flex</div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-box-vertical.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-box-vertical.xhtml
new file mode 100644
index 000000000000..cd82ba7ab8c4
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-box-vertical.xhtml
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+div > div {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border: 1px solid blue;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <div ordinal="2">2</div>
+  <div ordinal="1">1</div>
+  <div width="100">width</div>
+  <div height="100">height</div>
+  <div minwidth="100">minwidth</div>
+  <div minheight="100">minheight</div>
+  <div maxwidth="50">maxwidth</div>
+  <div maxheight="15">maxheight</div>
+  <div flex="100">flex</div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal-ref.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal-ref.xhtml
new file mode 100644
index 000000000000..af0fbf9f21eb
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal-ref.xhtml
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: horizontal;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <input type="text" value="2" />
+  <input type="text" value="1" />
+  <input type="text" value="width" />
+  <input type="text" value="height" />
+  <input type="text" value="minwidth" />
+  <input type="text" value="minheight" />
+  <input type="text" value="maxwidth" />
+  <input type="text" value="maxheight" />
+  <input type="text" value="flex" />
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal.xhtml
new file mode 100644
index 000000000000..271944161297
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-input-horizontal.xhtml
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: horizontal;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <input type="text" ordinal="2" value="2" />
+  <input type="text" ordinal="1" value="1" />
+  <input type="text" width="100" value="width" />
+  <input type="text" height="100" value="height" />
+  <input type="text" minwidth="100" value="minwidth" />
+  <input type="text" minheight="100" value="minheight" />
+  <input type="text" maxwidth="50" value="maxwidth" />
+  <input type="text" maxheight="15" value="maxheight" />
+  <input type="text" flex="100" value="flex" />
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-input-vertical-ref.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-input-vertical-ref.xhtml
new file mode 100644
index 000000000000..78281ceb8684
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-input-vertical-ref.xhtml
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <input type="text" value="2" />
+  <input type="text" value="1" />
+  <input type="text" value="width" />
+  <input type="text" value="height" />
+  <input type="text" value="minwidth" />
+  <input type="text" value="minheight" />
+  <input type="text" value="maxwidth" />
+  <input type="text" value="maxheight" />
+  <input type="text" value="flex" />
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/flexbox-attributes-no-input-vertical.xhtml b/layout/reftests/flexbox/flexbox-attributes-no-input-vertical.xhtml
new file mode 100644
index 000000000000..aa8dbd281fdd
--- /dev/null
+++ b/layout/reftests/flexbox/flexbox-attributes-no-input-vertical.xhtml
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Test that XUL attributes are not supported on non-XUL elements</title>
+<style type="text/css">
+<![CDATA[
+
+html, body {
+  display: -moz-box;
+  margin: 0; padding: 0;
+  width: 100%; height: 100%;
+}
+
+body > div {
+  display: -moz-box;
+  background: yellow;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+]]>
+</style>
+</head>
+<body>
+<div>
+  <input type="text" ordinal="2" value="2" />
+  <input type="text" ordinal="1" value="1" />
+  <input type="text" width="100" value="width" />
+  <input type="text" height="100" value="height" />
+  <input type="text" minwidth="100" value="minwidth" />
+  <input type="text" minheight="100" value="minheight" />
+  <input type="text" maxwidth="50" value="maxwidth" />
+  <input type="text" maxheight="5" value="maxheight" />
+  <input type="text" flex="100" value="flex" />
+</div>
+</body>
+</html>
diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list
new file mode 100644
index 000000000000..7acadb49d0ea
--- /dev/null
+++ b/layout/reftests/flexbox/reftest.list
@@ -0,0 +1,4 @@
+== flexbox-attributes-no-box-horizontal.xhtml flexbox-attributes-no-box-horizontal-ref.xhtml
+== flexbox-attributes-no-box-vertical.xhtml flexbox-attributes-no-box-vertical-ref.xhtml
+== flexbox-attributes-no-input-horizontal.xhtml flexbox-attributes-no-input-horizontal-ref.xhtml
+== flexbox-attributes-no-input-vertical.xhtml flexbox-attributes-no-input-vertical-ref.xhtml
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 600f86e7fb52..16b588acbc6d 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -134,6 +134,9 @@ skip-if(Android) include first-letter/reftest.list
 # first-line/
 include first-line/reftest.list
 
+# flexbox/
+include flexbox/reftest.list
+
 # floats/
 include floats/reftest.list
 
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp
index 486e34e2434d..0c0f4356ac3e 100644
--- a/layout/xul/base/src/nsBox.cpp
+++ b/layout/xul/base/src/nsBox.cpp
@@ -518,7 +518,7 @@ nsIFrame::GetOrdinal(nsBoxLayoutState& aState)
 
   // When present, attribute value overrides CSS.
   nsIContent* content = GetContent();
-  if (content) {
+  if (content && content->IsXUL()) {
     PRInt32 error;
     nsAutoString value;
 
@@ -812,7 +812,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize,
     // calc() with percentage is treated like '0' (unset)
 
     nsIContent* content = aBox->GetContent();
-    if (content) {
+    if (content && content->IsXUL()) {
         nsAutoString value;
         PRInt32 error;
 
@@ -875,7 +875,7 @@ nsIBox::AddCSSMaxSize(nsIBox* aBox, nsSize& aSize, PRBool &aWidthSet, PRBool &aH
     // percentages and calc() with percentages are treated like 'none'
 
     nsIContent* content = aBox->GetContent();
-    if (content) {
+    if (content && content->IsXUL()) {
         nsAutoString value;
         PRInt32 error;
 
@@ -910,8 +910,11 @@ nsIBox::AddCSSFlex(nsBoxLayoutState& aState, nsIBox* aBox, nscoord& aFlex)
     PRBool flexSet = PR_FALSE;
 
     // get the flexibility
+    aFlex = aBox->GetStyleXUL()->mBoxFlex;
+
+    // attribute value overrides CSS
     nsIContent* content = aBox->GetContent();
-    if (content) {
+    if (content && content->IsXUL()) {
         PRInt32 error;
         nsAutoString value;
 
@@ -921,15 +924,6 @@ nsIBox::AddCSSFlex(nsBoxLayoutState& aState, nsIBox* aBox, nscoord& aFlex)
             aFlex = value.ToInteger(&error);
             flexSet = PR_TRUE;
         }
-        else {
-          // No attribute value.  Check CSS.
-          const nsStyleXUL* boxInfo = aBox->GetStyleXUL();
-          if (boxInfo->mBoxFlex > 0.0f) {
-            // The flex was defined in CSS.
-            aFlex = (nscoord)boxInfo->mBoxFlex;
-            flexSet = PR_TRUE;
-          }
-        }
     }
 
     if (aFlex < 0)
@@ -937,7 +931,7 @@ nsIBox::AddCSSFlex(nsBoxLayoutState& aState, nsIBox* aBox, nscoord& aFlex)
     if (aFlex >= nscoord_MAX)
       aFlex = nscoord_MAX - 1;
 
-    return flexSet;
+    return flexSet || aFlex > 0;
 }
 
 void
diff --git a/toolkit/content/menulist.css b/toolkit/content/menulist.css
index e0fe43a8a987..a6b8c7778862 100644
--- a/toolkit/content/menulist.css
+++ b/toolkit/content/menulist.css
@@ -3,4 +3,5 @@
 html|*.menulist-editable-input {
   -moz-appearance: none !important;
   background: transparent ! important;
+  -moz-box-flex: 1;
 }
diff --git a/toolkit/content/textbox.css b/toolkit/content/textbox.css
index 09b7b32357d5..701e9422f818 100644
--- a/toolkit/content/textbox.css
+++ b/toolkit/content/textbox.css
@@ -6,12 +6,14 @@ html|*.textbox-input {
   text-align: inherit;
   text-shadow: inherit;
   -moz-box-sizing: border-box;
+  -moz-box-flex: 1;
 }
 
 html|*.textbox-textarea {
   -moz-appearance: none !important;
   text-shadow: inherit;
   -moz-box-sizing: border-box;
+  -moz-box-flex: 1;
 }
 
 /*
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 583d47891f03..bbe9f00fd3ac 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -69,7 +69,7 @@
         <xul:hbox anonid="textbox-input-box" class="textbox-input-box" flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
           <children/>
           <html:input anonid="input" class="autocomplete-textbox textbox-input"
-                      flex="1" allowevents="true"
+                      allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint"/>
         </xul:hbox>
         <children includes="hbox"/>
diff --git a/toolkit/content/widgets/datetimepicker.xml b/toolkit/content/widgets/datetimepicker.xml
index 532269abe93a..6bc410dab6a0 100644
--- a/toolkit/content/widgets/datetimepicker.xml
+++ b/toolkit/content/widgets/datetimepicker.xml
@@ -62,24 +62,24 @@
                 xbl:inherits="context">
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
@@ -1244,24 +1244,24 @@
                 allowevents="true" xbl:inherits="context">
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1"
+                      size="2" maxlength="2"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
diff --git a/toolkit/content/widgets/menulist.xml b/toolkit/content/widgets/menulist.xml
index 714a8d8dfaea..4020a3a37c51 100644
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -411,7 +411,7 @@
   <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content sizetopopup="pref">
       <xul:hbox class="menulist-editable-box textbox-input-box" xbl:inherits="context,disabled,readonly,focused" flex="1">
-        <html:input class="menulist-editable-input" flex="1" anonid="input" allowevents="true"
+        <html:input class="menulist-editable-input" anonid="input" allowevents="true"
                     xbl:inherits="value=label,value,disabled,tabindex,readonly,placeholder"/>
       </xul:hbox>
       <xul:dropmarker class="menulist-dropmarker" type="menu"
diff --git a/toolkit/content/widgets/numberbox.xml b/toolkit/content/widgets/numberbox.xml
index fab66a345541..e8b147280a72 100644
--- a/toolkit/content/widgets/numberbox.xml
+++ b/toolkit/content/widgets/numberbox.xml
@@ -15,7 +15,7 @@
 
     <content>
       <xul:hbox class="textbox-input-box numberbox-input-box" flex="1" xbl:inherits="context,disabled,focused">
-        <html:input class="numberbox-input textbox-input" flex="1" anonid="input"
+        <html:input class="numberbox-input textbox-input" anonid="input"
                     xbl:inherits="onfocus,onblur,value,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
       </xul:hbox>
       <xul:spinbuttons anonid="buttons" xbl:inherits="disabled,hidden=hidespinbuttons"/>
diff --git a/toolkit/content/widgets/textbox.xml b/toolkit/content/widgets/textbox.xml
index 7251db306367..50d0bfe361ac 100644
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@@ -20,7 +20,7 @@
     <content>
       <children/>
       <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context,spellcheck">
-        <html:input class="textbox-input" flex="1" anonid="input"
+        <html:input class="textbox-input" anonid="input"
                     xbl:inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,noinitialfocus,mozactionhint,spellcheck"/>
       </xul:hbox>
     </content>
@@ -307,7 +307,7 @@
     <content>
       <children/>
       <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context,spellcheck" align="center">
-        <html:input class="textbox-input" flex="1" anonid="input" mozactionhint="search"
+        <html:input class="textbox-input" anonid="input" mozactionhint="search"
                     xbl:inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint,spellcheck"/>
         <xul:deck class="textbox-search-icons" anonid="search-icons">
           <xul:image class="textbox-search-icon"
@@ -434,7 +434,7 @@
   <binding id="textarea" extends="chrome://global/content/bindings/textbox.xml#textbox">
     <content>
       <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context,spellcheck">
-        <html:textarea class="textbox-textarea" flex="1" anonid="input"
+        <html:textarea class="textbox-textarea" anonid="input"
                        xbl:inherits="onfocus,onblur,xbl:text=value,disabled,tabindex,rows,cols,readonly,wrap,placeholder,mozactionhint,spellcheck"><children/></html:textarea>
       </xul:hbox>
     </content>
diff --git a/xpfe/components/autocomplete/resources/content/autocomplete.xml b/xpfe/components/autocomplete/resources/content/autocomplete.xml
index 9ea5e9fcac0a..e10cdfbadf38 100644
--- a/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -22,7 +22,7 @@
         <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context,tooltiptext=inputtooltiptext">
           <children/>
           <html:input anonid="input" class="autocomplete-textbox textbox-input"
-                      flex="1" allowevents="true"
+                      allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint,userAction"/>
         </xul:hbox>
         <children includes="hbox"/>

From 303db68634012cecca0a1192b6c9b38976938a0a Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:24 -0700
Subject: [PATCH 410/509] unicode-bidi should inherit into ::-moz-cell-content,
 ::-moz-anonymous-block, ::-moz-anonymous-positioned-block, and
 ::-moz-fieldset-content.  (Bug 604294)  r=bzbarsky

---
 layout/reftests/bidi/reftest.list                        | 2 ++
 layout/reftests/bidi/unicode-bidi-anonymous-001-ref.html | 3 +++
 layout/reftests/bidi/unicode-bidi-anonymous-001.html     | 3 +++
 layout/reftests/bidi/unicode-bidi-anonymous-002-ref.html | 5 +++++
 layout/reftests/bidi/unicode-bidi-anonymous-002.html     | 5 +++++
 layout/style/forms.css                                   | 1 +
 layout/style/ua.css                                      | 2 ++
 7 files changed, 21 insertions(+)
 create mode 100644 layout/reftests/bidi/unicode-bidi-anonymous-001-ref.html
 create mode 100644 layout/reftests/bidi/unicode-bidi-anonymous-001.html
 create mode 100644 layout/reftests/bidi/unicode-bidi-anonymous-002-ref.html
 create mode 100644 layout/reftests/bidi/unicode-bidi-anonymous-002.html

diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 60ca7d8119d7..e33bab48aeee 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -29,6 +29,8 @@ random-if(cocoaWidget) == mirroring-02.html mirroring-02-ref.html
 == mixedChartype-02-j.html mixedChartype-02-ref.html
 == mixedChartype-03.html mixedChartype-03-ref.html
 == mixedChartype-03-j.html mixedChartype-03-ref.html
+== unicode-bidi-anonymous-001.html unicode-bidi-anonymous-001-ref.html
+== unicode-bidi-anonymous-002.html unicode-bidi-anonymous-002-ref.html
 == with-first-letter-1a.html with-first-letter-1-ref.html
 == with-first-letter-1b.html with-first-letter-1-ref.html
 == with-first-letter-2a.html with-first-letter-2-ref.html
diff --git a/layout/reftests/bidi/unicode-bidi-anonymous-001-ref.html b/layout/reftests/bidi/unicode-bidi-anonymous-001-ref.html
new file mode 100644
index 000000000000..64941d5ca113
--- /dev/null
+++ b/layout/reftests/bidi/unicode-bidi-anonymous-001-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE HTML>
+<title>Test for 'unicode-bidi' on table cells</title>
+<table border><tr><td>abc</td></tr></table>
diff --git a/layout/reftests/bidi/unicode-bidi-anonymous-001.html b/layout/reftests/bidi/unicode-bidi-anonymous-001.html
new file mode 100644
index 000000000000..a0e3dcb0a08d
--- /dev/null
+++ b/layout/reftests/bidi/unicode-bidi-anonymous-001.html
@@ -0,0 +1,3 @@
+<!DOCTYPE HTML>
+<title>Test for 'unicode-bidi' on table cells</title>
+<table border><tr><td style="unicode-bidi: bidi-override; direction: rtl; text-align: left">cba</td></tr></table>
diff --git a/layout/reftests/bidi/unicode-bidi-anonymous-002-ref.html b/layout/reftests/bidi/unicode-bidi-anonymous-002-ref.html
new file mode 100644
index 000000000000..6da4f8dcfd21
--- /dev/null
+++ b/layout/reftests/bidi/unicode-bidi-anonymous-002-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE HTML>
+<title>Test for 'unicode-bidi' on table cells</title>
+<fieldset>
+  abc
+</fieldset>
diff --git a/layout/reftests/bidi/unicode-bidi-anonymous-002.html b/layout/reftests/bidi/unicode-bidi-anonymous-002.html
new file mode 100644
index 000000000000..9839b2901841
--- /dev/null
+++ b/layout/reftests/bidi/unicode-bidi-anonymous-002.html
@@ -0,0 +1,5 @@
+<!DOCTYPE HTML>
+<title>Test for 'unicode-bidi' on table cells</title>
+<fieldset style="unicode-bidi: bidi-override; direction: rtl; text-align: left">
+  cba
+</fieldset>
diff --git a/layout/style/forms.css b/layout/style/forms.css
index 91d28e141948..3aa1600765c6 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -44,6 +44,7 @@
 
 *|*::-moz-fieldset-content {
   display: block;
+  unicode-bidi: inherit;
   height: 100%;   /* Need this so percentage heights of kids work right */
 }
 
diff --git a/layout/style/ua.css b/layout/style/ua.css
index 5d989188a935..bb7fa4d962a1 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -121,6 +121,7 @@
 *|*::-moz-anonymous-block, *|*::-moz-cell-content {
   display: block !important;
   position: static !important;
+  unicode-bidi: inherit;
 }
 
 *|*::-moz-anonymous-block, *|*::-moz-anonymous-positioned-block {
@@ -207,6 +208,7 @@
   z-index: inherit;
   clip: inherit;
   opacity: inherit;
+  unicode-bidi: inherit;
 }
 
 /* Printing */

From 5f05f9582d95d92a92c9954e59e8d05b39c277b2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:24 -0700
Subject: [PATCH 411/509] Should check link-related bits before reusing style
 context for root element.  (Bug 652268)  r=bzbarsky

---
 layout/base/nsFrameManager.cpp                |  5 +++-
 .../css-visited/link-root-1-ref.xhtml         | 16 ++++++++++++
 layout/reftests/css-visited/link-root-1.xhtml | 26 +++++++++++++++++++
 layout/style/test/test_visited_reftests.html  |  1 +
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/css-visited/link-root-1-ref.xhtml
 create mode 100644 layout/reftests/css-visited/link-root-1.xhtml

diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index 759d7249dcfd..b7e93faa330a 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1221,7 +1221,10 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
     NS_ASSERTION(newContext, "failed to get new style context");
     if (newContext) {
       if (!parentContext) {
-        if (oldContext->GetRuleNode() == newContext->GetRuleNode()) {
+        if (oldContext->GetRuleNode() == newContext->GetRuleNode() &&
+            oldContext->IsLinkContext() == newContext->IsLinkContext() &&
+            oldContext->RelevantLinkVisited() ==
+              newContext->RelevantLinkVisited()) {
           // We're the root of the style context tree and the new style
           // context returned has the same rule node.  This means that
           // we can use FindChildWithRules to keep a lot of the old
diff --git a/layout/reftests/css-visited/link-root-1-ref.xhtml b/layout/reftests/css-visited/link-root-1-ref.xhtml
new file mode 100644
index 000000000000..577792b119ab
--- /dev/null
+++ b/layout/reftests/css-visited/link-root-1-ref.xhtml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>dynamic changes to link state for root element (reference)</title>
+<style>
+<![CDATA[
+
+html { background: green }
+
+]]>
+</style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/css-visited/link-root-1.xhtml b/layout/reftests/css-visited/link-root-1.xhtml
new file mode 100644
index 000000000000..8ac75b4f91df
--- /dev/null
+++ b/layout/reftests/css-visited/link-root-1.xhtml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE html>
+<a xmlns="http://www.w3.org/1999/xhtml"
+   href="http://www.example-notvisited.tld" class="reftest-wait">
+<style>
+<![CDATA[
+
+a { display: block; width: 100%; height: 100% }
+
+:link { background: red }
+:visited { background: green }
+
+]]>
+</style>
+<script>
+<![CDATA[
+
+var a = document.documentElement;
+getComputedStyle(a, "").backgroundColor; // flush style
+a.href = "";
+getComputedStyle(a, "").backgroundColor; // flush style
+document.documentElement.removeAttribute("class");
+
+]]>
+</script>
+</a>
diff --git a/layout/style/test/test_visited_reftests.html b/layout/style/test/test_visited_reftests.html
index fe890990915b..10dbff0f057f 100644
--- a/layout/style/test/test_visited_reftests.html
+++ b/layout/style/test/test_visited_reftests.html
@@ -80,6 +80,7 @@ var gTests = [
   // part of the test don't work right when the link becomes visited.
   //"== first-line-1.html first-line-1-ref.html",
   "== white-to-transparent-1.html white-to-transparent-1-ref.html",
+  "== link-root-1.xhtml link-root-1-ref.xhtml",
 ];
 
 // Maintain a reference count of how many things we're waiting for until

From 3b5f6cea92cc828f5e4dfd27552d961ca86f4cae Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Fri, 22 Apr 2011 18:36:24 -0700
Subject: [PATCH 412/509] Reduce scope of :hover quirk:  make it apply normally
 if it has a class selector, and be quirky (only apply to links) only when
 actually global.  (Bug 197686)  r=bzbarsky

---
 layout/style/nsCSSRuleProcessor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index d315bece1dba..8127df965c31 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -1921,9 +1921,9 @@ static PRBool SelectorMatches(Element* aElement,
       // Bit-based pseudo-classes
       if (statesToCheck.HasAtLeastOneOfStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE) &&
           aTreeMatchContext.mCompatMode == eCompatibility_NavQuirks &&
-          // global selector (but don't check .class):
+          // global selector:
           !aSelector->HasTagSelector() && !aSelector->mIDList && 
-          !aSelector->mAttrList &&
+          !aSelector->mClassList && !aSelector->mAttrList &&
           // This (or the other way around) both make :not() asymmetric
           // in quirks mode (and it's hard to work around since we're
           // testing the current mNegations, not the first

From ef7343e000f12ae1a8e8e1909c56f5b8704c9423 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mmmulani@uwaterloo.ca>
Date: Fri, 22 Apr 2011 19:04:57 -0700
Subject: [PATCH 413/509] Bug 652294 - Adding diagnostics to
 test_hashcompleter.js for intermittent orange. (test only)

---
 .../url-classifier/tests/unit/test_hashcompleter.js    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js b/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
index 9f43dc7bdd44..673c240127ac 100644
--- a/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
+++ b/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
@@ -264,6 +264,16 @@ function callback(completion) {
 }
 callback.prototype = {
   completion: function completion(hash, table, chunkId, trusted) {
+    // This check was added as part of diagnostics for bug 652294.
+    if (!this._completion.expectCompletion) {
+      dump("Did not expect a completion for this result. Provided values:\n" +
+           "hash: " + JSON.stringify(hash) + "\ntable: " + table + "chunkId: " +
+           chunkId + "\n");
+      dump("Actual values:\nhash: " + JSON.stringify(this._completion.hash) +
+           "\ntable: " + this._completion.table + "\nchunkId: " +
+           this.completion.chunkId + "\n");
+    }
+
     do_check_true(this._completion.expectCompletion);
 
     if (this._completion.multipleCompletions) {

From 0c26acab224337251d321de86dcd35c31986c2a2 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mmmulani@uwaterloo.ca>
Date: Fri, 22 Apr 2011 19:17:42 -0700
Subject: [PATCH 414/509] Bug 652294 - Typo from previous patch. DONTBUILD

---
 .../components/url-classifier/tests/unit/test_hashcompleter.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js b/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
index 673c240127ac..c88e86bf5022 100644
--- a/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
+++ b/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
@@ -271,7 +271,7 @@ callback.prototype = {
            chunkId + "\n");
       dump("Actual values:\nhash: " + JSON.stringify(this._completion.hash) +
            "\ntable: " + this._completion.table + "\nchunkId: " +
-           this.completion.chunkId + "\n");
+           this._completion.chunkId + "\n");
     }
 
     do_check_true(this._completion.expectCompletion);

From f919596523eb130150ef34c52768665c10450846 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 23 Apr 2011 14:13:09 +0900
Subject: [PATCH 415/509] Bug 648299 -moz-text-decoration-style: -moz-none
 doesn't work r=dbaron

---
 layout/generic/nsHTMLContainerFrame.cpp             | 12 ++++++++----
 layout/generic/nsHTMLContainerFrame.h               |  2 ++
 layout/generic/nsTextFrame.h                        | 13 +++++++------
 .../decoration-style-quirks-ref.html                |  3 +++
 .../text-decoration/decoration-style-quirks.html    |  4 ++++
 .../decoration-style-standards-ref.html             |  3 +++
 .../text-decoration/decoration-style-standards.html |  4 ++++
 layout/xul/base/src/nsTextBoxFrame.cpp              |  9 ++++++---
 8 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index b7d3819475ae..0663822b539c 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -355,8 +355,9 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
                      overColor, strikeColor, underStyle, overStyle,
                      strikeStyle);
 
-  if (decorations == NS_STYLE_TEXT_DECORATION_NONE)
+  if (decorations == NS_STYLE_TEXT_DECORATION_NONE) {
     return NS_OK;
+  }
 
   // The text-shadow spec says that any text decorations must also have a
   // shadow applied to them. So draw the shadows as part of the display
@@ -368,19 +369,22 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  if (decorations & NS_STYLE_TEXT_DECORATION_UNDERLINE) {
+  if ((decorations & NS_STYLE_TEXT_DECORATION_UNDERLINE) &&
+      underStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aBelowTextDecorations->AppendNewToTop(new (aBuilder)
       nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_UNDERLINE,
                               underColor, underStyle, aLine));
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  if (decorations & NS_STYLE_TEXT_DECORATION_OVERLINE) {
+  if ((decorations & NS_STYLE_TEXT_DECORATION_OVERLINE) &&
+      overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aBelowTextDecorations->AppendNewToTop(new (aBuilder)
       nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_OVERLINE,
                               overColor, overStyle, aLine));
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  if (decorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) {
+  if ((decorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) &&
+      strikeStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aAboveTextDecorations->AppendNewToTop(new (aBuilder)
       nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_LINE_THROUGH,
                               strikeColor, strikeStyle, aLine));
diff --git a/layout/generic/nsHTMLContainerFrame.h b/layout/generic/nsHTMLContainerFrame.h
index 1a653d923668..318620e6546a 100644
--- a/layout/generic/nsHTMLContainerFrame.h
+++ b/layout/generic/nsHTMLContainerFrame.h
@@ -144,6 +144,8 @@ protected:
    *  NOTE: This function assigns NS_STYLE_TEXT_DECORATION_NONE to
    *        aDecorations for text-less frames.  See bug 20163 for
    *        details.
+   *  NOTE: The results of color and style for each lines were not initialized
+   *        if the line wasn't included in aDecorations.
    */
   void GetTextDecorations(nsPresContext* aPresContext, 
                           PRBool aIsBlock,
diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
index a2e9085e6745..49375ecc0b94 100644
--- a/layout/generic/nsTextFrame.h
+++ b/layout/generic/nsTextFrame.h
@@ -448,18 +448,19 @@ protected:
     { }
 
     PRBool HasDecorationlines() {
-      return !!(mDecorations & (NS_STYLE_TEXT_DECORATION_UNDERLINE |
-                                NS_STYLE_TEXT_DECORATION_OVERLINE |
-                                NS_STYLE_TEXT_DECORATION_LINE_THROUGH));
+      return HasUnderline() || HasOverline() || HasStrikeout();
     }
     PRBool HasUnderline() {
-      return !!(mDecorations & NS_STYLE_TEXT_DECORATION_UNDERLINE);
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_UNDERLINE) &&
+             mUnderStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
     PRBool HasOverline() {
-      return !!(mDecorations & NS_STYLE_TEXT_DECORATION_OVERLINE);
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_OVERLINE) &&
+             mOverStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
     PRBool HasStrikeout() {
-      return !!(mDecorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH);
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) &&
+             mStrikeStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
   };
   TextDecorations GetTextDecorations(nsPresContext* aPresContext);
diff --git a/layout/reftests/text-decoration/decoration-style-quirks-ref.html b/layout/reftests/text-decoration/decoration-style-quirks-ref.html
index 4a7c41a4ed67..d9a1f870add3 100644
--- a/layout/reftests/text-decoration/decoration-style-quirks-ref.html
+++ b/layout/reftests/text-decoration/decoration-style-quirks-ref.html
@@ -40,3 +40,6 @@
                                -moz-text-decoration-style: double;">,
     and here has double decoration lines.</span>
 </p>
+<p>
+  Here is specified the decoration style as -moz-none.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-quirks.html b/layout/reftests/text-decoration/decoration-style-quirks.html
index 07b6e992d426..f65f1118a4ca 100644
--- a/layout/reftests/text-decoration/decoration-style-quirks.html
+++ b/layout/reftests/text-decoration/decoration-style-quirks.html
@@ -31,3 +31,7 @@
     here is specified as dashed decoration lines but should be ignored</span>,
   and here has double decoration lines.
 </p>
+<p style="text-decoration: underline line-through overline;
+          -moz-text-decoration-style: -moz-none;">
+  Here is specified the decoration style as -moz-none.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-standards-ref.html b/layout/reftests/text-decoration/decoration-style-standards-ref.html
index 5eae6b7998a2..06431c6ec93e 100644
--- a/layout/reftests/text-decoration/decoration-style-standards-ref.html
+++ b/layout/reftests/text-decoration/decoration-style-standards-ref.html
@@ -25,3 +25,6 @@
      here is specified as dashed decoration lines but should be ignored</span>,
   and here has double decoration lines.
 </p>
+<p>
+  Here is specified the decoration style as -moz-none.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-standards.html b/layout/reftests/text-decoration/decoration-style-standards.html
index 8752ba83f508..bfd7b3f854c4 100644
--- a/layout/reftests/text-decoration/decoration-style-standards.html
+++ b/layout/reftests/text-decoration/decoration-style-standards.html
@@ -23,3 +23,7 @@
     here is specified as dashed decoration lines but should be ignored</span>,
   and here has double decoration lines.
 </p>
+<p style="text-decoration: underline line-through overline;
+          -moz-text-decoration-style: -moz-none;">
+  Here is specified the decoration style as -moz-none.
+</p>
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 806ea7b1b7fe..3d2b9105c742 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -500,13 +500,15 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       fontMet->GetUnderline(offset, size);
       gfxFloat offsetPixel = presContext->AppUnitsToGfxUnits(offset);
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
-      if (decorations & NS_FONT_DECORATION_UNDERLINE) {
+      if ((decorations & NS_FONT_DECORATION_UNDERLINE) &&
+          underStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
         nsCSSRendering::PaintDecorationLine(ctx, underColor,
                           pt, gfxSize(width, sizePixel),
                           ascentPixel, offsetPixel,
                           NS_STYLE_TEXT_DECORATION_UNDERLINE, underStyle);
       }
-      if (decorations & NS_FONT_DECORATION_OVERLINE) {
+      if ((decorations & NS_FONT_DECORATION_OVERLINE) &&
+          overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
         nsCSSRendering::PaintDecorationLine(ctx, overColor,
                           pt, gfxSize(width, sizePixel),
                           ascentPixel, ascentPixel,
@@ -584,7 +586,8 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
 
     // Strikeout is drawn on top of the text, per
     // http://www.w3.org/TR/CSS21/zindex.html point 7.2.1.4.1.1.
-    if (decorations & NS_FONT_DECORATION_LINE_THROUGH) {
+    if ((decorations & NS_FONT_DECORATION_LINE_THROUGH) &&
+        strikeStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
       fontMet->GetStrikeout(offset, size);
       gfxFloat offsetPixel = presContext->AppUnitsToGfxUnits(offset);
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);

From 1adf21f3e7390057b9d3cc0cafd3ea22d1327685 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 23 Apr 2011 14:16:41 +0900
Subject: [PATCH 416/509] Bug 647421 -moz-text-decoration-color and
 -moz-text-decoration-style should be reset by text-decoration r=dbaron,
 sr=bzbarsky

---
 .../html/content/src/nsHTMLFontElement.cpp    |   6 +-
 content/smil/nsSMILCSSProperty.cpp            |   2 +
 dom/interfaces/css/nsIDOMCSS2Properties.idl   |   8 +-
 layout/base/nsCSSRendering.cpp                |  13 +--
 layout/base/nsCSSRendering.h                  |  12 +-
 layout/base/nsStyleConsts.h                   |  19 +--
 layout/generic/nsBlockFrame.cpp               |   3 +-
 layout/generic/nsHTMLContainerFrame.cpp       |  88 +++++++-------
 layout/generic/nsHTMLContainerFrame.h         |  10 +-
 layout/generic/nsHTMLReflowState.cpp          |   3 +-
 layout/generic/nsInlineFrame.cpp              |   3 +-
 layout/generic/nsTextFrame.h                  |   6 +-
 layout/generic/nsTextFrameThebes.cpp          |  44 ++++---
 .../decoration-color-quirks-ref.html          |   5 +
 .../decoration-color-quirks.html              |   6 +
 .../decoration-color-standards-ref.html       |   5 +
 .../decoration-color-standards.html           |   6 +
 .../decoration-style-quirks-ref.html          |   4 +
 .../decoration-style-quirks.html              |   5 +
 .../decoration-style-standards-ref.html       |   4 +
 .../decoration-style-standards.html           |   5 +
 layout/style/Declaration.cpp                  |  50 ++++++++
 layout/style/nsCSSParser.cpp                  | 110 ++++++++++++++++--
 layout/style/nsCSSPropList.h                  |  25 +++-
 layout/style/nsCSSProps.cpp                   |  27 +++--
 layout/style/nsCSSProps.h                     |   3 +-
 layout/style/nsCSSValue.cpp                   |  10 +-
 layout/style/nsComputedDOMStyle.cpp           |  72 ++++++++++--
 layout/style/nsComputedDOMStyle.h             |   2 +
 layout/style/nsRuleNode.cpp                   |  30 +++--
 layout/style/nsStyleContext.cpp               |  14 ++-
 layout/style/nsStyleContext.h                 |   6 +-
 layout/style/nsStyleStruct.cpp                |  15 +--
 layout/style/nsStyleStruct.h                  |   7 +-
 layout/style/test/property_database.js        |  26 ++++-
 layout/xul/base/src/nsTextBoxFrame.cpp        |  45 +++----
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp |   2 +-
 37 files changed, 505 insertions(+), 196 deletions(-)

diff --git a/content/html/content/src/nsHTMLFontElement.cpp b/content/html/content/src/nsHTMLFontElement.cpp
index 487870cfe8b5..9f67d30ba7ac 100644
--- a/content/html/content/src/nsHTMLFontElement.cpp
+++ b/content/html/content/src/nsHTMLFontElement.cpp
@@ -241,13 +241,13 @@ MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
   }
   if (aData->mSIDs & NS_STYLE_INHERIT_BIT(TextReset)) {
     // Make <a><font color="red">text</font></a> give the text a red underline
-    // in quirks mode.  The NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL flag only
+    // in quirks mode.  The NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL flag only
     // affects quirks mode rendering.
     const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::color);
     nscolor color;
     if (value && value->GetColorValue(color)) {
-      nsCSSValue* decoration = aData->ValueForTextDecoration();
-      PRInt32 newValue = NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL;
+      nsCSSValue* decoration = aData->ValueForTextDecorationLine();
+      PRInt32 newValue = NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL;
       if (decoration->GetUnit() == eCSSUnit_Enumerated) {
         newValue |= decoration->GetIntValue();
       }
diff --git a/content/smil/nsSMILCSSProperty.cpp b/content/smil/nsSMILCSSProperty.cpp
index 17433e068609..2242d9dade7e 100644
--- a/content/smil/nsSMILCSSProperty.cpp
+++ b/content/smil/nsSMILCSSProperty.cpp
@@ -273,7 +273,9 @@ nsSMILCSSProperty::IsPropertyAnimatable(nsCSSProperty aPropID)
     case eCSSProperty_stroke_opacity:
     case eCSSProperty_stroke_width:
     case eCSSProperty_text_anchor:
+    case eCSSProperty_text_blink:
     case eCSSProperty_text_decoration:
+    case eCSSProperty_text_decoration_line:
     case eCSSProperty_text_rendering:
     case eCSSProperty_visibility:
     case eCSSProperty_word_spacing:
diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl
index 6a8c0634dbaf..f18f4d9c274b 100644
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@@ -50,7 +50,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Style
  */
 
-[scriptable, uuid(f28df617-ac8b-48e0-8094-c4642ab43940)]
+[scriptable, uuid(35c15ba1-932d-4a95-8f08-ddcdd50c041a)]
 interface nsIDOMCSS2Properties : nsISupports
 {
            attribute DOMString        background;
@@ -677,9 +677,15 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        backgroundSize;
                                         // raises(DOMException) on setting
 
+           attribute DOMString        MozTextBlink;
+                                        // raises(DOMException) on setting
+
            attribute DOMString        MozTextDecorationColor;
                                         // raises(DOMException) on setting
 
+           attribute DOMString        MozTextDecorationLine;
+                                        // raises(DOMException) on setting
+
            attribute DOMString        MozTextDecorationStyle;
                                         // raises(DOMException) on setting
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 3e13675abb78..3981e9cefd36 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -3414,10 +3414,9 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
   if (rect.IsEmpty())
     return;
 
-  if (aDecoration != NS_STYLE_TEXT_DECORATION_UNDERLINE &&
-      aDecoration != NS_STYLE_TEXT_DECORATION_OVERLINE &&
-      aDecoration != NS_STYLE_TEXT_DECORATION_LINE_THROUGH)
-  {
+  if (aDecoration != NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE &&
+      aDecoration != NS_STYLE_TEXT_DECORATION_LINE_OVERLINE &&
+      aDecoration != NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
     NS_ERROR("Invalid decoration value!");
     return;
   }
@@ -3703,7 +3702,7 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
   gfxFloat baseline = NS_floor(aPt.y + aAscent + 0.5);
   gfxFloat offset = 0.0;
   switch (aDecoration) {
-    case NS_STYLE_TEXT_DECORATION_UNDERLINE:
+    case NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE:
       offset = aOffset;
       if (canLiftUnderline) {
         if (descentLimit < -offset + r.Height()) {
@@ -3717,10 +3716,10 @@ nsCSSRendering::GetTextDecorationRectInternal(const gfxPoint& aPt,
         }
       }
       break;
-    case NS_STYLE_TEXT_DECORATION_OVERLINE:
+    case NS_STYLE_TEXT_DECORATION_LINE_OVERLINE:
       offset = aOffset - lineHeight + r.Height();
       break;
-    case NS_STYLE_TEXT_DECORATION_LINE_THROUGH: {
+    case NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH: {
       gfxFloat extra = NS_floor(r.Height() / 2.0 + 0.5);
       extra = NS_MAX(extra, lineHeight);
       offset = aOffset - lineHeight + extra;
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index 0f9c97d16458..4831148297ef 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -301,9 +301,9 @@ struct nsCSSRendering {
    *                              the baseline of the text (if the value is
    *                              positive, the line is lifted up)
    *     @param aDecoration       which line will be painted. The value can be
-   *                              NS_STYLE_TEXT_DECORATION_UNDERLINE or
-   *                              NS_STYLE_TEXT_DECORATION_OVERLINE or
-   *                              NS_STYLE_TEXT_DECORATION_LINE_THROUGH.
+   *                              NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_OVERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH.
    *     @param aStyle            the style of the decoration line such as
    *                              NS_STYLE_TEXT_DECORATION_STYLE_*.
    *     @param aDescentLimit     If aDescentLimit is zero or larger and the
@@ -341,9 +341,9 @@ struct nsCSSRendering {
    *                              the baseline of the text (if the value is
    *                              positive, the line is lifted up)
    *     @param aDecoration       which line will be painted. The value can be
-   *                              NS_STYLE_TEXT_DECORATION_UNDERLINE or
-   *                              NS_STYLE_TEXT_DECORATION_OVERLINE or
-   *                              NS_STYLE_TEXT_DECORATION_LINE_THROUGH.
+   *                              NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_OVERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH.
    *     @param aStyle            the style of the decoration line such as
    *                              NS_STYLE_TEXT_DECORATION_STYLE_*.
    *     @param aDescentLimit     If aDescentLimit is zero or larger and the
diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index afa57d45520d..c8dedc6cee28 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -633,17 +633,20 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
 // Note: make sure that the largest NS_STYLE_TEXT_ALIGN_* value is smaller than
 // the smallest NS_STYLE_VERTICAL_ALIGN_* value below!
 
+// See nsStyleText
+#define NS_STYLE_TEXT_BLINK_NONE                0
+#define NS_STYLE_TEXT_BLINK_BLINK               1
+
 // See nsStyleText, nsStyleFont
-#define NS_STYLE_TEXT_DECORATION_NONE           0
-#define NS_STYLE_TEXT_DECORATION_UNDERLINE      NS_FONT_DECORATION_UNDERLINE
-#define NS_STYLE_TEXT_DECORATION_OVERLINE       NS_FONT_DECORATION_OVERLINE
-#define NS_STYLE_TEXT_DECORATION_LINE_THROUGH   NS_FONT_DECORATION_LINE_THROUGH
-#define NS_STYLE_TEXT_DECORATION_BLINK          0x08
-#define NS_STYLE_TEXT_DECORATION_PREF_ANCHORS   0x10
+#define NS_STYLE_TEXT_DECORATION_LINE_NONE         0
+#define NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE    NS_FONT_DECORATION_UNDERLINE
+#define NS_STYLE_TEXT_DECORATION_LINE_OVERLINE     NS_FONT_DECORATION_OVERLINE
+#define NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH NS_FONT_DECORATION_LINE_THROUGH
+#define NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS 0x10
 // OVERRIDE_ALL does not occur in stylesheets; it only comes from HTML
 // attribute mapping (and thus appears in computed data)
-#define NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL   0x20
-#define NS_STYLE_TEXT_DECORATION_LINES_MASK     (NS_STYLE_TEXT_DECORATION_UNDERLINE | NS_STYLE_TEXT_DECORATION_OVERLINE | NS_STYLE_TEXT_DECORATION_LINE_THROUGH)
+#define NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL 0x20
+#define NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK   (NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE | NS_STYLE_TEXT_DECORATION_LINE_OVERLINE | NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH)
 
 // See nsStyleText
 #define NS_STYLE_TEXT_DECORATION_STYLE_NONE     0 // not in CSS spec, mapped to -moz-none
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 476460559a5c..51dbbd21fbd9 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -859,8 +859,9 @@ nsRect
 nsBlockFrame::ComputeTightBounds(gfxContext* aContext) const
 {
   // be conservative
-  if (GetStyleContext()->HasTextDecorations())
+  if (GetStyleContext()->HasTextDecorationLines()) {
     return GetVisualOverflowRect();
+  }
   return ComputeSimpleTightBounds(aContext);
 }
 
diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp
index 0663822b539c..a39e0673cd46 100644
--- a/layout/generic/nsHTMLContainerFrame.cpp
+++ b/layout/generic/nsHTMLContainerFrame.cpp
@@ -130,12 +130,12 @@ nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
 
   nsPoint pt = ToReferenceFrame();
   nsHTMLContainerFrame* f = static_cast<nsHTMLContainerFrame*>(mFrame);
-  if (mDecoration == NS_STYLE_TEXT_DECORATION_UNDERLINE) {
+  if (mDecoration == NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) {
     gfxFloat underlineOffset = fontGroup->GetUnderlineOffset();
     f->PaintTextDecorationLine(aCtx->ThebesContext(), pt, mLine, mColor,
                                mStyle, underlineOffset, ascent,
                                metrics.underlineSize, mDecoration);
-  } else if (mDecoration == NS_STYLE_TEXT_DECORATION_OVERLINE) {
+  } else if (mDecoration == NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) {
     f->PaintTextDecorationLine(aCtx->ThebesContext(), pt, mLine, mColor,
                                mStyle, metrics.maxAscent, ascent,
                                metrics.underlineSize, mDecoration);
@@ -240,23 +240,24 @@ nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
   nsRect underlineRect;
   nsRect overlineRect;
   nsRect lineThroughRect;
-  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_UNDERLINE) {
+  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) {
     gfxSize size(lineWidth, metrics.underlineSize);
     underlineRect = nsCSSRendering::GetTextDecorationRect(presContext, size,
                        ascent, underlineOffset,
-                       NS_STYLE_TEXT_DECORATION_UNDERLINE, mUnderlineStyle);
+                       NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+                       mUnderlineStyle);
   }
-  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_OVERLINE) {
+  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) {
     gfxSize size(lineWidth, metrics.underlineSize);
     overlineRect = nsCSSRendering::GetTextDecorationRect(presContext, size,
                        ascent, metrics.maxAscent,
-                       NS_STYLE_TEXT_DECORATION_OVERLINE, mOverlineStyle);
+                       NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, mOverlineStyle);
   }
-  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) {
+  if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
     gfxSize size(lineWidth, metrics.strikeoutSize);
     lineThroughRect = nsCSSRendering::GetTextDecorationRect(presContext, size,
                        ascent, metrics.strikeoutOffset,
-                       NS_STYLE_TEXT_DECORATION_LINE_THROUGH,
+                       NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
                        mStrikeThroughStyle);
   }
 
@@ -276,13 +277,13 @@ nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
     }
 
     nsRect shadowRect(0, 0, 0, 0);
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_UNDERLINE) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) {
       shadowRect.UnionRect(shadowRect, underlineRect + linePt);
     }
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_OVERLINE) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) {
       shadowRect.UnionRect(shadowRect, overlineRect + linePt);
     }
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
       shadowRect.UnionRect(shadowRect, lineThroughRect + linePt);
     }
 
@@ -299,21 +300,23 @@ nsDisplayTextShadow::Paint(nsDisplayListBuilder* aBuilder,
       continue;
     }
 
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_UNDERLINE) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) {
       f->PaintTextDecorationLine(shadowCtx, pt, mLine, shadowColor,
                                  mUnderlineStyle, underlineOffset, ascent,
-                                 metrics.underlineSize, NS_STYLE_TEXT_DECORATION_UNDERLINE);
+                                 metrics.underlineSize,
+                                 NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE);
     }
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_OVERLINE) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) {
       f->PaintTextDecorationLine(shadowCtx, pt, mLine, shadowColor,
                                  mOverlineStyle, metrics.maxAscent, ascent,
-                                 metrics.underlineSize, NS_STYLE_TEXT_DECORATION_OVERLINE);
+                                 metrics.underlineSize,
+                                 NS_STYLE_TEXT_DECORATION_LINE_OVERLINE);
     }
-    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) {
+    if (mDecorationFlags & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
       f->PaintTextDecorationLine(shadowCtx, pt, mLine, shadowColor,
                                  mStrikeThroughStyle, metrics.strikeoutOffset,
                                  ascent, metrics.strikeoutSize,
-                                 NS_STYLE_TEXT_DECORATION_LINE_THROUGH);
+                                 NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH);
     }
 
     contextBoxBlur.DoPaint();
@@ -350,12 +353,12 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
   // nsTextFrame::PaintTextDecorations.  (See bug 1777.)
   nscolor underColor, overColor, strikeColor;
   PRUint8 underStyle, overStyle, strikeStyle;
-  PRUint8 decorations = NS_STYLE_TEXT_DECORATION_NONE;
+  PRUint8 decorations = NS_STYLE_TEXT_DECORATION_LINE_NONE;
   GetTextDecorations(PresContext(), aLine != nsnull, decorations, underColor, 
                      overColor, strikeColor, underStyle, overStyle,
                      strikeStyle);
 
-  if (decorations == NS_STYLE_TEXT_DECORATION_NONE) {
+  if (decorations == NS_STYLE_TEXT_DECORATION_LINE_NONE) {
     return NS_OK;
   }
 
@@ -369,24 +372,27 @@ nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  if ((decorations & NS_STYLE_TEXT_DECORATION_UNDERLINE) &&
+  if ((decorations & NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) &&
       underStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aBelowTextDecorations->AppendNewToTop(new (aBuilder)
-      nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_UNDERLINE,
+      nsDisplayTextDecoration(aBuilder, this,
+                              NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
                               underColor, underStyle, aLine));
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  if ((decorations & NS_STYLE_TEXT_DECORATION_OVERLINE) &&
+  if ((decorations & NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) &&
       overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aBelowTextDecorations->AppendNewToTop(new (aBuilder)
-      nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_OVERLINE,
+      nsDisplayTextDecoration(aBuilder, this,
+                              NS_STYLE_TEXT_DECORATION_LINE_OVERLINE,
                               overColor, overStyle, aLine));
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  if ((decorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) &&
+  if ((decorations & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) &&
       strikeStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
     rv = aAboveTextDecorations->AppendNewToTop(new (aBuilder)
-      nsDisplayTextDecoration(aBuilder, this, NS_STYLE_TEXT_DECORATION_LINE_THROUGH,
+      nsDisplayTextDecoration(aBuilder, this,
+                              NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
                               strikeColor, strikeStyle, aLine));
     NS_ENSURE_SUCCESS(rv, rv);
   }
@@ -473,8 +479,8 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
                                          PRUint8& aOverStyle,
                                          PRUint8& aStrikeStyle)
 {
-  aDecorations = NS_STYLE_TEXT_DECORATION_NONE;
-  if (!mStyleContext->HasTextDecorations()) {
+  aDecorations = NS_STYLE_TEXT_DECORATION_LINE_NONE;
+  if (!mStyleContext->HasTextDecorationLines()) {
     // This is a necessary, but not sufficient, condition for text
     // decorations.
     return; 
@@ -482,8 +488,8 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
 
   if (!aIsBlock) {
     const nsStyleTextReset* styleTextReset = this->GetStyleTextReset();
-    aDecorations = styleTextReset->mTextDecoration &
-                   NS_STYLE_TEXT_DECORATION_LINES_MASK;
+    aDecorations = styleTextReset->mTextDecorationLine &
+                   NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK;
     if (aDecorations) {
       nscolor color =
         this->GetVisitedDependentColor(eCSSProperty_text_decoration_color);
@@ -499,35 +505,35 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
     // must win.  At any point in the loop below, this variable
     // indicates which decorations we are still paying attention to;
     // it starts set to all possible decorations.
-    PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_LINES_MASK;
+    PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK;
 
     // walk tree
     for (nsIFrame* frame = this; frame; frame = frame->GetParent()) {
       const nsStyleTextReset* styleTextReset = frame->GetStyleTextReset();
-      PRUint8 decors = styleTextReset->mTextDecoration & decorMask;
+      PRUint8 decors = styleTextReset->mTextDecorationLine & decorMask;
       if (decors) {
         // A *new* text-decoration is found.
         nscolor color = frame->GetVisitedDependentColor(
                                  eCSSProperty_text_decoration_color);
         PRUint8 style = styleTextReset->GetDecorationStyle();
 
-        if (NS_STYLE_TEXT_DECORATION_UNDERLINE & decors) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE & decors) {
           aUnderColor = color;
           aUnderStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_UNDERLINE;
-          aDecorations |= NS_STYLE_TEXT_DECORATION_UNDERLINE;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
+          aDecorations |= NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
         }
-        if (NS_STYLE_TEXT_DECORATION_OVERLINE & decors) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_OVERLINE & decors) {
           aOverColor = color;
           aOverStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_OVERLINE;
-          aDecorations |= NS_STYLE_TEXT_DECORATION_OVERLINE;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
+          aDecorations |= NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
         }
-        if (NS_STYLE_TEXT_DECORATION_LINE_THROUGH & decors) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH & decors) {
           aStrikeColor = color;
           aStrikeStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
-          aDecorations |= NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
+          aDecorations |= NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
         }
       }
       // If all possible decorations have now been specified, no
@@ -565,7 +571,7 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
   if (aDecorations) {
     // If this frame contains no text, we're required to ignore this property
     if (!HasTextFrameDescendantOrInFlow(this)) {
-      aDecorations = NS_STYLE_TEXT_DECORATION_NONE;
+      aDecorations = NS_STYLE_TEXT_DECORATION_LINE_NONE;
     }
   }
 }
diff --git a/layout/generic/nsHTMLContainerFrame.h b/layout/generic/nsHTMLContainerFrame.h
index 318620e6546a..73a6b4378eff 100644
--- a/layout/generic/nsHTMLContainerFrame.h
+++ b/layout/generic/nsHTMLContainerFrame.h
@@ -141,7 +141,7 @@ protected:
    *                         in aDecoration is set. It is undefined otherwise.
    *                         The style is one of
    *                         NS_STYLE_TEXT_DECORATION_STYLE_* consts.
-   *  NOTE: This function assigns NS_STYLE_TEXT_DECORATION_NONE to
+   *  NOTE: This function assigns NS_STYLE_TEXT_DECORATION_LINE_NONE to
    *        aDecorations for text-less frames.  See bug 20163 for
    *        details.
    *  NOTE: The results of color and style for each lines were not initialized
@@ -172,10 +172,10 @@ protected:
    *                                i.e. negative offsets draws *below*
    *                                the baseline.
    *    @param aSize              the thickness of the line
-   *    @param aDecoration        which line will be painted
-   *                                i.e., NS_STYLE_TEXT_DECORATION_UNDERLINE or
-   *                                      NS_STYLE_TEXT_DECORATION_OVERLINE or
-   *                                      NS_STYLE_TEXT_DECORATION_LINE_THROUGH.
+   *    @param aDecoration        which line will be painted i.e.,
+   *                              NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_OVERLINE or
+   *                              NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH.
    */
   virtual void PaintTextDecorationLine(gfxContext* aCtx,
                                        const nsPoint& aPt,
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 2289089f85cf..f9a064231bd9 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1878,8 +1878,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
   mFlags.mBlinks = (parentReflowState && parentReflowState->mFlags.mBlinks);
   if (!mFlags.mBlinks && BlinkIsAllowed()) {
     const nsStyleTextReset* st = frame->GetStyleTextReset();
-    mFlags.mBlinks = 
-      ((st->mTextDecoration & NS_STYLE_TEXT_DECORATION_BLINK) != 0);
+    mFlags.mBlinks = (st->mTextBlink != NS_STYLE_TEXT_BLINK_NONE);
   }
 }
 
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 5bc94805fbdb..60c78a6ae222 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -230,8 +230,9 @@ nsRect
 nsInlineFrame::ComputeTightBounds(gfxContext* aContext) const
 {
   // be conservative
-  if (GetStyleContext()->HasTextDecorations())
+  if (GetStyleContext()->HasTextDecorationLines()) {
     return GetVisualOverflowRect();
+  }
   return ComputeSimpleTightBounds(aContext);
 }
 
diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
index 49375ecc0b94..6907328cb721 100644
--- a/layout/generic/nsTextFrame.h
+++ b/layout/generic/nsTextFrame.h
@@ -451,15 +451,15 @@ protected:
       return HasUnderline() || HasOverline() || HasStrikeout();
     }
     PRBool HasUnderline() {
-      return (mDecorations & NS_STYLE_TEXT_DECORATION_UNDERLINE) &&
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE) &&
              mUnderStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
     PRBool HasOverline() {
-      return (mDecorations & NS_STYLE_TEXT_DECORATION_OVERLINE) &&
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_LINE_OVERLINE) &&
              mOverStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
     PRBool HasStrikeout() {
-      return (mDecorations & NS_STYLE_TEXT_DECORATION_LINE_THROUGH) &&
+      return (mDecorations & NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) &&
              mStrikeStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE;
     }
   };
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index e7a69892c8af..19c94708d7f9 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -4242,21 +4242,20 @@ nsTextFrame::GetTextDecorations(nsPresContext* aPresContext)
   // A mask of all possible decorations.
   // FIXME: Per spec, we still need to draw all relevant decorations
   // from ancestors, not just the nearest one from each.
-  PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_UNDERLINE | 
-                      NS_STYLE_TEXT_DECORATION_OVERLINE |
-                      NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
+  PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK;
 
   PRBool isChild; // ignored
   for (nsIFrame* f = this; decorMask && f;
        NS_SUCCEEDED(f->GetParentStyleContextFrame(aPresContext, &f, &isChild))
          || (f = nsnull)) {
     nsStyleContext* context = f->GetStyleContext();
-    if (!context->HasTextDecorations()) {
+    if (!context->HasTextDecorationLines()) {
       break;
     }
     const nsStyleTextReset* styleText = context->GetStyleTextReset();
     if (!useOverride && 
-        (NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL & styleText->mTextDecoration)) {
+        (NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL &
+           styleText->mTextDecorationLine)) {
       // This handles the <a href="blah.html"><font color="green">La 
       // la la</font></a> case. The link underline should be green.
       useOverride = PR_TRUE;
@@ -4265,7 +4264,7 @@ nsTextFrame::GetTextDecorations(nsPresContext* aPresContext)
     }
 
     // FIXME: see above (remove this check)
-    PRUint8 useDecorations = decorMask & styleText->mTextDecoration;
+    PRUint8 useDecorations = decorMask & styleText->mTextDecorationLine;
     if (useDecorations) {// a decoration defined here
       nscolor color = context->GetVisitedDependentColor(
                                  eCSSProperty_text_decoration_color);
@@ -4279,23 +4278,23 @@ nsTextFrame::GetTextDecorations(nsPresContext* aPresContext)
       // containing line; otherwise use the element's font); when
       // drawing it should always be relative to the line baseline.
       // This way we move the decorations for relative positioning.
-      if (NS_STYLE_TEXT_DECORATION_UNDERLINE & useDecorations) {
+      if (NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE & useDecorations) {
         decorations.mUnderColor = useOverride ? overrideColor : color;
         decorations.mUnderStyle = styleText->GetDecorationStyle();
-        decorMask &= ~NS_STYLE_TEXT_DECORATION_UNDERLINE;
-        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_UNDERLINE;
+        decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
+        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
       }
-      if (NS_STYLE_TEXT_DECORATION_OVERLINE & useDecorations) {
+      if (NS_STYLE_TEXT_DECORATION_LINE_OVERLINE & useDecorations) {
         decorations.mOverColor = useOverride ? overrideColor : color;
         decorations.mOverStyle = styleText->GetDecorationStyle();
-        decorMask &= ~NS_STYLE_TEXT_DECORATION_OVERLINE;
-        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_OVERLINE;
+        decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
+        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
       }
-      if (NS_STYLE_TEXT_DECORATION_LINE_THROUGH & useDecorations) {
+      if (NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH & useDecorations) {
         decorations.mStrikeColor = useOverride ? overrideColor : color;
         decorations.mStrikeStyle = styleText->GetDecorationStyle();
-        decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
-        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
+        decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
+        decorations.mDecorations |= NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
       }
     }
 
@@ -4387,7 +4386,7 @@ nsTextFrame::PaintTextDecorations(gfxContext* aCtx, const gfxRect& aDirtyRect,
     size.height = fontMetrics.underlineSize;
     nsCSSRendering::PaintDecorationLine(
       aCtx, lineColor, pt, size, ascent, fontMetrics.maxAscent,
-      NS_STYLE_TEXT_DECORATION_OVERLINE, decorations.mOverStyle);
+      NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, decorations.mOverStyle);
   }
   if (decorations.HasUnderline()) {
     lineColor = aOverrideColor ? *aOverrideColor : decorations.mUnderColor;
@@ -4395,7 +4394,7 @@ nsTextFrame::PaintTextDecorations(gfxContext* aCtx, const gfxRect& aDirtyRect,
     gfxFloat offset = aProvider.GetFontGroup()->GetUnderlineOffset();
     nsCSSRendering::PaintDecorationLine(
       aCtx, lineColor, pt, size, ascent, offset,
-      NS_STYLE_TEXT_DECORATION_UNDERLINE, decorations.mUnderStyle);
+      NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, decorations.mUnderStyle);
   }
   if (decorations.HasStrikeout()) {
     lineColor = aOverrideColor ? *aOverrideColor : decorations.mStrikeColor;
@@ -4403,7 +4402,7 @@ nsTextFrame::PaintTextDecorations(gfxContext* aCtx, const gfxRect& aDirtyRect,
     gfxFloat offset = fontMetrics.strikeoutOffset;
     nsCSSRendering::PaintDecorationLine(
       aCtx, lineColor, pt, size, ascent, offset,
-      NS_STYLE_TEXT_DECORATION_LINE_THROUGH, decorations.mStrikeStyle);
+      NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH, decorations.mStrikeStyle);
   }
 }
 
@@ -4549,7 +4548,7 @@ static void DrawSelectionDecorations(gfxContext* aContext, SelectionType aType,
   size.height *= relativeSize;
   nsCSSRendering::PaintDecorationLine(
     aContext, color, pt, size, aAscent, aFontMetrics.underlineOffset,
-    NS_STYLE_TEXT_DECORATION_UNDERLINE, style, descentLimit);
+    NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, style, descentLimit);
 }
 
 /**
@@ -5340,9 +5339,8 @@ nsTextFrame::CombineSelectionUnderlineRect(nsPresContext* aPresContext,
     size.height *= relativeSize;
     decorationArea =
       nsCSSRendering::GetTextDecorationRect(aPresContext, size,
-                                            ascent, underlineOffset,
-                                            NS_STYLE_TEXT_DECORATION_UNDERLINE,
-                                            style, descentLimit);
+        ascent, underlineOffset, NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+        style, descentLimit);
     aRect.UnionRect(aRect, decorationArea);
   }
   DestroySelectionDetails(details);
@@ -6315,7 +6313,7 @@ RoundOut(const gfxRect& aRect)
 nsRect
 nsTextFrame::ComputeTightBounds(gfxContext* aContext) const
 {
-  if ((GetStyleContext()->HasTextDecorations() &&
+  if ((GetStyleContext()->HasTextDecorationLines() &&
        eCompatibility_NavQuirks == PresContext()->CompatibilityMode()) ||
       (GetStateBits() & TEXT_HYPHEN_BREAK)) {
     // This is conservative, but OK.
diff --git a/layout/reftests/text-decoration/decoration-color-quirks-ref.html b/layout/reftests/text-decoration/decoration-color-quirks-ref.html
index c322a7650840..6c7c7bdda0f9 100644
--- a/layout/reftests/text-decoration/decoration-color-quirks-ref.html
+++ b/layout/reftests/text-decoration/decoration-color-quirks-ref.html
@@ -63,3 +63,8 @@
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
+<p style="color: blue;
+          text-decoration: underline line-through overline;">
+  Here has blue decoration lines even though its color is specified as red
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-color-quirks.html b/layout/reftests/text-decoration/decoration-color-quirks.html
index a6096988098e..c505fdde699e 100644
--- a/layout/reftests/text-decoration/decoration-color-quirks.html
+++ b/layout/reftests/text-decoration/decoration-color-quirks.html
@@ -71,3 +71,9 @@
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
+<p style="color: blue;
+          -moz-text-decoration-color: red;
+          text-decoration: underline line-through overline;">
+  Here has blue decoration lines even though its color is specified as red
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-color-standards-ref.html b/layout/reftests/text-decoration/decoration-color-standards-ref.html
index c59c066be994..1e04ad1f15b1 100644
--- a/layout/reftests/text-decoration/decoration-color-standards-ref.html
+++ b/layout/reftests/text-decoration/decoration-color-standards-ref.html
@@ -65,3 +65,8 @@
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
+<p style="color: blue;
+          text-decoration: underline line-through overline;">
+  Here has blue decoration lines even though its color is specified as red
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-color-standards.html b/layout/reftests/text-decoration/decoration-color-standards.html
index 8c273a230ed2..e761352fda7c 100644
--- a/layout/reftests/text-decoration/decoration-color-standards.html
+++ b/layout/reftests/text-decoration/decoration-color-standards.html
@@ -70,3 +70,9 @@
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
+<p style="color: blue;
+          -moz-text-decoration-color: red;
+          text-decoration: underline line-through overline;">
+  Here has blue decoration lines even though its color is specified as red
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-quirks-ref.html b/layout/reftests/text-decoration/decoration-style-quirks-ref.html
index d9a1f870add3..be92e9bd81cd 100644
--- a/layout/reftests/text-decoration/decoration-style-quirks-ref.html
+++ b/layout/reftests/text-decoration/decoration-style-quirks-ref.html
@@ -43,3 +43,7 @@
 <p>
   Here is specified the decoration style as -moz-none.
 </p>
+<p style="text-decoration: underline line-through overline;">
+  Here has solid decoration lines even if its style is specified as dotted
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-quirks.html b/layout/reftests/text-decoration/decoration-style-quirks.html
index f65f1118a4ca..85ee31b14467 100644
--- a/layout/reftests/text-decoration/decoration-style-quirks.html
+++ b/layout/reftests/text-decoration/decoration-style-quirks.html
@@ -35,3 +35,8 @@
           -moz-text-decoration-style: -moz-none;">
   Here is specified the decoration style as -moz-none.
 </p>
+<p style="-moz-text-decoration-style: dotted;
+          text-decoration: underline line-through overline;">
+  Here has solid decoration lines even if its style is specified as dotted
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-standards-ref.html b/layout/reftests/text-decoration/decoration-style-standards-ref.html
index 06431c6ec93e..56aa1e8d1eda 100644
--- a/layout/reftests/text-decoration/decoration-style-standards-ref.html
+++ b/layout/reftests/text-decoration/decoration-style-standards-ref.html
@@ -28,3 +28,7 @@
 <p>
   Here is specified the decoration style as -moz-none.
 </p>
+<p style="text-decoration: underline line-through overline;">
+  Here has solid decoration lines even if its style is specified as dotted
+  before text-decoration.
+</p>
diff --git a/layout/reftests/text-decoration/decoration-style-standards.html b/layout/reftests/text-decoration/decoration-style-standards.html
index bfd7b3f854c4..b815b13a4687 100644
--- a/layout/reftests/text-decoration/decoration-style-standards.html
+++ b/layout/reftests/text-decoration/decoration-style-standards.html
@@ -27,3 +27,8 @@
           -moz-text-decoration-style: -moz-none;">
   Here is specified the decoration style as -moz-none.
 </p>
+<p style="-moz-text-decoration-style: dotted;
+          text-decoration: underline line-through overline;">
+  Here has solid decoration lines even if its style is specified as dotted
+  before text-decoration.
+</p>
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 2b7aa829e563..19fffe670564 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -580,6 +580,56 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
         xValue.AppendToString(eCSSProperty_overflow_x, aValue);
       break;
     }
+    case eCSSProperty_text_decoration: {
+      // If text-decoration-color or text-decoration-style isn't initial value,
+      // we cannot serialize the text-decoration shorthand value.
+      const nsCSSValue &decorationColor =
+        *data->ValueFor(eCSSProperty_text_decoration_color);
+      const nsCSSValue &decorationStyle =
+        *data->ValueFor(eCSSProperty_text_decoration_style);
+
+      NS_ABORT_IF_FALSE(decorationStyle.GetUnit() == eCSSUnit_Enumerated,
+                        nsPrintfCString(32, "bad text-decoration-style unit %d",
+                                        decorationStyle.GetUnit()).get());
+
+      if (decorationColor.GetUnit() != eCSSUnit_Enumerated ||
+          decorationColor.GetIntValue() != NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR ||
+          decorationStyle.GetIntValue() !=
+            NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
+        return;
+      }
+
+      const nsCSSValue &textBlink =
+        *data->ValueFor(eCSSProperty_text_blink);
+      const nsCSSValue &decorationLine =
+        *data->ValueFor(eCSSProperty_text_decoration_line);
+
+      NS_ABORT_IF_FALSE(textBlink.GetUnit() == eCSSUnit_Enumerated,
+                        nsPrintfCString(32, "bad text-blink unit %d",
+                                        textBlink.GetUnit()).get());
+      NS_ABORT_IF_FALSE(decorationLine.GetUnit() == eCSSUnit_Enumerated,
+                        nsPrintfCString(32, "bad text-decoration-line unit %d",
+                                        decorationLine.GetUnit()).get());
+
+      PRBool blinkNone = (textBlink.GetIntValue() == NS_STYLE_TEXT_BLINK_NONE);
+      PRBool lineNone =
+        (decorationLine.GetIntValue() == NS_STYLE_TEXT_DECORATION_LINE_NONE);
+
+      if (blinkNone && lineNone) {
+        AppendValueToString(eCSSProperty_text_decoration_line, aValue);
+      } else {
+        if (!blinkNone) {
+          AppendValueToString(eCSSProperty_text_blink, aValue);
+        }
+        if (!lineNone) {
+          if (!aValue.IsEmpty()) {
+            aValue.Append(PRUnichar(' '));
+          }
+          AppendValueToString(eCSSProperty_text_decoration_line, aValue);
+        }
+      }
+      break;
+    }
     case eCSSProperty_transition: {
       const nsCSSValue &transProp =
         *data->ValueFor(eCSSProperty_transition_property);
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index f7eeceb6cbaf..bb7c9265afdf 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -522,7 +522,8 @@ protected:
   PRBool ParsePadding();
   PRBool ParseQuotes();
   PRBool ParseSize();
-  PRBool ParseTextDecoration(nsCSSValue& aValue);
+  PRBool ParseTextDecoration();
+  PRBool ParseTextDecorationLine(nsCSSValue& aValue);
 
   PRBool ParseShadowItem(nsCSSValue& aValue, PRBool aIsBoxShadow);
   PRBool ParseShadowList(nsCSSProperty aProperty);
@@ -5566,6 +5567,8 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
     return ParseQuotes();
   case eCSSProperty_size:
     return ParseSize();
+  case eCSSProperty_text_decoration:
+    return ParseTextDecoration();
   case eCSSProperty__moz_transform:
     return ParseMozTransform();
   case eCSSProperty__moz_transform_origin:
@@ -5625,8 +5628,8 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
         return ParseFontWeight(aValue);
       case eCSSProperty_marks:
         return ParseMarks(aValue);
-      case eCSSProperty_text_decoration:
-        return ParseTextDecoration(aValue);
+      case eCSSProperty_text_decoration_line:
+        return ParseTextDecorationLine(aValue);
       default:
         NS_ABORT_IF_FALSE(PR_FALSE, "should not reach here");
         return PR_FALSE;
@@ -7944,19 +7947,108 @@ CSSParserImpl::ParseSize()
 }
 
 PRBool
-CSSParserImpl::ParseTextDecoration(nsCSSValue& aValue)
+CSSParserImpl::ParseTextDecoration()
 {
-  if (ParseVariant(aValue, VARIANT_HK, nsCSSProps::kTextDecorationKTable)) {
+  enum {
+    eDecorationNone         = 0x00,
+    eDecorationUnderline    = 0x01,
+    eDecorationOverline     = 0x02,
+    eDecorationLineThrough  = 0x04,
+    eDecorationBlink        = 0x08,
+    eDecorationPrefAnchors  = 0x10
+  };
+
+  PR_STATIC_ASSERT(eDecorationUnderline ==
+                   NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE);
+  PR_STATIC_ASSERT(eDecorationOverline ==
+                   NS_STYLE_TEXT_DECORATION_LINE_OVERLINE);
+  PR_STATIC_ASSERT(eDecorationLineThrough ==
+                   NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH);
+  PR_STATIC_ASSERT(eDecorationPrefAnchors ==
+                   NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS);
+
+  static const PRInt32 kTextDecorationKTable[] = {
+    eCSSKeyword_none,                   eDecorationNone,
+    eCSSKeyword_underline,              eDecorationUnderline,
+    eCSSKeyword_overline,               eDecorationOverline,
+    eCSSKeyword_line_through,           eDecorationLineThrough,
+    eCSSKeyword_blink,                  eDecorationBlink,
+    eCSSKeyword__moz_anchor_decoration, eDecorationPrefAnchors,
+    eCSSKeyword_UNKNOWN,-1
+  };
+
+  nsCSSValue value;
+  if (!ParseVariant(value, VARIANT_HK, kTextDecorationKTable)) {
+    return PR_FALSE;
+  }
+
+  nsCSSValue blink, line, style, color;
+  switch (value.GetUnit()) {
+    case eCSSUnit_Enumerated: {
+      // We shouldn't accept decoration line style and color via
+      // text-decoration.
+      color.SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR,
+                        eCSSUnit_Enumerated);
+      style.SetIntValue(NS_STYLE_TEXT_DECORATION_STYLE_SOLID,
+                        eCSSUnit_Enumerated);
+
+      PRInt32 intValue = value.GetIntValue();
+      if (intValue == eDecorationNone) {
+        blink.SetIntValue(NS_STYLE_TEXT_BLINK_NONE, eCSSUnit_Enumerated);
+        line.SetIntValue(NS_STYLE_TEXT_DECORATION_LINE_NONE,
+                         eCSSUnit_Enumerated);
+        break;
+      }
+
+      // look for more keywords
+      nsCSSValue keyword;
+      PRInt32 index;
+      for (index = 0; index < 3; index++) {
+        if (!ParseEnum(keyword, kTextDecorationKTable)) {
+          break;
+        }
+        PRInt32 newValue = keyword.GetIntValue();
+        if (newValue == eDecorationNone || newValue & intValue) {
+          // 'none' keyword in conjuction with others is not allowed, and
+          // duplicate keyword is not allowed.
+          return PR_FALSE;
+        }
+        intValue |= newValue;
+      }
+
+      blink.SetIntValue((intValue & eDecorationBlink) != 0 ?
+                          NS_STYLE_TEXT_BLINK_BLINK : NS_STYLE_TEXT_BLINK_NONE,
+                        eCSSUnit_Enumerated);
+      line.SetIntValue((intValue & ~eDecorationBlink), eCSSUnit_Enumerated);
+      break;
+    }
+    default:
+      blink = line = color = style = value;
+      break;
+  }
+
+  AppendValue(eCSSProperty_text_blink, blink);
+  AppendValue(eCSSProperty_text_decoration_line, line);
+  AppendValue(eCSSProperty_text_decoration_color, color);
+  AppendValue(eCSSProperty_text_decoration_style, style);
+
+  return PR_TRUE;
+}
+
+PRBool
+CSSParserImpl::ParseTextDecorationLine(nsCSSValue& aValue)
+{
+  if (ParseVariant(aValue, VARIANT_HK, nsCSSProps::kTextDecorationLineKTable)) {
     if (eCSSUnit_Enumerated == aValue.GetUnit()) {
       PRInt32 intValue = aValue.GetIntValue();
-      if (intValue != NS_STYLE_TEXT_DECORATION_NONE) {
+      if (intValue != NS_STYLE_TEXT_DECORATION_LINE_NONE) {
         // look for more keywords
         nsCSSValue  keyword;
         PRInt32 index;
-        for (index = 0; index < 3; index++) {
-          if (ParseEnum(keyword, nsCSSProps::kTextDecorationKTable)) {
+        for (index = 0; index < 2; index++) {
+          if (ParseEnum(keyword, nsCSSProps::kTextDecorationLineKTable)) {
             PRInt32 newValue = keyword.GetIntValue();
-            if (newValue == NS_STYLE_TEXT_DECORATION_NONE ||
+            if (newValue == NS_STYLE_TEXT_DECORATION_LINE_NONE ||
                 newValue & intValue) {
               // 'none' keyword in conjuction with others is not allowed, and
               // duplicate keyword is not allowed.
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index d04f73e7e2e1..c6ea1a2aebae 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -2130,16 +2130,20 @@ CSS_PROP_TEXT(
     kTextAlignKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
-CSS_PROP_TEXTRESET(
+CSS_PROP_SHORTHAND(
     text-decoration,
     text_decoration,
     TextDecoration,
+    CSS_PROPERTY_PARSE_FUNCTION)
+CSS_PROP_TEXTRESET(
+    -moz-text-blink,
+    text_blink,
+    CSS_PROP_DOMPROP_PREFIXED(TextBlink),
     CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_PARSER_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
-    0,
-    kTextDecorationKTable,
-    offsetof(nsStyleTextReset, mTextDecoration),
+    VARIANT_HK,
+    kTextBlinkKTable,
+    offsetof(nsStyleTextReset, mTextBlink),
     eStyleAnimType_EnumU8)
 CSS_PROP_TEXTRESET(
     -moz-text-decoration-color,
@@ -2152,6 +2156,17 @@ CSS_PROP_TEXTRESET(
     kBorderColorKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Custom)
+CSS_PROP_TEXTRESET(
+    -moz-text-decoration-line,
+    text_decoration_line,
+    CSS_PROP_DOMPROP_PREFIXED(TextDecorationLine),
+    CSS_PROPERTY_PARSE_VALUE |
+        CSS_PROPERTY_VALUE_PARSER_FUNCTION |
+        CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
+    0,
+    kTextDecorationLineKTable,
+    offsetof(nsStyleTextReset, mTextDecorationLine),
+    eStyleAnimType_EnumU8)
 CSS_PROP_TEXTRESET(
     -moz-text-decoration-style,
     text_decoration_style,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 59436116b540..701d4d00f7e5 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1184,13 +1184,18 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
-const PRInt32 nsCSSProps::kTextDecorationKTable[] = {
-  eCSSKeyword_none, NS_STYLE_TEXT_DECORATION_NONE,
-  eCSSKeyword_underline, NS_STYLE_TEXT_DECORATION_UNDERLINE,
-  eCSSKeyword_overline, NS_STYLE_TEXT_DECORATION_OVERLINE,
-  eCSSKeyword_line_through, NS_STYLE_TEXT_DECORATION_LINE_THROUGH,
-  eCSSKeyword_blink, NS_STYLE_TEXT_DECORATION_BLINK,
-  eCSSKeyword__moz_anchor_decoration, NS_STYLE_TEXT_DECORATION_PREF_ANCHORS,
+const PRInt32 nsCSSProps::kTextBlinkKTable[] = {
+  eCSSKeyword_none, NS_STYLE_TEXT_BLINK_NONE,
+  eCSSKeyword_blink, NS_STYLE_TEXT_BLINK_BLINK,
+  eCSSKeyword_UNKNOWN,-1
+};
+
+const PRInt32 nsCSSProps::kTextDecorationLineKTable[] = {
+  eCSSKeyword_none, NS_STYLE_TEXT_DECORATION_LINE_NONE,
+  eCSSKeyword_underline, NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+  eCSSKeyword_overline, NS_STYLE_TEXT_DECORATION_LINE_OVERLINE,
+  eCSSKeyword_line_through, NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
+  eCSSKeyword__moz_anchor_decoration, NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS,
   eCSSKeyword_UNKNOWN,-1
 };
 
@@ -2004,6 +2009,14 @@ static const nsCSSProperty gPaddingEndSubpropTable[] = {
   eCSSProperty_UNKNOWN
 };
 
+static const nsCSSProperty gTextDecorationSubpropTable[] = {
+  eCSSProperty_text_blink,
+  eCSSProperty_text_decoration_color,
+  eCSSProperty_text_decoration_line,
+  eCSSProperty_text_decoration_style,
+  eCSSProperty_UNKNOWN
+};
+
 static const nsCSSProperty gTransitionSubpropTable[] = {
   eCSSProperty_transition_property,
   eCSSProperty_transition_duration,
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index fd184ed916a0..021a614160dd 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -408,7 +408,8 @@ public:
   static const PRInt32 kStackSizingKTable[];
   static const PRInt32 kTableLayoutKTable[];
   static const PRInt32 kTextAlignKTable[];
-  static const PRInt32 kTextDecorationKTable[];
+  static const PRInt32 kTextBlinkKTable[];
+  static const PRInt32 kTextDecorationLineKTable[];
   static const PRInt32 kTextDecorationStyleKTable[];
   static const PRInt32 kTextTransformKTable[];
   static const PRInt32 kTransitionTimingFunctionKTable[];
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index c1dcc567151f..4749726275b8 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -790,19 +790,19 @@ nsCSSValue::AppendToString(nsCSSProperty aProperty, nsAString& aResult) const
     aResult.AppendInt(GetIntValue(), 10);
   }
   else if (eCSSUnit_Enumerated == unit) {
-    if (eCSSProperty_text_decoration == aProperty) {
+    if (eCSSProperty_text_decoration_line == aProperty) {
       PRInt32 intValue = GetIntValue();
-      if (NS_STYLE_TEXT_DECORATION_NONE == intValue) {
+      if (NS_STYLE_TEXT_DECORATION_LINE_NONE == intValue) {
         AppendASCIItoUTF16(nsCSSProps::LookupPropertyValue(aProperty, intValue),
                            aResult);
       } else {
         // Ignore the "override all" internal value.
         // (It doesn't have a string representation.)
-        intValue &= ~NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL;
+        intValue &= ~NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL;
         nsStyleUtil::AppendBitmaskCSSValue(
           aProperty, intValue,
-          NS_STYLE_TEXT_DECORATION_UNDERLINE,
-          NS_STYLE_TEXT_DECORATION_PREF_ANCHORS,
+          NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+          NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS,
           aResult);
       }
     }
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index e8c00c470f25..272a674845a7 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -2261,26 +2261,48 @@ nsComputedDOMStyle::DoGetTextAlign()
   return val;
 }
 
+nsIDOMCSSValue*
+nsComputedDOMStyle::DoGetMozTextBlink()
+{
+  nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
+
+  val->SetIdent(
+    nsCSSProps::ValueToKeywordEnum(GetStyleTextReset()->mTextBlink,
+                                   nsCSSProps::kTextBlinkKTable));
+
+  return val;
+}
+
 nsIDOMCSSValue*
 nsComputedDOMStyle::DoGetTextDecoration()
 {
   nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
 
-  PRInt32 intValue = GetStyleTextReset()->mTextDecoration;
+  PRUint8 line = GetStyleTextReset()->mTextDecorationLine;
+  // Clear the -moz-anchor-decoration bit and the OVERRIDE_ALL bits -- we
+  // don't want these to appear in the computed style.
+  line &= ~(NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS |
+            NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL);
+  PRUint8 blink = GetStyleTextReset()->mTextBlink;
 
-  if (NS_STYLE_TEXT_DECORATION_NONE == intValue) {
+  if (blink == NS_STYLE_TEXT_BLINK_NONE &&
+      line == NS_STYLE_TEXT_DECORATION_LINE_NONE) {
     val->SetIdent(eCSSKeyword_none);
   } else {
-    nsAutoString decorationString;
-    // Clear the -moz-anchor-decoration bit and the OVERRIDE_ALL bits -- we
-    // don't want these to appear in the computed style.
-    intValue &= ~(NS_STYLE_TEXT_DECORATION_PREF_ANCHORS |
-                  NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL);
-    nsStyleUtil::AppendBitmaskCSSValue(eCSSProperty_text_decoration, intValue,
-                                       NS_STYLE_TEXT_DECORATION_UNDERLINE,
-                                       NS_STYLE_TEXT_DECORATION_BLINK,
-                                       decorationString);
-    val->SetString(decorationString);
+    nsAutoString str;
+    if (line != NS_STYLE_TEXT_DECORATION_LINE_NONE) {
+      nsStyleUtil::AppendBitmaskCSSValue(eCSSProperty_text_decoration_line,
+        line, NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+        NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH, str);
+    }
+    if (blink != NS_STYLE_TEXT_BLINK_NONE) {
+      if (!str.IsEmpty()) {
+        str.Append(PRUnichar(' '));
+      }
+      nsStyleUtil::AppendBitmaskCSSValue(eCSSProperty_text_blink, blink,
+        NS_STYLE_TEXT_BLINK_BLINK, NS_STYLE_TEXT_BLINK_BLINK, str);
+    }
+    val->SetString(str);
   }
 
   return val;
@@ -2303,6 +2325,30 @@ nsComputedDOMStyle::DoGetMozTextDecorationColor()
   return val;
 }
 
+nsIDOMCSSValue*
+nsComputedDOMStyle::DoGetMozTextDecorationLine()
+{
+  nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
+
+  PRInt32 intValue = GetStyleTextReset()->mTextDecorationLine;
+
+  if (NS_STYLE_TEXT_DECORATION_LINE_NONE == intValue) {
+    val->SetIdent(eCSSKeyword_none);
+  } else {
+    nsAutoString decorationLineString;
+    // Clear the -moz-anchor-decoration bit and the OVERRIDE_ALL bits -- we
+    // don't want these to appear in the computed style.
+    intValue &= ~(NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS |
+                  NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL);
+    nsStyleUtil::AppendBitmaskCSSValue(eCSSProperty_text_decoration_line,
+      intValue, NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
+      NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH, decorationLineString);
+    val->SetString(decorationLineString);
+  }
+
+  return val;
+}
+
 nsIDOMCSSValue*
 nsComputedDOMStyle::DoGetMozTextDecorationStyle()
 {
@@ -4347,7 +4393,9 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(stroke_width,                  StrokeWidth),
     COMPUTED_STYLE_MAP_ENTRY(text_anchor,                   TextAnchor),
     COMPUTED_STYLE_MAP_ENTRY(text_rendering,                TextRendering),
+    COMPUTED_STYLE_MAP_ENTRY(text_blink,                    MozTextBlink),
     COMPUTED_STYLE_MAP_ENTRY(text_decoration_color,         MozTextDecorationColor),
+    COMPUTED_STYLE_MAP_ENTRY(text_decoration_line,          MozTextDecorationLine),
     COMPUTED_STYLE_MAP_ENTRY(text_decoration_style,         MozTextDecorationStyle)
 
   };
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 44bd4263a848..30287fa586e6 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -308,8 +308,10 @@ private:
   /* Text Properties */
   nsIDOMCSSValue* DoGetLineHeight();
   nsIDOMCSSValue* DoGetTextAlign();
+  nsIDOMCSSValue* DoGetMozTextBlink();
   nsIDOMCSSValue* DoGetTextDecoration();
   nsIDOMCSSValue* DoGetMozTextDecorationColor();
+  nsIDOMCSSValue* DoGetMozTextDecorationLine();
   nsIDOMCSSValue* DoGetMozTextDecorationStyle();
   nsIDOMCSSValue* DoGetTextIndent();
   nsIDOMCSSValue* DoGetTextTransform();
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 22c8cb3cbee3..9971332458d2 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -3371,26 +3371,32 @@ nsRuleNode::ComputeTextResetData(void* aStartStruct,
     }
   }
 
-  // text-decoration: enum (bit field), inherit, initial
-  const nsCSSValue* decorationValue = aRuleData->ValueForTextDecoration();
-  if (eCSSUnit_Enumerated == decorationValue->GetUnit()) {
-    PRInt32 td = decorationValue->GetIntValue();
-    text->mTextDecoration = td;
-    if (td & NS_STYLE_TEXT_DECORATION_PREF_ANCHORS) {
+  // text-blink: enum, inherit, initial
+  SetDiscrete(*aRuleData->ValueForTextBlink(), text->mTextBlink,
+              canStoreInRuleTree, SETDSC_ENUMERATED, parentText->mTextBlink,
+              NS_STYLE_TEXT_BLINK_NONE, 0, 0, 0, 0);
+
+  // text-decoration-line: enum (bit field), inherit, initial
+  const nsCSSValue* decorationLineValue =
+    aRuleData->ValueForTextDecorationLine();
+  if (eCSSUnit_Enumerated == decorationLineValue->GetUnit()) {
+    PRInt32 td = decorationLineValue->GetIntValue();
+    text->mTextDecorationLine = td;
+    if (td & NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS) {
       PRBool underlineLinks =
         mPresContext->GetCachedBoolPref(kPresContext_UnderlineLinks);
       if (underlineLinks) {
-        text->mTextDecoration |= NS_STYLE_TEXT_DECORATION_UNDERLINE;
+        text->mTextDecorationLine |= NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
       }
       else {
-        text->mTextDecoration &= ~NS_STYLE_TEXT_DECORATION_UNDERLINE;
+        text->mTextDecorationLine &= ~NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
       }
     }
-  } else if (eCSSUnit_Inherit == decorationValue->GetUnit()) {
+  } else if (eCSSUnit_Inherit == decorationLineValue->GetUnit()) {
     canStoreInRuleTree = PR_FALSE;
-    text->mTextDecoration = parentText->mTextDecoration;
-  } else if (eCSSUnit_Initial == decorationValue->GetUnit()) {
-    text->mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE;
+    text->mTextDecorationLine = parentText->mTextDecorationLine;
+  } else if (eCSSUnit_Initial == decorationLineValue->GetUnit()) {
+    text->mTextDecorationLine = NS_STYLE_TEXT_DECORATION_LINE_NONE;
   }
 
   // text-decoration-color: color, string, enum, inherit, initial
diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp
index 78561c82b4cd..e44688db10b7 100644
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@@ -329,14 +329,16 @@ nsStyleContext::ApplyStyleFixups(nsPresContext* aPresContext)
 {
   // See if we have any text decorations.
   // First see if our parent has text decorations.  If our parent does, then we inherit the bit.
-  if (mParent && mParent->HasTextDecorations())
-    mBits |= NS_STYLE_HAS_TEXT_DECORATIONS;
-  else {
+  if (mParent && mParent->HasTextDecorationLines()) {
+    mBits |= NS_STYLE_HAS_TEXT_DECORATION_LINES;
+  } else {
     // We might have defined a decoration.
     const nsStyleTextReset* text = GetStyleTextReset();
-    if (text->mTextDecoration != NS_STYLE_TEXT_DECORATION_NONE &&
-        text->mTextDecoration != NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL)
-      mBits |= NS_STYLE_HAS_TEXT_DECORATIONS;
+    PRUint8 decorationLine = text->mTextDecorationLine;
+    if (decorationLine != NS_STYLE_TEXT_DECORATION_LINE_NONE &&
+        decorationLine != NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL) {
+      mBits |= NS_STYLE_HAS_TEXT_DECORATION_LINES;
+    }
   }
 
   if ((mParent && mParent->HasPseudoElementData()) || mPseudoTag) {
diff --git a/layout/style/nsStyleContext.h b/layout/style/nsStyleContext.h
index c81eb07066a3..8b9c0f3cb366 100644
--- a/layout/style/nsStyleContext.h
+++ b/layout/style/nsStyleContext.h
@@ -128,9 +128,9 @@ public:
                      PRBool aRelevantLinkVisited);
 
   // Does this style context or any of its ancestors have text
-  // decorations?
-  PRBool HasTextDecorations() const
-    { return !!(mBits & NS_STYLE_HAS_TEXT_DECORATIONS); }
+  // decoration lines?
+  PRBool HasTextDecorationLines() const
+    { return !!(mBits & NS_STYLE_HAS_TEXT_DECORATION_LINES); }
 
   // Does this style context represent the style for a pseudo-element or
   // inherit data from such a style context?  Whether this returns true
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 6bd8e3891033..8bf074ad3933 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2601,7 +2601,8 @@ nsStyleTextReset::nsStyleTextReset(void)
 { 
   MOZ_COUNT_CTOR(nsStyleTextReset);
   mVerticalAlign.SetIntValue(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated);
-  mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE;
+  mTextBlink = NS_STYLE_TEXT_BLINK_NONE;
+  mTextDecorationLine = NS_STYLE_TEXT_DECORATION_LINE_NONE;
   mTextDecorationColor = NS_RGB(0,0,0);
   mTextDecorationStyle =
     NS_STYLE_TEXT_DECORATION_STYLE_SOLID | BORDER_COLOR_FOREGROUND;
@@ -2623,15 +2624,15 @@ nsChangeHint nsStyleTextReset::CalcDifference(const nsStyleTextReset& aOther) co
 {
   if (mVerticalAlign == aOther.mVerticalAlign
       && mUnicodeBidi == aOther.mUnicodeBidi) {
+    // Reflow for blink changes
+    if (mTextBlink != aOther.mTextBlink) {
+      return NS_STYLE_HINT_REFLOW;
+    }
+
     PRUint8 lineStyle = GetDecorationStyle();
     PRUint8 otherLineStyle = aOther.GetDecorationStyle();
-    if (mTextDecoration != aOther.mTextDecoration ||
+    if (mTextDecorationLine != aOther.mTextDecorationLine ||
         lineStyle != otherLineStyle) {
-      // Reflow for blink changes
-      if ((mTextDecoration & NS_STYLE_TEXT_DECORATION_BLINK) !=
-            (aOther.mTextDecoration & NS_STYLE_TEXT_DECORATION_BLINK)) {
-        return NS_STYLE_HINT_REFLOW;
-      }
       // Reflow for decoration line style changes only to or from double or
       // wave because that may cause overflow area changes
       if (lineStyle == NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE ||
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 3ca32d084e72..d7736b791474 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -81,8 +81,8 @@ struct nsCSSValueList;
 #define NS_STYLE_INHERIT_MASK             0x00ffffff
 
 // Additional bits for nsStyleContext's mBits:
-// See nsStyleContext::HasTextDecorations
-#define NS_STYLE_HAS_TEXT_DECORATIONS     0x01000000
+// See nsStyleContext::HasTextDecorationLines
+#define NS_STYLE_HAS_TEXT_DECORATION_LINES 0x01000000
 // See nsStyleContext::HasPseudoElementData.
 #define NS_STYLE_HAS_PSEUDO_ELEMENT_DATA  0x02000000
 // See nsStyleContext::RelevantLinkIsVisited
@@ -1210,7 +1210,8 @@ struct nsStyleTextReset {
 
   nsStyleCoord  mVerticalAlign;         // [reset] coord, percent, calc, enum (see nsStyleConsts.h)
 
-  PRUint8 mTextDecoration;              // [reset] see nsStyleConsts.h
+  PRUint8 mTextBlink;                   // [reset] see nsStyleConsts.h
+  PRUint8 mTextDecorationLine;          // [reset] see nsStyleConsts.h
   PRUint8 mUnicodeBidi;                 // [reset] see nsStyleConsts.h
 protected:
   PRUint8 mTextDecorationStyle;         // [reset] see nsStyleConsts.h
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 6282618c29c5..9b09a0f8a468 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2432,13 +2432,23 @@ var gCSSProperties = {
 		other_values: [ "center", "justify", "end" ],
 		invalid_values: []
 	},
-	"text-decoration": {
-		domProp: "textDecoration",
+	"-moz-text-blink": {
+		domProp: "MozTextBlink",
 		inherited: false,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "none" ],
-		other_values: [ "underline", "overline", "line-through", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
-		invalid_values: [ "underline none", "none underline", "line-through blink line-through" ]
+		other_values: [ "blink" ],
+		invalid_values: [ "underline", "overline", "line-through", "none underline", "underline blink", "blink underline" ]
+	},
+	"text-decoration": {
+		domProp: "textDecoration",
+		inherited: false,
+		type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+		subproperties: [ "-moz-text-blink", "-moz-text-decoration-color", "-moz-text-decoration-line", "-moz-text-decoration-style" ],
+		initial_values: [ "none" ],
+		other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
+		invalid_values: [ "none none", "underline none", "none underline", "blink none", "none blink", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink",
+		                  "underline red solid", "underline #ff0000", "solid underline", "red underline", "#ff0000 underline" ]
 	},
 	"-moz-text-decoration-color": {
 		domProp: "MozTextDecorationColor",
@@ -2449,6 +2459,14 @@ var gCSSProperties = {
 		other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
 		invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
 	},
+	"-moz-text-decoration-line": {
+		domProp: "MozTextDecorationLine",
+		inherited: false,
+		type: CSS_TYPE_LONGHAND,
+		initial_values: [ "none" ],
+		other_values: [ "underline", "overline", "line-through", "line-through underline", "underline overline line-through", "-moz-anchor-decoration", "-moz-anchor-decoration" ],
+		invalid_values: [ "none none", "underline none", "none underline", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ]
+	},
 	"-moz-text-decoration-style": {
 		domProp: "MozTextDecorationStyle",
 		inherited: false,
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 3d2b9105c742..7cd42c144b4e 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -426,16 +426,17 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
     PRUint8 underStyle;
     PRUint8 strikeStyle;
     nsStyleContext* context = mStyleContext;
-  
-    PRUint8 decorations = NS_STYLE_TEXT_DECORATION_NONE; // Begin with no decorations
-    PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_UNDERLINE | NS_STYLE_TEXT_DECORATION_OVERLINE |
-                        NS_STYLE_TEXT_DECORATION_LINE_THROUGH; // A mask of all possible decorations.
-    PRBool hasDecorations = context->HasTextDecorations();
+
+    // Begin with no decorations
+    PRUint8 decorations = NS_STYLE_TEXT_DECORATION_LINE_NONE;
+    // A mask of all possible decorations.
+    PRUint8 decorMask = NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK;
+    PRBool hasDecorationLines = context->HasTextDecorationLines();
 
     do {  // find decoration colors
       const nsStyleTextReset* styleText = context->GetStyleTextReset();
       
-      if (decorMask & styleText->mTextDecoration) {  // a decoration defined here
+      if (decorMask & styleText->mTextDecorationLine) {  // a decoration defined here
         nscolor color;
         if (aOverrideColor) {
           color = *aOverrideColor;
@@ -448,32 +449,35 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
         }
         PRUint8 style = styleText->GetDecorationStyle();
 
-        if (NS_STYLE_TEXT_DECORATION_UNDERLINE & decorMask & styleText->mTextDecoration) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE & decorMask &
+              styleText->mTextDecorationLine) {
           underColor = color;
           underStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_UNDERLINE;
-          decorations |= NS_STYLE_TEXT_DECORATION_UNDERLINE;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
+          decorations |= NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
         }
-        if (NS_STYLE_TEXT_DECORATION_OVERLINE & decorMask & styleText->mTextDecoration) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_OVERLINE & decorMask &
+              styleText->mTextDecorationLine) {
           overColor = color;
           overStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_OVERLINE;
-          decorations |= NS_STYLE_TEXT_DECORATION_OVERLINE;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
+          decorations |= NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
         }
-        if (NS_STYLE_TEXT_DECORATION_LINE_THROUGH & decorMask & styleText->mTextDecoration) {
+        if (NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH & decorMask &
+              styleText->mTextDecorationLine) {
           strikeColor = color;
           strikeStyle = style;
-          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
-          decorations |= NS_STYLE_TEXT_DECORATION_LINE_THROUGH;
+          decorMask &= ~NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
+          decorations |= NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
         }
       }
       if (0 != decorMask) {
         context = context->GetParent();
         if (context) {
-          hasDecorations = context->HasTextDecorations();
+          hasDecorationLines = context->HasTextDecorationLines();
         }
       }
-    } while (context && hasDecorations && (0 != decorMask));
+    } while (context && hasDecorationLines && (0 != decorMask));
 
     nsRefPtr<nsFontMetrics> fontMet;
     nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet));
@@ -505,14 +509,14 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
         nsCSSRendering::PaintDecorationLine(ctx, underColor,
                           pt, gfxSize(width, sizePixel),
                           ascentPixel, offsetPixel,
-                          NS_STYLE_TEXT_DECORATION_UNDERLINE, underStyle);
+                          NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, underStyle);
       }
       if ((decorations & NS_FONT_DECORATION_OVERLINE) &&
           overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
         nsCSSRendering::PaintDecorationLine(ctx, overColor,
                           pt, gfxSize(width, sizePixel),
                           ascentPixel, ascentPixel,
-                          NS_STYLE_TEXT_DECORATION_OVERLINE, overStyle);
+                          NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, overStyle);
       }
     }
 
@@ -593,7 +597,8 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
       nsCSSRendering::PaintDecorationLine(ctx, strikeColor,
                         pt, gfxSize(width, sizePixel), ascentPixel, offsetPixel,
-                        NS_STYLE_TEXT_DECORATION_LINE_THROUGH, strikeStyle);
+                        NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
+                        strikeStyle);
     }
 }
 
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 423b655be145..bc2b2cfa9ca7 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -3602,7 +3602,7 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
   aRenderingContext.SetColor(textContext->GetStyleColor()->mColor);
 
   // Draw decorations.
-  PRUint8 decorations = textContext->GetStyleTextReset()->mTextDecoration;
+  PRUint8 decorations = textContext->GetStyleTextReset()->mTextDecorationLine;
 
   nscoord offset;
   nscoord size;

From ac73bb36a4c964b0a77df72b756dd3a9af8d40b4 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Sat, 23 Apr 2011 08:48:50 +0200
Subject: [PATCH 417/509] Bug 640494 part 1 - Get rid of STL algorithm use in
 jsworker.cpp. r=jimb

---
 js/src/shell/jsworkers.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/shell/jsworkers.cpp b/js/src/shell/jsworkers.cpp
index 798be1e241d5..7dfd146f35cf 100644
--- a/js/src/shell/jsworkers.cpp
+++ b/js/src/shell/jsworkers.cpp
@@ -40,7 +40,6 @@
 
 #ifdef JS_THREADSAFE
 
-#include <algorithm>
 #include <string.h>
 #include "prthread.h"
 #include "prlock.h"
@@ -117,7 +116,7 @@ class Queue {
 
     T pop() {
         if (front->empty()) {
-            std::reverse(back->begin(), back->end());
+            js::Reverse(back->begin(), back->end());
             Vec *tmp = front;
             front = back;
             back = tmp;

From cd1ed7b90b6c83d398b28bda53cd24a176c3e740 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Sat, 23 Apr 2011 08:48:50 +0200
Subject: [PATCH 418/509] Bug 640494 part 2 - Use bit masking instead of
 signbit() to avoid problems when including some STL headers. r=luke

---
 js/src/jsnum.h   | 47 ++++++++++++++++-------------------------------
 js/src/jsvalue.h | 25 ++++++++++---------------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 7b38f192422d..6bb02b880b7d 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -41,12 +41,6 @@
 #define jsnum_h___
 
 #include <math.h>
-#if defined(XP_WIN) || defined(XP_OS2)
-#include <float.h>
-#endif
-#ifdef SOLARIS
-#include <ieeefp.h>
-#endif
 #include "jsvalue.h"
 
 #include "jsstdint.h"
@@ -85,37 +79,32 @@ typedef union jsdpun {
     jsdouble d;
 } jsdpun;
 
+/* Low-level floating-point predicates. See bug 640494. */
+
 static inline int
 JSDOUBLE_IS_NaN(jsdouble d)
 {
-#ifdef WIN32
-    return _isnan(d);
-#else
-    return isnan(d);
-#endif
+    jsdpun u;
+    u.d = d;
+    return (u.u64 & JSDOUBLE_EXPMASK) == JSDOUBLE_EXPMASK &&
+           (u.u64 & JSDOUBLE_MANTMASK) != 0;
 }
 
 static inline int
 JSDOUBLE_IS_FINITE(jsdouble d)
 {
-#ifdef WIN32
-    return _finite(d);
-#else
-    return finite(d);
-#endif
+    /* -0 is finite. NaNs are not. */
+    jsdpun u;
+    u.d = d;
+    return (u.u64 & JSDOUBLE_EXPMASK) != JSDOUBLE_EXPMASK;
 }
 
 static inline int
 JSDOUBLE_IS_INFINITE(jsdouble d)
 {
-#ifdef WIN32
-    int c = _fpclass(d);
-    return c == _FPCLASS_NINF || c == _FPCLASS_PINF;
-#elif defined(SOLARIS)
-    return !finite(d) && !isnan(d);
-#else
-    return isinf(d);
-#endif
+    jsdpun u;
+    u.d = d;
+    return (u.u64 & ~JSDOUBLE_SIGNBIT) == JSDOUBLE_EXPMASK;
 }
 
 #define JSDOUBLE_HI32_SIGNBIT   0x80000000
@@ -127,13 +116,9 @@ JSDOUBLE_IS_INFINITE(jsdouble d)
 static inline bool
 JSDOUBLE_IS_NEG(jsdouble d)
 {
-#ifdef WIN32
-    return JSDOUBLE_IS_NEGZERO(d) || d < 0;
-#elif defined(SOLARIS)
-    return copysign(1, d) < 0;
-#else
-    return signbit(d);
-#endif
+    jsdpun u;
+    u.d = d;
+    return (u.s.hi & JSDOUBLE_HI32_SIGNBIT) != 0;
 }
 
 static inline uint32
diff --git a/js/src/jsvalue.h b/js/src/jsvalue.h
index 010250c39c78..b54e3f7bb0a9 100644
--- a/js/src/jsvalue.h
+++ b/js/src/jsvalue.h
@@ -89,24 +89,19 @@
 
 /* To avoid a circular dependency, pull in the necessary pieces of jsnum.h. */
 
-#include <math.h>
-#if defined(XP_WIN) || defined(XP_OS2)
-#include <float.h>
-#endif
-#ifdef SOLARIS
-#include <ieeefp.h>
-#endif
+#define JSDOUBLE_SIGNBIT (((uint64) 1) << 63)
+#define JSDOUBLE_EXPMASK (((uint64) 0x7ff) << 52)
+#define JSDOUBLE_MANTMASK ((((uint64) 1) << 52) - 1)
 
-static inline int
+static JS_ALWAYS_INLINE JSBool
 JSDOUBLE_IS_NEGZERO(jsdouble d)
 {
-#ifdef WIN32
-    return (d == 0 && (_fpclass(d) & _FPCLASS_NZ));
-#elif defined(SOLARIS)
-    return (d == 0 && copysign(1, d) < 0);
-#else
-    return (d == 0 && signbit(d));
-#endif
+    union {
+        jsdouble d;
+        uint64 bits;
+    } x;
+    x.d = d;
+    return x.bits == JSDOUBLE_SIGNBIT;
 }
 
 static inline bool

From fb3a8d129b435da5166cd85a5369e089972d9c86 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 23 Apr 2011 08:48:50 +0200
Subject: [PATCH 419/509] Bug 652139 - Use an integer type in
 DocumentViewerImpl::SetMinFontSize, instead of float. r=dbaron

At the same time, replace a couple (void*) casts with NS_INT32_TO_PTR.
---
 layout/base/nsDocumentViewer.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index a88fdad95e8a..7f4ca54d2dbb 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2734,8 +2734,7 @@ SetChildMinFontSize(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
   nsCOMPtr<nsIMarkupDocumentViewer_MOZILLA_2_0_BRANCH> branch =
     do_QueryInterface(aChild);
-  struct ZoomInfo* ZoomInfo = (struct ZoomInfo*) aClosure;
-  branch->SetMinFontSize(ZoomInfo->mZoom);
+  branch->SetMinFontSize(NS_PTR_TO_INT32(aClosure));
 }
 
 static void
@@ -2768,8 +2767,7 @@ SetExtResourceMinFontSize(nsIDocument* aDocument, void* aClosure)
   if (shell) {
     nsPresContext* ctxt = shell->GetPresContext();
     if (ctxt) {
-      struct ZoomInfo* ZoomInfo = static_cast<struct ZoomInfo*>(aClosure);
-      ctxt->SetMinFontSize(ZoomInfo->mZoom);
+      ctxt->SetMinFontSize(NS_PTR_TO_INT32(aClosure));
     }
   }
 
@@ -2848,8 +2846,7 @@ DocumentViewerImpl::SetMinFontSize(PRInt32 aMinFontSize)
   // change, our children's min font may be different, though it would be unusual).
   // Do this first, in case kids are auto-sizing and post reflow commands on
   // our presshell (which should be subsumed into our own style change reflow).
-  struct ZoomInfo ZoomInfo = { aMinFontSize };
-  CallChildren(SetChildMinFontSize, &ZoomInfo);
+  CallChildren(SetChildMinFontSize, NS_INT32_TO_PTR(aMinFontSize));
 
   // Now change our own min font
   nsPresContext* pc = GetPresContext();
@@ -2858,7 +2855,8 @@ DocumentViewerImpl::SetMinFontSize(PRInt32 aMinFontSize)
   }
 
   // And do the external resources
-  mDocument->EnumerateExternalResources(SetExtResourceMinFontSize, &ZoomInfo);
+  mDocument->EnumerateExternalResources(SetExtResourceMinFontSize,
+                                        NS_INT32_TO_PTR(aMinFontSize));
 
   batch.EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
   
@@ -3093,7 +3091,7 @@ DocumentViewerImpl::SetHintCharacterSetSource(PRInt32 aHintCharacterSetSource)
   mHintCharsetSource = aHintCharacterSetSource;
   // now set the hint char set source on all children of mContainer
   CallChildren(SetChildHintCharacterSetSource,
-                      (void*) aHintCharacterSetSource);
+                      NS_INT32_TO_PTR(aHintCharacterSetSource));
   return NS_OK;
 }
 
@@ -3230,7 +3228,7 @@ NS_IMETHODIMP DocumentViewerImpl::SetBidiOptions(PRUint32 aBidiOptions)
     mPresContext->SetBidi(aBidiOptions, PR_TRUE); // could cause reflow
   }
   // now set bidi on all children of mContainer
-  CallChildren(SetChildBidiOptions, (void*) aBidiOptions);
+  CallChildren(SetChildBidiOptions, NS_INT32_TO_PTR(aBidiOptions));
   return NS_OK;
 }
 

From e2fee3941f15d30fa3f36671837d95d63660c3c1 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Sat, 23 Apr 2011 00:29:12 -0700
Subject: [PATCH 420/509] Bug 588990: Remove lazy hashing of names to avoid
 walking full DOM. r=bz

---
 content/base/src/nsDocument.cpp               |  63 +---
 content/base/src/nsDocument.h                 |   8 +-
 content/base/test/Makefile.in                 |   1 +
 content/base/test/test_bug588990.html         | 337 ++++++++++++++++++
 content/html/document/src/nsHTMLDocument.cpp  |  96 +----
 content/html/document/src/nsHTMLDocument.h    |   2 -
 .../tests/suggestiontest/Makefile.orig        |  11 -
 7 files changed, 359 insertions(+), 159 deletions(-)
 create mode 100644 content/base/test/test_bug588990.html
 delete mode 100644 extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 79a5d80281df..5700367d00e9 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -218,19 +218,14 @@ static PRLogModuleInfo* gCspPRLog;
 
 nsIdentifierMapEntry::~nsIdentifierMapEntry()
 {
-  if (mNameContentList && mNameContentList != NAME_NOT_VALID) {
-    NS_RELEASE(mNameContentList);
-  }
 }
 
 void
 nsIdentifierMapEntry::Traverse(nsCycleCollectionTraversalCallback* aCallback)
 {
-  if (mNameContentList != NAME_NOT_VALID) {
-    NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*aCallback,
-                                       "mIdentifierMap mNameContentList");
-    aCallback->NoteXPCOMChild(static_cast<nsIDOMNodeList*>(mNameContentList));
-  }
+  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*aCallback,
+                                     "mIdentifierMap mNameContentList");
+  aCallback->NoteXPCOMChild(static_cast<nsIDOMNodeList*>(mNameContentList));
 
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*aCallback, "mIdentifierMap mDocAllList");
   aCallback->NoteXPCOMChild(static_cast<nsIDOMNodeList*>(mDocAllList));
@@ -243,18 +238,6 @@ nsIdentifierMapEntry::Traverse(nsCycleCollectionTraversalCallback* aCallback)
   }
 }
 
-void
-nsIdentifierMapEntry::SetInvalidName()
-{
-  mNameContentList = NAME_NOT_VALID;
-}
-
-PRBool
-nsIdentifierMapEntry::IsInvalidName()
-{
-  return mNameContentList == NAME_NOT_VALID;
-}
-
 PRBool
 nsIdentifierMapEntry::IsEmpty()
 {
@@ -262,15 +245,6 @@ nsIdentifierMapEntry::IsEmpty()
          !mChangeCallbacks && !mImageElement;
 }
 
-nsresult
-nsIdentifierMapEntry::CreateNameContentList()
-{
-  mNameContentList = new nsBaseContentList();
-  NS_ENSURE_TRUE(mNameContentList, NS_ERROR_OUT_OF_MEMORY);
-  NS_ADDREF(mNameContentList);
-  return NS_OK;
-}
-
 Element*
 nsIdentifierMapEntry::GetIdElement()
 {
@@ -450,25 +424,20 @@ nsIdentifierMapEntry::SetImageElement(Element* aElement)
 void
 nsIdentifierMapEntry::AddNameElement(Element* aElement)
 {
-  if (!mNameContentList || mNameContentList == NAME_NOT_VALID)
-    return;
-
-  // NOTE: this indexof is absolutely needed, since we don't flush
-  // content notifications when we do document.foo resolution.  So
-  // aContent may be in our list already and just now getting notified
-  // for!
-  // XXXbz with the HTML5 parser we can stop doing this!
-  if (mNameContentList->IndexOf(aElement, PR_FALSE) < 0) {
-    mNameContentList->AppendElement(aElement);
+  if (!mNameContentList) {
+    mNameContentList = new nsBaseContentList();
   }
+
+  mNameContentList->AppendElement(aElement);
 }
 
 void
 nsIdentifierMapEntry::RemoveNameElement(Element* aElement)
 {
-  if (mNameContentList && mNameContentList != NAME_NOT_VALID) {
-    mNameContentList->RemoveElement(aElement);
-  }
+  NS_ASSERTION(mNameContentList &&
+               mNameContentList->IndexOf(aElement, PR_FALSE) >= 0,
+               "Attmpting to remove named element that doesn't exist");
+  mNameContentList->RemoveElement(aElement);
 }
 
 // Helper structs for the content->subdoc map
@@ -2583,14 +2552,10 @@ nsDocument::GetLastModified(nsAString& aLastModified)
 void
 nsDocument::AddToNameTable(Element *aElement, nsIAtom* aName)
 {
-  if (!mIsRegularHTML)
-    return;
-
   nsIdentifierMapEntry *entry =
-    mIdentifierMap.GetEntry(nsDependentAtomString(aName));
-
-  // entry is null if we're not tracking the elements with this name
+    mIdentifierMap.PutEntry(nsDependentAtomString(aName));
 
+  // Null for out-of-memory
   if (entry) {
     entry->AddNameElement(aElement);
   }
@@ -2600,7 +2565,7 @@ void
 nsDocument::RemoveFromNameTable(Element *aElement, nsIAtom* aName)
 {
   // Speed up document teardown
-  if (!mIsRegularHTML || mIdentifierMap.Count() == 0)
+  if (mIdentifierMap.Count() == 0)
     return;
 
   nsIdentifierMapEntry *entry =
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index a80c5bf646bc..4863e417bd3f 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -168,14 +168,10 @@ public:
   PRBool IsInvalidName();
   void AddNameElement(Element* aElement);
   void RemoveNameElement(Element* aElement);
-  PRBool HasNameContentList() {
-    return mNameContentList != nsnull;
-  }
   PRBool IsEmpty();
   nsBaseContentList* GetNameContentList() {
     return mNameContentList;
   }
-  nsresult CreateNameContentList();
 
   /**
    * Returns the element if we know the element associated with this
@@ -258,9 +254,7 @@ private:
   // empty if there are no elementswith this ID.
   // The elements are stored as weak pointers.
   nsSmallVoidArray mIdContentList;
-  // NAME_NOT_VALID if this id cannot be used as a 'name'.  Otherwise
-  // stores Elements.
-  nsBaseContentList *mNameContentList;
+  nsRefPtr<nsBaseContentList> mNameContentList;
   nsRefPtr<nsContentList> mDocAllList;
   nsAutoPtr<nsTHashtable<ChangeCallbackEntry> > mChangeCallbacks;
   nsRefPtr<Element> mImageElement;
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 2f1f6deb707a..c8aac34dd462 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -363,6 +363,7 @@ _TEST_FILES2 = \
 		bug475156.sjs \
 		test_bug544642.html \
 		test_bug564863.xhtml \
+		test_bug588990.html \
 		test_copypaste.html \
 		test_bug503481.html \
 		file_bug503481.sjs \
diff --git a/content/base/test/test_bug588990.html b/content/base/test/test_bug588990.html
new file mode 100644
index 000000000000..6a3a28c05bb1
--- /dev/null
+++ b/content/base/test/test_bug588990.html
@@ -0,0 +1,337 @@
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=588990
+-->
+<head>
+  <title>Test for Bug 588990</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/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=588990">Mozilla Bug 588990</a>
+<!-- DOM to muck around with for tests -->
+<p id="root">
+<img name="n1">
+<img name="n2">
+<img name="n2">
+<img name="n3">
+<img name="n3">
+<img name="n3">
+</p>
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+root = $('root');
+i1_1 = root.children[0];
+i2_1 = root.children[1];
+i2_2 = root.children[2];
+i3_1 = root.children[3];
+i3_2 = root.children[4];
+i3_3 = root.children[5];
+
+function checkHasName(test) {
+  // Check name first to avoid flushes from hiding problems
+  checkHasNameNoDocProp(test);
+
+  is(document.n1, i1_1, "i1_1 doc.name " + test);
+  is(document.n2[0], i2_1, "i2_1 doc.name " + test);
+  is(document.n2[1], i2_2, "i2_2 doc.name " + test);
+  is(document.n2.length, 2, "doc.name.length " + test);
+  is(document.n3[0], i3_1, "i3_1 doc.name " + test);
+  is(document.n3[1], i3_2, "i3_2 doc.name " + test);
+  is(document.n3[2], i3_3, "i3_3 doc.name " + test);
+  is(document.n3.length, 3, "doc.name.length " + test);
+}
+
+function checkHasNameNoDocProp(test) {
+  is(i1_1.name, "n1", "i1_1 name " + test);
+  is(i2_1.name, "n2", "i2_1 name " + test);
+  is(i2_2.name, "n2", "i2_2 name " + test);
+  is(i3_1.name, "n3", "i3_1 name " + test);
+  is(i3_2.name, "n3", "i3_2 name " + test);
+  is(i3_3.name, "n3", "i3_3 name " + test);
+}
+
+function checkHasNoName(removed, test) {
+  is(i1_1.name, "", "i1_1 name " + test);
+  is(i2_1.name, "", "i2_1 name " + test);
+  is(i2_2.name, "", "i2_2 name " + test);
+  is(i3_1.name, "", "i3_1 name " + test);
+  is(i3_2.name, "", "i3_2 name " + test);
+  is(i3_3.name, "", "i3_3 name " + test);
+
+  var attrValue = removed ? null : "";
+  is(i1_1.getAttribute("name"), attrValue, "i1_1 getAttribute " + test);
+  is(i2_1.getAttribute("name"), attrValue, "i2_1 getAttribute " + test);
+  is(i2_2.getAttribute("name"), attrValue, "i2_2 getAttribute " + test);
+  is(i3_1.getAttribute("name"), attrValue, "i3_1 getAttribute " + test);
+  is(i3_2.getAttribute("name"), attrValue, "i3_2 getAttribute " + test);
+  is(i3_3.getAttribute("name"), attrValue, "i3_3 getAttribute " + test);
+  
+  todo_is(document.n1,  undefined, "doc.n1 " + test);
+  todo_is(document.n2,  undefined, "doc.n2 " + test);
+  todo_is(document.n3,  undefined, "doc.n3 " + test);
+}
+
+// Check that dynamic modifications of attribute work
+
+checkHasName("in markup");
+
+i1_1.name = "";
+i2_1.name = "";
+i2_2.name = "";
+i3_1.name = "";
+i3_2.name = "";
+i3_3.name = "";
+
+checkHasNoName(false, "set to empty");
+
+i1_1.name = "n1";
+i2_1.name = "n2";
+i2_2.name = "n2";
+i3_1.name = "n3";
+i3_2.name = "n3";
+i3_3.name = "n3";
+
+checkHasName("set using .name");
+
+i1_1.setAttribute("name", "");
+i2_1.setAttribute("name", "");
+i2_2.setAttribute("name", "");
+i3_1.setAttribute("name", "");
+i3_2.setAttribute("name", "");
+i3_3.setAttribute("name", "");
+
+checkHasNoName(false, "setAttribute to empty");
+
+i1_1.name = "n1";
+i2_1.name = "n2";
+i2_2.name = "n2";
+i3_1.name = "n3";
+i3_2.name = "n3";
+i3_3.name = "n3";
+
+checkHasName("set again using .name");
+
+i1_1.removeAttribute("name");
+i2_1.removeAttribute("name");
+i2_2.removeAttribute("name");
+i3_1.removeAttribute("name");
+i3_2.removeAttribute("name");
+i3_3.removeAttribute("name");
+
+checkHasNoName(true, "removed attribute");
+
+i1_1.setAttribute("name", "n1");
+i2_1.setAttribute("name", "n2");
+i2_2.setAttribute("name", "n2");
+i3_1.setAttribute("name", "n3");
+i3_2.setAttribute("name", "n3");
+i3_3.setAttribute("name", "n3");
+
+checkHasName("set using setAttribute");
+
+t1 = document.createElement("img");
+t1.name = "n1";
+t2 = document.createElement("img");
+t2.name = "n2";
+t3 = document.createElement("img");
+t3.name = "n2";
+t4 = document.createElement("img");
+t4.name = "n3";
+t5 = document.createElement("img");
+t5.name = "n3";
+t6 = document.createElement("img");
+t6.name = "n3";
+
+// Check that inserting elements before/after existing work
+
+function insertAfter(newChild, existing) {
+  existing.parentNode.insertBefore(newChild, existing.nextSibling);
+}
+function insertBefore(newChild, existing) {
+  existing.parentNode.insertBefore(newChild, existing);
+}
+function removeNode(child) {
+  child.parentNode.removeChild(child);
+}
+
+insertAfter(t1, i1_1);
+insertAfter(t2, i2_1);
+insertAfter(t3, i2_2);
+insertAfter(t4, i3_1);
+insertAfter(t5, i3_2);
+insertAfter(t6, i3_3);
+
+checkHasNameNoDocProp("inserted after");
+is(document.n1[0], i1_1, "i1_1 doc.name inserted after");
+is(document.n1[1], t1, "t1 doc.name inserted after");
+is(document.n1.length, 2, "doc.name1.length inserted after");
+is(document.n2[0], i2_1, "i2_1 doc.name inserted after");
+todo_is(document.n2[1], t2, "This is where t2 should show up. The elements in here should be in order-in-document rather than order-of-insertion");
+is(document.n2[1], i2_2, "i2_2 doc.name inserted after");
+is(document.n2[2], t2, "t2 doc.name inserted after");
+is(document.n2[3], t3, "t3 doc.name inserted after");
+is(document.n2.length, 4, "doc.name2.length inserted after");
+is(document.n3[0], i3_1, "i3_1 doc.name inserted after");
+is(document.n3[1], i3_2, "i3_3 doc.name inserted after");
+is(document.n3[2], i3_3, "i3_2 doc.name inserted after");
+is(document.n3[3], t4, "t4 doc.name inserted after");
+is(document.n3[4], t5, "t5 doc.name inserted after");
+is(document.n3[5], t6, "t6 doc.name inserted after");
+is(document.n3.length, 6, "doc.name3.length inserted after");
+
+
+insertBefore(t1, i1_1);
+insertBefore(t2, i2_1);
+insertBefore(t3, i2_2);
+insertBefore(t4, i3_1);
+insertBefore(t5, i3_2);
+insertBefore(t6, i3_3);
+
+checkHasNameNoDocProp("inserted before");
+is(document.n1[0], i1_1, "i1_1 doc.name inserted before");
+is(document.n1[1], t1, "t1 doc.name inserted before");
+is(document.n1.length, 2, "doc.name1.length inserted before");
+is(document.n2[0], i2_1, "i2_1 doc.name inserted before");
+is(document.n2[1], i2_2, "i2_2 doc.name inserted before");
+is(document.n2[2], t2, "t2 doc.name inserted before");
+is(document.n2[3], t3, "t3 doc.name inserted before");
+is(document.n2.length, 4, "doc.name2.length inserted before");
+is(document.n3[0], i3_1, "i3_1 doc.name inserted before");
+is(document.n3[1], i3_2, "i3_3 doc.name inserted before");
+is(document.n3[2], i3_3, "i3_2 doc.name inserted before");
+is(document.n3[3], t4, "t4 doc.name inserted before");
+is(document.n3[4], t5, "t5 doc.name inserted before");
+is(document.n3[5], t6, "t6 doc.name inserted before");
+is(document.n3.length, 6, "doc.name3.length inserted before");
+
+t1.removeAttribute("name");
+t2.removeAttribute("name");
+t3.removeAttribute("name");
+t4.removeAttribute("name");
+t5.removeAttribute("name");
+t6.removeAttribute("name");
+
+checkHasName("removed tx attribute");
+
+t1.setAttribute("name", "n1");
+t2.setAttribute("name", "n2");
+t3.setAttribute("name", "n2");
+t4.setAttribute("name", "n3");
+t5.setAttribute("name", "n3");
+t6.setAttribute("name", "n3");
+
+checkHasNameNoDocProp("inserted before");
+is(document.n1[0], i1_1, "i1_1 doc.name inserted before");
+is(document.n1[1], t1, "t1 doc.name inserted before");
+is(document.n1.length, 2, "doc.name1.length inserted before");
+is(document.n2[0], i2_1, "i2_1 doc.name inserted before");
+is(document.n2[1], i2_2, "i2_2 doc.name inserted before");
+is(document.n2[2], t2, "t2 doc.name inserted before");
+is(document.n2[3], t3, "t3 doc.name inserted before");
+is(document.n2.length, 4, "doc.name2.length inserted before");
+is(document.n3[0], i3_1, "i3_1 doc.name inserted before");
+is(document.n3[1], i3_2, "i3_3 doc.name inserted before");
+is(document.n3[2], i3_3, "i3_2 doc.name inserted before");
+is(document.n3[3], t4, "t4 doc.name inserted before");
+is(document.n3[4], t5, "t5 doc.name inserted before");
+is(document.n3[5], t6, "t6 doc.name inserted before");
+is(document.n3.length, 6, "doc.name3.length inserted before");
+
+removeNode(t1);
+removeNode(t2);
+removeNode(t3);
+removeNode(t4);
+removeNode(t5);
+removeNode(t6);
+
+checkHasName("removed temporaries");
+
+removeNode(i1_1);
+removeNode(i2_1);
+removeNode(i2_2);
+removeNode(i3_1);
+removeNode(i3_2);
+removeNode(i3_3);
+
+checkHasNameNoDocProp("removed node");
+
+// Check that removing an element during UnsetAttr works
+is(i1_1.name, "n1", "i1_1 has name set");
+var mutateFired = false;
+root.appendChild(i1_1);
+i1_1.addEventListener("DOMAttrModified", function(e) {
+  i1_1.removeEventListener("DOMAttrModified", arguments.callee, false);
+  is(e.target, i1_1, "target is i1_1");
+  is(i1_1.name, "", "i1_1 no longer has name");
+  is(i1_1.getAttribute("name"), null, "i1_1 no longer has name attr");
+  removeNode(i1_1);
+  is(i1_1.parentNode, null, "i1_1 was removed");
+  mutateFired = true;
+}, false);
+i1_1.removeAttribute("name");
+ok(mutateFired, "mutation event fired");
+SpecialPowers.gc();
+
+// Check that removing an element during SetAttr works
+i2_1.name = "";
+mutateFired = false;
+root.appendChild(i2_1);
+i2_1.addEventListener("DOMAttrModified", function(e) {
+  i2_1.removeEventListener("DOMAttrModified", arguments.callee, false);
+  is(e.target, i2_1, "target is i2_1");
+  is(i2_1.name, "n2", "i2_1 no longer has name");
+  is(i2_1.getAttribute("name"), "n2", "i2_1 no longer has name attr");
+  removeNode(i2_1);
+  is(i2_1.parentNode, null, "i2_1 was removed");
+  mutateFired = true;
+}, false);
+i2_1.name = "n2";
+ok(mutateFired, "mutation event fired");
+SpecialPowers.gc();
+
+// Re-add the name inside a mutation event on a HTML element
+is(i2_2.name, "n2", "i2_2 has name set");
+root.appendChild(i2_2);
+mutateFired = false;
+root.appendChild(i2_2);
+i2_2.addEventListener("DOMAttrModified", function(e) {
+  i2_2.removeEventListener("DOMAttrModified", arguments.callee, false);
+  is(e.target, i2_2, "target is i2_2");
+  is(i2_2.name, "", "i2_2 no longer has name");
+  is(i2_2.getAttribute("name"), "", "i2_2 has empty name attr");
+  i2_2.name = "n2";
+  mutateFired = true;
+}, false);
+i2_2.name = "";
+ok(mutateFired, "mutation event fired");
+is(document.n2, i2_2, "named was readded during mutation");
+removeNode(i2_2);
+SpecialPowers.gc();
+
+// Re-remove the name inside a mutation event on a HTML element
+i3_1.name = "";
+root.appendChild(i3_1);
+mutateFired = false;
+root.appendChild(i3_1);
+i3_1.addEventListener("DOMAttrModified", function(e) {
+  i3_1.removeEventListener("DOMAttrModified", arguments.callee, false);
+  is(e.target, i3_1, "target is i3_1");
+  is(i3_1.name, "n3", "i3_1 no longer has name");
+  is(i3_1.getAttribute("name"), "n3", "i3_1 has empty name attr");
+  i3_1.removeAttribute("name");
+  mutateFired = true;
+}, false);
+i3_1.name = "n3";
+ok(mutateFired, "mutation event fired");
+todo_is(document.n3, undefined, "named was readded during mutation");
+removeNode(i3_1);
+SpecialPowers.gc();
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 2a32c648585d..98e17655f5ce 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -332,7 +332,6 @@ nsHTMLDocument::Init()
   // to match our compat mode.
   CSSLoader()->SetCompatibilityMode(mCompatMode);
 
-  PrePopulateIdentifierMap();
   return NS_OK;
 }
 
@@ -355,8 +354,6 @@ nsHTMLDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
 
   nsDocument::ResetToURI(aURI, aLoadGroup, aPrincipal);
 
-  PrePopulateIdentifierMap();
-
   mImages = nsnull;
   mApplets = nsnull;
   mEmbeds = nsnull;
@@ -2523,30 +2520,6 @@ nsHTMLDocument::GetPlugins(nsIDOMHTMLCollection** aPlugins)
   return GetEmbeds(aPlugins);
 }
 
-static void
-FindNamedItems(nsIAtom* aName, nsIContent *aContent,
-               nsIdentifierMapEntry* aEntry)
-{
-  NS_ASSERTION(aEntry->HasNameContentList(),
-               "Entry w/o content list passed to FindNamedItems()!");
-  NS_ASSERTION(!aEntry->IsInvalidName(),
-               "Entry that should never have a list passed to FindNamedItems()!");
-
-  if (aContent->HasName()) {
-    NS_ASSERTION(nsGenericHTMLElement::FromContent(aContent),
-                 "Only HTML Elements should have a name");
-  
-    nsGenericHTMLElement* elm = static_cast<nsGenericHTMLElement*>(aContent);
-    if (elm->GetParsedAttr(nsGkAtoms::name)->GetAtomValue() == aName) {
-      aEntry->AddNameElement(elm);
-    }
-  }
-
-  for (nsINode::ChildIterator iter(aContent); !iter.IsDone(); iter.Next()) {
-    FindNamedItems(aName, iter, aEntry);
-  }
-}
-
 nsresult
 nsHTMLDocument::ResolveName(const nsAString& aName,
                             nsIDOMHTMLFormElement *aForm,
@@ -2556,47 +2529,16 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
   *aResult = nsnull;
   *aCache = nsnull;
 
-  // We have built a table and cache the named items. The table will
-  // be updated as content is added and removed.
-  nsIdentifierMapEntry *entry = mIdentifierMap.PutEntry(aName);
-  NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
-
-  if (entry->IsInvalidName()) {
-    // There won't be any named items by this name -- it's reserved
+  nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aName);
+  if (!entry) {
     return NS_OK;
   }
 
-  // Now we know we _might_ have items.
-
-  if (!entry->HasNameContentList()) {
-#ifdef DEBUG_jst
-    {
-      printf ("nsHTMLDocument name cache miss for name '%s'\n",
-              NS_ConvertUTF16toUTF8(aName).get());
-    }
-#endif
-
-    nsresult rv = entry->CreateNameContentList();
-    if (NS_FAILED(rv))
-      return rv;
-
-    Element* root = GetRootElement();
-    if (root && !aName.IsEmpty()) {
-      // do_GetAtom() can fail on OOM, but it'll only do that if the
-      // atom doesn't already exist, which means the named item
-      // doesn't exist either.
-      nsCOMPtr<nsIAtom> name(do_GetAtom(aName));
-
-      if (name) {
-        FindNamedItems(name, root, entry);
-      }
-    }
-  }
-
+  PRUint32 length = 0;
   nsBaseContentList *list = entry->GetNameContentList();
-
-  PRUint32 length;
-  list->GetLength(&length);
+  if (list) {
+    list->GetLength(&length);
+  }
 
   if (length > 0) {
     if (length == 1) {
@@ -2670,32 +2612,6 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
   return NS_OK;
 }
 
-// Pre-fill the name hash with names that are likely to be resolved in
-// this document to avoid walking the tree looking for elements with
-// these names.
-
-nsresult
-nsHTMLDocument::PrePopulateIdentifierMap()
-{
-  static const char names[][13] = {
-    "write", "writeln", "open", "close", "forms", "elements",
-    "characterSet", "nodeType", "parentNode", "cookie"
-  };
-
-  for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(names); ++i) {
-    nsCOMPtr<nsIAtom> atom(do_GetAtom(names[i]));
-    NS_ENSURE_TRUE(atom, NS_ERROR_OUT_OF_MEMORY);
-  
-    nsIdentifierMapEntry* entry =
-      mIdentifierMap.PutEntry(nsDependentAtomString(atom));
-    NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
-
-    entry->SetInvalidName();
-  }
-
-  return NS_OK;
-}
-
 //----------------------------
 
 /* virtual */ nsIContent*
diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h
index 81c3a3ec4feb..5b6035185960 100644
--- a/content/html/document/src/nsHTMLDocument.h
+++ b/content/html/document/src/nsHTMLDocument.h
@@ -243,8 +243,6 @@ protected:
   nsresult GetBodySize(PRInt32* aWidth,
                        PRInt32* aHeight);
 
-  nsresult PrePopulateIdentifierMap();
-
   nsIContent *MatchId(nsIContent *aContent, const nsAString& aId);
 
   static PRBool MatchLinks(nsIContent *aContent, PRInt32 aNamespaceID,
diff --git a/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig b/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig
deleted file mode 100644
index b699c611816e..000000000000
--- a/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig
+++ /dev/null
@@ -1,11 +0,0 @@
-all:
-	./prepare
-	./test
-
-single:
-	./prepare2
-	./test
-
-clean:
-	rm *.[1-5] result.*
-

From 864c681c5730c5430fdc2c38f47463abcc079bf2 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Sat, 23 Apr 2011 00:53:58 -0700
Subject: [PATCH 421/509] Add back file accidentally removed

---
 .../hunspell/tests/suggestiontest/Makefile.orig       | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig

diff --git a/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig b/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig
new file mode 100644
index 000000000000..b699c611816e
--- /dev/null
+++ b/extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig
@@ -0,0 +1,11 @@
+all:
+	./prepare
+	./test
+
+single:
+	./prepare2
+	./test
+
+clean:
+	rm *.[1-5] result.*
+

From b5066cd3affe6cf12e56c3d9e58594013ecdf379 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 23 Apr 2011 13:06:48 +0200
Subject: [PATCH 422/509] Backout changeset d29e1e37e7c2 from bug 640494
 because of jsreftest orange on Win opt builds

---
 js/src/jsnum.h   | 47 +++++++++++++++++++++++++++++++----------------
 js/src/jsvalue.h | 25 +++++++++++++++----------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 6bb02b880b7d..7b38f192422d 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -41,6 +41,12 @@
 #define jsnum_h___
 
 #include <math.h>
+#if defined(XP_WIN) || defined(XP_OS2)
+#include <float.h>
+#endif
+#ifdef SOLARIS
+#include <ieeefp.h>
+#endif
 #include "jsvalue.h"
 
 #include "jsstdint.h"
@@ -79,32 +85,37 @@ typedef union jsdpun {
     jsdouble d;
 } jsdpun;
 
-/* Low-level floating-point predicates. See bug 640494. */
-
 static inline int
 JSDOUBLE_IS_NaN(jsdouble d)
 {
-    jsdpun u;
-    u.d = d;
-    return (u.u64 & JSDOUBLE_EXPMASK) == JSDOUBLE_EXPMASK &&
-           (u.u64 & JSDOUBLE_MANTMASK) != 0;
+#ifdef WIN32
+    return _isnan(d);
+#else
+    return isnan(d);
+#endif
 }
 
 static inline int
 JSDOUBLE_IS_FINITE(jsdouble d)
 {
-    /* -0 is finite. NaNs are not. */
-    jsdpun u;
-    u.d = d;
-    return (u.u64 & JSDOUBLE_EXPMASK) != JSDOUBLE_EXPMASK;
+#ifdef WIN32
+    return _finite(d);
+#else
+    return finite(d);
+#endif
 }
 
 static inline int
 JSDOUBLE_IS_INFINITE(jsdouble d)
 {
-    jsdpun u;
-    u.d = d;
-    return (u.u64 & ~JSDOUBLE_SIGNBIT) == JSDOUBLE_EXPMASK;
+#ifdef WIN32
+    int c = _fpclass(d);
+    return c == _FPCLASS_NINF || c == _FPCLASS_PINF;
+#elif defined(SOLARIS)
+    return !finite(d) && !isnan(d);
+#else
+    return isinf(d);
+#endif
 }
 
 #define JSDOUBLE_HI32_SIGNBIT   0x80000000
@@ -116,9 +127,13 @@ JSDOUBLE_IS_INFINITE(jsdouble d)
 static inline bool
 JSDOUBLE_IS_NEG(jsdouble d)
 {
-    jsdpun u;
-    u.d = d;
-    return (u.s.hi & JSDOUBLE_HI32_SIGNBIT) != 0;
+#ifdef WIN32
+    return JSDOUBLE_IS_NEGZERO(d) || d < 0;
+#elif defined(SOLARIS)
+    return copysign(1, d) < 0;
+#else
+    return signbit(d);
+#endif
 }
 
 static inline uint32
diff --git a/js/src/jsvalue.h b/js/src/jsvalue.h
index b54e3f7bb0a9..010250c39c78 100644
--- a/js/src/jsvalue.h
+++ b/js/src/jsvalue.h
@@ -89,19 +89,24 @@
 
 /* To avoid a circular dependency, pull in the necessary pieces of jsnum.h. */
 
-#define JSDOUBLE_SIGNBIT (((uint64) 1) << 63)
-#define JSDOUBLE_EXPMASK (((uint64) 0x7ff) << 52)
-#define JSDOUBLE_MANTMASK ((((uint64) 1) << 52) - 1)
+#include <math.h>
+#if defined(XP_WIN) || defined(XP_OS2)
+#include <float.h>
+#endif
+#ifdef SOLARIS
+#include <ieeefp.h>
+#endif
 
-static JS_ALWAYS_INLINE JSBool
+static inline int
 JSDOUBLE_IS_NEGZERO(jsdouble d)
 {
-    union {
-        jsdouble d;
-        uint64 bits;
-    } x;
-    x.d = d;
-    return x.bits == JSDOUBLE_SIGNBIT;
+#ifdef WIN32
+    return (d == 0 && (_fpclass(d) & _FPCLASS_NZ));
+#elif defined(SOLARIS)
+    return (d == 0 && copysign(1, d) < 0);
+#else
+    return (d == 0 && signbit(d));
+#endif
 }
 
 static inline bool

From 6448f71f0d2318df7f619938c32ec5382ed2f545 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 23 Apr 2011 13:19:01 -0700
Subject: [PATCH 423/509] Push a context on the stack when notifying a
 MediaQueryListListener.  (Bug 652317)  r=smaug

---
 layout/base/nsPresContext.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index d257a0a521a6..5065e858e7f4 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1692,9 +1692,17 @@ nsPresContext::MediaFeatureValuesChanged(PRBool aCallerWillRebuildStyleData)
       mql->MediumFeaturesChanged(notifyList);
     }
 
-    for (PRUint32 i = 0, i_end = notifyList.Length(); i != i_end; ++i) {
-      nsDOMMediaQueryList::HandleChangeData &d = notifyList[i];
-      d.listener->HandleChange(d.mql);
+    if (!notifyList.IsEmpty()) {
+      nsPIDOMWindow *win = mDocument->GetInnerWindow();
+      nsCOMPtr<nsPIDOMEventTarget> et = do_QueryInterface(win);
+      nsCxPusher pusher;
+
+      for (PRUint32 i = 0, i_end = notifyList.Length(); i != i_end; ++i) {
+        if (pusher.RePush(et)) {
+          nsDOMMediaQueryList::HandleChangeData &d = notifyList[i];
+          d.listener->HandleChange(d.mql);
+        }
+      }
     }
 
     // NOTE:  When |notifyList| goes out of scope, our destructor could run.

From 54e695816dc45233b61d57ef75ca306d48b1e0e0 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Sun, 24 Apr 2011 11:52:59 +1200
Subject: [PATCH 424/509] Comment typo fixes. (no bug, unreviewed, DONTBUILD)

--HG--
extra : rebase_source : 058fddab2d87b4c6dfcfb40fac71b2a39df8b000
---
 widget/src/windows/nsWindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index e7c632ce0b70..d7189bce9381 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -6668,7 +6668,7 @@ PRUint16 nsWindow::GetMouseInputSource()
 }
 #endif
 /*
- * OnMouseWheel - mouse wheele event processing. This was originally embedded
+ * OnMouseWheel - mouse wheel event processing. This was originally embedded
  * within the message case block. If returning true result should be returned
  * immediately (no more processing).
  */
@@ -6727,10 +6727,10 @@ PRBool nsWindow::OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, PRBool& ge
     return PR_FALSE; // break
 
   // The mousewheel event will be dispatched to the toplevel
-  // window.  We need to give it to the child window
+  // window.  We need to give it to the child window.
   PRBool quit;
   if (!HandleScrollingPlugins(msg, wParam, lParam, result, aRetValue, quit))
-    return quit; // return immediately if its not our window
+    return quit; // return immediately if it's not our window
 
   // We should cancel the surplus delta if the current window is not
   // same as previous.

From 540ca93080c91d33b8bba2d1de85d1bcb6baffba Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 24 Apr 2011 08:54:25 +0200
Subject: [PATCH 425/509] Bug 616684 - Remove support for DOM Views; r=sicking

---
 .../src/atk/nsMaiInterfaceComponent.cpp       |  2 -
 accessible/src/base/nsCoreUtils.cpp           | 22 +++---
 accessible/src/html/nsHyperTextAccessible.cpp |  2 -
 accessible/src/msaa/nsAccessNodeWrap.cpp      |  1 -
 content/base/src/nsContentAreaDragDrop.cpp    |  1 -
 content/base/src/nsContentUtils.cpp           |  4 +-
 content/base/src/nsDocument.cpp               | 16 ++---
 content/base/src/nsDocument.h                 |  6 --
 content/base/src/nsGenericElement.cpp         |  1 -
 content/events/src/nsDOMDragEvent.cpp         |  4 +-
 content/events/src/nsDOMKeyboardEvent.cpp     |  6 +-
 content/events/src/nsDOMMouseEvent.cpp        |  8 +--
 content/events/src/nsDOMMouseScrollEvent.cpp  |  6 +-
 content/events/src/nsDOMMozTouchEvent.cpp     |  5 +-
 content/events/src/nsDOMScrollAreaEvent.cpp   | 11 +--
 .../events/src/nsDOMSimpleGestureEvent.cpp    |  2 +-
 content/events/src/nsDOMUIEvent.cpp           | 12 ++--
 content/events/src/nsDOMUIEvent.h             |  9 ++-
 content/events/src/nsDOMXULCommandEvent.cpp   |  6 +-
 content/events/src/nsEventStateManager.cpp    |  1 -
 content/html/document/src/nsHTMLDocument.cpp  |  6 ++
 content/smil/nsDOMTimeEvent.cpp               |  5 +-
 content/smil/nsDOMTimeEvent.h                 |  4 +-
 content/svg/content/src/nsSVGElement.cpp      |  2 -
 .../xml/document/src/nsXMLPrettyPrinter.cpp   | 20 ++----
 content/xul/content/src/nsXULElement.cpp      |  6 +-
 dom/Makefile.in                               |  1 -
 dom/base/nsDOMClassInfo.cpp                   | 11 ---
 dom/base/nsGlobalWindow.cpp                   | 28 --------
 dom/base/nsGlobalWindow.h                     |  8 ---
 dom/interfaces/base/domstubs.idl              |  5 --
 dom/interfaces/base/nsIDOMWindow.idl          | 11 ++-
 dom/interfaces/base/nsIDOMWindow2.idl         |  2 +-
 dom/interfaces/base/nsIDOMWindowInternal.idl  |  2 +-
 dom/interfaces/core/nsIDOMDocument.idl        |  9 ++-
 dom/interfaces/core/nsIDOMXMLDocument.idl     |  2 +-
 dom/interfaces/css/Makefile.in                |  1 -
 dom/interfaces/css/nsIDOMViewCSS.idl          | 49 --------------
 dom/interfaces/events/nsIDOMDragEvent.idl     |  5 +-
 dom/interfaces/events/nsIDOMKeyEvent.idl      |  4 +-
 dom/interfaces/events/nsIDOMMouseEvent.idl    |  4 +-
 .../events/nsIDOMMouseScrollEvent.idl         |  4 +-
 dom/interfaces/events/nsIDOMMozTouchEvent.idl |  4 +-
 dom/interfaces/events/nsIDOMNSMouseEvent.idl  |  4 +-
 .../events/nsIDOMScrollAreaEvent.idl          |  4 +-
 .../events/nsIDOMSimpleGestureEvent.idl       |  4 +-
 dom/interfaces/events/nsIDOMUIEvent.idl       |  6 +-
 dom/interfaces/html/nsIDOMHTMLDocument.idl    |  2 +-
 dom/interfaces/smil/nsIDOMTimeEvent.idl       |  6 +-
 dom/interfaces/svg/nsIDOMSVGDocument.idl      |  2 +-
 dom/interfaces/svg/nsIDOMSVGZoomEvent.idl     |  2 +-
 dom/interfaces/views/Makefile.in              | 54 ---------------
 dom/interfaces/views/nsIDOMAbstractView.idl   | 53 ---------------
 dom/interfaces/views/nsIDOMDocumentView.idl   | 54 ---------------
 dom/interfaces/xul/nsIDOMXULCommandEvent.idl  |  4 +-
 editor/libeditor/html/nsHTMLAbsPosition.cpp   |  9 +--
 .../libeditor/html/nsHTMLAnonymousUtils.cpp   |  8 +--
 editor/libeditor/html/nsHTMLCSSUtils.cpp      | 67 +++++++++----------
 editor/libeditor/html/nsHTMLCSSUtils.h        | 29 ++++----
 .../browser/webBrowser/nsContextMenuInfo.cpp  | 22 +++---
 .../spellcheck/src/mozInlineSpellWordUtil.cpp | 16 ++---
 .../spellcheck/src/mozInlineSpellWordUtil.h   |  3 +-
 extensions/widgetutils/src/nsWidgetUtils.cpp  | 23 ++-----
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  6 +-
 layout/inspector/src/inLayoutUtils.cpp        | 17 ++---
 toolkit/toolkit-makefiles.sh                  |  1 -
 widget/src/cocoa/nsMenuItemIconX.mm           | 31 ++++-----
 widget/src/cocoa/nsMenuUtilsX.mm              |  5 +-
 xpfe/appshell/src/nsXULWindow.cpp             |  5 +-
 69 files changed, 207 insertions(+), 548 deletions(-)
 delete mode 100644 dom/interfaces/css/nsIDOMViewCSS.idl
 delete mode 100644 dom/interfaces/views/Makefile.in
 delete mode 100644 dom/interfaces/views/nsIDOMAbstractView.idl
 delete mode 100644 dom/interfaces/views/nsIDOMDocumentView.idl

diff --git a/accessible/src/atk/nsMaiInterfaceComponent.cpp b/accessible/src/atk/nsMaiInterfaceComponent.cpp
index 863026e66e3b..588e3441a454 100644
--- a/accessible/src/atk/nsMaiInterfaceComponent.cpp
+++ b/accessible/src/atk/nsMaiInterfaceComponent.cpp
@@ -45,8 +45,6 @@
 #include "nsCoreUtils.h"
 
 #include "nsIDOMDocument.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index f7d660f6c849..081888febad0 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -43,15 +43,12 @@
 #include "nsAccessNode.h"
 
 #include "nsIDocument.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMRange.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDocShell.h"
@@ -425,13 +422,12 @@ nsCoreUtils::GetScreenCoordsForWindow(nsINode *aNode)
   nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
   treeItem->GetRootTreeItem(getter_AddRefs(rootTreeItem));
   nsCOMPtr<nsIDOMDocument> domDoc = do_GetInterface(rootTreeItem);
-  nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(domDoc));
-  if (!docView)
+  if (!domDoc)
     return coords;
 
-  nsCOMPtr<nsIDOMAbstractView> abstractView;
-  docView->GetDefaultView(getter_AddRefs(abstractView));
-  nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(abstractView));
+  nsCOMPtr<nsIDOMWindow> window;
+  domDoc->GetDefaultView(getter_AddRefs(window));
+  nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(window));
   if (!windowInter)
     return coords;
 
@@ -597,14 +593,14 @@ nsCoreUtils::GetComputedStyleDeclaration(const nsAString& aPseudoElt,
   if (!document)
     return nsnull;
 
-  nsCOMPtr<nsIDOMViewCSS> viewCSS(do_QueryInterface(document->GetWindow()));
-  if (!viewCSS)
+  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(document->GetWindow());
+  if (!window)
     return nsnull;
 
-  nsIDOMCSSStyleDeclaration* cssDecl = nsnull;
+  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
   nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(content));
-  viewCSS->GetComputedStyle(domElement, aPseudoElt, &cssDecl);
-  return cssDecl;
+  window->GetComputedStyle(domElement, aPseudoElt, getter_AddRefs(cssDecl));
+  return cssDecl.forget();
 }
 
 already_AddRefed<nsIBoxObject>
diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index 912641c32301..ae826053be8b 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -47,11 +47,9 @@
 
 #include "nsIClipboard.h"
 #include "nsContentCID.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMDocument.h"
 #include "nsPIDOMWindow.h"        
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMWindowInternal.h"
diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index 3129dec2d2fa..9c8dc89f21f5 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -52,7 +52,6 @@
 #include "nsIDocument.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMNSHTMLElement.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsIPrefService.h"
diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp
index 6d52bb5915da..675bbdb68d49 100644
--- a/content/base/src/nsContentAreaDragDrop.cpp
+++ b/content/base/src/nsContentAreaDragDrop.cpp
@@ -54,7 +54,6 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMDragEvent.h"
-#include "nsIDOMAbstractView.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentRange.h"
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index cae96e74ac5c..e6876383fa44 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -168,7 +168,6 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIChromeRegistry.h"
 #include "nsIMIMEHeaderParam.h"
 #include "nsIDOMXULCommandEvent.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMDragEvent.h"
 #include "nsDOMDataTransfer.h"
 #include "nsHtml5Module.h"
@@ -5501,9 +5500,8 @@ nsContentUtils::DispatchXULCommand(nsIContent* aTarget,
   nsCOMPtr<nsIDOMXULCommandEvent> xulCommand = do_QueryInterface(event);
   nsCOMPtr<nsIPrivateDOMEvent> pEvent = do_QueryInterface(xulCommand);
   NS_ENSURE_STATE(pEvent);
-  nsCOMPtr<nsIDOMAbstractView> view = do_QueryInterface(doc->GetWindow());
   nsresult rv = xulCommand->InitCommandEvent(NS_LITERAL_STRING("command"),
-                                             PR_TRUE, PR_TRUE, view,
+                                             PR_TRUE, PR_TRUE, doc->GetWindow(),
                                              0, aCtrl, aAlt, aShift, aMeta,
                                              aSourceEvent);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 5700367d00e9..e8a86425e8d1 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -75,8 +75,6 @@
 #include "nsDOMAttribute.h"
 #include "nsIDOMDOMStringList.h"
 #include "nsIDOMDOMImplementation.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMDocumentXBL.h"
 #include "mozilla/FunctionTimer.h"
 #include "nsGenericElement.h"
@@ -5069,16 +5067,14 @@ nsDocument::CreateTreeWalker(nsIDOMNode *aRoot,
 
 
 NS_IMETHODIMP
-nsDocument::GetDefaultView(nsIDOMAbstractView** aDefaultView)
+nsDocument::GetDefaultView(nsIDOMWindow** aDefaultView)
 {
-  nsPIDOMWindow* win = GetWindow();
-  if (win) {
-    return CallQueryInterface(win, aDefaultView);
-  }
-
   *aDefaultView = nsnull;
-
-  return NS_OK;
+  nsPIDOMWindow* win = GetWindow();
+  if (!win) {
+    return NS_OK;
+  }
+  return CallQueryInterface(win, aDefaultView);
 }
 
 NS_IMETHODIMP
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 4863e417bd3f..541c78512844 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -52,7 +52,6 @@
 #include "nsTArray.h"
 #include "nsHashSets.h"
 #include "nsIDOMXMLDocument.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMDocumentXBL.h"
 #include "nsIDOMNSDocument.h"
 #include "nsIDOMNSDocumentStyle.h"
@@ -498,7 +497,6 @@ class nsDocument : public nsIDocument,
                    public nsIDOMDocumentEvent,
                    public nsIDOM3DocumentEvent,
                    public nsIDOMNSDocumentStyle,
-                   public nsIDOMDocumentView,
                    public nsIDOMDocumentRange,
                    public nsIDOMDocumentTraversal,
                    public nsIDOMDocumentXBL,
@@ -814,9 +812,6 @@ public:
   // nsIDOMNSDocumentStyle
   NS_DECL_NSIDOMNSDOCUMENTSTYLE
 
-  // nsIDOMDocumentView
-  NS_DECL_NSIDOMDOCUMENTVIEW
-
   // nsIDOMDocumentRange
   NS_DECL_NSIDOMDOCUMENTRANGE
 
@@ -1263,7 +1258,6 @@ protected:
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocument, nsDocument)      \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMNSDocument, nsDocument)    \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentEvent, nsDocument) \
-  NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentView, nsDocument)  \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentTraversal,         \
                                      nsDocument)                              \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMEventTarget, nsDocument)   \
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 8388ece9e828..2e31ff32a52b 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -92,7 +92,6 @@
 
 #include "nsBindingManager.h"
 #include "nsXBLBinding.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIXBLService.h"
 #include "nsPIDOMWindow.h"
 #include "nsIBoxObject.h"
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index 3622ed48cbab..abb29ba8e28e 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -80,7 +80,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent)
 NS_IMETHODIMP
 nsDOMDragEvent::InitDragEvent(const nsAString & aType,
                               PRBool aCanBubble, PRBool aCancelable,
-                              nsIDOMAbstractView* aView, PRInt32 aDetail,
+                              nsIDOMWindow* aView, PRInt32 aDetail,
                               PRInt32 aScreenX, PRInt32 aScreenY,
                               PRInt32 aClientX, PRInt32 aClientY, 
                               PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey,
@@ -132,7 +132,5 @@ nsresult NS_NewDOMDragEvent(nsIDOMEvent** aInstancePtrResult,
                             nsDragEvent *aEvent) 
 {
   nsDOMDragEvent* event = new nsDOMDragEvent(aPresContext, aEvent);
-  NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
-
   return CallQueryInterface(event, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMKeyboardEvent.cpp b/content/events/src/nsDOMKeyboardEvent.cpp
index 33cc4ed450ba..e69a875183a8 100644
--- a/content/events/src/nsDOMKeyboardEvent.cpp
+++ b/content/events/src/nsDOMKeyboardEvent.cpp
@@ -175,7 +175,7 @@ nsDOMKeyboardEvent::GetWhich(PRUint32* aWhich)
 
 NS_IMETHODIMP
 nsDOMKeyboardEvent::InitKeyEvent(const nsAString& aType, PRBool aCanBubble, PRBool aCancelable,
-                                 nsIDOMAbstractView* aView, PRBool aCtrlKey, PRBool aAltKey,
+                                 nsIDOMWindow* aView, PRBool aCtrlKey, PRBool aAltKey,
                                  PRBool aShiftKey, PRBool aMetaKey,
                                  PRUint32 aKeyCode, PRUint32 aCharCode)
 {
@@ -198,9 +198,5 @@ nsresult NS_NewDOMKeyboardEvent(nsIDOMEvent** aInstancePtrResult,
                                 nsKeyEvent *aEvent)
 {
   nsDOMKeyboardEvent* it = new nsDOMKeyboardEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
index dbedcde48bea..322fc60b9994 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -104,7 +104,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent)
 
 NS_IMETHODIMP
 nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX, 
+                                nsIDOMWindow* aView, PRInt32 aDetail, PRInt32 aScreenX, 
                                 PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY, 
                                 PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey, 
                                 PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget)
@@ -147,7 +147,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo
 
 NS_IMETHODIMP
 nsDOMMouseEvent::InitNSMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                  nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX,
+                                  nsIDOMWindow *aView, PRInt32 aDetail, PRInt32 aScreenX,
                                   PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY,
                                   PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey,
                                   PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget,
@@ -313,9 +313,5 @@ nsresult NS_NewDOMMouseEvent(nsIDOMEvent** aInstancePtrResult,
                              nsInputEvent *aEvent) 
 {
   nsDOMMouseEvent* it = new nsDOMMouseEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index 34bda3a5ddea..ac61c741286d 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -88,7 +88,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent)
 
 NS_IMETHODIMP
 nsDOMMouseScrollEvent::InitMouseScrollEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX, 
+                                nsIDOMWindow *aView, PRInt32 aDetail, PRInt32 aScreenX, 
                                 PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY, 
                                 PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey, 
                                 PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget,
@@ -129,9 +129,5 @@ nsresult NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
                                    nsInputEvent *aEvent) 
 {
   nsDOMMouseScrollEvent* it = new nsDOMMouseScrollEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMozTouchEvent.cpp b/content/events/src/nsDOMMozTouchEvent.cpp
index 03faf82f72f9..0c517e9dd06e 100644
--- a/content/events/src/nsDOMMozTouchEvent.cpp
+++ b/content/events/src/nsDOMMozTouchEvent.cpp
@@ -85,7 +85,7 @@ NS_IMETHODIMP
 nsDOMMozTouchEvent::InitMozTouchEvent(const nsAString& aTypeArg,
                                       PRBool aCanBubbleArg,
                                       PRBool aCancelableArg,
-                                      nsIDOMAbstractView* aViewArg,
+                                      nsIDOMWindow* aViewArg,
                                       PRInt32 aDetailArg,
                                       PRInt32 aScreenX,
                                       PRInt32 aScreenY,
@@ -127,8 +127,5 @@ nsresult NS_NewDOMMozTouchEvent(nsIDOMEvent** aInstancePtrResult,
                                      nsMozTouchEvent *aEvent)
 {
   nsDOMMozTouchEvent *it = new nsDOMMozTouchEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMScrollAreaEvent.cpp b/content/events/src/nsDOMScrollAreaEvent.cpp
index 5712179653b4..44c373b0febc 100644
--- a/content/events/src/nsDOMScrollAreaEvent.cpp
+++ b/content/events/src/nsDOMScrollAreaEvent.cpp
@@ -101,7 +101,7 @@ NS_IMETHODIMP
 nsDOMScrollAreaEvent::InitScrollAreaEvent(const nsAString &aEventType,
                                           PRBool aCanBubble,
                                           PRBool aCancelable,
-                                          nsIDOMAbstractView *aView,
+                                          nsIDOMWindow *aView,
                                           PRInt32 aDetail,
                                           float aX, float aY,
                                           float aWidth, float aHeight)
@@ -155,11 +155,6 @@ NS_NewDOMScrollAreaEvent(nsIDOMEvent **aInstancePtrResult,
                          nsPresContext *aPresContext,
                          nsScrollAreaEvent *aEvent)
 {
-  nsDOMScrollAreaEvent *ev = new nsDOMScrollAreaEvent(aPresContext, aEvent);
-
-  if (!ev) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return CallQueryInterface(ev, aInstancePtrResult);
+  nsDOMScrollAreaEvent* it = new nsDOMScrollAreaEvent(aPresContext, aEvent);
+  return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMSimpleGestureEvent.cpp b/content/events/src/nsDOMSimpleGestureEvent.cpp
index 61374c488fa8..c3d3b59f1c44 100644
--- a/content/events/src/nsDOMSimpleGestureEvent.cpp
+++ b/content/events/src/nsDOMSimpleGestureEvent.cpp
@@ -95,7 +95,7 @@ NS_IMETHODIMP
 nsDOMSimpleGestureEvent::InitSimpleGestureEvent(const nsAString& aTypeArg,
                                                 PRBool aCanBubbleArg,
                                                 PRBool aCancelableArg,
-                                                nsIDOMAbstractView* aViewArg,
+                                                nsIDOMWindow* aViewArg,
                                                 PRInt32 aDetailArg,
                                                 PRInt32 aScreenX, 
                                                 PRInt32 aScreenY,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index 07bcba00a9d3..c25f1cbfcb87 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -176,7 +176,7 @@ nsDOMUIEvent::GetClientPoint()
 }
 
 NS_IMETHODIMP
-nsDOMUIEvent::GetView(nsIDOMAbstractView** aView)
+nsDOMUIEvent::GetView(nsIDOMWindow** aView)
 {
   *aView = mView;
   NS_IF_ADDREF(*aView);
@@ -191,7 +191,11 @@ nsDOMUIEvent::GetDetail(PRInt32* aDetail)
 }
 
 NS_IMETHODIMP
-nsDOMUIEvent::InitUIEvent(const nsAString & typeArg, PRBool canBubbleArg, PRBool cancelableArg, nsIDOMAbstractView *viewArg, PRInt32 detailArg)
+nsDOMUIEvent::InitUIEvent(const nsAString& typeArg,
+                          PRBool canBubbleArg,
+                          PRBool cancelableArg,
+                          nsIDOMWindow* viewArg,
+                          PRInt32 detailArg)
 {
   nsresult rv = nsDOMEvent::InitEvent(typeArg, canBubbleArg, cancelableArg);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -418,9 +422,5 @@ nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult,
                           nsGUIEvent *aEvent) 
 {
   nsDOMUIEvent* it = new nsDOMUIEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMUIEvent.h b/content/events/src/nsDOMUIEvent.h
index a242af36f5be..22cee7ade555 100644
--- a/content/events/src/nsDOMUIEvent.h
+++ b/content/events/src/nsDOMUIEvent.h
@@ -36,12 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsDOMUIEvent_h__
-#define nsDOMUIEvent_h__
+#ifndef nsDOMUIEvent_h
+#define nsDOMUIEvent_h
 
 #include "nsIDOMUIEvent.h"
 #include "nsIDOMNSUIEvent.h"
-#include "nsIDOMAbstractView.h"
 #include "nsDOMEvent.h"
 
 class nsDOMUIEvent : public nsDOMEvent,
@@ -78,7 +77,7 @@ protected:
   nsIntPoint GetPagePoint();
   
 protected:
-  nsCOMPtr<nsIDOMAbstractView> mView;
+  nsCOMPtr<nsIDOMWindow> mView;
   PRInt32 mDetail;
   nsIntPoint mClientPoint;
   // Screenpoint is mEvent->refPoint.
@@ -90,4 +89,4 @@ protected:
   NS_FORWARD_NSIDOMUIEVENT(nsDOMUIEvent::) \
   NS_FORWARD_TO_NSDOMEVENT
 
-#endif // nsDOMUIEvent_h__
+#endif // nsDOMUIEvent_h
diff --git a/content/events/src/nsDOMXULCommandEvent.cpp b/content/events/src/nsDOMXULCommandEvent.cpp
index 1090d318f62b..30611e651112 100644
--- a/content/events/src/nsDOMXULCommandEvent.cpp
+++ b/content/events/src/nsDOMXULCommandEvent.cpp
@@ -118,7 +118,7 @@ nsDOMXULCommandEvent::GetSourceEvent(nsIDOMEvent** aSourceEvent)
 NS_IMETHODIMP
 nsDOMXULCommandEvent::InitCommandEvent(const nsAString& aType,
                                        PRBool aCanBubble, PRBool aCancelable,
-                                       nsIDOMAbstractView *aView,
+                                       nsIDOMWindow* aView,
                                        PRInt32 aDetail,
                                        PRBool aCtrlKey, PRBool aAltKey,
                                        PRBool aShiftKey, PRBool aMetaKey,
@@ -144,9 +144,5 @@ nsresult NS_NewDOMXULCommandEvent(nsIDOMEvent** aInstancePtrResult,
                                   nsInputEvent *aEvent) 
 {
   nsDOMXULCommandEvent* it = new nsDOMXULCommandEvent(aPresContext, aEvent);
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index b87f2f04ad39..2f95f42e5662 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -118,7 +118,6 @@
 #include "nsIDOMMouseScrollEvent.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMNSUIEvent.h"
 #include "nsDOMDragEvent.h"
 #include "nsIDOMNSEditableElement.h"
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 98e17655f5ce..df3c7088a718 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1388,6 +1388,12 @@ nsHTMLDocument::NormalizeDocument()
   return nsDocument::NormalizeDocument();
 }
 
+NS_IMETHODIMP
+nsHTMLDocument::GetDefaultView(nsIDOMWindow** aWindow)
+{
+  return nsDocument::GetDefaultView(aWindow);
+}
+
 //
 // nsIDOMHTMLDocument interface implementation
 //
diff --git a/content/smil/nsDOMTimeEvent.cpp b/content/smil/nsDOMTimeEvent.cpp
index 100a385b31c3..d37dc033c37b 100644
--- a/content/smil/nsDOMTimeEvent.cpp
+++ b/content/smil/nsDOMTimeEvent.cpp
@@ -39,7 +39,6 @@
 #include "nsGUIEvent.h"
 #include "nsPresContext.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIDOMAbstractView.h"
 
 nsDOMTimeEvent::nsDOMTimeEvent(nsPresContext* aPresContext, nsEvent* aEvent)
   : nsDOMEvent(aPresContext, aEvent ? aEvent : new nsUIEvent(PR_FALSE, 0, 0)),
@@ -92,7 +91,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMTimeEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
 
 NS_IMETHODIMP
-nsDOMTimeEvent::GetView(nsIDOMAbstractView** aView)
+nsDOMTimeEvent::GetView(nsIDOMWindow** aView)
 {
   *aView = mView;
   NS_IF_ADDREF(*aView);
@@ -108,7 +107,7 @@ nsDOMTimeEvent::GetDetail(PRInt32* aDetail)
 
 NS_IMETHODIMP
 nsDOMTimeEvent::InitTimeEvent(const nsAString& aTypeArg,
-                              nsIDOMAbstractView* aViewArg,
+                              nsIDOMWindow* aViewArg,
                               PRInt32 aDetailArg)
 {
   nsresult rv = nsDOMEvent::InitEvent(aTypeArg, PR_FALSE /*doesn't bubble*/,
diff --git a/content/smil/nsDOMTimeEvent.h b/content/smil/nsDOMTimeEvent.h
index 632b8ddc19a9..9ff25f5e37ca 100644
--- a/content/smil/nsDOMTimeEvent.h
+++ b/content/smil/nsDOMTimeEvent.h
@@ -58,8 +58,8 @@ public:
   NS_FORWARD_TO_NSDOMEVENT
 
 private:
-  nsCOMPtr<nsIDOMAbstractView> mView;
-  PRInt32                      mDetail;
+  nsCOMPtr<nsIDOMWindow> mView;
+  PRInt32 mDetail;
 };
 
 #endif // NS_DOMTIMEEVENT_H_
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
index 6818d4f9a215..e885ef81906c 100644
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -51,8 +51,6 @@
 #include "nsStyleConsts.h"
 #include "nsDOMError.h"
 #include "nsIPresShell.h"
-#include "nsIDOMViewCSS.h"
-#include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIServiceManager.h"
 #include "nsIXBLService.h"
 #include "nsGkAtoms.h"
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/content/xml/document/src/nsXMLPrettyPrinter.cpp
index e6b963561bc8..504db4af51db 100644
--- a/content/xml/document/src/nsXMLPrettyPrinter.cpp
+++ b/content/xml/document/src/nsXMLPrettyPrinter.cpp
@@ -38,10 +38,7 @@
  
 #include "nsXMLPrettyPrinter.h"
 #include "nsContentUtils.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMCSSStyleDeclaration.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMDocumentXBL.h"
 #include "nsIObserver.h"
 #include "nsIXSLTProcessor.h"
@@ -95,16 +92,13 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
         nsCOMPtr<nsIDOMCSSStyleDeclaration> computedStyle;
         nsCOMPtr<nsIDOMDocument> frameOwnerDoc;
         frameElem->GetOwnerDocument(getter_AddRefs(frameOwnerDoc));
-        nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(frameOwnerDoc);
-        if (docView) {
-            nsCOMPtr<nsIDOMAbstractView> defaultView;
-            docView->GetDefaultView(getter_AddRefs(defaultView));
-            nsCOMPtr<nsIDOMViewCSS> defaultCSSView =
-                do_QueryInterface(defaultView);
-            if (defaultCSSView) {
-                defaultCSSView->GetComputedStyle(frameElem,
-                                                 EmptyString(),
-                                                 getter_AddRefs(computedStyle));
+        if (frameOwnerDoc) {
+            nsCOMPtr<nsIDOMWindow> window;
+            frameOwnerDoc->GetDefaultView(getter_AddRefs(window));
+            if (window) {
+                window->GetComputedStyle(frameElem,
+                                         EmptyString(),
+                                         getter_AddRefs(computedStyle));
             }
         }
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index a91eab34d349..23279f0f2116 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -119,7 +118,6 @@
 #include "nsXULDocument.h"
 #include "nsXULPopupListener.h"
 #include "nsRuleWalker.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsCSSParser.h"
 #include "nsIListBoxObject.h"
diff --git a/dom/Makefile.in b/dom/Makefile.in
index cb57d182cb44..e2d79ad032ab 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -50,7 +50,6 @@ DIRS = \
   interfaces/html \
   interfaces/events \
   interfaces/stylesheets \
-  interfaces/views \
   interfaces/sidebar \
   interfaces/css \
   interfaces/traversal \
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 6efc5de2ebc3..1044b69ba39f 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -192,7 +192,6 @@
 #include "nsBindingManager.h"
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsStyleSet.h"
@@ -253,7 +252,6 @@
 #include "nsIDOMDocumentRange.h"
 #include "nsIDOMDocumentTraversal.h"
 #include "nsIDOMDocumentXBL.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMLinkStyle.h"
 #include "nsIDOMHTMLDocument.h"
@@ -2273,7 +2271,6 @@ nsDOMClassInfo::RegisterExternalClasses()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentEvent)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentStyle)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSDocumentStyle)                            \
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentView)                               \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentRange)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTraversal)                          \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentXBL)                                \
@@ -2350,8 +2347,6 @@ nsDOMClassInfo::Init()
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
@@ -2363,8 +2358,6 @@ nsDOMClassInfo::Init()
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
     DOM_CLASSINFO_MAP_END
@@ -3071,8 +3064,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(RangeException, nsIDOMRangeException)
@@ -3955,8 +3946,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMModalContentWindow)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 154a966d0ea3..a4912c349b10 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -111,7 +111,6 @@
 #endif
 #include "nsIDOMDocument.h"
 #include "nsIDOMNSDocument.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEvent.h"
@@ -1334,8 +1333,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
   NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMWindow)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMViewCSS)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMAbstractView)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageWindow)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
@@ -7939,10 +7936,6 @@ nsGlobalWindow::UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent)
   }
 }
 
-//*****************************************************************************
-// nsGlobalWindow::nsIDOMViewCSS
-//*****************************************************************************
-
 NS_IMETHODIMP
 nsGlobalWindow::GetComputedStyle(nsIDOMElement* aElt,
                                  const nsAString& aPseudoElt,
@@ -7979,27 +7972,6 @@ nsGlobalWindow::GetComputedStyle(nsIDOMElement* aElt,
   return NS_OK;
 }
 
-//*****************************************************************************
-// nsGlobalWindow::nsIDOMAbstractView
-//*****************************************************************************
-
-NS_IMETHODIMP
-nsGlobalWindow::GetDocument(nsIDOMDocumentView ** aDocumentView)
-{
-  NS_ENSURE_ARG_POINTER(aDocumentView);
-
-  nsresult rv = NS_OK;
-
-  if (mDocument) {
-    rv = CallQueryInterface(mDocument, aDocumentView);
-  }
-  else {
-    *aDocumentView = nsnull;
-  }
-
-  return rv;
-}
-
 //*****************************************************************************
 // nsGlobalWindow::nsIDOMStorageWindow
 //*****************************************************************************
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index dac3c390d91a..4c533df74503 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -62,7 +62,6 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDOMClientInformation.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEventTarget.h"
@@ -280,7 +279,6 @@ class nsGlobalWindow : public nsPIDOMWindow,
                        public nsPIDOMEventTarget,
                        public nsIDOM3EventTarget,
                        public nsIDOMNSEventTarget,
-                       public nsIDOMViewCSS,
                        public nsIDOMStorageWindow,
                        public nsIDOMStorageIndexedDB,
                        public nsSupportsWeakReference,
@@ -419,12 +417,6 @@ public:
   virtual NS_HIDDEN_(void) MaybeUpdateTouchState();
   virtual NS_HIDDEN_(void) UpdateTouchState();
 
-  // nsIDOMViewCSS
-  NS_DECL_NSIDOMVIEWCSS
-
-  // nsIDOMAbstractView
-  NS_DECL_NSIDOMABSTRACTVIEW
-
   // nsIDOMStorageWindow
   NS_DECL_NSIDOMSTORAGEWINDOW
 
diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl
index 3dd14bb44d75..1a4496dddad8 100644
--- a/dom/interfaces/base/domstubs.idl
+++ b/dom/interfaces/base/domstubs.idl
@@ -77,10 +77,6 @@ interface nsIDOMLinkStyle;
 interface nsIDOMStyleSheet;
 interface nsIDOMMediaList;
 
-// Views
-interface nsIDOMAbstractView;
-interface nsIDOMDocumentView;
-
 // Base
 interface nsIDOMWindow;
 interface nsIDOMWindowInternal;
@@ -130,4 +126,3 @@ interface nsIDOMRange;
 interface nsIDOMCRMFObject;
 interface nsIDOMCrypto;
 interface nsIDOMPkcs11;
-
diff --git a/dom/interfaces/base/nsIDOMWindow.idl b/dom/interfaces/base/nsIDOMWindow.idl
index fdc98011b44c..ec0414e05708 100644
--- a/dom/interfaces/base/nsIDOMWindow.idl
+++ b/dom/interfaces/base/nsIDOMWindow.idl
@@ -47,11 +47,10 @@ interface nsISelection;
  * contain child windows if the document in the window contains a
  * HTML frameset document or if the document contains iframe elements.
  *
- * This interface is not officially defined by any standard bodies, it
- * originates from the defacto DOM Level 0 standard.
+ * @see <http://www.whatwg.org/html/#window>
  */
 
-[scriptable, uuid(a6cf906b-15b3-11d2-932e-00805f8add32)]
+[scriptable, uuid(ff7d278f-93db-4078-b89a-058c8e1270b4)]
 interface nsIDOMWindow : nsISupports
 {
   /**
@@ -150,4 +149,10 @@ interface nsIDOMWindow : nsISupports
    * Method for sizing this window to the content in the window.
    */
   void                      sizeToContent();
+
+  /**
+   * @see <http://dev.w3.org/csswg/cssom/#dom-window-getcomputedstyle>
+   */
+  nsIDOMCSSStyleDeclaration getComputedStyle(in nsIDOMElement elt, 
+                                             [optional] in DOMString pseudoElt);
 };
diff --git a/dom/interfaces/base/nsIDOMWindow2.idl b/dom/interfaces/base/nsIDOMWindow2.idl
index 510e3178f081..a69d0ae88162 100644
--- a/dom/interfaces/base/nsIDOMWindow2.idl
+++ b/dom/interfaces/base/nsIDOMWindow2.idl
@@ -40,7 +40,7 @@
 interface nsIDOMOfflineResourceList;
 interface nsIDOMBlob;
 
-[scriptable, uuid(efff0d88-3b94-4375-bdeb-676a847ecd7d)]
+[scriptable, uuid(e2796e00-14de-4ce0-acfe-0374bc0e715d)]
 interface nsIDOMWindow2 : nsIDOMWindow
 {
   /**
diff --git a/dom/interfaces/base/nsIDOMWindowInternal.idl b/dom/interfaces/base/nsIDOMWindowInternal.idl
index 114b39d40926..27e2d3167aba 100644
--- a/dom/interfaces/base/nsIDOMWindowInternal.idl
+++ b/dom/interfaces/base/nsIDOMWindowInternal.idl
@@ -46,7 +46,7 @@ interface nsIVariant;
 interface nsIAnimationFrameListener;
 interface nsIDOMMediaQueryList;
 
-[scriptable, uuid(04eafa93-efbe-4254-9d65-91c344fa7ff2)]
+[scriptable, uuid(4d95736f-8130-43cb-a276-5bc554eca80a)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index e9587254012b..68956bbe4d18 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -52,7 +52,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(2d305b95-a030-4d24-a12c-7fabf61a8c3c)]
+[scriptable, uuid(d12f0ecf-434a-4b5c-81ad-354e3b9037b9)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -108,4 +108,11 @@ interface nsIDOMDocument : nsIDOMNode
                                         raises(DOMException);
   // Introduced in DOM Level 3:
   void               normalizeDocument();
+
+  /**
+   * The window associated with this document.
+   *
+   * @see http://www.whatwg.org/html/#dom-document-defaultview
+   */
+  readonly attribute nsIDOMWindow    defaultView;
 };
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 224ba547c50e..3069153065ac 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(f493687c-ea80-471b-965b-11467ebea24b)]
+[scriptable, uuid(68e4448c-eb64-48ea-801a-0c83008d2607)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/css/Makefile.in b/dom/interfaces/css/Makefile.in
index a0b4c64838c8..b432a249adbf 100644
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -71,7 +71,6 @@ XPIDLSRCS =					\
 	nsIDOMDocumentCSS.idl			\
 	nsIDOMRGBColor.idl			\
 	nsIDOMRect.idl				\
-	nsIDOMViewCSS.idl			\
 	nsIDOMNSRGBAColor.idl			\
 	$(NULL)
 
diff --git a/dom/interfaces/css/nsIDOMViewCSS.idl b/dom/interfaces/css/nsIDOMViewCSS.idl
deleted file mode 100644
index 2eb66fc9e9f9..000000000000
--- a/dom/interfaces/css/nsIDOMViewCSS.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@netscape.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIDOMAbstractView.idl"
-
-[scriptable, uuid(0b9341f3-95d4-4fa4-adcd-e119e0db2889)]
-interface nsIDOMViewCSS : nsIDOMAbstractView
-{
-  /**
-   * @see <http://dev.w3.org/csswg/cssom/#dom-window-getcomputedstyle>
-   */
-  nsIDOMCSSStyleDeclaration getComputedStyle(in nsIDOMElement elt, 
-                                             [optional] in DOMString pseudoElt);
-};
diff --git a/dom/interfaces/events/nsIDOMDragEvent.idl b/dom/interfaces/events/nsIDOMDragEvent.idl
index a443f7d5e3ec..13e25628e296 100644
--- a/dom/interfaces/events/nsIDOMDragEvent.idl
+++ b/dom/interfaces/events/nsIDOMDragEvent.idl
@@ -38,10 +38,9 @@
 #include "domstubs.idl"
 #include "nsIDOMMouseEvent.idl"
 
-interface nsIDOMAbstractView;
 interface nsIDOMDataTransfer;
 
-[scriptable, uuid(98351627-62d7-4b07-bbf3-78009b20764b)]
+[scriptable, uuid(0f4fef03-c0e9-406c-a754-c01148e431ae)]
 interface nsIDOMDragEvent : nsIDOMMouseEvent
 {
   readonly attribute nsIDOMDataTransfer dataTransfer;
@@ -49,7 +48,7 @@ interface nsIDOMDragEvent : nsIDOMMouseEvent
   void initDragEvent(in DOMString typeArg,
                      in boolean canBubbleArg,
                      in boolean cancelableArg,
-                     in nsIDOMAbstractView aView,
+                     in nsIDOMWindow aView,
                      in long aDetail,
                      in long aScreenX,
                      in long aScreenY,
diff --git a/dom/interfaces/events/nsIDOMKeyEvent.idl b/dom/interfaces/events/nsIDOMKeyEvent.idl
index c0ed1dfc59aa..18e770dd603c 100644
--- a/dom/interfaces/events/nsIDOMKeyEvent.idl
+++ b/dom/interfaces/events/nsIDOMKeyEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(028e0e6e-8b01-11d3-aae7-0010838a3123)]
+[scriptable, uuid(e44d7977-20f2-442e-bc13-0f2f52992a4c)]
 interface nsIDOMKeyEvent : nsIDOMUIEvent
 {
   const unsigned long DOM_VK_CANCEL         = 0x03;
@@ -193,7 +193,7 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent
   void                      initKeyEvent(in DOMString typeArg,
                                          in boolean canBubbleArg,
                                          in boolean cancelableArg,
-                                         in nsIDOMAbstractView viewArg,
+                                         in nsIDOMWindow viewArg,
                                          in boolean ctrlKeyArg,
                                          in boolean altKeyArg,
                                          in boolean shiftKeyArg,
diff --git a/dom/interfaces/events/nsIDOMMouseEvent.idl b/dom/interfaces/events/nsIDOMMouseEvent.idl
index f21e93d8b614..7f0d763b9edb 100644
--- a/dom/interfaces/events/nsIDOMMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseEvent.idl
@@ -47,7 +47,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(ff751edc-8b02-aae7-0010-8301838a3123)]
+[scriptable, uuid(73558605-f479-493e-86d1-9794cd117fef)]
 interface nsIDOMMouseEvent : nsIDOMUIEvent
 {
   readonly attribute long               screenX;
@@ -67,7 +67,7 @@ interface nsIDOMMouseEvent : nsIDOMUIEvent
   void                      initMouseEvent(in DOMString typeArg,
                                            in boolean canBubbleArg,
                                            in boolean cancelableArg,
-                                           in nsIDOMAbstractView viewArg,
+                                           in nsIDOMWindow viewArg,
                                            in long detailArg,
                                            in long screenXArg,
                                            in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
index 269061fab605..fafce7cb327f 100644
--- a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMMouseEvent.idl"
 
-[scriptable, uuid(ba8d1a7e-b475-4542-8d32-01e7ea7b8091)]
+[scriptable, uuid(af08bce0-6821-4bac-8964-0fcee4be549a)]
 interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
 {
   const long HORIZONTAL_AXIS = 1;
@@ -49,7 +49,7 @@ interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
   void                initMouseScrollEvent(in DOMString typeArg,
                                            in boolean canBubbleArg,
                                            in boolean cancelableArg,
-                                           in nsIDOMAbstractView viewArg,
+                                           in nsIDOMWindow viewArg,
                                            in long detailArg,
                                            in long screenXArg,
                                            in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMMozTouchEvent.idl b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
index b9439dfa06fc..d9f73c5bc8e8 100644
--- a/dom/interfaces/events/nsIDOMMozTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
@@ -40,7 +40,7 @@
 #include "nsIDOMMouseEvent.idl"
 
 
-[scriptable, uuid(9b454391-0190-4313-a070-1e26e9bf6f31)]
+[scriptable, uuid(e9ed248b-1995-482f-8407-33ae7744bb9c)]
 interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
 {
   readonly attribute unsigned long streamId;
@@ -48,7 +48,7 @@ interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
   void initMozTouchEvent(in DOMString typeArg,
                          in boolean canBubbleArg,
                          in boolean cancelableArg,
-                         in nsIDOMAbstractView viewArg,
+                         in nsIDOMWindow viewArg,
                          in long detailArg,
                          in long screenXArg,
                          in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMNSMouseEvent.idl b/dom/interfaces/events/nsIDOMNSMouseEvent.idl
index a9b54780d177..abf10c770905 100644
--- a/dom/interfaces/events/nsIDOMNSMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMNSMouseEvent.idl
@@ -43,7 +43,7 @@
  * by providing various information related to the mouse event.
  */
 
-[scriptable, uuid(f5dd5fbb-f4ff-4277-819c-f31aa1dafc32)]
+[scriptable, uuid(8418a402-3c9b-431a-80a7-a59b23ed57a0)]
 interface nsIDOMNSMouseEvent : nsIDOMMouseEvent
 {
   // Finger or touch pressure event value
@@ -63,7 +63,7 @@ interface nsIDOMNSMouseEvent : nsIDOMMouseEvent
   void                initNSMouseEvent(in DOMString typeArg,
                                        in boolean canBubbleArg,
                                        in boolean cancelableArg,
-                                       in nsIDOMAbstractView viewArg,
+                                       in nsIDOMWindow viewArg,
                                        in long detailArg,
                                        in long screenXArg,
                                        in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
index 0cbc870b8425..b4ad5b9fd174 100644
--- a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
+++ b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
@@ -37,7 +37,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(b2f49035-4a2f-4e62-8fb0-deb68b0de4d9)]
+[scriptable, uuid(911c3352-6690-421c-9bbe-6bd34f1600dc)]
 interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
 {
   // Scroll area client rect
@@ -49,7 +49,7 @@ interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
   void initScrollAreaEvent(in DOMString aEventType,
                            in boolean aCanBubble,
                            in boolean aCancelable,
-                           in nsIDOMAbstractView aView,
+                           in nsIDOMWindow aView,
                            in long aDetail,
                            in float x,
                            in float y,
diff --git a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
index 91d1ac23d461..625acd43b056 100644
--- a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
+++ b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
@@ -97,7 +97,7 @@
  * consuming events.
  */
 
-[scriptable, uuid(cb68e879-f710-415d-a871-9a550860df01)]
+[scriptable, uuid(fe6b7df3-be7c-4a0b-99a2-da84e956e2f5)]
 interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
 {
   /* Swipe direction constants */
@@ -148,7 +148,7 @@ interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
   void initSimpleGestureEvent(in DOMString typeArg,
                               in boolean canBubbleArg,
                               in boolean cancelableArg,
-                              in nsIDOMAbstractView viewArg,
+                              in nsIDOMWindow viewArg,
                               in long detailArg,
                               in long screenXArg,
                               in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMUIEvent.idl b/dom/interfaces/events/nsIDOMUIEvent.idl
index cbd86bfe10dd..155858d1964c 100644
--- a/dom/interfaces/events/nsIDOMUIEvent.idl
+++ b/dom/interfaces/events/nsIDOMUIEvent.idl
@@ -47,14 +47,14 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(a6cf90c3-15b3-11d2-932e-00805f8add32)]
+[scriptable, uuid(25f28689-3f78-47e8-8d76-15b936faf8c1)]
 interface nsIDOMUIEvent : nsIDOMEvent
 {
-  readonly attribute nsIDOMAbstractView view;
+  readonly attribute nsIDOMWindow       view;
   readonly attribute long               detail;
   void                      initUIEvent(in DOMString typeArg,
                                         in boolean canBubbleArg,
                                         in boolean cancelableArg,
-                                        in nsIDOMAbstractView viewArg,
+                                        in nsIDOMWindow viewArg,
                                         in long detailArg);
 };
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index 53972ff95ae9..bc957bec92d6 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(2d7a0f2e-6b1c-4e93-bbea-122eb0a8a513)]
+[scriptable, uuid(42bb545e-be46-4f4f-8c0a-6c948ea0c1d4)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            title;
diff --git a/dom/interfaces/smil/nsIDOMTimeEvent.idl b/dom/interfaces/smil/nsIDOMTimeEvent.idl
index af1e5bc5ea09..086b7aebe23f 100644
--- a/dom/interfaces/smil/nsIDOMTimeEvent.idl
+++ b/dom/interfaces/smil/nsIDOMTimeEvent.idl
@@ -45,13 +45,13 @@
  * http://www.w3.org/TR/SVG/animate.html#InterfaceTimeEvent
  */
 
-[scriptable, uuid(0d309c26-ddbb-44cb-9af1-3008972349e3)]
+[scriptable, uuid(873785cc-d8be-48af-8b30-5c566e3f4e6e)]
 interface nsIDOMTimeEvent : nsIDOMEvent
 {
   readonly attribute long detail;
-  readonly attribute nsIDOMAbstractView view;
+  readonly attribute nsIDOMWindow view;
   
   void initTimeEvent(in DOMString typeArg,
-                     in nsIDOMAbstractView viewArg,
+                     in nsIDOMWindow viewArg,
                      in long detailArg);
 };
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index 89aff8b4048f..78faa0f9b0db 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,7 +39,7 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(dcac0765-b258-4e0b-9862-6470eb9876ba)]
+[scriptable, uuid(907f1ada-5ace-4789-8c25-0c79f251044d)]
 interface nsIDOMSVGDocument : nsIDOMDocument
                          /* , nsIDOMDocumentEvent */
 {
diff --git a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
index edf22923df90..839845422287 100644
--- a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
@@ -45,7 +45,7 @@
 interface nsIDOMSVGRect;
 interface nsIDOMSVGPoint;
 
-[scriptable, uuid(339a8c7a-552e-4cbc-8d96-8370a3939358)]
+[scriptable, uuid(7298880d-127d-470d-a8ac-e5a8e5969270)]
 interface nsIDOMSVGZoomEvent : nsIDOMUIEvent
 {
   readonly attribute nsIDOMSVGRect  zoomRectScreen;
diff --git a/dom/interfaces/views/Makefile.in b/dom/interfaces/views/Makefile.in
deleted file mode 100644
index 6137d4a5c4fc..000000000000
--- a/dom/interfaces/views/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= dom
-XPIDL_MODULE	= dom_views
-GRE_MODULE	= 1
-
-SDK_XPIDLSRCS =                                 \
-	nsIDOMDocumentView.idl			\
-	nsIDOMAbstractView.idl			\
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/views/nsIDOMAbstractView.idl b/dom/interfaces/views/nsIDOMAbstractView.idl
deleted file mode 100644
index eedc3e05384d..000000000000
--- a/dom/interfaces/views/nsIDOMAbstractView.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@netscape.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "domstubs.idl"
-
-/**
- * The nsIDOMAbstractView interface is a datatype for a view in the
- * Document Object Model.
- *
- * For more information on this interface please see
- * http://www.w3.org/TR/DOM-Level-2-Views
- */
-
-[scriptable, uuid(F51EBADE-8B1A-11D3-AAE7-0010830123B4)]
-interface nsIDOMAbstractView : nsISupports
-{
-  readonly attribute nsIDOMDocumentView     document;
-};
diff --git a/dom/interfaces/views/nsIDOMDocumentView.idl b/dom/interfaces/views/nsIDOMDocumentView.idl
deleted file mode 100644
index a78ef779be65..000000000000
--- a/dom/interfaces/views/nsIDOMDocumentView.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@netscape.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "domstubs.idl"
-
-/**
- * The nsIDOMDocumentView interface is a datatype for a document that
- * supports views in the Document Object Model.
- *
- * For more information on this interface please see
- * http://www.w3.org/TR/DOM-Level-2-Views
- */
-
-[scriptable, uuid(1ACDB2BA-1DD2-11B2-95BC-9542495D2569)]
-interface nsIDOMDocumentView : nsISupports
-{
-  readonly attribute nsIDOMAbstractView     defaultView;
-};
-
diff --git a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
index 0f8263a3344a..803857f05fb3 100644
--- a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
+++ b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
@@ -43,7 +43,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(f9fa8205-a988-4828-9228-f3332d5475ac)]
+[scriptable, uuid(1d78da1e-2177-4b8f-9b11-41e78d1e60f7)]
 interface nsIDOMXULCommandEvent : nsIDOMUIEvent
 {
   /**
@@ -68,7 +68,7 @@ interface nsIDOMXULCommandEvent : nsIDOMUIEvent
   void initCommandEvent(in DOMString typeArg,
                         in boolean canBubbleArg,
                         in boolean cancelableArg,
-                        in nsIDOMAbstractView viewArg,
+                        in nsIDOMWindow viewArg,
                         in long detailArg,
                         in boolean ctrlKeyArg,
                         in boolean altKeyArg,
diff --git a/editor/libeditor/html/nsHTMLAbsPosition.cpp b/editor/libeditor/html/nsHTMLAbsPosition.cpp
index c3b72590d251..5c685dc5cc11 100644
--- a/editor/libeditor/html/nsHTMLAbsPosition.cpp
+++ b/editor/libeditor/html/nsHTMLAbsPosition.cpp
@@ -690,13 +690,14 @@ nsHTMLEditor::CheckPositionedElementBGandFG(nsIDOMElement * aElement,
                                          bgColorStr);
     NS_ENSURE_SUCCESS(res, res);
     if (bgColorStr.EqualsLiteral("transparent")) {
+      nsCOMPtr<nsIDOMWindow> window;
+      res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(window));
+      NS_ENSURE_SUCCESS(res, res);
 
-      nsCOMPtr<nsIDOMViewCSS> viewCSS;
-      res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(viewCSS));
-      NS_ENSURE_SUCCESS(res, res);
       nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
-      res = viewCSS->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
+      res = window->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
       NS_ENSURE_SUCCESS(res, res);
+
       // from these declarations, get the one we want and that one only
       nsCOMPtr<nsIDOMCSSValue> colorCssValue;
       res = cssDecl->GetPropertyCSSValue(NS_LITERAL_STRING("color"), getter_AddRefs(colorCssValue));
diff --git a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
index 79a0f6924281..b7aea69a67d4 100644
--- a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
+++ b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
@@ -430,13 +430,13 @@ nsHTMLEditor::GetPositionAndDimensions(nsIDOMElement * aElement,
     // Yes, it is absolutely positioned
     mResizedObjectIsAbsolutelyPositioned = PR_TRUE;
 
-    nsCOMPtr<nsIDOMViewCSS> viewCSS;
-    res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(viewCSS));
-    NS_ENSURE_TRUE(viewCSS, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIDOMWindow> window;
+    res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(window));
+    NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
     // Get the all the computed css styles attached to the element node
-    res = viewCSS->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
+    res = window->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
     NS_ENSURE_SUCCESS(res, res);
 
     aBorderLeft = GetCSSFloatValue(cssDecl, NS_LITERAL_STRING("border-left-width"));
diff --git a/editor/libeditor/html/nsHTMLCSSUtils.cpp b/editor/libeditor/html/nsHTMLCSSUtils.cpp
index 884a00d46909..19e46b5e3a32 100644
--- a/editor/libeditor/html/nsHTMLCSSUtils.cpp
+++ b/editor/libeditor/html/nsHTMLCSSUtils.cpp
@@ -47,7 +47,6 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIContent.h"
 #include "nsIAtom.h"
 #include "nsTextEditUtils.h"
@@ -538,35 +537,36 @@ nsresult
 nsHTMLCSSUtils::GetComputedProperty(nsIDOMNode *aNode, nsIAtom *aProperty,
                                     nsAString & aValue)
 {
-  nsCOMPtr<nsIDOMViewCSS> viewCSS = nsnull;
-  nsresult res = GetDefaultViewCSS(aNode, getter_AddRefs(viewCSS));
+  nsCOMPtr<nsIDOMWindow> window;
+  nsresult res = GetDefaultViewCSS(aNode, getter_AddRefs(window));
   NS_ENSURE_SUCCESS(res, res);
 
-  return GetCSSInlinePropertyBase(aNode, aProperty, aValue, viewCSS, COMPUTED_STYLE_TYPE);
+  return GetCSSInlinePropertyBase(aNode, aProperty, aValue, window, COMPUTED_STYLE_TYPE);
 }
 
 nsresult
 nsHTMLCSSUtils::GetCSSInlinePropertyBase(nsIDOMNode *aNode, nsIAtom *aProperty,
-                                        nsAString &aValue,
-                                        nsIDOMViewCSS *aViewCSS,
-                                        PRUint8 aStyleType)
+                                         nsAString& aValue,
+                                         nsIDOMWindow* aWindow,
+                                         PRUint8 aStyleType)
 {
   aValue.Truncate();
   NS_ENSURE_TRUE(aProperty, NS_ERROR_NULL_POINTER);
 
-  nsCOMPtr<nsIDOMElement>element;
+  nsCOMPtr<nsIDOMElement> element;
   nsresult res = GetElementContainerOrSelf(aNode, getter_AddRefs(element));
   NS_ENSURE_SUCCESS(res, res);
 
   switch (aStyleType) {
     case COMPUTED_STYLE_TYPE:
-      if (element && aViewCSS) {
+      if (element && aWindow) {
         nsAutoString value, propString;
         nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
         aProperty->ToString(propString);
         // Get the all the computed css styles attached to the element node
-        res = aViewCSS->GetComputedStyle(element, EmptyString(), getter_AddRefs(cssDecl));
-        if (NS_FAILED(res) || !cssDecl) return res;
+        res = aWindow->GetComputedStyle(element, EmptyString(), getter_AddRefs(cssDecl));
+        if (NS_FAILED(res) || !cssDecl)
+          return res;
         // from these declarations, get the one we want and that one only
         res = cssDecl->GetPropertyValue(propString, value);
         NS_ENSURE_SUCCESS(res, res);
@@ -591,33 +591,28 @@ nsHTMLCSSUtils::GetCSSInlinePropertyBase(nsIDOMNode *aNode, nsIAtom *aProperty,
 }
 
 nsresult
-nsHTMLCSSUtils::GetDefaultViewCSS(nsIDOMNode *aNode, nsIDOMViewCSS **aViewCSS)
+nsHTMLCSSUtils::GetDefaultViewCSS(nsIDOMNode *aNode, nsIDOMWindow **aViewCSS)
 {
-  nsCOMPtr<nsIDOMElement>element;
+  *aViewCSS = nsnull;
+  nsCOMPtr<nsIDOMElement> element;
   nsresult res = GetElementContainerOrSelf(aNode, getter_AddRefs(element));
   NS_ENSURE_SUCCESS(res, res);
 
-  // if we have an element node
-  if (element) {
-    // find the owner document
-    nsCOMPtr<nsIDOMDocument> doc;
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(element);
-    res = node->GetOwnerDocument(getter_AddRefs(doc));
-    NS_ENSURE_SUCCESS(res, res);
-    if (doc) {
-      nsCOMPtr<nsIDOMDocumentView> documentView = do_QueryInterface(doc);
-      nsCOMPtr<nsIDOMAbstractView> abstractView;
-      // from the document, get the abtractView
-      res = documentView->GetDefaultView(getter_AddRefs(abstractView));
-      NS_ENSURE_SUCCESS(res, res);
-      if (abstractView) {
-        // from the abstractView, get the CSS view
-        CallQueryInterface(abstractView, aViewCSS);
-        return NS_OK;
-      }
-    }
+  if (!element) {
+    return NS_OK;
   }
-  *aViewCSS = nsnull;
+  // find the owner document
+  nsCOMPtr<nsIDOMDocument> doc;
+  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(element);
+  res = node->GetOwnerDocument(getter_AddRefs(doc));
+  NS_ENSURE_SUCCESS(res, res);
+  if (!doc) {
+    return NS_OK;
+  }
+  nsCOMPtr<nsIDOMWindow> window;
+  res = doc->GetDefaultView(getter_AddRefs(window));
+  NS_ENSURE_SUCCESS(res, res);
+  window.forget(aViewCSS);
   return NS_OK;
 }
 
@@ -1087,9 +1082,9 @@ nsHTMLCSSUtils::GetCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode,
   if (theElement && IsCSSEditableProperty(theElement, aHTMLProperty, aAttribute)) {
     // Yes, the requested HTML style has a CSS equivalence in this implementation
     // Retrieve the default ViewCSS if we are asked for computed styles
-    nsCOMPtr<nsIDOMViewCSS> viewCSS = nsnull;
+    nsCOMPtr<nsIDOMWindow> window;
     if (COMPUTED_STYLE_TYPE == aStyleType) {
-      res = GetDefaultViewCSS(theElement, getter_AddRefs(viewCSS));
+      res = GetDefaultViewCSS(theElement, getter_AddRefs(window));
       NS_ENSURE_SUCCESS(res, res);
     }
     nsTArray<nsIAtom*> cssPropertyArray;
@@ -1104,7 +1099,7 @@ nsHTMLCSSUtils::GetCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode,
       nsAutoString valueString;
       // retrieve the specified/computed value of the property
       res = GetCSSInlinePropertyBase(theElement, cssPropertyArray[index],
-                                     valueString, viewCSS, aStyleType);
+                                     valueString, window, aStyleType);
       NS_ENSURE_SUCCESS(res, res);
       // append the value to aValueString (possibly with a leading whitespace)
       if (index) aValueString.Append(PRUnichar(' '));
diff --git a/editor/libeditor/html/nsHTMLCSSUtils.h b/editor/libeditor/html/nsHTMLCSSUtils.h
index f310aecf544a..54ddf2ea7994 100644
--- a/editor/libeditor/html/nsHTMLCSSUtils.h
+++ b/editor/libeditor/html/nsHTMLCSSUtils.h
@@ -42,7 +42,6 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIHTMLEditor.h"
@@ -54,6 +53,7 @@
 #define COMPUTED_STYLE_TYPE     2
 
 class nsHTMLEditor;
+class nsIDOMWindow;
 
 typedef void (*nsProcessValueFunc)(const nsAString * aInputString, nsAString & aOutputString,
                                    const char * aDefaultValueString,
@@ -312,12 +312,13 @@ public:
     */
   nsresult GetElementContainerOrSelf(nsIDOMNode * aNode, nsIDOMElement ** aElement);
 
-  /** Gets the default DOMView for a given node
+  /**
+   * Gets the default Window for a given node.
    *
-   * @param aNode               the node we want the default DOMView for
-   * @param aViewCSS            [OUT] the default DOMViewCSS
+   * @param aNode    the node we want the default Window for
+   * @param aWindow  [OUT] the default Window
    */
-  nsresult        GetDefaultViewCSS(nsIDOMNode * aNode, nsIDOMViewCSS ** aViewCSS);
+  nsresult        GetDefaultViewCSS(nsIDOMNode* aNode, nsIDOMWindow** aWindow);
 
 
 private:
@@ -383,17 +384,17 @@ private:
                                    PRBool aRemoveProperty);
 
   /** back-end for GetSpecifiedProperty and GetComputedProperty
-    *
-    * @param aNode               [IN] a DOM node
-    * @param aProperty           [IN] a CSS property
-    * @param aValue              [OUT] the retrieved value for this property
-    * @param aViewCSS            [IN] the ViewCSS we need in case we query computed styles
-    * @param aStyleType          [IN] SPECIFIED_STYLE_TYPE to query the specified style values
-                                      COMPUTED_STYLE_TYPE  to query the computed style values
-    */
+   *
+   * @param aNode               [IN] a DOM node
+   * @param aProperty           [IN] a CSS property
+   * @param aValue              [OUT] the retrieved value for this property
+   * @param aWindow             [IN] the window we need in case we query computed styles
+   * @param aStyleType          [IN] SPECIFIED_STYLE_TYPE to query the specified style values
+   *                                 COMPUTED_STYLE_TYPE  to query the computed style values
+   */
   nsresult    GetCSSInlinePropertyBase(nsIDOMNode * aNode, nsIAtom * aProperty,
                                        nsAString & aValue,
-                                       nsIDOMViewCSS * aViewCSS,
+                                       nsIDOMWindow* aWindow,
                                        PRUint8 aStyleType);
 
 
diff --git a/embedding/browser/webBrowser/nsContextMenuInfo.cpp b/embedding/browser/webBrowser/nsContextMenuInfo.cpp
index f3fb991e7aff..e0b6c68fe1f2 100644
--- a/embedding/browser/webBrowser/nsContextMenuInfo.cpp
+++ b/embedding/browser/webBrowser/nsContextMenuInfo.cpp
@@ -1,6 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -51,9 +50,7 @@
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIDOMHTMLAreaElement.h"
 #include "nsIDOMHTMLLinkElement.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
-#include "nsIDOMViewCSS.h"
+#include "nsIDOMWindow.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSValue.h"
 #include "nsIDOMCSSPrimitiveValue.h"
@@ -293,13 +290,10 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR
 
   nsCOMPtr<nsIDOMDocument> document;
   domNode->GetOwnerDocument(getter_AddRefs(document));
-  nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(document));
-  NS_ENSURE_TRUE(docView, NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDOMAbstractView> defaultView;
-  docView->GetDefaultView(getter_AddRefs(defaultView));
-  nsCOMPtr<nsIDOMViewCSS> defaultCSSView(do_QueryInterface(defaultView));
-  NS_ENSURE_TRUE(defaultCSSView, NS_ERROR_FAILURE);
+  nsCOMPtr<nsIDOMWindow> window;
+  document->GetDefaultView(getter_AddRefs(window));
 
   nsCOMPtr<nsIDOMCSSPrimitiveValue> primitiveValue;
   nsAutoString bgStringValue;
@@ -327,8 +321,8 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR
       break;
     
     nsCOMPtr<nsIDOMCSSStyleDeclaration> computedStyle;
-    defaultCSSView->GetComputedStyle(domElement, EmptyString(),
-                                     getter_AddRefs(computedStyle));
+    window->GetComputedStyle(domElement, EmptyString(),
+                             getter_AddRefs(computedStyle));
     if (computedStyle) {
       nsCOMPtr<nsIDOMCSSValue> cssValue;
       computedStyle->GetPropertyCSSValue(NS_LITERAL_STRING("background-image"),
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index 2ca15167ecff..5e7644b1438b 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -41,7 +41,6 @@
 #include "nsIAtom.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIDOMCSSStyleDeclaration.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMRange.h"
@@ -103,13 +102,10 @@ mozInlineSpellWordUtil::Init(nsWeakPtr aWeakEditor)
   NS_ENSURE_SUCCESS(rv, rv);
 
   // view
-  nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(domDoc, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDOMAbstractView> abstractView;
-  rv = docView->GetDefaultView(getter_AddRefs(abstractView));
-  NS_ENSURE_SUCCESS(rv, rv);
-  mCSSView = do_QueryInterface(abstractView, &rv);
+  nsCOMPtr<nsIDOMWindow> window;
+  rv = domDoc->GetDefaultView(getter_AddRefs(window));
   NS_ENSURE_SUCCESS(rv, rv);
+  mCSSView = window;
 
   // Find the root node for the editor. For contenteditable we'll need something
   // cleverer here.
@@ -498,7 +494,7 @@ ContainsDOMWordSeparator(nsIDOMNode* aNode, PRInt32 aBeforeOffset,
 }
 
 static PRBool
-IsBreakElement(nsIDOMViewCSS* aDocView, nsIDOMNode* aNode)
+IsBreakElement(nsIDOMWindow* aDocView, nsIDOMNode* aNode)
 {
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aNode);
   if (!element)
@@ -537,8 +533,8 @@ IsBreakElement(nsIDOMViewCSS* aDocView, nsIDOMNode* aNode)
 }
 
 struct CheckLeavingBreakElementClosure {
-  nsIDOMViewCSS* mDocView;
-  PRPackedBool   mLeftBreakElement;
+  nsIDOMWindow* mDocView;
+  PRPackedBool  mLeftBreakElement;
 };
 
 static void
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.h b/extensions/spellcheck/src/mozInlineSpellWordUtil.h
index 9591f8f530ea..8cedaecc7732 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.h
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.h
@@ -38,7 +38,6 @@
 #include "nsCOMPtr.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentRange.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDocument.h"
 #include "nsString.h"
 #include "nsTArray.h"
@@ -126,7 +125,7 @@ private:
   // cached stuff for the editor, set by Init
   nsCOMPtr<nsIDOMDocumentRange> mDOMDocumentRange;
   nsCOMPtr<nsIDocument>         mDocument;
-  nsCOMPtr<nsIDOMViewCSS>       mCSSView;
+  nsCOMPtr<nsIDOMWindow>        mCSSView;
   nsCOMPtr<nsIUGenCategory>     mCategories;
 
   // range to check, see SetRange
diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp
index 57cf60749829..1e17808025cb 100644
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp
+++ b/extensions/widgetutils/src/nsWidgetUtils.cpp
@@ -39,9 +39,7 @@
 
 #include "nsCURILoader.h"
 #include "nsICategoryManager.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMDocumentView.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsIDOMNSDocument.h"
@@ -68,7 +66,6 @@
 #include "nsIDOMEventTarget.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindow.h"
-//#include ".h"
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMKeyListener.h"
 #include "nsIDOMCompositionListener.h"
@@ -428,28 +425,22 @@ nsWidgetUtils::IsXULNode(nsIDOMNode *aNode, PRUint32 *aType)
 }
 
 nsresult
-nsWidgetUtils::GetDOMWindowByNode(nsIDOMNode *aNode, nsIDOMWindow * *aDOMWindow)
+nsWidgetUtils::GetDOMWindowByNode(nsIDOMNode* aNode, nsIDOMWindow** aDOMWindow)
 {
-  nsresult rv;
   nsCOMPtr<nsIDOMDocument> nodeDoc;
-  rv = aNode->GetOwnerDocument(getter_AddRefs(nodeDoc));
+  nsresult rv = aNode->GetOwnerDocument(getter_AddRefs(nodeDoc));
   NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(nodeDoc, &rv);
+
+  nsCOMPtr<nsIDOMWindow> window;
+  rv = nodeDoc->GetDefaultView(getter_AddRefs(window));
   NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDOMAbstractView> absView;
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = docView->GetDefaultView(getter_AddRefs(absView));
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(absView, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  *aDOMWindow = window;
-  NS_IF_ADDREF(*aDOMWindow);
+  window.forget(aDOMWindow);
   return rv;
 }
 
 void
 nsWidgetUtils::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
-                                 nsIDOMEventTarget **aChromeTarget)
+                                     nsIDOMEventTarget **aChromeTarget)
 {
     nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin));
     nsPIDOMEventTarget* chromeEventHandler = nsnull;
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 469d1b4625bc..9c88d14a3c2a 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -71,6 +71,7 @@ members = [
     #'nsIDOMWindow.document',
     'nsIDOMWindow.getSelection',
     'nsIDOMWindow.scrollByLines',
+    'nsIDOMWindow.getComputedStyle',
     'nsIDOMJSWindow.dump',
     'nsIDOMScreen.top',
     'nsIDOMScreen.height',
@@ -108,6 +109,7 @@ members = [
     'nsIDOMDocument.createTextNode',
     'nsIDOMDocument.documentURI',
     'nsIDOMDocument.adoptNode',
+    'nsIDOMDocument.defaultView',
     'nsIDOMElement.removeAttributeNS',
     'nsIDOMElement.removeAttribute',
     'nsIDOMElement.getAttribute',
@@ -173,7 +175,6 @@ members = [
     'nsIDOMElementCSSInlineStyle.*',
     'nsIDOMCSS2Properties.*',
     'nsIDOMRect.*',
-    'nsIDOMViewCSS.getComputedStyle',
     'nsIDOMCSSStyleDeclaration.*',
 
     # dom/interfaces/events
@@ -386,9 +387,6 @@ members = [
     'nsIDOMDocumentTraversal.createNodeIterator',
     'nsIDOMNodeIterator.nextNode',
 
-    # dom/interfaces/views
-    'nsIDOMDocumentView.defaultView',
-
     # dom/interfaces/xbl - None.
 
     # dom/interfaces/xpath
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 111b2bf4febd..7fc4b345af28 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -37,8 +37,6 @@
 
 #include "inLayoutUtils.h"
 
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
 #include "nsIContentViewer.h"
@@ -60,15 +58,14 @@ inLayoutUtils::GetWindowFor(nsIDOMNode* aNode)
 nsIDOMWindowInternal*
 inLayoutUtils::GetWindowFor(nsIDOMDocument* aDoc)
 {
-  nsCOMPtr<nsIDOMDocumentView> doc = do_QueryInterface(aDoc);
-  if (!doc) return nsnull;
+  nsCOMPtr<nsIDOMWindow> window;
+  aDoc->GetDefaultView(getter_AddRefs(window));
+  if (!window) {
+    return nsnull;
+  }
   
-  nsCOMPtr<nsIDOMAbstractView> view;
-  doc->GetDefaultView(getter_AddRefs(view));
-  if (!view) return nsnull;
-  
-  nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(view);
-  return window;
+  nsCOMPtr<nsIDOMWindowInternal> windowInternal = do_QueryInterface(window);
+  return windowInternal;
 }
 
 nsIPresShell* 
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 5e058bd5722a..1f040fdff122 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -70,7 +70,6 @@ MAKEFILES_dom="
   dom/interfaces/stylesheets/Makefile
   dom/interfaces/threads/Makefile
   dom/interfaces/traversal/Makefile
-  dom/interfaces/views/Makefile
   dom/interfaces/xbl/Makefile
   dom/interfaces/xpath/Makefile
   dom/interfaces/xul/Makefile
diff --git a/widget/src/cocoa/nsMenuItemIconX.mm b/widget/src/cocoa/nsMenuItemIconX.mm
index 343d5b551ffd..3605a8c89d23 100644
--- a/widget/src/cocoa/nsMenuItemIconX.mm
+++ b/widget/src/cocoa/nsMenuItemIconX.mm
@@ -49,8 +49,6 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsWidgetAtoms.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSValue.h"
@@ -201,24 +199,27 @@ nsMenuItemIconX::GetIconURI(nsIURI** aIconURI)
   if (!hasImageAttr) {
     // If the content node has no "image" attribute, get the
     // "list-style-image" property from CSS.
-    nsCOMPtr<nsIDOMDocumentView> domDocumentView =
-     do_QueryInterface(mContent->GetDocument());
-    if (!domDocumentView) return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMDocument> domDocument =
+      do_QueryInterface(mContent->GetDocument());
+    if (!domDocument)
+      return NS_ERROR_FAILURE;
 
-    nsCOMPtr<nsIDOMAbstractView> domAbstractView;
-    rv = domDocumentView->GetDefaultView(getter_AddRefs(domAbstractView));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIDOMViewCSS> domViewCSS = do_QueryInterface(domAbstractView);
-    if (!domViewCSS) return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMWindow> window;
+    rv = domDocument->GetDefaultView(getter_AddRefs(window));
+    if (NS_FAILED(rv))
+      return rv;
+    if (!window)
+      return NS_ERROR_FAILURE;
 
     nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mContent);
-    if (!domElement) return NS_ERROR_FAILURE;
+    if (!domElement)
+      return NS_ERROR_FAILURE;
 
 
-    rv = domViewCSS->GetComputedStyle(domElement, EmptyString(),
-                                      getter_AddRefs(cssStyleDecl));
-    if (NS_FAILED(rv)) return rv;
+    rv = window->GetComputedStyle(domElement, EmptyString(),
+                                  getter_AddRefs(cssStyleDecl));
+    if (NS_FAILED(rv))
+      return rv;
 
     NS_NAMED_LITERAL_STRING(listStyleImage, "list-style-image");
     rv = cssStyleDecl->GetPropertyCSSValue(listStyleImage,
diff --git a/widget/src/cocoa/nsMenuUtilsX.mm b/widget/src/cocoa/nsMenuUtilsX.mm
index f05a50914343..eecef2c4f284 100644
--- a/widget/src/cocoa/nsMenuUtilsX.mm
+++ b/widget/src/cocoa/nsMenuUtilsX.mm
@@ -51,7 +51,6 @@
 #include "nsIDOMXULCommandEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsPIDOMWindow.h"
-#include "nsIDOMAbstractView.h"
 
 void nsMenuUtilsX::DispatchCommandTo(nsIContent* aTargetContent)
 {
@@ -66,13 +65,13 @@ void nsMenuUtilsX::DispatchCommandTo(nsIContent* aTargetContent)
                           getter_AddRefs(event));
     nsCOMPtr<nsIDOMXULCommandEvent> command = do_QueryInterface(event);
     nsCOMPtr<nsIPrivateDOMEvent> pEvent = do_QueryInterface(command);
-    nsCOMPtr<nsIDOMAbstractView> view = do_QueryInterface(doc->GetWindow());
 
     // FIXME: Should probably figure out how to init this with the actual
     // pressed keys, but this is a big old edge case anyway. -dwh
     if (pEvent &&
         NS_SUCCEEDED(command->InitCommandEvent(NS_LITERAL_STRING("command"),
-                                               PR_TRUE, PR_TRUE, view, 0,
+                                               PR_TRUE, PR_TRUE,
+                                               doc->GetWindow(), 0,
                                                PR_FALSE, PR_FALSE, PR_FALSE,
                                                PR_FALSE, nsnull))) {
       pEvent->SetTrusted(PR_TRUE);
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 9d5f889aa67c..59262b0cfe50 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1,7 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 ci et: */
-/*
- * ***** BEGIN LICENSE BLOCK *****
+/* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -84,8 +83,6 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIWindowWatcher.h"
 #include "nsIURI.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMViewCSS.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsITimelineService.h"
 #include "nsAppShellCID.h"

From dc0488031b4793006b3e94b1f8d523cd234f4c2b Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Fri, 22 Apr 2011 23:44:06 +0200
Subject: [PATCH 426/509] Bug 651311 - Race condition in TabView._initFrame()
 [f=raymond, r=ian]

---
 browser/base/content/browser-tabview.js       | 58 +++++++++++++------
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug597248.js |  8 +--
 .../test/tabview/browser_tabview_bug651311.js | 38 ++++++++++++
 4 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug651311.js

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index c01191a4f091..3020c7a58385 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -42,6 +42,8 @@ let TabView = {
   _window: null,
   _firstUseExperienced: false,
   _browserKeyHandlerInitialized: false,
+  _isFrameLoading: false,
+  _initFrameCallbacks: [],
   VISIBILITY_IDENTIFIER: "tabview-visibility",
 
   // ----------
@@ -128,34 +130,52 @@ let TabView = {
   // Creates the frame and calls the callback once it's loaded. 
   // If the frame already exists, calls the callback immediately. 
   _initFrame: function TabView__initFrame(callback) {
+    let hasCallback = typeof callback == "function";
+
     if (this._window) {
-      if (typeof callback == "function")
+      if (hasCallback)
         callback();
-    } else {
-      // ___ find the deck
-      this._deck = document.getElementById("tab-view-deck");
+      return;
+    }
 
-      // ___ create the frame
-      this._iframe = document.createElement("iframe");
-      this._iframe.id = "tab-view";
-      this._iframe.setAttribute("transparent", "true");
-      this._iframe.flex = 1;
+    if (hasCallback)
+      this._initFrameCallbacks.push(callback);
 
-      if (typeof callback == "function")
-        window.addEventListener("tabviewframeinitialized", callback, false);
+    if (this._isFrameLoading)
+      return;
 
-      this._iframe.setAttribute("src", "chrome://browser/content/tabview.html");
-      this._deck.appendChild(this._iframe);
-      this._window = this._iframe.contentWindow;
+    this._isFrameLoading = true;
 
-      if (this._tabShowEventListener) {
+    // ___ find the deck
+    this._deck = document.getElementById("tab-view-deck");
+
+    // ___ create the frame
+    this._iframe = document.createElement("iframe");
+    this._iframe.id = "tab-view";
+    this._iframe.setAttribute("transparent", "true");
+    this._iframe.flex = 1;
+
+    let self = this;
+
+    window.addEventListener("tabviewframeinitialized", function onInit() {
+      window.removeEventListener("tabviewframeinitialized", onInit, false);
+
+      self._isFrameLoading = false;
+      self._window = self._iframe.contentWindow;
+      self._setBrowserKeyHandlers();
+
+      if (self._tabShowEventListener) {
         gBrowser.tabContainer.removeEventListener(
-          "TabShow", this._tabShowEventListener, true);
-        this._tabShowEventListener = null;
+          "TabShow", self._tabShowEventListener, true);
+        self._tabShowEventListener = null;
       }
 
-      this._setBrowserKeyHandlers();
-    }
+      self._initFrameCallbacks.forEach(function (cb) cb());
+      self._initFrameCallbacks = [];
+    }, false);
+
+    this._iframe.setAttribute("src", "chrome://browser/content/tabview.html");
+    this._deck.appendChild(this._iframe);
   },
 
   // ----------
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index dea5fcd7f543..04f88dba1eaa 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -132,6 +132,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug645653.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_bug649307.js \
+                 browser_tabview_bug651311.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
                  browser_tabview_expander.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597248.js b/browser/base/content/test/tabview/browser_tabview_bug597248.js
index 7be32df98c88..438ea1c2b7d7 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug597248.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug597248.js
@@ -34,7 +34,7 @@ function setupTwo(win) {
 
   // force all canvases to update, and hook in imageData save detection
   tabItems.forEach(function(tabItem) {
-    contentWindow.TabItems._update(tabItem.tab);
+    contentWindow.TabItems.update(tabItem.tab);
     tabItem.addSubscriber(tabItem, "savedCachedImageData", function(item) {
       item.removeSubscriber(item, "savedCachedImageData");
       --numTabsToSave;
@@ -70,8 +70,7 @@ function setupTwo(win) {
           restoredWin.removeEventListener(
             "tabviewframeinitialized", onTabViewFrameInitialized, false);
 
-          let restoredContentWindow =
-            restoredWin.document.getElementById("tab-view").contentWindow;
+          let restoredContentWindow = restoredWin.TabView.getContentWindow();
           // prevent TabItems._update being called before checking cached images
           restoredContentWindow.TabItems._pauseUpdateForTest = true;
 
@@ -134,8 +133,7 @@ let gTabsProgressListener = {
 
 function updateAndCheck() {
   // force all canvas to update
-  let contentWindow = 
-    restoredWin.document.getElementById("tab-view").contentWindow;
+  let contentWindow = restoredWin.TabView.getContentWindow();
 
   contentWindow.TabItems._pauseUpdateForTest = false;
 
diff --git a/browser/base/content/test/tabview/browser_tabview_bug651311.js b/browser/base/content/test/tabview/browser_tabview_bug651311.js
new file mode 100644
index 000000000000..236f729dd539
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug651311.js
@@ -0,0 +1,38 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  let callCount = 0;
+
+  newWindow(function (win) {
+    registerCleanupFunction(function () win.close());
+
+    win.TabView._initFrame(function () {
+      is(callCount++, 0, "call count is zero");
+      ok(win.TabView.getContentWindow().UI, "content window is loaded");
+    });
+
+    win.TabView._initFrame(function () {
+      is(callCount++, 1, "call count is one");
+      ok(win.TabView.getContentWindow().UI, "content window is loaded");
+    });
+
+    win.TabView._initFrame(function () {
+      is(callCount, 2, "call count is two");
+      ok(win.TabView.getContentWindow().UI, "content window is loaded");
+      finish();
+    });
+  });
+}
+
+function newWindow(callback) {
+  let opts = "chrome,all,dialog=no,height=800,width=800";
+  let win = window.openDialog(getBrowserURL(), "_blank", opts);
+
+  win.addEventListener("load", function onLoad() {
+    win.removeEventListener("load", onLoad, false);
+    callback(win);
+  }, false);
+}

From 33bfbfc98e6890181e0e211bcbe0956d4ce2ae21 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Fri, 22 Apr 2011 20:03:44 +0200
Subject: [PATCH 427/509] Bug 651114 - Clean up browser_tabview_bug612470.js
 [f=raymond, r=ian]

---
 .../test/tabview/browser_tabview_bug612470.js | 106 +++++++-----------
 1 file changed, 39 insertions(+), 67 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug612470.js b/browser/base/content/test/tabview/browser_tabview_bug612470.js
index a43847ef16a9..1516764c10a0 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug612470.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug612470.js
@@ -3,74 +3,46 @@
 
 // Tests that groups behave properly when closing all tabs but app tabs.
 
-let appTab, contentWindow;
-let originalGroup, originalGroupTab, newGroup, newGroupTab;
-
 function test() {
+  let cw, win, groupItem;
+
+  let onLoad = function (tvwin) {
+    win = tvwin;
+    registerCleanupFunction(function () win.close());
+    win.gBrowser.pinTab(win.gBrowser.tabs[0]);
+    win.gBrowser.loadOneTab("about:blank", {inBackground: true});
+  };
+
+  let onShow = function () {
+    cw = win.TabView.getContentWindow();
+    is(cw.GroupItems.groupItems.length, 1, "There's only one group");
+
+    groupItem = createEmptyGroupItem(cw, 200, 200, 20);
+    cw.GroupItems.setActiveGroupItem(groupItem);
+
+    executeSoon(function () hideTabView(onHide, win));
+  };
+
+  let onHide = function () {
+    let tab = win.gBrowser.loadOneTab("about:blank", {inBackground: true});
+    is(groupItem.getChildren().length, 1, "One tab is in the new group");
+
+    executeSoon(function () {
+      is(win.gBrowser.visibleTabs.length, 2, "There are two tabs displayed");
+      win.gBrowser.removeTab(tab);
+
+      is(groupItem.getChildren().length, 0, "No tabs are in the new group");
+      is(win.gBrowser.visibleTabs.length, 1, "There is one tab displayed");
+      is(cw.GroupItems.groupItems.length, 2, "There are two groups still");
+
+      showTabView(function () {
+        is(cw.GroupItems.groupItems.length, 1, "There is now only one group");
+        waitForFocus(finish);
+      }, win);
+    });
+  };
+
   waitForExplicitFinish();
 
-  appTab = gBrowser.selectedTab;
-  gBrowser.pinTab(appTab);
-  originalGroupTab = gBrowser.addTab();
-
-  addEventListener("tabviewshown", createGroup, false);
-  TabView.toggle();
+  newWindowWithTabView(onShow, onLoad);
 }
-
-function createGroup() {
-  removeEventListener("tabviewshown", createGroup, false);
-
-  contentWindow = document.getElementById("tab-view").contentWindow;
-  is(contentWindow.GroupItems.groupItems.length, 1, "There's only one group");
-
-  originalGroup = contentWindow.GroupItems.groupItems[0];
-
-  // Create a new group.
-  let box = new contentWindow.Rect(20, 400, 300, 300);
-  newGroup = new contentWindow.GroupItem([], { bounds: box });
-
-  contentWindow.GroupItems.setActiveGroupItem(newGroup);
-
-  addEventListener("tabviewhidden", addTab, false);
-  TabView.toggle();
-}
-
-function addTab() {
-  removeEventListener("tabviewhidden", addTab, false);
-
-  newGroupTab = gBrowser.addTab();
-  is(newGroup.getChildren().length, 1, "One tab is in the new group");
-  executeSoon(removeTab);
-}
-
-function removeTab() {
-  is(gBrowser.visibleTabs.length, 2, "There are two tabs displayed");
-  gBrowser.removeTab(newGroupTab);
-
-  is(newGroup.getChildren().length, 0, "No tabs are in the new group");
-  is(gBrowser.visibleTabs.length, 1, "There is one tab displayed");
-  is(contentWindow.GroupItems.groupItems.length, 2,
-     "There are two groups still");
-
-  addEventListener("tabviewshown", checkForRemovedGroup, false);
-  TabView.toggle();
-}
-
-function checkForRemovedGroup() {
-  removeEventListener("tabviewshown", checkForRemovedGroup, false);
-
-  is(contentWindow.GroupItems.groupItems.length, 1,
-     "There is now only one group");
-
-  addEventListener("tabviewhidden", finishTest, false);
-  TabView.toggle();
-}
-
-function finishTest() {
-  removeEventListener("tabviewhidden", finishTest, false);
-
-  gBrowser.removeTab(originalGroupTab);
-  gBrowser.unpinTab(appTab);
-  finish();
-}
-

From 4f70da51192e85fa0be1d4092bc320c0948c09e8 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 24 Apr 2011 08:58:51 +0200
Subject: [PATCH 428/509] Bug 652029 - Remove WinCE code from
 mobile/components/build/ & prune now unused nsIPhoneSupport methods;
 r=mfinkle

---
 mobile/components/build/Makefile.in         |   4 -
 mobile/components/build/nsIPhoneSupport.idl |  29 +-
 mobile/components/build/nsPhoneSupport.cpp  | 335 --------------------
 3 files changed, 1 insertion(+), 367 deletions(-)

diff --git a/mobile/components/build/Makefile.in b/mobile/components/build/Makefile.in
index 167a8048a838..1a96f237217c 100644
--- a/mobile/components/build/Makefile.in
+++ b/mobile/components/build/Makefile.in
@@ -85,9 +85,5 @@ LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_QT_LIBS)
 endif
 
-ifdef WINCE
-OS_LIBS += $(call EXPAND_LIBNAME, aygshell cellcore)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mobile/components/build/nsIPhoneSupport.idl b/mobile/components/build/nsIPhoneSupport.idl
index bb01aa302985..ab1c4ac921a2 100644
--- a/mobile/components/build/nsIPhoneSupport.idl
+++ b/mobile/components/build/nsIPhoneSupport.idl
@@ -40,38 +40,11 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(c75982d6-811b-4321-980d-46490e1a6703)]
+[scriptable, uuid(c893eb89-8650-49d2-aed7-0ef809a2b940)]
 interface nsIPhoneSupport : nsISupports
 {
-  /**
-   * This method attempts to make a telephone call.
-   *
-   * @param telephoneNumber this is the telephone to dial.
-   * @param telephoneDescription this is an optional
-   * description of the telephone number.
-   * @param aPrompt this indicates whether to display the confirm call dialog
-   * before dialing   
-   */
-  void makeCall(in wstring telephoneNumber, in wstring telephoneDescription, in boolean aPrompt);
-  
   /**
    * This method displays a UI to switch to (or launch) a different task
    */
   void switchTask();
-
-  /**
-   * Determines whether or not Fennec is the "Default Browser".
-   * This is simply whether or not Fennec is registered to handle http links.
-   */
-  boolean isDefaultBrowser();
-
-  /**
-   * Registers Fennec as the "Default Browser".
-   */
-  void setDefaultBrowser();
-
-  /**
-   * Restores previous "Default Browser".
-   */
-  void restoreDefaultBrowser();
 };
diff --git a/mobile/components/build/nsPhoneSupport.cpp b/mobile/components/build/nsPhoneSupport.cpp
index 6218327d2438..70bbd8393591 100644
--- a/mobile/components/build/nsPhoneSupport.cpp
+++ b/mobile/components/build/nsPhoneSupport.cpp
@@ -39,11 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef WINCE_WINDOWS_MOBILE
-#include <windows.h>
-#include <phone.h>
-#endif
-
 #if (MOZ_PLATFORM_MAEMO == 5)
 #include <dbus/dbus.h>
 #endif
@@ -58,35 +53,6 @@
 
 NS_IMPL_ISUPPORTS1(nsPhoneSupport, nsIPhoneSupport)
 
-NS_IMETHODIMP
-nsPhoneSupport::MakeCall(const PRUnichar *telephoneNumber, const PRUnichar *telephoneDescription, PRBool aPrompt)
-{
-  long result = -1;
-
-#ifdef WINCE_WINDOWS_MOBILE
-  typedef LONG (*__PhoneMakeCall)(PHONEMAKECALLINFO *ppmci);
-
-  HMODULE hPhoneDLL = LoadLibraryW(L"phone.dll");
-  if (hPhoneDLL) {
-    __PhoneMakeCall MakeCall = (__PhoneMakeCall) GetProcAddress(hPhoneDLL,
-                                                                "PhoneMakeCall");
-    if (MakeCall) {
-      PHONEMAKECALLINFO callInfo;
-      callInfo.cbSize          = sizeof(PHONEMAKECALLINFO);
-      callInfo.dwFlags         = aPrompt ? PMCF_PROMPTBEFORECALLING : PMCF_DEFAULT;
-      callInfo.pszDestAddress  = telephoneNumber;
-      callInfo.pszAppName      = nsnull;
-      callInfo.pszCalledParty  = telephoneDescription;
-      callInfo.pszComment      = nsnull;
-      result = MakeCall(&callInfo);
-    }
-    FreeLibrary(hPhoneDLL);
-  }
-#endif
-
-  return (result == 0) ? NS_OK : NS_ERROR_FAILURE;
-}
-
 NS_IMETHODIMP
 nsPhoneSupport::SwitchTask()
 {
@@ -115,304 +81,3 @@ nsPhoneSupport::SwitchTask()
   return NS_ERROR_NOT_IMPLEMENTED;
 #endif
 }
-
-#ifdef WINCE
-
-///////////////////////////////////////////////////////////////////////////////
-// Default Browser Registry Settings
-// Based on the browser\components\shell\src\nsWindowsShellService.cpp
-//
-// The following keys have to be changed for Windows Mobile:
-//
-// [HKEY_LOCAL_MACHINE\Software\Microsoft\Shell\Rai\:DEFBROWSER]
-// 0=Pocket IE
-// 1=:MSPIE
-// 
-// [HKEY_CLASSES_ROOT\file\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\ftp\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\http\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\https\Shell\Open\Command]
-// (Default)=iexplore.exe %1
-// 
-// --- Optional: ---
-// 
-// [HKEY_CLASSES_ROOT\htmlfile\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\xhtmlfile\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\xmlfile\Shell\Open\Command]
-// [HKEY_CLASSES_ROOT\xslfile\Shell\Open\Command]
-// (Default)=iexplore.exe file:%1
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#define MAX_BUF 1024
-
-#define REG_SUCCEEDED(val) \
-  (val == ERROR_SUCCESS)
-
-#define REG_FAILED(val) \
-  (val != ERROR_SUCCESS)
-
-typedef struct {
-  HKEY keyRoot;
-  char* keyName;
-  char* valueName;
-  char* valueData;
-  char* backupValueName;
-} SETTING;
-
-#define APP_REG_NAME "Fennec"
-#define BACKUP_KEY_ROOT HKEY_LOCAL_MACHINE
-#define BACKUP_KEY "Software\\Mozilla\\Fennec\\DefaultBrowserBackup"
-#define DEFBROWSERREG "Software\\Microsoft\\Shell\\Rai\\:DEFBROWSER"
-#define VAL_OPEN "\"%APPPATH%\" \"%1\""
-#define SHELL_OPEN "\\Shell\\Open\\Command"
-
-static SETTING gSettings[] = {
-  { HKEY_LOCAL_MACHINE, DEFBROWSERREG,         "0", APP_REG_NAME,    "Rai_DEFBROWSER_0" },
-  { HKEY_LOCAL_MACHINE, DEFBROWSERREG,         "1", "\"%APPPATH%\"", "Rai_DEFBROWSER_1" },
-  { HKEY_CLASSES_ROOT, "http" SHELL_OPEN,      "",  VAL_OPEN,        "http" },
-  { HKEY_CLASSES_ROOT, "https" SHELL_OPEN,     "",  VAL_OPEN,        "https" },
-  // Optional in Firefox
-  { HKEY_CLASSES_ROOT, "file" SHELL_OPEN,      "",  VAL_OPEN,        "file" },
-  { HKEY_CLASSES_ROOT, "ftp" SHELL_OPEN,       "",  VAL_OPEN,        "ftp" },
-  { HKEY_CLASSES_ROOT, "htmlfile" SHELL_OPEN,  "",  VAL_OPEN,        "htmlfile" },
-  { HKEY_CLASSES_ROOT, "xhtmlfile" SHELL_OPEN, "",  VAL_OPEN,        "xhtmlfile" },
-  { HKEY_CLASSES_ROOT, "xmlfile" SHELL_OPEN,   "",  VAL_OPEN,        "xmlfile" },
-  { HKEY_CLASSES_ROOT, "xslfile" SHELL_OPEN,   "",  VAL_OPEN,        "xslfile" },
-  // Opera changes these as well
-  { HKEY_CLASSES_ROOT, ".htm",                 "",  "htmlfile",      ".htm" },
-  { HKEY_CLASSES_ROOT, ".html",                "",  "htmlfile",      ".html" },
-  { HKEY_CLASSES_ROOT, ".xml",                 "",  "xmlfile",       ".xml" },
-  { HKEY_CLASSES_ROOT, ".xsl",                 "",  "xslfile",       ".xsl" },
-};
-
-const PRInt32 gSettingsCount = sizeof(gSettings)/sizeof(SETTING);
-
-static nsresult
-OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
-{
-  const nsString &flatName = PromiseFlatString(aKeyName);
-
-  DWORD res = ::RegOpenKeyExW(aKeyRoot, flatName.get(), 0, KEY_READ, aKey);
-  switch (res) {
-  case ERROR_ACCESS_DENIED:
-    return NS_ERROR_FILE_ACCESS_DENIED;
-  case ERROR_FILE_NOT_FOUND:
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  return NS_OK;
-}
-
-static nsresult
-OpenKeyForWriting(HKEY aStartKey, const nsAString& aKeyName, HKEY* aKey)
-{
-  const nsString &flatName = PromiseFlatString(aKeyName);
-
-  DWORD dwDisp = 0;
-  DWORD res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                                0, KEY_READ | KEY_WRITE, NULL, aKey,
-                                &dwDisp);
-  switch (res) {
-  case ERROR_ACCESS_DENIED:
-    return NS_ERROR_FILE_ACCESS_DENIED;
-  case ERROR_FILE_NOT_FOUND:
-    res = ::RegCreateKeyExW(aStartKey, flatName.get(), 0, NULL,
-                            0, KEY_READ | KEY_WRITE, NULL, aKey,
-                            NULL);
-    if (res != ERROR_SUCCESS)
-      return NS_ERROR_FILE_ACCESS_DENIED;
-  }
-
-  return NS_OK;
-}
-
-void
-SetRegValue(HKEY aKeyRoot, const nsString& aKeyName, const nsString& aValueName, const nsString& aValue)
-{
-  PRUnichar buf[MAX_BUF];
-  DWORD len = sizeof buf;
-
-  HKEY theKey;
-  nsresult rv = OpenKeyForWriting(aKeyRoot, aKeyName, &theKey);
-  if (NS_FAILED(rv))
-    return;
-
-  // Get the current value.
-  DWORD res = ::RegQueryValueExW(theKey, PromiseFlatString(aValueName).get(),
-                                 NULL, NULL, (LPBYTE)buf, &len);
-
-  // Set the new value if it doesn't exist or it is different than the current
-  // value.
-  nsAutoString current(buf);
-  if (REG_FAILED(res) || !current.Equals(aValue)) {
-    const nsString &flatValue = PromiseFlatString(aValue);
-
-    ::RegSetValueExW(theKey, PromiseFlatString(aValueName).get(),
-                     0, REG_SZ, (const BYTE *)flatValue.get(),
-                     (flatValue.Length() + 1) * sizeof(PRUnichar));
-  }
-
-  // Close the key we opened.
-  ::RegCloseKey(theKey);
-}
-
-DWORD
-GetRegValue(HKEY aKeyRoot, const nsString& aKeyName, const nsString& aValueName, nsString& aValue)
-{
-  aValue = L"";
-  PRUnichar currValue[MAX_BUF];
-  ::ZeroMemory(currValue, sizeof(currValue));
-  HKEY theKey;
-  DWORD res = OpenKeyForReading(aKeyRoot, aKeyName, &theKey);
-  if (REG_FAILED(res))
-    return res;
-
-  DWORD len = sizeof currValue;
-  res = ::RegQueryValueExW(theKey, PromiseFlatString(aValueName).get(),
-                                 NULL, NULL, (LPBYTE)currValue, &len);
-  // Close the key we opened.
-  ::RegCloseKey(theKey);
-
-  if (REG_SUCCEEDED(res))
-    aValue = currValue;
-
-  return res;
-}
-#endif // WINCE
-
-NS_IMETHODIMP
-nsPhoneSupport::IsDefaultBrowser(PRBool* aIsDefaultBrowser)
-{
-#ifdef WINCE
-  *aIsDefaultBrowser = PR_TRUE;
-
-  SETTING* settings;
-  SETTING* end = gSettings + gSettingsCount;
-
-  PRUnichar exePath[MAX_BUF];
-  if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  nsAutoString appPath(exePath);
-
-  nsresult rv;
-  PRUnichar currValue[MAX_BUF];
-  for (settings = gSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 dataPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    PRInt32 offset = dataPath.Find("%APPPATH%");
-    if (offset >= 0)
-      dataPath.Replace(offset, 9, appPath);
-
-    ::ZeroMemory(currValue, sizeof(currValue));
-    HKEY theKey;
-    rv = OpenKeyForReading(settings->keyRoot, key, &theKey);
-    if (NS_FAILED(rv)) {
-      *aIsDefaultBrowser = PR_FALSE;
-      return NS_OK;
-    }
-
-    DWORD len = sizeof currValue;
-    DWORD res = ::RegQueryValueExW(theKey, PromiseFlatString(value).get(),
-                                   NULL, NULL, (LPBYTE)currValue, &len);
-    // Close the key we opened.
-    ::RegCloseKey(theKey);
-    if (REG_FAILED(res) ||
-        !dataPath.Equals(currValue)) {
-      // Key wasn't set, or was set to something other than our registry entry
-      *aIsDefaultBrowser = PR_FALSE;
-      return NS_OK;
-    }
-  }
-
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-NS_IMETHODIMP
-nsPhoneSupport::SetDefaultBrowser()
-{
-#ifdef WINCE
-  PRBool defaultBrowser = PR_FALSE;
-  nsresult result = IsDefaultBrowser(&defaultBrowser);
-  if (defaultBrowser || result != NS_OK)
-  {
-    // Already set as default browser
-    return result;
-  }
-
-  SETTING* settings;
-  SETTING* end = gSettings + gSettingsCount;
-
-  PRUnichar exePath[MAX_BUF];
-  if (!::GetModuleFileNameW(0, exePath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  nsAutoString appPath(exePath);
-
-  for (settings = gSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 dataPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    NS_ConvertUTF8toUTF16 backupKey(BACKUP_KEY);
-    NS_ConvertUTF8toUTF16 backupValue(settings->backupValueName);
-    PRInt32 offset = dataPath.Find("%APPPATH%");
-    if (offset >= 0)
-      dataPath.Replace(offset, 9, appPath);
-
-    nsString dataOld;
-    if (REG_SUCCEEDED(GetRegValue(settings->keyRoot, key, value, dataOld))) {
-      SetRegValue(BACKUP_KEY_ROOT, backupKey, backupValue, dataOld);
-      SetRegValue(settings->keyRoot, key, value, dataPath);
-    }
-  }
-  // On Windows CE RegFlushKey can negatively impact performance if there are a
-  // lot of pending writes to the HKEY_CLASSES_ROOT registry hive but it is
-  // necessary to save the values in the case where the user performs a hard
-  // power off of the device.
-  ::RegFlushKey(HKEY_CLASSES_ROOT);
-  ::RegFlushKey(HKEY_LOCAL_MACHINE);
-
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-NS_IMETHODIMP
-nsPhoneSupport::RestoreDefaultBrowser()
-{
-#ifdef WINCE
-  PRBool defaultBrowser = PR_FALSE;
-  nsresult result = IsDefaultBrowser(&defaultBrowser);
-  if (!defaultBrowser || result != NS_OK)
-  {
-    // Not default browser - nothing to restore
-    return result;
-  }
-
-  SETTING* settings;
-  SETTING* end = gSettings + gSettingsCount;
-
-  for (settings = gSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    NS_ConvertUTF8toUTF16 backupKey(BACKUP_KEY);
-    NS_ConvertUTF8toUTF16 backupValue(settings->backupValueName);
-
-    nsString dataOld;
-    if (REG_SUCCEEDED(GetRegValue(BACKUP_KEY_ROOT, backupKey, backupValue, dataOld)))
-      SetRegValue(settings->keyRoot, key, value, dataOld);
-  }
-  ::RegFlushKey(HKEY_CLASSES_ROOT);
-  ::RegFlushKey(HKEY_LOCAL_MACHINE);
-
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-}

From fffbdd90214edfc16cb258d3f78de0b03e0f5b50 Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Mon, 25 Apr 2011 01:55:41 +0800
Subject: [PATCH 429/509] Bug 366774 - Removed unused preference
 bidi.characterset.(p1) r=smontagu

---
 docshell/base/nsIMarkupDocumentViewer.idl | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docshell/base/nsIMarkupDocumentViewer.idl b/docshell/base/nsIMarkupDocumentViewer.idl
index 901903dd7677..822ff6b56cb9 100644
--- a/docshell/base/nsIMarkupDocumentViewer.idl
+++ b/docshell/base/nsIMarkupDocumentViewer.idl
@@ -142,13 +142,6 @@ interface nsIMarkupDocumentViewer : nsISupports
    */
   attribute octet bidiSupport;
 
-  /**
-   * bidiCharacterSet: whether to force the user's character set
-   *                   1 - use the document character set
-   *                   2 - use the character set chosen by the user
-   */
-  attribute octet bidiCharacterSet;  
-  
   /**
    * Use this attribute to access all the Bidi options in one operation
    */

From e923fb2f59af0d9345d57356dff37af2baf61e42 Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Mon, 25 Apr 2011 01:56:09 +0800
Subject: [PATCH 430/509] Bug 366774 - Removed unused preference
 bidi.characterset.(p2) r=smontagu

---
 layout/base/nsDocumentViewer.cpp | 21 ---------------------
 layout/base/nsPresContext.cpp    |  5 -----
 2 files changed, 26 deletions(-)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 7f4ca54d2dbb..6b24d7048653 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -3201,27 +3201,6 @@ NS_IMETHODIMP DocumentViewerImpl::GetBidiSupport(PRUint8* aSupport)
   return NS_OK;
 }
 
-NS_IMETHODIMP DocumentViewerImpl::SetBidiCharacterSet(PRUint8 aCharacterSet)
-{
-  PRUint32 bidiOptions;
-
-  GetBidiOptions(&bidiOptions);
-  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, aCharacterSet);
-  SetBidiOptions(bidiOptions);
-  return NS_OK;
-}
-
-NS_IMETHODIMP DocumentViewerImpl::GetBidiCharacterSet(PRUint8* aCharacterSet)
-{
-  PRUint32 bidiOptions;
-
-  if (aCharacterSet) {
-    GetBidiOptions(&bidiOptions);
-    *aCharacterSet = GET_BIDI_OPTION_CHARACTERSET(bidiOptions);
-  }
-  return NS_OK;
-}
-
 NS_IMETHODIMP DocumentViewerImpl::SetBidiOptions(PRUint32 aBidiOptions)
 {
   if (mPresContext) {
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 5065e858e7f4..6cbca726f83d 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -764,11 +764,6 @@ nsPresContext::GetUserPreferences()
                                GET_BIDI_OPTION_SUPPORT(bidiOptions));
   SET_BIDI_OPTION_SUPPORT(bidiOptions, prefInt);
 
-  prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_CHARSET_STR,
-                               GET_BIDI_OPTION_CHARACTERSET(bidiOptions));
-  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, prefInt);
-
   // We don't need to force reflow: either we are initializing a new
   // prescontext or we are being called from UpdateAfterPreferencesChanged()
   // which triggers a reflow anyway.

From cfeb3e87631518df87c581ad908e74fd62257867 Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Mon, 25 Apr 2011 01:56:49 +0800
Subject: [PATCH 431/509] Bug 366774 - Remove unused preference
 bidi.characterset. (p3) (v2) r=smontagu

---
 modules/libpref/src/init/all.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 530497d22de3..7f7649d7949a 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1217,12 +1217,6 @@ pref("bidi.numeral", 0);
 // 2 = OsBidisupport
 // 3 = disableBidisupport
 pref("bidi.support", 1);
-// ------------------
-//  Charset Mode
-// ------------------
-// 1 = doccharactersetBidi *
-// 2 = defaultcharactersetBidi
-pref("bidi.characterset", 1);
 // Whether delete and backspace should immediately delete characters not
 // visually adjacent to the caret, or adjust the visual position of the caret
 // on the first keypress and delete the character on a second keypress

From cbe15575328490d879d50a64804189955f2e576a Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Mon, 25 Apr 2011 01:57:23 +0800
Subject: [PATCH 432/509] Bug 366774 - Remove unused preference
 bidi.characterset. (p5) (v2) r=smontagu

---
 intl/unicharutil/util/nsBidiUtils.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/intl/unicharutil/util/nsBidiUtils.h b/intl/unicharutil/util/nsBidiUtils.h
index 9134fa3bfc4b..9a325a2b21f6 100644
--- a/intl/unicharutil/util/nsBidiUtils.h
+++ b/intl/unicharutil/util/nsBidiUtils.h
@@ -174,13 +174,11 @@ typedef enum nsCharType nsCharType;
 #define IBMBIDI_TEXTTYPE_STR            "bidi.texttype"
 #define IBMBIDI_NUMERAL_STR             "bidi.numeral"
 #define IBMBIDI_SUPPORTMODE_STR         "bidi.support"
-#define IBMBIDI_CHARSET_STR             "bidi.characterset"
 
 #define IBMBIDI_TEXTDIRECTION       1
 #define IBMBIDI_TEXTTYPE            2
 #define IBMBIDI_NUMERAL             4
 #define IBMBIDI_SUPPORTMODE         5
-#define IBMBIDI_CHARSET             6
 
 //  ------------------
 //  Text Direction
@@ -213,32 +211,22 @@ typedef enum nsCharType nsCharType;
 #define IBMBIDI_SUPPORTMODE_MOZILLA     1 //  1 = mozillaBidisupport *
 #define IBMBIDI_SUPPORTMODE_OSBIDI      2 //  2 = OsBidisupport
 #define IBMBIDI_SUPPORTMODE_DISABLE     3 //  3 = disableBidisupport
-//  ------------------
-//  Charset Mode
-//  ------------------
-//  bidi.characterset
-#define IBMBIDI_CHARSET_BIDI        1 //  1 = doccharactersetBidi *
-#define IBMBIDI_CHARSET_DEFAULT     2 //  2 = defaultcharactersetBidi
 
 #define IBMBIDI_DEFAULT_BIDI_OPTIONS              \
         ((IBMBIDI_TEXTDIRECTION_LTR<<0)         | \
          (IBMBIDI_TEXTTYPE_CHARSET<<4)          | \
          (IBMBIDI_NUMERAL_NOMINAL<<8)          | \
-         (IBMBIDI_SUPPORTMODE_MOZILLA<<12)      | \
-         (IBMBIDI_CHARSET_BIDI<<16))
-
+         (IBMBIDI_SUPPORTMODE_MOZILLA<<12)
 
 #define GET_BIDI_OPTION_DIRECTION(bo) (((bo)>>0) & 0x0000000F) /* 4 bits for DIRECTION */
 #define GET_BIDI_OPTION_TEXTTYPE(bo) (((bo)>>4) & 0x0000000F) /* 4 bits for TEXTTYPE */
 #define GET_BIDI_OPTION_NUMERAL(bo) (((bo)>>8) & 0x0000000F) /* 4 bits for NUMERAL */
 #define GET_BIDI_OPTION_SUPPORT(bo) (((bo)>>12) & 0x0000000F) /* 4 bits for SUPPORT */
-#define GET_BIDI_OPTION_CHARACTERSET(bo) (((bo)>>16) & 0x0000000F) /* 4 bits for CHARACTERSET */
 
 #define SET_BIDI_OPTION_DIRECTION(bo, dir) {(bo)=((bo) & 0xFFFFFFF0)|(((dir)& 0x0000000F)<<0);}
 #define SET_BIDI_OPTION_TEXTTYPE(bo, tt) {(bo)=((bo) & 0xFFFFFF0F)|(((tt)& 0x0000000F)<<4);}
 #define SET_BIDI_OPTION_NUMERAL(bo, num) {(bo)=((bo) & 0xFFFFF0FF)|(((num)& 0x0000000F)<<8);}
 #define SET_BIDI_OPTION_SUPPORT(bo, sup) {(bo)=((bo) & 0xFFFF0FFF)|(((sup)& 0x0000000F)<<12);}
-#define SET_BIDI_OPTION_CHARACTERSET(bo, cs) {(bo)=((bo) & 0xFFF0FFFF)|(((cs)& 0x0000000F)<<16);}
 
 /* Constants related to the position of numerics in the codepage */
 #define START_HINDI_DIGITS              0x0660

From 8c0037de5850a0b9a160b92356a93d3340932dd6 Mon Sep 17 00:00:00 2001
From: Philip Chee <philip.chee@gmail.com>
Date: Mon, 25 Apr 2011 02:16:43 +0800
Subject: [PATCH 433/509] Backed out changeset: 582c92878440

---
 docshell/base/nsIMarkupDocumentViewer.idl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docshell/base/nsIMarkupDocumentViewer.idl b/docshell/base/nsIMarkupDocumentViewer.idl
index 822ff6b56cb9..901903dd7677 100644
--- a/docshell/base/nsIMarkupDocumentViewer.idl
+++ b/docshell/base/nsIMarkupDocumentViewer.idl
@@ -142,6 +142,13 @@ interface nsIMarkupDocumentViewer : nsISupports
    */
   attribute octet bidiSupport;
 
+  /**
+   * bidiCharacterSet: whether to force the user's character set
+   *                   1 - use the document character set
+   *                   2 - use the character set chosen by the user
+   */
+  attribute octet bidiCharacterSet;  
+  
   /**
    * Use this attribute to access all the Bidi options in one operation
    */

From f3e044b88ad2f7d45bc5d4edd2218e29771b2025 Mon Sep 17 00:00:00 2001
From: Philip Chee <philip.chee@gmail.com>
Date: Mon, 25 Apr 2011 02:19:05 +0800
Subject: [PATCH 434/509] Backed out changeset: baf7456adc98

---
 layout/base/nsDocumentViewer.cpp | 21 +++++++++++++++++++++
 layout/base/nsPresContext.cpp    |  5 +++++
 2 files changed, 26 insertions(+)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 6b24d7048653..7f4ca54d2dbb 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -3201,6 +3201,27 @@ NS_IMETHODIMP DocumentViewerImpl::GetBidiSupport(PRUint8* aSupport)
   return NS_OK;
 }
 
+NS_IMETHODIMP DocumentViewerImpl::SetBidiCharacterSet(PRUint8 aCharacterSet)
+{
+  PRUint32 bidiOptions;
+
+  GetBidiOptions(&bidiOptions);
+  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, aCharacterSet);
+  SetBidiOptions(bidiOptions);
+  return NS_OK;
+}
+
+NS_IMETHODIMP DocumentViewerImpl::GetBidiCharacterSet(PRUint8* aCharacterSet)
+{
+  PRUint32 bidiOptions;
+
+  if (aCharacterSet) {
+    GetBidiOptions(&bidiOptions);
+    *aCharacterSet = GET_BIDI_OPTION_CHARACTERSET(bidiOptions);
+  }
+  return NS_OK;
+}
+
 NS_IMETHODIMP DocumentViewerImpl::SetBidiOptions(PRUint32 aBidiOptions)
 {
   if (mPresContext) {
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 6cbca726f83d..5065e858e7f4 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -764,6 +764,11 @@ nsPresContext::GetUserPreferences()
                                GET_BIDI_OPTION_SUPPORT(bidiOptions));
   SET_BIDI_OPTION_SUPPORT(bidiOptions, prefInt);
 
+  prefInt =
+    nsContentUtils::GetIntPref(IBMBIDI_CHARSET_STR,
+                               GET_BIDI_OPTION_CHARACTERSET(bidiOptions));
+  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, prefInt);
+
   // We don't need to force reflow: either we are initializing a new
   // prescontext or we are being called from UpdateAfterPreferencesChanged()
   // which triggers a reflow anyway.

From 66c6830451edec4bc9f5962a0a1b92a965fdde41 Mon Sep 17 00:00:00 2001
From: Philip Chee <philip.chee@gmail.com>
Date: Mon, 25 Apr 2011 02:20:46 +0800
Subject: [PATCH 435/509] Backed out changeset: 3f7277e15d8d

---
 modules/libpref/src/init/all.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 7f7649d7949a..530497d22de3 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1217,6 +1217,12 @@ pref("bidi.numeral", 0);
 // 2 = OsBidisupport
 // 3 = disableBidisupport
 pref("bidi.support", 1);
+// ------------------
+//  Charset Mode
+// ------------------
+// 1 = doccharactersetBidi *
+// 2 = defaultcharactersetBidi
+pref("bidi.characterset", 1);
 // Whether delete and backspace should immediately delete characters not
 // visually adjacent to the caret, or adjust the visual position of the caret
 // on the first keypress and delete the character on a second keypress

From 3a6ad0089da11d144878e8dc0ff632e0d46526e4 Mon Sep 17 00:00:00 2001
From: Philip Chee <philip.chee@gmail.com>
Date: Mon, 25 Apr 2011 02:23:02 +0800
Subject: [PATCH 436/509] Backed out changeset: 96bfa1480f5f

---
 intl/unicharutil/util/nsBidiUtils.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/intl/unicharutil/util/nsBidiUtils.h b/intl/unicharutil/util/nsBidiUtils.h
index 9a325a2b21f6..9134fa3bfc4b 100644
--- a/intl/unicharutil/util/nsBidiUtils.h
+++ b/intl/unicharutil/util/nsBidiUtils.h
@@ -174,11 +174,13 @@ typedef enum nsCharType nsCharType;
 #define IBMBIDI_TEXTTYPE_STR            "bidi.texttype"
 #define IBMBIDI_NUMERAL_STR             "bidi.numeral"
 #define IBMBIDI_SUPPORTMODE_STR         "bidi.support"
+#define IBMBIDI_CHARSET_STR             "bidi.characterset"
 
 #define IBMBIDI_TEXTDIRECTION       1
 #define IBMBIDI_TEXTTYPE            2
 #define IBMBIDI_NUMERAL             4
 #define IBMBIDI_SUPPORTMODE         5
+#define IBMBIDI_CHARSET             6
 
 //  ------------------
 //  Text Direction
@@ -211,22 +213,32 @@ typedef enum nsCharType nsCharType;
 #define IBMBIDI_SUPPORTMODE_MOZILLA     1 //  1 = mozillaBidisupport *
 #define IBMBIDI_SUPPORTMODE_OSBIDI      2 //  2 = OsBidisupport
 #define IBMBIDI_SUPPORTMODE_DISABLE     3 //  3 = disableBidisupport
+//  ------------------
+//  Charset Mode
+//  ------------------
+//  bidi.characterset
+#define IBMBIDI_CHARSET_BIDI        1 //  1 = doccharactersetBidi *
+#define IBMBIDI_CHARSET_DEFAULT     2 //  2 = defaultcharactersetBidi
 
 #define IBMBIDI_DEFAULT_BIDI_OPTIONS              \
         ((IBMBIDI_TEXTDIRECTION_LTR<<0)         | \
          (IBMBIDI_TEXTTYPE_CHARSET<<4)          | \
          (IBMBIDI_NUMERAL_NOMINAL<<8)          | \
-         (IBMBIDI_SUPPORTMODE_MOZILLA<<12)
+         (IBMBIDI_SUPPORTMODE_MOZILLA<<12)      | \
+         (IBMBIDI_CHARSET_BIDI<<16))
+
 
 #define GET_BIDI_OPTION_DIRECTION(bo) (((bo)>>0) & 0x0000000F) /* 4 bits for DIRECTION */
 #define GET_BIDI_OPTION_TEXTTYPE(bo) (((bo)>>4) & 0x0000000F) /* 4 bits for TEXTTYPE */
 #define GET_BIDI_OPTION_NUMERAL(bo) (((bo)>>8) & 0x0000000F) /* 4 bits for NUMERAL */
 #define GET_BIDI_OPTION_SUPPORT(bo) (((bo)>>12) & 0x0000000F) /* 4 bits for SUPPORT */
+#define GET_BIDI_OPTION_CHARACTERSET(bo) (((bo)>>16) & 0x0000000F) /* 4 bits for CHARACTERSET */
 
 #define SET_BIDI_OPTION_DIRECTION(bo, dir) {(bo)=((bo) & 0xFFFFFFF0)|(((dir)& 0x0000000F)<<0);}
 #define SET_BIDI_OPTION_TEXTTYPE(bo, tt) {(bo)=((bo) & 0xFFFFFF0F)|(((tt)& 0x0000000F)<<4);}
 #define SET_BIDI_OPTION_NUMERAL(bo, num) {(bo)=((bo) & 0xFFFFF0FF)|(((num)& 0x0000000F)<<8);}
 #define SET_BIDI_OPTION_SUPPORT(bo, sup) {(bo)=((bo) & 0xFFFF0FFF)|(((sup)& 0x0000000F)<<12);}
+#define SET_BIDI_OPTION_CHARACTERSET(bo, cs) {(bo)=((bo) & 0xFFF0FFFF)|(((cs)& 0x0000000F)<<16);}
 
 /* Constants related to the position of numerics in the codepage */
 #define START_HINDI_DIGITS              0x0660

From bafe2e9f2f158fc8e03c86a4392491e4738a0f3d Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Tue, 12 Apr 2011 12:22:45 -0700
Subject: [PATCH 437/509] Bug 649429 part 1: fix undefined behavior in
 gfxASurface::CheckSurfaceSize. r=jrmuizel

--HG--
extra : rebase_source : 145c3c4b2acd86e2743811f4be5eba599dcc1df3
---
 gfx/thebes/gfxASurface.cpp | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index a4842fe56c70..08f499fed805 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -38,6 +38,7 @@
 
 #include "nsIMemoryReporter.h"
 #include "nsMemory.h"
+#include "CheckedInt.h"
 
 #include "gfxASurface.h"
 #include "gfxContext.h"
@@ -84,6 +85,8 @@
 #include "nsIConsoleService.h"
 #include "nsServiceManagerUtils.h"
 
+using mozilla::CheckedInt;
+
 static cairo_user_data_key_t gfxasurface_pointer_key;
 
 // Surfaces use refcounting that's tied to the cairo surface refcnt, to avoid
@@ -353,33 +356,37 @@ gfxASurface::CheckSurfaceSize(const gfxIntSize& sz, PRInt32 limit)
         return PR_FALSE;
     }
 
+    // reject images with sides bigger than limit
+    if (limit && (sz.width > limit || sz.height > limit)) {
+        NS_WARNING("Surface size too large (exceeds caller's limit)!");
+        return PR_FALSE;
+    }
+
 #if defined(XP_MACOSX)
-    // CoreGraphics is limited to images < 32K in *height*, so clamp all surfaces on the Mac to that height
+    // CoreGraphics is limited to images < 32K in *height*,
+    // so clamp all surfaces on the Mac to that height
     if (sz.height > SHRT_MAX) {
-        NS_WARNING("Surface size too large (would overflow)!");
+        NS_WARNING("Surface size too large (exceeds CoreGraphics limit)!");
         return PR_FALSE;
     }
 #endif
 
-    // check to make sure we don't overflow a 32-bit
-    PRInt32 tmp = sz.width * sz.height;
-    if (tmp && tmp / sz.height != sz.width) {
+    // make sure the surface area doesn't overflow a PRInt32
+    CheckedInt<PRInt32> tmp = sz.width;
+    tmp *= sz.height;
+    if (!tmp.valid()) {
         NS_WARNING("Surface size too large (would overflow)!");
         return PR_FALSE;
     }
 
-    // always assume 4-byte stride
-    tmp = tmp * 4;
-    if (tmp && tmp / 4 != sz.width * sz.height) {
-        NS_WARNING("Surface size too large (would overflow)!");
+    // assuming 4-byte stride, make sure the allocation size
+    // doesn't overflow a PRInt32 either
+    tmp *= 4;
+    if (!tmp.valid()) {
+        NS_WARNING("Allocation too large (would overflow)!");
         return PR_FALSE;
     }
 
-    // reject images with sides bigger than limit
-    if (limit &&
-        (sz.width > limit || sz.height > limit))
-        return PR_FALSE;
-
     return PR_TRUE;
 }
 

From 74ad2fbe608e391a6b7fcb90ea2708869e6e54cd Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Wed, 20 Apr 2011 12:22:04 -0700
Subject: [PATCH 438/509] Bug 651546 - Remove stackLimit from GCMarker. r=billm

---
 js/src/jsgc.cpp | 2 --
 js/src/jsgc.h   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index dcb3e4baa7d1..b3c8580f63ea 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1452,7 +1452,6 @@ namespace js {
 
 GCMarker::GCMarker(JSContext *cx)
   : color(0),
-    stackLimit(0),
     unmarkedArenaStackTop(NULL),
     objStack(cx->runtime->gcMarkStackObjs, sizeof(cx->runtime->gcMarkStackObjs)),
     xmlStack(cx->runtime->gcMarkStackXMLs, sizeof(cx->runtime->gcMarkStackXMLs)),
@@ -2450,7 +2449,6 @@ MarkAndSweep(JSContext *cx, JSCompartment *comp, JSGCInvocationKind gckind GCTIM
     JS_ASSERT(IS_GC_MARKING_TRACER(&gcmarker));
     JS_ASSERT(gcmarker.getMarkColor() == BLACK);
     rt->gcMarkingTracer = &gcmarker;
-    gcmarker.stackLimit = cx->stackLimit;
 #ifdef JS_THREADSAFE
     /*
      * cx->gcBackgroundFree is set if we need several mark-and-sweep loops to
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index b54dcb75b0ae..d4b1f9aea224 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1118,7 +1118,6 @@ struct GCMarker : public JSTracer {
     uint32 color;
 
   public:
-    jsuword stackLimit;
     /* See comments before delayMarkingChildren is jsgc.cpp. */
     js::gc::Arena<js::gc::Cell> *unmarkedArenaStackTop;
 #ifdef DEBUG

From af2fa353a0dbaf292f4160c1da64315d90d254d6 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 16 Apr 2011 17:14:10 -0400
Subject: [PATCH 439/509] Bug 600677 - Add fix hook to proxies. r=gal

---
 js/src/jsproxy.cpp                           | 15 ++++++++++++++-
 js/src/tests/js1_8_5/extensions/proxy-fix.js |  9 +++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 js/src/tests/js1_8_5/extensions/proxy-fix.js

diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 699962578ba3..be30629ecdf9 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -981,6 +981,19 @@ proxy_TraceFunction(JSTracer *trc, JSObject *obj)
     MarkValue(trc, GetConstruct(obj), "construct");
 }
 
+static JSBool
+proxy_Fix(JSContext *cx, JSObject *obj, bool *fixed, AutoIdVector *props)
+{
+    JS_ASSERT(obj->isProxy());
+    JSBool isFixed;
+    bool ok = FixProxy(cx, obj, &isFixed);
+    if (ok) {
+        *fixed = isFixed;
+        return GetPropertyNames(cx, obj, JSITER_OWNONLY | JSITER_HIDDEN, props);
+    }
+    return false;
+}
+
 static void
 proxy_Finalize(JSContext *cx, JSObject *obj)
 {
@@ -1036,7 +1049,7 @@ JS_FRIEND_API(Class) ObjectProxyClass = {
         proxy_DeleteProperty,
         NULL,             /* enumerate       */
         proxy_TypeOf,
-        NULL,             /* fix             */
+        proxy_Fix,        /* fix             */
         NULL,             /* thisObject      */
         NULL,             /* clear           */
     }
diff --git a/js/src/tests/js1_8_5/extensions/proxy-fix.js b/js/src/tests/js1_8_5/extensions/proxy-fix.js
new file mode 100644
index 000000000000..d7a073dd837d
--- /dev/null
+++ b/js/src/tests/js1_8_5/extensions/proxy-fix.js
@@ -0,0 +1,9 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+// Contributor: Josh Matthews
+
+var p = Proxy.create({ fix: function() { return {foo: {value: 2} }; } });
+Object.preventExtensions(p);
+reportCompare(p.foo, 2, "property exists");
+p.foo = 3;
+reportCompare(p.foo, 2, "proxy is frozen");
\ No newline at end of file

From cd034a698bdad087a9575d9eed613e28a3dc2323 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 21 Apr 2011 12:36:46 -0700
Subject: [PATCH 440/509] Bug 649429 part 2: move
 nsSVGUtils::ConvertToSurfaceSize back to nsSVGUtils.cpp. r=dholbert

--HG--
extra : rebase_source : 7c3b91c2d59b39d9c5e0421ac77dad94ef947e34
---
 layout/svg/base/src/nsSVGUtils.cpp | 20 ++++++++++++++++++++
 layout/svg/base/src/nsSVGUtils.h   | 22 +---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index d0e221ae506a..6245f0f882b8 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1140,6 +1140,26 @@ nsSVGUtils::ToAppPixelRect(nsPresContext *aPresContext, const gfxRect& rect)
                 aPresContext->DevPixelsToAppUnits(NSToIntCeil(rect.YMost()) - NSToIntFloor(rect.Y())));
 }
 
+gfxIntSize
+nsSVGUtils::ConvertToSurfaceSize(const gfxSize& aSize,
+                                 PRBool *aResultOverflows)
+{
+  gfxIntSize surfaceSize(ClampToInt(aSize.width), ClampToInt(aSize.height));
+
+  *aResultOverflows = surfaceSize.width != NS_round(aSize.width) ||
+    surfaceSize.height != NS_round(aSize.height);
+
+  if (!gfxASurface::CheckSurfaceSize(surfaceSize)) {
+    surfaceSize.width = NS_MIN(NS_SVG_OFFSCREEN_MAX_DIMENSION,
+                               surfaceSize.width);
+    surfaceSize.height = NS_MIN(NS_SVG_OFFSCREEN_MAX_DIMENSION,
+                                surfaceSize.height);
+    *aResultOverflows = PR_TRUE;
+  }
+
+  return surfaceSize;
+}
+
 gfxMatrix
 nsSVGUtils::ConvertSVGMatrixToThebes(nsIDOMSVGMatrix *aMatrix)
 {
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index ba9def9d6564..738ee7221865 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -445,32 +445,12 @@ public:
    * possibly making it smaller in the process so the surface does not
    * use excessive memory.
    *
-   * XXXdholbert Putting impl in header file so that imagelib can call this
-   * method.  Once we switch to a libxul-only world, this can go back into
-   * the .cpp file.
-   *
    * @param aSize the desired surface size
    * @param aResultOverflows true if the desired surface size is too big
    * @return the surface size to use
    */
   static gfxIntSize ConvertToSurfaceSize(const gfxSize& aSize,
-                                  PRBool *aResultOverflows)
-  {
-    gfxIntSize surfaceSize(ClampToInt(aSize.width), ClampToInt(aSize.height));
-
-    *aResultOverflows = surfaceSize.width != NS_round(aSize.width) ||
-      surfaceSize.height != NS_round(aSize.height);
-
-    if (!gfxASurface::CheckSurfaceSize(surfaceSize)) {
-      surfaceSize.width = NS_MIN(NS_SVG_OFFSCREEN_MAX_DIMENSION,
-                                 surfaceSize.width);
-      surfaceSize.height = NS_MIN(NS_SVG_OFFSCREEN_MAX_DIMENSION,
-                                  surfaceSize.height);
-      *aResultOverflows = PR_TRUE;
-    }
-
-    return surfaceSize;
-  }
+                                         PRBool *aResultOverflows);
 
   /*
    * Convert a nsIDOMSVGMatrix to a gfxMatrix.

From 5eb13325791b6f6c7378f6711bda27b497e86684 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 21 Apr 2011 12:36:53 -0700
Subject: [PATCH 441/509] Bug 651926: abort (even in production) if anything in
 gfxPlatform::Init fails, its callers can't cope. r=jrmuizel

---
 gfx/src/nsThebesGfxFactory.cpp |  3 ++-
 gfx/thebes/gfxPlatform.cpp     | 24 ++++++------------------
 gfx/thebes/gfxPlatform.h       |  7 ++++---
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gfx/src/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
index db7c13f89ce5..373fba6c6fc0 100644
--- a/gfx/src/nsThebesGfxFactory.cpp
+++ b/gfx/src/nsThebesGfxFactory.cpp
@@ -137,7 +137,8 @@ static const mozilla::Module::CategoryEntry kThebesCategories[] = {
 static nsresult
 nsThebesGfxModuleCtor()
 {
-    return gfxPlatform::Init();
+    gfxPlatform::Init();
+    return NS_OK;
 }
 
 static void
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index a43b3205db8f..1874f41ba92d 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -234,7 +234,7 @@ gfxPlatform::GetPlatform()
     return gPlatform;
 }
 
-nsresult
+void
 gfxPlatform::Init()
 {
     NS_ASSERTION(!gPlatform, "Already started???");
@@ -281,9 +281,7 @@ gfxPlatform::Init()
 #if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID) // temporary, until this is implemented on others
     rv = gfxPlatformFontList::Init();
     if (NS_FAILED(rv)) {
-        NS_ERROR("Could not initialize gfxPlatformFontList");
-        Shutdown();
-        return rv;
+        NS_RUNTIMEABORT("Could not initialize gfxPlatformFontList");
     }
 #endif
 
@@ -291,30 +289,22 @@ gfxPlatform::Init()
         gPlatform->CreateOffscreenSurface(gfxIntSize(1,1),
                                           gfxASurface::CONTENT_COLOR_ALPHA);
     if (!gPlatform->mScreenReferenceSurface) {
-        NS_ERROR("Could not initialize mScreenReferenceSurface");
-        Shutdown();
-        return NS_ERROR_OUT_OF_MEMORY;
+        NS_RUNTIMEABORT("Could not initialize mScreenReferenceSurface");
     }
 
     rv = gfxFontCache::Init();
     if (NS_FAILED(rv)) {
-        NS_ERROR("Could not initialize gfxFontCache");
-        Shutdown();
-        return rv;
+        NS_RUNTIMEABORT("Could not initialize gfxFontCache");
     }
 
     rv = gfxTextRunWordCache::Init();
     if (NS_FAILED(rv)) {
-        NS_ERROR("Could not initialize gfxTextRunWordCache");
-        Shutdown();
-        return rv;
+        NS_RUNTIMEABORT("Could not initialize gfxTextRunWordCache");
     }
 
     rv = gfxTextRunCache::Init();
     if (NS_FAILED(rv)) {
-        NS_ERROR("Could not initialize gfxTextRunCache");
-        Shutdown();
-        return rv;
+        NS_RUNTIMEABORT("Could not initialize gfxTextRunCache");
     }
 
     /* Pref migration hook. */
@@ -330,8 +320,6 @@ gfxPlatform::Init()
         prefs->AddObserver("gfx.downloadable_fonts.", fontPrefObserver, PR_FALSE);
         prefs->AddObserver("gfx.font_rendering.", fontPrefObserver, PR_FALSE);
     }
-
-    return NS_OK;
 }
 
 void
diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h
index b40cdc2bb409..4b24a8baf912 100644
--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -147,12 +147,13 @@ public:
     static gfxPlatform *GetPlatform();
 
     /**
-     * Start up Thebes. This can fail.
+     * Start up Thebes.
      */
-    static nsresult Init();
+    static void Init();
 
     /**
-     * Clean up static objects to shut down thebes.
+     * Shut down Thebes.
+     * Init() arranges for this to be called at an appropriate time.
      */
     static void Shutdown();
 

From dcee138127c8482d6c4678019c25f3acad3f9584 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 24 Apr 2011 20:10:10 -0700
Subject: [PATCH 442/509] Bug 473687 - Remove widget WinCE support: Part A
 (File removal); r=dougt

---
 widget/src/windows/nsClipboardCE.cpp | 241 ---------
 widget/src/windows/nsClipboardCE.h   |  67 ---
 widget/src/windows/nsWindowCE.cpp    | 720 ---------------------------
 widget/src/windows/nsWindowCE.h      | 108 ----
 4 files changed, 1136 deletions(-)
 delete mode 100644 widget/src/windows/nsClipboardCE.cpp
 delete mode 100644 widget/src/windows/nsClipboardCE.h
 delete mode 100644 widget/src/windows/nsWindowCE.cpp
 delete mode 100644 widget/src/windows/nsWindowCE.h

diff --git a/widget/src/windows/nsClipboardCE.cpp b/widget/src/windows/nsClipboardCE.cpp
deleted file mode 100644
index e2ef21673966..000000000000
--- a/widget/src/windows/nsClipboardCE.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- *   Mozilla Corporation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Vladimir Vukicevic <vladimir@pobox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsClipboardCE.h"
-
-#include "nsISupportsPrimitives.h"
-#include "nsXPIDLString.h"
-#include "nsCRT.h"
-#include "nsComponentManagerUtils.h"
-
-#include <winuserm.h>
-
-nsClipboard::nsClipboard()
-{
-}
-
-nsClipboard::~nsClipboard()
-{
-}
-
-UINT nsClipboard::GetFormat(const char* aMimeStr)
-{
-  UINT format;
-
-  if (strcmp(aMimeStr, kTextMime) == 0)
-    format = CF_TEXT;
-  else if (strcmp(aMimeStr, kUnicodeMime) == 0)
-    format = CF_UNICODETEXT;
-  else if (strcmp(aMimeStr, kJPEGImageMime) == 0 ||
-           strcmp(aMimeStr, kPNGImageMime) == 0)
-    format = CF_DIB;
-  else if (strcmp(aMimeStr, kFileMime) == 0 || 
-           strcmp(aMimeStr, kFilePromiseMime) == 0)
-    format = CF_HDROP; // XXX CF_HDROP not listed as supported but it compiles!
-  else
-    format = ::RegisterClipboardFormat(NS_ConvertASCIItoUTF16(aMimeStr).get());
-
-  // CE doesn't support CF_HTML (kNativeHTMLMime)
-
-  return format;
-}
-
-NS_IMETHODIMP
-nsClipboard::SetNativeClipboardData(PRInt32 aWhichClipboard)
-{
-  if (aWhichClipboard != kGlobalClipboard || !mTransferable)
-    return NS_ERROR_INVALID_ARG;
-
-  if (!::OpenClipboard(NULL))
-    return NS_ERROR_FAILURE;
-
-  if (!::EmptyClipboard())
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsISupportsArray> flavorList;
-  mTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavorList));
-
-  PRUint32 count, i;
-  flavorList->Count(&count);
-  nsresult rv = NS_OK;
-
-  for (i = 0; i < count; i++) {
-    nsCOMPtr<nsISupports> listItem;
-    flavorList->GetElementAt(i, getter_AddRefs(listItem));
-
-    nsCOMPtr<nsISupportsCString> flavor(do_QueryInterface(listItem));
-    if (!flavor)
-      continue;
-    nsXPIDLCString flavorStr;
-    flavor->ToString(getter_Copies(flavorStr));
-
-    UINT format = GetFormat(flavorStr);
-
-    PRUint32 len;
-    nsCOMPtr<nsISupports> wrapper;
-    mTransferable->GetTransferData(flavorStr, getter_AddRefs(wrapper), &len);
-    if (!wrapper)
-      continue;
-
-    char *memory = nsnull;
-    nsCOMPtr<nsISupportsString> textItem(do_QueryInterface(wrapper));
-    nsCOMPtr<nsISupportsPRBool> boolItem(do_QueryInterface(wrapper));
-
-    if (format == CF_TEXT || format == CF_DIB || format == CF_HDROP) {
-      NS_WARNING("Setting this clipboard format not implemented");
-      continue;
-    } else if (textItem) {
-      // format == CF_UNICODETEXT, or is otherwise unicode data.
-      nsAutoString text;
-      textItem->GetData(text);
-      PRInt32 len = text.Length() * 2;
-
-      memory = reinterpret_cast<char*>(::LocalAlloc(LMEM_FIXED, len + 2));
-      if (!memory) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-        break;
-      }
-      memcpy(memory, nsPromiseFlatString(text).get(), len);
-      memory[len]   = '\0';
-      memory[len+1] = '\0';
-    } else if (boolItem) {
-      // Private browsing sets a boolean type.
-      PRBool value;
-      boolItem->GetData(&value);
-      memory = reinterpret_cast<char*>(::LocalAlloc(LMEM_FIXED, 1));
-      if (!memory) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-        break;
-      }
-      *memory = value ? 1 : 0;
-    } else {
-      NS_WARNING("Can't set unknown transferrable primitive");
-      continue;
-    }
-
-    if (!::SetClipboardData(format, memory)) {
-      NS_WARNING("::SetClipboardData failed");
-      if (memory)
-        ::LocalFree(memory);
-    }
-  }
-
-  ::CloseClipboard();
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsClipboard::GetNativeClipboardData(nsITransferable *aTransferable,
-				    PRInt32 aWhichClipboard)
-{
-  if (aWhichClipboard != kGlobalClipboard || !aTransferable)
-    return NS_ERROR_INVALID_ARG;
-
-  if (!::OpenClipboard(NULL))
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsISupportsArray> flavorList;
-  aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
-
-  PRUint32 count, i;
-  flavorList->Count(&count);
-  nsresult rv = NS_OK;
-
-  for (i = 0; i < count; i++) {
-    nsCOMPtr<nsISupports> listItem;
-    flavorList->GetElementAt(i, getter_AddRefs(listItem));
-
-    nsCOMPtr<nsISupportsCString> flavor(do_QueryInterface(listItem));
-    if (!flavor)
-      continue;
-    nsXPIDLCString flavorStr;
-    flavor->ToString(getter_Copies(flavorStr));
-
-    UINT format = GetFormat(flavorStr);
-
-    void *data;
-    data = ::GetClipboardData(format);
-    if (!data)
-      continue;
-
-    if (format == CF_UNICODETEXT) {
-      PRUnichar *dataStr = reinterpret_cast<PRUnichar*>(data);
-      nsString *stringCopy = new nsString(dataStr);
-
-      nsCOMPtr<nsISupportsString> primitive =
-        do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID);
-      if (!primitive) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-        break;
-      }
-
-      primitive->SetData(*stringCopy);
-      aTransferable->SetTransferData(flavorStr, primitive,
-                                     stringCopy->Length() * sizeof(PRUnichar));
-    } else {
-      NS_WARNING("Getting this clipboard format not implemented");
-      continue;
-    }
-
-  }
-
-  ::CloseClipboard();
-
-  return rv;
-}
-
-NS_IMETHODIMP nsClipboard::HasDataMatchingFlavors(const char** aFlavorList,
-                                                  PRUint32 aLength,
-                                                  PRInt32 aWhichClipboard,
-                                                  PRBool *_retval)
-{
-  *_retval = PR_FALSE;
-  if (aWhichClipboard != kGlobalClipboard || !aFlavorList)
-    return NS_OK;
-  for (PRUint32 i = 0;i < aLength; ++i) {
-
-    UINT format = GetFormat(aFlavorList[i]);
-    if (::IsClipboardFormatAvailable(format)) {
-      *_retval = PR_TRUE;
-      break;
-    }
-  }
-
-  return NS_OK;
-}
diff --git a/widget/src/windows/nsClipboardCE.h b/widget/src/windows/nsClipboardCE.h
deleted file mode 100644
index 3d6cbdf369d2..000000000000
--- a/widget/src/windows/nsClipboardCE.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- *   Mozilla Corporation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Vladimir Vukicevic <vladimir@pobox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsClipboardCE_h__
-#define nsClipboardCE_h__
-
-#include "nsBaseClipboard.h"
-
-#include <windows.h>
-
-/*
- * Windows CE clipboard wrapper
- */
-
-class nsClipboard :
-  public nsBaseClipboard
-{
-public:
-  nsClipboard();
-  virtual ~nsClipboard();
-  NS_IMETHOD HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
-                                    PRInt32 aWhichClipboard, PRBool *_retval);
-
-protected:
-  NS_IMETHOD SetNativeClipboardData (PRInt32 aWhichClipboard);
-  NS_IMETHOD GetNativeClipboardData (nsITransferable * aTransferable, PRInt32 aWhichClipboard);
-
-private:
-  static UINT     GetFormat(const char* aMimeStr);
-};
-
-#endif
diff --git a/widget/src/windows/nsWindowCE.cpp b/widget/src/windows/nsWindowCE.cpp
deleted file mode 100644
index 31786482cf15..000000000000
--- a/widget/src/windows/nsWindowCE.cpp
+++ /dev/null
@@ -1,720 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * nsWindowCE - Windows CE specific code related to nsWindow. 
- */
-
-#include "nsWindowCE.h"
-#include "nsIObserverService.h"
-#include "resource.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
-
-/**************************************************************
- **************************************************************
- **
- ** BLOCK: Variables
- **
- ** nsWindow Class static initializations and global variables. 
- **
- **************************************************************
- **************************************************************/
-
-/**************************************************************
- *
- * SECTION: nsWindow statics
- *
- **************************************************************/
-
-#if defined(WINCE_HAVE_SOFTKB)
-PRBool          nsWindow::sSoftKeyboardState      = PR_FALSE;
-PRBool          nsWindowCE::sSIPInTransition      = PR_FALSE;
-TriStateBool    nsWindowCE::sShowSIPButton        = TRI_UNKNOWN;
-TriStateBool    nsWindowCE::sHardKBPresence       = TRI_UNKNOWN;
-HWND            nsWindowCE::sSoftKeyMenuBarHandle = NULL;
-RECT            nsWindowCE::sDefaultSIPRect       = {0, 0, 0, 0};
-HWND            nsWindowCE::sMainWindowHandle     = NULL;
-PRBool          nsWindowCE::sMenuBarShown         = PR_FALSE;
-#endif
-
-/**************************************************************
- **************************************************************
- **
- ** BLOCK: nsWindowCE helpers
- **
- ** Called by nsWindow for wince specific work.
- **
- **************************************************************
- **************************************************************/
-
-#ifdef WINCE_HAVE_SOFTKB
-void nsWindowCE::OnSoftKbSettingsChange(HWND wnd, LPRECT visRect)
-{
-  if (!visRect) {
-    SIPINFO sipInfo;
-    memset(&sipInfo, 0, sizeof(SIPINFO));
-    sipInfo.cbSize = sizeof(SIPINFO);
-    if (SipGetInfo(&sipInfo)) 
-      visRect = &(sipInfo.rcVisibleDesktop);
-    else
-      return;
-  }
-
-  if (wnd) {
-    HWND wndMain = nsWindow::GetTopLevelHWND(wnd);
-    RECT winRect;
-    ::GetWindowRect(wndMain, &winRect);
-    if (sMenuBarShown && visRect->bottom == GetSystemMetrics(SM_CYSCREEN)) {
-      RECT menuBarRect;
-      if (GetWindowRect(sSoftKeyMenuBarHandle, &menuBarRect) && menuBarRect.top < visRect->bottom)
-        visRect->bottom = menuBarRect.top;
-    }
-    if (winRect.bottom != visRect->bottom) {
-      if (!sMenuBarShown && winRect.bottom < visRect->bottom) {
-        SHFullScreen(wndMain, SHFS_HIDESIPBUTTON);
-      }
-      winRect.bottom = visRect->bottom;
-      MoveWindow(wndMain, winRect.left, winRect.top, winRect.right - winRect.left, winRect.bottom - winRect.top, TRUE);
-    }
-  }
-}
-
-void nsWindowCE::ToggleSoftKB(HWND wnd, PRBool show)
-{
-  if (sHardKBPresence == TRI_UNKNOWN)
-    CheckKeyboardStatus();
-
-  if (sHardKBPresence == TRI_TRUE) {
-    if (GetSliderStateOpen() != TRI_FALSE) {
-      show = PR_FALSE;
-      sShowSIPButton = TRI_FALSE;
-    }
-  }
-
-  sSIPInTransition = PR_TRUE;
-
-  SHSipPreference(wnd, show ? SIP_UP : SIP_DOWN);
-
-  if (sShowSIPButton == TRI_UNKNOWN) {
-    // Set it to a known value to avoid checking preferences every time
-    // Note: ui.sip.showSIPButton preference change requires browser restart
-    sShowSIPButton = TRI_TRUE;
-
-    PRBool tmpBool = PR_FALSE;
-    nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (prefs) {
-      nsCOMPtr<nsIPrefBranch> prefBranch;
-      prefs->GetBranch(0, getter_AddRefs(prefBranch));
-      if (prefBranch) {
-        nsresult rv = prefBranch->GetBoolPref("ui.sip.showSIPButton", &tmpBool);
-        if (NS_SUCCEEDED(rv)) {
-          sShowSIPButton = tmpBool ? TRI_TRUE : TRI_FALSE;
-
-          if (sShowSIPButton == TRI_FALSE) {
-            // Move the SIP rect to the bottom of the screen
-            SIPINFO sipInfo;
-            memset(&sipInfo, 0, sizeof(SIPINFO));
-            sipInfo.cbSize = sizeof(SIPINFO);
-            if (SipGetInfo(&sipInfo)) {
-              // Store the original rect
-              sDefaultSIPRect = sipInfo.rcSipRect;
-
-              // Move the SIP to the bottom of the screen
-              RECT sipRect = sipInfo.rcSipRect;
-              int sipShift = GetSystemMetrics(SM_CYSCREEN) - sipRect.bottom;
-              sipRect.top += sipShift;
-              sipRect.bottom += sipShift;
-              SipSetDefaultRect(&sipRect);
-
-              // Re-select the IM to apply the change
-              CLSID clsid;
-              if (SipGetCurrentIM(&clsid))
-                SipSetCurrentIM(&clsid);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  PRBool showSIPButton = show;
-  if (sShowSIPButton == TRI_FALSE)
-    showSIPButton = PR_FALSE;
-
-  if (!showSIPButton) {
-    HWND hWndSIPB = FindWindowW(L"MS_SIPBUTTON", NULL);
-    if (hWndSIPB)
-      ShowWindow(hWndSIPB, SW_HIDE);
-  }
-
-  if (sSoftKeyMenuBarHandle) {
-    ShowWindow(sSoftKeyMenuBarHandle, showSIPButton ? SW_SHOW: SW_HIDE);
-    if (showSIPButton)
-      SetWindowPos(sSoftKeyMenuBarHandle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
-    SHFullScreen(wnd, showSIPButton ? SHFS_SHOWSIPBUTTON : SHFS_HIDESIPBUTTON);
-    sMenuBarShown = showSIPButton;
-    OnSoftKbSettingsChange(wnd, nsnull);
-  }
-
-  sSIPInTransition = PR_FALSE;
-}
-
-void nsWindowCE::CreateSoftKeyMenuBar(HWND wnd)
-{
-  if (!wnd)
-    return;
-
-  sMainWindowHandle = wnd;
-  
-  if (sSoftKeyMenuBarHandle != NULL)
-    return;
-  
-  SHMENUBARINFO mbi;
-  ZeroMemory(&mbi, sizeof(SHMENUBARINFO));
-  mbi.cbSize = sizeof(SHMENUBARINFO);
-  mbi.hwndParent = wnd;
-  
-  //  On windows ce smartphone, events never occur if the
-  //  menubar is empty.  This doesn't work: 
-  //  mbi.dwFlags = SHCMBF_EMPTYBAR;
-  
-  HMENU dummyMenu = CreateMenu();
-  AppendMenu(dummyMenu, MF_STRING, 0, L"");
-
-  mbi.nToolBarId = (UINT)dummyMenu;
-  mbi.dwFlags = SHCMBF_HMENU | SHCMBF_HIDDEN;
-  mbi.hInstRes = GetModuleHandle(NULL);
-  
-  if (!SHCreateMenuBar(&mbi))
-    return;
-
-  SendMessage(mbi.hwndMB, SHCMBM_OVERRIDEKEY, VK_TBACK,
-              MAKELPARAM(SHMBOF_NODEFAULT | SHMBOF_NOTIFY,
-                         SHMBOF_NODEFAULT | SHMBOF_NOTIFY));
-  
-  SendMessage(mbi.hwndMB, SHCMBM_OVERRIDEKEY, VK_TSOFT1, 
-              MAKELPARAM (SHMBOF_NODEFAULT | SHMBOF_NOTIFY, 
-                          SHMBOF_NODEFAULT | SHMBOF_NOTIFY));
-  
-  SendMessage(mbi.hwndMB, SHCMBM_OVERRIDEKEY, VK_TSOFT2, 
-              MAKELPARAM (SHMBOF_NODEFAULT | SHMBOF_NOTIFY, 
-                          SHMBOF_NODEFAULT | SHMBOF_NOTIFY));
-
-  sSoftKeyMenuBarHandle = mbi.hwndMB;
-}
-
-void nsWindowCE::CheckKeyboardStatus()
-{
-  HKEY  hKey = 0;
-  LONG  result = 0;
-  DWORD entryType = 0;
-  DWORD hwkbd = 0;
-  DWORD paramSize = sizeof(DWORD);
- 
-  result = RegOpenKeyExW(HKEY_CURRENT_USER, 
-                           L"SOFTWARE\\Microsoft\\Shell", 
-                           0, 
-                           KEY_READ,
-                           &hKey); 
-
-  if (result != ERROR_SUCCESS)
-  {
-    sHardKBPresence = TRI_FALSE;
-    return;
-  }
-
-  result = RegQueryValueEx(hKey,
-                             L"HasKeyboard",
-                             NULL, 
-                             &entryType, 
-                             (LPBYTE)&hwkbd, 
-                             &paramSize);
-
-  if (result != ERROR_SUCCESS)
-  {
-    RegCloseKey(hKey);
-    sHardKBPresence = TRI_FALSE;
-    return;
-  }
-    
-  sHardKBPresence = hwkbd ? TRI_TRUE : TRI_FALSE;
-}
-
-TriStateBool nsWindowCE::GetSliderStateOpen()
-{
-
-  HKEY  hKey = 0;
-  LONG  result = 0;
-  DWORD entryType = 0;
-  DWORD sliderStateOpen = 0;
-  DWORD paramSize = sizeof(DWORD);
-
-  result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, 
-                           L"System\\GDI\\Rotation", 
-                           0, 
-                           KEY_READ,
-                           &hKey); 
-
-  if (result != ERROR_SUCCESS)
-    return TRI_UNKNOWN;
-
-  result = RegQueryValueEx(hKey,
-                             L"Slidekey",
-                             NULL, 
-                             &entryType, 
-                             (LPBYTE)&sliderStateOpen, 
-                             &paramSize);
-
-  if (result != ERROR_SUCCESS)
-  {
-     RegCloseKey(hKey);
-     return TRI_UNKNOWN;
-  }
-    
-  return  sliderStateOpen ? TRI_TRUE : TRI_FALSE;
-}
-
-
-void nsWindowCE::ResetSoftKB(HWND wnd)
-{
-  if (!wnd || wnd != sMainWindowHandle)
-    return;
-
-  // Main window is being destroyed - reset all the soft-keyboard settings
-  sMainWindowHandle = NULL;
-  sSoftKeyMenuBarHandle = NULL;
-
-  if (sDefaultSIPRect.top > 0) {
-    SipSetDefaultRect(&sDefaultSIPRect);
-    // Re-select the IM to apply the change
-    CLSID clsid;
-    if (SipGetCurrentIM(&clsid))
-      SipSetCurrentIM(&clsid);
-    ZeroMemory(&sDefaultSIPRect, sizeof(sDefaultSIPRect));
-  }
-
-  // This will make it re-read the pref next time
-  sShowSIPButton = TRI_UNKNOWN;
-}
-
-#endif  //defined(WINCE_HAVE_SOFTKB)
-
-typedef struct ECWWindows
-{
-  LPARAM      params;
-  WNDENUMPROC func;
-  HWND        parent;
-} ECWWindows;
-
-static BOOL CALLBACK MyEnumWindowsProc(HWND hwnd, LPARAM lParam)
-{
-  ECWWindows *myParams = (ECWWindows*) lParam;
-  
-  if (IsChild(myParams->parent, hwnd))
-  {
-    return myParams->func(hwnd, myParams->params);
-  }
-  return TRUE;
-}
-
-BOOL nsWindowCE::EnumChildWindows(HWND inParent, WNDENUMPROC inFunc, LPARAM inParam)
-{
-  ECWWindows myParams;
-  myParams.params = inParam;
-  myParams.func   = inFunc;
-  myParams.parent = inParent;
-  
-  return EnumWindows(MyEnumWindowsProc, (LPARAM) &myParams);
-}
-
-/**************************************************************
- **************************************************************
- **
- ** BLOCK: nsIWidget impl.
- **
- ** CE specifric nsIWidget impl. and associated helper methods
- ** used by nsWindow.
- **
- **************************************************************
- **************************************************************/
-
-/**************************************************************
- *
- * SECTION: Window styles utilities
- *
- * Return the proper windows styles and extended styles.
- *
- **************************************************************/
-
-// Return nsWindow styles
-DWORD nsWindow::WindowStyle()
-{
-  DWORD style;
-
-  /* On Windows Mobile, we want very simple window styles; this is
-   * just optimizing for full-screen apps that don't want any
-   * titlebar/etc.  UI.  We should probably allow apps some
-   * finer-grained control over these types at some point, but for now
-   * this will work fine.  If we're on Windows CE, we probably have a
-   * full window manager, so we make dialog/toplevel windows be real
-   * windows.  In addition, we do the post-processing on the style
-   * (e.g. disabling the thick resize window if we don't have resize
-   * handles specified in the style).
-   */
-
-  /* Note: On Windows CE (and presumably Mobile), WS_OVERLAPPED provides
-   * space for a menu bar in the window, which we don't want; it shouldn't
-   * be used. */
-
-  /* on CE, WS_OVERLAPPED == WS_BORDER | WS_CAPTION, so don't use OVERLAPPED, just set the
-   * separate bits directly for clarity */
-  switch (mWindowType) {
-    case eWindowType_plugin:
-    case eWindowType_child:
-      style = WS_CHILD;
-      break;
-
-    case eWindowType_dialog:
-      style = WS_BORDER | WS_POPUP;
-#if !defined(WINCE_WINDOWS_MOBILE)
-      style |= WS_SYSMENU;
-      if (mBorderStyle != eBorderStyle_default)
-        style |= WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
-#endif
-      break;
-
-    case eWindowType_popup:
-      style = WS_POPUP;
-      break;
-
-    default:
-      NS_ERROR("unknown border style");
-      // fall through
-
-    case eWindowType_toplevel:
-    case eWindowType_invisible:
-      style = WS_BORDER;
-#if !defined(WINCE_WINDOWS_MOBILE)
-      style |= WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
-#endif
-      break;
-  }
-
-#ifndef WINCE_WINDOWS_MOBILE
-  if (mBorderStyle != eBorderStyle_default && mBorderStyle != eBorderStyle_all) {
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_border))
-      style &= ~WS_BORDER;
-
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_title)) {
-      style &= ~WS_DLGFRAME;
-      style |= WS_POPUP;
-      style &= ~WS_CHILD;
-    }
-
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_close))
-      style &= ~0;
-    // XXX The close box can only be removed by changing the window class,
-    // as far as I know   --- roc+moz@cs.cmu.edu
-
-    if (mBorderStyle == eBorderStyle_none ||
-      !(mBorderStyle & (eBorderStyle_menu | eBorderStyle_close)))
-      style &= ~WS_SYSMENU;
-    // Looks like getting rid of the system menu also does away with the
-    // close box. So, we only get rid of the system menu if you want neither it
-    // nor the close box. How does the Windows "Dialog" window class get just
-    // closebox and no sysmenu? Who knows.
-
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_resizeh))
-      style &= ~WS_THICKFRAME;
-
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_minimize))
-      style &= ~WS_MINIMIZEBOX;
-
-    if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_maximize))
-      style &= ~WS_MAXIMIZEBOX;
-  }
-#endif // #ifndef WINCE_WINDOWS_MOBILE
-
-  VERIFY_WINDOW_STYLE(style);
-  return style;
-}
-
-/**************************************************************
- *
- * SECTION: nsIWidget::SetSizeMode
- *
- * Z-order, positioning, restore, minimize, and maximize.
- *
- **************************************************************/
-
-// Maximize, minimize or restore the window.
-NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode)
-{
-#if defined(WINCE_HAVE_SOFTKB)
-  if (aMode == 0 && mSizeMode == 3  && nsWindowCE::sSIPInTransition) {
-      // ignore the size mode being set to normal by the SIP resizing us
-    return NS_OK;
-  }
-#endif
-  nsresult rv;
-
-  // Let's not try and do anything if we're already in that state.
-  // (This is needed to prevent problems when calling window.minimize(), which
-  // calls us directly, and then the OS triggers another call to us.)
-  if (aMode == mSizeMode)
-    return NS_OK;
-
-#ifdef WINCE_WINDOWS_MOBILE
-  // on windows mobile, dialogs and top level windows are full screen
-  // This is partly due to the lack of a GetWindowPlacement.
-  if (mWindowType == eWindowType_dialog || mWindowType == eWindowType_toplevel) {
-    if (aMode == nsSizeMode_Normal)
-      aMode = nsSizeMode_Maximized;
-  }
-
-  // also on windows mobile, we never minimize.
-  if (aMode == nsSizeMode_Minimized)
-    return NS_OK;
-#endif
-
-  // save the requested state
-  rv = nsBaseWidget::SetSizeMode(aMode);
-  if (NS_SUCCEEDED(rv) && mIsVisible) {
-    int mode;
-
-    switch (aMode) {
-      case nsSizeMode_Fullscreen :
-      case nsSizeMode_Maximized :
-        mode = SW_MAXIMIZE;
-        break;
-      default :
-        mode = SW_RESTORE;
-    }
-    ::ShowWindow(mWnd, mode);
-  }
-  return rv;
-}
-
-/**************************************************************
- *
- * SECTION: nsIWidget::EnableDragDrop
- *
- * Enables/Disables drag and drop of files on this widget.
- *
- **************************************************************/
-
-NS_METHOD nsWindow::EnableDragDrop(PRBool aEnable)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/**************************************************************
- **************************************************************
- **
- ** BLOCK: Native message handling
- **
- ** Main Windows message handlers and OnXXX handlers for
- ** windowing events.
- **
- **************************************************************
- **************************************************************/
-
-/**************************************************************
- *
- * SECTION: OnXXX message handlers
- *
- * For message handlers that need to be broken out or
- * implemented in specific win platform code.
- *
- **************************************************************/
-
-// This needs to move into nsIDOMKeyEvent.idl && nsGUIEvent.h
-PRBool nsWindow::OnHotKey(WPARAM wParam, LPARAM lParam)
-{
-  // SmartPhones has a one or two menu buttons at the
-  // bottom of the screen.  They are dispatched via a
-  // menu resource, rather then a hotkey.  To make
-  // this look consistent, we have mapped this menu to
-  // fire hotkey events.  See
-  // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/win_ce/html/pwc_TheBackButtonandOtherInterestingButtons.asp
-  
-  if (VK_TSOFT1 == HIWORD(lParam) && (0 != (MOD_KEYUP & LOWORD(lParam))))
-  {
-    keybd_event(VK_F19, 0, 0, 0);
-    keybd_event(VK_F19, 0, KEYEVENTF_KEYUP, 0);
-    return PR_FALSE;
-  }
-  
-  if (VK_TSOFT2 == HIWORD(lParam) && (0 != (MOD_KEYUP & LOWORD(lParam))))
-  {
-    keybd_event(VK_F20, 0, 0, 0);
-    keybd_event(VK_F20, 0, KEYEVENTF_KEYUP, 0);
-    return PR_FALSE;
-  }
-  
-  if (VK_TBACK == HIWORD(lParam) && (0 != (MOD_KEYUP & LOWORD(lParam))))
-  {
-    keybd_event(VK_BACK, 0, 0, 0);
-    keybd_event(VK_BACK, 0, KEYEVENTF_KEYUP, 0);
-    return PR_FALSE;
-  }
-
-  switch (wParam) 
-  {
-    case VK_APP1:
-      keybd_event(VK_F1, 0, 0, 0);
-      keybd_event(VK_F1, 0, KEYEVENTF_KEYUP, 0);
-      break;
-
-    case VK_APP2:
-      keybd_event(VK_F2, 0, 0, 0);
-      keybd_event(VK_F2, 0, KEYEVENTF_KEYUP, 0);
-      break;
-
-    case VK_APP3:
-      keybd_event(VK_F3, 0, 0, 0);
-      keybd_event(VK_F3, 0, KEYEVENTF_KEYUP, 0);
-      break;
-
-    case VK_APP4:
-      keybd_event(VK_F4, 0, 0, 0);
-      keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0);
-      break;
-
-    case VK_APP5:
-      keybd_event(VK_F5, 0, 0, 0);
-      keybd_event(VK_F5, 0, KEYEVENTF_KEYUP, 0);
-      break;
-
-    case VK_APP6:
-      keybd_event(VK_F6, 0, 0, 0);
-      keybd_event(VK_F6, 0, KEYEVENTF_KEYUP, 0);
-      break;
-  }
-  return PR_FALSE;
-}
-
-void nsWindow::OnWindowPosChanged(WINDOWPOS *wp, PRBool& result)
-{
-  if (wp == nsnull)
-    return;
-
-  // We only care about a resize, so filter out things like z-order
-  // changes. Note: there's a WM_MOVE handler above which is why we're
-  // not handling them here...
-  if (0 == (wp->flags & SWP_NOSIZE)) {
-    RECT r;
-    PRInt32 newWidth, newHeight;
-
-    ::GetWindowRect(mWnd, &r);
-
-    newWidth  = r.right - r.left;
-    newHeight = r.bottom - r.top;
-    nsIntRect rect(wp->x, wp->y, newWidth, newHeight);
-
-    if (newWidth > mLastSize.width)
-    {
-      RECT drect;
-
-      // getting wider
-      drect.left   = wp->x + mLastSize.width;
-      drect.top    = wp->y;
-      drect.right  = drect.left + (newWidth - mLastSize.width);
-      drect.bottom = drect.top + newHeight;
-
-      ::RedrawWindow(mWnd, &drect, NULL,
-                     RDW_INVALIDATE |
-                     RDW_NOERASE |
-                     RDW_NOINTERNALPAINT |
-                     RDW_ERASENOW |
-                     RDW_ALLCHILDREN);
-    }
-    if (newHeight > mLastSize.height)
-    {
-      RECT drect;
-
-      // getting taller
-      drect.left   = wp->x;
-      drect.top    = wp->y + mLastSize.height;
-      drect.right  = drect.left + newWidth;
-      drect.bottom = drect.top + (newHeight - mLastSize.height);
-
-      ::RedrawWindow(mWnd, &drect, NULL,
-                     RDW_INVALIDATE |
-                     RDW_NOERASE |
-                     RDW_NOINTERNALPAINT |
-                     RDW_ERASENOW |
-                     RDW_ALLCHILDREN);
-    }
-
-    mBounds.width    = newWidth;
-    mBounds.height   = newHeight;
-    mLastSize.width  = newWidth;
-    mLastSize.height = newHeight;
-
-    // If we're being minimized, don't send the resize event to Gecko because
-    // it will cause the scrollbar in the content area to go away and we'll
-    // forget the scroll position of the page.  Note that we need to check the
-    // toplevel window, because child windows seem to go to 0x0 on minimize.
-    HWND toplevelWnd = GetTopLevelHWND(mWnd);
-    if (mWnd == toplevelWnd && IsIconic(toplevelWnd)) {
-      result = PR_FALSE;
-      return;
-    }
-
-    // recalculate the width and height
-    // this time based on the client area
-    if (::GetClientRect(mWnd, &r)) {
-      rect.width  = PRInt32(r.right - r.left);
-      rect.height = PRInt32(r.bottom - r.top);
-    }
-    result = OnResize(rect);
-  }
-
-  // handle size mode changes - (the framechanged message seems a handy
-  // place to hook in, because it happens early enough (WM_SIZE is too
-  // late) and because in testing it seems an accurate harbinger of an
-  // impending min/max/restore change (WM_NCCALCSIZE would also work,
-  // but it's also sent when merely resizing.))
-  if (wp->flags & SWP_FRAMECHANGED && ::IsWindowVisible(mWnd)) {
-    nsSizeModeEvent event(PR_TRUE, NS_SIZEMODE, this);
-    event.mSizeMode = mSizeMode;
-    InitEvent(event);
-    result = DispatchWindowEvent(&event);
-  }
-}
diff --git a/widget/src/windows/nsWindowCE.h b/widget/src/windows/nsWindowCE.h
deleted file mode 100644
index 3c9dbe8e44cd..000000000000
--- a/widget/src/windows/nsWindowCE.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsWindow.h"
-
-#ifndef WindowCE_h__
-#define WindowCE_h__
-
-/*
- * nsWindowCE - Windows CE specific code related to nsWindow. 
- */
-
-#ifdef WINCE
-
-#include "aygshell.h"
-#include "imm.h"
-#ifdef WINCE_WINDOWS_MOBILE
-#define WINCE_HAVE_SOFTKB
-#include "tpcshell.h"
-#else
-#undef WINCE_HAVE_SOFTKB
-#include "winuserm.h"
-#endif
-
-#define IDI_APPLICATION         MAKEINTRESOURCE(32512)
-
-#define SetWindowLongPtrA       SetWindowLongW
-#define SetWindowLongPtrW       SetWindowLongW
-#define GetWindowLongPtrW       GetWindowLongW
-#define GWLP_WNDPROC            GWL_WNDPROC
-#define GetPropW                GetProp
-#define SetPropW                SetProp
-#define RemovePropW             RemoveProp
-
-#define MapVirtualKeyEx(a,b,c)  MapVirtualKey(a,b)
-
-#ifndef WINCE_WINDOWS_MOBILE
-// Aliases to make nsFilePicker work.
-#define BROWSEINFOW             BROWSEINFO
-#define BFFM_SETSELECTIONW      BFFM_SETSELECTION
-#define SHBrowseForFolderW(a)   SHBrowseForFolder(a)
-#endif
-
-// No-ops for nonexistent ce global apis.
-inline void FlashWindow(HWND window, BOOL ignore){}
-inline BOOL IsIconic(HWND inWnd){return false;}
-
-class nsWindowCE {
-public:
-  static BOOL EnumChildWindows(HWND inParent, WNDENUMPROC inFunc, LPARAM inParam);
-
-#if defined(WINCE_HAVE_SOFTKB)
-  static void ToggleSoftKB(HWND wnd, PRBool show);
-  static void CreateSoftKeyMenuBar(HWND wnd);
-  static void OnSoftKbSettingsChange(HWND wnd, LPRECT = NULL);
-  static PRBool sSIPInTransition;
-  static TriStateBool sShowSIPButton;
-  static void CheckKeyboardStatus();
-  static TriStateBool GetSliderStateOpen();
-  static void ResetSoftKB(HWND wnd);
-protected:
-  static PRBool sMenuBarShown;
-  static HWND sSoftKeyMenuBarHandle;
-private:
-  static TriStateBool sHardKBPresence;
-  static RECT sDefaultSIPRect;
-  static HWND sMainWindowHandle;
-#endif
-  friend class nsWindow;
-};
-
-#endif /* WINCE */
-
-#endif /* WindowCE_h__ */

From 95e0b881112f7c9b5e0725cf7de2abd8aa7643de Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 24 Apr 2011 20:10:12 -0700
Subject: [PATCH 443/509] Bug 473687 - Remove widget WinCE support: Part B
 (Main ifdef removal); r=dougt

---
 widget/src/build/Makefile.in                  |   9 +-
 widget/src/build/nsWinWidgetFactory.cpp       |  15 +-
 widget/src/build/widget.rc                    |   6 -
 widget/src/windows/Makefile.in                |  11 -
 widget/src/windows/nsAppShell.cpp             |  16 -
 widget/src/windows/nsDeviceContextSpecWin.cpp |  20 -
 widget/src/windows/nsFilePicker.cpp           |  24 -
 widget/src/windows/nsIMM32Handler.cpp         |  23 -
 widget/src/windows/nsIMM32Handler.h           |   4 -
 widget/src/windows/nsIdleServiceWin.cpp       |  10 -
 widget/src/windows/nsLookAndFeel.cpp          |  48 --
 widget/src/windows/nsNativeThemeWin.cpp       |  85 +---
 widget/src/windows/nsScreenWin.cpp            |  19 -
 widget/src/windows/nsToolkit.cpp              |  18 +-
 widget/src/windows/nsWinGesture.cpp           |   4 -
 widget/src/windows/nsWindow.cpp               | 479 +-----------------
 widget/src/windows/nsWindow.h                 |  25 +-
 widget/src/windows/nsWindowDefs.h             |  13 -
 widget/src/windows/nsWindowGfx.cpp            |  46 +-
 .../xpwidgets/nsClipboardPrivacyHandler.cpp   |   4 +-
 widget/tests/Makefile.in                      |   2 -
 21 files changed, 32 insertions(+), 849 deletions(-)

diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in
index df60368f7b68..7ac18251f1ae 100644
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -63,14 +63,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../windows \
 		$(NULL)
 
-OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32)
-
-ifneq ($(OS_ARCH), WINCE)
-OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
-else
-OS_LIBS += $(call EXPAND_LIBNAME, aygshell ddraw)
-EXTRA_DSO_LDOPTS += $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib
-endif
+OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32 comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
 
 SHARED_LIBRARY_LIBS = \
 		../windows/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
diff --git a/widget/src/build/nsWinWidgetFactory.cpp b/widget/src/build/nsWinWidgetFactory.cpp
index f48eabd2a053..fdfec14b5813 100644
--- a/widget/src/build/nsWinWidgetFactory.cpp
+++ b/widget/src/build/nsWinWidgetFactory.cpp
@@ -63,13 +63,9 @@
 
 #include "nsClipboardHelper.h"
 
-#ifdef WINCE
-#include "nsClipboardCE.h"
-#else
 #include "nsClipboard.h"
 #include "nsBidiKeyboard.h"
 #include "nsDragService.h"
-#endif
 #include "nsTransferable.h"
 #include "nsHTMLFormatConverter.h"
 
@@ -110,10 +106,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init);
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
-#ifndef WINCE
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
-#endif
 
 #ifdef NS_PRINTING
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsWin, Init)
@@ -137,7 +131,7 @@ NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID);
 NS_DEFINE_NAMED_CID(NS_SOUND_CID);
 NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
-#ifndef WINCE
+
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
 NS_DEFINE_NAMED_CID(NS_WIN_TASKBAR_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTBUILDER_CID);
@@ -146,9 +140,10 @@ NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID);
 NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID);
 #endif
+
 NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID);
-#endif
+
 #ifdef NS_PRINTING
 NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
@@ -173,7 +168,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
   { &kNS_SOUND_CID, false, NULL, nsSoundConstructor },
   { &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
   { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
-#ifndef WINCE
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   { &kNS_WIN_TASKBAR_CID, false, NULL, WinTaskbarConstructor },
   { &kNS_WIN_JUMPLISTBUILDER_CID, false, NULL, JumpListBuilderConstructor },
@@ -184,7 +178,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
 #endif
   { &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor },
   { &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor },
-#endif
 #ifdef NS_PRINTING
   { &kNS_PRINTSETTINGSSERVICE_CID, false, NULL, nsPrintOptionsWinConstructor },
   { &kNS_PRINTER_ENUMERATOR_CID, false, NULL, nsPrinterEnumeratorWinConstructor },
@@ -210,7 +203,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
   { "@mozilla.org/sound;1", &kNS_SOUND_CID },
   { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
   { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
-#ifndef WINCE
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   { "@mozilla.org/windows-taskbar;1", &kNS_WIN_TASKBAR_CID },
   { "@mozilla.org/windows-jumplistbuilder;1", &kNS_WIN_JUMPLISTBUILDER_CID },
@@ -221,7 +213,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
 #endif
   { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID },
   { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID },
-#endif
 #ifdef NS_PRINTING
   { "@mozilla.org/gfx/printsettings-service;1", &kNS_PRINTSETTINGSSERVICE_CID },
   { "@mozilla.org/gfx/printerenumerator;1", &kNS_PRINTER_ENUMERATOR_CID },
diff --git a/widget/src/build/widget.rc b/widget/src/build/widget.rc
index 47930d4f6acf..efa88bb27300 100644
--- a/widget/src/build/widget.rc
+++ b/widget/src/build/widget.rc
@@ -37,13 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "resource.h"
-#ifdef WINCE
-#include "winuser.h"
-#include "aygshell.h"
-#define DS_CONTEXTHELP 0
-#else
 #include <winresrc.h>
-#endif
 #include <dlgs.h>
 
 IDC_GRAB                CURSOR  DISCARDABLE     "res/grab.cur"
diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in
index ba09e342de5b..2e2ce57d958d 100644
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -87,12 +87,6 @@ CPPSRCS		+= \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH), WINCE)
-CPPSRCS += \
-	nsWindowCE.cpp \
-	nsClipboardCE.cpp \
-	$(NULL)
-else
 CPPSRCS += \
 	KeyboardLayout.cpp \
 	IEnumFE.cpp  \
@@ -108,7 +102,6 @@ CPPSRCS += \
 ifdef NS_ENABLE_TSF
 CPPSRCS		+= nsTextStore.cpp
 endif
-endif
 
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE 
@@ -138,10 +131,6 @@ LOCAL_INCLUDES	= \
 
 FORCE_STATIC_LIB = 1
 
-ifdef WINCE
-EXTRA_DSO_LDOPTS += ddraw.lib
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/src/windows/nsAppShell.cpp b/widget/src/windows/nsAppShell.cpp
index 8417864e80df..082e96e61880 100644
--- a/widget/src/windows/nsAppShell.cpp
+++ b/widget/src/windows/nsAppShell.cpp
@@ -52,22 +52,6 @@
 const PRUnichar* kAppShellEventId = L"nsAppShell:EventID";
 const PRUnichar* kTaskbarButtonEventId = L"TaskbarButtonCreated";
 
-#ifdef WINCE
-BOOL WaitMessage(VOID)
-{
-  BOOL retval = TRUE;
-  
-  HANDLE hThread = GetCurrentThread();
-  DWORD waitRes = MsgWaitForMultipleObjectsEx(1, &hThread, INFINITE, QS_ALLEVENTS, 0);
-  if((DWORD)-1 == waitRes)
-  {
-    retval = FALSE;
-  }
-  
-  return retval;
-}
-#endif
-
 static UINT sMsgId;
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
diff --git a/widget/src/windows/nsDeviceContextSpecWin.cpp b/widget/src/windows/nsDeviceContextSpecWin.cpp
index 784ac0196e55..5dbb78d1b467 100644
--- a/widget/src/windows/nsDeviceContextSpecWin.cpp
+++ b/widget/src/windows/nsDeviceContextSpecWin.cpp
@@ -38,9 +38,7 @@
 #include "nsDeviceContextSpecWin.h"
 #include "prmem.h"
 
-#ifndef WINCE
 #include <winspool.h>
-#endif
 
 #include <tchar.h>
 
@@ -132,7 +130,6 @@ const NativePaperSizes kPaperSizes[] = {
   {DMPAPER_A4,        210.0, 297.0, PR_FALSE},
   {DMPAPER_B4,        250.0, 354.0, PR_FALSE}, 
   {DMPAPER_B5,        182.0, 257.0, PR_FALSE},
-#ifndef WINCE
   {DMPAPER_TABLOID,   11.0,  17.0,  PR_TRUE},
   {DMPAPER_LEDGER,    17.0,  11.0,  PR_TRUE},
   {DMPAPER_STATEMENT, 5.5,   8.5,   PR_TRUE},
@@ -169,7 +166,6 @@ const NativePaperSizes kPaperSizes[] = {
   {DMPAPER_FANFOLD_US,   14.875, 11.0, PR_TRUE},  
   {DMPAPER_FANFOLD_STD_GERMAN, 8.5, 12.0, PR_TRUE},  
   {DMPAPER_FANFOLD_LGL_GERMAN, 8.5, 13.0, PR_TRUE},  
-#endif // WINCE
 };
 const PRInt32 kNumPaperSizes = 41;
 
@@ -218,9 +214,6 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters()
 static nsresult 
 EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, PRBool& aIsFound, PRBool& aIsFile)
 {
-#ifdef WINCE
-  aIsFound = PR_FALSE;
-#else
   DWORD             dwSizeNeeded = 0;
   DWORD             dwNumItems   = 0;
   LPPRINTER_INFO_2W  lpInfo        = NULL;
@@ -252,7 +245,6 @@ EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, PRBool& aIsFo
   }
 
   free(lpInfo);
-#endif
   return NS_OK;
 }
 
@@ -262,7 +254,6 @@ CheckForPrintToFileWithName(LPWSTR aPrinterName, PRBool& aIsFile)
 {
   PRBool isFound = PR_FALSE;
   aIsFile = PR_FALSE;
-#ifndef WINCE
   nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile);
   if (isFound) return;
 
@@ -274,7 +265,6 @@ CheckForPrintToFileWithName(LPWSTR aPrinterName, PRBool& aIsFile)
 
   rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile);
   if (isFound) return;
-#endif
 }
 
 static nsresult 
@@ -682,9 +672,6 @@ SetupDevModeFromSettings(LPDEVMODEW aDevMode, nsIPrintSettings* aPrintSettings)
 nsresult
 nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSettings* aPS)
 {
-#ifdef WINCE 
-  return NS_ERROR_NOT_IMPLEMENTED;
-#else
   nsresult rv = NS_ERROR_FAILURE;
 
   if (!GlobalPrinters::GetInstance()->PrintersAreAllocated()) {
@@ -749,7 +736,6 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
     DISPLAY_LAST_ERROR
   }
   return rv;
-#endif // WINCE
 }
 
 //----------------------------------------------------------------------------------
@@ -974,7 +960,6 @@ nsresult
 GlobalPrinters::EnumerateNativePrinters()
 {
   nsresult rv = NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE;
-#ifndef WINCE
   PR_PL(("-----------------------\n"));
   PR_PL(("EnumerateNativePrinters\n"));
 
@@ -1000,7 +985,6 @@ GlobalPrinters::EnumerateNativePrinters()
     rv = NS_OK;
   }
   PR_PL(("-----------------------\n"));
-#endif
   return rv;
 }
 
@@ -1009,7 +993,6 @@ GlobalPrinters::EnumerateNativePrinters()
 void 
 GlobalPrinters::GetDefaultPrinterName(nsString& aDefaultPrinterName)
 {
-#ifndef WINCE
   aDefaultPrinterName.Truncate();
   WCHAR szDefaultPrinterName[1024];    
   DWORD status = GetProfileStringW(L"windows", L"device", 0,
@@ -1029,9 +1012,6 @@ GlobalPrinters::GetDefaultPrinterName(nsString& aDefaultPrinterName)
   }
 
   PR_PL(("DEFAULT PRINTER [%s]\n", aDefaultPrinterName.get()));
-#else
-  aDefaultPrinterName = NS_LITERAL_STRING("UNKNOWN");
-#endif
 }
 
 //----------------------------------------------------------------------------------
diff --git a/widget/src/windows/nsFilePicker.cpp b/widget/src/windows/nsFilePicker.cpp
index 6a458f4de249..653c1b891fc6 100644
--- a/widget/src/windows/nsFilePicker.cpp
+++ b/widget/src/windows/nsFilePicker.cpp
@@ -57,9 +57,7 @@
 
 // commdlg.h and cderr.h are needed to build with WIN32_LEAN_AND_MEAN
 #include <commdlg.h>
-#ifndef WINCE
 #include <cderr.h>
-#endif
 
 #include "nsString.h"
 #include "nsToolkit.h"
@@ -100,7 +98,6 @@ nsFilePicker::~nsFilePicker()
 //
 //-------------------------------------------------------------------------
 
-#ifndef WINCE_WINDOWS_MOBILE
 int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
 {
   if (uMsg == BFFM_INITIALIZED)
@@ -113,7 +110,6 @@ int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpDa
   }
   return 0;
 }
-#endif
 
 NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
 {
@@ -144,8 +140,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
 
   mUnicodeFile.Truncate();
 
-#ifndef WINCE_WINDOWS_MOBILE
-
   if (mMode == modeGetFolder) {
     PRUnichar dirBuffer[MAX_PATH+1];
     wcsncpy(dirBuffer, initialDir.get(), MAX_PATH);
@@ -183,7 +177,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
     }
   }
   else 
-#endif // WINCE_WINDOWS_MOBILE
   {
 
     OPENFILENAMEW ofn;
@@ -198,12 +191,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
     ofn.lpstrTitle   = (LPCWSTR)mTitle.get();
     ofn.lpstrFilter  = (LPCWSTR)filterBuffer.get();
     ofn.nFilterIndex = mSelectedType;
-#ifdef WINCE_WINDOWS_MOBILE
-    // If we're running fullscreen the dialog inherits that, which is bad
-    ofn.hwndOwner    = (HWND) 0;
-#else
     ofn.hwndOwner    = (HWND) (mParentWidget.get() ? mParentWidget->GetNativeData(NS_NATIVE_TMP_WINDOW) : 0); 
-#endif
     ofn.lpstrFile    = fileBuffer;
     ofn.nMaxFile     = FILE_BUFFER_SIZE;
 
@@ -235,9 +223,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
       }
     }
 
-#ifndef WINCE
     MOZ_SEH_TRY {
-#endif
       if (mMode == modeOpen) {
         // FILE MUST EXIST!
         ofn.Flags |= OFN_FILEMUSTEXIST;
@@ -264,9 +250,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
         if (!result) {
           // Error, find out what kind.
           if (::GetLastError() == ERROR_INVALID_PARAMETER 
-#ifndef WINCE
               || ::CommDlgExtendedError() == FNERR_INVALIDFILENAME
-#endif
               ) {
             // probably the default file name is too long or contains illegal characters!
             // Try again, without a starting file name.
@@ -275,16 +259,9 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
           }
         }
       } 
-#ifdef WINCE_WINDOWS_MOBILE
-      else if (mMode == modeGetFolder) {
-        ofn.Flags = OFN_PROJECT | OFN_FILEMUSTEXIST;
-        result = ::GetOpenFileNameW(&ofn);
-      }
-#endif
       else {
         NS_ERROR("unsupported mode"); 
       }
-#ifndef WINCE
     }
     MOZ_SEH_EXCEPT(PR_TRUE) {
       MessageBoxW(ofn.hwndOwner,
@@ -293,7 +270,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
                   MB_ICONERROR);
       result = PR_FALSE;
     }
-#endif
 
     if (result) {
       // Remember what filter type the user selected
diff --git a/widget/src/windows/nsIMM32Handler.cpp b/widget/src/windows/nsIMM32Handler.cpp
index e002cb04957e..e9a04c868d73 100644
--- a/widget/src/windows/nsIMM32Handler.cpp
+++ b/widget/src/windows/nsIMM32Handler.cpp
@@ -92,10 +92,8 @@ PRPackedBool nsIMM32Handler::sIsStatusChanged = PR_FALSE;
 PRPackedBool nsIMM32Handler::sIsIME = PR_TRUE;
 PRPackedBool nsIMM32Handler::sIsIMEOpening = PR_FALSE;
 
-#ifndef WINCE
 UINT nsIMM32Handler::sCodePage = 0;
 DWORD nsIMM32Handler::sIMEProperty = 0;
-#endif
 
 /* static */ void
 nsIMM32Handler::EnsureHandlerInstance()
@@ -197,22 +195,16 @@ nsIMM32Handler::IsDoingKakuteiUndo(HWND aWnd)
 /* static */ PRBool
 nsIMM32Handler::ShouldDrawCompositionStringOurselves()
 {
-#ifdef WINCE
-  // We are not sure we should use native IME behavior...
-  return PR_TRUE;
-#else
   // If current IME has special UI or its composition window should not
   // positioned to caret position, we should now draw composition string
   // ourselves.
   return !(sIMEProperty & IME_PROP_SPECIAL_UI) &&
           (sIMEProperty & IME_PROP_AT_CARET);
-#endif
 }
 
 /* static */ void
 nsIMM32Handler::InitKeyboardLayout(HKL aKeyboardLayout)
 {
-#ifndef WINCE
   WORD langID = LOWORD(aKeyboardLayout);
   ::GetLocaleInfoW(MAKELCID(langID, SORT_DEFAULT),
                    LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
@@ -222,32 +214,23 @@ nsIMM32Handler::InitKeyboardLayout(HKL aKeyboardLayout)
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: InitKeyboardLayout, aKeyboardLayout=%08x, sCodePage=%lu, sIMEProperty=%08x sIsIME=%s\n",
      aKeyboardLayout, sCodePage, sIMEProperty, sIsIME ? "TRUE" : "FALSE"));
-#endif
 }
 
 /* static */ UINT
 nsIMM32Handler::GetKeyboardCodePage()
 {
-#ifdef WINCE
-  return ::GetACP();
-#else
   return sCodePage;
-#endif
 }
 
 /* static */ PRBool
 nsIMM32Handler::CanOptimizeKeyAndIMEMessages(MSG *aNextKeyOrIMEMessage)
 {
-#ifdef WINCE
-  return PR_TRUE;
-#else
   // If IME is opening right now, we shouldn't optimize the key and IME message
   // order because ATOK (Japanese IME of third party) has some problem with the
   // optimization.  When it finishes opening completely, it eats all key
   // messages in the message queue.  And it causes starting composition.  So,
   // we shouldn't eat the key messages before ATOK.
   return !sIsIMEOpening;
-#endif
 }
 
 
@@ -1189,7 +1172,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
     nsresult rv = EnsureClauseArray(clauseArrayLength);
     NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
-#ifndef WINCE
     // Intelligent ABC IME (Simplified Chinese IME, the code page is 936)
     // will crash in ImmGetCompositionStringW for GCS_COMPCLAUSE (bug 424663).
     // See comment 35 of the bug for the detail. Therefore, we should use A
@@ -1199,15 +1181,12 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
     PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, GCS_COMPCLAUSE, useA_API=%s\n",
        useA_API ? "TRUE" : "FALSE"));
-#endif
 
     long clauseArrayLength2 = 
-#ifndef WINCE
       useA_API ?
         ::ImmGetCompositionStringA(aIMEContext.get(), GCS_COMPCLAUSE,
                                    mClauseArray.Elements(),
                                    mClauseArray.Capacity() * sizeof(PRUint32)) :
-#endif
         ::ImmGetCompositionStringW(aIMEContext.get(), GCS_COMPCLAUSE,
                                    mClauseArray.Elements(),
                                    mClauseArray.Capacity() * sizeof(PRUint32));
@@ -1221,7 +1200,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
         clauseArrayLength = clauseArrayLength2;
     }
 
-#ifndef WINCE
     if (useA_API) {
       // Convert each values of sIMECompClauseArray. The values mean offset of
       // the clauses in ANSI string. But we need the values in Unicode string.
@@ -1239,7 +1217,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
         }
       }
     }
-#endif
   }
   // compClauseArrayLength may be negative. I.e., ImmGetCompositionStringW
   // may return an error code.
diff --git a/widget/src/windows/nsIMM32Handler.h b/widget/src/windows/nsIMM32Handler.h
index d28b32c8ef4a..4b3ce5a2bc6e 100644
--- a/widget/src/windows/nsIMM32Handler.h
+++ b/widget/src/windows/nsIMM32Handler.h
@@ -57,9 +57,7 @@ class nsIWidget;
 class nsWindow;
 struct nsIntRect;
 
-#ifndef WINCE
 #define ENABLE_IME_MOUSE_HANDLING 1
-#endif // WINCE
 
 #define NS_WM_IMEFIRST WM_IME_SETCONTEXT
 #define NS_WM_IMELAST  WM_IME_KEYUP
@@ -334,10 +332,8 @@ protected:
   static PRPackedBool sIsIME;
   static PRPackedBool sIsIMEOpening;
 
-#ifndef WINCE
   static UINT sCodePage;
   static DWORD sIMEProperty;
-#endif // #ifndef WINCE
 };
 
 #endif // nsIMM32Handler_h__
diff --git a/widget/src/windows/nsIdleServiceWin.cpp b/widget/src/windows/nsIdleServiceWin.cpp
index 122285ee598d..a5d4808c364c 100644
--- a/widget/src/windows/nsIdleServiceWin.cpp
+++ b/widget/src/windows/nsIdleServiceWin.cpp
@@ -46,7 +46,6 @@ NS_IMPL_ISUPPORTS2(nsIdleServiceWin, nsIIdleService, nsIdleService)
 bool
 nsIdleServiceWin::PollIdleTime(PRUint32 *aIdleTime)
 {
-#ifndef WINCE
     LASTINPUTINFO inputInfo;
     inputInfo.cbSize = sizeof(inputInfo);
     if (!::GetLastInputInfo(&inputInfo))
@@ -55,19 +54,10 @@ nsIdleServiceWin::PollIdleTime(PRUint32 *aIdleTime)
     *aIdleTime = SAFE_COMPARE_EVEN_WITH_WRAPPING(GetTickCount(), inputInfo.dwTime);
 
     return true;
-#else
-    // On WinCE we don't pull the idle time from the system.
-    return false;
-#endif
 }
 
 bool
 nsIdleServiceWin::UsePollMode()
 {
-#ifndef WINCE
     return true;
-#else
-    // On WinCE we don't pull the idle time from the system.
-    return false;
-#endif
 }
diff --git a/widget/src/windows/nsLookAndFeel.cpp b/widget/src/windows/nsLookAndFeel.cpp
index 3a59864efa66..e18a3ec3f1cf 100644
--- a/widget/src/windows/nsLookAndFeel.cpp
+++ b/widget/src/windows/nsLookAndFeel.cpp
@@ -45,8 +45,6 @@
 #include <shellapi.h>
 #include "nsWindow.h"
 #include "nsStyleConsts.h"
-
-#ifndef WINCE
 #include "nsUXThemeData.h"
 #include "nsUXThemeConstants.h"
 
@@ -69,7 +67,6 @@ static nsresult GetColorFromTheme(nsUXThemeClass cls,
   }
   return NS_ERROR_FAILURE;
 }
-#endif
 
 static PRInt32 GetSystemParam(long flag, PRInt32 def)
 {
@@ -79,26 +76,22 @@ static PRInt32 GetSystemParam(long flag, PRInt32 def)
 
 nsLookAndFeel::nsLookAndFeel() : nsXPLookAndFeel()
 {
-#ifndef WINCE
   gShell32DLLInst = LoadLibraryW(L"Shell32.dll");
   if (gShell32DLLInst)
   {
       gSHAppBarMessage = (SHAppBarMessagePtr) GetProcAddress(gShell32DLLInst,
                                                              "SHAppBarMessage");
   }
-#endif
 }
 
 nsLookAndFeel::~nsLookAndFeel()
 {
-#ifndef WINCE
    if (gShell32DLLInst)
    {
        FreeLibrary(gShell32DLLInst);
        gShell32DLLInst = NULL;
        gSHAppBarMessage = NULL;
    }
-#endif
 }
 
 nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
@@ -206,7 +199,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
       idx = COLOR_HIGHLIGHT;
       break;
     case eColor__moz_menubarhovertext:
-#ifndef WINCE
       if (!nsUXThemeData::sIsVistaOrLater || !nsUXThemeData::isAppThemed())
       {
         idx = nsUXThemeData::sFlatMenus ?
@@ -214,10 +206,8 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
                 COLOR_MENUTEXT;
         break;
       }
-#endif
       // Fall through
     case eColor__moz_menuhovertext:
-#ifndef WINCE
       if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater)
       {
         res = ::GetColorFromTheme(eUXMenu,
@@ -226,7 +216,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
           return res;
         // fall through to highlight case
       }
-#endif
     case eColor_highlighttext:
     case eColor__moz_html_cellhighlighttext:
       idx = COLOR_HIGHLIGHTTEXT;
@@ -295,19 +284,16 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
       idx = COLOR_3DFACE;
       break;
     case eColor__moz_win_mediatext:
-#ifndef WINCE
       if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater) {
         res = ::GetColorFromTheme(eUXMediaToolbar,
                                   TP_BUTTON, TS_NORMAL, TMT_TEXTCOLOR, aColor);
         if (NS_SUCCEEDED(res))
           return res;
       }
-#endif
       // if we've gotten here just return -moz-dialogtext instead
       idx = COLOR_WINDOWTEXT;
       break;
     case eColor__moz_win_communicationstext:
-#ifndef WINCE
       if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater)
       {
         res = ::GetColorFromTheme(eUXCommunicationsToolbar,
@@ -315,7 +301,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
         if (NS_SUCCEEDED(res))
           return res;
       }
-#endif
       // if we've gotten here just return -moz-dialogtext instead
       idx = COLOR_WINDOWTEXT;
       break;
@@ -330,12 +315,7 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
       idx = COLOR_3DDKSHADOW;
       break;
     case eColor__moz_nativehyperlinktext:
-#ifndef WINCE
       idx = COLOR_HOTLIGHT;
-#else
-      aColor = NS_RGB(0, 0, 0xee);
-      return NS_OK;
-#endif
       break;
     default:
       idx = COLOR_WINDOW;
@@ -373,17 +353,12 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     case eMetric_SubmenuDelay:
         // This will default to the Windows' default
         // (400ms) on error.
-#ifndef WINCE
         aMetric = GetSystemParam(SPI_GETMENUSHOWDELAY, 400);
-#else
-        aMetric = 400;
-#endif
         break;
     case eMetric_MenusCanOverlapOSBar:
         // we want XUL popups to be able to overlap the task bar.
         aMetric = 1;
         break;
-#ifndef WINCE
     case eMetric_DragThresholdX:
         // The system metric is the number of pixels at which a drag should
         // start.  Our look and feel metric is the number of pixels you can
@@ -404,7 +379,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
 
         aMetric = ((contrastThemeInfo.dwFlags & HCF_HIGHCONTRASTON) != 0);
         break;
-#endif
     case eMetric_ScrollArrowStyle:
         aMetric = eMetric_ScrollArrowStyleSingle;
         break;
@@ -427,28 +401,16 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
         aMetric = 3;
         break;
     case eMetric_WindowsClassic:
-#ifndef WINCE
         aMetric = !nsUXThemeData::IsAppThemed();
-#else
-        aMetric = 0;
-#endif
         break;
     case eMetric_TouchEnabled:
         aMetric = 0;
-#ifndef WINCE
         PRInt32 touchCapabilities;
         touchCapabilities = ::GetSystemMetrics(SM_DIGITIZER);
         if ((touchCapabilities & NID_READY) && 
            (touchCapabilities & (NID_EXTERNAL_TOUCH | NID_INTEGRATED_TOUCH))) {
             aMetric = 1;
         }
-#elif defined(WINCE_WINDOWS_MOBILE)
-        WCHAR platformType[MAX_PATH];
-        SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(platformType),
-                             platformType, 0);
-        if (!wcscmp(platformType, L"PocketPC"))
-            aMetric = 1;
-#endif
         break;
     case eMetric_WindowsDefaultTheme:
         aMetric = nsUXThemeData::IsDefaultWindowTheme();
@@ -462,15 +424,10 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
         res = NS_ERROR_NOT_IMPLEMENTED;
         break;
     case eMetric_DWMCompositor:
-#ifndef WINCE
         aMetric = nsUXThemeData::CheckForCompositor();
-#else
-        aMetric = 0;
-#endif
         break;
     case eMetric_AlertNotificationOrigin:
         aMetric = 0;
-#ifndef WINCE
         if (gSHAppBarMessage)
         {
           // Get task bar window handle
@@ -508,7 +465,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
             }
           }
         }
-#endif // WINCE
         break;
     case eMetric_IMERawInputUnderlineStyle:
     case eMetric_IMEConvertedTextUnderlineStyle:
@@ -553,9 +509,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri
 PRUnichar nsLookAndFeel::GetPasswordCharacter()
 {
 #define UNICODE_BLACK_CIRCLE_CHAR 0x25cf
-#ifdef WINCE
-  return UNICODE_BLACK_CIRCLE_CHAR;
-#else
   static PRUnichar passwordCharacter = 0;
   if (!passwordCharacter) {
     passwordCharacter = '*';
@@ -563,7 +516,6 @@ PRUnichar nsLookAndFeel::GetPasswordCharacter()
       passwordCharacter = UNICODE_BLACK_CIRCLE_CHAR;
   }
   return passwordCharacter;
-#endif
 }
 
 #ifdef NS_DEBUG
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index d86a481a8546..4b179a606cd9 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -73,48 +73,6 @@
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsNativeThemeWin, nsNativeTheme, nsITheme)
 
-#ifdef WINCE
-
-/* These functions might or might not be present; FrameRect probably isn't,
- * but GetViewportOrgEx might be -- so #define them to avoid name collisions.
- */
-
-#define FrameRect moz_FrameRect
-#define GetViewportOrgEx moz_GetViewportOrgEx
-
-static int FrameRect(HDC inDC, CONST RECT *inRect, HBRUSH inBrush)
- {
-   HBRUSH oldBrush = (HBRUSH)SelectObject(inDC, inBrush);
-   RECT myRect = *inRect;
-   InflateRect(&myRect, 1, 1); 
-
-   // The width and height of the border are always one
-   // logical unit.
-
-   // move to top-left, and go clockwise.
-   MoveToEx(inDC, myRect.left, myRect.top, (LPPOINT) NULL);
-   // 1 -> 2
-   LineTo(inDC, myRect.right, myRect.top);
-   // 2 -> 3
-   LineTo(inDC, myRect.right, myRect.bottom);
-   // 3 -> 4
-   LineTo(inDC, myRect.left, myRect.bottom);
-   // 4 -> 1
-   LineTo(inDC, myRect.left, myRect.top);
-
-   SelectObject(inDC, oldBrush);
-   return 1;
-}
-
-static BOOL GetViewportOrgEx(HDC hdc, LPPOINT lpPoint)
-{
-  SetViewportOrgEx(hdc, 0, 0, lpPoint);
-  if (lpPoint->x != 0 || lpPoint->y != 0)
-    SetViewportOrgEx(hdc, lpPoint->x, lpPoint->y, NULL);
-  return TRUE;
-}
-#endif
-
 static inline PRBool IsHTMLContent(nsIFrame *frame)
 {
   nsIContent* content = frame->GetContent();
@@ -1470,7 +1428,6 @@ RENDER_AGAIN:
         ::GetViewportOrgEx(hdc, &vpOrg);
         ::SetBrushOrgEx(hdc, vpOrg.x + widgetRect.left, vpOrg.y + widgetRect.top, NULL);
 
-#ifndef WINCE
         // On vista, choose our own colors and draw an XP style half focus rect
         // for focused checkboxes and a full rect when active.
         if (nsUXThemeData::sIsVistaOrLater && aWidgetType == NS_THEME_CHECKBOX) {
@@ -1497,10 +1454,6 @@ RENDER_AGAIN:
           ::SetTextColor(hdc, 0);
           ::DrawFocusRect(hdc, &widgetRect);
         }
-#else
-        ::SetTextColor(hdc, 0);
-        ::DrawFocusRect(hdc, &widgetRect);
-#endif
         ::RestoreDC(hdc, id);
         if (hPen) {
           ::DeleteObject(hPen);
@@ -2439,13 +2392,8 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
     case NS_THEME_MENUCHECKBOX:
     case NS_THEME_MENURADIO:
     case NS_THEME_MENUARROW:
-#ifdef WINCE
-      (*aResult).width =  16;
-      (*aResult).height = 16;
-#else
       (*aResult).width = ::GetSystemMetrics(SM_CXMENUCHECK);
       (*aResult).height = ::GetSystemMetrics(SM_CYMENUCHECK);
-#endif
       break;
     case NS_THEME_SCROLLBAR_BUTTON_UP:
     case NS_THEME_SCROLLBAR_BUTTON_DOWN:
@@ -2501,24 +2449,17 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
       // no minimum widget size
       break;
     case NS_THEME_RESIZER: {     
-#ifndef WINCE
       NONCLIENTMETRICS nc;
       nc.cbSize = sizeof(nc);
       if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(nc), &nc, 0))
         (*aResult).width = (*aResult).height = abs(nc.lfStatusFont.lfHeight) + 4;
       else
-#endif
         (*aResult).width = (*aResult).height = 15;
       *aIsOverridable = PR_FALSE;
       break;
     case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
-#ifndef WINCE
       (*aResult).width = ::GetSystemMetrics(SM_CXVSCROLL);
       (*aResult).height = ::GetSystemMetrics(SM_CYVTHUMB);
-#else
-      (*aResult).width = 15;
-      (*aResult).height = 15;
-#endif
       // Without theming, divide the thumb size by two in order to look more
       // native
       if (!GetTheme(aWidgetType))
@@ -2526,13 +2467,8 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
       *aIsOverridable = PR_FALSE;
       break;
     case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
-#ifndef WINCE
       (*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB);
       (*aResult).height = ::GetSystemMetrics(SM_CYHSCROLL);
-#else
-      (*aResult).width = 15;
-      (*aResult).height = 15;
-#endif
       // Without theming, divide the thumb size by two in order to look more
       // native
       if (!GetTheme(aWidgetType))
@@ -2540,11 +2476,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
       *aIsOverridable = PR_FALSE;
       break;
     case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
-#ifndef WINCE
       (*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB) << 1;
-#else
-      (*aResult).width = 10;
-#endif
       break;
     }
     case NS_THEME_MENUSEPARATOR:
@@ -2624,10 +2556,9 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
           const nsStyleUserInterface *uiData = aFrame->GetStyleUserInterface();
           // The down state is flat if the button is focusable
           if (uiData->mUserFocus == NS_STYLE_USER_FOCUS_NORMAL) {
-#ifndef WINCE
             if (!aFrame->GetContent()->IsHTML())
               aState |= DFCS_FLAT;
-#endif
+
             aFocused = PR_TRUE;
           }
         }
@@ -2789,7 +2720,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
         return NS_OK;
       }
 
-#ifndef WINCE
       if (isHTML) {
         nsIComboboxControlFrame* ccf = do_QueryFrame(aFrame);
         isOpen = (ccf && ccf->IsDroppedDown());
@@ -2805,7 +2735,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
       // Dropdown button active state doesn't need :hover.
       if (eventState.HasState(NS_EVENT_STATE_ACTIVE))
         aState |= DFCS_PUSHED | DFCS_FLAT;
-#endif
 
       return NS_OK;
     }
@@ -2834,10 +2763,8 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
       if (IsDisabled(aFrame, contentState))
         aState |= DFCS_INACTIVE;
       else {
-#ifndef WINCE
         if (contentState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE))
           aState |= DFCS_PUSHED | DFCS_FLAT;
-#endif
       }
 
       return NS_OK;
@@ -2867,12 +2794,8 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
     }
     case NS_THEME_RESIZER:    
       aPart = DFC_SCROLL;
-#ifndef WINCE
       aState = (IsFrameRTL(aFrame)) ?
                DFCS_SCROLLSIZEGRIPRIGHT : DFCS_SCROLLSIZEGRIP;
-#else
-      aState = 0;
-#endif
       return NS_OK;
     case NS_THEME_MENUSEPARATOR:
       aPart = 0;
@@ -3016,7 +2939,6 @@ static void DrawTab(HDC hdc, const RECT& R, PRInt32 aPosition, PRBool aSelected,
     ::DrawEdge(hdc, &shadeRect, EDGE_RAISED, BF_SOFT | shadeFlag);
 }
 
-#ifndef WINCE
 static void DrawMenuImage(HDC hdc, const RECT& rc, PRInt32 aComponent, PRUint32 aColor)
 {
   // This procedure creates a memory bitmap to contain the check mark, draws
@@ -3063,7 +2985,6 @@ static void DrawMenuImage(HDC hdc, const RECT& rc, PRInt32 aComponent, PRUint32
     ::DeleteDC(hMemoryDC);
   }
 }
-#endif
 
 void nsNativeThemeWin::DrawCheckedRect(HDC hdc, const RECT& rc, PRInt32 fore, PRInt32 back,
                                        HBRUSH defaultBack)
@@ -3080,9 +3001,7 @@ void nsNativeThemeWin::DrawCheckedRect(HDC hdc, const RECT& rc, PRInt32 fore, PR
       COLORREF oldBackColor = ::SetBkColor(hdc, ::GetSysColor(back));
       POINT vpOrg;
 
-#ifndef WINCE
       ::UnrealizeObject(brush);
-#endif
       ::GetViewportOrgEx(hdc, &vpOrg);
       ::SetBrushOrgEx(hdc, vpOrg.x + rc.left, vpOrg.y + rc.top, NULL);
       HBRUSH oldBrush = (HBRUSH) ::SelectObject(hdc, brush);
@@ -3357,7 +3276,6 @@ RENDER_AGAIN:
         }
       }
       break;
-#ifndef WINCE
     case NS_THEME_MENUCHECKBOX:
     case NS_THEME_MENURADIO:
       if (!(state & DFCS_CHECKED))
@@ -3394,7 +3312,6 @@ RENDER_AGAIN:
       ::FillRect(hdc, &widgetRect, (HBRUSH)(COLOR_3DHILIGHT+1));
       break;
     }
-#endif
 
     case NS_THEME_WINDOW_TITLEBAR:
     case NS_THEME_WINDOW_TITLEBAR_MAXIMIZED:
diff --git a/widget/src/windows/nsScreenWin.cpp b/widget/src/windows/nsScreenWin.cpp
index 481b24477f9c..e6c58a944170 100644
--- a/widget/src/windows/nsScreenWin.cpp
+++ b/widget/src/windows/nsScreenWin.cpp
@@ -47,13 +47,6 @@
 
 #include "nsScreenWin.h"
 
-#ifdef WINCE
-#ifdef WINCE_WINDOWS_MOBILE
-#include "sipapi.h"
-#endif
-#define GetMonitorInfoW GetMonitorInfo
-#endif
-
 
 nsScreenWin :: nsScreenWin ( void* inScreen )
   : mScreen(inScreen)
@@ -117,18 +110,6 @@ NS_IMETHODIMP
 nsScreenWin :: GetAvailRect(PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight)
 {
   BOOL success = FALSE;
-#ifdef WINCE_WINDOWS_MOBILE
-  SIPINFO sipInfo;
-  memset(&sipInfo, 0, sizeof(SIPINFO));
-  sipInfo.cbSize = sizeof(SIPINFO);
-  if (SipGetInfo(&sipInfo) && !(sipInfo.fdwFlags & SIPF_OFF)) {
-    *outLeft = sipInfo.rcVisibleDesktop.left;
-    *outTop = sipInfo.rcVisibleDesktop.top;
-    *outWidth = sipInfo.rcVisibleDesktop.right - sipInfo.rcVisibleDesktop.left;
-    *outHeight = sipInfo.rcVisibleDesktop.bottom - sipInfo.rcVisibleDesktop.top;
-    return NS_OK;
-  }
-#endif
 
 #if _MSC_VER >= 1200
   if ( mScreen ) {
diff --git a/widget/src/windows/nsToolkit.cpp b/widget/src/windows/nsToolkit.cpp
index 8dd1427e58e2..3ebe75d3b9f9 100644
--- a/widget/src/windows/nsToolkit.cpp
+++ b/widget/src/windows/nsToolkit.cpp
@@ -49,9 +49,7 @@
 #include <objbase.h>
 #include <initguid.h>
 
-#ifndef WINCE
 #include "nsUXThemeData.h"
-#endif
 
 // unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
 #include <unknwn.h>
@@ -87,9 +85,6 @@ StartAllowingD3D9(nsITimer *aTimer, void *aClosure)
 extern "C" {
 #endif
 
-// Windows CE is created when nsToolkit
-// starts up, not when the dll is loaded.
-#ifndef WINCE
 BOOL APIENTRY DllMain(  HINSTANCE hModule, 
                         DWORD reason, 
                         LPVOID lpReserved )
@@ -113,7 +108,6 @@ BOOL APIENTRY DllMain(  HINSTANCE hModule,
 
     return TRUE;
 }
-#endif //#ifndef WINCE
 
 #if defined(__GNUC__)
 } // extern "C"
@@ -166,7 +160,7 @@ nsToolkit::nsToolkit()
     mGuiThread  = NULL;
     mDispatchWnd = 0;
 
-#if defined(MOZ_STATIC_COMPONENT_LIBS) || defined (WINCE)
+#if defined(MOZ_STATIC_COMPONENT_LIBS)
     nsToolkit::Startup(GetModuleHandle(NULL));
 #endif
 
@@ -196,7 +190,7 @@ nsToolkit::~nsToolkit()
       gMouseTrailer = nsnull;
     }
 
-#if defined (MOZ_STATIC_COMPONENT_LIBS) || defined(WINCE)
+#if defined (MOZ_STATIC_COMPONENT_LIBS)
     nsToolkit::Shutdown();
 #endif
 }
@@ -232,9 +226,7 @@ nsToolkit::Startup(HMODULE hModule)
     if (setDPIAware)
       setDPIAware();
 
-#ifndef WINCE
     nsUXThemeData::Initialize();
-#endif
 }
 
 
@@ -355,7 +347,6 @@ LRESULT CALLBACK nsToolkit::WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
                                        LPARAM lParam)
 {
     switch (msg) {
-#ifndef WINCE
         case WM_SYSCOLORCHANGE:
         {
           // WM_SYSCOLORCHANGE messages are only dispatched to top
@@ -369,7 +360,6 @@ LRESULT CALLBACK nsToolkit::WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
           // the current system colors.
           nsWindow::GlobalMsgWindowProc(hWnd, msg, wParam, lParam);
         }
-#endif
     }
 
     return ::DefWindowProcW(hWnd, msg, wParam, lParam);
@@ -435,7 +425,6 @@ PRBool nsToolkit::InitVersionInfo()
   {
     isInitialized = PR_TRUE;
 
-#ifndef WINCE
     OSVERSIONINFO osversion;
     osversion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
@@ -444,7 +433,6 @@ PRBool nsToolkit::InitVersionInfo()
     if (osversion.dwMajorVersion == 5)  { 
       nsToolkit::mIsWinXP = (osversion.dwMinorVersion == 1);
     }
-#endif
   }
 
   return PR_TRUE;
@@ -558,10 +546,8 @@ void MouseTrailer::TimerProc(nsITimer* aTimer, void* aClosure)
     mp.y = GET_Y_LPARAM(pos);
     HWND mouseWnd = ::WindowFromPoint(mp);
     if (mtrailer->mMouseTrailerWindow != mouseWnd) {
-#ifndef WINCE
       // Notify someone that a mouse exit happened.
       PostMessage(mtrailer->mMouseTrailerWindow, WM_MOUSELEAVE, 0, 0);
-#endif
 
       // we are out of this window, destroy timer
       mtrailer->DestroyTimer();
diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp
index 1e55d00894b5..385b75899ec4 100644
--- a/widget/src/windows/nsWinGesture.cpp
+++ b/widget/src/windows/nsWinGesture.cpp
@@ -86,9 +86,6 @@ nsWinGesture::nsWinGesture() :
 
 PRBool nsWinGesture::InitLibrary()
 {
-#ifdef WINCE
-  return PR_FALSE;
-#else
   if (getGestureInfo) {
     return PR_TRUE;
   } else if (sLibraryHandle) {
@@ -156,7 +153,6 @@ PRBool nsWinGesture::InitLibrary()
   }
 
   return PR_TRUE;
-#endif
 }
 
 #define GCOUNT 5
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index d7189bce9381..bc5aaefa39c6 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -89,8 +89,6 @@
  *                       and general setup.
  *  nsWindowDbg.h/.cpp - Debug related code and directives.
  *  nsWindowGfx.h/.cpp - Graphics and painting.
- *  nsWindowCE.h/.cpp  - WINCE specific code that can be
- *                       split out from nsWindow.
  *
  */
 
@@ -159,31 +157,21 @@
 #include "nsWindowsDllInterceptor.h"
 #include "nsIWindowMediator.h"
 #include "nsIServiceManager.h"
-
-#if defined(WINCE)
-#include "nsWindowCE.h"
-#endif
-
-#if defined(WINCE_WINDOWS_MOBILE)
-#define KILL_PRIORITY_ID 2444
-#endif
-
 #include "nsWindowGfx.h"
 #include "gfxWindowsPlatform.h"
 #include "Layers.h"
-#ifndef WINCE
+
 #ifdef MOZ_ENABLE_D3D9_LAYER
 #include "LayerManagerD3D9.h"
 #endif
+
 #ifdef MOZ_ENABLE_D3D10_LAYER
 #include "LayerManagerD3D10.h"
 #endif
+
 #include "LayerManagerOGL.h"
 #include "nsIGfxInfo.h"
-#endif
 #include "BasicLayers.h"
-
-#if !defined(WINCE)
 #include "nsUXThemeConstants.h"
 #include "KeyboardLayout.h"
 #include "nsNativeDragTarget.h"
@@ -191,7 +179,6 @@
 #include <zmouse.h>
 #include <pbt.h>
 #include <richedit.h>
-#endif // !defined(WINCE)
 
 #if defined(ACCESSIBILITY)
 #include "oleidl.h"
@@ -219,12 +206,6 @@
 
 #include "nsWindowDefs.h"
 
-#include "mozilla/FunctionTimer.h"
-
-#ifdef WINCE_WINDOWS_MOBILE
-#include "nsGfxCIID.h"
-#endif
-
 #include "mozilla/FunctionTimer.h"
 #include "nsCrashOnException.h"
 #include "nsIXULRuntime.h"
@@ -329,23 +310,8 @@ static const char *sScreenManagerContractID       = "@mozilla.org/gfx/screenmana
 PRLogModuleInfo* gWindowsLog                      = nsnull;
 #endif
 
-#ifndef WINCE
 // Kbd layout. Used throughout character processing.
 static KeyboardLayout gKbdLayout;
-#endif
-
-#ifdef WINCE_WINDOWS_MOBILE
-// HTC Navigation Wheel Event
-// This is the defined value for Gesture Mode
-const int WM_HTCNAV = 0x0400 + 200;
-
-typedef int (__stdcall * HTCApiNavOpen)(HANDLE, int);
-typedef int (__stdcall * HTCApiNavSetMode)(HANDLE, unsigned int);
-
-HTCApiNavOpen    gHTCApiNavOpen = nsnull;
-HTCApiNavSetMode gHTCApiNavSetMode = nsnull;
-static PRBool    gCheckForHTCApi = PR_FALSE;
-#endif
 
 // Global user preference for disabling native theme. Used
 // in NativeWindowTheme.
@@ -447,9 +413,7 @@ nsWindow::nsWindow() : nsBaseWidget()
 
   // Global initialization
   if (!sInstanceCount) {
-#if !defined(WINCE)
     gKbdLayout.LoadLayout(::GetKeyboardLayout(0));
-#endif
 
     // Init IME handler
     nsIMM32Handler::Initialize();
@@ -458,15 +422,11 @@ nsWindow::nsWindow() : nsBaseWidget()
     nsTextStore::Initialize();
 #endif
 
-#if !defined(WINCE)
     if (SUCCEEDED(::OleInitialize(NULL)))
       sIsOleInitialized = TRUE;
     NS_ASSERTION(sIsOleInitialized, "***** OLE is not initialized!\n");
-#endif
 
-#if !defined(WINCE)
     InitInputWorkaroundPrefDefaults();
-#endif
 
     // Init titlebar button info for custom frames.
     nsUXThemeData::InitTitlebarInfo();
@@ -499,8 +459,6 @@ nsWindow::~nsWindow()
 #ifdef NS_ENABLE_TSF
     nsTextStore::Terminate();
 #endif
-
-#if !defined(WINCE)
     NS_IF_RELEASE(sCursorImgContainer);
     if (sIsOleInitialized) {
       ::OleFlushClipboard();
@@ -509,12 +467,9 @@ nsWindow::~nsWindow()
     }
     // delete any of the IME structures that we allocated
     nsIMM32Handler::Terminate();
-#endif // !defined(WINCE)
   }
 
-#if !defined(WINCE)
   NS_IF_RELEASE(mNativeDragTarget);
-#endif // !defined(WINCE)
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
@@ -528,20 +483,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
  **************************************************************/
 
 // Allow Derived classes to modify the height that is passed
-// when the window is created or resized. Also add extra height
-// if needed (on Windows CE)
+// when the window is created or resized.
 PRInt32 nsWindow::GetHeight(PRInt32 aProposedHeight)
 {
-  PRInt32 extra = 0;
-
-  #if defined(WINCE) && !defined(WINCE_WINDOWS_MOBILE)
-  DWORD style = WindowStyle();
-  if ((style & WS_SYSMENU) && (style & WS_POPUP)) {
-    extra = GetSystemMetrics(SM_CYCAPTION);
-  }
-  #endif
-
-  return aProposedHeight + extra;
+  return aProposedHeight;
 }
 
 // Create the proper widget
@@ -724,10 +669,6 @@ nsWindow::Create(nsIWidget *aParent,
       }
     }
   }
-#if defined(WINCE_HAVE_SOFTKB)
-  if (mWindowType == eWindowType_dialog || mWindowType == eWindowType_toplevel )
-     nsWindowCE::CreateSoftKeyMenuBar(mWnd);
-#endif
 
   return NS_OK;
 }
@@ -852,7 +793,6 @@ void nsWindow::GetWindowPopupClass(nsString& aWindowClass)
  **************************************************************/
 
 // Return nsWindow styles
-#if !defined(WINCE) // implemented in nsWindowCE.cpp
 DWORD nsWindow::WindowStyle()
 {
   DWORD style;
@@ -931,7 +871,6 @@ DWORD nsWindow::WindowStyle()
   VERIFY_WINDOW_STYLE(style);
   return style;
 }
-#endif // !defined(WINCE)
 
 // Return nsWindow extended styles
 DWORD nsWindow::WindowExStyle()
@@ -947,11 +886,7 @@ DWORD nsWindow::WindowExStyle()
 
     case eWindowType_popup:
     {
-      DWORD extendedStyle =
-#if defined(WINCE) && !defined(WINCE_WINDOWS_MOBILE)
-        WS_EX_NOACTIVATE |
-#endif
-        WS_EX_TOOLWINDOW;
+      DWORD extendedStyle = WS_EX_TOOLWINDOW;
       if (mPopupLevel == ePopupLevelTop)
         extendedStyle |= WS_EX_TOPMOST;
       return extendedStyle;
@@ -1144,15 +1079,12 @@ nsWindow* nsWindow::GetParentWindow(PRBool aIncludeOwner)
   // true parent (default).
   nsWindow* widget = nsnull;
   if (mWnd) {
-#ifdef WINCE
-    HWND parent = ::GetParent(mWnd);
-#else
     HWND parent = nsnull;
     if (aIncludeOwner)
       parent = ::GetParent(mWnd);
     else
       parent = ::GetAncestor(mWnd, GA_PARENT);
-#endif
+
     if (parent) {
       widget = GetNSWindowPtr(parent);
       if (widget) {
@@ -1279,19 +1211,6 @@ NS_METHOD nsWindow::Show(PRBool bState)
         // top level windows:
         syncInvalidate = PR_TRUE;
         switch (mSizeMode) {
-#ifdef WINCE
-          case nsSizeMode_Fullscreen:
-            ::SetForegroundWindow(mWnd);
-            ::ShowWindow(mWnd, SW_SHOWMAXIMIZED);
-            MakeFullScreen(TRUE);
-            break;
-
-          case nsSizeMode_Maximized :
-            ::SetForegroundWindow(mWnd);
-            ::ShowWindow(mWnd, SW_SHOWMAXIMIZED);
-            break;
-          // use default for nsSizeMode_Minimized on Windows CE
-#else
           case nsSizeMode_Fullscreen:
             ::ShowWindow(mWnd, SW_SHOW);
             break;
@@ -1301,12 +1220,8 @@ NS_METHOD nsWindow::Show(PRBool bState)
           case nsSizeMode_Minimized :
             ::ShowWindow(mWnd, SW_SHOWMINIMIZED);
             break;
-#endif
           default:
             if (CanTakeFocus()) {
-#ifdef WINCE
-              ::SetForegroundWindow(mWnd);
-#endif
               ::ShowWindow(mWnd, SW_SHOWNORMAL);
             } else {
               // Place the window behind the foreground window
@@ -1328,31 +1243,25 @@ NS_METHOD nsWindow::Show(PRBool bState)
           flags |= SWP_NOZORDER;
 
         if (mWindowType == eWindowType_popup) {
-#ifndef WINCE
           // ensure popups are the topmost of the TOPMOST
           // layer. Remember not to set the SWP_NOZORDER
           // flag as that might allow the taskbar to overlap
-          // the popup.  However on windows ce, we need to
-          // activate the popup or clicks will not be sent.
+          // the popup.
           flags |= SWP_NOACTIVATE;
-#endif
           HWND owner = ::GetWindow(mWnd, GW_OWNER);
           ::SetWindowPos(mWnd, owner ? 0 : HWND_TOPMOST, 0, 0, 0, 0, flags);
         } else {
-#ifndef WINCE
           if (mWindowType == eWindowType_dialog && !CanTakeFocus())
             flags |= SWP_NOACTIVATE;
-#endif
+
           ::SetWindowPos(mWnd, HWND_TOP, 0, 0, 0, 0, flags);
         }
       }
 
-#ifndef WINCE
       if (!wasVisible && (mWindowType == eWindowType_toplevel || mWindowType == eWindowType_dialog)) {
         // when a toplevel window or dialog is shown, initialize the UI state
         ::SendMessageW(mWnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL), 0);
       }
-#endif
     } else {
       if (mWindowType != eWindowType_dialog) {
         ::ShowWindow(mWnd, SW_HIDE);
@@ -1399,18 +1308,15 @@ NS_METHOD nsWindow::IsVisible(PRBool & bState)
 // transparency. These routines are called on size and move operations.
 void nsWindow::ClearThemeRegion()
 {
-#ifndef WINCE
   if (nsUXThemeData::sIsVistaOrLater && !HasGlass() &&
       (mWindowType == eWindowType_popup && !IsPopupWithTitleBar() &&
        (mPopupType == ePopupTypeTooltip || mPopupType == ePopupTypePanel))) {
     SetWindowRgn(mWnd, NULL, false);
   }
-#endif
 }
 
 void nsWindow::SetThemeRegion()
 {
-#ifndef WINCE
   // Popup types that have a visual styles region applied (bug 376408). This can be expanded
   // for other window types as needed. The regions are applied generically to the base window
   // so default constants are used for part and state. At some point we might need part and
@@ -1430,7 +1336,6 @@ void nsWindow::SetThemeRegion()
     }
     ::ReleaseDC(mWnd, dc);
   }
-#endif
 }
 
 /**************************************************************
@@ -1444,23 +1349,18 @@ void nsWindow::SetThemeRegion()
 
 NS_METHOD nsWindow::RegisterTouchWindow() {
   mTouchWindow = PR_TRUE;
-#ifndef WINCE
   mGesture.RegisterTouchWindow(mWnd);
   ::EnumChildWindows(mWnd, nsWindow::RegisterTouchForDescendants, 0);
-#endif
   return NS_OK;
 }
 
 NS_METHOD nsWindow::UnregisterTouchWindow() {
   mTouchWindow = PR_FALSE;
-#ifndef WINCE
   mGesture.UnregisterTouchWindow(mWnd);
   ::EnumChildWindows(mWnd, nsWindow::UnregisterTouchForDescendants, 0);
-#endif
   return NS_OK;
 }
 
-#ifndef WINCE
 BOOL CALLBACK nsWindow::RegisterTouchForDescendants(HWND aWnd, LPARAM aMsg) {
   nsWindow* win = GetNSWindowPtr(aWnd);
   if (win)
@@ -1474,7 +1374,6 @@ BOOL CALLBACK nsWindow::UnregisterTouchForDescendants(HWND aWnd, LPARAM aMsg) {
     win->mGesture.UnregisterTouchWindow(aWnd);
   return TRUE;
 }
-#endif
 
 /**************************************************************
  *
@@ -1569,11 +1468,9 @@ NS_METHOD nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
   if (mWnd) {
     UINT  flags = SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE;
 
-#ifndef WINCE
     if (!aRepaint) {
       flags |= SWP_NOREDRAW;
     }
-#endif
 
     ClearThemeRegion();
     VERIFY(::SetWindowPos(mWnd, NULL, 0, 0, aWidth, GetHeight(aHeight), flags));
@@ -1610,11 +1507,9 @@ NS_METHOD nsWindow::Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeig
 
   if (mWnd) {
     UINT  flags = SWP_NOZORDER | SWP_NOACTIVATE;
-#ifndef WINCE
     if (!aRepaint) {
       flags |= SWP_NOREDRAW;
     }
-#endif
 
     ClearThemeRegion();
     VERIFY(::SetWindowPos(mWnd, NULL, aX, aY, aWidth, GetHeight(aHeight), flags));
@@ -1651,7 +1546,6 @@ NS_METHOD nsWindow::ResizeClient(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32
   return Resize(aWidth, aHeight, aRepaint);
 }
 
-#if !defined(WINCE)
 NS_IMETHODIMP
 nsWindow::BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVertical)
 {
@@ -1708,7 +1602,7 @@ nsWindow::BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVert
 
   return NS_OK;
 }
-#endif
+
 /**************************************************************
  *
  * SECTION: Window Z-order and state.
@@ -1750,7 +1644,6 @@ NS_METHOD nsWindow::PlaceBehind(nsTopLevelWidgetZPlacement aPlacement,
 }
 
 // Maximize, minimize or restore the window.
-#if !defined(WINCE) // implemented in nsWindowCE.cpp
 NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
 
   nsresult rv;
@@ -1796,7 +1689,6 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
   }
   return rv;
 }
-#endif // !defined(WINCE)
 
 // Constrain a potential move to fit onscreen
 NS_METHOD nsWindow::ConstrainPosition(PRBool aAllowSlop,
@@ -1902,13 +1794,7 @@ NS_METHOD nsWindow::Enable(PRBool bState)
 NS_METHOD nsWindow::IsEnabled(PRBool *aState)
 {
   NS_ENSURE_ARG_POINTER(aState);
-
-#ifndef WINCE
   *aState = !mWnd || (::IsWindowEnabled(mWnd) && ::IsWindowEnabled(::GetAncestor(mWnd, GA_ROOT)));
-#else
-  *aState = !mWnd || (::IsWindowEnabled(mWnd) && ::IsWindowEnabled(mWnd));
-#endif
-
   return NS_OK;
 }
 
@@ -2234,7 +2120,6 @@ nsWindow::UpdateNonClientMargins(PRInt32 aSizeMode, PRBool aReflowWindow)
   else if (mNonClientMargins.bottom > 0)
     mNonClientOffset.bottom = mVertResizeMargin - mNonClientMargins.bottom;
 
-#ifndef WINCE
   if (aSizeMode == nsSizeMode_Maximized) {
     // Address an issue with auto-hide taskbars which fall behind the window.
     // Ensure a 1 pixel margin at the bottom of the monitor so that unhiding
@@ -2258,7 +2143,6 @@ nsWindow::UpdateNonClientMargins(PRInt32 aSizeMode, PRBool aReflowWindow)
       }
     }
   }
-#endif
 
   if (aReflowWindow) {
     // Force a reflow of content based on the new client
@@ -2376,11 +2260,9 @@ NS_METHOD nsWindow::SetBackgroundColor(const nscolor &aColor)
     ::DeleteObject(mBrush);
 
   mBrush = ::CreateSolidBrush(NSRGB_2_COLOREF(mBackground));
-#ifndef WINCE
   if (mWnd != NULL) {
     ::SetClassLongPtrW(mWnd, GCLP_HBRBACKGROUND, (LONG_PTR)mBrush);
   }
-#endif
   return NS_OK;
 }
 
@@ -2849,47 +2731,6 @@ NS_METHOD nsWindow::Invalidate(const nsIntRect & aRect, PRBool aIsSynchronous)
 NS_IMETHODIMP
 nsWindow::MakeFullScreen(PRBool aFullScreen)
 {
-#if WINCE_WINDOWS_MOBILE
-  RECT rc;
-  if (aFullScreen) {
-    SetForegroundWindow(mWnd);
-    if (nsWindowCE::sMenuBarShown) {
-      SIPINFO sipInfo;
-      memset(&sipInfo, 0, sizeof(SIPINFO));
-      sipInfo.cbSize = sizeof(SIPINFO);
-      if (SipGetInfo(&sipInfo))
-        SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN), 
-                sipInfo.rcVisibleDesktop.bottom);
-      else
-        SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN), 
-                GetSystemMetrics(SM_CYSCREEN));
-      RECT menuBarRect;
-      if (GetWindowRect(nsWindowCE::sSoftKeyMenuBarHandle, &menuBarRect) && 
-          menuBarRect.top < rc.bottom)
-        rc.bottom = menuBarRect.top;
-      SHFullScreen(mWnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_SHOWSIPBUTTON);
-    } else {
-      
-      SHFullScreen(mWnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
-      SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
-    }
-  }
-  else {
-    SHFullScreen(mWnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON);
-    SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, FALSE);
-  }
-
-  if (aFullScreen)
-    mSizeMode = nsSizeMode_Fullscreen;
-
-  // nsBaseWidget hides the chrome and resizes the window, replicate that here
-  HideWindowChrome(aFullScreen);
-  Resize(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, PR_TRUE);
-
-  return NS_OK;
-
-#else
-
   mFullscreenMode = aFullScreen;
   if (aFullScreen) {
     if (mSizeMode == nsSizeMode_Fullscreen)
@@ -2923,7 +2764,6 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
   DispatchWindowEvent(&event);
 
   return rv;
-#endif
 }
 
 /**************************************************************
@@ -3052,7 +2892,6 @@ NS_METHOD nsWindow::SetTitle(const nsAString& aTitle)
 
 NS_METHOD nsWindow::SetIcon(const nsAString& aIconSpec) 
 {
-#ifndef WINCE
   // Assume the given string is a local identifier for an icon file.
 
   nsCOMPtr<nsILocalFile> iconFile;
@@ -3103,7 +2942,6 @@ NS_METHOD nsWindow::SetIcon(const nsAString& aIconSpec)
     printf( "\nSmall icon load error; icon=%s, rc=0x%08X\n\n", cPath.get(), ::GetLastError() );
   }
 #endif
-#endif // WINCE
   return NS_OK;
 }
 
@@ -3148,7 +2986,6 @@ nsIntSize nsWindow::ClientToWindowSize(const nsIntSize& aClientSize)
  *
  **************************************************************/
 
-#if !defined(WINCE) // implemented in nsWindowCE.cpp
 NS_METHOD nsWindow::EnableDragDrop(PRBool aEnable)
 {
   NS_ASSERTION(mWnd, "nsWindow::EnableDragDrop() called after Destroy()");
@@ -3178,7 +3015,6 @@ NS_METHOD nsWindow::EnableDragDrop(PRBool aEnable)
   }
   return rv;
 }
-#endif
 
 /**************************************************************
  *
@@ -3234,23 +3070,16 @@ NS_IMETHODIMP nsWindow::CaptureRollupEvents(nsIRollupListener * aListener,
     NS_IF_ADDREF(aMenuRollup);
     sRollupWidget = this;
     NS_ADDREF(this);
-
-#ifndef WINCE
     if (!sMsgFilterHook && !sCallProcHook && !sCallMouseHook) {
       RegisterSpecialDropdownHooks();
     }
     sProcessHook = PR_TRUE;
-#endif
-    
   } else {
     sRollupListener = nsnull;
     NS_IF_RELEASE(sMenuRollup);
     NS_IF_RELEASE(sRollupWidget);
-    
-#ifndef WINCE
     sProcessHook = PR_FALSE;
     UnregisterSpecialDropdownHooks();
-#endif
   }
 
   return NS_OK;
@@ -3268,7 +3097,6 @@ NS_IMETHODIMP nsWindow::CaptureRollupEvents(nsIRollupListener * aListener,
 NS_IMETHODIMP
 nsWindow::GetAttention(PRInt32 aCycleCount)
 {
-#ifndef WINCE
   // Got window?
   if (!mWnd)
     return NS_ERROR_NOT_INITIALIZED;
@@ -3294,13 +3122,12 @@ nsWindow::GetAttention(PRInt32 aCycleCount)
   FLASHWINFO flashInfo = { sizeof(FLASHWINFO), flashWnd,
     FLASHW_ALL, aCycleCount > 0 ? aCycleCount : defaultCycleCount, 0 };
   ::FlashWindowEx(&flashInfo);
-#endif
+
   return NS_OK;
 }
 
 void nsWindow::StopFlashing()
 {
-#ifndef WINCE
   HWND flashWnd = mWnd;
   while (HWND ownerWnd = ::GetWindow(flashWnd, GW_OWNER)) {
     flashWnd = ownerWnd;
@@ -3309,7 +3136,6 @@ void nsWindow::StopFlashing()
   FLASHWINFO flashInfo = { sizeof(FLASHWINFO), flashWnd,
     FLASHW_STOP, 0, 0 };
   ::FlashWindowEx(&flashInfo);
-#endif
 }
 
 /**************************************************************
@@ -3331,15 +3157,11 @@ nsWindow::HasPendingInputEvent()
   // reported to the application.
   if (HIWORD(GetQueueStatus(QS_INPUT)))
     return PR_TRUE;
-#ifdef WINCE
-  return PR_FALSE;
-#else
   GUITHREADINFO guiInfo;
   guiInfo.cbSize = sizeof(GUITHREADINFO);
   if (!GetGUIThreadInfo(GetCurrentThreadId(), &guiInfo))
     return PR_FALSE;
   return GUI_INMOVESIZE == (guiInfo.flags & GUI_INMOVESIZE);
-#endif
 }
 
 /**************************************************************
@@ -3399,7 +3221,6 @@ nsWindow::GetLayerManager(LayerManagerPersistence aPersistence, bool* aAllowReta
     *aAllowRetaining = true;
   }
 
-#ifndef WINCE
 #ifdef MOZ_ENABLE_D3D10_LAYER
   if (mLayerManager) {
     if (mLayerManager->GetBackendType() ==
@@ -3485,7 +3306,6 @@ nsWindow::GetLayerManager(LayerManagerPersistence aPersistence, bool* aAllowReta
     if (!mLayerManager)
       mLayerManager = CreateBasicLayerManager();
   }
-#endif
 
   return mLayerManager;
 }
@@ -3541,9 +3361,6 @@ gfxASurface *nsWindow::GetThebesSurface()
 NS_IMETHODIMP
 nsWindow::OnDefaultButtonLoaded(const nsIntRect &aButtonRect)
 {
-#ifdef WINCE
-  return NS_ERROR_NOT_IMPLEMENTED;
-#else
   if (aButtonRect.IsEmpty())
     return NS_OK;
 
@@ -3590,7 +3407,6 @@ nsWindow::OnDefaultButtonLoaded(const nsIntRect &aButtonRect)
     return NS_ERROR_FAILURE;
   }
   return NS_OK;
-#endif
 }
 
 NS_IMETHODIMP
@@ -3721,12 +3537,7 @@ void nsWindow::InitEvent(nsGUIEvent& event, nsIntPoint* aPoint)
     event.refPoint.y = aPoint->y;
   }
 
-#ifndef WINCE
   event.time = ::GetMessageTime();
-#else
-  event.time = PR_Now() / 1000;
-#endif
-
   mLastPoint = event.refPoint;
 }
 
@@ -3956,11 +3767,7 @@ void nsWindow::DispatchPendingEvents()
     // Note: EnumChildWindows enumerates all descendant windows not just
     // the children (but not the window itself).
     nsWindow::DispatchStarvedPaints(topWnd, 0);
-#if !defined(WINCE)
     ::EnumChildWindows(topWnd, nsWindow::DispatchStarvedPaints, 0);
-#else
-    nsWindowCE::EnumChildWindows(topWnd, nsWindow::DispatchStarvedPaints, NULL);
-#endif
   }
 }
 
@@ -4094,11 +3901,7 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, WPARAM wParam,
 
   // Doubleclicks are used to set the click count, then changed to mousedowns
   // We're going to time double-clicks from mouse *up* to next mouse *down*
-#ifndef WINCE
   LONG curMsgTime = ::GetMessageTime();
-#else
-  LONG curMsgTime = PR_Now() / 1000;
-#endif
 
   if (aEventType == NS_MOUSE_DOUBLECLICK) {
     event.message = NS_MOUSE_BUTTON_DOWN;
@@ -4760,7 +4563,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 #endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
 
   switch (msg) {
-#ifndef WINCE
     // WM_QUERYENDSESSION must be handled by all windows.
     // Otherwise Windows thinks the window can just be killed at will.
     case WM_QUERYENDSESSION:
@@ -4782,11 +4584,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       *aRetValue = sCanQuit ? TRUE : FALSE;
       result = PR_TRUE;
       break;
-#endif
 
-#ifndef WINCE
     case WM_ENDSESSION:
-#endif
     case MOZ_WM_APP_QUIT:
       if (msg == MOZ_WM_APP_QUIT || (wParam == TRUE && sCanQuit == TRI_TRUE))
       {
@@ -4810,11 +4609,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       result = PR_TRUE;
       break;
 
-#ifndef WINCE
     case WM_DISPLAYCHANGE:
       DispatchStandardEvent(NS_DISPLAYCHANGED);
       break;
-#endif
 
     case WM_SYSCOLORCHANGE:
       // Note: This is sent for child windows as well as top-level windows.
@@ -5026,7 +4823,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     }
     break;
 
-#ifndef WINCE
     case WM_POWERBROADCAST:
       // only hidden window handle this
       // to prevent duplicate notification
@@ -5044,7 +4840,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         }
       }
       break;
-#endif
 
     case WM_MOVE: // Window moved
     {
@@ -5070,11 +4865,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       result = PR_TRUE;
       break;
 
-#ifndef WINCE
     case WM_PRINTCLIENT:
       result = OnPaint((HDC) wParam, 0);
       break;
-#endif
 
     case WM_HOTKEY:
       result = OnHotKey(wParam, lParam);
@@ -5119,11 +4912,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 
     case WM_MOUSEMOVE:
     {
-#ifdef WINCE_WINDOWS_MOBILE
-      // Reset the kill timer so that we can continue at this
-      // priority
-      SetTimer(mWnd, KILL_PRIORITY_ID, 2000 /* 2seconds */, NULL);
-#endif
       mMousePresent = PR_TRUE;
 
       // Suppress dispatch of pending events
@@ -5153,19 +4941,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         SendMessage(mWnd, WM_MOUSELEAVE, 0, 0);
     break;
 
-#ifdef WINCE_WINDOWS_MOBILE
-    case WM_TIMER:
-      SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_NORMAL);
-      KillTimer(mWnd, KILL_PRIORITY_ID);
-      break;
-#endif
-
     case WM_LBUTTONDOWN:
     {
-#ifdef WINCE_WINDOWS_MOBILE
-      SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
-      SetTimer(mWnd, KILL_PRIORITY_ID, 2000 /* 2 seconds */, NULL);
-#endif
       result = DispatchMouseEvent(NS_MOUSE_BUTTON_DOWN, wParam, lParam,
                                   PR_FALSE, nsMouseEvent::eLeftButton, MOUSE_INPUT_SOURCE());
       DispatchPendingEvents();
@@ -5177,15 +4954,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       result = DispatchMouseEvent(NS_MOUSE_BUTTON_UP, wParam, lParam,
                                   PR_FALSE, nsMouseEvent::eLeftButton, MOUSE_INPUT_SOURCE());
       DispatchPendingEvents();
-
-#ifdef WINCE_WINDOWS_MOBILE
-      SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_NORMAL);
-      KillTimer(mWnd, KILL_PRIORITY_ID);
-#endif
     }
     break;
 
-#ifndef WINCE
     case WM_MOUSELEAVE:
     {
       if (!mMousePresent)
@@ -5204,7 +4975,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
                          nsMouseEvent::eLeftButton, MOUSE_INPUT_SOURCE());
     }
     break;
-#endif
 
     case WM_CONTEXTMENU:
     {
@@ -5363,17 +5133,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       if (mEventCallback) {
         PRInt32 fActive = LOWORD(wParam);
 
-#if defined(WINCE_HAVE_SOFTKB)
-        if (mIsTopWidgetWindow && sSoftKeyboardState)
-          nsWindowCE::ToggleSoftKB(mWnd, fActive);
-        if (nsWindowCE::sShowSIPButton == TRI_FALSE && WA_INACTIVE != fActive) {
-          HWND hWndSIPB = FindWindowW(L"MS_SIPBUTTON", NULL ); 
-          if (hWndSIPB)
-            ShowWindow(hWndSIPB, SW_HIDE);
-        }
-
-#endif
-
         if (WA_INACTIVE == fActive) {
           // when minimizing a window, the deactivation and focus events will
           // be fired in the reverse order. Instead, just dispatch
@@ -5382,10 +5141,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
             result = DispatchFocusToTopLevelWindow(NS_DEACTIVATE);
           else
             sJustGotDeactivate = PR_TRUE;
-#ifndef WINCE
+
           if (mIsTopWidgetWindow)
             mLastKeyboardLayout = gKbdLayout.GetLayout();
-#endif
 
         } else {
           StopFlashing();
@@ -5395,32 +5153,12 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
                              nsMouseEvent::eReal);
           InitEvent(event);
           DispatchWindowEvent(&event);
-#ifndef WINCE
           if (sSwitchKeyboardLayout && mLastKeyboardLayout)
             ActivateKeyboardLayout(mLastKeyboardLayout, 0);
-#endif
         }
       }
-#ifdef WINCE_WINDOWS_MOBILE
-      if (!gCheckForHTCApi && gHTCApiNavOpen == nsnull) {
-        gCheckForHTCApi = PR_TRUE;
-
-        HINSTANCE library = LoadLibrary(L"HTCAPI.dll"); 
-        gHTCApiNavOpen    = (HTCApiNavOpen)    GetProcAddress(library, "HTCNavOpen"); 
-        gHTCApiNavSetMode = (HTCApiNavSetMode) GetProcAddress(library ,"HTCNavSetMode"); 
-      }
-      
-      if (gHTCApiNavOpen != nsnull) {
-        gHTCApiNavOpen(mWnd, 1 /* undocumented value */);
-
-        if (gHTCApiNavSetMode != nsnull)
-          gHTCApiNavSetMode ( mWnd, 4);
-        // 4 is Gesture Mode. This will generate WM_HTCNAV events to the window
-      }
-#endif
       break;
       
-#ifndef WINCE
     case WM_MOUSEACTIVATE:
       if (mWindowType == eWindowType_popup) {
         // a popup with a parent owner should not be activated when clicked
@@ -5441,7 +5179,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       OnWindowPosChanging(info);
     }
     break;
-#endif
 
     case WM_SETFOCUS:
       // If previous focused window isn't ours, it must have received the
@@ -5459,27 +5196,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
         nsAccessible *rootAccessible = GetRootAccessible();
       }
 #endif
-
-#if defined(WINCE_HAVE_SOFTKB)
-      {
-        // On Windows CE, we have a window that overlaps
-        // the ISP button.  In this case, we should always
-        // try to hide it when we are activated
-      
-        nsIMEContext IMEContext(mWnd);
-        // Open the IME 
-        ImmSetOpenStatus(IMEContext.get(), TRUE);
-      }
-#endif
       break;
 
     case WM_KILLFOCUS:
-#if defined(WINCE_HAVE_SOFTKB)
-      {
-        nsIMEContext IMEContext(mWnd);
-        ImmSetOpenStatus(IMEContext.get(), FALSE);
-      }
-#endif
       if (sJustGotDeactivate) {
         result = DispatchFocusToTopLevelWindow(NS_DEACTIVATE);
       }
@@ -5493,30 +5212,10 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     break;
 
     case WM_SETTINGCHANGE:
-#if !defined (WINCE_WINDOWS_MOBILE)
       getWheelInfo = PR_TRUE;
-#else
-      switch (wParam) {
-        case SPI_SETSIPINFO:
-        case SPI_SETCURRENTIM:
-          nsWindowCE::OnSoftKbSettingsChange(mWnd);
-          break;
-        case SETTINGCHANGE_RESET:
-          if (mWindowType == eWindowType_invisible) {
-            // The OS sees to get confused and think that the invisable window
-            // is in the foreground after an orientation change. By actually
-            // setting it to the foreground and hiding it, we set it strait.
-            // See bug 514007 for details.
-            SetForegroundWindow(mWnd);
-            ShowWindow(mWnd, SW_HIDE);
-          } 
-          break;
-      }
-#endif
       OnSettingsChange(wParam, lParam);
       break;
 
-#ifndef WINCE
     case WM_INPUTLANGCHANGEREQUEST:
       *aRetValue = TRUE;
       result = PR_FALSE;
@@ -5525,7 +5224,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     case WM_INPUTLANGCHANGE:
       result = OnInputLangChange((HKL)lParam);
       break;
-#endif // WINCE
 
     case WM_DESTROYCLIPBOARD:
     {
@@ -5557,7 +5255,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     }
 #endif
 
-#ifndef WINCE
     case WM_SYSCOMMAND:
     {
       WPARAM filteredWParam = (wParam &0xFFF0);
@@ -5578,14 +5275,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       }
     }
     break;
-#endif
-
-
-#ifdef WINCE
-  case WM_HIBERNATE:        
-    nsMemory::HeapMinimize(PR_TRUE);
-    break;
-#endif
 
   case WM_MOUSEWHEEL:
   case WM_MOUSEHWHEEL:
@@ -5601,7 +5290,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     }
     break;
 
-#ifndef WINCE
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
   case WM_DWMCOMPOSITIONCHANGED:
     // First, update the compositor state to latest one. All other methods
@@ -5681,7 +5369,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       result = PR_FALSE; //should always bubble to DefWindowProc
     }
     break;
-#endif // !defined(WINCE)
 
     case WM_CLEAR:
     {
@@ -5715,7 +5402,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     }
     break;
 
-#ifndef WINCE
     case EM_UNDO:
     {
       nsContentCommandEvent command(PR_TRUE, NS_CONTENT_COMMAND_UNDO, this);
@@ -5767,23 +5453,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       result = PR_TRUE;
     }
     break;
-#endif
-
-#ifdef WINCE_WINDOWS_MOBILE
-   //HTC NAVIGATION WHEEL EVENT
-   case WM_HTCNAV:
-   {
-     int distance = wParam & 0x000000FF;
-     if ( (wParam & 0x000000100) != 0) // Counter Clockwise
-       distance *= -1;
-     if (OnMouseWheel(WM_MOUSEWHEEL, MAKEWPARAM(0, distance), 
-                      MAKELPARAM(GetSystemMetrics(SM_CXSCREEN) / 2, 
-                                 GetSystemMetrics(SM_CYSCREEN) / 2), 
-                      getWheelInfo, result, aRetValue))
-        return result;
-   }
-   break;
-#endif
 
     default:
     {
@@ -5852,11 +5521,7 @@ BOOL CALLBACK nsWindow::BroadcastMsg(HWND aTopWindow, LPARAM aMsg)
 {
   // Iterate each of aTopWindows child windows sending the aMsg
   // to each of them.
-#if !defined(WINCE)
   ::EnumChildWindows(aTopWindow, nsWindow::BroadcastMsgToChildren, aMsg);
-#else
-  nsWindowCE::EnumChildWindows(aTopWindow, nsWindow::BroadcastMsgToChildren, aMsg);
-#endif
   return TRUE;
 }
 
@@ -5875,9 +5540,7 @@ void nsWindow::GlobalMsgWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP
       // System color changes are posted to top-level windows only.
       // The NS_SYSCOLORCHANGE must be dispatched to all child
       // windows as well.
-#if !defined(WINCE)
      ::EnumThreadWindows(GetCurrentThreadId(), nsWindow::BroadcastMsg, msg);
-#endif
     break;
   }
 }
@@ -5991,7 +5654,6 @@ nsWindow::ClientMarginHitTestPoint(PRInt32 mx, PRInt32 my)
   return testResult;
 }
 
-#ifndef WINCE
 void nsWindow::PostSleepWakeNotification(const char* aNotification)
 {
   nsCOMPtr<nsIObserverService> observerService =
@@ -5999,7 +5661,6 @@ void nsWindow::PostSleepWakeNotification(const char* aNotification)
   if (observerService)
     observerService->NotifyObservers(nsnull, aNotification, nsnull);
 }
-#endif
 
 // RemoveNextCharMessage() should be called by WM_KEYDOWN or WM_SYSKEYDOWM
 // message handler.  If there is no WM_(SYS)CHAR message for it, this
@@ -6113,7 +5774,6 @@ LRESULT nsWindow::ProcessKeyDownMessage(const MSG &aMsg,
     forgetRedirectedMessage.mCancel = PR_TRUE;
   }
 
-#ifndef WINCE
   if (aMsg.wParam == VK_MENU ||
       (aMsg.wParam == VK_F10 && !modKeyState.mIsShiftDown)) {
     // We need to let Windows handle this keypress,
@@ -6132,7 +5792,6 @@ LRESULT nsWindow::ProcessKeyDownMessage(const MSG &aMsg,
     }
     result = !hasNativeMenu;
   }
-#endif
 
   return result;
 }
@@ -6144,7 +5803,6 @@ nsWindow::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
                                    const nsAString& aCharacters,
                                    const nsAString& aUnmodifiedCharacters)
 {
-#ifndef WINCE  //Win CE doesn't support many of the calls used in this method, perhaps theres another way
   nsPrintfCString layoutName("%08x", aNativeKeyboardLayout);
   HKL loadedLayout = LoadKeyboardLayoutA(layoutName.get(), KLF_NOTELLSHELL);
   if (loadedLayout == NULL)
@@ -6206,9 +5864,6 @@ nsWindow::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
 
   UnloadKeyboardLayout(loadedLayout);
   return NS_OK;
-#else  //XXX: is there another way to do this?
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
 }
 
 nsresult
@@ -6216,7 +5871,6 @@ nsWindow::SynthesizeNativeMouseEvent(nsIntPoint aPoint,
                                      PRUint32 aNativeMessage,
                                      PRUint32 aModifierFlags)
 {
-#ifndef WINCE // I don't think WINCE supports SendInput
   RECT r;
   ::GetWindowRect(mWnd, &r);
   ::SetCursorPos(r.left + aPoint.x, r.top + aPoint.y);
@@ -6229,9 +5883,6 @@ nsWindow::SynthesizeNativeMouseEvent(nsIntPoint aPoint,
   ::SendInput(1, &input, sizeof(INPUT));
 
   return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
 }
 
 /**************************************************************
@@ -6248,15 +5899,10 @@ BOOL nsWindow::OnInputLangChange(HKL aHKL)
 #ifdef KE_DEBUG
   printf("OnInputLanguageChange\n");
 #endif
-
-#ifndef WINCE
   gKbdLayout.LoadLayout(aHKL);
-#endif
-
   return PR_FALSE;   // always pass to child window
 }
 
-#if !defined(WINCE) // implemented in nsWindowCE.cpp
 void nsWindow::OnWindowPosChanged(WINDOWPOS *wp, PRBool& result)
 {
   if (wp == nsnull)
@@ -6454,9 +6100,7 @@ void nsWindow::ActivateOtherWindowHelper(HWND aWnd)
   // forgotten when we use SW_SHOWMINIMIZED.
   ::PlaySoundW(L"Minimize", nsnull, SND_ALIAS | SND_NODEFAULT | SND_ASYNC);
 }
-#endif // !defined(WINCE)
 
-#if !defined(WINCE)
 void nsWindow::OnWindowPosChanging(LPWINDOWPOS& info)
 {
   // Update non-client margins if the frame size is changing, and let the
@@ -6526,7 +6170,6 @@ void nsWindow::OnWindowPosChanging(LPWINDOWPOS& info)
   if (mWindowType == eWindowType_invisible)
     info->flags &= ~SWP_SHOWWINDOW;
 }
-#endif
 
 void nsWindow::UserActivity()
 {
@@ -6581,7 +6224,6 @@ PRBool nsWindow::OnTouch(WPARAM wParam, LPARAM lParam)
 #endif
 
 // Gesture event processing. Handles WM_GESTURE events.
-#if !defined(WINCE)
 PRBool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)
 {
   // Treatment for pan events which translate into scroll events:
@@ -6653,9 +6295,7 @@ PRBool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)
 
   return PR_TRUE; // Handled
 }
-#endif // !defined(WINCE)
 
-#if !defined(WINCE)
 PRUint16 nsWindow::GetMouseInputSource()
 {
   PRUint16 inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_MOUSE;
@@ -6666,7 +6306,7 @@ PRUint16 nsWindow::GetMouseInputSource()
   }
   return inputSource;
 }
-#endif
+
 /*
  * OnMouseWheel - mouse wheel event processing. This was originally embedded
  * within the message case block. If returning true result should be returned
@@ -6820,14 +6460,11 @@ StringCaseInsensitiveEquals(const PRUnichar* aChars1, const PRUint32 aNumChars1,
 
 UINT nsWindow::MapFromNativeToDOM(UINT aNativeKeyCode)
 {
-#ifndef WINCE
   switch (aNativeKeyCode) {
     case VK_OEM_1:     return NS_VK_SEMICOLON;     // 0xBA, For the US standard keyboard, the ';:' key
     case VK_OEM_PLUS:  return NS_VK_ADD;           // 0xBB, For any country/region, the '+' key
     case VK_OEM_MINUS: return NS_VK_SUBTRACT;      // 0xBD, For any country/region, the '-' key
   }
-#endif
-
   return aNativeKeyCode;
 }
 
@@ -6885,10 +6522,7 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
 {
   UINT virtualKeyCode =
     aMsg.wParam != VK_PROCESSKEY ? aMsg.wParam : ::ImmGetVirtualKey(mWnd);
-
-#ifndef WINCE
   gKbdLayout.OnKeyDown(virtualKeyCode);
-#endif
 
   if (sUseElantechGestureHacks) {
     PerformElantechSwipeGestureHack(virtualKeyCode, aModKeyState);
@@ -6988,11 +6622,7 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
   // confusion between ctrl-enter and ctrl-J.
   if (DOMKeyCode == NS_VK_RETURN || DOMKeyCode == NS_VK_BACK ||
       ((aModKeyState.mIsControlDown || aModKeyState.mIsAltDown)
-#ifdef WINCE
-       ))
-#else
        && !gKbdLayout.IsDeadKey() && KeyboardLayout::IsPrintableCharKey(virtualKeyCode)))
-#endif
   {
     // Remove a possible WM_CHAR or WM_SYSCHAR messages from the message queue.
     // They can be more than one because of:
@@ -7058,7 +6688,6 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
       ::DefWindowProcW(mWnd, msg.message, msg.wParam, msg.lParam);
     return result;
   }
-#ifndef WINCE
   else if (!aModKeyState.mIsControlDown && !aModKeyState.mIsAltDown &&
              (KeyboardLayout::IsPrintableCharKey(virtualKeyCode) ||
               KeyboardLayout::IsNumpadKey(virtualKeyCode)))
@@ -7227,17 +6856,6 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
     DispatchKeyEvent(NS_KEY_PRESS, 0, nsnull, DOMKeyCode, nsnull, aModKeyState,
                      extraFlags);
   }
-#else
-  {
-    UINT unichar = ::MapVirtualKey(virtualKeyCode, MAPVK_VK_TO_CHAR);
-    // Check for dead characters or no mapping
-    if (unichar & 0x80) {
-      return noDefault;
-    }
-    DispatchKeyEvent(NS_KEY_PRESS, unichar, nsnull, DOMKeyCode, nsnull, aModKeyState,
-                     extraFlags);
-  }
-#endif
 
   return noDefault;
 }
@@ -7401,12 +7019,6 @@ nsWindow::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
     nsWindow* w = static_cast<nsWindow*>(configuration.mChild);
     NS_ASSERTION(w->GetParent() == this,
                  "Configured widget is not a child");
-#ifdef WINCE
-    // MSDN says we should do on WinCE this before moving or resizing the window
-    // See http://msdn.microsoft.com/en-us/library/aa930600.aspx
-    // We put the region back just below, anyway.
-    ::SetWindowRgn(w->mWnd, NULL, TRUE);
-#endif
     nsresult rv = w->SetWindowClipRegion(configuration.mClipRegion, PR_TRUE);
     NS_ENSURE_SUCCESS(rv, rv);
     nsIntRect bounds;
@@ -7614,15 +7226,8 @@ void nsWindow::OnDestroy()
     SetupTranslucentWindowMemoryBitmap(eTransparencyOpaque);
 #endif
 
-#if defined(WINCE_HAVE_SOFTKB)
-  // Revert the changes made for the software keyboard settings
-  nsWindowCE::ResetSoftKB(mWnd);
-#endif
-
-#if !defined(WINCE)
   // Finalize panning feedback to possibly restore window displacement
   mGesture.PanFeedbackFinalize(mWnd, PR_TRUE);
-#endif
 
   // Clear the main HWND.
   mWnd = NULL;
@@ -7678,12 +7283,10 @@ PRBool nsWindow::OnResize(nsIntRect &aWindowRect)
   return PR_FALSE;
 }
 
-#if !defined(WINCE) // implemented in nsWindowCE.cpp
 PRBool nsWindow::OnHotKey(WPARAM wParam, LPARAM lParam)
 {
   return PR_TRUE;
 }
-#endif // !defined(WINCE)
 
 void nsWindow::OnSettingsChange(WPARAM wParam, LPARAM lParam)
 {
@@ -8238,11 +7841,6 @@ NS_IMETHODIMP nsWindow::SetInputMode(const IMEContext& aContext)
   PRBool enable = (status == nsIWidget::IME_STATUS_ENABLED ||
                    status == nsIWidget::IME_STATUS_PLUGIN);
 
-#if defined(WINCE_HAVE_SOFTKB)
-  sSoftKeyboardState = (status != nsIWidget::IME_STATUS_DISABLED);
-  nsWindowCE::ToggleSoftKB(mWnd, sSoftKeyboardState);
-#endif
-
   if (!enable != !mOldIMC)
     return NS_OK;
   mOldIMC = ::ImmAssociateContext(mWnd, enable ? mOldIMC : NULL);
@@ -8443,8 +8041,6 @@ void nsWindow::ResizeTranslucentWindow(PRInt32 aNewWidth, PRInt32 aNewHeight, PR
 
 void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
 {
-#ifndef WINCE
-
   if (aMode == mTransparencyMode)
     return;
 
@@ -8498,7 +8094,6 @@ void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
 
   SetupTranslucentWindowMemoryBitmap(aMode);
   UpdateGlass();
-#endif // #ifndef WINCE
 }
 
 void nsWindow::SetupTranslucentWindowMemoryBitmap(nsTransparencyMode aMode)
@@ -8513,7 +8108,6 @@ void nsWindow::SetupTranslucentWindowMemoryBitmap(nsTransparencyMode aMode)
 
 nsresult nsWindow::UpdateTranslucentWindow()
 {
-#ifndef WINCE
   if (mBounds.IsEmpty())
     return NS_OK;
 
@@ -8548,7 +8142,6 @@ nsresult nsWindow::UpdateTranslucentWindow()
   if (!updateSuccesful) {
     return NS_ERROR_FAILURE;
   }
-#endif
 
   return NS_OK;
 }
@@ -8565,7 +8158,6 @@ nsresult nsWindow::UpdateTranslucentWindow()
  **************************************************************
  **************************************************************/
 
-#ifndef WINCE
 // Schedules a timer for a window, so we can rollup after processing the hook event
 void nsWindow::ScheduleHookTimer(HWND aWnd, UINT aMsgId)
 {
@@ -8774,7 +8366,6 @@ VOID CALLBACK nsWindow::HookTimerForPopups(HWND hwnd, UINT uMsg, UINT idEvent, D
     sRollupMsgWnd = NULL;
   }
 }
-#endif // WinCE
 
 BOOL CALLBACK nsWindow::ClearResourcesCallback(HWND aWnd, LPARAM aMsg)
 {
@@ -8809,17 +8400,9 @@ nsWindow::EventIsInsideWindow(UINT Msg, nsWindow* aWindow)
 {
   RECT r;
 
-#ifndef WINCE
   if (Msg == WM_ACTIVATEAPP)
     // don't care about activation/deactivation
     return PR_FALSE;
-#else
-  if (Msg == WM_ACTIVATE)
-    // but on Windows CE we do care about
-    // activation/deactivation because there doesn't exist
-    // cancelable Mouse Activation events
-    return PR_TRUE;
-#endif
 
   ::GetWindowRect(aWindow->mWnd, &r);
   DWORD pos = ::GetMessagePos();
@@ -8839,9 +8422,7 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
 
     if (inMsg == WM_LBUTTONDOWN || inMsg == WM_RBUTTONDOWN || inMsg == WM_MBUTTONDOWN ||
         inMsg == WM_MOUSEWHEEL || inMsg == WM_MOUSEHWHEEL || inMsg == WM_ACTIVATE ||
-        (inMsg == WM_KILLFOCUS && IsDifferentThreadWindow((HWND)inWParam))
-#ifndef WINCE
-        ||
+        (inMsg == WM_KILLFOCUS && IsDifferentThreadWindow((HWND)inWParam)) ||
         inMsg == WM_NCRBUTTONDOWN ||
         inMsg == WM_MOVING ||
         inMsg == WM_SIZING ||
@@ -8849,9 +8430,7 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
         inMsg == WM_NCMBUTTONDOWN ||
         inMsg == WM_MOUSEACTIVATE ||
         inMsg == WM_ACTIVATEAPP ||
-        inMsg == WM_MENUSELECT
-#endif
-        )
+        inMsg == WM_MENUSELECT)
     {
       // Rollup if the event is outside the popup.
       PRBool rollup = !nsWindow::EventIsInsideWindow(inMsg, (nsWindow*)sRollupWidget);
@@ -8888,7 +8467,6 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
         } // if rollup listener knows about menus
       }
 
-#ifndef WINCE
       if (inMsg == WM_MOUSEACTIVATE && popupsToRollup == PR_UINT32_MAX) {
         // Prevent the click inside the popup from causing a change in window
         // activation. Since the popup is shown non-activated, we need to eat
@@ -8915,9 +8493,7 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
         }
       }
       // if we've still determined that we should still rollup everything, do it.
-      else
-#endif
-      if ( rollup ) {
+      else if (rollup) {
         // sRollupConsumeEvent may be modified by
         // nsIRollupListener::Rollup.
         PRBool consumeRollupEvent = sRollupConsumeEvent;
@@ -8937,7 +8513,6 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
           *outResult = MA_ACTIVATE;
 
           // However, don't activate panels
-#ifndef WINCE
           if (inMsg == WM_MOUSEACTIVATE) {
             nsWindow* activateWindow = GetNSWindowPtr(inWnd);
             if (activateWindow) {
@@ -8948,11 +8523,8 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
               }
             }
           }
-#endif
-
           return TRUE;
         }
-#ifndef WINCE
         // if we are only rolling up some popups, don't activate and don't let
         // the event go through. This prevents clicks menus higher in the
         // chain from opening when a context menu is open
@@ -8960,7 +8532,6 @@ nsWindow::DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam, LPARAM inLPara
           *outResult = MA_NOACTIVATEANDEAT;
           return TRUE;
         }
-#endif
       }
     } // if event that might trigger a popup to rollup
   } // if rollup listeners registered
@@ -8989,9 +8560,6 @@ nsModifierKeyState::nsModifierKeyState()
 
 PRInt32 nsWindow::GetWindowsVersion()
 {
-#ifdef WINCE
-  return 0x500;
-#else
   static PRInt32 version = 0;
   static PRBool didCheck = PR_FALSE;
 
@@ -9005,7 +8573,6 @@ PRInt32 nsWindow::GetWindowsVersion()
     version = (osInfo.dwMajorVersion & 0xff) << 8 | (osInfo.dwMinorVersion & 0xff);
   }
   return version;
-#endif
 }
 
 // Note that the result of GetTopLevelWindow method can be different from the
@@ -9060,18 +8627,6 @@ HWND nsWindow::GetTopLevelHWND(HWND aWnd, PRBool aStopOnDialogOrPopup)
     }
 
     upWnd = ::GetParent(curWnd); // Parent or owner (if has no parent)
-
-#ifdef WINCE
-    // For dialog windows, we want just the parent, not the owner.
-    // For other/popup windows, we want to find the first owner/parent
-    // that's a dialog and/or has an owner.
-    if (upWnd && ::GetWindow(curWnd, GW_OWNER) == upWnd) {
-      DWORD_PTR style = ::GetWindowLongPtrW(curWnd, GWL_STYLE);
-      if ((style & WS_DLGFRAME) != 0)
-        break;
-    }
-#endif
-
     curWnd = upWnd;
   }
 
@@ -9167,7 +8722,6 @@ PRBool nsWindow::UseTrackPointHack()
                                 sDefaultTrackPointHack);
 }
 
-#if !defined(WINCE)
 static PRBool
 HasRegistryKey(HKEY aRoot, PRUnichar* aName)
 {
@@ -9281,7 +8835,6 @@ void nsWindow::InitInputWorkaroundPrefDefaults()
     GetInputWorkaroundPref("ui.elantech_gesture_hacks.enabled",
                            IsObsoleteElantechDriver());
 }
-#endif // #if !defined(WINCE)
 
 LPARAM nsWindow::lParamToScreen(LPARAM lParam)
 {
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 63ec62311ba9..3c8db6b2e48e 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -65,13 +65,7 @@
 #include "gfxD2DSurface.h"
 #endif
 
-#if !defined(WINCE)
 #include "nsWinGesture.h"
-#endif
-
-#if defined(WINCE)
-#include "nsWindowCE.h"
-#endif
 
 #include "WindowHook.h"
 #include "TaskbarWindowPreview.h"
@@ -81,9 +75,8 @@
 #include "nsAccessible.h"
 #endif
 
-#if !defined(WINCE)
 #include "nsUXThemeData.h"
-#endif // !defined(WINCE)
+
 /**
  * Forward class definitions
  */
@@ -133,9 +126,7 @@ public:
   NS_IMETHOD              Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
   NS_IMETHOD              Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
   NS_IMETHOD              ResizeClient(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
-#if !defined(WINCE)
   NS_IMETHOD              BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVertical);
-#endif
   NS_IMETHOD              PlaceBehind(nsTopLevelWidgetZPlacement aPlacement, nsIWidget *aWidget, PRBool aActivate);
   NS_IMETHOD              SetSizeMode(PRInt32 aMode);
   NS_IMETHOD              Enable(PRBool aState);
@@ -301,10 +292,8 @@ protected:
   static BOOL CALLBACK    BroadcastMsgToChildren(HWND aWnd, LPARAM aMsg);
   static BOOL CALLBACK    BroadcastMsg(HWND aTopWindow, LPARAM aMsg);
   static BOOL CALLBACK    DispatchStarvedPaints(HWND aTopWindow, LPARAM aMsg);
-#if !defined(WINCE)
   static BOOL CALLBACK    RegisterTouchForDescendants(HWND aTopWindow, LPARAM aMsg);
   static BOOL CALLBACK    UnregisterTouchForDescendants(HWND aTopWindow, LPARAM aMsg);
-#endif
   static LRESULT CALLBACK MozSpecialMsgFilter(int code, WPARAM wParam, LPARAM lParam);
   static LRESULT CALLBACK MozSpecialWndProc(int code, WPARAM wParam, LPARAM lParam);
   static LRESULT CALLBACK MozSpecialMouseProc(int code, WPARAM wParam, LPARAM lParam);
@@ -330,9 +319,7 @@ protected:
   void                    ResetLayout();
   void                    InvalidateNonClientRegion();
   HRGN                    ExcludeNonClientFromPaintRegion(HRGN aRegion);
-#if !defined(WINCE)
   static void             InitInputWorkaroundPrefDefaults();
-#endif
   static PRBool           GetInputWorkaroundPref(const char* aPrefName, PRBool aValueIfAutomatic);
   static PRBool           UseTrackPointHack();
   static void             PerformElantechSwipeGestureHack(UINT& aVirtualKeyCode, nsModifierKeyState& aModKeyState);
@@ -428,9 +415,7 @@ protected:
   PRBool                  OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, 
                                        PRBool& result, PRBool& getWheelInfo,
                                        LRESULT *aRetValue);
-#if !defined(WINCE)
   void                    OnWindowPosChanging(LPWINDOWPOS& info);
-#endif // !defined(WINCE)
 
   /**
    * Function that registers when the user has been active (used for detecting
@@ -490,10 +475,8 @@ protected:
                                               PRBool aIntersectWithExisting);
   nsIntRegion             GetRegionToPaint(PRBool aForceFullRepaint, 
                                            PAINTSTRUCT ps, HDC aDC);
-#if !defined(WINCE)
   static void             ActivateOtherWindowHelper(HWND aWnd);
   static PRUint16         GetMouseInputSource();
-#endif
 #ifdef ACCESSIBILITY
   static STDMETHODIMP_(LRESULT) LresultFromObject(REFIID riid, WPARAM wParam, LPUNKNOWN pAcc);
 #endif // ACCESSIBILITY
@@ -614,9 +597,7 @@ protected:
 #endif // MOZ_XUL
 
   // Win7 Gesture processing and management
-#if !defined(WINCE)
   nsWinGesture          mGesture;
-#endif // !defined(WINCE)
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   // Weak ref to the nsITaskbarWindowPreview associated with this window
@@ -626,10 +607,6 @@ protected:
   PRBool                mHasTaskbarIconBeenCreated;
 #endif
 
-#if defined(WINCE_HAVE_SOFTKB)
-  static PRBool         sSoftKeyboardState;
-#endif // defined(WINCE_HAVE_SOFTKB)
-
 #ifdef ACCESSIBILITY
   static BOOL           sIsAccessibilityOn;
   static HINSTANCE      sAccLib;
diff --git a/widget/src/windows/nsWindowDefs.h b/widget/src/windows/nsWindowDefs.h
index 52778cf2a9f0..3bd48bc2eb86 100644
--- a/widget/src/windows/nsWindowDefs.h
+++ b/widget/src/windows/nsWindowDefs.h
@@ -169,24 +169,11 @@
    */
 #endif // #ifndef APPCOMMAND_BROWSER_BACKWARD
 
-#if defined(WINCE)
-#ifndef RDW_NOINTERNALPAINT
-#define RDW_NOINTERNALPAINT     0
-#endif
-#ifndef ERROR
-#define ERROR 0
-#endif
-#endif // defined(WINCE)
-
 //Tablet PC Mouse Input Source
-#if !defined(WINCE)
 #define TABLET_INK_SIGNATURE 0xFFFFFF00
 #define TABLET_INK_CHECK     0xFF515700
 #define TABLET_INK_TOUCH     0x00000080
 #define MOUSE_INPUT_SOURCE() GetMouseInputSource()
-#else
-#define MOUSE_INPUT_SOURCE() nsIDOMNSMouseEvent::MOZ_SOURCE_MOUSE
-#endif
 
 /**************************************************************
  *
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index 0fdc4a77bed0..827ba170a1e2 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -76,10 +76,8 @@ using mozilla::plugins::PluginInstanceParent;
 #include "LayerManagerD3D10.h"
 #endif
 
-#ifndef WINCE
 #include "nsUXThemeData.h"
 #include "nsUXThemeConstants.h"
-#endif
 
 extern "C" {
 #include "pixman.h"
@@ -164,23 +162,11 @@ nsWindowGfx::ConvertHRGNToRegion(HRGN aRgn)
 
 void nsWindowGfx::OnSettingsChangeGfx(WPARAM wParam)
 {
-#if defined(WINCE_WINDOWS_MOBILE)
-  if (wParam == SETTINGCHANGE_RESET) {
-    if (glpDDSecondary) {
-      glpDDSecondary->Release();
-      glpDDSecondary = NULL;
-    }
-
-    if(glpDD)
-      glpDD->RestoreAllSurfaces();
-  }
-#endif
+  // Previously contained only an ifdef WINCE_WINDOWS_MOBILE
+  // TODO: Remove this and adjust references
 }
 
 // GetRegionToPaint returns the invalidated region that needs to be painted
-// it's abstracted out because Windows XP/Vista/7 handles this for us, but
-// we need to keep track of it our selves for Windows CE and Windows Mobile
-
 nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
                                        PAINTSTRUCT ps, HDC aDC)
 {
@@ -190,14 +176,9 @@ nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
     return nsIntRegion(nsWindowGfx::ToIntRect(paintRect));
   }
 
-#if defined(WINCE_WINDOWS_MOBILE) || !defined(WINCE)
   HRGN paintRgn = ::CreateRectRgn(0, 0, 0, 0);
   if (paintRgn != NULL) {
-# ifdef WINCE
-    int result = GetUpdateRgn(mWnd, paintRgn, FALSE);
-# else
     int result = GetRandomRgn(aDC, paintRgn, SYSRGN);
-# endif
     if (result == 1) {
       POINT pt = {0,0};
       ::MapWindowPoints(NULL, mWnd, &pt, 1);
@@ -205,12 +186,8 @@ nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
     }
     nsIntRegion rgn(nsWindowGfx::ConvertHRGNToRegion(paintRgn));
     ::DeleteObject(paintRgn);
-# ifdef WINCE
-    if (!rgn.IsEmpty())
-# endif
-      return rgn;
+    return rgn;
   }
-#endif
   return nsIntRegion(nsWindowGfx::ToIntRect(ps.rcPaint));
 }
 
@@ -432,15 +409,12 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
             thebesContext->Paint();
             thebesContext->SetOperator(gfxContext::OPERATOR_OVER);
           }
-#ifdef WINCE
-          thebesContext->SetFlag(gfxContext::FLAG_SIMPLIFY_OPERATORS);
-#endif
 
           // don't need to double buffer with anything but GDI
           BasicLayerManager::BufferMode doubleBuffering =
             BasicLayerManager::BUFFER_NONE;
           if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI)) {
-# if defined(MOZ_XUL) && !defined(WINCE)
+#ifdef MOZ_XUL
             switch (mTransparencyMode) {
               case eTransparencyGlass:
               case eTransparencyBorderlessGlass:
@@ -627,7 +601,7 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
 
   mPaintDC = nsnull;
 
-#if defined(WIDGET_DEBUG_OUTPUT) && !defined(WINCE)
+#if defined(WIDGET_DEBUG_OUTPUT)
   if (debug_WantPaintFlashing())
   {
     // Only flash paint events which have not ignored the paint message.
@@ -642,7 +616,7 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
     ::ReleaseDC(mWnd, debugPaintFlashDC);
     ::DeleteObject(debugPaintFlashRegion);
   }
-#endif // WIDGET_DEBUG_OUTPUT && !WINCE
+#endif // WIDGET_DEBUG_OUTPUT
 
   mPainting = PR_FALSE;
 
@@ -735,9 +709,6 @@ PRUint8* nsWindowGfx::Data32BitTo1Bit(PRUint8* aImageData,
 
 PRBool nsWindowGfx::IsCursorTranslucencySupported()
 {
-#ifdef WINCE
-  return PR_FALSE;
-#else
   static PRBool didCheck = PR_FALSE;
   static PRBool isSupported = PR_FALSE;
   if (!didCheck) {
@@ -747,7 +718,6 @@ PRBool nsWindowGfx::IsCursorTranslucencySupported()
   }
 
   return isSupported;
-#endif
 }
 
 /**
@@ -770,7 +740,6 @@ HBITMAP nsWindowGfx::DataToBitmap(PRUint8* aImageData,
                                   PRUint32 aHeight,
                                   PRUint32 aDepth)
 {
-#ifndef WINCE
   HDC dc = ::GetDC(NULL);
 
   if (aDepth == 32 && IsCursorTranslucencySupported()) {
@@ -831,7 +800,4 @@ HBITMAP nsWindowGfx::DataToBitmap(PRUint8* aImageData,
   HBITMAP bmp = ::CreateDIBitmap(dc, &head, CBM_INIT, aImageData, &bi, DIB_RGB_COLORS);
   ::ReleaseDC(NULL, dc);
   return bmp;
-#else
-  return nsnull;
-#endif
 }
diff --git a/widget/src/xpwidgets/nsClipboardPrivacyHandler.cpp b/widget/src/xpwidgets/nsClipboardPrivacyHandler.cpp
index c983f8b4bacf..e2669667d941 100644
--- a/widget/src/xpwidgets/nsClipboardPrivacyHandler.cpp
+++ b/widget/src/xpwidgets/nsClipboardPrivacyHandler.cpp
@@ -48,7 +48,7 @@
 #include "nsXPCOM.h"
 #include "mozilla/Services.h"
 
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
 #include <ole2.h>
 #endif
 
@@ -110,7 +110,7 @@ nsClipboardPrivacyHandler::Observe(nsISupports *aSubject, char const *aTopic, PR
                                            nsIClipboard::kGlobalClipboard,
                                            &haveFlavors);
     if (NS_SUCCEEDED(rv) && haveFlavors) {
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
       // Workaround for bug 518412.  On Windows 7 x64, there is a bug
       // in handling clipboard data without any formats between
       // 32-bit/64-bit boundaries, which could lead Explorer to crash.
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index b80064c7bf3b..a72a42f76a50 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -112,7 +112,6 @@ _CHROME_FILES += native_menus_window.xul \
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifneq ($(OS_ARCH), WINCE)
 _CHROME_FILES  += taskbar_previews.xul \
 		window_state_windows.xul \
 		taskbar_progress.xul \
@@ -124,7 +123,6 @@ _CHROME_FILES  += taskbar_previews.xul \
 _TEST_FILES +=	test_bug565392.html \
 		$(NULL)
 endif
-endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 _TEST_FILES += 	plugin_scroll_invalidation.html \

From 1c4d6bdef0ae098753b71cb909558733e8149f04 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 24 Apr 2011 20:10:14 -0700
Subject: [PATCH 444/509] Bug 473687 - Remove widget WinCE support: Part C
 (Remove ENABLE_IME_MOUSE_HANDLING); r=dougt

---
 widget/src/windows/nsIMM32Handler.cpp | 13 -------------
 widget/src/windows/nsIMM32Handler.h   |  4 ----
 2 files changed, 17 deletions(-)

diff --git a/widget/src/windows/nsIMM32Handler.cpp b/widget/src/windows/nsIMM32Handler.cpp
index e9a04c868d73..43f56107e770 100644
--- a/widget/src/windows/nsIMM32Handler.cpp
+++ b/widget/src/windows/nsIMM32Handler.cpp
@@ -67,7 +67,6 @@ static nsIMM32Handler* gIMM32Handler = nsnull;
 PRLogModuleInfo* gIMM32Log = nsnull;
 #endif
 
-#ifdef ENABLE_IME_MOUSE_HANDLING
 static UINT sWM_MSIME_MOUSE = 0; // mouse message for MSIME 98/2000
 
 //-------------------------------------------------------------------------
@@ -86,8 +85,6 @@ static UINT sWM_MSIME_MOUSE = 0; // mouse message for MSIME 98/2000
 #define IMEMOUSE_WUP        0x10    // wheel up
 #define IMEMOUSE_WDOWN      0x20    // wheel down
 
-#endif
-
 PRPackedBool nsIMM32Handler::sIsStatusChanged = PR_FALSE;
 PRPackedBool nsIMM32Handler::sIsIME = PR_TRUE;
 PRPackedBool nsIMM32Handler::sIsIMEOpening = PR_FALSE;
@@ -111,12 +108,9 @@ nsIMM32Handler::Initialize()
     gIMM32Log = PR_NewLogModule("nsIMM32HandlerWidgets");
 #endif
 
-#ifdef ENABLE_IME_MOUSE_HANDLING
   if (!sWM_MSIME_MOUSE) {
     sWM_MSIME_MOUSE = ::RegisterWindowMessage(RWM_MOUSE);
   }
-#endif
-
   InitKeyboardLayout(::GetKeyboardLayout(0));
 }
 
@@ -382,7 +376,6 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
 
   *aRetValue = 0;
   switch (msg) {
-#ifdef ENABLE_IME_MOUSE_HANDLING
     case WM_LBUTTONDOWN:
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN: {
@@ -398,7 +391,6 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
       aEatMessage = PR_FALSE;
       return PR_TRUE;
     }
-#endif // ENABLE_IME_MOUSE_HANDLING
     case WM_INPUTLANGCHANGE:
       return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
                                            aRetValue, aEatMessage);
@@ -2029,9 +2021,6 @@ nsIMM32Handler::ResolveIMECaretPos(nsIWidget* aReferenceWidget,
     aOutRect.MoveBy(-aNewOriginWidget->WidgetToScreenOffset());
 }
 
-
-#ifdef ENABLE_IME_MOUSE_HANDLING
-
 PRBool
 nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
 {
@@ -2079,8 +2068,6 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
                         (LPARAM) IMEContext.get()) == 1;
 }
 
-#endif // ENABLE_IME_MOUSE_HANDLING
-
 /* static */ PRBool
 nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
                                PRBool &aEatMessage)
diff --git a/widget/src/windows/nsIMM32Handler.h b/widget/src/windows/nsIMM32Handler.h
index 4b3ce5a2bc6e..aa47c511c2a9 100644
--- a/widget/src/windows/nsIMM32Handler.h
+++ b/widget/src/windows/nsIMM32Handler.h
@@ -57,8 +57,6 @@ class nsIWidget;
 class nsWindow;
 struct nsIntRect;
 
-#define ENABLE_IME_MOUSE_HANDLING 1
-
 #define NS_WM_IMEFIRST WM_IME_SETCONTEXT
 #define NS_WM_IMELAST  WM_IME_KEYUP
 
@@ -172,9 +170,7 @@ protected:
 
   // The result of following On*Event methods means "The message was processed,
   // don't process the message in the caller (nsWindow)".
-#ifdef ENABLE_IME_MOUSE_HANDLING
   PRBool OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction);
-#endif // ENABLE_IME_MOUSE_HANDLING
   static PRBool OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
                                PRBool &aEatMessage);
 

From d7dac11206d7b25a14d365c262240402a2ab02b4 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 24 Apr 2011 20:10:16 -0700
Subject: [PATCH 445/509] Bug 473687 - Remove widget WinCE support: Part D
 (Remove nsWindowGfx::OnSettingsChangeGfx & nsWindow::OnSettingsChange);
 r=dougt

---
 widget/src/windows/nsWindow.cpp    | 8 --------
 widget/src/windows/nsWindow.h      | 1 -
 widget/src/windows/nsWindowGfx.cpp | 6 ------
 widget/src/windows/nsWindowGfx.h   | 1 -
 4 files changed, 16 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index bc5aaefa39c6..31b698cc16e4 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -5213,7 +5213,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 
     case WM_SETTINGCHANGE:
       getWheelInfo = PR_TRUE;
-      OnSettingsChange(wParam, lParam);
       break;
 
     case WM_INPUTLANGCHANGEREQUEST:
@@ -7288,13 +7287,6 @@ PRBool nsWindow::OnHotKey(WPARAM wParam, LPARAM lParam)
   return PR_TRUE;
 }
 
-void nsWindow::OnSettingsChange(WPARAM wParam, LPARAM lParam)
-{
-  if (mWindowType == eWindowType_dialog ||
-      mWindowType == eWindowType_toplevel )
-    nsWindowGfx::OnSettingsChangeGfx(wParam);
-}
-
 /* static */
 PRBool nsWindow::IsOurProcessWindow(HWND aHWND)
 {
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 3c8db6b2e48e..db51701212c3 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -409,7 +409,6 @@ protected:
 #endif
   PRBool                  OnHotKey(WPARAM wParam, LPARAM lParam);
   BOOL                    OnInputLangChange(HKL aHKL);
-  void                    OnSettingsChange(WPARAM wParam, LPARAM lParam);
   PRBool                  OnPaint(HDC aDC, PRUint32 aNestingLevel);
   void                    OnWindowPosChanged(WINDOWPOS *wp, PRBool& aResult);
   PRBool                  OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, 
diff --git a/widget/src/windows/nsWindowGfx.cpp b/widget/src/windows/nsWindowGfx.cpp
index 827ba170a1e2..74180d7b058b 100644
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -160,12 +160,6 @@ nsWindowGfx::ConvertHRGNToRegion(HRGN aRgn)
  **************************************************************
  **************************************************************/
 
-void nsWindowGfx::OnSettingsChangeGfx(WPARAM wParam)
-{
-  // Previously contained only an ifdef WINCE_WINDOWS_MOBILE
-  // TODO: Remove this and adjust references
-}
-
 // GetRegionToPaint returns the invalidated region that needs to be painted
 nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
                                        PAINTSTRUCT ps, HDC aDC)
diff --git a/widget/src/windows/nsWindowGfx.h b/widget/src/windows/nsWindowGfx.h
index c15caf58561e..2fb957b5a31d 100644
--- a/widget/src/windows/nsWindowGfx.h
+++ b/widget/src/windows/nsWindowGfx.h
@@ -59,7 +59,6 @@ public:
   }
 
   static nsIntRegion ConvertHRGNToRegion(HRGN aRgn);
-  static void OnSettingsChangeGfx(WPARAM wParam);
 
   static nsresult CreateIcon(imgIContainer *aContainer, PRBool aIsCursor, PRUint32 aHotspotX, PRUint32 aHotspotY, HICON *aIcon);
 

From b40b0293ca0ba59a4cafa0c5ec902b75ae3cb9e6 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 18 Apr 2011 09:51:18 +0900
Subject: [PATCH 446/509] Bug 571739 - Use SIMD for conversion from RGB to YUV
 on Win64. r=kinetik

---
 gfx/ycbcr/Makefile.in       |   5 +
 gfx/ycbcr/README            |   2 +
 gfx/ycbcr/update.sh         |   1 +
 gfx/ycbcr/win64.patch       | 210 ++++++++++++++++++++++++++++++++++++
 gfx/ycbcr/yuv_row_win64.cpp | 205 +++++++++++++++++++++++++++++++++++
 5 files changed, 423 insertions(+)
 create mode 100644 gfx/ycbcr/win64.patch
 create mode 100644 gfx/ycbcr/yuv_row_win64.cpp

diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index a7b0a10f6870..2ebe9d3b1925 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -53,8 +53,13 @@ endif
 
 
 ifdef _MSC_VER
+ifeq ($(OS_TEST),x86_64)
+CPPSRCS += yuv_row_win64.cpp \
+           $(NULL)
+else
 CPPSRCS += yuv_row_win.cpp \
            $(NULL)
+endif
 else
 ifeq ($(OS_ARCH),Linux)
 CPPSRCS += yuv_row_posix.cpp \
diff --git a/gfx/ycbcr/README b/gfx/ycbcr/README
index 16390e427125..4bbcd0c88ead 100644
--- a/gfx/ycbcr/README
+++ b/gfx/ycbcr/README
@@ -21,3 +21,5 @@ convert.patch contains the following changes:
   * Bug 619178 - Update CPU detection in yuv_convert to new SSE.h interface.
   * Bug 616778 - Split yuv_convert FilterRows vectorized code into separate files so it can
     be properly guarded with cpuid() calls.
+
+win64.patch: SSE2 optimization for Microsoft Visual C++ x64 version
diff --git a/gfx/ycbcr/update.sh b/gfx/ycbcr/update.sh
index cf64f4a9aacf..54f223683dfe 100644
--- a/gfx/ycbcr/update.sh
+++ b/gfx/ycbcr/update.sh
@@ -7,3 +7,4 @@ cp $1/media/base/yuv_row_posix.cc yuv_row_posix.cpp
 cp $1/media/base/yuv_row_win.cc yuv_row_win.cpp
 cp $1/media/base/yuv_row_posix.cc yuv_row_c.cpp
 patch -p3 <convert.patch
+patch -p3 <win64.patch
diff --git a/gfx/ycbcr/win64.patch b/gfx/ycbcr/win64.patch
new file mode 100644
index 000000000000..f182987d8edd
--- /dev/null
+++ b/gfx/ycbcr/win64.patch
@@ -0,0 +1,210 @@
+diff --git a/gfx/ycbcr/yuv_row_win64.cpp b/gfx/ycbcr/yuv_row_win64.cpp
+new file mode 100644
+--- /dev/null
++++ b/gfx/ycbcr/yuv_row_win64.cpp
+@@ -0,0 +1,205 @@
++// Copyright (c) 2010 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "yuv_row.h"
++
++extern "C" {
++
++// x64 compiler does'nt support MMX and inline assembler.  Use SSE2 intrin.
++
++#define kCoefficientsRgbU (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 2048)
++#define kCoefficientsRgbV (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 4096)
++
++#include <emmintrin.h>
++
++static void FastConvertYUVToRGB32Row_SSE2(const uint8* y_buf,
++                                          const uint8* u_buf,
++                                          const uint8* v_buf,
++                                          uint8* rgb_buf,
++                                          int width) {
++  __m128i xmm0, xmmY1, xmmY2;
++  __m128  xmmY;
++
++  while (width >= 2) {
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * *u_buf++)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * *v_buf++)));
++
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf++));
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++
++    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf++));
++    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
++
++    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
++                          0x44);
++    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++
++    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
++    rgb_buf += 8;
++    width -= 2;
++  }
++
++  if (width) {
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * *u_buf)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * *v_buf)));
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf));
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++    xmmY1 = _mm_srai_epi16(xmmY1, 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
++  }
++}
++
++static void ScaleYUVToRGB32Row_SSE2(const uint8* y_buf,
++                                    const uint8* u_buf,
++                                    const uint8* v_buf,
++                                    uint8* rgb_buf,
++                                    int width,
++                                    int source_dx) {
++  __m128i xmm0, xmmY1, xmmY2;
++  __m128  xmmY;
++  uint8 u, v, y;
++  int x = 0;
++
++  while (width >= 2) {
++    u = u_buf[x >> 17];
++    v = v_buf[x >> 17];
++    y = y_buf[x >> 16];
++    x += source_dx;
++
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++
++    y = y_buf[x >> 16];
++    x += source_dx;
++
++    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
++
++    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
++                          0x44);
++    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++
++    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
++    rgb_buf += 8;
++    width -= 2;
++  }
++
++  if (width) {
++    u = u_buf[x >> 17];
++    v = v_buf[x >> 17];
++    y = y_buf[x >> 16];
++
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++    xmmY1 = _mm_srai_epi16(xmmY1, 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
++  }
++}
++
++static void LinearScaleYUVToRGB32Row_SSE2(const uint8* y_buf,
++                                          const uint8* u_buf,
++                                          const uint8* v_buf,
++                                          uint8* rgb_buf,
++                                          int width,
++                                          int source_dx) {
++  __m128i xmm0, xmmY1, xmmY2;
++  __m128  xmmY;
++  uint8 u0, u1, v0, v1, y0, y1;
++  uint32 uv_frac, y_frac, u, v, y;
++  int x = 0;
++
++  if (source_dx >= 0x20000) {
++    x = 32768;
++  }
++
++  while(width >= 2) {
++    u0 = u_buf[x >> 17];
++    u1 = u_buf[(x >> 17) + 1];
++    v0 = v_buf[x >> 17];
++    v1 = v_buf[(x >> 17) + 1];
++    y0 = y_buf[x >> 16];
++    y1 = y_buf[(x >> 16) + 1];
++    uv_frac = (x & 0x1fffe);
++    y_frac = (x & 0xffff);
++    u = (uv_frac * u1 + (uv_frac ^ 0x1fffe) * u0) >> 17;
++    v = (uv_frac * v1 + (uv_frac ^ 0x1fffe) * v0) >> 17;
++    y = (y_frac * y1 + (y_frac ^ 0xffff) * y0) >> 16;
++    x += source_dx;
++
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++
++    y0 = y_buf[x >> 16];
++    y1 = y_buf[(x >> 16) + 1];
++    y_frac = (x & 0xffff);
++    y = (y_frac * y1 + (y_frac ^ 0xffff) * y0) >> 16;
++    x += source_dx;
++
++    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
++
++    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
++                          0x44);
++    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++
++    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
++    rgb_buf += 8;
++    width -= 2;
++  }
++
++  if (width) {
++    u = u_buf[x >> 17];
++    v = v_buf[x >> 17];
++    y = y_buf[x >> 16];
++
++    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
++                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
++    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
++
++    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
++    xmmY1 = _mm_srai_epi16(xmmY1, 6);
++    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
++    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
++  }
++}
++
++void FastConvertYUVToRGB32Row(const uint8* y_buf,
++                              const uint8* u_buf,
++                              const uint8* v_buf,
++                              uint8* rgb_buf,
++                              int width) {
++  FastConvertYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width);
++}
++
++void ScaleYUVToRGB32Row(const uint8* y_buf,
++                        const uint8* u_buf,
++                        const uint8* v_buf,
++                        uint8* rgb_buf,
++                        int width,
++                        int source_dx) {
++  ScaleYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width, source_dx);
++}
++
++void LinearScaleYUVToRGB32Row(const uint8* y_buf,
++                              const uint8* u_buf,
++                              const uint8* v_buf,
++                              uint8* rgb_buf,
++                              int width,
++                              int source_dx) {
++  LinearScaleYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width,
++                                source_dx);
++}
++
++} // extern "C"
diff --git a/gfx/ycbcr/yuv_row_win64.cpp b/gfx/ycbcr/yuv_row_win64.cpp
new file mode 100644
index 000000000000..fc6c8db64cd9
--- /dev/null
+++ b/gfx/ycbcr/yuv_row_win64.cpp
@@ -0,0 +1,205 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "yuv_row.h"
+
+extern "C" {
+
+// x64 compiler doesn't support MMX and inline assembler.  Use SSE2 intrinsics.
+
+#define kCoefficientsRgbU (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 2048)
+#define kCoefficientsRgbV (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 4096)
+
+#include <emmintrin.h>
+
+static void FastConvertYUVToRGB32Row_SSE2(const uint8* y_buf,
+                                          const uint8* u_buf,
+                                          const uint8* v_buf,
+                                          uint8* rgb_buf,
+                                          int width) {
+  __m128i xmm0, xmmY1, xmmY2;
+  __m128  xmmY;
+
+  while (width >= 2) {
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * *u_buf++)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * *v_buf++)));
+
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf++));
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+
+    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf++));
+    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
+
+    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
+                          0x44);
+    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+
+    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
+    rgb_buf += 8;
+    width -= 2;
+  }
+
+  if (width) {
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * *u_buf)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * *v_buf)));
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * *y_buf));
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+    xmmY1 = _mm_srai_epi16(xmmY1, 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
+  }
+}
+
+static void ScaleYUVToRGB32Row_SSE2(const uint8* y_buf,
+                                    const uint8* u_buf,
+                                    const uint8* v_buf,
+                                    uint8* rgb_buf,
+                                    int width,
+                                    int source_dx) {
+  __m128i xmm0, xmmY1, xmmY2;
+  __m128  xmmY;
+  uint8 u, v, y;
+  int x = 0;
+
+  while (width >= 2) {
+    u = u_buf[x >> 17];
+    v = v_buf[x >> 17];
+    y = y_buf[x >> 16];
+    x += source_dx;
+
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+
+    y = y_buf[x >> 16];
+    x += source_dx;
+
+    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
+
+    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
+                          0x44);
+    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+
+    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
+    rgb_buf += 8;
+    width -= 2;
+  }
+
+  if (width) {
+    u = u_buf[x >> 17];
+    v = v_buf[x >> 17];
+    y = y_buf[x >> 16];
+
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+    xmmY1 = _mm_srai_epi16(xmmY1, 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
+  }
+}
+
+static void LinearScaleYUVToRGB32Row_SSE2(const uint8* y_buf,
+                                          const uint8* u_buf,
+                                          const uint8* v_buf,
+                                          uint8* rgb_buf,
+                                          int width,
+                                          int source_dx) {
+  __m128i xmm0, xmmY1, xmmY2;
+  __m128  xmmY;
+  uint8 u0, u1, v0, v1, y0, y1;
+  uint32 uv_frac, y_frac, u, v, y;
+  int x = 0;
+
+  if (source_dx >= 0x20000) {
+    x = 32768;
+  }
+
+  while(width >= 2) {
+    u0 = u_buf[x >> 17];
+    u1 = u_buf[(x >> 17) + 1];
+    v0 = v_buf[x >> 17];
+    v1 = v_buf[(x >> 17) + 1];
+    y0 = y_buf[x >> 16];
+    y1 = y_buf[(x >> 16) + 1];
+    uv_frac = (x & 0x1fffe);
+    y_frac = (x & 0xffff);
+    u = (uv_frac * u1 + (uv_frac ^ 0x1fffe) * u0) >> 17;
+    v = (uv_frac * v1 + (uv_frac ^ 0x1fffe) * v0) >> 17;
+    y = (y_frac * y1 + (y_frac ^ 0xffff) * y0) >> 16;
+    x += source_dx;
+
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+
+    y0 = y_buf[x >> 16];
+    y1 = y_buf[(x >> 16) + 1];
+    y_frac = (x & 0xffff);
+    y = (y_frac * y1 + (y_frac ^ 0xffff) * y0) >> 16;
+    x += source_dx;
+
+    xmmY2 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+    xmmY2 = _mm_adds_epi16(xmmY2, xmm0);
+
+    xmmY = _mm_shuffle_ps(_mm_castsi128_ps(xmmY1), _mm_castsi128_ps(xmmY2),
+                          0x44);
+    xmmY1 = _mm_srai_epi16(_mm_castps_si128(xmmY), 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+
+    _mm_storel_epi64(reinterpret_cast<__m128i*>(rgb_buf), xmmY1);
+    rgb_buf += 8;
+    width -= 2;
+  }
+
+  if (width) {
+    u = u_buf[x >> 17];
+    v = v_buf[x >> 17];
+    y = y_buf[x >> 16];
+
+    xmm0 = _mm_adds_epi16(_mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbU + 8 * u)),
+                          _mm_loadl_epi64(reinterpret_cast<__m128i*>(kCoefficientsRgbV + 8 * v)));
+    xmmY1 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(reinterpret_cast<uint8*>(kCoefficientsRgbY) + 8 * y));
+
+    xmmY1 = _mm_adds_epi16(xmmY1, xmm0);
+    xmmY1 = _mm_srai_epi16(xmmY1, 6);
+    xmmY1 = _mm_packus_epi16(xmmY1, xmmY1);
+    *reinterpret_cast<uint32*>(rgb_buf) = _mm_cvtsi128_si32(xmmY1);
+  }
+}
+
+void FastConvertYUVToRGB32Row(const uint8* y_buf,
+                              const uint8* u_buf,
+                              const uint8* v_buf,
+                              uint8* rgb_buf,
+                              int width) {
+  FastConvertYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width);
+}
+
+void ScaleYUVToRGB32Row(const uint8* y_buf,
+                        const uint8* u_buf,
+                        const uint8* v_buf,
+                        uint8* rgb_buf,
+                        int width,
+                        int source_dx) {
+  ScaleYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width, source_dx);
+}
+
+void LinearScaleYUVToRGB32Row(const uint8* y_buf,
+                              const uint8* u_buf,
+                              const uint8* v_buf,
+                              uint8* rgb_buf,
+                              int width,
+                              int source_dx) {
+  LinearScaleYUVToRGB32Row_SSE2(y_buf, u_buf, v_buf, rgb_buf, width,
+                                source_dx);
+}
+
+} // extern "C"

From 8eccf2de16c8133dd1e72c41b3c2ba769fb01d00 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Mon, 18 Apr 2011 16:50:47 -0400
Subject: [PATCH 447/509] Bug 641655 - Add a js::GlobalObject subtype of
 JSObject.  r=njn

---
 js/src/GlobalObject.cpp                      | 204 +++++++++++++++++++
 js/src/GlobalObject.h                        | 160 +++++++++++++++
 js/src/Makefile.in                           |   2 +
 js/src/jsapi.cpp                             | 131 +-----------
 js/src/jsapi.h                               |  14 +-
 js/src/jscntxtinlines.h                      |   4 +-
 js/src/jsfun.cpp                             |   7 +-
 js/src/jsinterp.cpp                          |   5 +-
 js/src/jsobj.cpp                             |  32 +--
 js/src/jsobj.h                               |   5 +-
 js/src/jsobjinlines.h                        |   1 +
 js/src/jsregexp.h                            |   2 +-
 js/src/jsregexpinlines.h                     |   6 +-
 js/src/jsxml.cpp                             |  19 +-
 js/src/jsxml.h                               |   3 -
 js/src/xpconnect/wrappers/WrapperFactory.cpp |   7 +-
 16 files changed, 414 insertions(+), 188 deletions(-)
 create mode 100644 js/src/GlobalObject.cpp
 create mode 100644 js/src/GlobalObject.h

diff --git a/js/src/GlobalObject.cpp b/js/src/GlobalObject.cpp
new file mode 100644
index 000000000000..b137179b04b1
--- /dev/null
+++ b/js/src/GlobalObject.cpp
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey global object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "GlobalObject.h"
+
+#include "jscntxt.h"
+#include "jsexn.h"
+#include "json.h"
+
+#include "jsobjinlines.h"
+#include "jsregexpinlines.h"
+
+using namespace js;
+
+JSObject *
+js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
+{
+    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
+
+    /* If cx has no global object, use obj so prototypes can be found. */
+    if (!cx->globalObject)
+        JS_SetGlobalObject(cx, obj);
+
+    /* Record Function and Object in cx->resolvingList. */
+    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
+    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
+    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
+
+    /* Initialize the function class first so constructors can be made. */
+    JSObject *fun_proto;
+    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
+        return NULL;
+    if (!fun_proto) {
+        fun_proto = js_InitFunctionClass(cx, obj);
+        if (!fun_proto)
+            return NULL;
+    } else {
+        JSObject *ctor = JS_GetConstructor(cx, fun_proto);
+        if (!ctor)
+            return NULL;
+        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
+                                 ObjectValue(*ctor), 0, 0, 0)) {
+            return NULL;
+        }
+    }
+
+    /* Initialize the object class next so Object.prototype works. */
+    JSObject *obj_proto;
+    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
+        return NULL;
+    if (!obj_proto)
+        obj_proto = js_InitObjectClass(cx, obj);
+    if (!obj_proto)
+        return NULL;
+
+    /* Function.prototype and the global object delegate to Object.prototype. */
+    fun_proto->setProto(obj_proto);
+    if (!obj->getProto())
+        obj->setProto(obj_proto);
+
+    return fun_proto;
+}
+
+namespace js {
+
+GlobalObject *
+GlobalObject::create(JSContext *cx, Class *clasp)
+{
+    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
+
+    JSObject *obj = NewNonFunction<WithProto::Given>(cx, clasp, NULL, NULL);
+    if (!obj)
+        return NULL;
+
+    GlobalObject *globalObj = obj->asGlobal();
+
+    globalObj->syncSpecialEquality();
+
+    /* Construct a regexp statics object for this global object. */
+    JSObject *res = regexp_statics_construct(cx, globalObj);
+    if (!res)
+        return NULL;
+    globalObj->setSlot(REGEXP_STATICS, ObjectValue(*res));
+    globalObj->setFlags(0);
+    return globalObj;
+}
+
+bool
+GlobalObject::initStandardClasses(JSContext *cx)
+{
+    /* Native objects get their reserved slots from birth. */
+    JS_ASSERT(numSlots() >= JSSLOT_FREE(getClass()));
+
+    JSAtomState &state = cx->runtime->atomState;
+
+    /* Define a top-level property 'undefined' with the undefined value. */
+    if (!defineProperty(cx, ATOM_TO_JSID(state.typeAtoms[JSTYPE_VOID]), UndefinedValue(),
+                        PropertyStub, StrictPropertyStub, JSPROP_PERMANENT | JSPROP_READONLY))
+    {
+        return false;
+    }
+
+    if (!js_InitFunctionAndObjectClasses(cx, this))
+        return false;
+
+    /* Initialize the rest of the standard objects and functions. */
+    return js_InitArrayClass(cx, this) &&
+           js_InitBooleanClass(cx, this) &&
+           js_InitExceptionClasses(cx, this) &&
+           js_InitMathClass(cx, this) &&
+           js_InitNumberClass(cx, this) &&
+           js_InitJSONClass(cx, this) &&
+           js_InitRegExpClass(cx, this) &&
+           js_InitStringClass(cx, this) &&
+           js_InitTypedArrayClasses(cx, this) &&
+#if JS_HAS_XML_SUPPORT
+           js_InitXMLClasses(cx, this) &&
+#endif
+#if JS_HAS_GENERATORS
+           js_InitIteratorClasses(cx, this) &&
+#endif
+           js_InitDateClass(cx, this) &&
+           js_InitProxyClass(cx, this);
+}
+
+void
+GlobalObject::clear(JSContext *cx)
+{
+    /* This can return false but that doesn't mean it failed. */
+    unbrand(cx);
+
+    for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
+        setSlot(key, UndefinedValue());
+
+    /* Clear regexp statics. */
+    RegExpStatics::extractFrom(this)->clear();
+
+    /* Clear the CSP eval-is-allowed cache. */
+    setSlot(EVAL_ALLOWED, UndefinedValue());
+
+    /*
+     * Mark global as cleared. If we try to execute any compile-and-go
+     * scripts from here on, we will throw.
+     */
+    int32 flags = getSlot(FLAGS).toInt32();
+    flags |= FLAGS_CLEARED;
+    setSlot(FLAGS, Int32Value(flags));
+}
+
+bool
+GlobalObject::isEvalAllowed(JSContext *cx)
+{
+    Value &v = getSlotRef(EVAL_ALLOWED);
+    if (v.isUndefined()) {
+        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
+
+        /*
+         * If there are callbacks, make sure that the CSP callback is installed
+         * and that it permits eval(), then cache the result.
+         */
+        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
+                     callbacks->contentSecurityPolicyAllows(cx));
+    }
+    return !v.isFalse();
+}
+
+} // namespace js
diff --git a/js/src/GlobalObject.h b/js/src/GlobalObject.h
new file mode 100644
index 000000000000..0d57bf6d654f
--- /dev/null
+++ b/js/src/GlobalObject.h
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=78:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey global object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GlobalObject_h___
+#define GlobalObject_h___
+
+#include "jsfun.h"
+
+extern JSObject *
+js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj);
+
+namespace js {
+
+/*
+ * Global object slots are reserved as follows:
+ *
+ * [0, JSProto_LIMIT)
+ *   Stores the original value of the constructor for the corresponding
+ *   JSProtoKey.
+ * [JSProto_LIMIT, 2 * JSProto_LIMIT)
+ *   Stores the prototype, if any, for the constructor for the corresponding
+ *   JSProtoKey offset from JSProto_LIMIT.
+ * [2 * JSProto_LIMIT, 3 * JSProto_LIMIT)
+ *   Stores the current value of the global property named for the JSProtoKey
+ *   for the corresponding JSProtoKey offset from 2 * JSProto_LIMIT.
+ * [3 * JSProto_LIMIT, RESERVED_SLOTS)
+ *   Various one-off values: ES5 13.2.3's [[ThrowTypeError]], RegExp statics,
+ *   the Namespace object for E4X's function::, the original eval for this
+ *   global object (implementing |var eval = otherWindow.eval; eval(...)| as an
+ *   indirect eval), a bit indicating whether this object has been cleared
+ *   (see JS_ClearScope), and a cache for whether eval is allowed (per the
+ *   global's Content Security Policy).
+ *
+ * The first two ranges are necessary to implement js::FindClassObject,
+ * js::FindClassPrototype, and spec language speaking in terms of "the original
+ * Array prototype object", or "as if by the expression new Array()" referring
+ * to the original Array constructor.  The third range stores the (writable and
+ * even deletable) Object, Array, &c. properties (although a slot won't be used
+ * again if its property is deleted and readded).
+ */
+class GlobalObject : public ::JSObject {
+    /*
+     * Count of slots to store built-in constructors, prototypes, and initial
+     * visible properties for the constructors.
+     */
+    static const uintN STANDARD_CLASS_SLOTS  = JSProto_LIMIT * 3;
+
+    /* One-off properties stored after slots for built-ins. */
+    static const uintN THROWTYPEERROR        = STANDARD_CLASS_SLOTS;
+    static const uintN REGEXP_STATICS        = THROWTYPEERROR + 1;
+    static const uintN FUNCTION_NS           = REGEXP_STATICS + 1;
+    static const uintN EVAL_ALLOWED          = FUNCTION_NS + 1;
+    static const uintN EVAL                  = EVAL_ALLOWED + 1;
+    static const uintN FLAGS                 = EVAL + 1;
+
+    /* Total reserved-slot count for global objects. */
+    static const uintN RESERVED_SLOTS = FLAGS + 1;
+
+    void staticAsserts() {
+        /*
+         * The slot count must be in the public API for JSCLASS_GLOBAL_FLAGS,
+         * and we aren't going to expose GlobalObject, so just assert that the
+         * two values are synchronized.
+         */
+        JS_STATIC_ASSERT(JSCLASS_GLOBAL_SLOT_COUNT == RESERVED_SLOTS);
+    }
+
+    static const int32 FLAGS_CLEARED = 0x1;
+
+    void setFlags(int32 flags) {
+        setSlot(FLAGS, Int32Value(flags));
+    }
+
+  public:
+    static GlobalObject *create(JSContext *cx, Class *clasp);
+
+    void setThrowTypeError(JSFunction *fun) {
+        Value &v = getSlotRef(THROWTYPEERROR);
+        JS_ASSERT(v.isUndefined());
+        v.setObject(*fun);
+    }
+
+    JSObject *getThrowTypeError() const {
+        return &getSlot(THROWTYPEERROR).toObject();
+    }
+
+    Value getRegExpStatics() const {
+        return getSlot(REGEXP_STATICS);
+    }
+
+    void clear(JSContext *cx);
+
+    bool isCleared() const {
+        return getSlot(FLAGS).toInt32() & FLAGS_CLEARED;
+    }
+
+    bool isEvalAllowed(JSContext *cx);
+
+    const Value &getOriginalEval() const {
+        return getSlot(EVAL);
+    }
+
+    void setOriginalEval(JSObject *evalobj) {
+        Value &v = getSlotRef(EVAL);
+        JS_ASSERT(v.isUndefined());
+        v.setObject(*evalobj);
+    }
+
+    bool getFunctionNamespace(JSContext *cx, Value *vp);
+
+    bool initStandardClasses(JSContext *cx);
+};
+
+} // namespace js
+
+js::GlobalObject *
+JSObject::asGlobal()
+{
+    JS_ASSERT(isGlobal());
+    return reinterpret_cast<js::GlobalObject *>(this);
+}
+
+#endif /* GlobalObject_h___ */
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index a2d4b89a3f00..465e04a7dffb 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -147,6 +147,7 @@ CPPSRCS		= \
 		jsgcmark.cpp \
 		jsgcchunk.cpp \
 		jsgcstats.cpp \
+		GlobalObject.cpp \
 		jshash.cpp \
 		jsinterp.cpp \
 		jsinvoke.cpp \
@@ -212,6 +213,7 @@ INSTALLED_HEADERS = \
 		jsgcchunk.h \
 		jsgcstats.h \
 		jscompartment.h \
+		GlobalObject.h \
 		jshash.h \
 		jsinterp.h \
 		jsinttypes.h \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index eb08cf173ae4..9cca598433aa 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1523,56 +1523,6 @@ JS_SetGlobalObject(JSContext *cx, JSObject *obj)
         cx->resetCompartment();
 }
 
-JSObject *
-js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
-{
-    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
-    JSObject *fun_proto, *obj_proto;
-
-    /* If cx has no global object, use obj so prototypes can be found. */
-    if (!cx->globalObject)
-        JS_SetGlobalObject(cx, obj);
-
-    /* Record Function and Object in cx->resolvingList. */
-    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
-    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
-    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
-
-    /* Initialize the function class first so constructors can be made. */
-    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
-        return NULL;
-    if (!fun_proto) {
-        fun_proto = js_InitFunctionClass(cx, obj);
-        if (!fun_proto)
-            return NULL;
-    } else {
-        JSObject *ctor;
-
-        ctor = JS_GetConstructor(cx, fun_proto);
-        if (!ctor)
-            return NULL;
-        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
-                                 ObjectValue(*ctor), 0, 0, 0)) {
-            return NULL;
-        }
-    }
-
-    /* Initialize the object class next so Object.prototype works. */
-    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
-        return NULL;
-    if (!obj_proto)
-        obj_proto = js_InitObjectClass(cx, obj);
-    if (!obj_proto)
-        return NULL;
-
-    /* Function.prototype and the global object delegate to Object.prototype. */
-    fun_proto->setProto(obj_proto);
-    if (!obj->getProto())
-        obj->setProto(obj_proto);
-
-    return fun_proto;
-}
-
 JS_PUBLIC_API(JSBool)
 JS_InitStandardClasses(JSContext *cx, JSObject *obj)
 {
@@ -1588,36 +1538,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
         JS_SetGlobalObject(cx, obj);
     assertSameCompartment(cx, obj);
 
-    /* Define a top-level property 'undefined' with the undefined value. */
-    JSAtom *atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
-    if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
-                             PropertyStub, StrictPropertyStub,
-                             JSPROP_PERMANENT | JSPROP_READONLY)) {
-        return JS_FALSE;
-    }
-
-    /* Function and Object require cooperative bootstrapping magic. */
-    if (!js_InitFunctionAndObjectClasses(cx, obj))
-        return JS_FALSE;
-
-    /* Initialize the rest of the standard objects and functions. */
-    return js_InitArrayClass(cx, obj) &&
-           js_InitBooleanClass(cx, obj) &&
-           js_InitExceptionClasses(cx, obj) &&
-           js_InitMathClass(cx, obj) &&
-           js_InitNumberClass(cx, obj) &&
-           js_InitJSONClass(cx, obj) &&
-           js_InitRegExpClass(cx, obj) &&
-           js_InitStringClass(cx, obj) &&
-           js_InitTypedArrayClasses(cx, obj) &&
-#if JS_HAS_XML_SUPPORT
-           js_InitXMLClasses(cx, obj) &&
-#endif
-#if JS_HAS_GENERATORS
-           js_InitIteratorClasses(cx, obj) &&
-#endif
-           js_InitDateClass(cx, obj) &&
-           js_InitProxyClass(cx, obj);
+    return obj->asGlobal()->initStandardClasses(cx);
 }
 
 #define CLASP(name)                 (&js_##name##Class)
@@ -3078,22 +2999,8 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp)
 {
     JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
     CHECK_REQUEST(cx);
-    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
-    JSObject *obj = NewNonFunction<WithProto::Given>(cx, Valueify(clasp), NULL, NULL);
-    if (!obj)
-        return NULL;
 
-    obj->syncSpecialEquality();
-
-    /* Construct a regexp statics object for this global object. */
-    JSObject *res = regexp_statics_construct(cx, obj);
-    if (!res ||
-        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_REGEXP_STATICS, ObjectValue(*res)) ||
-        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Int32Value(0))) {
-        return NULL;
-    }
-
-    return obj;
+    return GlobalObject::create(cx, Valueify(clasp));
 }
 
 class AutoHoldCompartment {
@@ -3987,27 +3894,8 @@ JS_ClearScope(JSContext *cx, JSObject *obj)
         js_ClearNative(cx, obj);
 
     /* Clear cached class objects on the global object. */
-    if (obj->isGlobal()) {
-        /* This can return false but that doesn't mean it failed. */
-        obj->unbrand(cx);
-
-        for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
-            JS_SetReservedSlot(cx, obj, key, JSVAL_VOID);
-
-        /* Clear regexp statics. */
-        RegExpStatics::extractFrom(obj)->clear();
-
-        /* Clear the CSP eval-is-allowed cache. */
-        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL_ALLOWED, JSVAL_VOID);
-
-        /*
-         * Mark global as cleared. If we try to execute any compile-and-go
-         * scripts from here on, we will throw.
-         */
-        int32 flags = obj->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
-        flags |= JSGLOBAL_FLAGS_CLEARED;
-        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Jsvalify(Int32Value(flags)));
-    }
+    if (obj->isGlobal())
+        obj->asGlobal()->clear(cx);
 
     js_InitRandom(cx);
 }
@@ -5898,7 +5786,7 @@ JS_NewRegExpObject(JSContext *cx, JSObject *obj, char *bytes, size_t length, uin
     jschar *chars = js_InflateString(cx, bytes, &length);
     if (!chars)
         return NULL;
-    RegExpStatics *res = RegExpStatics::extractFrom(obj);
+    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
     JSObject *reobj = RegExp::createObject(cx, res, chars, length, flags);
     cx->free_(chars);
     return reobj;
@@ -5908,7 +5796,7 @@ JS_PUBLIC_API(JSObject *)
 JS_NewUCRegExpObject(JSContext *cx, JSObject *obj, jschar *chars, size_t length, uintN flags)
 {
     CHECK_REQUEST(cx);
-    RegExpStatics *res = RegExpStatics::extractFrom(obj);
+    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
     return RegExp::createObject(cx, res, chars, length, flags);
 }
 
@@ -5918,7 +5806,7 @@ JS_SetRegExpInput(JSContext *cx, JSObject *obj, JSString *input, JSBool multilin
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, input);
 
-    RegExpStatics::extractFrom(obj)->reset(input, !!multiline);
+    RegExpStatics::extractFrom(obj->asGlobal())->reset(input, !!multiline);
 }
 
 JS_PUBLIC_API(void)
@@ -5927,7 +5815,7 @@ JS_ClearRegExpStatics(JSContext *cx, JSObject *obj)
     CHECK_REQUEST(cx);
     JS_ASSERT(obj);
 
-    RegExpStatics::extractFrom(obj)->clear();
+    RegExpStatics::extractFrom(obj->asGlobal())->clear();
 }
 
 JS_PUBLIC_API(JSBool)
@@ -5944,7 +5832,8 @@ JS_ExecuteRegExp(JSContext *cx, JSObject *obj, JSObject *reobj, jschar *chars, s
     if (!str)
         return false;
 
-    return re->execute(cx, RegExpStatics::extractFrom(obj), str, indexp, test, Valueify(rval));
+    return re->execute(cx, RegExpStatics::extractFrom(obj->asGlobal()), str, indexp, test,
+                       Valueify(rval));
 }
 
 JS_PUBLIC_API(JSObject *)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index c8ecf328a15c..c15273c6f45c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2010,16 +2010,6 @@ struct JSClass {
 #define JSCLASS_FREEZE_PROTO            (1<<(JSCLASS_HIGH_FLAGS_SHIFT+5))
 #define JSCLASS_FREEZE_CTOR             (1<<(JSCLASS_HIGH_FLAGS_SHIFT+6))
 
-/* Additional global reserved slots, beyond those for standard prototypes. */
-#define JSRESERVED_GLOBAL_SLOTS_COUNT     7
-#define JSRESERVED_GLOBAL_THIS            (JSProto_LIMIT * 3)
-#define JSRESERVED_GLOBAL_THROWTYPEERROR  (JSRESERVED_GLOBAL_THIS + 1)
-#define JSRESERVED_GLOBAL_REGEXP_STATICS  (JSRESERVED_GLOBAL_THROWTYPEERROR + 1)
-#define JSRESERVED_GLOBAL_FUNCTION_NS     (JSRESERVED_GLOBAL_REGEXP_STATICS + 1)
-#define JSRESERVED_GLOBAL_EVAL_ALLOWED    (JSRESERVED_GLOBAL_FUNCTION_NS + 1)
-#define JSRESERVED_GLOBAL_EVAL            (JSRESERVED_GLOBAL_EVAL_ALLOWED + 1)
-#define JSRESERVED_GLOBAL_FLAGS           (JSRESERVED_GLOBAL_EVAL + 1)
-
 /* Global flags. */
 #define JSGLOBAL_FLAGS_CLEARED          0x1
 
@@ -2034,9 +2024,9 @@ struct JSClass {
  * with the following flags. Failure to use JSCLASS_GLOBAL_FLAGS was
  * prevously allowed, but is now an ES5 violation and thus unsupported.
  */
+#define JSCLASS_GLOBAL_SLOT_COUNT      (JSProto_LIMIT * 3 + 6)
 #define JSCLASS_GLOBAL_FLAGS                                                  \
-    (JSCLASS_IS_GLOBAL |                                                      \
-     JSCLASS_HAS_RESERVED_SLOTS(JSRESERVED_GLOBAL_THIS + JSRESERVED_GLOBAL_SLOTS_COUNT))
+    (JSCLASS_IS_GLOBAL | JSCLASS_HAS_RESERVED_SLOTS(JSCLASS_GLOBAL_SLOT_COUNT))
 
 /* Fast access to the original value of each standard class's prototype. */
 #define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 8)
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 875cce0afa2d..8c2a57a4fe74 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -51,7 +51,7 @@
 
 namespace js {
 
-static inline JSObject *
+static inline GlobalObject *
 GetGlobalForScopeChain(JSContext *cx)
 {
     /*
@@ -73,7 +73,7 @@ GetGlobalForScopeChain(JSContext *cx)
         return NULL;
     }
     OBJ_TO_INNER_OBJECT(cx, scope);
-    return scope;
+    return scope->asGlobal();
 }
 
 }
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 393b8d606268..f155cc32581f 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -98,7 +98,7 @@ using namespace js::gc;
 inline JSObject *
 JSObject::getThrowTypeError() const
 {
-    return &getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_THROWTYPEERROR).toObject();
+    return getGlobal()->getThrowTypeError();
 }
 
 JSBool
@@ -2693,14 +2693,13 @@ js_InitFunctionClass(JSContext *cx, JSObject *obj)
 
     if (obj->isGlobal()) {
         /* ES5 13.2.3: Construct the unique [[ThrowTypeError]] function object. */
-        JSObject *throwTypeError =
+        JSFunction *throwTypeError =
             js_NewFunction(cx, NULL, reinterpret_cast<Native>(ThrowTypeError), 0,
                            0, obj, NULL);
         if (!throwTypeError)
             return NULL;
 
-        JS_ALWAYS_TRUE(js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_THROWTYPEERROR,
-                                          ObjectValue(*throwTypeError)));
+        obj->asGlobal()->setThrowTypeError(throwTypeError);
     }
 
     return proto;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 52c68e5bfd0c..6674e4a42583 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -614,8 +614,7 @@ RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp)
 
     /* FIXME: Once bug 470510 is fixed, make this an assert. */
     if (script->compileAndGo) {
-        int32 flags = fp->scopeChain().getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
-        if (flags & JSGLOBAL_FLAGS_CLEARED) {
+        if (fp->scopeChain().getGlobal()->isCleared()) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CLEARED_SCOPE);
             return false;
         }
@@ -6471,7 +6470,7 @@ END_CASE(JSOP_XMLPI)
 BEGIN_CASE(JSOP_GETFUNNS)
 {
     Value rval;
-    if (!js_GetFunctionNamespace(cx, &rval))
+    if (!cx->fp()->scopeChain().getGlobal()->getFunctionNamespace(cx, &rval))
         goto error;
     PUSH_COPY(rval);
 }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index ee8a9ce94db8..91ad0ee2a74e 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -922,22 +922,7 @@ obj_valueOf(JSContext *cx, uintN argc, Value *vp)
 JSBool
 js_CheckContentSecurityPolicy(JSContext *cx, JSObject *scopeobj)
 {
-    // CSP is static per document, so if our check said yes before, that
-    // answer is still valid.
-    JSObject *global = scopeobj->getGlobal();
-    Value v = global->getReservedSlot(JSRESERVED_GLOBAL_EVAL_ALLOWED);
-    if (v.isUndefined()) {
-        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
-
-        // if there are callbacks, make sure that the CSP callback is installed and
-        // that it permits eval().
-        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
-                     callbacks->contentSecurityPolicyAllows(cx));
-
-        // update the cache in the global object for the result of the security check
-        js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_EVAL_ALLOWED, v);
-    }
-    return !v.isFalse();
+    return scopeobj->getGlobal()->isEvalAllowed(cx);
 }
 
 /* We should be able to assert this for *any* fp->scopeChain(). */
@@ -1319,9 +1304,7 @@ DirectEval(JSContext *cx, const CallArgs &call)
 bool
 IsBuiltinEvalForScope(JSObject *scopeChain, const Value &v)
 {
-    JSObject *global = scopeChain->getGlobal();
-    JS_ASSERT((global->getClass()->flags & JSCLASS_GLOBAL_FLAGS) == JSCLASS_GLOBAL_FLAGS);
-    return global->getReservedSlot(JSRESERVED_GLOBAL_EVAL) == v;
+    return scopeChain->getGlobal()->getOriginalEval() == v;
 }
 
 bool
@@ -3796,10 +3779,8 @@ js_InitObjectClass(JSContext *cx, JSObject *obj)
     JSObject *evalobj = js_DefineFunction(cx, obj, id, eval, 1, JSFUN_STUB_GSOPS);
     if (!evalobj)
         return NULL;
-    if (obj->isGlobal()) {
-        if (!js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL, ObjectValue(*evalobj)))
-            return NULL;
-    }
+    if (obj->isGlobal())
+        obj->asGlobal()->setOriginalEval(evalobj);
 
     return proto;
 }
@@ -6560,14 +6541,13 @@ js_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 slot, const Value &v)
     return true;
 }
 
-JSObject *
+GlobalObject *
 JSObject::getGlobal() const
 {
     JSObject *obj = const_cast<JSObject *>(this);
     while (JSObject *parent = obj->getParent())
         obj = parent;
-    JS_ASSERT(obj->isGlobal());
-    return obj;
+    return obj->asGlobal();
 }
 
 JSBool
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 95853e7754e9..6ea319198ed5 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -261,6 +261,7 @@ namespace js {
 
 struct NativeIterator;
 class RegExp;
+class GlobalObject;
 
 }
 
@@ -698,12 +699,14 @@ struct JSObject : js::gc::Cell {
         parent = newParent;
     }
 
-    JS_FRIEND_API(JSObject *) getGlobal() const;
+    JS_FRIEND_API(js::GlobalObject *) getGlobal() const;
 
     bool isGlobal() const {
         return !!(getClass()->flags & JSCLASS_IS_GLOBAL);
     }
 
+    inline js::GlobalObject *asGlobal();
+
     void *getPrivate() const {
         JS_ASSERT(getClass()->flags & JSCLASS_HAS_PRIVATE);
         return privateData;
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index bbe90784fb7c..7b70d47cf58d 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -58,6 +58,7 @@
 /* Headers included for inline implementations used by this header. */
 #include "jsbool.h"
 #include "jscntxt.h"
+#include "GlobalObject.h"
 #include "jsnum.h"
 #include "jsscriptinlines.h"
 #include "jsstr.h"
diff --git a/js/src/jsregexp.h b/js/src/jsregexp.h
index 0168c2882b96..429cbd5df4c4 100644
--- a/js/src/jsregexp.h
+++ b/js/src/jsregexp.h
@@ -167,7 +167,7 @@ class RegExpStatics
   public:
     RegExpStatics() : bufferLink(NULL), copied(false) { clear(); }
 
-    static RegExpStatics *extractFrom(JSObject *global);
+    static RegExpStatics *extractFrom(GlobalObject *globalObj);
 
     /* Mutators. */
 
diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index 38517563be8f..fdd182f80c62 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -65,7 +65,7 @@ namespace js {
 extern Class regexp_statics_class;
 
 static inline JSObject *
-regexp_statics_construct(JSContext *cx, JSObject *parent)
+regexp_statics_construct(JSContext *cx, GlobalObject *parent)
 {
     JSObject *obj = NewObject<WithProto::Given>(cx, &regexp_statics_class, NULL, parent);
     if (!obj)
@@ -593,9 +593,9 @@ RegExp::extractFrom(JSObject *obj)
 /* RegExpStatics inlines. */
 
 inline RegExpStatics *
-RegExpStatics::extractFrom(JSObject *global)
+RegExpStatics::extractFrom(js::GlobalObject *globalObj)
 {
-    Value resVal = global->getReservedSlot(JSRESERVED_GLOBAL_REGEXP_STATICS);
+    Value resVal = globalObj->getRegExpStatics();
     RegExpStatics *res = static_cast<RegExpStatics *>(resVal.toObject().getPrivate());
     return res;
 }
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index c7726f9a2b16..f806a6460812 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -7216,13 +7216,13 @@ js_InitXMLClasses(JSContext *cx, JSObject *obj)
     return js_InitXMLClass(cx, obj);
 }
 
-JSBool
-js_GetFunctionNamespace(JSContext *cx, Value *vp)
-{
-    JSObject *global = cx->hasfp() ? cx->fp()->scopeChain().getGlobal() : cx->globalObject;
+namespace js {
 
-    *vp = global->getReservedSlot(JSRESERVED_GLOBAL_FUNCTION_NS);
-    if (vp->isUndefined()) {
+bool
+GlobalObject::getFunctionNamespace(JSContext *cx, Value *vp)
+{
+    Value &v = getSlotRef(FUNCTION_NS);
+    if (v.isUndefined()) {
         JSRuntime *rt = cx->runtime;
         JSLinearString *prefix = rt->atomState.typeAtoms[JSTYPE_FUNCTION];
         JSLinearString *uri = rt->atomState.functionNamespaceURIAtom;
@@ -7239,14 +7239,15 @@ js_GetFunctionNamespace(JSContext *cx, Value *vp)
          */
         obj->clearProto();
 
-        vp->setObject(*obj);
-        if (!js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_FUNCTION_NS, *vp))
-            return false;
+        v.setObject(*obj);
     }
 
+    *vp = v;
     return true;
 }
 
+} // namespace js
+
 /*
  * Note the asymmetry between js_GetDefaultXMLNamespace and js_SetDefaultXML-
  * Namespace.  Get searches fp->scopeChain for JS_DEFAULT_XML_NAMESPACE_ID,
diff --git a/js/src/jsxml.h b/js/src/jsxml.h
index 566ec5daaf39..5fef407bfe4e 100644
--- a/js/src/jsxml.h
+++ b/js/src/jsxml.h
@@ -279,9 +279,6 @@ js_InitXMLClass(JSContext *cx, JSObject *obj);
 extern JSObject *
 js_InitXMLClasses(JSContext *cx, JSObject *obj);
 
-extern JSBool
-js_GetFunctionNamespace(JSContext *cx, js::Value *vp);
-
 /*
  * If obj is QName corresponding to function::name, set *funidp to name's id,
  * otherwise set *funidp to void.
diff --git a/js/src/xpconnect/wrappers/WrapperFactory.cpp b/js/src/xpconnect/wrappers/WrapperFactory.cpp
index 29c50bf234f7..f081abe7bc2b 100644
--- a/js/src/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/src/xpconnect/wrappers/WrapperFactory.cpp
@@ -113,7 +113,8 @@ WrapperFactory::WaiveXray(JSContext *cx, JSObject *obj)
             JSAutoEnterCompartment ac;
             if (!ac.enter(cx, obj))
                 return nsnull;
-            wobj = JSWrapper::New(cx, obj, proto, obj->getGlobal(), &WaiveXrayWrapperWrapper);
+            wobj = JSWrapper::New(cx, obj, proto, JS_GetGlobalForObject(cx, obj),
+                                  &WaiveXrayWrapperWrapper);
             if (!wobj)
                 return nsnull;
 
@@ -253,7 +254,7 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
     JSWrapper *wrapper;
     CompartmentPrivate *targetdata = static_cast<CompartmentPrivate *>(target->data);
     if (AccessCheck::isChrome(target)) {
-        if (AccessCheck::isChrome(origin) || obj->getGlobal()->isSystem()) {
+        if (AccessCheck::isChrome(origin) || JS_GetGlobalForObject(cx, obj)->isSystem()) {
             wrapper = &JSCrossCompartmentWrapper::singleton;
         } else if (flags & WAIVE_XRAY_WRAPPER_FLAG) {
             // If we waived the X-ray wrapper for this object, wrap it into a
@@ -381,7 +382,7 @@ JSObject *
 WrapperFactory::WrapSOWObject(JSContext *cx, JSObject *obj)
 {
     JSObject *wrapperObj =
-        JSWrapper::New(cx, obj, obj->getProto(), obj->getGlobal(),
+        JSWrapper::New(cx, obj, obj->getProto(), JS_GetGlobalForObject(cx, obj),
                        &FilteringWrapper<JSWrapper,
                                          OnlyIfSubjectIsSystem>::singleton);
     return wrapperObj;

From c2f90d93f5c5a71174907dba4ff70f3e080378ea Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Wed, 20 Apr 2011 13:22:57 -0500
Subject: [PATCH 448/509] Bug 202019 - Built-in functions should not be
 constructors. r=jorendorff.

--HG--
extra : rebase_source : 2f845218384004c09a60c59ae03704729f1d91dc
---
 dom/src/threads/nsDOMWorker.cpp               | 10 +--
 js/src/jit-test/tests/basic/bug579740.js      | 10 +--
 js/src/jit-test/tests/basic/bug630865-1.js    |  6 --
 js/src/jit-test/tests/basic/bug630865-2.js    |  6 --
 js/src/jit-test/tests/basic/bug630865-3.js    | 12 ----
 js/src/jit-test/tests/basic/bug630865-4.js    | 10 ---
 .../tests/basic/new-Function-prototype.js     | 11 ++-
 js/src/jit-test/tests/basic/testBug593559.js  |  4 +-
 .../tests/basic/testProxyConstructors.js      | 15 ++--
 js/src/jsfun.h                                |  4 +-
 js/src/jsinterp.cpp                           | 71 +++++++------------
 js/src/methodjit/InvokeHelpers.cpp            |  4 +-
 .../ecma_5/Function/builtin-no-construct.js   | 52 ++++++++++++++
 js/src/tests/ecma_5/Function/jstests.list     |  1 +
 js/src/tests/ecma_5/misc/jstests.list         |  1 +
 .../ecma_5/misc/new-with-non-constructor.js   | 39 ++++++++++
 js/src/xpconnect/src/XPCWrapper.cpp           |  5 +-
 17 files changed, 144 insertions(+), 117 deletions(-)
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-1.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-2.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-3.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-4.js
 create mode 100644 js/src/tests/ecma_5/Function/builtin-no-construct.js
 create mode 100644 js/src/tests/ecma_5/misc/new-with-non-constructor.js

diff --git a/dom/src/threads/nsDOMWorker.cpp b/dom/src/threads/nsDOMWorker.cpp
index 357e3d8de76f..2dbe96ea7426 100644
--- a/dom/src/threads/nsDOMWorker.cpp
+++ b/dom/src/threads/nsDOMWorker.cpp
@@ -767,7 +767,6 @@ nsDOMWorkerFunctions::CTypesLazyGetter(JSContext* aCx,
          JS_GetPropertyById(aCx, aObj, aId, aVp);
 }
 #endif
-
 JSFunctionSpec gDOMWorkerFunctions[] = {
   { "dump",                nsDOMWorkerFunctions::Dump,                1, 0 },
   { "setTimeout",          nsDOMWorkerFunctions::SetTimeout,          1, 0 },
@@ -775,19 +774,16 @@ JSFunctionSpec gDOMWorkerFunctions[] = {
   { "setInterval",         nsDOMWorkerFunctions::SetInterval,         1, 0 },
   { "clearInterval",       nsDOMWorkerFunctions::KillTimeout,         1, 0 },
   { "importScripts",       nsDOMWorkerFunctions::LoadScripts,         1, 0 },
-  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, 0 },
-  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, 0 },
+  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, JSFUN_CONSTRUCTOR },
+  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, JSFUN_CONSTRUCTOR },
   { "atob",                nsDOMWorkerFunctions::AtoB,                1, 0 },
   { "btoa",                nsDOMWorkerFunctions::BtoA,                1, 0 },
   { nsnull,                nsnull,                                    0, 0 }
 };
-
 JSFunctionSpec gDOMWorkerChromeFunctions[] = {
-  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, 0 },
+  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, JSFUN_CONSTRUCTOR },
   { nsnull,                nsnull,                                    0, 0 }
 };
-
-
 enum DOMWorkerStructuredDataType
 {
   // We have a special tag for XPCWrappedNatives that are being passed between
diff --git a/js/src/jit-test/tests/basic/bug579740.js b/js/src/jit-test/tests/basic/bug579740.js
index 83ee967bfd86..26fa1ce22a10 100644
--- a/js/src/jit-test/tests/basic/bug579740.js
+++ b/js/src/jit-test/tests/basic/bug579740.js
@@ -1,7 +1,7 @@
-
-for (a = 0; a < 4; a++) {
-    new Math.round(0).t
+try {
+    for (a = 0; a < 4; a++) {
+        new Math.round(0).t
+    }
 }
-
+catch (e) {}
 /* Don't assert. */
-
diff --git a/js/src/jit-test/tests/basic/bug630865-1.js b/js/src/jit-test/tests/basic/bug630865-1.js
deleted file mode 100644
index 5203d1383d78..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Object.defineProperty(Function.prototype, "prototype", {set:function(){}});
-var x;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    x = new Function.prototype;
-assertEq(toString.call(x), "[object Object]");
-assertEq(Object.getPrototypeOf(x), Object.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-2.js b/js/src/jit-test/tests/basic/bug630865-2.js
deleted file mode 100644
index 4616891b3b31..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Function.prototype.prototype = function () {};
-var x;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    x = new Function.prototype;
-assertEq(toString.call(x), "[object Object]");
-assertEq(Object.getPrototypeOf(x), Function.prototype.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-3.js b/js/src/jit-test/tests/basic/bug630865-3.js
deleted file mode 100644
index 5933b2cb3123..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-3.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var a = [];
-function next() {
-    var x = {};
-    a.push(x);
-    return x;
-}
-Object.defineProperty(Function.prototype, 'prototype', {get: next});
-var b = [];
-for (var i = 0; i < HOTLOOP + 2; i++)
-    b[i] = new Function.prototype;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    assertEq(Object.getPrototypeOf(b[i]), a[i]);
diff --git a/js/src/jit-test/tests/basic/bug630865-4.js b/js/src/jit-test/tests/basic/bug630865-4.js
deleted file mode 100644
index fd9f8b5e2bb7..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-4.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Object.defineProperty(Function.prototype, 'prototype',
-                      {get: function () { if (i == HOTLOOP + 1) throw "X"; }});
-var x;
-try {
-    for (var i = 0; i < HOTLOOP + 2; i++)
-        x = new Function.prototype;
-} catch (exc) {
-    assertEq(i, HOTLOOP + 1);
-    assertEq(exc, "X");
-}
diff --git a/js/src/jit-test/tests/basic/new-Function-prototype.js b/js/src/jit-test/tests/basic/new-Function-prototype.js
index 72bc5f78e8f2..943cbba350a3 100644
--- a/js/src/jit-test/tests/basic/new-Function-prototype.js
+++ b/js/src/jit-test/tests/basic/new-Function-prototype.js
@@ -1,19 +1,18 @@
 var funProto = Function.prototype;
 assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
-
 assertEq(parseInt.prototype, undefined);
-
 var oldObj;
 for (var i = 0, sz = RUNLOOP; i < sz; oldObj = obj, i++)
 {
-  var obj = new funProto;
-  assertEq(obj === oldObj, false);
-  assertEq(Object.prototype.toString.call(obj), "[object Object]");
+
+  try {
+    var obj = new funProto;
+  }
+  catch (e) {}
   assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
   assertEq(Object.getOwnPropertyDescriptor(parseInt, "prototype"), undefined);
   assertEq(parseInt.prototype, undefined);
 }
-
 checkStats({
   recorderStarted: 1,
   recorderAborted: 0,
diff --git a/js/src/jit-test/tests/basic/testBug593559.js b/js/src/jit-test/tests/basic/testBug593559.js
index c49e5367b976..15c29d779925 100644
--- a/js/src/jit-test/tests/basic/testBug593559.js
+++ b/js/src/jit-test/tests/basic/testBug593559.js
@@ -1,10 +1,8 @@
 var gen = (function () {yield})();
 var t = gen.throw;
-
 try {
     new t;
 } catch (e) {
     actual = "" + e;
 }
-assertEq(actual, "TypeError: Generator.prototype.throw called on incompatible Object");
-
+assertEq(actual, "TypeError: t is not a constructor");
diff --git a/js/src/jit-test/tests/basic/testProxyConstructors.js b/js/src/jit-test/tests/basic/testProxyConstructors.js
index 04665a78859f..14947e82bd5c 100644
--- a/js/src/jit-test/tests/basic/testProxyConstructors.js
+++ b/js/src/jit-test/tests/basic/testProxyConstructors.js
@@ -2,15 +2,16 @@
 
 // proxies can return primitives
 assertEq(new (Proxy.createFunction({}, function(){}, function(){})), undefined);
-
 x = Proxy.createFunction((function () {}), Uint16Array, wrap)
 new(wrap(x))
-
 // proxies can return the callee
 var x = Proxy.createFunction({}, function (q) { return q; });
-new x(x);
-
-// not an error
-new (Proxy.createFunction({}, "".indexOf));
-
+assertEq(new x(x), x);
+try {
+    var x = (Proxy.createFunction({}, "".indexOf));
+    new x;
+}
+catch (e) {
+    assertEq(e.message, 'new x is not a constructor');
+}
 throw "ExitCleanly"
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index e73c4e523e92..3a90fda2b2eb 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -152,12 +152,10 @@ struct JSFunction : public JSObject_Slots2
     bool isConstructor()     const { return flags & JSFUN_CONSTRUCTOR; }
     bool isHeavyweight()     const { return JSFUN_HEAVYWEIGHT_TEST(flags); }
     bool isFlatClosure()     const { return FUN_KIND(this) == JSFUN_FLAT_CLOSURE; }
-
     bool isFunctionPrototype() const { return flags & JSFUN_PROTOTYPE; }
-
+    bool isInterpretedConstructor() const { return isInterpreted() && !isFunctionPrototype(); }
     /* Returns the strictness of this function, which must be interpreted. */
     inline bool inStrictMode() const;
-
     void setArgCount(uint16 nargs) {
         JS_ASSERT(this->nargs == 0);
         this->nargs = nargs;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 52c68e5bfd0c..112469553fd7 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1251,56 +1251,37 @@ InvokeConstructor(JSContext *cx, const CallArgs &argsRef)
     JS_ASSERT(!js_FunctionClass.construct);
     CallArgs args = argsRef;
 
-    JSObject *callee;
-    if (args.calleev().isPrimitive() || !(callee = &args.callee())->getParent()) {
-        js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
-        return false;
-    }
+    if (args.calleev().isObject()) {
+        JSObject *callee = &args.callee();
+        if (callee->isFunction()) {
+            JSFunction *fun = callee->getFunctionPrivate();
 
-    /* Handle the fast-constructors cases before falling into the general case . */
-    Class *clasp = callee->getClass();
-    JSFunction *fun = NULL;
-    if (clasp == &js_FunctionClass) {
-        fun = callee->getFunctionPrivate();
-        if (fun->isConstructor()) {
-            args.thisv().setMagicWithObjectOrNullPayload(NULL);
-            return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
-        }
-    } else if (clasp->construct) {
-        args.thisv().setMagicWithObjectOrNullPayload(NULL);
-        return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
-    }
-
-    /* Scripts create their own |this| in JSOP_BEGIN */
-    if (!fun || !fun->isInterpreted()) {
-        JSObject *obj = js_CreateThis(cx, callee);
-        if (!obj)
-            return false;
-        args.thisv().setObject(*obj);
-    }
-
-    if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
-        return false;
-
-    if (args.rval().isPrimitive()) {
-        if (clasp != &js_FunctionClass) {
-            /* native [[Construct]] returning primitive is error */
-            JSAutoByteString bytes;
-            if (js_ValueToPrintable(cx, args.rval(), &bytes)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_NEW_RESULT, bytes.ptr());
-                return false;
+            if (fun->isConstructor()) {
+                args.thisv().setMagicWithObjectOrNullPayload(NULL);
+                return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
             }
+
+            if (!fun->isInterpretedConstructor())
+                goto error;
+
+            if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
+                return false;
+
+            JS_ASSERT(args.rval().isObject());
+            JS_RUNTIME_METER(cx->runtime, constructs);
+            return true;
         }
 
-        /* The interpreter fixes rval for us. */
-        JS_ASSERT(!fun->isInterpreted());
-
-        args.rval() = args.thisv();
+        Class *clasp = callee->getClass();
+        if (clasp->construct) {
+            args.thisv().setMagicWithObjectOrNullPayload(NULL);
+            return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
+        }
     }
 
-    JS_RUNTIME_METER(cx->runtime, constructs);
-    return true;
+error:
+    js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
+    return false;
 }
 
 bool
@@ -4588,7 +4569,7 @@ BEGIN_CASE(JSOP_NEW)
      */
     if (IsFunctionObject(vp[0], &callee)) {
         newfun = callee->getFunctionPrivate();
-        if (newfun->isInterpreted()) {
+        if (newfun->isInterpretedConstructor()) {
             if (newfun->u.i.script->isEmpty()) {
                 JSObject *obj2 = js_CreateThisForFunction(cx, callee);
                 if (!obj2)
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 1fba629ac481..34816b113dbd 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -409,12 +409,10 @@ void
 stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
 {
     ucr->init();
-
     JSContext *cx = f.cx;
     Value *vp = f.regs.sp - (argc + 2);
-
     /* Try to do a fast inline call before the general Invoke path. */
-    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpreted()) {
+    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpretedConstructor()) {
         ucr->callee = &vp->toObject();
         if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
             THROW();
diff --git a/js/src/tests/ecma_5/Function/builtin-no-construct.js b/js/src/tests/ecma_5/Function/builtin-no-construct.js
new file mode 100644
index 000000000000..b6c9e289f478
--- /dev/null
+++ b/js/src/tests/ecma_5/Function/builtin-no-construct.js
@@ -0,0 +1,52 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+function checkMethod(method) {
+    try {
+        new method();
+        assertEq(0, 1, "not reached " + method);
+    } catch (e) {
+        assertEq(e.message, "method is not a constructor");
+    }
+}
+
+function checkMethods(proto) {
+    var names = Object.getOwnPropertyNames(proto);
+    for (var i = 0; i < names.length; i++) {
+        var name = names[i];
+        if (name == "constructor")
+            continue;
+        var prop = proto[name];
+        if (typeof prop === "function")
+            checkMethod(prop);
+    }
+}
+
+checkMethod(Function.prototype);
+checkMethods(JSON);
+checkMethods(Math);
+checkMethods(Proxy);
+
+var builtin_ctors = [
+    Object, Function, Array, String, Boolean, Number, Date, RegExp, Error,
+    EvalError, RangeError, ReferenceError, SyntaxError, TypeError, URIError,
+];
+
+for (var i = 0; i < builtin_ctors.length; i++) {
+    checkMethods(builtin_ctors[i]);
+    checkMethods(builtin_ctors[i].prototype);
+}
+
+var builtin_funcs = [
+    eval, isFinite, isNaN, parseFloat, parseInt,
+    decodeURI, decodeURIComponent, encodeURI, encodeURIComponent
+];
+
+for (var i = 0; i < builtin_funcs.length; i++) {
+    checkMethod(builtin_funcs[i]);
+}
+
+if (typeof reportCompare == 'function')
+    reportCompare(0, 0, "ok");
diff --git a/js/src/tests/ecma_5/Function/jstests.list b/js/src/tests/ecma_5/Function/jstests.list
index 1813ecf32d19..242cbb91ec45 100644
--- a/js/src/tests/ecma_5/Function/jstests.list
+++ b/js/src/tests/ecma_5/Function/jstests.list
@@ -10,3 +10,4 @@ script function-call.js
 script redefine-arguments-length.js
 script builtin-no-prototype.js
 script Function-arguments-gc.js
+script builtin-no-construct.js
diff --git a/js/src/tests/ecma_5/misc/jstests.list b/js/src/tests/ecma_5/misc/jstests.list
index adc9a73792be..fdceb9111886 100644
--- a/js/src/tests/ecma_5/misc/jstests.list
+++ b/js/src/tests/ecma_5/misc/jstests.list
@@ -9,4 +9,5 @@ skip-if(!xulRuntime.shell) script function-definition-evaluate.js # needs evalua
 script future-reserved-words.js
 script builtin-methods-reject-null-undefined-this.js
 script regress-bug632003.js
+script new-with-non-constructor.js
 script error-undefined-message.js
diff --git a/js/src/tests/ecma_5/misc/new-with-non-constructor.js b/js/src/tests/ecma_5/misc/new-with-non-constructor.js
new file mode 100644
index 000000000000..7f73711b860a
--- /dev/null
+++ b/js/src/tests/ecma_5/misc/new-with-non-constructor.js
@@ -0,0 +1,39 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+function checkConstruct(thing, buggy) {
+    try {
+        new thing();
+        assertEq(0, 1, "not reached " + thing);
+    } catch (e) {
+        if (buggy)
+            assertEq(e.message, "new thing is not a constructor");
+        else
+            assertEq(e.message, "thing is not a constructor");
+    }
+}
+
+var re = /aaa/
+checkConstruct(re, false);
+
+var boundFunctionPrototype = Function.prototype.bind();
+checkConstruct(boundFunctionPrototype, true);
+
+var boundBuiltin = Math.sin.bind();
+checkConstruct(boundBuiltin, true);
+
+/* We set the proxies construct trap to undefined,
+ * so the call trap is used as constructor.
+ */
+
+var proxiedFunctionPrototype = Proxy.create({}, Function.prototype, undefined);
+checkConstruct(proxiedFunctionPrototype, false);
+
+var proxiedBuiltin = Proxy.create({}, parseInt, undefined);
+checkConstruct(proxiedBuiltin, false);
+
+
+if (typeof reportCompare == 'function')
+    reportCompare(0, 0, "ok");
diff --git a/js/src/xpconnect/src/XPCWrapper.cpp b/js/src/xpconnect/src/XPCWrapper.cpp
index 1af8e0ab6676..753c0e95bf29 100644
--- a/js/src/xpconnect/src/XPCWrapper.cpp
+++ b/js/src/xpconnect/src/XPCWrapper.cpp
@@ -103,7 +103,6 @@ XrayWrapperConstructor(JSContext *cx, uintN argc, jsval *vp)
   *vp = OBJECT_TO_JSVAL(obj);
   return JS_WrapValue(cx, vp);
 }
-
 // static
 PRBool
 AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
@@ -111,15 +110,13 @@ AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
   JSObject *xpcnativewrapper =
     JS_DefineFunction(ccx, aGlobalObject, "XPCNativeWrapper",
                       XrayWrapperConstructor, 1,
-                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS);
+                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS | JSFUN_CONSTRUCTOR);
   if (!xpcnativewrapper) {
     return PR_FALSE;
   }
-
   return JS_DefineFunction(ccx, xpcnativewrapper, "unwrap", UnwrapNW, 1,
                            JSPROP_READONLY | JSPROP_PERMANENT) != nsnull;
 }
-
 }
 
 namespace XPCWrapper {

From 27a1f0b0a8bc7bc7f32bcf61414019b65c9ec960 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Wed, 20 Apr 2011 16:10:38 -0500
Subject: [PATCH 449/509] Backed out changeset e02df4a05968 due to orange.

---
 dom/src/threads/nsDOMWorker.cpp               | 10 ++-
 js/src/jit-test/tests/basic/bug579740.js      | 10 +--
 js/src/jit-test/tests/basic/bug630865-1.js    |  6 ++
 js/src/jit-test/tests/basic/bug630865-2.js    |  6 ++
 js/src/jit-test/tests/basic/bug630865-3.js    | 12 +++
 js/src/jit-test/tests/basic/bug630865-4.js    | 10 +++
 .../tests/basic/new-Function-prototype.js     | 11 +--
 js/src/jit-test/tests/basic/testBug593559.js  |  4 +-
 .../tests/basic/testProxyConstructors.js      | 15 ++--
 js/src/jsfun.h                                |  4 +-
 js/src/jsinterp.cpp                           | 79 ++++++++++++-------
 js/src/methodjit/InvokeHelpers.cpp            |  4 +-
 .../ecma_5/Function/builtin-no-construct.js   | 52 ------------
 js/src/tests/ecma_5/Function/jstests.list     |  1 -
 js/src/tests/ecma_5/misc/jstests.list         |  1 -
 .../ecma_5/misc/new-with-non-constructor.js   | 39 ---------
 js/src/xpconnect/src/XPCWrapper.cpp           |  5 +-
 17 files changed, 121 insertions(+), 148 deletions(-)
 create mode 100644 js/src/jit-test/tests/basic/bug630865-1.js
 create mode 100644 js/src/jit-test/tests/basic/bug630865-2.js
 create mode 100644 js/src/jit-test/tests/basic/bug630865-3.js
 create mode 100644 js/src/jit-test/tests/basic/bug630865-4.js
 delete mode 100644 js/src/tests/ecma_5/Function/builtin-no-construct.js
 delete mode 100644 js/src/tests/ecma_5/misc/new-with-non-constructor.js

diff --git a/dom/src/threads/nsDOMWorker.cpp b/dom/src/threads/nsDOMWorker.cpp
index 2dbe96ea7426..357e3d8de76f 100644
--- a/dom/src/threads/nsDOMWorker.cpp
+++ b/dom/src/threads/nsDOMWorker.cpp
@@ -767,6 +767,7 @@ nsDOMWorkerFunctions::CTypesLazyGetter(JSContext* aCx,
          JS_GetPropertyById(aCx, aObj, aId, aVp);
 }
 #endif
+
 JSFunctionSpec gDOMWorkerFunctions[] = {
   { "dump",                nsDOMWorkerFunctions::Dump,                1, 0 },
   { "setTimeout",          nsDOMWorkerFunctions::SetTimeout,          1, 0 },
@@ -774,16 +775,19 @@ JSFunctionSpec gDOMWorkerFunctions[] = {
   { "setInterval",         nsDOMWorkerFunctions::SetInterval,         1, 0 },
   { "clearInterval",       nsDOMWorkerFunctions::KillTimeout,         1, 0 },
   { "importScripts",       nsDOMWorkerFunctions::LoadScripts,         1, 0 },
-  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, JSFUN_CONSTRUCTOR },
-  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, JSFUN_CONSTRUCTOR },
+  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, 0 },
+  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, 0 },
   { "atob",                nsDOMWorkerFunctions::AtoB,                1, 0 },
   { "btoa",                nsDOMWorkerFunctions::BtoA,                1, 0 },
   { nsnull,                nsnull,                                    0, 0 }
 };
+
 JSFunctionSpec gDOMWorkerChromeFunctions[] = {
-  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, JSFUN_CONSTRUCTOR },
+  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, 0 },
   { nsnull,                nsnull,                                    0, 0 }
 };
+
+
 enum DOMWorkerStructuredDataType
 {
   // We have a special tag for XPCWrappedNatives that are being passed between
diff --git a/js/src/jit-test/tests/basic/bug579740.js b/js/src/jit-test/tests/basic/bug579740.js
index 26fa1ce22a10..83ee967bfd86 100644
--- a/js/src/jit-test/tests/basic/bug579740.js
+++ b/js/src/jit-test/tests/basic/bug579740.js
@@ -1,7 +1,7 @@
-try {
-    for (a = 0; a < 4; a++) {
-        new Math.round(0).t
-    }
+
+for (a = 0; a < 4; a++) {
+    new Math.round(0).t
 }
-catch (e) {}
+
 /* Don't assert. */
+
diff --git a/js/src/jit-test/tests/basic/bug630865-1.js b/js/src/jit-test/tests/basic/bug630865-1.js
new file mode 100644
index 000000000000..5203d1383d78
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug630865-1.js
@@ -0,0 +1,6 @@
+Object.defineProperty(Function.prototype, "prototype", {set:function(){}});
+var x;
+for (var i = 0; i < HOTLOOP + 2; i++)
+    x = new Function.prototype;
+assertEq(toString.call(x), "[object Object]");
+assertEq(Object.getPrototypeOf(x), Object.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-2.js b/js/src/jit-test/tests/basic/bug630865-2.js
new file mode 100644
index 000000000000..4616891b3b31
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug630865-2.js
@@ -0,0 +1,6 @@
+Function.prototype.prototype = function () {};
+var x;
+for (var i = 0; i < HOTLOOP + 2; i++)
+    x = new Function.prototype;
+assertEq(toString.call(x), "[object Object]");
+assertEq(Object.getPrototypeOf(x), Function.prototype.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-3.js b/js/src/jit-test/tests/basic/bug630865-3.js
new file mode 100644
index 000000000000..5933b2cb3123
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug630865-3.js
@@ -0,0 +1,12 @@
+var a = [];
+function next() {
+    var x = {};
+    a.push(x);
+    return x;
+}
+Object.defineProperty(Function.prototype, 'prototype', {get: next});
+var b = [];
+for (var i = 0; i < HOTLOOP + 2; i++)
+    b[i] = new Function.prototype;
+for (var i = 0; i < HOTLOOP + 2; i++)
+    assertEq(Object.getPrototypeOf(b[i]), a[i]);
diff --git a/js/src/jit-test/tests/basic/bug630865-4.js b/js/src/jit-test/tests/basic/bug630865-4.js
new file mode 100644
index 000000000000..fd9f8b5e2bb7
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug630865-4.js
@@ -0,0 +1,10 @@
+Object.defineProperty(Function.prototype, 'prototype',
+                      {get: function () { if (i == HOTLOOP + 1) throw "X"; }});
+var x;
+try {
+    for (var i = 0; i < HOTLOOP + 2; i++)
+        x = new Function.prototype;
+} catch (exc) {
+    assertEq(i, HOTLOOP + 1);
+    assertEq(exc, "X");
+}
diff --git a/js/src/jit-test/tests/basic/new-Function-prototype.js b/js/src/jit-test/tests/basic/new-Function-prototype.js
index 943cbba350a3..72bc5f78e8f2 100644
--- a/js/src/jit-test/tests/basic/new-Function-prototype.js
+++ b/js/src/jit-test/tests/basic/new-Function-prototype.js
@@ -1,18 +1,19 @@
 var funProto = Function.prototype;
 assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
+
 assertEq(parseInt.prototype, undefined);
+
 var oldObj;
 for (var i = 0, sz = RUNLOOP; i < sz; oldObj = obj, i++)
 {
-
-  try {
-    var obj = new funProto;
-  }
-  catch (e) {}
+  var obj = new funProto;
+  assertEq(obj === oldObj, false);
+  assertEq(Object.prototype.toString.call(obj), "[object Object]");
   assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
   assertEq(Object.getOwnPropertyDescriptor(parseInt, "prototype"), undefined);
   assertEq(parseInt.prototype, undefined);
 }
+
 checkStats({
   recorderStarted: 1,
   recorderAborted: 0,
diff --git a/js/src/jit-test/tests/basic/testBug593559.js b/js/src/jit-test/tests/basic/testBug593559.js
index 15c29d779925..c49e5367b976 100644
--- a/js/src/jit-test/tests/basic/testBug593559.js
+++ b/js/src/jit-test/tests/basic/testBug593559.js
@@ -1,8 +1,10 @@
 var gen = (function () {yield})();
 var t = gen.throw;
+
 try {
     new t;
 } catch (e) {
     actual = "" + e;
 }
-assertEq(actual, "TypeError: t is not a constructor");
+assertEq(actual, "TypeError: Generator.prototype.throw called on incompatible Object");
+
diff --git a/js/src/jit-test/tests/basic/testProxyConstructors.js b/js/src/jit-test/tests/basic/testProxyConstructors.js
index 14947e82bd5c..04665a78859f 100644
--- a/js/src/jit-test/tests/basic/testProxyConstructors.js
+++ b/js/src/jit-test/tests/basic/testProxyConstructors.js
@@ -2,16 +2,15 @@
 
 // proxies can return primitives
 assertEq(new (Proxy.createFunction({}, function(){}, function(){})), undefined);
+
 x = Proxy.createFunction((function () {}), Uint16Array, wrap)
 new(wrap(x))
+
 // proxies can return the callee
 var x = Proxy.createFunction({}, function (q) { return q; });
-assertEq(new x(x), x);
-try {
-    var x = (Proxy.createFunction({}, "".indexOf));
-    new x;
-}
-catch (e) {
-    assertEq(e.message, 'new x is not a constructor');
-}
+new x(x);
+
+// not an error
+new (Proxy.createFunction({}, "".indexOf));
+
 throw "ExitCleanly"
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 3a90fda2b2eb..e73c4e523e92 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -152,10 +152,12 @@ struct JSFunction : public JSObject_Slots2
     bool isConstructor()     const { return flags & JSFUN_CONSTRUCTOR; }
     bool isHeavyweight()     const { return JSFUN_HEAVYWEIGHT_TEST(flags); }
     bool isFlatClosure()     const { return FUN_KIND(this) == JSFUN_FLAT_CLOSURE; }
+
     bool isFunctionPrototype() const { return flags & JSFUN_PROTOTYPE; }
-    bool isInterpretedConstructor() const { return isInterpreted() && !isFunctionPrototype(); }
+
     /* Returns the strictness of this function, which must be interpreted. */
     inline bool inStrictMode() const;
+
     void setArgCount(uint16 nargs) {
         JS_ASSERT(this->nargs == 0);
         this->nargs = nargs;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 112469553fd7..52c68e5bfd0c 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1251,37 +1251,56 @@ InvokeConstructor(JSContext *cx, const CallArgs &argsRef)
     JS_ASSERT(!js_FunctionClass.construct);
     CallArgs args = argsRef;
 
-    if (args.calleev().isObject()) {
-        JSObject *callee = &args.callee();
-        if (callee->isFunction()) {
-            JSFunction *fun = callee->getFunctionPrivate();
-
-            if (fun->isConstructor()) {
-                args.thisv().setMagicWithObjectOrNullPayload(NULL);
-                return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
-            }
-
-            if (!fun->isInterpretedConstructor())
-                goto error;
-
-            if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
-                return false;
-
-            JS_ASSERT(args.rval().isObject());
-            JS_RUNTIME_METER(cx->runtime, constructs);
-            return true;
-        }
-
-        Class *clasp = callee->getClass();
-        if (clasp->construct) {
-            args.thisv().setMagicWithObjectOrNullPayload(NULL);
-            return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
-        }
+    JSObject *callee;
+    if (args.calleev().isPrimitive() || !(callee = &args.callee())->getParent()) {
+        js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
+        return false;
     }
 
-error:
-    js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
-    return false;
+    /* Handle the fast-constructors cases before falling into the general case . */
+    Class *clasp = callee->getClass();
+    JSFunction *fun = NULL;
+    if (clasp == &js_FunctionClass) {
+        fun = callee->getFunctionPrivate();
+        if (fun->isConstructor()) {
+            args.thisv().setMagicWithObjectOrNullPayload(NULL);
+            return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
+        }
+    } else if (clasp->construct) {
+        args.thisv().setMagicWithObjectOrNullPayload(NULL);
+        return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
+    }
+
+    /* Scripts create their own |this| in JSOP_BEGIN */
+    if (!fun || !fun->isInterpreted()) {
+        JSObject *obj = js_CreateThis(cx, callee);
+        if (!obj)
+            return false;
+        args.thisv().setObject(*obj);
+    }
+
+    if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
+        return false;
+
+    if (args.rval().isPrimitive()) {
+        if (clasp != &js_FunctionClass) {
+            /* native [[Construct]] returning primitive is error */
+            JSAutoByteString bytes;
+            if (js_ValueToPrintable(cx, args.rval(), &bytes)) {
+                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                                     JSMSG_BAD_NEW_RESULT, bytes.ptr());
+                return false;
+            }
+        }
+
+        /* The interpreter fixes rval for us. */
+        JS_ASSERT(!fun->isInterpreted());
+
+        args.rval() = args.thisv();
+    }
+
+    JS_RUNTIME_METER(cx->runtime, constructs);
+    return true;
 }
 
 bool
@@ -4569,7 +4588,7 @@ BEGIN_CASE(JSOP_NEW)
      */
     if (IsFunctionObject(vp[0], &callee)) {
         newfun = callee->getFunctionPrivate();
-        if (newfun->isInterpretedConstructor()) {
+        if (newfun->isInterpreted()) {
             if (newfun->u.i.script->isEmpty()) {
                 JSObject *obj2 = js_CreateThisForFunction(cx, callee);
                 if (!obj2)
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 34816b113dbd..1fba629ac481 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -409,10 +409,12 @@ void
 stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
 {
     ucr->init();
+
     JSContext *cx = f.cx;
     Value *vp = f.regs.sp - (argc + 2);
+
     /* Try to do a fast inline call before the general Invoke path. */
-    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpretedConstructor()) {
+    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpreted()) {
         ucr->callee = &vp->toObject();
         if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
             THROW();
diff --git a/js/src/tests/ecma_5/Function/builtin-no-construct.js b/js/src/tests/ecma_5/Function/builtin-no-construct.js
deleted file mode 100644
index b6c9e289f478..000000000000
--- a/js/src/tests/ecma_5/Function/builtin-no-construct.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-
-function checkMethod(method) {
-    try {
-        new method();
-        assertEq(0, 1, "not reached " + method);
-    } catch (e) {
-        assertEq(e.message, "method is not a constructor");
-    }
-}
-
-function checkMethods(proto) {
-    var names = Object.getOwnPropertyNames(proto);
-    for (var i = 0; i < names.length; i++) {
-        var name = names[i];
-        if (name == "constructor")
-            continue;
-        var prop = proto[name];
-        if (typeof prop === "function")
-            checkMethod(prop);
-    }
-}
-
-checkMethod(Function.prototype);
-checkMethods(JSON);
-checkMethods(Math);
-checkMethods(Proxy);
-
-var builtin_ctors = [
-    Object, Function, Array, String, Boolean, Number, Date, RegExp, Error,
-    EvalError, RangeError, ReferenceError, SyntaxError, TypeError, URIError,
-];
-
-for (var i = 0; i < builtin_ctors.length; i++) {
-    checkMethods(builtin_ctors[i]);
-    checkMethods(builtin_ctors[i].prototype);
-}
-
-var builtin_funcs = [
-    eval, isFinite, isNaN, parseFloat, parseInt,
-    decodeURI, decodeURIComponent, encodeURI, encodeURIComponent
-];
-
-for (var i = 0; i < builtin_funcs.length; i++) {
-    checkMethod(builtin_funcs[i]);
-}
-
-if (typeof reportCompare == 'function')
-    reportCompare(0, 0, "ok");
diff --git a/js/src/tests/ecma_5/Function/jstests.list b/js/src/tests/ecma_5/Function/jstests.list
index 242cbb91ec45..1813ecf32d19 100644
--- a/js/src/tests/ecma_5/Function/jstests.list
+++ b/js/src/tests/ecma_5/Function/jstests.list
@@ -10,4 +10,3 @@ script function-call.js
 script redefine-arguments-length.js
 script builtin-no-prototype.js
 script Function-arguments-gc.js
-script builtin-no-construct.js
diff --git a/js/src/tests/ecma_5/misc/jstests.list b/js/src/tests/ecma_5/misc/jstests.list
index fdceb9111886..adc9a73792be 100644
--- a/js/src/tests/ecma_5/misc/jstests.list
+++ b/js/src/tests/ecma_5/misc/jstests.list
@@ -9,5 +9,4 @@ skip-if(!xulRuntime.shell) script function-definition-evaluate.js # needs evalua
 script future-reserved-words.js
 script builtin-methods-reject-null-undefined-this.js
 script regress-bug632003.js
-script new-with-non-constructor.js
 script error-undefined-message.js
diff --git a/js/src/tests/ecma_5/misc/new-with-non-constructor.js b/js/src/tests/ecma_5/misc/new-with-non-constructor.js
deleted file mode 100644
index 7f73711b860a..000000000000
--- a/js/src/tests/ecma_5/misc/new-with-non-constructor.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-
-function checkConstruct(thing, buggy) {
-    try {
-        new thing();
-        assertEq(0, 1, "not reached " + thing);
-    } catch (e) {
-        if (buggy)
-            assertEq(e.message, "new thing is not a constructor");
-        else
-            assertEq(e.message, "thing is not a constructor");
-    }
-}
-
-var re = /aaa/
-checkConstruct(re, false);
-
-var boundFunctionPrototype = Function.prototype.bind();
-checkConstruct(boundFunctionPrototype, true);
-
-var boundBuiltin = Math.sin.bind();
-checkConstruct(boundBuiltin, true);
-
-/* We set the proxies construct trap to undefined,
- * so the call trap is used as constructor.
- */
-
-var proxiedFunctionPrototype = Proxy.create({}, Function.prototype, undefined);
-checkConstruct(proxiedFunctionPrototype, false);
-
-var proxiedBuiltin = Proxy.create({}, parseInt, undefined);
-checkConstruct(proxiedBuiltin, false);
-
-
-if (typeof reportCompare == 'function')
-    reportCompare(0, 0, "ok");
diff --git a/js/src/xpconnect/src/XPCWrapper.cpp b/js/src/xpconnect/src/XPCWrapper.cpp
index 753c0e95bf29..1af8e0ab6676 100644
--- a/js/src/xpconnect/src/XPCWrapper.cpp
+++ b/js/src/xpconnect/src/XPCWrapper.cpp
@@ -103,6 +103,7 @@ XrayWrapperConstructor(JSContext *cx, uintN argc, jsval *vp)
   *vp = OBJECT_TO_JSVAL(obj);
   return JS_WrapValue(cx, vp);
 }
+
 // static
 PRBool
 AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
@@ -110,13 +111,15 @@ AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
   JSObject *xpcnativewrapper =
     JS_DefineFunction(ccx, aGlobalObject, "XPCNativeWrapper",
                       XrayWrapperConstructor, 1,
-                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS | JSFUN_CONSTRUCTOR);
+                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS);
   if (!xpcnativewrapper) {
     return PR_FALSE;
   }
+
   return JS_DefineFunction(ccx, xpcnativewrapper, "unwrap", UnwrapNW, 1,
                            JSPROP_READONLY | JSPROP_PERMANENT) != nsnull;
 }
+
 }
 
 namespace XPCWrapper {

From a7c243271a9354aee6a07ce2de852ecc421563f3 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 20 Apr 2011 18:27:30 -0500
Subject: [PATCH 450/509] Bug 647011: Sprinkle some DebugOnly in js/src. r=luke

---
 js/src/jscntxt.cpp  |  5 +----
 js/src/jscntxt.h    |  6 ++----
 js/src/jsemit.cpp   |  9 ++-------
 js/src/jsobj.cpp    |  8 ++------
 js/src/jsscript.cpp |  5 +----
 js/src/jstracer.cpp | 21 ++++-----------------
 js/src/jsutil.h     |  4 ++++
 js/src/shell/js.cpp |  4 +---
 mfbt/Util.h         | 16 +++++++++++-----
 9 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 6acaab51ca54..94c2c9ca5877 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1000,10 +1000,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
              * JSCONTEXT_DESTROY callback is not allowed to fail and must
              * return true.
              */
-#ifdef DEBUG
-            JSBool callbackStatus =
-#endif
-            cxCallback(cx, JSCONTEXT_DESTROY);
+            DebugOnly<JSBool> callbackStatus = cxCallback(cx, JSCONTEXT_DESTROY);
             JS_ASSERT(callbackStatus);
         }
     }
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 057e3e4f9182..ae0a0d8c0f23 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -2510,10 +2510,8 @@ class AutoEnumStateRooter : private AutoGCRooter
 
     ~AutoEnumStateRooter() {
         if (!stateValue.isNull()) {
-#ifdef DEBUG
-            JSBool ok =
-#endif
-            obj->enumerate(context, JSENUMERATE_DESTROY, &stateValue, 0);
+            DebugOnly<JSBool> ok =
+                obj->enumerate(context, JSENUMERATE_DESTROY, &stateValue, 0);
             JS_ASSERT(ok);
         }
     }
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index 5a1bbbb285d4..10b5570ed647 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -850,9 +850,7 @@ OptimizeSpanDeps(JSContext *cx, JSCodeGenerator *cg)
     JSSrcNoteSpec *spec;
     uintN i, n, noteIndex;
     JSTryNode *tryNode;
-#ifdef DEBUG_brendan
-    int passes = 0;
-#endif
+    DebugOnly<int> passes = 0;
 
     base = CG_BASE(cg);
     sdbase = cg->spanDeps;
@@ -4694,10 +4692,7 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
             if (!EmitFunctionDefNop(cx, cg, index))
                 return JS_FALSE;
         } else {
-#ifdef DEBUG
-            BindingKind kind =
-#endif
-                cg->bindings.lookup(cx, fun->atom, &slot);
+            DebugOnly<BindingKind> kind = cg->bindings.lookup(cx, fun->atom, &slot);
             JS_ASSERT(kind == VARIABLE || kind == CONSTANT);
             JS_ASSERT(index < JS_BIT(20));
             pn->pn_index = index;
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index a33f3c35cbec..ee8a9ce94db8 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -4798,9 +4798,7 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const Value &valu
          * See bug 560998.
          */
         if (obj->shape() == oldShape && obj->branded() && shape->slot != SHAPE_INVALID_SLOT) {
-#ifdef DEBUG
-            const Shape *newshape =
-#endif
+            DebugOnly<const Shape*> newshape =
                 obj->methodWriteBarrier(cx, *shape, valueCopy);
             JS_ASSERT(newshape == shape);
         }
@@ -5154,9 +5152,7 @@ js_FindIdentifierBase(JSContext *cx, JSObject *scopeChain, jsid id)
                 return obj;
             }
             JS_ASSERT_IF(obj->getParent(), pobj->getClass() == obj->getClass());
-#ifdef DEBUG
-            PropertyCacheEntry *entry =
-#endif
+            DebugOnly<PropertyCacheEntry*> entry =
                 JS_PROPERTY_CACHE(cx).fill(cx, scopeChain, scopeIndex, protoIndex, pobj,
                                            (Shape *) prop);
             JS_ASSERT(entry);
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 8327acb8f83f..ac625b62ac47 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -265,10 +265,7 @@ Bindings::sharpSlotBase(JSContext *cx)
 #if JS_HAS_SHARP_VARS
     if (JSAtom *name = js_Atomize(cx, "#array", 6, 0)) {
         uintN index = uintN(-1);
-#ifdef DEBUG
-        BindingKind kind =
-#endif
-            lookup(cx, name, &index);
+        DebugOnly<BindingKind> kind = lookup(cx, name, &index);
         JS_ASSERT(kind == VARIABLE);
         return int(index);
     }
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 877769981dae..6e1315ee8b38 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -6607,14 +6607,9 @@ ExecuteTree(JSContext* cx, TraceMonitor* tm, TreeFragment* f, uintN& inlineCallC
     JS_ASSERT_IF(lr->exitType == LOOP_EXIT, !lr->calldepth);
 
     /* Restore interpreter state. */
-#ifdef DEBUG
-    LEAVE_TREE_STATUS lts = 
-#endif
-        LeaveTree(tm, state, lr);
-#ifdef DEBUG
+    DebugOnly<LEAVE_TREE_STATUS> lts = LeaveTree(tm, state, lr);
     JS_ASSERT_IF(lts == NO_DEEP_BAIL,
                  *(uint64*)&tm->storage->global()[globalSlots] == 0xdeadbeefdeadbeefLL);
-#endif
 
     *lrp = state.innermost;
     bool ok = !(state.builtinStatus & BUILTIN_ERROR);
@@ -6927,10 +6922,7 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
                       calldepth,
                       (unsigned long long int)cycles);
 
-#ifdef DEBUG
-    int slots =
-#endif
-        FlushNativeStackFrame(cx, innermost->calldepth, innermost->stackTypeMap(), stack);
+    DebugOnly<int> slots = FlushNativeStackFrame(cx, innermost->calldepth, innermost->stackTypeMap(), stack);
     JS_ASSERT(unsigned(slots) == innermost->numStackSlots);
 
     /*
@@ -6963,10 +6955,7 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
         JS_ASSERT(innermost->root()->nGlobalTypes() == ngslots);
         JS_ASSERT(innermost->root()->nGlobalTypes() > innermost->numGlobalSlots);
         typeMap.ensure(ngslots);
-#ifdef DEBUG
-        unsigned check_ngslots =
-#endif
-        BuildGlobalTypeMapFromInnerTree(typeMap, innermost);
+        DebugOnly<unsigned> check_ngslots = BuildGlobalTypeMapFromInnerTree(typeMap, innermost);
         JS_ASSERT(check_ngslots == ngslots);
         globalTypeMap = typeMap.data();
     }
@@ -8135,9 +8124,7 @@ TraceRecorder::callProp(JSObject* obj, JSProperty* prop, jsid id, Value*& vp,
         // Call objects do not yet have shape->isMethod() properties, but they
         // should. See bug 514046, for which this code is future-proof. Remove
         // this comment when that bug is fixed (so, FIXME: 514046).
-#ifdef DEBUG
-        JSBool rv =
-#endif
+        DebugOnly<JSBool> rv =
             js_GetPropertyHelper(cx, obj, shape->id,
                                  (op == JSOP_CALLNAME)
                                  ? JSGET_NO_METHOD_BARRIER
diff --git a/js/src/jsutil.h b/js/src/jsutil.h
index 405031869eeb..68570f251025 100644
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -45,6 +45,7 @@
 #define jsutil_h___
 
 #include "jstypes.h"
+#include "mozilla/Util.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -463,6 +464,9 @@ JS_END_EXTERN_C
  * be used, though this is undesirable.
  */
 namespace js {
+/* Import common mfbt declarations into "js". */
+using namespace mozilla;
+
 class OffTheBooks {
 public:
     JS_DECLARE_NEW_METHODS(::js_malloc, JS_ALWAYS_INLINE static)
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index abdfdcb34972..5de88ed47cca 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4153,9 +4153,7 @@ WatchdogMain(void *arg)
             PRIntervalTime sleepDuration = gWatchdogHasTimeout
                                            ? gWatchdogTimeout - now
                                            : PR_INTERVAL_NO_TIMEOUT;
-#ifdef DEBUG
-            PRStatus status =
-#endif
+            DebugOnly<PRStatus> status =
                 PR_WaitCondVar(gWatchdogWakeup, sleepDuration);
             JS_ASSERT(status == PR_SUCCESS);
         }
diff --git a/mfbt/Util.h b/mfbt/Util.h
index 501a96e1ecd9..d82a203fd08d 100644
--- a/mfbt/Util.h
+++ b/mfbt/Util.h
@@ -40,6 +40,8 @@
 #ifndef mozilla_Util_h_
 #define mozilla_Util_h_
 
+#ifdef __cplusplus
+
 namespace mozilla {
 
 /**
@@ -81,12 +83,16 @@ struct DebugOnly
     DebugOnly& operator=(const T&) {}   
 #endif
 
-    // DebugOnly must always have a destructor or else it will
-    // generate "unused variable" warnings, exactly what it's intended
-    // to avoid!
+    /*
+     * DebugOnly must always have a destructor or else it will
+     * generate "unused variable" warnings, exactly what it's intended
+     * to avoid!
+     */
     ~DebugOnly() {}
 };
 
-} // namespace mozilla
+} /* namespace mozilla */
 
-#endif  // mozilla_Util_h_
+#endif /* __cplusplus */
+
+#endif  /* mozilla_Util_h_ */

From fae4901023d199a8306c2a329f60451965c27c35 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 20 Apr 2011 18:34:49 -0700
Subject: [PATCH 451/509] Bug 651041 - add API to store private data to an
 external string (r=njn)

---
 js/src/jsapi-tests/Makefile.in             |  1 +
 js/src/jsapi-tests/testExternalStrings.cpp | 42 ++++++++++++++++++++++
 js/src/jsapi.cpp                           | 26 ++++++++++++--
 js/src/jsapi.h                             | 32 +++++++++++++++--
 js/src/jsprvtd.h                           |  1 +
 js/src/jsstr.cpp                           |  8 +++++
 js/src/jsstr.h                             | 32 +++++++++++++----
 js/src/jsstrinlines.h                      | 13 +++----
 8 files changed, 137 insertions(+), 18 deletions(-)
 create mode 100644 js/src/jsapi-tests/testExternalStrings.cpp

diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index f37b24827b20..04c78342040b 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -81,6 +81,7 @@ CPPSRCS = \
   testVersion.cpp \
   testXDR.cpp \
   testCustomIterator.cpp \
+  testExternalStrings.cpp \
   $(NULL)
 
 # Disabled: an entirely unrelated test seems to cause this to fail.  Moreover,
diff --git a/js/src/jsapi-tests/testExternalStrings.cpp b/js/src/jsapi-tests/testExternalStrings.cpp
new file mode 100644
index 000000000000..0edcc667abea
--- /dev/null
+++ b/js/src/jsapi-tests/testExternalStrings.cpp
@@ -0,0 +1,42 @@
+#include "tests.h"
+#include "jsutil.h"
+
+const jschar arr[] = { 'h', 'i', ',', 'd', 'o', 'n', '\'', 't', ' ', 'd', 'e', 'l', 'e', 't', 'e', ' ', 'm', 'e', '\0' };
+size_t arrlen = sizeof(arr) / sizeof(arr[0]) - 1;
+void *magic = (void *)0x42;
+
+int finalized_noclosure = 0;
+int finalized_closure = 0;
+
+void finalize_str(JSContext *cx, JSString *str)
+{
+    size_t len;
+    const jschar *chars = JS_GetStringCharsAndLength(cx, str, &len);
+    if (chars && len == arrlen && js::PodEqual(chars, arr, len)) {
+        void *closure = JS_GetExternalStringClosure(cx, str);
+        if (closure) {
+            if (closure == magic)
+                ++finalized_closure;
+        } else {
+            ++finalized_noclosure;
+        }
+    }
+}
+
+BEGIN_TEST(testExternalStrings)
+{
+    intN op = JS_AddExternalStringFinalizer(finalize_str);
+
+    CHECK(JS_NewExternalString(cx, arr, arrlen, op));
+    CHECK(JS_NewExternalStringWithClosure(cx, arr, arrlen, op, magic));
+
+    // clear that newborn root
+    JS_NewUCStringCopyN(cx, arr, arrlen);
+
+    JS_GC(cx);
+    CHECK(finalized_noclosure == 1);
+    CHECK(finalized_closure == 1);
+
+    return true;
+}
+END_TEST(testExternalStrings)
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 3a82b2cd1b6e..adf10a16256a 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2799,10 +2799,32 @@ JS_RemoveExternalStringFinalizer(JSStringFinalizeOp finalizer)
 }
 
 JS_PUBLIC_API(JSString *)
-JS_NewExternalString(JSContext *cx, jschar *chars, size_t length, intN type)
+JS_NewExternalString(JSContext *cx, const jschar *chars, size_t length, intN type)
 {
     CHECK_REQUEST(cx);
-    return JSExternalString::new_(cx, chars, length, type);
+    return JSExternalString::new_(cx, chars, length, type, NULL);
+}
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewExternalStringWithClosure(JSContext *cx, const jschar *chars, size_t length,
+                                intN type, void *closure)
+{
+    CHECK_REQUEST(cx);
+    return JSExternalString::new_(cx, chars, length, type, closure);
+}
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsExternalString(JSContext *, JSString *str)
+{
+    CHECK_REQUEST(cx);
+    return str->isExternal();
+}
+
+extern JS_PUBLIC_API(void *)
+JS_GetExternalStringClosure(JSContext *cx, JSString *str)
+{
+    CHECK_REQUEST(cx);
+    return str->asExternal().externalClosure();
 }
 
 JS_PUBLIC_API(void)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 7f8bb9566af6..c8ecf328a15c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1874,11 +1874,37 @@ JS_RemoveExternalStringFinalizer(JSStringFinalizeOp finalizer);
 
 /*
  * Create a new JSString whose chars member refers to external memory, i.e.,
- * memory requiring spe, type-specific finalization.  The type code must
- * be a nonnegative return value from JS_AddExternalStringFinalizer.
+ * memory requiring type-specific finalization.  The type code must be a
+ * nonnegative return value from JS_AddExternalStringFinalizer.
  */
 extern JS_PUBLIC_API(JSString *)
-JS_NewExternalString(JSContext *cx, jschar *chars, size_t length, intN type);
+JS_NewExternalString(JSContext *cx, const jschar *chars, size_t length, intN type);
+
+/*
+ * Like JS_NewExternalString, except that 'closure' can be retrieved later via
+ * JS_GetExternalStringClosure. This closure data is a black blox to the JS
+ * engine and may be used by the embedding to associate extra data with an
+ * external string. E.g., an embedding may want to associate a pointer to the
+ * object that owns the chars of an external string so that, when this external
+ * string is finalized, the owner object can be deleted.
+ */
+extern JS_PUBLIC_API(JSString *)
+JS_NewExternalStringWithClosure(JSContext *cx, const jschar *chars, size_t length,
+                                intN type, void *closure);
+
+/*
+ * Return whether 'str' was created with JS_NewExternalString or
+ * JS_NewExternalStringWithClosure.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_IsExternalString(JSContext *cx, JSString *str);
+
+/*
+ * Return the 'closure' arg passed to JS_NewExternalStringWithClosure or NULL
+ * if the external string was created via JS_NewExternalString.
+ */
+extern JS_PUBLIC_API(void *)
+JS_GetExternalStringClosure(JSContext *cx, JSString *str);
 
 /*
  * Deprecated. Use JS_SetNativeStackQuoata instead.
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index 6516470f2eaf..a67c0914cd35 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -120,6 +120,7 @@ extern "C++" {
 
 class JSDependentString;
 class JSExtensibleString;
+class JSExternalString;
 class JSLinearString;
 class JSFixedString;
 class JSStaticAtom;
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 96ba3984f1b8..44606d77cd12 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -102,6 +102,14 @@ JSString::isFixed() const
 }
 #endif
 
+bool
+JSString::isExternal() const
+{
+    bool is_external = arena()->header()->thingKind == FINALIZE_EXTERNAL_STRING;
+    JS_ASSERT_IF(is_external, isFixed());
+    return is_external;
+}
+
 static JS_ALWAYS_INLINE JSString *
 Tag(JSRope *str)
 {
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 22ff23509c4a..f85740bddf07 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -159,10 +159,11 @@ class JSString : public js::gc::Cell
                     JSLinearString *base;               /* JSDependentString */
                     JSString       *right;              /* JSRope */
                     size_t         capacity;            /* JSFlatString (extensible) */
-                    size_t         externalStringType;  /* JSExternalString */
+                    size_t         externalType;        /* JSExternalString */
                 } u2;
                 union {
                     JSString       *parent;             /* JSRope (temporary) */
+                    void           *externalClosure;    /* JSExternalString */
                     size_t         reserved;            /* may use for bug 615290 */
                 } u3;
             } s;
@@ -340,6 +341,14 @@ class JSString : public js::gc::Cell
         return *(JSFixedString *)this;
     }
 
+    bool isExternal() const;
+
+    JS_ALWAYS_INLINE
+    JSExternalString &asExternal() {
+        JS_ASSERT(isExternal());
+        return *(JSExternalString *)this;
+    }
+
     JS_ALWAYS_INLINE
     bool isAtom() const {
         bool atomized = (d.lengthAndFlags & ATOM_MASK) == ATOM_FLAGS;
@@ -542,22 +551,31 @@ class JSShortString : public JSInlineString
 
 JS_STATIC_ASSERT(sizeof(JSShortString) == 2 * sizeof(JSString));
 
+/*
+ * The externalClosure stored in an external string is a black box to the JS
+ * engine; see JS_NewExternalStringWithClosure.
+ */
 class JSExternalString : public JSFixedString
 {
     static void staticAsserts() {
         JS_STATIC_ASSERT(TYPE_LIMIT == 8);
     }
 
-    void init(const jschar *chars, size_t length, intN type);
+    void init(const jschar *chars, size_t length, intN type, void *closure);
 
   public:
     static inline JSExternalString *new_(JSContext *cx, const jschar *chars,
-                                         size_t length, intN type);
+                                         size_t length, intN type, void *closure);
 
-    intN externalStringType() const {
-        JS_ASSERT(isFlat() && !isAtom());
-        JS_ASSERT(d.s.u2.externalStringType < TYPE_LIMIT);
-        return d.s.u2.externalStringType;
+    intN externalType() const {
+        JS_ASSERT(isExternal());
+        JS_ASSERT(d.s.u2.externalType < TYPE_LIMIT);
+        return d.s.u2.externalType;
+    }
+
+    void *externalClosure() const {
+        JS_ASSERT(isExternal());
+        return d.s.u3.externalClosure;
     }
 
     static const uintN TYPE_LIMIT = 8;
diff --git a/js/src/jsstrinlines.h b/js/src/jsstrinlines.h
index 5b72a734b8ac..674b0552da5b 100644
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.h
@@ -391,15 +391,16 @@ JSShortString::initAtOffsetInBuffer(const jschar *chars, size_t length)
 }
 
 JS_ALWAYS_INLINE void
-JSExternalString::init(const jschar *chars, size_t length, intN type)
+JSExternalString::init(const jschar *chars, size_t length, intN type, void *closure)
 {
     d.lengthAndFlags = buildLengthAndFlags(length, FIXED_FLAGS);
     d.u1.chars = chars;
-    d.s.u2.externalStringType = type;
+    d.s.u2.externalType = type;
+    d.s.u3.externalClosure = closure;
 }
 
 JS_ALWAYS_INLINE JSExternalString *
-JSExternalString::new_(JSContext *cx, const jschar *chars, size_t length, intN type)
+JSExternalString::new_(JSContext *cx, const jschar *chars, size_t length, intN type, void *closure)
 {
     JS_ASSERT(uintN(type) < JSExternalString::TYPE_LIMIT);
     JS_ASSERT(chars[length] == 0);
@@ -407,7 +408,7 @@ JSExternalString::new_(JSContext *cx, const jschar *chars, size_t length, intN t
     JSExternalString *str = (JSExternalString *)js_NewGCExternalString(cx, type);
     if (!str)
         return NULL;
-    str->init(chars, length, type);
+    str->init(chars, length, type, closure);
     cx->runtime->updateMallocCounter((length + 1) * sizeof(jschar));
     return str;
 }
@@ -560,14 +561,14 @@ inline void
 JSExternalString::finalize(JSContext *cx)
 {
     JS_RUNTIME_UNMETER(cx->runtime, liveStrings);
-    if (JSStringFinalizeOp finalizer = str_finalizers[externalStringType()])
+    if (JSStringFinalizeOp finalizer = str_finalizers[externalType()])
         finalizer(cx, this);
 }
 
 inline void
 JSExternalString::finalize()
 {
-    JSStringFinalizeOp finalizer = str_finalizers[externalStringType()];
+    JSStringFinalizeOp finalizer = str_finalizers[externalType()];
     if (finalizer) {
         /*
          * Assume that the finalizer for the permanently interned

From af55c33dc016cdde6404683d7338cae27c64c68d Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 20 Apr 2011 19:29:11 -0700
Subject: [PATCH 452/509] Fix typo in --enable-threadsafe builds (r=burning)

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

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index adf10a16256a..eb08cf173ae4 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2814,7 +2814,7 @@ JS_NewExternalStringWithClosure(JSContext *cx, const jschar *chars, size_t lengt
 }
 
 extern JS_PUBLIC_API(JSBool)
-JS_IsExternalString(JSContext *, JSString *str)
+JS_IsExternalString(JSContext *cx, JSString *str)
 {
     CHECK_REQUEST(cx);
     return str->isExternal();

From 740e2ebfb62bdfb2adb467d94aa9e8865709228a Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 20 Apr 2011 21:06:01 -0700
Subject: [PATCH 453/509] Loosen test from 905a35f3a76b to account for
 conservative GC rooting fuzziness (r=orange)

---
 js/src/jsapi-tests/testExternalStrings.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/js/src/jsapi-tests/testExternalStrings.cpp b/js/src/jsapi-tests/testExternalStrings.cpp
index 0edcc667abea..6cc0492f8580 100644
--- a/js/src/jsapi-tests/testExternalStrings.cpp
+++ b/js/src/jsapi-tests/testExternalStrings.cpp
@@ -27,15 +27,23 @@ BEGIN_TEST(testExternalStrings)
 {
     intN op = JS_AddExternalStringFinalizer(finalize_str);
 
-    CHECK(JS_NewExternalString(cx, arr, arrlen, op));
-    CHECK(JS_NewExternalStringWithClosure(cx, arr, arrlen, op, magic));
+    const unsigned N = 1000;
+
+    for (unsigned i = 0; i < N; ++i) {
+        CHECK(JS_NewExternalString(cx, arr, arrlen, op));
+        CHECK(JS_NewExternalStringWithClosure(cx, arr, arrlen, op, magic));
+    }
 
     // clear that newborn root
     JS_NewUCStringCopyN(cx, arr, arrlen);
 
     JS_GC(cx);
-    CHECK(finalized_noclosure == 1);
-    CHECK(finalized_closure == 1);
+
+    // a generous fudge factor to account for strings rooted by conservative gc
+    const unsigned epsilon = 10;
+
+    CHECK((N - finalized_noclosure) < epsilon);
+    CHECK((N - finalized_closure) < epsilon);
 
     return true;
 }

From 404aabd1d493c6563139476911336f5f45cb569f Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Thu, 21 Apr 2011 11:14:49 -0700
Subject: [PATCH 454/509] Refactor Call ICs (bug 638680, r=luke).

---
 js/src/assembler/assembler/ARMAssembler.h     |    5 +
 js/src/assembler/assembler/ARMv7Assembler.h   |    5 +
 .../assembler/AbstractMacroAssembler.h        |    5 +
 js/src/assembler/assembler/CodeLocation.h     |   16 +-
 js/src/assembler/assembler/LinkBuffer.h       |    5 +
 js/src/assembler/assembler/X86Assembler.h     |    5 +
 js/src/jscompartment.cpp                      |    4 +-
 js/src/methodjit/BaseAssembler.h              |   39 +-
 js/src/methodjit/Compiler.cpp                 |  662 +++------
 js/src/methodjit/Compiler.h                   |   65 +-
 js/src/methodjit/FrameState.cpp               |   13 +
 js/src/methodjit/FrameState.h                 |    5 +
 js/src/methodjit/InlineFrameAssembler.h       |  157 ---
 js/src/methodjit/InvokeHelpers.cpp            |  163 +--
 js/src/methodjit/MethodJIT.cpp                |   35 +-
 js/src/methodjit/MethodJIT.h                  |   24 +-
 js/src/methodjit/MonoIC.cpp                   | 1202 +++++++++--------
 js/src/methodjit/MonoIC.h                     |  137 +-
 js/src/methodjit/PolyIC.h                     |    6 -
 js/src/methodjit/StubCalls-inl.h              |   17 +
 js/src/methodjit/StubCalls.h                  |   37 -
 js/src/methodjit/StubCompiler.cpp             |   27 +
 js/src/methodjit/StubCompiler.h               |    2 +
 23 files changed, 1083 insertions(+), 1553 deletions(-)
 delete mode 100644 js/src/methodjit/InlineFrameAssembler.h

diff --git a/js/src/assembler/assembler/ARMAssembler.h b/js/src/assembler/assembler/ARMAssembler.h
index d45a1e41043f..7643f41b7eda 100644
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -1114,6 +1114,11 @@ namespace JSC {
             return true;
         }
 
+        static bool canLinkJump(void* code, JmpSrc where, void* value)
+        {
+            return true;
+        }
+
         static void linkCall(void* code, JmpSrc from, void* to)
         {
             js::JaegerSpew(js::JSpew_Insns,
diff --git a/js/src/assembler/assembler/ARMv7Assembler.h b/js/src/assembler/assembler/ARMv7Assembler.h
index e1478ba2c91d..e00de0117ebd 100644
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -1633,6 +1633,11 @@ public:
     {
         return true;
     }
+
+    static bool canLinkJump(void* code, JmpSrc where, void* value)
+    {
+        return true;
+    }
     
     static void relinkCall(void* from, void* to)
     {
diff --git a/js/src/assembler/assembler/AbstractMacroAssembler.h b/js/src/assembler/assembler/AbstractMacroAssembler.h
index 260380acd307..7cd15efd3196 100644
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -579,6 +579,11 @@ protected:
         return AssemblerType::canRelinkJump(jump.dataLocation(), destination.dataLocation());
     }
 
+    static bool canPatchJump(void *code, Jump jump, CodeLocationLabel target)
+    {
+        return AssemblerType::canLinkJump(code, jump.m_jmp, target.dataLocation());
+    }
+
     static void repatchNearCall(CodeLocationNearCall nearCall, CodeLocationLabel destination)
     {
         AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress());
diff --git a/js/src/assembler/assembler/CodeLocation.h b/js/src/assembler/assembler/CodeLocation.h
index 490157688614..56e7259559ba 100644
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -59,11 +59,11 @@ class CodeLocationDataLabelPtr;
 class CodeLocationCommon : public MacroAssemblerCodePtr {
 public:
     CodeLocationInstruction instructionAtOffset(int offset);
-    CodeLocationLabel labelAtOffset(int offset);
-    CodeLocationJump jumpAtOffset(int offset);
-    CodeLocationCall callAtOffset(int offset);
+    CodeLocationLabel labelAtOffset(int offset) const;
+    CodeLocationJump jumpAtOffset(int offset) const;
+    CodeLocationCall callAtOffset(int offset) const;
     CodeLocationNearCall nearCallAtOffset(int offset);
-    CodeLocationDataLabelPtr dataLabelPtrAtOffset(int offset);
+    CodeLocationDataLabelPtr dataLabelPtrAtOffset(int offset) const;
     CodeLocationDataLabel32 dataLabel32AtOffset(int offset);
 
 protected:
@@ -146,19 +146,19 @@ inline CodeLocationInstruction CodeLocationCommon::instructionAtOffset(int offse
     return CodeLocationInstruction(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationLabel CodeLocationCommon::labelAtOffset(int offset)
+inline CodeLocationLabel CodeLocationCommon::labelAtOffset(int offset) const
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationLabel(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationJump CodeLocationCommon::jumpAtOffset(int offset)
+inline CodeLocationJump CodeLocationCommon::jumpAtOffset(int offset) const
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationJump(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationCall CodeLocationCommon::callAtOffset(int offset)
+inline CodeLocationCall CodeLocationCommon::callAtOffset(int offset) const
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationCall(reinterpret_cast<char*>(dataLocation()) + offset);
@@ -170,7 +170,7 @@ inline CodeLocationNearCall CodeLocationCommon::nearCallAtOffset(int offset)
     return CodeLocationNearCall(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationDataLabelPtr CodeLocationCommon::dataLabelPtrAtOffset(int offset)
+inline CodeLocationDataLabelPtr CodeLocationCommon::dataLabelPtrAtOffset(int offset) const
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationDataLabelPtr(reinterpret_cast<char*>(dataLocation()) + offset);
diff --git a/js/src/assembler/assembler/LinkBuffer.h b/js/src/assembler/assembler/LinkBuffer.h
index eac984c8d466..65c39e106ece 100644
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -119,6 +119,11 @@ public:
             MacroAssembler::linkJump(code(), list.m_jumps[i], label);
     }
 
+    bool canLink(Jump jump, CodeLocationLabel label)
+    {
+        return MacroAssembler::canPatchJump(code(), jump, label);
+    }
+
     void patch(DataLabelPtr label, void* value)
     {
         MacroAssembler::linkPointer(code(), label.m_label, value);
diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index fb12f78f478c..d79a40afd1c5 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -2387,6 +2387,11 @@ public:
         intptr_t offset = reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(from);
         return (offset == static_cast<int32_t>(offset));
     }
+
+    static bool canLinkJump(void* code, JmpSrc where, void* value)
+    {
+        return canRelinkJump(reinterpret_cast<char*>(code) + where.m_offset, value);
+    }
     
     static void relinkCall(void* from, void* to)
     {
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index f2a4e2e2bcad..37d72a8e5512 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -512,8 +512,8 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
     for (JSCList *cursor = scripts.next; cursor != &scripts; cursor = cursor->next) {
         JSScript *script = reinterpret_cast<JSScript *>(cursor);
         if (script->hasJITCode()) {
-            mjit::ic::SweepCallICs(cx, script, discardScripts);
             if (discardScripts) {
+                mjit::ic::PurgeICs(cx, script);
                 if (script->jitNormal &&
                     ScriptPoolDestroyed(cx, script->jitNormal, releaseInterval, counter)) {
                     mjit::ReleaseScriptCode(cx, script);
@@ -523,6 +523,8 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
                     ScriptPoolDestroyed(cx, script->jitCtor, releaseInterval, counter)) {
                     mjit::ReleaseScriptCode(cx, script);
                 }
+            } else {
+                mjit::ic::SweepICs(cx, script);
             }
         }
     }
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index 400e373a932b..f89b0d24b764 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -608,8 +608,10 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
 
         /* PC -> regs->pc :( */
-        storePtr(ImmPtr(pc),
-                 FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc)));
+        if (pc) {
+            storePtr(ImmPtr(pc),
+                     FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc)));
+        }
     }
 
     // An infallible VM call is a stub call (taking a VMFrame & and one
@@ -693,6 +695,39 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         return fails;
     }
 
+    //
+    // Class to assist with computing offsets into a frame being pushed from JIT code.
+    struct AdjustedFrame {
+        AdjustedFrame(uint32 baseOffset)
+         : baseOffset(baseOffset)
+        { }
+
+        uint32 baseOffset;
+
+        JSC::MacroAssembler::Address addrOf(uint32 offset) {
+            return JSC::MacroAssembler::Address(JSFrameReg, baseOffset + offset);
+        }
+    };
+
+    // Implements JSStackFrame::initCallFrameCallerHalf.
+    DataLabelPtr emitStaticFrame(bool isNew, uint32 frameDepth, void *returnAddress) {
+        AdjustedFrame newfp(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
+    
+        Address flagsAddr = newfp.addrOf(JSStackFrame::offsetOfFlags());
+        uint32 extraFlags = isNew ? JSFRAME_CONSTRUCTING : 0;
+        store32(Imm32(JSFRAME_FUNCTION | extraFlags), flagsAddr);
+    
+        Address prevAddr = newfp.addrOf(JSStackFrame::offsetOfPrev());
+        storePtr(JSFrameReg, prevAddr);
+    
+        Address ncodeAddr = newfp.addrOf(JSStackFrame::offsetOfncode());
+        DataLabelPtr ptr = storePtrWithPatch(ImmPtr(returnAddress), ncodeAddr);
+    
+        addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
+
+        return ptr;
+    }
+
     void loadObjClass(RegisterID objReg, RegisterID destReg) {
         loadPtr(Address(objReg, offsetof(JSObject, clasp)), destReg);
     }
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index b1d3615fd6fd..a393918b2f4d 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -55,7 +55,6 @@
 #include "FrameState-inl.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
-#include "InlineFrameAssembler.h"
 #include "jscompartment.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
@@ -99,7 +98,6 @@ mjit::Compiler::Compiler(JSContext *cx, JSStackFrame *fp)
 #if defined JS_MONOIC
     getGlobalNames(CompilerAllocPolicy(cx, *thisFromCtor())),
     setGlobalNames(CompilerAllocPolicy(cx, *thisFromCtor())),
-    callICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     equalityICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     traceICs(CompilerAllocPolicy(cx, *thisFromCtor())),
 #endif
@@ -108,7 +106,7 @@ mjit::Compiler::Compiler(JSContext *cx, JSStackFrame *fp)
     getElemICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     setElemICs(CompilerAllocPolicy(cx, *thisFromCtor())),
 #endif
-    callPatches(CompilerAllocPolicy(cx, *thisFromCtor())),
+    callICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     callSites(CompilerAllocPolicy(cx, *thisFromCtor())), 
     doubleList(CompilerAllocPolicy(cx, *thisFromCtor())),
     jumpTables(CompilerAllocPolicy(cx, *thisFromCtor())),
@@ -433,10 +431,10 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     /* Please keep in sync with JITScript::scriptDataSize! */
     size_t totalBytes = sizeof(JITScript) +
                         sizeof(NativeMapEntry) * nNmapLive +
+                        sizeof(ic::CallIC) * callICs.length() +
 #if defined JS_MONOIC
                         sizeof(ic::GetGlobalNameIC) * getGlobalNames.length() +
                         sizeof(ic::SetGlobalNameIC) * setGlobalNames.length() +
-                        sizeof(ic::CallICInfo) * callICs.length() +
                         sizeof(ic::EqualityICInfo) * equalityICs.length() +
                         sizeof(ic::TraceICInfo) * traceICs.length() +
 #endif
@@ -458,6 +456,7 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     cursor += sizeof(JITScript);
 
     jit->code = JSC::MacroAssemblerCodeRef(result, execPool, masm.size() + stubcc.size());
+    jit->script = script;
     jit->invokeEntry = result;
     jit->singleStepMode = script->singleStepMode;
     if (fun) {
@@ -489,6 +488,58 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     }
     JS_ASSERT(ix == jit->nNmapPairs);
 
+    ic::CallIC *callICs_ = (ic::CallIC *)cursor;
+    jit->nCallICs = callICs.length();
+    cursor += sizeof(ic::CallIC) * jit->nCallICs;
+    for (size_t i = 0; i < jit->nCallICs; i++) {
+        const CallICInfo &from = callICs[i];
+        ic::CallIC &to = callICs_[i];
+
+        to.fastPathStart = fullCode.locationOf(from.fastPathStart);
+        to.slowPathStart = stubCode.locationOf(from.slowPathStart);
+        to.frameSize = from.frameSize;
+        to.pc = from.pc;
+
+        uint32 offset = fullCode.locationOf(from.fastPathRejoin) - to.fastPathStart;
+        to.inlineRejoinOffset = offset;
+        JS_ASSERT(to.inlineRejoinOffset == offset);
+
+        offset = fullCode.locationOf(from.completedRejoinOffset) - to.fastPathStart;
+        to.completedRejoinOffset = offset;
+        JS_ASSERT(to.completedRejoinOffset == offset);
+
+        offset = fullCode.locationOf(from.inlineJump) - to.fastPathStart;
+        to.inlineJumpOffset = offset;
+        JS_ASSERT(to.inlineJumpOffset == offset);
+
+        offset = stubCode.locationOf(from.slowPathCall) - to.slowPathStart;
+        to.slowCallOffset = offset;
+        JS_ASSERT(to.slowCallOffset == offset);
+
+        offset = from.rval.offset;
+        to.rvalOffset = offset;
+        JS_ASSERT(offset == to.rvalOffset);
+
+        to.calleeData = from.calleeData;
+
+        if (from.hasExtendedInlinePath) {
+            to.hasExtendedInlinePath = true;
+            fullCode.patch(from.ncodePatch, to.returnAddress());
+
+            offset = fullCode.locationOf(from.calleePtr) - to.fastPathStart;
+            to.inlineCalleeGuard = offset;
+            JS_ASSERT(offset == to.inlineCalleeGuard);
+
+            offset = fullCode.locationOf(from.inlineCall) - to.fastPathStart;
+            to.inlineCallOffset = offset;
+            JS_ASSERT(offset == to.inlineCallOffset);
+        }
+
+        stubCode.patch(from.paramAddr, &to);
+        if (from.speculatedFunCallOrApply)
+            stubCode.patch(from.failedSpeculationParam, &to);
+    }
+
 #if defined JS_MONOIC
     ic::GetGlobalNameIC *getGlobalNames_ = (ic::GetGlobalNameIC *)cursor;
     jit->nGetGlobalNames = getGlobalNames.length();
@@ -538,65 +589,6 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
         stubCode.patch(from.addrLabel, &to);
     }
 
-    ic::CallICInfo *jitCallICs = (ic::CallICInfo *)cursor;
-    jit->nCallICs = callICs.length();
-    cursor += sizeof(ic::CallICInfo) * jit->nCallICs;
-    for (size_t i = 0; i < jit->nCallICs; i++) {
-        jitCallICs[i].reset();
-        jitCallICs[i].funGuard = fullCode.locationOf(callICs[i].funGuard);
-        jitCallICs[i].funJump = fullCode.locationOf(callICs[i].funJump);
-        jitCallICs[i].slowPathStart = stubCode.locationOf(callICs[i].slowPathStart);
-
-        /* Compute the hot call offset. */
-        uint32 offset = fullCode.locationOf(callICs[i].hotJump) -
-                        fullCode.locationOf(callICs[i].funGuard);
-        jitCallICs[i].hotJumpOffset = offset;
-        JS_ASSERT(jitCallICs[i].hotJumpOffset == offset);
-
-        /* Compute the join point offset. */
-        offset = fullCode.locationOf(callICs[i].joinPoint) -
-                 fullCode.locationOf(callICs[i].funGuard);
-        jitCallICs[i].joinPointOffset = offset;
-        JS_ASSERT(jitCallICs[i].joinPointOffset == offset);
-                                        
-        /* Compute the OOL call offset. */
-        offset = stubCode.locationOf(callICs[i].oolCall) -
-                 stubCode.locationOf(callICs[i].slowPathStart);
-        jitCallICs[i].oolCallOffset = offset;
-        JS_ASSERT(jitCallICs[i].oolCallOffset == offset);
-
-        /* Compute the OOL jump offset. */
-        offset = stubCode.locationOf(callICs[i].oolJump) -
-                 stubCode.locationOf(callICs[i].slowPathStart);
-        jitCallICs[i].oolJumpOffset = offset;
-        JS_ASSERT(jitCallICs[i].oolJumpOffset == offset);
-
-        /* Compute the start of the OOL IC call. */
-        offset = stubCode.locationOf(callICs[i].icCall) -
-                 stubCode.locationOf(callICs[i].slowPathStart);
-        jitCallICs[i].icCallOffset = offset;
-        JS_ASSERT(jitCallICs[i].icCallOffset == offset);
-
-        /* Compute the slow join point offset. */
-        offset = stubCode.locationOf(callICs[i].slowJoinPoint) -
-                 stubCode.locationOf(callICs[i].slowPathStart);
-        jitCallICs[i].slowJoinOffset = offset;
-        JS_ASSERT(jitCallICs[i].slowJoinOffset == offset);
-
-        /* Compute the join point offset for continuing on the hot path. */
-        offset = stubCode.locationOf(callICs[i].hotPathLabel) -
-                 stubCode.locationOf(callICs[i].funGuard);
-        jitCallICs[i].hotPathOffset = offset;
-        JS_ASSERT(jitCallICs[i].hotPathOffset == offset);
-
-        jitCallICs[i].pc = callICs[i].pc;
-        jitCallICs[i].frameSize = callICs[i].frameSize;
-        jitCallICs[i].funObjReg = callICs[i].funObjReg;
-        jitCallICs[i].funPtrReg = callICs[i].funPtrReg;
-        stubCode.patch(callICs[i].addrLabel1, &jitCallICs[i]);
-        stubCode.patch(callICs[i].addrLabel2, &jitCallICs[i]);
-    }
-
     ic::EqualityICInfo *jitEqualityICs = (ic::EqualityICInfo *)cursor;
     jit->nEqualityICs = equalityICs.length();
     cursor += sizeof(ic::EqualityICInfo) * jit->nEqualityICs;
@@ -649,15 +641,6 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     }
 #endif /* JS_MONOIC */
 
-    for (size_t i = 0; i < callPatches.length(); i++) {
-        CallPatchInfo &patch = callPatches[i];
-
-        if (patch.hasFastNcode)
-            fullCode.patch(patch.fastNcodePatch, fullCode.locationOf(patch.joinPoint));
-        if (patch.hasSlowNcode)
-            stubCode.patch(patch.slowNcodePatch, fullCode.locationOf(patch.joinPoint));
-    }
-
 #ifdef JS_POLYIC
     ic::GetElementIC *jitGetElems = (ic::GetElementIC *)cursor;
     jit->nGetElems = getElemICs.length();
@@ -2362,42 +2345,6 @@ mjit::Compiler::addReturnSite(Label joinPoint, uint32 id)
     addCallSite(site);
 }
 
-void
-mjit::Compiler::emitUncachedCall(uint32 argc, bool callingNew)
-{
-    CallPatchInfo callPatch;
-
-    RegisterID r0 = Registers::ReturnReg;
-    VoidPtrStubUInt32 stub = callingNew ? stubs::UncachedNew : stubs::UncachedCall;
-
-    frame.syncAndKill(Registers(Registers::AvailRegs), Uses(argc + 2));
-    prepareStubCall(Uses(argc + 2));
-    masm.move(Imm32(argc), Registers::ArgReg1);
-    INLINE_STUBCALL(stub);
-
-    Jump notCompiled = masm.branchTestPtr(Assembler::Zero, r0, r0);
-
-    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-    callPatch.hasFastNcode = true;
-    callPatch.fastNcodePatch =
-        masm.storePtrWithPatch(ImmPtr(NULL),
-                               Address(JSFrameReg, JSStackFrame::offsetOfncode()));
-
-    masm.jump(r0);
-    callPatch.joinPoint = masm.label();
-    addReturnSite(callPatch.joinPoint, __LINE__);
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
-
-    frame.popn(argc + 2);
-    frame.takeReg(JSReturnReg_Type);
-    frame.takeReg(JSReturnReg_Data);
-    frame.pushRegs(JSReturnReg_Type, JSReturnReg_Data);
-
-    stubcc.linkExitDirect(notCompiled, stubcc.masm.label());
-    stubcc.rejoin(Changes(0));
-    callPatches.append(callPatch);
-}
-
 static bool
 IsLowerableFunCallOrApply(jsbytecode *pc)
 {
@@ -2409,90 +2356,6 @@ IsLowerableFunCallOrApply(jsbytecode *pc)
 #endif
 }
 
-void
-mjit::Compiler::checkCallApplySpeculation(uint32 callImmArgc, uint32 speculatedArgc,
-                                          FrameEntry *origCallee, FrameEntry *origThis,
-                                          MaybeRegisterID origCalleeType, RegisterID origCalleeData,
-                                          MaybeRegisterID origThisType, RegisterID origThisData,
-                                          Jump *uncachedCallSlowRejoin, CallPatchInfo *uncachedCallPatch)
-{
-    JS_ASSERT(IsLowerableFunCallOrApply(PC));
-
-    /*
-     * if (origCallee.isObject() &&
-     *     origCallee.toObject().isFunction &&
-     *     origCallee.toObject().getFunctionPrivate() == js_fun_{call,apply})
-     */
-    MaybeJump isObj;
-    if (origCalleeType.isSet())
-        isObj = masm.testObject(Assembler::NotEqual, origCalleeType.reg());
-    Jump isFun = masm.testFunction(Assembler::NotEqual, origCalleeData);
-    masm.loadObjPrivate(origCalleeData, origCalleeData);
-    Native native = *PC == JSOP_FUNCALL ? js_fun_call : js_fun_apply;
-    Jump isNative = masm.branchPtr(Assembler::NotEqual,
-                                   Address(origCalleeData, JSFunction::offsetOfNativeOrScript()),
-                                   ImmPtr(JS_FUNC_TO_DATA_PTR(void *, native)));
-
-    /*
-     * If speculation fails, we can't use the ic, since it is compiled on the
-     * assumption that speculation succeeds. Instead, just do an uncached call.
-     */
-    {
-        if (isObj.isSet())
-            stubcc.linkExitDirect(isObj.getJump(), stubcc.masm.label());
-        stubcc.linkExitDirect(isFun, stubcc.masm.label());
-        stubcc.linkExitDirect(isNative, stubcc.masm.label());
-
-        int32 frameDepthAdjust;
-        if (applyTricks == LazyArgsObj) {
-            OOL_STUBCALL(stubs::Arguments);
-            frameDepthAdjust = +1;
-        } else {
-            frameDepthAdjust = 0;
-        }
-
-        stubcc.masm.move(Imm32(callImmArgc), Registers::ArgReg1);
-        JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW CALL CODE ---- \n");
-        OOL_STUBCALL_LOCAL_SLOTS(JS_FUNC_TO_DATA_PTR(void *, stubs::UncachedCall),
-                           frame.localSlots() + frameDepthAdjust);
-        JaegerSpew(JSpew_Insns, " ---- END SLOW CALL CODE ---- \n");
-
-        RegisterID r0 = Registers::ReturnReg;
-        Jump notCompiled = stubcc.masm.branchTestPtr(Assembler::Zero, r0, r0);
-
-        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-        Address ncodeAddr(JSFrameReg, JSStackFrame::offsetOfncode());
-        uncachedCallPatch->hasSlowNcode = true;
-        uncachedCallPatch->slowNcodePatch = stubcc.masm.storePtrWithPatch(ImmPtr(NULL), ncodeAddr);
-
-        stubcc.masm.jump(r0);
-        addReturnSite(masm.label(), __LINE__);
-
-        notCompiled.linkTo(stubcc.masm.label(), &stubcc.masm);
-
-        /*
-         * inlineCallHelper will link uncachedCallSlowRejoin to the join point
-         * at the end of the ic. At that join point, the return value of the
-         * call is assumed to be in registers, so load them before jumping.
-         */
-        JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW RESTORE CODE ---- \n");
-        Address rval = frame.addressOf(origCallee);  /* vp[0] == rval */
-        stubcc.masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
-        *uncachedCallSlowRejoin = stubcc.masm.jump();
-        JaegerSpew(JSpew_Insns, " ---- END SLOW RESTORE CODE ---- \n");
-    }
-
-    /*
-     * For simplicity, we don't statically specialize calls to
-     * ic::SplatApplyArgs based on applyTricks. Rather, this state is
-     * communicated dynamically through the VMFrame.
-     */
-    if (*PC == JSOP_FUNAPPLY) {
-        masm.store32(Imm32(applyTricks == LazyArgsObj),
-                     FrameAddress(offsetof(VMFrame, u.call.lazyArgsObj)));
-    }
-}
-
 /* This predicate must be called before the current op mutates the FrameState. */
 bool
 mjit::Compiler::canUseApplyTricks()
@@ -2505,315 +2368,218 @@ mjit::Compiler::canUseApplyTricks()
            !debugMode();
 }
 
-/* See MonoIC.cpp, CallCompiler for more information on call ICs. */
 void
 mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
 {
-    /* Check for interrupts on function call */
     interruptCheckHelper();
 
-    int32 speculatedArgc;
+    int32 numArgsPushedBeforeCall;
     if (applyTricks == LazyArgsObj) {
         frame.pop();
-        speculatedArgc = 1;
+        numArgsPushedBeforeCall = 1;
     } else {
-        speculatedArgc = callImmArgc;
+        numArgsPushedBeforeCall = callImmArgc;
     }
 
-    FrameEntry *origCallee = frame.peek(-(speculatedArgc + 2));
-    FrameEntry *origThis = frame.peek(-(speculatedArgc + 1));
+    FrameEntry *origCallee = frame.peek(-(numArgsPushedBeforeCall + 2));
+    FrameEntry *origThis = frame.peek(-(numArgsPushedBeforeCall + 1));
 
-    /* 'this' does not need to be synced for constructing. */
+    // If constructing, |this| can be bogus.
     if (callingNew)
         frame.discardFe(origThis);
 
-    /*
-     * From the presence of JSOP_FUN{CALL,APPLY}, we speculate that we are
-     * going to call js_fun_{call,apply}. Normally, this call would go through
-     * js::Invoke to ultimately call 'this'. We can do much better by having
-     * the callIC cache and call 'this' directly. However, if it turns out that
-     * we are not actually calling js_fun_call, the callIC must act as normal.
-     */
-    bool lowerFunCallOrApply = IsLowerableFunCallOrApply(PC);
+    CallICInfo ic((JSOp)*PC);
+    ic.pc = PC;
 
-    /*
-     * Currently, constant values are not functions, so don't even try to
-     * optimize. This lets us assume that callee/this have regs below.
-     */
-#ifdef JS_MONOIC
-    if (debugMode() ||
-        origCallee->isConstant() || origCallee->isNotType(JSVAL_TYPE_OBJECT) ||
-        (lowerFunCallOrApply &&
-         (origThis->isConstant() || origThis->isNotType(JSVAL_TYPE_OBJECT)))) {
-#endif
-        if (applyTricks == LazyArgsObj) {
-            /* frame.pop() above reset us to pre-JSOP_ARGUMENTS state */
-            jsop_arguments();
-            frame.pushSynced();
-        }
-        emitUncachedCall(callImmArgc, callingNew);
-        return;
-#ifdef JS_MONOIC
-    }
+    MaybeRegisterID origCalleeType, origCalleeData;
 
-    /* Initialized by both branches below. */
-    CallGenInfo     callIC(PC);
-    CallPatchInfo   callPatch;
-    MaybeRegisterID icCalleeType; /* type to test for function-ness */
-    RegisterID      icCalleeData; /* data to call */
-    Address         icRvalAddr;   /* return slot on slow-path rejoin */
+    // Get the callee in registers.
+    if (origCallee->isConstant())
+        frame.forgetConstant(origCallee);
+    frame.ensureFullRegs(origCallee, &origCalleeType, &origCalleeData);
 
-    /*
-     * IC space must be reserved (using RESERVE_IC_SPACE or RESERVE_OOL_SPACE) between the
-     * following labels (as used in finishThisUp):
-     *  - funGuard -> hotJump
-     *  - funGuard -> joinPoint
-     *  - funGuard -> hotPathLabel
-     *  - slowPathStart -> oolCall
-     *  - slowPathStart -> oolJump
-     *  - slowPathStart -> icCall
-     *  - slowPathStart -> slowJoinPoint
-     * Because the call ICs are fairly long (compared to PICs), we don't reserve the space in each
-     * path until the first usage of funGuard (for the in-line path) or slowPathStart (for the
-     * out-of-line path).
-     */
+    MaybeJump failedSpeculationSlowRejoin;
+    ic.speculatedFunCallOrApply = IsLowerableFunCallOrApply(PC);
 
-    /* Initialized only on lowerFunCallOrApply branch. */
-    Jump            uncachedCallSlowRejoin;
-    CallPatchInfo   uncachedCallPatch;
+#define FTC(b, x) FunctionTemplateConditional((b), x<true>, x<false>)
+#define FTDP(x) JS_FUNC_TO_DATA_PTR(void *, (x))
 
+    // Sync the frame on the inline path, keeping the callee in registers.
+    MaybeRegisterID calleeType;
     {
-        MaybeRegisterID origCalleeType, maybeOrigCalleeData;
-        RegisterID origCalleeData;
-
-        /* Get the callee in registers. */
-        frame.ensureFullRegs(origCallee, &origCalleeType, &maybeOrigCalleeData);
-        origCalleeData = maybeOrigCalleeData.reg();
         PinRegAcrossSyncAndKill p1(frame, origCalleeData), p2(frame, origCalleeType);
 
-        if (lowerFunCallOrApply) {
-            MaybeRegisterID origThisType, maybeOrigThisData;
-            RegisterID origThisData;
+        // From the presence of JSOP_FUN{CALL,APPLY}, we speculate that we are
+        // going to call js_fun_{call,apply}. Normally, this call would go
+        // through js::Invoke to ultimately call 'this'. We can do much better
+        // by having the callIC cache and call 'this' directly. However, if it
+        // turns out that we are not actually calling js_fun_call, we default
+        // to a slower path that can stay in JIT code but goes through a stub
+        // call to create frames.
+        if (ic.speculatedFunCallOrApply) {
+            MaybeRegisterID origThisType, origThisData;
             {
-                /* Get thisv in registers. */
-                frame.ensureFullRegs(origThis, &origThisType, &maybeOrigThisData);
-                origThisData = maybeOrigThisData.reg();
+                // Get thisv in registers. The payload will always have a register
+                // if using FUNCALL, or FUNAPPLY with lazy args.
+                if (origThis->isConstant())
+                    frame.forgetConstant(origThis);
+                frame.ensureFullRegs(origThis, &origThisType, &origThisData);
                 PinRegAcrossSyncAndKill p3(frame, origThisData), p4(frame, origThisType);
 
-                /* Leaves pinned regs untouched. */
-                frame.syncAndKill(Registers(Registers::AvailRegs), Uses(speculatedArgc + 2));
+                // This will leave pinned regs untouched.
+                frame.syncAndKill(Registers(Registers::AvailRegs), Uses(numArgsPushedBeforeCall + 2));
             }
 
-            checkCallApplySpeculation(callImmArgc, speculatedArgc,
-                                      origCallee, origThis,
-                                      origCalleeType, origCalleeData,
-                                      origThisType, origThisData,
-                                      &uncachedCallSlowRejoin, &uncachedCallPatch);
+            // Guard that the speculation of (callee=fun_call/fun_apply) is accurate.
+            MaybeJump typeGuard;
+            if (origCalleeType.isSet())
+                typeGuard = masm.testObject(Assembler::NotEqual, origCalleeType.reg());
+            Jump claspGuard = masm.testFunction(Assembler::NotEqual, origCalleeData.reg());
 
-            icCalleeType = origThisType;
-            icCalleeData = origThisData;
-            icRvalAddr = frame.addressOf(origThis);
+            Native native = (ic.op == JSOP_FUNCALL) ? js_fun_call : js_fun_apply;
+            Address nativeAddr(origCalleeData.reg(), JSFunction::offsetOfNativeOrScript());
+            masm.loadObjPrivate(origCalleeData.reg(), origCalleeData.reg());
+            Jump funGuard = masm.branchPtr(Assembler::NotEqual, nativeAddr,
+                                           ImmPtr(JS_FUNC_TO_DATA_PTR(void *, native)));
 
-            /*
-             * For f.call(), since we compile the ic under the (checked)
-             * assumption that call == js_fun_call, we still have a static
-             * frame size. For f.apply(), the frame size depends on the dynamic
-             * length of the array passed to apply.
-             */
-            if (*PC == JSOP_FUNCALL)
-                callIC.frameSize.initStatic(frame.localSlots(), speculatedArgc - 1);
-            else
-                callIC.frameSize.initDynamic();
+            // If speculation fails, act as though we never speculated. Call
+            // special functions which will adjust the stack and try to at
+            // least stay within this VMFrame, if the actual callee can be
+            // JIT'd. Note there is no IC path here.
+            {
+                if (typeGuard.isSet())
+                    stubcc.linkExitDirect(typeGuard.get(), stubcc.masm.label());
+                stubcc.linkExitDirect(claspGuard, stubcc.masm.label());
+                stubcc.linkExitDirect(funGuard, stubcc.masm.label());
+
+                ic.failedSpeculationParam =
+                    stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
+                void *ptr = (ic.op == JSOP_FUNCALL)
+                            ? JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunCall)
+                            : (applyTricks == LazyArgsObj)
+                              ? JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunApplyLazyArgs)
+                              : JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunApply);
+                OOL_STUBCALL(ptr);
+
+                FrameSize frameSize;
+                frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall);
+                failedSpeculationSlowRejoin =
+                    stubcc.emitCallTail(frameSize, frame.addressOf(origCallee));
+            }
+
+            ic.calleeData = origThisData.reg();
+            calleeType = origThisType;
+
+            if (ic.op == JSOP_FUNCALL) {
+                ic.frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall - 1);
+            } else {
+                ic.frameSize.initDynamic();
+
+                // Make sure the speculated callee's registers can't be
+                // clobbered by the ensuing stub call. First, reserve both
+                // registers so allocating one does not clobber the other,
+                // then give new registers as needed.
+                Registers regs;
+                regs.takeReg(ic.calleeData);
+                if (calleeType.isSet())
+                    regs.takeReg(calleeType.reg());
+                if (!Registers::isSaved(ic.calleeData)) {
+                    RegisterID r = regs.takeRegInMask(Registers::SavedRegs);
+                    masm.move(ic.calleeData, r);
+                    ic.calleeData = r;
+                }
+                if (calleeType.isSet() && !Registers::isSaved(calleeType.reg())) {
+                    RegisterID r = regs.takeRegInMask(Registers::SavedRegs);
+                    masm.move(calleeType.reg(), r);
+                    calleeType = r;
+                }
+
+                // Splat the apply args on the inline path, so it's always taken
+                // before the actual call IC.
+                void *funptr = FTDP(FTC((applyTricks == LazyArgsObj), ic::SplatApplyArgs));
+                INLINE_STUBCALL(funptr);
+            }
+
+            ic.rval = frame.addressOf(origThis);
         } else {
-            /* Leaves pinned regs untouched. */
-            frame.syncAndKill(Registers(Registers::AvailRegs), Uses(speculatedArgc + 2));
-
-            icCalleeType = origCalleeType;
-            icCalleeData = origCalleeData;
-            icRvalAddr = frame.addressOf(origCallee);
-            callIC.frameSize.initStatic(frame.localSlots(), speculatedArgc);
+            frame.syncAndKill(Registers(Registers::AvailRegs), Uses(numArgsPushedBeforeCall + 2));
+            ic.frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall);
+            ic.rval = frame.addressOf(origCallee);
+            ic.calleeData = origCalleeData.reg();
+            calleeType = origCalleeType;
         }
     }
 
-    /* Test the type if necessary. Failing this always takes a really slow path. */
-    MaybeJump notObjectJump;
-    if (icCalleeType.isSet())
-        notObjectJump = masm.testObject(Assembler::NotEqual, icCalleeType.reg());
-
-    /*
-     * For an optimized apply, keep icCalleeData and funPtrReg in a
-     * callee-saved registers for the subsequent ic::SplatApplyArgs call.
-     */
-    Registers tempRegs;
-    if (callIC.frameSize.isDynamic() && !Registers::isSaved(icCalleeData)) {
-        RegisterID x = tempRegs.takeRegInMask(Registers::SavedRegs);
-        masm.move(icCalleeData, x);
-        icCalleeData = x;
-    } else {
-        tempRegs.takeReg(icCalleeData);
-    }
-    RegisterID funPtrReg = tempRegs.takeRegInMask(Registers::SavedRegs);
-
-    /* Reserve space just before initialization of funGuard. */
     RESERVE_IC_SPACE(masm);
-
-    /*
-     * Guard on the callee identity. This misses on the first run. If the
-     * callee is scripted, compiled/compilable, and argc == nargs, then this
-     * guard is patched, and the compiled code address is baked in.
-     */
-    Jump j = masm.branchPtrWithPatch(Assembler::NotEqual, icCalleeData, callIC.funGuard);
-    callIC.funJump = j;
-
-    /* Reserve space just before initialization of slowPathStart. */
     RESERVE_OOL_SPACE(stubcc.masm);
 
-    Jump rejoin1, rejoin2;
-    {
-        RESERVE_OOL_SPACE(stubcc.masm);
-        stubcc.linkExitDirect(j, stubcc.masm.label());
-        callIC.slowPathStart = stubcc.masm.label();
+    MaybeJump typeGuard;
+    if (calleeType.isSet())
+        typeGuard = masm.testObject(Assembler::NotEqual, calleeType.reg());
 
-        /*
-         * Test if the callee is even a function. If this doesn't match, we
-         * take a _really_ slow path later.
-         */
-        Jump notFunction = stubcc.masm.testFunction(Assembler::NotEqual, icCalleeData);
+    ic.fastPathStart = masm.label();
 
-        /* Test if the function is scripted. */
-        RegisterID tmp = tempRegs.takeAnyReg();
-        stubcc.masm.loadObjPrivate(icCalleeData, funPtrReg);
-        stubcc.masm.load16(Address(funPtrReg, offsetof(JSFunction, flags)), tmp);
-        stubcc.masm.and32(Imm32(JSFUN_KINDMASK), tmp);
-        Jump isNative = stubcc.masm.branch32(Assembler::Below, tmp, Imm32(JSFUN_INTERPRETED));
-        tempRegs.putReg(tmp);
-
-        /*
-         * N.B. After this call, the frame will have a dynamic frame size.
-         * Check after the function is known not to be a native so that the
-         * catch-all/native path has a static depth.
-         */
-        if (callIC.frameSize.isDynamic())
-            OOL_STUBCALL(ic::SplatApplyArgs);
-
-        /*
-         * No-op jump that gets patched by ic::New/Call to the stub generated
-         * by generateFullCallStub.
-         */
-        Jump toPatch = stubcc.masm.jump();
-        toPatch.linkTo(stubcc.masm.label(), &stubcc.masm);
-        callIC.oolJump = toPatch;
-        callIC.icCall = stubcc.masm.label();
-
-        /*
-         * At this point the function is definitely scripted, so we try to
-         * compile it and patch either funGuard/funJump or oolJump. This code
-         * is only executed once.
-         */
-        callIC.addrLabel1 = stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
-        void *icFunPtr = JS_FUNC_TO_DATA_PTR(void *, callingNew ? ic::New : ic::Call);
-        if (callIC.frameSize.isStatic())
-            callIC.oolCall = OOL_STUBCALL_LOCAL_SLOTS(icFunPtr, frame.localSlots());
-        else
-            callIC.oolCall = OOL_STUBCALL_LOCAL_SLOTS(icFunPtr, -1);
-
-        callIC.funObjReg = icCalleeData;
-        callIC.funPtrReg = funPtrReg;
-
-        /*
-         * The IC call either returns NULL, meaning call completed, or a
-         * function pointer to jump to. Caveat: Must restore JSFrameReg
-         * because a new frame has been pushed.
-         */
-        rejoin1 = stubcc.masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
-                                            Registers::ReturnReg);
-        if (callIC.frameSize.isStatic())
-            stubcc.masm.move(Imm32(callIC.frameSize.staticArgc()), JSParamReg_Argc);
-        else
-            stubcc.masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
-        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-        callPatch.hasSlowNcode = true;
-        callPatch.slowNcodePatch =
-            stubcc.masm.storePtrWithPatch(ImmPtr(NULL),
-                                          Address(JSFrameReg, JSStackFrame::offsetOfncode()));
-        stubcc.masm.jump(Registers::ReturnReg);
-
-        /*
-         * This ool path is the catch-all for everything but scripted function
-         * callees. For native functions, ic::NativeNew/NativeCall will repatch
-         * funGaurd/funJump with a fast call stub. All other cases
-         * (non-function callable objects and invalid callees) take the slow
-         * path through js::Invoke.
-         */
-        if (notObjectJump.isSet())
-            stubcc.linkExitDirect(notObjectJump.get(), stubcc.masm.label());
-        notFunction.linkTo(stubcc.masm.label(), &stubcc.masm);
-        isNative.linkTo(stubcc.masm.label(), &stubcc.masm);
-
-        callIC.addrLabel2 = stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
-        OOL_STUBCALL(callingNew ? ic::NativeNew : ic::NativeCall);
-
-        rejoin2 = stubcc.masm.jump();
+    // If speculating funApply, splat the apply args in the OOL path, to
+    // simplify the OOL and generated paths.
+    if (ic.frameSize.isDynamic()) {
+        // No inline path for speculation.
+        ic.inlineJump = masm.jump();
+        ic.hasExtendedInlinePath = false;
+    } else {
+        // For static argc, we attempt to inline the best-case call sequence.
+        ic.inlineJump = masm.branchPtrWithPatch(Assembler::NotEqual, ic.calleeData, ic.calleePtr);
+        ic.ncodePatch = masm.emitStaticFrame(callingNew, frame.localSlots(), NULL);
+        ic.hasExtendedInlinePath = true;
+        ic.inlineCall = masm.jump();
     }
 
-    /*
-     * If the call site goes to a closure over the same function, it will
-     * generate an out-of-line stub that joins back here.
-     */
-    callIC.hotPathLabel = masm.label();
+#define FTC_IC(b, x, ic) FunctionTemplateConditional((b), x<true, ic>, x<false, ic>)
 
-    uint32 flags = 0;
-    if (callingNew)
-        flags |= JSFRAME_CONSTRUCTING;
+    ic.slowPathStart = stubcc.masm.label();
+    stubcc.linkExitDirect(ic.inlineJump, ic.slowPathStart);
+    if (typeGuard.isSet())
+        stubcc.linkExitDirect(typeGuard.get(), ic.slowPathStart);
 
-    InlineFrameAssembler inlFrame(masm, callIC, flags);
-    callPatch.hasFastNcode = true;
-    callPatch.fastNcodePatch = inlFrame.assemble(NULL);
+    void *funptr = (callingNew)
+                   ? FTDP(FTC(!debugMode(), ic::New))
+                   : debugMode()
+                     ? FTDP(FTC_IC((ic.frameSize.isDynamic()), ic::Call, false))
+                     : FTDP(FTC_IC((ic.frameSize.isDynamic()), ic::Call, true));
+    passICAddress(&ic);
+    if (ic.frameSize.isStatic())
+        ic.slowPathCall = OOL_STUBCALL(funptr);
+    else
+        ic.slowPathCall = OOL_STUBCALL_LOCAL_SLOTS(funptr, -1);
+    Jump slowRejoin = stubcc.emitCallTail(ic.frameSize, ic.rval);
 
-    callIC.hotJump = masm.jump();
-    callIC.joinPoint = callPatch.joinPoint = masm.label();
-    addReturnSite(callPatch.joinPoint, __LINE__);
-    if (lowerFunCallOrApply)
-        uncachedCallPatch.joinPoint = callIC.joinPoint;
+#undef FTC_NOIC
+#undef FTC_IC
+#undef FTDP
+#undef FTC
+
+    // Inline calls return here, and must restore the frame pointer.
+    ic.fastPathRejoin = masm.label();
+    addReturnSite(ic.fastPathRejoin, __LINE__);
     masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
 
-    /*
-     * We've placed hotJump, joinPoint and hotPathLabel, and no other labels are located by offset
-     * in the in-line path so we can check the IC space now.
-     */
-    CHECK_IC_SPACE();
+    // Completed calls are not inline and therefore don't restore JSFrameReg.
+    ic.completedRejoinOffset = masm.label();
 
-    frame.popn(speculatedArgc + 2);
+    // Slow paths (non-JIT) can safely rejoin here; |fp| has not changed.
+    if (failedSpeculationSlowRejoin.isSet())
+        stubcc.crossJump(failedSpeculationSlowRejoin.get(), masm.label());
+    stubcc.crossJump(slowRejoin, masm.label());
+
+    frame.popn(numArgsPushedBeforeCall + 2);
     frame.takeReg(JSReturnReg_Type);
     frame.takeReg(JSReturnReg_Data);
     frame.pushRegs(JSReturnReg_Type, JSReturnReg_Data);
 
-    /*
-     * Now that the frame state is set, generate the rejoin path. Note that, if
-     * lowerFunCallOrApply, we cannot just call 'stubcc.rejoin' since the return
-     * value has been placed at vp[1] which is not the stack address associated
-     * with frame.peek(-1).
-     */
-    callIC.slowJoinPoint = stubcc.masm.label();
-    rejoin1.linkTo(callIC.slowJoinPoint, &stubcc.masm);
-    rejoin2.linkTo(callIC.slowJoinPoint, &stubcc.masm);
-    JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW RESTORE CODE ---- \n");
-    stubcc.masm.loadValueAsComponents(icRvalAddr, JSReturnReg_Type, JSReturnReg_Data);
-    stubcc.crossJump(stubcc.masm.jump(), masm.label());
-    JaegerSpew(JSpew_Insns, " ---- END SLOW RESTORE CODE ---- \n");
-
+    CHECK_IC_SPACE();
     CHECK_OOL_SPACE();
-
-    if (lowerFunCallOrApply)
-        stubcc.crossJump(uncachedCallSlowRejoin, masm.label());
-
-    callICs.append(callIC);
-    callPatches.append(callPatch);
-    if (lowerFunCallOrApply)
-        callPatches.append(uncachedCallPatch);
+    callICs.append(ic);
 
     applyTricks = NoApplyTricks;
-#endif
 }
 
 /*
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 95d807497f5b..470c5226ae02 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -126,48 +126,9 @@ class Compiler : public BaseCompiler
     };
 
     /* InlineFrameAssembler wants to see this. */
-  public:
-    struct CallGenInfo {
-        CallGenInfo(jsbytecode *pc) : pc(pc) {}
-
-        /*
-         * These members map to members in CallICInfo. See that structure for
-         * more comments.
-         */
-        jsbytecode   *pc;
-        DataLabelPtr funGuard;
-        Jump         funJump;
-        Jump         hotJump;
-        Call         oolCall;
-        Label        joinPoint;
-        Label        slowJoinPoint;
-        Label        slowPathStart;
-        Label        hotPathLabel;
-        DataLabelPtr addrLabel1;
-        DataLabelPtr addrLabel2;
-        Jump         oolJump;
-        Label        icCall;
-        RegisterID   funObjReg;
-        RegisterID   funPtrReg;
-        FrameSize    frameSize;
-    };
-
   private:
 #endif
 
-    /*
-     * Writes of call return addresses which needs to be delayed until the final
-     * absolute address of the join point is known.
-     */
-    struct CallPatchInfo {
-        CallPatchInfo() : hasFastNcode(false), hasSlowNcode(false) {}
-        Label joinPoint;
-        DataLabelPtr fastNcodePatch;
-        DataLabelPtr slowNcodePatch;
-        bool hasFastNcode;
-        bool hasSlowNcode;
-    };
-
     struct BaseICInfo {
         BaseICInfo(JSOp op) : op(op)
         { }
@@ -188,6 +149,23 @@ class Compiler : public BaseCompiler
         }
     };
 
+    struct CallICInfo : public BaseICInfo {
+        CallICInfo(JSOp op) : BaseICInfo(op)
+        { }
+        jsbytecode *pc;
+        RegisterID calleeData;
+        FrameSize frameSize;
+        Jump inlineJump;
+        bool speculatedFunCallOrApply;
+        DataLabelPtr failedSpeculationParam;
+        DataLabelPtr ncodePatch;
+        DataLabelPtr calleePtr;
+        Address rval;
+        Label completedRejoinOffset;
+        bool hasExtendedInlinePath;
+        Jump inlineCall;
+    };
+
     struct GetElementICInfo : public BaseICInfo {
         GetElementICInfo(JSOp op) : BaseICInfo(op)
         { }
@@ -342,7 +320,6 @@ class Compiler : public BaseCompiler
 #if defined JS_MONOIC
     js::Vector<GetGlobalNameICInfo, 16, CompilerAllocPolicy> getGlobalNames;
     js::Vector<SetGlobalNameICInfo, 16, CompilerAllocPolicy> setGlobalNames;
-    js::Vector<CallGenInfo, 64, CompilerAllocPolicy> callICs;
     js::Vector<EqualityGenInfo, 64, CompilerAllocPolicy> equalityICs;
     js::Vector<TraceGenInfo, 64, CompilerAllocPolicy> traceICs;
 #endif
@@ -351,7 +328,7 @@ class Compiler : public BaseCompiler
     js::Vector<GetElementICInfo, 16, CompilerAllocPolicy> getElemICs;
     js::Vector<SetElementICInfo, 16, CompilerAllocPolicy> setElemICs;
 #endif
-    js::Vector<CallPatchInfo, 64, CompilerAllocPolicy> callPatches;
+    js::Vector<CallICInfo, 16, CompilerAllocPolicy> callICs;
     js::Vector<InternalCallSite, 64, CompilerAllocPolicy> callSites;
     js::Vector<DoublePatch, 16, CompilerAllocPolicy> doubleList;
     js::Vector<JumpTable, 16> jumpTables;
@@ -432,12 +409,6 @@ class Compiler : public BaseCompiler
     void emitReturnValue(Assembler *masm, FrameEntry *fe);
     void dispatchCall(VoidPtrStubUInt32 stub, uint32 argc);
     void interruptCheckHelper();
-    void emitUncachedCall(uint32 argc, bool callingNew);
-    void checkCallApplySpeculation(uint32 callImmArgc, uint32 speculatedArgc,
-                                   FrameEntry *origCallee, FrameEntry *origThis,
-                                   MaybeRegisterID origCalleeType, RegisterID origCalleeData,
-                                   MaybeRegisterID origThisType, RegisterID origThisData,
-                                   Jump *uncachedCallSlowRejoin, CallPatchInfo *uncachedCallPatch);
     void inlineCallHelper(uint32 argc, bool callingNew);
     void fixPrimitiveReturn(Assembler *masm, FrameEntry *fe);
     void jsop_gnameinc(JSOp op, VoidStubAtom stub, uint32 index);
diff --git a/js/src/methodjit/FrameState.cpp b/js/src/methodjit/FrameState.cpp
index 5dbc015902a7..0061e1f9b38d 100644
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -1693,3 +1693,16 @@ FrameState::maybeUnpinReg(MaybeRegisterID reg)
         unpinReg(reg.reg());
 }
 
+void
+FrameState::forgetConstant(FrameEntry *fe)
+{
+    JS_ASSERT(fe->isConstant());
+    RegisterID typeReg = allocReg();
+    RegisterID dataReg = allocReg();
+    masm.loadValueAsComponents(fe->getValue(), typeReg, dataReg);
+    regstate[typeReg].associate(fe, RematInfo::TYPE);
+    regstate[dataReg].associate(fe, RematInfo::DATA);
+    fe->type.setRegister(typeReg);
+    fe->data.setRegister(dataReg);
+}
+
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index c7f214bf780a..8c840ca3e306 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -704,6 +704,11 @@ class FrameState
     MaybeRegisterID maybePinType(FrameEntry *fe);
     void maybeUnpinReg(MaybeRegisterID reg);
 
+    /*
+     * Given a constant FrameEntry, assigns its contents to registers.
+     */
+    void forgetConstant(FrameEntry *fe);
+
     /*
      * Dups the top item on the stack.
      */
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
deleted file mode 100644
index 0e60478a7ac9..000000000000
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=99:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
- * May 28, 2008.
- *
- * The Initial Developer of the Original Code is
- *   Brendan Eich <brendan@mozilla.org>
- *
- * Contributor(s):
- *   David Anderson <danderson@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if !defined jsjaeger_inl_frame_asm_h__ && defined JS_METHODJIT && defined JS_MONOIC
-#define jsjaeger_inl_frame_asm_h__
-
-#include "assembler/assembler/MacroAssembler.h"
-#include "assembler/assembler/CodeLocation.h"
-#include "methodjit/MethodJIT.h"
-#include "CodeGenIncludes.h"
-
-namespace js {
-namespace mjit {
-
-struct AdjustedFrame {
-    AdjustedFrame(uint32 baseOffset)
-     : baseOffset(baseOffset)
-    { }
-
-    uint32 baseOffset;
-
-    JSC::MacroAssembler::Address addrOf(uint32 offset) {
-        return JSC::MacroAssembler::Address(JSFrameReg, baseOffset + offset);
-    }
-};
-
-/*
- * This is used for emitting code to inline callee-side frame creation and
- * should jit code equivalent to JSStackFrame::initCallFrameCallerHalf.
- *
- * Once finished, JSFrameReg is advanced to be the new fp.
- */
-class InlineFrameAssembler {
-    typedef JSC::MacroAssembler::RegisterID RegisterID;
-    typedef JSC::MacroAssembler::Address Address;
-    typedef JSC::MacroAssembler::Imm32 Imm32;
-    typedef JSC::MacroAssembler::ImmPtr ImmPtr;
-    typedef JSC::MacroAssembler::DataLabelPtr DataLabelPtr;
-
-    Assembler &masm;
-    FrameSize  frameSize;       // size of the caller's frame
-    RegisterID funObjReg;       // register containing the function object (callee)
-    jsbytecode *pc;             // bytecode location at the caller call site
-    uint32     flags;           // frame flags
-
-  public:
-    /*
-     * Register state, so consumers of this class can restrict which registers
-     * can and can't be clobbered.
-     */
-    Registers  tempRegs;
-
-    InlineFrameAssembler(Assembler &masm, ic::CallICInfo &ic, uint32 flags)
-      : masm(masm), pc(ic.pc), flags(flags)
-    {
-        frameSize = ic.frameSize;
-        funObjReg = ic.funObjReg;
-        tempRegs.takeReg(ic.funPtrReg);
-        tempRegs.takeReg(funObjReg);
-    }
-
-    InlineFrameAssembler(Assembler &masm, Compiler::CallGenInfo &gen, uint32 flags)
-      : masm(masm), pc(gen.pc), flags(flags)
-    {
-        frameSize = gen.frameSize;
-        funObjReg = gen.funObjReg;
-        tempRegs.takeReg(funObjReg);
-    }
-
-    DataLabelPtr assemble(void *ncode)
-    {
-        JS_ASSERT((flags & ~JSFRAME_CONSTRUCTING) == 0);
-
-        /* Generate JSStackFrame::initCallFrameCallerHalf. */
-
-        DataLabelPtr ncodePatch;
-        if (frameSize.isStatic()) {
-            uint32 frameDepth = frameSize.staticLocalSlots();
-            AdjustedFrame newfp(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
-
-            Address flagsAddr = newfp.addrOf(JSStackFrame::offsetOfFlags());
-            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
-            Address prevAddr = newfp.addrOf(JSStackFrame::offsetOfPrev());
-            masm.storePtr(JSFrameReg, prevAddr);
-            Address ncodeAddr = newfp.addrOf(JSStackFrame::offsetOfncode());
-            ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
-
-            masm.addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
-        } else {
-            /*
-             * If the frame size is dynamic, then the fast path generated by
-             * generateFullCallStub must be used. Thus, this code is executed
-             * after stubs::SplatApplyArgs has been called. SplatApplyArgs
-             * stores the dynamic stack pointer (i.e., regs.sp after pushing a
-             * dynamic number of arguments) to VMFrame.regs, so we just load it
-             * here to get the new frame pointer.
-             */
-            RegisterID newfp = tempRegs.takeAnyReg();
-            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), newfp);
-
-            Address flagsAddr(newfp, JSStackFrame::offsetOfFlags());
-            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
-            Address prevAddr(newfp, JSStackFrame::offsetOfPrev());
-            masm.storePtr(JSFrameReg, prevAddr);
-            Address ncodeAddr(newfp, JSStackFrame::offsetOfncode());
-            ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
-
-            masm.move(newfp, JSFrameReg);
-            tempRegs.putReg(newfp);
-        }
-
-        return ncodePatch;
-    }
-};
-
-
-} /* namespace mjit */
-} /* namespace js */
-
-#endif /* jsjaeger_inl_frame_asm_h__ */
-
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 1fba629ac481..83784bdabc29 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -170,43 +170,6 @@ top:
     return NULL;
 }
 
-/*
- * Clean up a frame and return.
- */
-static void
-InlineReturn(VMFrame &f)
-{
-    JSContext *cx = f.cx;
-    JSStackFrame *fp = f.regs.fp;
-
-    JS_ASSERT(f.fp() != f.entryfp);
-
-    JS_ASSERT(!js_IsActiveWithOrBlock(cx, &fp->scopeChain(), 0));
-
-    Value *newsp = fp->actualArgs() - 1;
-    newsp[-1] = fp->returnValue();
-    cx->stack().popInlineFrame(cx, fp->prev(), newsp);
-}
-
-void JS_FASTCALL
-stubs::SlowCall(VMFrame &f, uint32 argc)
-{
-    Value *vp = f.regs.sp - (argc + 2);
-
-    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
-        THROW();
-}
-
-void JS_FASTCALL
-stubs::SlowNew(VMFrame &f, uint32 argc)
-{
-    JSContext *cx = f.cx;
-    Value *vp = f.regs.sp - (argc + 2);
-
-    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
-        THROW();
-}
-
 /*
  * This function must only be called after the early prologue, since it depends
  * on fp->exec.fun.
@@ -305,6 +268,9 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     JSFunction *fun = callee.getFunctionPrivate();
     JSScript *script = fun->script();
 
+    /* Update regs.pc since we didn't bother to do that in generated code. */
+    f.regs.pc = script->code;
+
     /*
      * FixupArity/RemovePartialFrame expect to be called after the early
      * prologue.
@@ -323,7 +289,7 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     /* These would have been initialized by the prologue. */
     f.regs.fp = fp;
     f.regs.sp = fp->base();
-    f.regs.pc = script->code;
+    JS_ASSERT(f.regs.pc == script->code);
 
     if (fun->isHeavyweight() && !js::CreateFunCallObject(cx, fp))
         THROWV(NULL);
@@ -342,96 +308,6 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     return NULL;
 }
 
-static inline bool
-UncachedInlineCall(VMFrame &f, uint32 flags, void **pret, bool *unjittable, uint32 argc)
-{
-    JSContext *cx = f.cx;
-    Value *vp = f.regs.sp - (argc + 2);
-    JSObject &callee = vp->toObject();
-    JSFunction *newfun = callee.getFunctionPrivate();
-    JSScript *newscript = newfun->script();
-
-    /* Get pointer to new frame/slots, prepare arguments. */
-    StackSpace &stack = cx->stack();
-    JSStackFrame *newfp = stack.getInlineFrameWithinLimit(cx, f.regs.sp, argc,
-                                                          newfun, newscript, &flags,
-                                                          f.entryfp, &f.stackLimit);
-    if (JS_UNLIKELY(!newfp))
-        return false;
-
-    /* Initialize frame, locals. */
-    newfp->initCallFrame(cx, callee, newfun, argc, flags);
-    SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
-
-    /* Officially push the frame. */
-    stack.pushInlineFrame(cx, newscript, newfp, &f.regs);
-    JS_ASSERT(newfp == f.regs.fp);
-
-    /* Scope with a call object parented by callee's parent. */
-    if (newfun->isHeavyweight() && !js::CreateFunCallObject(cx, newfp))
-        return false;
-
-    /* Try to compile if not already compiled. */
-    if (newscript->getJITStatus(newfp->isConstructing()) == JITScript_None) {
-        CompileStatus status = CanMethodJIT(cx, newscript, newfp, CompileRequest_Interpreter);
-        if (status == Compile_Error) {
-            /* A runtime exception was thrown, get out. */
-            InlineReturn(f);
-            return false;
-        }
-        if (status == Compile_Abort)
-            *unjittable = true;
-    }
-
-    /* If newscript was successfully compiled, run it. */
-    if (JITScript *jit = newscript->getJIT(newfp->isConstructing())) {
-        *pret = jit->invokeEntry;
-        return true;
-    }
-
-    /* Otherwise, run newscript in the interpreter. */
-    bool ok = !!Interpret(cx, cx->fp());
-    InlineReturn(f);
-
-    *pret = NULL;
-    return ok;
-}
-
-void * JS_FASTCALL
-stubs::UncachedNew(VMFrame &f, uint32 argc)
-{
-    UncachedCallResult ucr;
-    UncachedNewHelper(f, argc, &ucr);
-    return ucr.codeAddr;
-}
-
-void
-stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
-{
-    ucr->init();
-
-    JSContext *cx = f.cx;
-    Value *vp = f.regs.sp - (argc + 2);
-
-    /* Try to do a fast inline call before the general Invoke path. */
-    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpreted()) {
-        ucr->callee = &vp->toObject();
-        if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
-            THROW();
-    } else {
-        if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
-            THROW();
-    }
-}
-
-void * JS_FASTCALL
-stubs::UncachedCall(VMFrame &f, uint32 argc)
-{
-    UncachedCallResult ucr;
-    UncachedCallHelper(f, argc, &ucr);
-    return ucr.codeAddr;
-}
-
 void JS_FASTCALL
 stubs::Eval(VMFrame &f, uint32 argc)
 {
@@ -450,37 +326,6 @@ stubs::Eval(VMFrame &f, uint32 argc)
     f.regs.sp = vp + 1;
 }
 
-void
-stubs::UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
-{
-    ucr->init();
-
-    JSContext *cx = f.cx;
-    Value *vp = f.regs.sp - (argc + 2);
-
-    if (IsFunctionObject(*vp, &ucr->callee)) {
-        ucr->callee = &vp->toObject();
-        ucr->fun = GET_FUNCTION_PRIVATE(cx, ucr->callee);
-
-        if (ucr->fun->isInterpreted()) {
-            if (!UncachedInlineCall(f, 0, &ucr->codeAddr, &ucr->unjittable, argc))
-                THROW();
-            return;
-        }
-
-        if (ucr->fun->isNative()) {
-            if (!CallJSNative(cx, ucr->fun->u.n.native, argc, vp))
-                THROW();
-            return;
-        }
-    }
-
-    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
-        THROW();
-
-    return;
-}
-
 void JS_FASTCALL
 stubs::PutActivationObjects(VMFrame &f)
 {
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index c2af0ec5f0f7..1d1efd6498b2 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -752,31 +752,31 @@ JITScript::nmapSectionLimit() const
     return (char *)nmap() + sizeof(NativeMapEntry) * nNmapPairs;
 }
 
+ic::CallIC *
+JITScript::callICs() const
+{
+    return (ic::CallIC *)nmapSectionLimit();
+}
+
 #ifdef JS_MONOIC
 ic::GetGlobalNameIC *
 JITScript::getGlobalNames() const
 {
-    return (ic::GetGlobalNameIC *)nmapSectionLimit();
+    return (ic::GetGlobalNameIC *)((char *)callICs() + sizeof(ic::CallIC) * nCallICs);
 }
 
 ic::SetGlobalNameIC *
 JITScript::setGlobalNames() const
 {
-    return (ic::SetGlobalNameIC *)((char *)nmapSectionLimit() +
+    return (ic::SetGlobalNameIC *)((char *)getGlobalNames() +
             sizeof(ic::GetGlobalNameIC) * nGetGlobalNames);
 }
 
-ic::CallICInfo *
-JITScript::callICs() const
-{
-    return (ic::CallICInfo *)((char *)setGlobalNames() +
-            sizeof(ic::SetGlobalNameIC) * nSetGlobalNames);
-}
-
 ic::EqualityICInfo *
 JITScript::equalityICs() const
 {
-    return (ic::EqualityICInfo *)((char *)callICs() + sizeof(ic::CallICInfo) * nCallICs);
+    return (ic::EqualityICInfo *)((char *)setGlobalNames() +
+            sizeof(ic::SetGlobalNameIC) * nSetGlobalNames);
 }
 
 ic::TraceICInfo *
@@ -794,7 +794,7 @@ JITScript::monoICSectionsLimit() const
 char *
 JITScript::monoICSectionsLimit() const
 {
-    return nmapSectionsLimit();
+    return (char *)callICs() + sizeof(ic::CallIC) * nCallICs;
 }
 #endif  // JS_MONOIC
 
@@ -870,10 +870,6 @@ mjit::JITScript::~JITScript()
     {
         (*pExecPool)->release();
     }
-    
-    ic::CallICInfo *callICs_ = callICs();
-    for (uint32 i = 0; i < nCallICs; i++)
-        callICs_[i].releasePools();
 #endif
 }
 
@@ -886,7 +882,6 @@ mjit::JITScript::scriptDataSize()
 #if defined JS_MONOIC
         sizeof(ic::GetGlobalNameIC) * nGetGlobalNames +
         sizeof(ic::SetGlobalNameIC) * nSetGlobalNames +
-        sizeof(ic::CallICInfo) * nCallICs +
         sizeof(ic::EqualityICInfo) * nEqualityICs +
         sizeof(ic::TraceICInfo) * nTraceICs +
 #endif
@@ -992,11 +987,11 @@ JITScript::nativeToPC(void *returnAddress) const
 {
     size_t low = 0;
     size_t high = nCallICs;
-    js::mjit::ic::CallICInfo *callICs_ = callICs();
+    js::mjit::ic::CallIC *callICs_ = callICs();
     while (high > low + 1) {
         /* Could overflow here on a script with 2 billion calls. Oh well. */
         size_t mid = (high + low) / 2;
-        void *entry = callICs_[mid].funGuard.executableAddress();
+        void *entry = callICs_[mid].fastPathStart.executableAddress();
 
         /*
          * Use >= here as the return address of the call is likely to be
@@ -1008,9 +1003,9 @@ JITScript::nativeToPC(void *returnAddress) const
             low = mid;
     }
 
-    js::mjit::ic::CallICInfo &ic = callICs_[low];
+    js::mjit::ic::CallIC &ic = callICs_[low];
 
-    JS_ASSERT((uint8*)ic.funGuard.executableAddress() + ic.joinPointOffset == returnAddress);
+    JS_ASSERT((uint8*)ic.fastPathStart.executableAddress() + ic.inlineRejoinOffset == returnAddress);
     return ic.pc;
 }
 
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index e1741e95731f..58eddf516870 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -100,7 +100,6 @@ struct VMFrame
             void *ptr3;
         } x;
         struct {
-            uint32 lazyArgsObj;
             uint32 dynamicArgc;
         } call;
     } u;
@@ -189,6 +188,12 @@ extern "C" void JaegerStubVeneer(void);
 
 namespace mjit {
 
+enum LookupStatus {
+    Lookup_Error = 0,
+    Lookup_Uncacheable,
+    Lookup_Cacheable
+};
+
 /*
  * Trampolines to force returns from jit code.
  * See also TrampolineCompiler::generateForceReturn(Fast).
@@ -293,7 +298,7 @@ namespace ic {
     struct SetGlobalNameIC;
     struct EqualityICInfo;
     struct TraceICInfo;
-    struct CallICInfo;
+    struct CallIC;
 # endif
 }
 }
@@ -318,8 +323,6 @@ typedef void (JS_FASTCALL *VoidStubJSObj)(VMFrame &, JSObject *);
 typedef void (JS_FASTCALL *VoidStubPC)(VMFrame &, jsbytecode *);
 typedef JSBool (JS_FASTCALL *BoolStubUInt32)(VMFrame &f, uint32);
 #ifdef JS_MONOIC
-typedef void (JS_FASTCALL *VoidStubCallIC)(VMFrame &, js::mjit::ic::CallICInfo *);
-typedef void * (JS_FASTCALL *VoidPtrStubCallIC)(VMFrame &, js::mjit::ic::CallICInfo *);
 typedef void (JS_FASTCALL *VoidStubGetGlobal)(VMFrame &, js::mjit::ic::GetGlobalNameIC *);
 typedef void (JS_FASTCALL *VoidStubSetGlobal)(VMFrame &, js::mjit::ic::SetGlobalNameIC *);
 typedef JSBool (JS_FASTCALL *BoolStubEqualityIC)(VMFrame &, js::mjit::ic::EqualityICInfo *);
@@ -343,6 +346,7 @@ struct NativeMapEntry {
 struct JITScript {
     typedef JSC::MacroAssemblerCodeRef CodeRef;
     CodeRef         code;       /* pool & code addresses */
+    JSScript        *script;    /* parent script */
 
 
     void            *invokeEntry;       /* invoke address */
@@ -360,10 +364,10 @@ struct JITScript {
     uint32          nNmapPairs:31;      /* The NativeMapEntrys are sorted by .bcOff.
                                            .ncode values may not be NULL. */
     bool            singleStepMode:1;   /* compiled in "single step mode" */
+    uint32          nCallICs;
 #ifdef JS_MONOIC
     uint32          nGetGlobalNames;
     uint32          nSetGlobalNames;
-    uint32          nCallICs;
     uint32          nEqualityICs;
     uint32          nTraceICs;
 #endif
@@ -381,10 +385,10 @@ struct JITScript {
 #endif
 
     NativeMapEntry *nmap() const;
+    ic::CallIC *callICs() const;
 #ifdef JS_MONOIC
     ic::GetGlobalNameIC *getGlobalNames() const;
     ic::SetGlobalNameIC *setGlobalNames() const;
-    ic::CallICInfo *callICs() const;
     ic::EqualityICInfo *equalityICs() const;
     ic::TraceICInfo *traceICs() const;
 #endif
@@ -403,10 +407,10 @@ struct JITScript {
         return jcheck >= jitcode && jcheck < jitcode + code.m_size;
     }
 
-    void nukeScriptDependentICs();
-    void sweepCallICs(JSContext *cx, bool purgeAll);
-    void purgeMICs();
-    void purgePICs();
+    void sweepICs(JSContext *cx);   // After GC, sweeps ICs caching dead objects.
+    void purgeICs(JSContext *cx);   // On pool-decaying GC, removes all extra ICs
+    void purgeMICs();               // Removes mono ICs only, on shape-regen GC
+    void purgePICs();               // Removes poly ICs only, on every GC
 
     size_t scriptDataSize();
 
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index d3db5ecfecb5..ee48097fead2 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -48,8 +48,8 @@
 #include "methodjit/CodeGenIncludes.h"
 #include "methodjit/Compiler.h"
 #include "methodjit/ICRepatcher.h"
+#include "methodjit/MethodJIT-inl.h"
 #include "methodjit/PolyIC.h"
-#include "InlineFrameAssembler.h"
 #include "jsobj.h"
 
 #include "jsinterpinlines.h"
@@ -69,6 +69,7 @@ typedef JSC::MacroAssembler::ImmPtr ImmPtr;
 typedef JSC::MacroAssembler::Call Call;
 typedef JSC::MacroAssembler::Label Label;
 typedef JSC::MacroAssembler::DataLabel32 DataLabel32;
+typedef JSC::MacroAssembler::DataLabelPtr DataLabelPtr;
 
 #if defined JS_MONOIC
 
@@ -536,505 +537,6 @@ ic::Equality(VMFrame &f, ic::EqualityICInfo *ic)
     return ic->stub(f);
 }
 
-static void * JS_FASTCALL
-SlowCallFromIC(VMFrame &f, ic::CallICInfo *ic)
-{
-    stubs::SlowCall(f, ic->frameSize.getArgc(f));
-    return NULL;
-}
-
-static void * JS_FASTCALL
-SlowNewFromIC(VMFrame &f, ic::CallICInfo *ic)
-{
-    stubs::SlowNew(f, ic->frameSize.staticArgc());
-    return NULL;
-}
-
-/*
- * Calls have an inline path and an out-of-line path. The inline path is used
- * in the fastest case: the method has JIT'd code, and |argc == nargs|.
- * 
- * The inline path and OOL path are separated by a guard on the identity of
- * the callee object. This guard starts as NULL and always fails on the first
- * hit. On the OOL path, the callee is verified to be both a function and a
- * scripted function. If these conditions hold, |ic::Call| is invoked.
- *
- * |ic::Call| first ensures that the callee has JIT code. If it doesn't, the
- * call to |ic::Call| is patched to a slow path. If it does have JIT'd code,
- * the following cases can occur:
- *
- *   1) args != nargs: The call to |ic::Call| is patched with a dynamically
- *      generated stub. This stub inlines a path that looks like:
- *      ----
- *      push frame
- *      if (callee is not compiled) {
- *          Compile(callee);
- *      }
- *      call callee->arityLabel
- *
- *      The arity label is a special entry point for correcting frames for
- *      arity mismatches.
- *
- *   2) args == nargs, and the inline call site was not patched yet.
- *      The guard dividing the two paths is patched to guard on the given
- *      function object identity, and the proceeding call is patched to
- *      directly call the JIT code.
- *
- *   3) args == nargs, and the inline call site was patched already.
- *      A small stub is created which extends the original guard to also
- *      guard on the JSFunction lying underneath the function object.
- *
- * If the OOL path does not have a scripted function, but does have a
- * scripted native, then a small stub is generated which inlines the native
- * invocation.
- */
-class CallCompiler : public BaseCompiler
-{
-    VMFrame &f;
-    CallICInfo &ic;
-    bool callingNew;
-
-  public:
-    CallCompiler(VMFrame &f, CallICInfo &ic, bool callingNew)
-      : BaseCompiler(f.cx), f(f), ic(ic), callingNew(callingNew)
-    {
-    }
-
-    JSC::ExecutablePool *poolForSize(LinkerHelper &linker, CallICInfo::PoolIndex index)
-    {
-        JSC::ExecutablePool *ep = linker.init(f.cx);
-        if (!ep)
-            return NULL;
-        JS_ASSERT(!ic.pools[index]);
-        ic.pools[index] = ep;
-        return ep;
-    }
-
-    void disable(JITScript *jit)
-    {
-        JSC::CodeLocationCall oolCall = ic.slowPathStart.callAtOffset(ic.oolCallOffset);
-        Repatcher repatch(jit);
-        JSC::FunctionPtr fptr = callingNew
-                                ? JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, SlowNewFromIC))
-                                : JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, SlowCallFromIC));
-        repatch.relink(oolCall, fptr);
-    }
-
-    bool generateFullCallStub(JITScript *from, JSScript *script, uint32 flags)
-    {
-        /*
-         * Create a stub that works with arity mismatches. Like the fast-path,
-         * this allocates a frame on the caller side, but also performs extra
-         * checks for compilability. Perhaps this should be a separate, shared
-         * trampoline, but for now we generate it dynamically.
-         */
-        Assembler masm;
-        InlineFrameAssembler inlFrame(masm, ic, flags);
-        RegisterID t0 = inlFrame.tempRegs.takeAnyReg();
-
-        /* Generate the inline frame creation. */
-        inlFrame.assemble(ic.funGuard.labelAtOffset(ic.joinPointOffset).executableAddress());
-
-        /* funPtrReg is still valid. Check if a compilation is needed. */
-        Address scriptAddr(ic.funPtrReg, offsetof(JSFunction, u) +
-                           offsetof(JSFunction::U::Scripted, script));
-        masm.loadPtr(scriptAddr, t0);
-
-        /*
-         * Test if script->nmap is NULL - same as checking ncode, but faster
-         * here since ncode has two failure modes and we need to load out of
-         * nmap anyway.
-         */
-        size_t offset = callingNew
-                        ? offsetof(JSScript, jitArityCheckCtor)
-                        : offsetof(JSScript, jitArityCheckNormal);
-        masm.loadPtr(Address(t0, offset), t0);
-        Jump hasCode = masm.branchPtr(Assembler::Above, t0, ImmPtr(JS_UNJITTABLE_SCRIPT));
-
-        /* Try and compile. On success we get back the nmap pointer. */
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
-        void *compilePtr = JS_FUNC_TO_DATA_PTR(void *, stubs::CompileFunction);
-        if (ic.frameSize.isStatic()) {
-            masm.move(Imm32(ic.frameSize.staticArgc()), Registers::ArgReg1);
-            masm.fallibleVMCall(compilePtr, script->code, ic.frameSize.staticLocalSlots());
-        } else {
-            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), Registers::ArgReg1);
-            masm.fallibleVMCall(compilePtr, script->code, -1);
-        }
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-
-        Jump notCompiled = masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
-                                              Registers::ReturnReg);
-
-        masm.jump(Registers::ReturnReg);
-
-        hasCode.linkTo(masm.label(), &masm);
-
-        /* Get nmap[ARITY], set argc, call. */
-        if (ic.frameSize.isStatic())
-            masm.move(Imm32(ic.frameSize.staticArgc()), JSParamReg_Argc);
-        else
-            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
-        masm.jump(t0);
-
-        LinkerHelper linker(masm);
-        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_ScriptStub);
-        if (!ep)
-            return false;
-
-        if (!linker.verifyRange(from)) {
-            disable(from);
-            return true;
-        }
-
-        linker.link(notCompiled, ic.slowPathStart.labelAtOffset(ic.slowJoinOffset));
-        JSC::CodeLocationLabel cs = linker.finalize();
-
-        JaegerSpew(JSpew_PICs, "generated CALL stub %p (%d bytes)\n", cs.executableAddress(),
-                   masm.size());
-
-        Repatcher repatch(from);
-        JSC::CodeLocationJump oolJump = ic.slowPathStart.jumpAtOffset(ic.oolJumpOffset);
-        repatch.relink(oolJump, cs);
-
-        return true;
-    }
-
-    bool patchInlinePath(JITScript *from, JSScript *script, JSObject *obj)
-    {
-        JS_ASSERT(ic.frameSize.isStatic());
-        JITScript *jit = script->getJIT(callingNew);
-
-        /* Very fast path. */
-        Repatcher repatch(from);
-
-        if (!repatch.canRelink(ic.funGuard.jumpAtOffset(ic.hotJumpOffset),
-                               JSC::CodeLocationLabel(jit->fastEntry))) {
-            return false;
-        }
-
-        ic.fastGuardedObject = obj;
-
-        repatch.repatch(ic.funGuard, obj);
-        repatch.relink(ic.funGuard.jumpAtOffset(ic.hotJumpOffset),
-                       JSC::CodeLocationLabel(jit->fastEntry));
-
-        JaegerSpew(JSpew_PICs, "patched CALL path %p (obj: %p)\n",
-                   ic.funGuard.executableAddress(), ic.fastGuardedObject);
-
-        return true;
-    }
-
-    bool generateStubForClosures(JITScript *from, JSObject *obj)
-    {
-        JS_ASSERT(ic.frameSize.isStatic());
-
-        /* Slightly less fast path - guard on fun->getFunctionPrivate() instead. */
-        Assembler masm;
-
-        Registers tempRegs;
-        tempRegs.takeReg(ic.funObjReg);
-
-        RegisterID t0 = tempRegs.takeAnyReg();
-
-        /* Guard that it's actually a function object. */
-        Jump claspGuard = masm.testObjClass(Assembler::NotEqual, ic.funObjReg, &js_FunctionClass);
-
-        /* Guard that it's the same function. */
-        JSFunction *fun = obj->getFunctionPrivate();
-        masm.loadObjPrivate(ic.funObjReg, t0);
-        Jump funGuard = masm.branchPtr(Assembler::NotEqual, t0, ImmPtr(fun));
-        Jump done = masm.jump();
-
-        LinkerHelper linker(masm);
-        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_ClosureStub);
-        if (!ep)
-            return false;
-
-        ic.hasJsFunCheck = true;
-
-        if (!linker.verifyRange(from)) {
-            disable(from);
-            return true;
-        }
-
-        linker.link(claspGuard, ic.slowPathStart);
-        linker.link(funGuard, ic.slowPathStart);
-        linker.link(done, ic.funGuard.labelAtOffset(ic.hotPathOffset));
-        JSC::CodeLocationLabel cs = linker.finalize();
-
-        JaegerSpew(JSpew_PICs, "generated CALL closure stub %p (%d bytes)\n",
-                   cs.executableAddress(), masm.size());
-
-        Repatcher repatch(from);
-        repatch.relink(ic.funJump, cs);
-
-        return true;
-    }
-
-    bool generateNativeStub()
-    {
-        JITScript *jit = f.jit();
-
-        /* Snapshot the frameDepth before SplatApplyArgs modifies it. */
-        uintN initialFrameDepth = f.regs.sp - f.regs.fp->slots();
-
-        /*
-         * SplatApplyArgs has not been called, so we call it here before
-         * potentially touching f.u.call.dynamicArgc.
-         */
-        Value *vp;
-        if (ic.frameSize.isStatic()) {
-            JS_ASSERT(f.regs.sp - f.regs.fp->slots() == (int)ic.frameSize.staticLocalSlots());
-            vp = f.regs.sp - (2 + ic.frameSize.staticArgc());
-        } else {
-            JS_ASSERT(*f.regs.pc == JSOP_FUNAPPLY && GET_ARGC(f.regs.pc) == 2);
-            if (!ic::SplatApplyArgs(f))       /* updates regs.sp */
-                THROWV(true);
-            vp = f.regs.sp - (2 + f.u.call.dynamicArgc);
-        }
-
-        JSObject *obj;
-        if (!IsFunctionObject(*vp, &obj))
-            return false;
-
-        JSFunction *fun = obj->getFunctionPrivate();
-        if ((!callingNew && !fun->isNative()) || (callingNew && !fun->isConstructor()))
-            return false;
-
-        if (callingNew)
-            vp[1].setMagicWithObjectOrNullPayload(NULL);
-
-        if (!CallJSNative(cx, fun->u.n.native, ic.frameSize.getArgc(f), vp))
-            THROWV(true);
-
-        /* Right now, take slow-path for IC misses or multiple stubs. */
-        if (ic.fastGuardedNative || ic.hasJsFunCheck)
-            return true;
-
-        /* Native MIC needs to warm up first. */
-        if (!ic.hit) {
-            ic.hit = true;
-            return true;
-        }
-
-        /* Generate fast-path for calling this native. */
-        Assembler masm;
-
-        /* Guard on the function object identity, for now. */
-        Jump funGuard = masm.branchPtr(Assembler::NotEqual, ic.funObjReg, ImmPtr(obj));
-
-        /* N.B. After this call, the frame will have a dynamic frame size. */
-        if (ic.frameSize.isDynamic()) {
-            masm.fallibleVMCall(JS_FUNC_TO_DATA_PTR(void *, ic::SplatApplyArgs),
-                                f.regs.pc, initialFrameDepth);
-        }
-
-        Registers tempRegs;
-#ifndef JS_CPU_X86
-        tempRegs.takeReg(Registers::ArgReg0);
-        tempRegs.takeReg(Registers::ArgReg1);
-        tempRegs.takeReg(Registers::ArgReg2);
-#endif
-        RegisterID t0 = tempRegs.takeAnyReg();
-
-        /* Store pc. */
-        masm.storePtr(ImmPtr(cx->regs->pc),
-                       FrameAddress(offsetof(VMFrame, regs.pc)));
-
-        /* Store sp (if not already set by ic::SplatApplyArgs). */
-        if (ic.frameSize.isStatic()) {
-            uint32 spOffset = sizeof(JSStackFrame) + initialFrameDepth * sizeof(Value);
-            masm.addPtr(Imm32(spOffset), JSFrameReg, t0);
-            masm.storePtr(t0, FrameAddress(offsetof(VMFrame, regs.sp)));
-        }
-
-        /* Store fp. */
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
-
-        /* Grab cx. */
-#ifdef JS_CPU_X86
-        RegisterID cxReg = tempRegs.takeAnyReg();
-#else
-        RegisterID cxReg = Registers::ArgReg0;
-#endif
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, cx)), cxReg);
-
-        /* Compute vp. */
-#ifdef JS_CPU_X86
-        RegisterID vpReg = t0;
-#else
-        RegisterID vpReg = Registers::ArgReg2;
-#endif
-        MaybeRegisterID argcReg;
-        if (ic.frameSize.isStatic()) {
-            uint32 vpOffset = sizeof(JSStackFrame) + (vp - f.regs.fp->slots()) * sizeof(Value);
-            masm.addPtr(Imm32(vpOffset), JSFrameReg, vpReg);
-        } else {
-            argcReg = tempRegs.takeAnyReg();
-            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), argcReg.reg());
-            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), vpReg);
-
-            /* vpOff = (argc + 2) * sizeof(Value) */
-            RegisterID vpOff = tempRegs.takeAnyReg();
-            masm.move(argcReg.reg(), vpOff);
-            masm.add32(Imm32(2), vpOff);  /* callee, this */
-            JS_STATIC_ASSERT(sizeof(Value) == 8);
-            masm.lshift32(Imm32(3), vpOff);
-            masm.subPtr(vpOff, vpReg);
-
-            tempRegs.putReg(vpOff);
-        }
-
-        /* Mark vp[1] as magic for |new|. */
-        if (callingNew) {
-            Value v;
-            v.setMagicWithObjectOrNullPayload(NULL);
-            masm.storeValue(v, Address(vpReg, sizeof(Value)));
-        }
-
-        masm.setupABICall(Registers::NormalCall, 3);
-        masm.storeArg(2, vpReg);
-        if (ic.frameSize.isStatic())
-            masm.storeArg(1, Imm32(ic.frameSize.staticArgc()));
-        else
-            masm.storeArg(1, argcReg.reg());
-        masm.storeArg(0, cxReg);
-
-        js::Native native = fun->u.n.native;
-
-        /*
-         * Call RegExp.test instead of exec if the result will not be used or
-         * will only be used to test for existence.
-         */
-        if (native == js_regexp_exec && !CallResultEscapes(f.regs.pc))
-            native = js_regexp_test;
-
-        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, native), false);
-
-        Jump hasException = masm.branchTest32(Assembler::Zero, Registers::ReturnReg,
-                                              Registers::ReturnReg);
-        
-
-        Jump done = masm.jump();
-
-        /* Move JaegerThrowpoline into register for very far jump on x64. */
-        hasException.linkTo(masm.label(), &masm);
-        masm.throwInJIT();
-
-        LinkerHelper linker(masm);
-        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_NativeStub);
-        if (!ep)
-            THROWV(true);
-
-        ic.fastGuardedNative = obj;
-
-        if (!linker.verifyRange(jit)) {
-            disable(jit);
-            return true;
-        }
-
-        linker.link(done, ic.slowPathStart.labelAtOffset(ic.slowJoinOffset));
-        linker.link(funGuard, ic.slowPathStart);
-        JSC::CodeLocationLabel cs = linker.finalize();
-
-        JaegerSpew(JSpew_PICs, "generated native CALL stub %p (%d bytes)\n",
-                   cs.executableAddress(), masm.size());
-
-        Repatcher repatch(jit);
-        repatch.relink(ic.funJump, cs);
-
-        return true;
-    }
-
-    void *update()
-    {
-        JITScript *jit = f.jit();
-
-        stubs::UncachedCallResult ucr;
-        if (callingNew)
-            stubs::UncachedNewHelper(f, ic.frameSize.staticArgc(), &ucr);
-        else
-            stubs::UncachedCallHelper(f, ic.frameSize.getArgc(f), &ucr);
-
-        // If the function cannot be jitted (generally unjittable or empty script),
-        // patch this site to go to a slow path always.
-        if (!ucr.codeAddr) {
-            if (ucr.unjittable)
-                disable(jit);
-            return NULL;
-        }
-            
-        JSFunction *fun = ucr.fun;
-        JS_ASSERT(fun);
-        JSScript *script = fun->script();
-        JS_ASSERT(script);
-        JSObject *callee = ucr.callee;
-        JS_ASSERT(callee);
-
-        uint32 flags = callingNew ? JSFRAME_CONSTRUCTING : 0;
-
-        if (!ic.hit) {
-            ic.hit = true;
-            return ucr.codeAddr;
-        }
-
-        if (!ic.frameSize.isStatic() || ic.frameSize.staticArgc() != fun->nargs) {
-            if (!generateFullCallStub(jit, script, flags))
-                THROWV(NULL);
-        } else {
-            if (!ic.fastGuardedObject && patchInlinePath(jit, script, callee)) {
-                // Nothing, done.
-            } else if (ic.fastGuardedObject &&
-                       !ic.hasJsFunCheck &&
-                       !ic.fastGuardedNative &&
-                       ic.fastGuardedObject->getFunctionPrivate() == fun) {
-                /*
-                 * Note: Multiple "function guard" stubs are not yet
-                 * supported, thus the fastGuardedNative check.
-                 */
-                if (!generateStubForClosures(jit, callee))
-                    THROWV(NULL);
-            } else {
-                if (!generateFullCallStub(jit, script, flags))
-                    THROWV(NULL);
-            }
-        }
-
-        return ucr.codeAddr;
-    }
-};
-
-void * JS_FASTCALL
-ic::Call(VMFrame &f, CallICInfo *ic)
-{
-    CallCompiler cc(f, *ic, false);
-    return cc.update();
-}
-
-void * JS_FASTCALL
-ic::New(VMFrame &f, CallICInfo *ic)
-{
-    CallCompiler cc(f, *ic, true);
-    return cc.update();
-}
-
-void JS_FASTCALL
-ic::NativeCall(VMFrame &f, CallICInfo *ic)
-{
-    CallCompiler cc(f, *ic, false);
-    if (!cc.generateNativeStub())
-        stubs::SlowCall(f, ic->frameSize.getArgc(f));
-}
-
-void JS_FASTCALL
-ic::NativeNew(VMFrame &f, CallICInfo *ic)
-{
-    CallCompiler cc(f, *ic, true);
-    if (!cc.generateNativeStub())
-        stubs::SlowNew(f, ic->frameSize.staticArgc());
-}
-
 static const unsigned MANY_ARGS = 1024;
 static const unsigned MIN_SPACE = 500;
 
@@ -1096,6 +598,7 @@ BumpStack(VMFrame &f, uintN inc)
  * All successful paths through SplatApplyArgs must set f.u.call.dynamicArgc
  * and f.regs.sp.
  */
+template <bool LazyArgsObj>
 JSBool JS_FASTCALL
 ic::SplatApplyArgs(VMFrame &f)
 {
@@ -1113,7 +616,7 @@ ic::SplatApplyArgs(VMFrame &f)
      *
      *  | Function.prototype.apply | f | x | arguments |
      */
-    if (f.u.call.lazyArgsObj) {
+    if (LazyArgsObj) {
         Value *vp = f.regs.sp - 3;
         JS_ASSERT(JS_CALLEE(cx, vp).toObject().getFunctionPrivate()->u.n.native == js_fun_apply);
 
@@ -1208,6 +711,561 @@ ic::SplatApplyArgs(VMFrame &f)
     f.u.call.dynamicArgc = n;
     return true;
 }
+template JSBool JS_FASTCALL ic::SplatApplyArgs<true>(VMFrame &f);
+template JSBool JS_FASTCALL ic::SplatApplyArgs<false>(VMFrame &f);
+
+template <bool IsNew>
+static bool
+CallHelper(VMFrame &f, ic::CallIC *ic, CallDescription &call)
+{
+    Value *vp = f.regs.sp - (2 + call.argc);
+
+    // Take the slowest path if the callee is not a funobj, or if the function
+    // is native and constructing.
+    if (vp->isObject()) {
+        call.callee = &vp->toObject();
+        call.fun = call.callee->isFunction() ? call.callee->getFunctionPrivate() : NULL;
+    } else {
+        call.callee = call.fun = NULL;
+    }
+
+    if (!call.fun || call.fun->isNative()) {
+        if (IsNew)
+            return InvokeConstructor(f.cx, InvokeArgsAlreadyOnTheStack(vp, call.argc));
+        if (!call.fun)
+            return Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, call.argc), 0);
+        return CallJSNative(f.cx, call.fun->u.n.native, call.argc, vp);
+    }
+
+    // The function is interpreted.
+    uint32 flags = IsNew ? JSFRAME_CONSTRUCTING : 0;
+    JSScript *newscript = call.fun->script();
+    StackSpace &stack = f.cx->stack();
+    JSStackFrame *newfp = stack.getInlineFrameWithinLimit(f.cx, f.regs.sp, call.argc,
+                                                          call.fun, newscript, &flags,
+                                                          f.entryfp, &f.stackLimit);
+    if (!newfp)
+        return false;
+
+    // Initialize the frame and locals.
+    newfp->initCallFrame(f.cx, *call.callee, call.fun, call.argc, flags);
+    SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
+
+    // Officially push the frame.
+    stack.pushInlineFrame(f.cx, newscript, newfp, &f.regs);
+    JS_ASSERT(newfp == f.regs.fp);
+
+    /* Scope with a call object parented by callee's parent. */
+    if (call.fun->isHeavyweight() && !js::CreateFunCallObject(f.cx, newfp))
+        return false;
+
+    // Try to compile the method if it's not already compiled.
+    call.unjittable = false;
+    if (newscript->getJITStatus(IsNew) == JITScript_None) {
+        CompileStatus status = CanMethodJIT(f.cx, newscript, newfp, CompileRequest_Interpreter);
+        if (status == Compile_Error) {
+            // A runtime exception was thrown, get out.
+            InlineReturn(f);
+            return false;
+        }
+        if (status == Compile_Abort)
+            call.unjittable = true;
+    }
+
+    // If the script was successfully compiled, we're now done.
+    if (JITScript *jit = newscript->getJIT(IsNew)) {
+        newfp->setNativeReturnAddress(ic->returnAddress());
+        call.code = jit->invokeEntry;
+        return true;
+    }
+
+    // Otherwise, run the script in the interpreter.
+    bool ok = !!Interpret(f.cx, f.fp());
+    InlineReturn(f);
+    call.code = NULL;
+
+    return ok;
+}
+
+template <bool IsNew, bool UpdateIC>
+static bool
+CallICTail(VMFrame &f, ic::CallIC *ic, CallDescription &call)
+{
+    JITScript *jit = f.jit();
+    (void)jit;
+
+    if (!CallHelper<IsNew>(f, ic, call))
+        return false;
+    if (UpdateIC) {
+        if (!ic->update(f.cx, jit, call))
+            return false;
+    }
+    return true;
+}
+
+void * JS_FASTCALL
+ic::FailedFunApplyLazyArgs(VMFrame &f, ic::CallIC *ic)
+{
+    // Reify the lazy argsobj.
+    f.regs.sp++;
+    if (!js_GetArgsValue(f.cx, f.fp(), &f.regs.sp[-1]))
+        THROWV(NULL);
+    return ic::FailedFunApply(f, ic);
+}
+
+void * JS_FASTCALL
+ic::FailedFunApply(VMFrame &f, ic::CallIC *ic)
+{
+    CallDescription call(2);
+    if (!CallICTail<false, false>(f, ic, call))
+        THROWV(NULL);
+    return call.code;
+}
+
+void * JS_FASTCALL
+ic::FailedFunCall(VMFrame &f, ic::CallIC *ic)
+{
+    CallDescription call(ic->frameSize.staticArgc() + 1);
+    if (!CallICTail<false, false>(f, ic, call))
+        THROWV(NULL);
+    return call.code;
+}
+
+template <bool DynamicArgc, bool UpdateIC>
+void * JS_FASTCALL
+ic::Call(VMFrame &f, ic::CallIC *ic)
+{
+    CallDescription call(DynamicArgc
+                         ? f.u.call.dynamicArgc
+                         : ic->frameSize.staticArgc());
+    if (!CallICTail<false, UpdateIC>(f, ic, call))
+        THROWV(NULL);
+    return call.code;
+}
+template void * JS_FASTCALL ic::Call<true, true>(VMFrame &f, ic::CallIC *ic);
+template void * JS_FASTCALL ic::Call<true, false>(VMFrame &f, ic::CallIC *ic);
+template void * JS_FASTCALL ic::Call<false, true>(VMFrame &f, ic::CallIC *ic);
+template void * JS_FASTCALL ic::Call<false, false>(VMFrame &f, ic::CallIC *ic);
+
+template <bool UpdateIC>
+void * JS_FASTCALL
+ic::New(VMFrame &f, ic::CallIC *ic)
+{
+    CallDescription call(ic->frameSize.staticArgc());
+    if (!CallICTail<true, UpdateIC>(f, ic, call))
+        THROWV(NULL);
+    return call.code;
+}
+template void * JS_FASTCALL ic::New<true>(VMFrame &f, ic::CallIC *ic);
+template void * JS_FASTCALL ic::New<false>(VMFrame &f, ic::CallIC *ic);
+
+JSOp
+ic::CallIC::op() const
+{
+    return JSOp(*pc);
+}
+
+class CallAssembler
+{
+    JSContext *cx;
+    const ic::CallIC &ic;
+    JITScript *jit;
+    CallDescription &call;
+    Registers tempRegs;
+
+    // Guards that always go to the slowest path.
+    MaybeJump claspGuard;
+
+    // Must be patched during linking.
+    MaybeJump nativeDone;
+    MaybeJump takeSlowPath;
+    MaybeJump interpDone;
+
+  public:
+    Assembler masm;
+
+  public:
+    CallAssembler(JSContext *cx, ic::CallIC &ic, JITScript *jit, CallDescription &call)
+      : cx(cx),
+        ic(ic),
+        jit(jit),
+        call(call)
+    {
+        tempRegs.takeReg(ic.calleeData);
+    }
+
+    void emitStaticFrame(uint32 frameDepth)
+    {
+        masm.emitStaticFrame(ic.op() == JSOP_NEW, frameDepth, ic.returnAddress());
+    }
+
+    void emitDynamicFrame()
+    {
+        RegisterID newfp = tempRegs.takeAnyReg();
+        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), newfp);
+    
+        Address flagsAddr(newfp, JSStackFrame::offsetOfFlags());
+        uint32 extraFlags = (ic.op() == JSOP_NEW) ? JSFRAME_CONSTRUCTING : 0;
+        masm.store32(Imm32(JSFRAME_FUNCTION | extraFlags), flagsAddr);
+    
+        Address prevAddr(newfp, JSStackFrame::offsetOfPrev());
+        masm.storePtr(JSFrameReg, prevAddr);
+    
+        Address ncodeAddr(newfp, JSStackFrame::offsetOfncode());
+        masm.storePtr(ImmPtr(ic.returnAddress()), ncodeAddr);
+    
+        masm.move(newfp, JSFrameReg);
+        tempRegs.putReg(newfp);
+    }
+
+    Jump emitNativeCall(Native native)
+    {
+        // Call RegExp.test instead of exec if the result will not eb used or
+        // will only be used to test for existance.
+        if (native == js_regexp_exec && !CallResultEscapes(cx->regs->pc))
+            native = js_regexp_test;
+
+        Registers tempRegs; // note, separate from member variable for convenience.
+#ifndef JS_CPU_X86
+        tempRegs.takeReg(Registers::ArgReg0);
+        tempRegs.takeReg(Registers::ArgReg1);
+        tempRegs.takeReg(Registers::ArgReg2);
+#endif
+
+        // Store the PC.
+        masm.storePtr(ImmPtr(ic.pc), FrameAddress(offsetof(VMFrame, regs.pc)));
+
+        // Store |sp| (SplatApplyArgs has already been called so that's not
+        // needed here).
+        RegisterID t0 = tempRegs.takeAnyReg();
+        if (ic.frameSize.isStatic()) {
+            uint32 spOffset = sizeof(JSStackFrame) + ic.frameSize.staticLocalSlots() * sizeof(Value);
+            masm.addPtr(Imm32(spOffset), JSFrameReg, t0);
+            masm.storePtr(t0, FrameAddress(offsetof(VMFrame, regs.sp)));
+        }
+
+        // Store the frame pointer.
+        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+
+        // Grab cx.
+#ifdef JS_CPU_X86
+        RegisterID cxReg = tempRegs.takeAnyReg();
+#else
+        RegisterID cxReg = Registers::ArgReg0;
+#endif
+        masm.loadPtr(FrameAddress(offsetof(VMFrame, cx)), cxReg);
+
+        // Compute vp.
+#ifdef JS_CPU_X86
+        RegisterID argcReg = tempRegs.takeAnyReg();
+        RegisterID vpReg = t0;
+#else
+        RegisterID argcReg = Registers::ArgReg1;
+        RegisterID vpReg = Registers::ArgReg2;
+#endif
+        if (ic.frameSize.isStatic()) {
+            uint32 vpOffset = ic.frameSize.staticLocalSlots() - (ic.frameSize.staticArgc() + 2);
+            masm.addPtr(Imm32(sizeof(JSStackFrame) + vpOffset * sizeof(Value)), JSFrameReg, vpReg);
+        } else {
+            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), argcReg);
+            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), vpReg);
+
+            // vpOff = (argc + 2) * sizeof(Value)
+            RegisterID vpOff = tempRegs.takeAnyReg();
+            masm.move(argcReg, vpOff);
+            masm.add32(Imm32(2), vpOff); // callee, this
+            JS_STATIC_ASSERT(sizeof(Value) == 8);
+            masm.lshift32(Imm32(3), vpOff);
+            masm.subPtr(vpOff, vpReg);
+            tempRegs.putReg(vpOff);
+        }
+
+        // Mark vp[1] as magic for |new|.
+        if (ic.op() == JSOP_NEW) {
+            Value v;
+            v.setMagicWithObjectOrNullPayload(NULL);
+            masm.storeValue(v, Address(vpReg, sizeof(Value)));
+        }
+
+        masm.setupABICall(Registers::NormalCall, 3);
+        masm.storeArg(2, vpReg);
+        if (ic.frameSize.isStatic())
+            masm.storeArg(1, Imm32(ic.frameSize.staticArgc()));
+        else
+            masm.storeArg(1, argcReg);
+        masm.storeArg(0, cxReg);
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, native), false);
+
+        Jump hasException = masm.branchTest32(Assembler::Zero, Registers::ReturnReg,
+                                              Registers::ReturnReg);
+
+        Address rval(JSFrameReg, ic.rvalOffset);
+        masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
+        Jump done = masm.jump();
+
+        hasException.linkTo(masm.label(), &masm);
+        masm.throwInJIT();
+
+        return done;
+    }
+
+    void emitLoadArgc(RegisterID reg)
+    {
+        if (ic.frameSize.isStatic())
+            masm.move(Imm32(ic.frameSize.staticArgc()), reg);
+        else
+            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), reg);
+    }
+
+    void emitGeneric()
+    {
+        RegisterID tmp = tempRegs.takeAnyReg();
+
+        // ic.calleeData is definitely a funobj at this point.
+        masm.loadObjPrivate(ic.calleeData, ic.calleeData);
+        masm.load16(Address(ic.calleeData, offsetof(JSFunction, flags)), tmp);
+        masm.and32(Imm32(JSFUN_KINDMASK), tmp);
+
+        takeSlowPath = masm.branch32(Assembler::Below, tmp, Imm32(JSFUN_INTERPRETED));
+        if (ic.frameSize.isStatic())
+            emitStaticFrame(ic.frameSize.staticLocalSlots());
+        else
+            emitDynamicFrame();
+
+        Address scriptAddr(ic.calleeData, offsetof(JSFunction, u.i.script));
+        masm.loadPtr(scriptAddr, tmp);
+
+        // Test if the script has JIT code.
+        size_t offset = (ic.op() == JSOP_NEW)
+                        ? offsetof(JSScript, jitArityCheckCtor)
+                        : offsetof(JSScript, jitArityCheckNormal);
+        masm.loadPtr(Address(tmp, offset), Registers::ReturnReg);
+        Jump hasCode = masm.branchPtr(Assembler::Above, Registers::ReturnReg,
+                                      ImmPtr(JS_UNJITTABLE_SCRIPT));
+
+        // Try and compile. On success we get back the nmap pointer.
+        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+        emitLoadArgc(Registers::ArgReg1);
+
+        void *ptr = JS_FUNC_TO_DATA_PTR(void *, stubs::CompileFunction);
+        if (ic.frameSize.isStatic())
+            masm.fallibleVMCall(ptr, NULL, ic.frameSize.staticLocalSlots());
+        else
+            masm.fallibleVMCall(ptr, NULL, -1);
+
+        // Must reload JSFrameReg since CompileFunction could re-adjust it.
+        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+
+        // NULL return means Interpret() was called, and this will jump to the
+        // "completed call" join point. Otherwise, we jump directly to JIT
+        // code: the frame is setup and ncode (the "inline call" join point)
+        // has been stored one way or another.
+        interpDone = masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
+                                        Registers::ReturnReg);
+
+        masm.jump(Registers::ReturnReg);
+
+        hasCode.linkTo(masm.label(), &masm);
+        emitLoadArgc(JSParamReg_Argc);
+        masm.jump(Registers::ReturnReg);
+    }
+
+    bool link(Repatcher &repatcher)
+    {
+        JS_ASSERT(!ic.pool);
+        JS_ASSERT(!ic.guardedNative);
+
+        LinkerHelper linker(masm);
+        JSC::ExecutablePool *ep = linker.init(cx);
+        if (!ep)
+            return false;
+        if (!linker.verifyRange(jit)) {
+            ep->release();
+            return true;
+        }
+
+        ic.pool = ep;
+        linker.link(claspGuard.get(), ic.slowPathStart);
+        linker.link(takeSlowPath.get(), ic.slowPathStart);
+        linker.link(interpDone.get(), ic.completedRejoinLabel());
+
+        if (nativeDone.isSet()) {
+            // Note: jump to the "completed call" finish point, not the inline
+            // call finish point.
+            linker.link(nativeDone.get(), ic.completedRejoinLabel());
+            ic.guardedNative = call.callee;
+        }
+
+        JSC::CodeLocationLabel cs = linker.finalize();
+        JaegerSpew(JSpew_PICs, "generated call IC at %p\n", cs.executableAddress());
+
+        // Finally, patch the inline path.
+        repatcher.relink(ic.inlineJump(), cs);
+        return true;
+    }
+
+  public:
+    bool assemble(Repatcher &repatcher)
+    {
+        // Call ICs generate one or more fast-paths. The fast paths fall into
+        // the following categories:
+        //
+        // Monomorphic scripted function-object, with matching args:
+        //   After a type check and callee guard, frame creation is completely
+        //   inlined, as is the function invocaton. If the callee guard fails,
+        //   there is an additional path that tries to unravel the funobj to
+        //   see if its internal JSFunction matches.
+        //
+        // Monomorphic native function-object:
+        //   After a type check and callee guard, native invocation is
+        //   completely inlined.
+        //
+        // If these guards fail, a slow path is taken instead. The slow path
+        // checks whether the callee is a function or not, and then, whether it
+        // is scripted or native. If not a function, it jumps back to the OOL
+        // path. If scripted, it attempts an inline call (and may try to compile
+        // an uncompiled function). If native, it goes to the slow path, but
+        // it would not be difficult to invoke a generic native handler using
+        // the same emitNativeCall() routine.
+ 
+        // If there's a native, generate a specialized path to call it.
+        MaybeJump calleeGuard;
+        if (call.fun->isNative()) {
+            calleeGuard = masm.branchPtr(Assembler::NotEqual, ic.calleeData, ImmPtr(call.callee));
+            nativeDone = emitNativeCall(call.fun->u.n.native);
+        }
+    
+        // Emit a general call path. We reach this if all callee guards fail, or
+        // if the frame size is dynamic (fun.apply speculation), this path is
+        // always taken. Note that the clasp guard might already have been
+        // emitted.
+        if (calleeGuard.isSet())
+            calleeGuard.get().linkTo(masm.label(), &masm);
+        claspGuard = masm.testFunction(Assembler::NotEqual, ic.calleeData);
+
+        emitGeneric();
+
+        return link(repatcher);
+    }
+};
+
+typedef void * (JS_FASTCALL *CallICFun)(VMFrame &, ic::CallIC *);
+template <bool UpdateIC>
+CallICFun GetCallICFun(JSOp op, const FrameSize &frameSize)
+{
+    if (op == JSOP_NEW)
+        return ic::New<UpdateIC>;
+    if (frameSize.isStatic())
+        return ic::Call<false, UpdateIC>;
+    return ic::Call<true, UpdateIC>;
+}
+
+void
+CallIC::disable(Repatcher &repatcher)
+{
+    CallICFun fun = GetCallICFun<false>(op(), frameSize);
+    repatcher.relink(slowCall(), JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, fun)));
+}
+
+void
+CallIC::reenable(JITScript *jit, Repatcher &repatcher)
+{
+    // Never re-enable if in debug mode.
+    if (jit->script->debugMode)
+        return;
+    CallICFun fun = GetCallICFun<true>(op(), frameSize);
+    repatcher.relink(slowCall(), JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, fun)));
+}
+
+void
+CallIC::purgeInlineGuard(Repatcher &repatcher)
+{
+    JS_ASSERT(hasExtendedInlinePath);
+    repatcher.repatch(calleePtr(), NULL);
+    inlineCallee = NULL;
+}
+
+void
+CallIC::purgeStub(Repatcher &repatcher)
+{
+    repatcher.relink(inlineJump(), slowPathStart);
+    pool->release();
+    pool = NULL;
+    guardedNative = NULL;
+}
+
+void
+CallIC::purge(JITScript *jit, Repatcher &repatcher)
+{
+    reenable(jit, repatcher);
+    if (inlineCallee)
+        purgeInlineGuard(repatcher);
+    if (pool)
+        purgeStub(repatcher);
+}
+
+bool
+CallIC::shouldDisable(JSContext *cx, JITScript *jit, CallDescription &call)
+{
+    // Callee is not a funobj, don't bother caching.
+    if (!call.fun)
+        return true;
+
+    // If interpreted and unjittable, also don't bother caching.
+    if (call.fun->isInterpreted() && call.unjittable)
+        return true;
+
+    // CallICs do not support debug mode yet.
+    JS_ASSERT(!jit->script->debugMode);
+    return false;
+}
+
+bool
+CallIC::update(JSContext *cx, JITScript *jit, CallDescription &call)
+{
+    if (shouldDisable(cx, jit, call)) {
+        Repatcher repatcher(jit);
+        disable(repatcher);
+        return true;
+    }
+
+    // If the callee is interpreted, but doesn't yet have JIT code, delay
+    // building the IC until it has become hot enough to compile.
+    if (call.fun->isInterpreted() && !call.code) {
+        // This should have been caught earlier.
+        JS_ASSERT(!call.unjittable);
+        return true;
+    }
+
+    // Disable the IC builder now that we'll be attaching one IC.
+    Repatcher repatcher(jit);
+    disable(repatcher);
+
+    // At this point, the IC is probably incomplete in one of two ways:
+    // (1) The inline path is not patched (either unhit or GC'd), or
+    // (2) There is no generated stub (either unhit or GC'd).
+
+    // Try to patch the inline path, if we can.
+    if (call.fun->isInterpreted() &&
+        hasExtendedInlinePath &&
+        frameSize.staticArgc() == call.fun->nargs &&
+        !inlineCallee)
+    {
+        JS_ASSERT(cx->fp()->jit() == call.fun->script()->getJIT(op() == JSOP_NEW));
+
+        JSC::CodeLocationLabel target(cx->fp()->jit()->fastEntry);
+        repatcher.relink(inlineCall(), target);
+        repatcher.repatch(calleePtr(), call.callee);
+        inlineCallee = call.callee;
+    }
+
+    // Always generate a stub.
+    if (!pool) {
+        CallAssembler ca(cx, *this, jit, call);
+        return ca.assemble(repatcher);
+    }
+    return true;
+}
 
 void
 JITScript::purgeMICs()
@@ -1249,28 +1307,26 @@ ic::PurgeMICs(JSContext *cx, JSScript *script)
 }
 
 void
-JITScript::nukeScriptDependentICs()
+JITScript::sweepICs(JSContext *cx)
 {
-    if (!nCallICs)
-        return;
-
     Repatcher repatcher(this);
 
-    ic::CallICInfo *callICs_ = callICs();
+    ic::CallIC *callICs_ = callICs();
     for (uint32 i = 0; i < nCallICs; i++) {
-        ic::CallICInfo &ic = callICs_[i];
-        if (!ic.fastGuardedObject)
-            continue;
-        repatcher.repatch(ic.funGuard, NULL);
-        repatcher.relink(ic.funJump, ic.slowPathStart);
-        ic.releasePool(CallICInfo::Pool_ClosureStub);
-        ic.fastGuardedObject = NULL;
-        ic.hasJsFunCheck = false;
+        ic::CallIC &ic = callICs_[i];
+        bool killedInline = ic.inlineCallee && IsAboutToBeFinalized(cx, ic.inlineCallee);
+        bool killedNative = ic.guardedNative && IsAboutToBeFinalized(cx, ic.guardedNative);
+        if (killedInline)
+            ic.purgeInlineGuard(repatcher);
+        if (killedNative)
+            ic.purgeStub(repatcher);
+        if (killedInline || killedNative)
+            ic.reenable(this, repatcher);
     }
 }
 
 void
-JITScript::sweepCallICs(JSContext *cx, bool purgeAll)
+JITScript::purgeICs(JSContext *cx)
 {
     Repatcher repatcher(this);
 
@@ -1280,96 +1336,58 @@ JITScript::sweepCallICs(JSContext *cx, bool purgeAll)
      * alive pools that we are trying to destroy (see JSCompartment::sweep).
      */
 
-    ic::CallICInfo *callICs_ = callICs();
-    for (uint32 i = 0; i < nCallICs; i++) {
-        ic::CallICInfo &ic = callICs_[i];
+    uint32 released = 0;
 
-        /*
-         * If the object is unreachable, we're guaranteed not to be currently
-         * executing a stub generated by a guard on that object. This lets us
-         * precisely GC call ICs while keeping the identity guard safe.
-         */
-        bool fastFunDead = ic.fastGuardedObject &&
-            (purgeAll || IsAboutToBeFinalized(cx, ic.fastGuardedObject));
-        bool nativeDead = ic.fastGuardedNative &&
-            (purgeAll || IsAboutToBeFinalized(cx, ic.fastGuardedNative));
+    ic::CallIC *callICs_ = callICs();
+    for (uint32 i = 0; i < nCallICs; i++)
+        callICs_[i].purge(this, repatcher);
 
-        /*
-         * There are three conditions where we need to relink:
-         * (1) purgeAll is true.
-         * (2) The native is dead, since it always has a stub.
-         * (3) The fastFun is dead *and* there is a closure stub.
-         *
-         * Note although both objects can be non-NULL, there can only be one
-         * of [closure, native] stub per call IC.
-         */
-        if (purgeAll || nativeDead || (fastFunDead && ic.hasJsFunCheck)) {
-            repatcher.relink(ic.funJump, ic.slowPathStart);
-            ic.hit = false;
-        }
+    ic::EqualityICInfo *equalityICs_ = equalityICs();
+    for (uint32 i = 0; i < nEqualityICs; i++) {
+        ic::EqualityICInfo &ic = equalityICs_[i];
+        if (!ic.generated)
+            continue;
 
-        if (fastFunDead) {
-            repatcher.repatch(ic.funGuard, NULL);
-            ic.releasePool(CallICInfo::Pool_ClosureStub);
-            ic.hasJsFunCheck = false;
-            ic.fastGuardedObject = NULL;
-        }
+        JSC::FunctionPtr fptr(JS_FUNC_TO_DATA_PTR(void *, ic::Equality));
+        repatcher.relink(ic.stubCall, fptr);
+        repatcher.relink(ic.jumpToStub, ic.stubEntry);
 
-        if (nativeDead) {
-            ic.releasePool(CallICInfo::Pool_NativeStub);
-            ic.fastGuardedNative = NULL;
-        }
-
-        if (purgeAll) {
-            ic.releasePool(CallICInfo::Pool_ScriptStub);
-            JSC::CodeLocationJump oolJump = ic.slowPathStart.jumpAtOffset(ic.oolJumpOffset);
-            JSC::CodeLocationLabel icCall = ic.slowPathStart.labelAtOffset(ic.icCallOffset);
-            repatcher.relink(oolJump, icCall);
-        }
+        ic.generated = false;
+        released++;
     }
 
-    if (purgeAll) {
-        /* Purge ICs generating stubs into execPools. */
-        uint32 released = 0;
-
-        ic::EqualityICInfo *equalityICs_ = equalityICs();
-        for (uint32 i = 0; i < nEqualityICs; i++) {
-            ic::EqualityICInfo &ic = equalityICs_[i];
-            if (!ic.generated)
-                continue;
-
-            JSC::FunctionPtr fptr(JS_FUNC_TO_DATA_PTR(void *, ic::Equality));
-            repatcher.relink(ic.stubCall, fptr);
-            repatcher.relink(ic.jumpToStub, ic.stubEntry);
-
-            ic.generated = false;
-            released++;
-        }
-
-        ic::SetGlobalNameIC *setGlobalNames_ = setGlobalNames();
-        for (uint32 i = 0; i < nSetGlobalNames; i ++) {
-            ic::SetGlobalNameIC &ic = setGlobalNames_[i];
-            if (!ic.hasExtraStub)
-                continue;
-            repatcher.relink(ic.fastPathStart.jumpAtOffset(ic.inlineShapeJump), ic.slowPathStart);
-            ic.hasExtraStub = false;
-            released++;
-        }
-
-        JS_ASSERT(released == execPools.length());
-        for (uint32 i = 0; i < released; i++)
-            execPools[i]->release();
-        execPools.clear();
+    ic::SetGlobalNameIC *setGlobalNames_ = setGlobalNames();
+    for (uint32 i = 0; i < nSetGlobalNames; i ++) {
+        ic::SetGlobalNameIC &ic = setGlobalNames_[i];
+        if (!ic.hasExtraStub)
+            continue;
+        repatcher.relink(ic.fastPathStart.jumpAtOffset(ic.inlineShapeJump), ic.slowPathStart);
+        ic.hasExtraStub = false;
+        released++;
     }
+
+    JS_ASSERT(released == execPools.length());
+    for (uint32 i = 0; i < released; i++)
+        execPools[i]->release();
+    execPools.clear();
 }
 
 void
-ic::SweepCallICs(JSContext *cx, JSScript *script, bool purgeAll)
+ic::SweepICs(JSContext *cx, JSScript *script)
 {
     if (script->jitNormal)
-        script->jitNormal->sweepCallICs(cx, purgeAll);
+        script->jitNormal->sweepICs(cx);
     if (script->jitCtor)
-        script->jitCtor->sweepCallICs(cx, purgeAll);
+        script->jitCtor->sweepICs(cx);
+}
+
+void
+ic::PurgeICs(JSContext *cx, JSScript *script)
+{
+    if (script->jitNormal)
+        script->jitNormal->purgeICs(cx);
+    if (script->jitCtor)
+        script->jitCtor->purgeICs(cx);
 }
 
 #endif /* JS_MONOIC */
diff --git a/js/src/methodjit/MonoIC.h b/js/src/methodjit/MonoIC.h
index ec33db7e7bd0..5d8857659b81 100644
--- a/js/src/methodjit/MonoIC.h
+++ b/js/src/methodjit/MonoIC.h
@@ -187,91 +187,96 @@ struct EqualityICInfo {
 
 JSBool JS_FASTCALL Equality(VMFrame &f, ic::EqualityICInfo *ic);
 
-/* See MonoIC.cpp, CallCompiler for more information on call ICs. */
-struct CallICInfo {
+struct CallDescription {
+    CallDescription(uint32 argc) : argc(argc), code(NULL)
+    { }
+    JSObject    *callee;
+    JSFunction  *fun;
+    uint32      argc;
+    void        *code;
+    bool        unjittable;     // Only set if fun && fun->isInterpreted()
+};
+
+struct CallIC {
     typedef JSC::MacroAssembler::RegisterID RegisterID;
+    typedef JSC::MacroAssembler::Call Call;
 
-    enum PoolIndex {
-        Pool_ScriptStub,
-        Pool_ClosureStub,
-        Pool_NativeStub,
-        Total_Pools
-    };
-
-    JSC::ExecutablePool *pools[Total_Pools];
-
-    /* Used for rooting and reification. */
-    JSObject *fastGuardedObject;
-    JSObject *fastGuardedNative;
-
-    /* PC at the call site. */
-    jsbytecode *pc;
-
-    FrameSize frameSize;
-
-    /* Function object identity guard. */
-    JSC::CodeLocationDataLabelPtr funGuard;
-
-    /* Starting point for all slow call paths. */
+    JSC::CodeLocationLabel fastPathStart;
     JSC::CodeLocationLabel slowPathStart;
 
-    /* Inline to OOL jump, redirected by stubs. */
-    JSC::CodeLocationJump funJump;
+    jsbytecode  *pc;
+    FrameSize   frameSize;
 
-    /* Offset to inline scripted call, from funGuard. */
-    uint32 hotJumpOffset   : 16;
-    uint32 joinPointOffset : 16;
+    uint32      slowCallOffset : 12;        // For repatching the slow call.
+    uint32      inlineRejoinOffset : 10;    // Return address for inline calls.
+    uint32      completedRejoinOffset : 10; // Return address for completed clals.
+    uint32      inlineJumpOffset : 10;      // For patching the inline path.
+    uint32      inlineCalleeGuard : 10;     // If there is an extended inline
+                                            // path, this is the offest to
+                                            // patch the guarded callee obj.
+    uint32      inlineCallOffset : 10;      // Offset of jump-to-script instruction
 
-    /* Out of line slow call. */
-    uint32 oolCallOffset   : 16;
+    RegisterID  calleeData : 5;
+    bool hasExtendedInlinePath : 1;
 
-    /* Jump to patch for out-of-line scripted calls. */
-    uint32 oolJumpOffset   : 16;
+    // Offset the return value from JSFrameReg.
+    uint32 rvalOffset;
 
-    /* Label for out-of-line call to IC function. */
-    uint32 icCallOffset    : 16;
+    // If a path has been generated, |pool| is non-NULL.
+    mutable JSC::ExecutablePool *pool;
 
-    /* Offset for deep-fun check to rejoin at. */
-    uint32 hotPathOffset   : 16;
+    // inlineCallee is the funobj being guarded on the inline path,
+    // if hasExtendedInlinePath is true. Otherwise, it is unused.
+    mutable JSObject *inlineCallee;
 
-    /* Join point for all slow call paths. */
-    uint32 slowJoinOffset  : 16;
+    // guardedNative is non-NULL if |pool| is non-NULL and a native stub
+    // has been generated.
+    mutable JSObject *guardedNative;
 
-    RegisterID funObjReg : 5;
-    RegisterID funPtrReg : 5;
-    bool hit : 1;
-    bool hasJsFunCheck : 1;
+    bool shouldDisable(JSContext *cx, JITScript *jit, CallDescription &call);
+    void purge(JITScript *jit, Repatcher &repatcher);
+    void disable(Repatcher &repatcher);
+    bool update(JSContext *cx, JITScript *jit, CallDescription &call);
+    JSOp op() const;
+    void reenable(JITScript *jit, Repatcher &repatcher);
+    void purgeInlineGuard(Repatcher &repatcher);
+    void purgeStub(Repatcher &repatcher);
 
-    inline void reset() {
-        fastGuardedObject = NULL;
-        fastGuardedNative = NULL;
-        hit = false;
-        hasJsFunCheck = false;
-        pools[0] = pools[1] = pools[2] = NULL;
+    JSC::CodeLocationLabel inlineRejoinLabel() const {
+       return fastPathStart.labelAtOffset(inlineRejoinOffset);
     }
-
-    inline void releasePools() {
-        releasePool(Pool_ScriptStub);
-        releasePool(Pool_ClosureStub);
-        releasePool(Pool_NativeStub);
+    void *returnAddress() const {
+        return inlineRejoinLabel().executableAddress();
     }
-
-    inline void releasePool(PoolIndex index) {
-        if (pools[index]) {
-            pools[index]->release();
-            pools[index] = NULL;
-        }
+    JSC::CodeLocationLabel completedRejoinLabel() const {
+        return fastPathStart.labelAtOffset(completedRejoinOffset);
+    }
+    JSC::CodeLocationJump inlineJump() const {
+        return fastPathStart.jumpAtOffset(inlineJumpOffset);
+    }
+    JSC::CodeLocationCall slowCall() const {
+        return slowPathStart.callAtOffset(slowCallOffset);
+    }
+    JSC::CodeLocationDataLabelPtr calleePtr() const {
+        JS_ASSERT(hasExtendedInlinePath);
+        return fastPathStart.dataLabelPtrAtOffset(inlineCalleeGuard);
+    }
+    JSC::CodeLocationJump inlineCall() const {
+        JS_ASSERT(hasExtendedInlinePath);
+        return fastPathStart.jumpAtOffset(inlineCallOffset);
     }
 };
 
-void * JS_FASTCALL New(VMFrame &f, ic::CallICInfo *ic);
-void * JS_FASTCALL Call(VMFrame &f, ic::CallICInfo *ic);
-void JS_FASTCALL NativeNew(VMFrame &f, ic::CallICInfo *ic);
-void JS_FASTCALL NativeCall(VMFrame &f, ic::CallICInfo *ic);
-JSBool JS_FASTCALL SplatApplyArgs(VMFrame &f);
+template <bool UpdateIC> void * JS_FASTCALL New(VMFrame &f, ic::CallIC *ic);
+template <bool DynamicArgc, bool UpdateIC> void * JS_FASTCALL Call(VMFrame &f, ic::CallIC *ic);
+template <bool LazyArgsObj> JSBool JS_FASTCALL SplatApplyArgs(VMFrame &f);
+void * JS_FASTCALL FailedFunCall(VMFrame &f, ic::CallIC *ic);
+void * JS_FASTCALL FailedFunApply(VMFrame &f, ic::CallIC *ic);
+void * JS_FASTCALL FailedFunApplyLazyArgs(VMFrame &f, ic::CallIC *ic);
 
 void PurgeMICs(JSContext *cx, JSScript *script);
-void SweepCallICs(JSContext *cx, JSScript *script, bool purgeAll);
+void SweepICs(JSContext *cx, JSScript *script);
+void PurgeICs(JSContext *cx, JSScript *script);
 
 } /* namespace ic */
 } /* namespace mjit */
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index 9fa7bcfb02aa..411cb5806ff6 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -63,12 +63,6 @@ static const uint32 MAX_GETELEM_IC_STUBS = 17;
 
 void PurgePICs(JSContext *cx);
 
-enum LookupStatus {
-    Lookup_Error = 0,
-    Lookup_Uncacheable,
-    Lookup_Cacheable
-};
-
 struct BaseIC : public MacroAssemblerTypedefs {
     BaseIC() { }
 
diff --git a/js/src/methodjit/StubCalls-inl.h b/js/src/methodjit/StubCalls-inl.h
index 84ce86153d2f..4df2cc0a8895 100644
--- a/js/src/methodjit/StubCalls-inl.h
+++ b/js/src/methodjit/StubCalls-inl.h
@@ -70,6 +70,23 @@ ReportAtomNotDefined(JSContext *cx, JSAtom *atom)
         js_ReportIsNotDefined(cx, printable.ptr());
 }
 
+// Clean up a frame and return.
+static inline void
+InlineReturn(VMFrame &f)
+{
+    JSContext *cx = f.cx;
+    JSStackFrame *fp = f.regs.fp;
+
+    JS_ASSERT(f.fp() != f.entryfp);
+
+    JS_ASSERT(!js_IsActiveWithOrBlock(cx, &fp->scopeChain(), 0));
+
+    Value *newsp = fp->actualArgs() - 1;
+    newsp[-1] = fp->returnValue();
+    cx->stack().popInlineFrame(cx, fp->prev(), newsp);
+}
+
+
 #define NATIVE_SET(cx,obj,shape,entry,strict,vp)                              \
     JS_BEGIN_MACRO                                                            \
         if (shape->hasDefaultSetter() &&                                      \
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index 989bfa7c491d..c0679b22fcd2 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -66,47 +66,10 @@ void JS_FASTCALL InitMethod(VMFrame &f, JSAtom *atom);
 void JS_FASTCALL HitStackQuota(VMFrame &f);
 void * JS_FASTCALL FixupArity(VMFrame &f, uint32 argc);
 void * JS_FASTCALL CompileFunction(VMFrame &f, uint32 argc);
-void JS_FASTCALL SlowNew(VMFrame &f, uint32 argc);
-void JS_FASTCALL SlowCall(VMFrame &f, uint32 argc);
-void * JS_FASTCALL UncachedNew(VMFrame &f, uint32 argc);
-void * JS_FASTCALL UncachedCall(VMFrame &f, uint32 argc);
 void JS_FASTCALL Eval(VMFrame &f, uint32 argc);
 void JS_FASTCALL ScriptDebugPrologue(VMFrame &f);
 void JS_FASTCALL ScriptDebugEpilogue(VMFrame &f);
 
-/*
- * Result struct for UncachedXHelper.
- *
- * These functions can have one of two results:
- *
- *   (1) The function was executed in the interpreter. Then all fields
- *       are NULL except unjittable.
- *
- *   (2) The function was not executed, and the function has been compiled
- *       to JM native code. Then all fields are non-NULL.
- */
-struct UncachedCallResult {
-    JSObject   *callee;       // callee object
-    JSFunction *fun;          // callee function
-    void       *codeAddr;     // code address of compiled callee function
-    bool       unjittable;    // did we try to JIT and fail?
-
-    void init() {
-        callee = NULL;
-        fun = NULL;
-        codeAddr = NULL;
-        unjittable = false;
-    }        
-};
-
-/*
- * Helper functions for stubs and IC functions for calling functions.
- * These functions either execute the function, return a native code
- * pointer that can be used to call the function, or throw.
- */
-void UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr);
-void UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr);
-
 void JS_FASTCALL CreateThis(VMFrame &f, JSObject *proto);
 void JS_FASTCALL Throw(VMFrame &f);
 void JS_FASTCALL PutActivationObjects(VMFrame &f);
diff --git a/js/src/methodjit/StubCompiler.cpp b/js/src/methodjit/StubCompiler.cpp
index 1bde46072a6f..95a6249f2e65 100644
--- a/js/src/methodjit/StubCompiler.cpp
+++ b/js/src/methodjit/StubCompiler.cpp
@@ -222,3 +222,30 @@ StubCompiler::jumpInScript(Jump j, jsbytecode *target)
     }
 }
 
+// Emits code for an out-of-line path where a stub call has either performed a
+// call already, or has returned a JIT address to enter.
+JSC::MacroAssembler::Jump
+StubCompiler::emitCallTail(const FrameSize &frameSize, JSC::MacroAssembler::Address rval)
+{
+    RegisterID r0 = Registers::ReturnReg;
+
+    // The convention is that, if the return value is NULL, then the call has
+    // already completed, and the return value must be loaded from the stack.
+    // Otherwise, the call has not yet taken place, and we should jump to it:
+    // the frame is set up, even ncode.
+    Jump noJIT = masm.branchTestPtr(Assembler::Zero, r0, r0);
+    if (frameSize.isStatic())
+        masm.move(Imm32(frameSize.staticArgc()), JSParamReg_Argc);
+    else
+        masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
+    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+    masm.jump(r0);
+
+    // In the non-JIT case, we demand the return value be placed in a
+    // consistent location, that is, in the |this| position for speculated
+    // funcall/funapply and in |callee| otherwise.
+    noJIT.linkTo(masm.label(), &masm);
+    masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
+    return masm.jump();
+}
+
diff --git a/js/src/methodjit/StubCompiler.h b/js/src/methodjit/StubCompiler.h
index e7a8ccc88060..291ac3c21704 100644
--- a/js/src/methodjit/StubCompiler.h
+++ b/js/src/methodjit/StubCompiler.h
@@ -51,6 +51,7 @@ namespace js {
 namespace mjit {
 
 class Compiler;
+class FrameSize;
 
 class StubCompiler
 {
@@ -136,6 +137,7 @@ class StubCompiler
     void fixCrossJumps(uint8 *ncode, size_t offset, size_t total);
     bool jumpInScript(Jump j, jsbytecode *target);
     void crossJump(Jump j, Label l);
+    Jump emitCallTail(const FrameSize &frameSize, JSC::MacroAssembler::Address rval);
 
     Call emitStubCall(void *ptr, uint32 id);
     Call emitStubCall(void *ptr, int32 slots, uint32 id);

From 300e8819a9975fe06e8657bf20439192d7790ef6 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 21 Apr 2011 16:29:54 -0400
Subject: [PATCH 455/509] Backed out changeset c8ba5bd72b0c, we have too many
 test harnesses and I forgot to run one.  r=tree-decorator

---
 js/src/GlobalObject.cpp                      | 204 -------------------
 js/src/GlobalObject.h                        | 160 ---------------
 js/src/Makefile.in                           |   2 -
 js/src/jsapi.cpp                             | 131 +++++++++++-
 js/src/jsapi.h                               |  14 +-
 js/src/jscntxtinlines.h                      |   4 +-
 js/src/jsfun.cpp                             |   7 +-
 js/src/jsinterp.cpp                          |   5 +-
 js/src/jsobj.cpp                             |  32 ++-
 js/src/jsobj.h                               |   5 +-
 js/src/jsobjinlines.h                        |   1 -
 js/src/jsregexp.h                            |   2 +-
 js/src/jsregexpinlines.h                     |   6 +-
 js/src/jsxml.cpp                             |  19 +-
 js/src/jsxml.h                               |   3 +
 js/src/xpconnect/wrappers/WrapperFactory.cpp |   7 +-
 16 files changed, 188 insertions(+), 414 deletions(-)
 delete mode 100644 js/src/GlobalObject.cpp
 delete mode 100644 js/src/GlobalObject.h

diff --git a/js/src/GlobalObject.cpp b/js/src/GlobalObject.cpp
deleted file mode 100644
index b137179b04b1..000000000000
--- a/js/src/GlobalObject.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SpiderMonkey global object code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jeff Walden <jwalden+code@mit.edu> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "GlobalObject.h"
-
-#include "jscntxt.h"
-#include "jsexn.h"
-#include "json.h"
-
-#include "jsobjinlines.h"
-#include "jsregexpinlines.h"
-
-using namespace js;
-
-JSObject *
-js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
-{
-    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
-
-    /* If cx has no global object, use obj so prototypes can be found. */
-    if (!cx->globalObject)
-        JS_SetGlobalObject(cx, obj);
-
-    /* Record Function and Object in cx->resolvingList. */
-    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
-    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
-    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
-
-    /* Initialize the function class first so constructors can be made. */
-    JSObject *fun_proto;
-    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
-        return NULL;
-    if (!fun_proto) {
-        fun_proto = js_InitFunctionClass(cx, obj);
-        if (!fun_proto)
-            return NULL;
-    } else {
-        JSObject *ctor = JS_GetConstructor(cx, fun_proto);
-        if (!ctor)
-            return NULL;
-        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
-                                 ObjectValue(*ctor), 0, 0, 0)) {
-            return NULL;
-        }
-    }
-
-    /* Initialize the object class next so Object.prototype works. */
-    JSObject *obj_proto;
-    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
-        return NULL;
-    if (!obj_proto)
-        obj_proto = js_InitObjectClass(cx, obj);
-    if (!obj_proto)
-        return NULL;
-
-    /* Function.prototype and the global object delegate to Object.prototype. */
-    fun_proto->setProto(obj_proto);
-    if (!obj->getProto())
-        obj->setProto(obj_proto);
-
-    return fun_proto;
-}
-
-namespace js {
-
-GlobalObject *
-GlobalObject::create(JSContext *cx, Class *clasp)
-{
-    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
-
-    JSObject *obj = NewNonFunction<WithProto::Given>(cx, clasp, NULL, NULL);
-    if (!obj)
-        return NULL;
-
-    GlobalObject *globalObj = obj->asGlobal();
-
-    globalObj->syncSpecialEquality();
-
-    /* Construct a regexp statics object for this global object. */
-    JSObject *res = regexp_statics_construct(cx, globalObj);
-    if (!res)
-        return NULL;
-    globalObj->setSlot(REGEXP_STATICS, ObjectValue(*res));
-    globalObj->setFlags(0);
-    return globalObj;
-}
-
-bool
-GlobalObject::initStandardClasses(JSContext *cx)
-{
-    /* Native objects get their reserved slots from birth. */
-    JS_ASSERT(numSlots() >= JSSLOT_FREE(getClass()));
-
-    JSAtomState &state = cx->runtime->atomState;
-
-    /* Define a top-level property 'undefined' with the undefined value. */
-    if (!defineProperty(cx, ATOM_TO_JSID(state.typeAtoms[JSTYPE_VOID]), UndefinedValue(),
-                        PropertyStub, StrictPropertyStub, JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    if (!js_InitFunctionAndObjectClasses(cx, this))
-        return false;
-
-    /* Initialize the rest of the standard objects and functions. */
-    return js_InitArrayClass(cx, this) &&
-           js_InitBooleanClass(cx, this) &&
-           js_InitExceptionClasses(cx, this) &&
-           js_InitMathClass(cx, this) &&
-           js_InitNumberClass(cx, this) &&
-           js_InitJSONClass(cx, this) &&
-           js_InitRegExpClass(cx, this) &&
-           js_InitStringClass(cx, this) &&
-           js_InitTypedArrayClasses(cx, this) &&
-#if JS_HAS_XML_SUPPORT
-           js_InitXMLClasses(cx, this) &&
-#endif
-#if JS_HAS_GENERATORS
-           js_InitIteratorClasses(cx, this) &&
-#endif
-           js_InitDateClass(cx, this) &&
-           js_InitProxyClass(cx, this);
-}
-
-void
-GlobalObject::clear(JSContext *cx)
-{
-    /* This can return false but that doesn't mean it failed. */
-    unbrand(cx);
-
-    for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
-        setSlot(key, UndefinedValue());
-
-    /* Clear regexp statics. */
-    RegExpStatics::extractFrom(this)->clear();
-
-    /* Clear the CSP eval-is-allowed cache. */
-    setSlot(EVAL_ALLOWED, UndefinedValue());
-
-    /*
-     * Mark global as cleared. If we try to execute any compile-and-go
-     * scripts from here on, we will throw.
-     */
-    int32 flags = getSlot(FLAGS).toInt32();
-    flags |= FLAGS_CLEARED;
-    setSlot(FLAGS, Int32Value(flags));
-}
-
-bool
-GlobalObject::isEvalAllowed(JSContext *cx)
-{
-    Value &v = getSlotRef(EVAL_ALLOWED);
-    if (v.isUndefined()) {
-        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
-
-        /*
-         * If there are callbacks, make sure that the CSP callback is installed
-         * and that it permits eval(), then cache the result.
-         */
-        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
-                     callbacks->contentSecurityPolicyAllows(cx));
-    }
-    return !v.isFalse();
-}
-
-} // namespace js
diff --git a/js/src/GlobalObject.h b/js/src/GlobalObject.h
deleted file mode 100644
index 0d57bf6d654f..000000000000
--- a/js/src/GlobalObject.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SpiderMonkey global object code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jeff Walden <jwalden+code@mit.edu> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef GlobalObject_h___
-#define GlobalObject_h___
-
-#include "jsfun.h"
-
-extern JSObject *
-js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj);
-
-namespace js {
-
-/*
- * Global object slots are reserved as follows:
- *
- * [0, JSProto_LIMIT)
- *   Stores the original value of the constructor for the corresponding
- *   JSProtoKey.
- * [JSProto_LIMIT, 2 * JSProto_LIMIT)
- *   Stores the prototype, if any, for the constructor for the corresponding
- *   JSProtoKey offset from JSProto_LIMIT.
- * [2 * JSProto_LIMIT, 3 * JSProto_LIMIT)
- *   Stores the current value of the global property named for the JSProtoKey
- *   for the corresponding JSProtoKey offset from 2 * JSProto_LIMIT.
- * [3 * JSProto_LIMIT, RESERVED_SLOTS)
- *   Various one-off values: ES5 13.2.3's [[ThrowTypeError]], RegExp statics,
- *   the Namespace object for E4X's function::, the original eval for this
- *   global object (implementing |var eval = otherWindow.eval; eval(...)| as an
- *   indirect eval), a bit indicating whether this object has been cleared
- *   (see JS_ClearScope), and a cache for whether eval is allowed (per the
- *   global's Content Security Policy).
- *
- * The first two ranges are necessary to implement js::FindClassObject,
- * js::FindClassPrototype, and spec language speaking in terms of "the original
- * Array prototype object", or "as if by the expression new Array()" referring
- * to the original Array constructor.  The third range stores the (writable and
- * even deletable) Object, Array, &c. properties (although a slot won't be used
- * again if its property is deleted and readded).
- */
-class GlobalObject : public ::JSObject {
-    /*
-     * Count of slots to store built-in constructors, prototypes, and initial
-     * visible properties for the constructors.
-     */
-    static const uintN STANDARD_CLASS_SLOTS  = JSProto_LIMIT * 3;
-
-    /* One-off properties stored after slots for built-ins. */
-    static const uintN THROWTYPEERROR        = STANDARD_CLASS_SLOTS;
-    static const uintN REGEXP_STATICS        = THROWTYPEERROR + 1;
-    static const uintN FUNCTION_NS           = REGEXP_STATICS + 1;
-    static const uintN EVAL_ALLOWED          = FUNCTION_NS + 1;
-    static const uintN EVAL                  = EVAL_ALLOWED + 1;
-    static const uintN FLAGS                 = EVAL + 1;
-
-    /* Total reserved-slot count for global objects. */
-    static const uintN RESERVED_SLOTS = FLAGS + 1;
-
-    void staticAsserts() {
-        /*
-         * The slot count must be in the public API for JSCLASS_GLOBAL_FLAGS,
-         * and we aren't going to expose GlobalObject, so just assert that the
-         * two values are synchronized.
-         */
-        JS_STATIC_ASSERT(JSCLASS_GLOBAL_SLOT_COUNT == RESERVED_SLOTS);
-    }
-
-    static const int32 FLAGS_CLEARED = 0x1;
-
-    void setFlags(int32 flags) {
-        setSlot(FLAGS, Int32Value(flags));
-    }
-
-  public:
-    static GlobalObject *create(JSContext *cx, Class *clasp);
-
-    void setThrowTypeError(JSFunction *fun) {
-        Value &v = getSlotRef(THROWTYPEERROR);
-        JS_ASSERT(v.isUndefined());
-        v.setObject(*fun);
-    }
-
-    JSObject *getThrowTypeError() const {
-        return &getSlot(THROWTYPEERROR).toObject();
-    }
-
-    Value getRegExpStatics() const {
-        return getSlot(REGEXP_STATICS);
-    }
-
-    void clear(JSContext *cx);
-
-    bool isCleared() const {
-        return getSlot(FLAGS).toInt32() & FLAGS_CLEARED;
-    }
-
-    bool isEvalAllowed(JSContext *cx);
-
-    const Value &getOriginalEval() const {
-        return getSlot(EVAL);
-    }
-
-    void setOriginalEval(JSObject *evalobj) {
-        Value &v = getSlotRef(EVAL);
-        JS_ASSERT(v.isUndefined());
-        v.setObject(*evalobj);
-    }
-
-    bool getFunctionNamespace(JSContext *cx, Value *vp);
-
-    bool initStandardClasses(JSContext *cx);
-};
-
-} // namespace js
-
-js::GlobalObject *
-JSObject::asGlobal()
-{
-    JS_ASSERT(isGlobal());
-    return reinterpret_cast<js::GlobalObject *>(this);
-}
-
-#endif /* GlobalObject_h___ */
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 465e04a7dffb..a2d4b89a3f00 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -147,7 +147,6 @@ CPPSRCS		= \
 		jsgcmark.cpp \
 		jsgcchunk.cpp \
 		jsgcstats.cpp \
-		GlobalObject.cpp \
 		jshash.cpp \
 		jsinterp.cpp \
 		jsinvoke.cpp \
@@ -213,7 +212,6 @@ INSTALLED_HEADERS = \
 		jsgcchunk.h \
 		jsgcstats.h \
 		jscompartment.h \
-		GlobalObject.h \
 		jshash.h \
 		jsinterp.h \
 		jsinttypes.h \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9cca598433aa..eb08cf173ae4 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1523,6 +1523,56 @@ JS_SetGlobalObject(JSContext *cx, JSObject *obj)
         cx->resetCompartment();
 }
 
+JSObject *
+js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
+{
+    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
+    JSObject *fun_proto, *obj_proto;
+
+    /* If cx has no global object, use obj so prototypes can be found. */
+    if (!cx->globalObject)
+        JS_SetGlobalObject(cx, obj);
+
+    /* Record Function and Object in cx->resolvingList. */
+    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
+    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
+    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
+
+    /* Initialize the function class first so constructors can be made. */
+    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
+        return NULL;
+    if (!fun_proto) {
+        fun_proto = js_InitFunctionClass(cx, obj);
+        if (!fun_proto)
+            return NULL;
+    } else {
+        JSObject *ctor;
+
+        ctor = JS_GetConstructor(cx, fun_proto);
+        if (!ctor)
+            return NULL;
+        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
+                                 ObjectValue(*ctor), 0, 0, 0)) {
+            return NULL;
+        }
+    }
+
+    /* Initialize the object class next so Object.prototype works. */
+    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
+        return NULL;
+    if (!obj_proto)
+        obj_proto = js_InitObjectClass(cx, obj);
+    if (!obj_proto)
+        return NULL;
+
+    /* Function.prototype and the global object delegate to Object.prototype. */
+    fun_proto->setProto(obj_proto);
+    if (!obj->getProto())
+        obj->setProto(obj_proto);
+
+    return fun_proto;
+}
+
 JS_PUBLIC_API(JSBool)
 JS_InitStandardClasses(JSContext *cx, JSObject *obj)
 {
@@ -1538,7 +1588,36 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
         JS_SetGlobalObject(cx, obj);
     assertSameCompartment(cx, obj);
 
-    return obj->asGlobal()->initStandardClasses(cx);
+    /* Define a top-level property 'undefined' with the undefined value. */
+    JSAtom *atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
+    if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
+                             PropertyStub, StrictPropertyStub,
+                             JSPROP_PERMANENT | JSPROP_READONLY)) {
+        return JS_FALSE;
+    }
+
+    /* Function and Object require cooperative bootstrapping magic. */
+    if (!js_InitFunctionAndObjectClasses(cx, obj))
+        return JS_FALSE;
+
+    /* Initialize the rest of the standard objects and functions. */
+    return js_InitArrayClass(cx, obj) &&
+           js_InitBooleanClass(cx, obj) &&
+           js_InitExceptionClasses(cx, obj) &&
+           js_InitMathClass(cx, obj) &&
+           js_InitNumberClass(cx, obj) &&
+           js_InitJSONClass(cx, obj) &&
+           js_InitRegExpClass(cx, obj) &&
+           js_InitStringClass(cx, obj) &&
+           js_InitTypedArrayClasses(cx, obj) &&
+#if JS_HAS_XML_SUPPORT
+           js_InitXMLClasses(cx, obj) &&
+#endif
+#if JS_HAS_GENERATORS
+           js_InitIteratorClasses(cx, obj) &&
+#endif
+           js_InitDateClass(cx, obj) &&
+           js_InitProxyClass(cx, obj);
 }
 
 #define CLASP(name)                 (&js_##name##Class)
@@ -2999,8 +3078,22 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp)
 {
     JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
     CHECK_REQUEST(cx);
+    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
+    JSObject *obj = NewNonFunction<WithProto::Given>(cx, Valueify(clasp), NULL, NULL);
+    if (!obj)
+        return NULL;
 
-    return GlobalObject::create(cx, Valueify(clasp));
+    obj->syncSpecialEquality();
+
+    /* Construct a regexp statics object for this global object. */
+    JSObject *res = regexp_statics_construct(cx, obj);
+    if (!res ||
+        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_REGEXP_STATICS, ObjectValue(*res)) ||
+        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Int32Value(0))) {
+        return NULL;
+    }
+
+    return obj;
 }
 
 class AutoHoldCompartment {
@@ -3894,8 +3987,27 @@ JS_ClearScope(JSContext *cx, JSObject *obj)
         js_ClearNative(cx, obj);
 
     /* Clear cached class objects on the global object. */
-    if (obj->isGlobal())
-        obj->asGlobal()->clear(cx);
+    if (obj->isGlobal()) {
+        /* This can return false but that doesn't mean it failed. */
+        obj->unbrand(cx);
+
+        for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
+            JS_SetReservedSlot(cx, obj, key, JSVAL_VOID);
+
+        /* Clear regexp statics. */
+        RegExpStatics::extractFrom(obj)->clear();
+
+        /* Clear the CSP eval-is-allowed cache. */
+        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL_ALLOWED, JSVAL_VOID);
+
+        /*
+         * Mark global as cleared. If we try to execute any compile-and-go
+         * scripts from here on, we will throw.
+         */
+        int32 flags = obj->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
+        flags |= JSGLOBAL_FLAGS_CLEARED;
+        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Jsvalify(Int32Value(flags)));
+    }
 
     js_InitRandom(cx);
 }
@@ -5786,7 +5898,7 @@ JS_NewRegExpObject(JSContext *cx, JSObject *obj, char *bytes, size_t length, uin
     jschar *chars = js_InflateString(cx, bytes, &length);
     if (!chars)
         return NULL;
-    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
+    RegExpStatics *res = RegExpStatics::extractFrom(obj);
     JSObject *reobj = RegExp::createObject(cx, res, chars, length, flags);
     cx->free_(chars);
     return reobj;
@@ -5796,7 +5908,7 @@ JS_PUBLIC_API(JSObject *)
 JS_NewUCRegExpObject(JSContext *cx, JSObject *obj, jschar *chars, size_t length, uintN flags)
 {
     CHECK_REQUEST(cx);
-    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
+    RegExpStatics *res = RegExpStatics::extractFrom(obj);
     return RegExp::createObject(cx, res, chars, length, flags);
 }
 
@@ -5806,7 +5918,7 @@ JS_SetRegExpInput(JSContext *cx, JSObject *obj, JSString *input, JSBool multilin
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, input);
 
-    RegExpStatics::extractFrom(obj->asGlobal())->reset(input, !!multiline);
+    RegExpStatics::extractFrom(obj)->reset(input, !!multiline);
 }
 
 JS_PUBLIC_API(void)
@@ -5815,7 +5927,7 @@ JS_ClearRegExpStatics(JSContext *cx, JSObject *obj)
     CHECK_REQUEST(cx);
     JS_ASSERT(obj);
 
-    RegExpStatics::extractFrom(obj->asGlobal())->clear();
+    RegExpStatics::extractFrom(obj)->clear();
 }
 
 JS_PUBLIC_API(JSBool)
@@ -5832,8 +5944,7 @@ JS_ExecuteRegExp(JSContext *cx, JSObject *obj, JSObject *reobj, jschar *chars, s
     if (!str)
         return false;
 
-    return re->execute(cx, RegExpStatics::extractFrom(obj->asGlobal()), str, indexp, test,
-                       Valueify(rval));
+    return re->execute(cx, RegExpStatics::extractFrom(obj), str, indexp, test, Valueify(rval));
 }
 
 JS_PUBLIC_API(JSObject *)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index c15273c6f45c..c8ecf328a15c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2010,6 +2010,16 @@ struct JSClass {
 #define JSCLASS_FREEZE_PROTO            (1<<(JSCLASS_HIGH_FLAGS_SHIFT+5))
 #define JSCLASS_FREEZE_CTOR             (1<<(JSCLASS_HIGH_FLAGS_SHIFT+6))
 
+/* Additional global reserved slots, beyond those for standard prototypes. */
+#define JSRESERVED_GLOBAL_SLOTS_COUNT     7
+#define JSRESERVED_GLOBAL_THIS            (JSProto_LIMIT * 3)
+#define JSRESERVED_GLOBAL_THROWTYPEERROR  (JSRESERVED_GLOBAL_THIS + 1)
+#define JSRESERVED_GLOBAL_REGEXP_STATICS  (JSRESERVED_GLOBAL_THROWTYPEERROR + 1)
+#define JSRESERVED_GLOBAL_FUNCTION_NS     (JSRESERVED_GLOBAL_REGEXP_STATICS + 1)
+#define JSRESERVED_GLOBAL_EVAL_ALLOWED    (JSRESERVED_GLOBAL_FUNCTION_NS + 1)
+#define JSRESERVED_GLOBAL_EVAL            (JSRESERVED_GLOBAL_EVAL_ALLOWED + 1)
+#define JSRESERVED_GLOBAL_FLAGS           (JSRESERVED_GLOBAL_EVAL + 1)
+
 /* Global flags. */
 #define JSGLOBAL_FLAGS_CLEARED          0x1
 
@@ -2024,9 +2034,9 @@ struct JSClass {
  * with the following flags. Failure to use JSCLASS_GLOBAL_FLAGS was
  * prevously allowed, but is now an ES5 violation and thus unsupported.
  */
-#define JSCLASS_GLOBAL_SLOT_COUNT      (JSProto_LIMIT * 3 + 6)
 #define JSCLASS_GLOBAL_FLAGS                                                  \
-    (JSCLASS_IS_GLOBAL | JSCLASS_HAS_RESERVED_SLOTS(JSCLASS_GLOBAL_SLOT_COUNT))
+    (JSCLASS_IS_GLOBAL |                                                      \
+     JSCLASS_HAS_RESERVED_SLOTS(JSRESERVED_GLOBAL_THIS + JSRESERVED_GLOBAL_SLOTS_COUNT))
 
 /* Fast access to the original value of each standard class's prototype. */
 #define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 8)
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 8c2a57a4fe74..875cce0afa2d 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -51,7 +51,7 @@
 
 namespace js {
 
-static inline GlobalObject *
+static inline JSObject *
 GetGlobalForScopeChain(JSContext *cx)
 {
     /*
@@ -73,7 +73,7 @@ GetGlobalForScopeChain(JSContext *cx)
         return NULL;
     }
     OBJ_TO_INNER_OBJECT(cx, scope);
-    return scope->asGlobal();
+    return scope;
 }
 
 }
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index f155cc32581f..393b8d606268 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -98,7 +98,7 @@ using namespace js::gc;
 inline JSObject *
 JSObject::getThrowTypeError() const
 {
-    return getGlobal()->getThrowTypeError();
+    return &getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_THROWTYPEERROR).toObject();
 }
 
 JSBool
@@ -2693,13 +2693,14 @@ js_InitFunctionClass(JSContext *cx, JSObject *obj)
 
     if (obj->isGlobal()) {
         /* ES5 13.2.3: Construct the unique [[ThrowTypeError]] function object. */
-        JSFunction *throwTypeError =
+        JSObject *throwTypeError =
             js_NewFunction(cx, NULL, reinterpret_cast<Native>(ThrowTypeError), 0,
                            0, obj, NULL);
         if (!throwTypeError)
             return NULL;
 
-        obj->asGlobal()->setThrowTypeError(throwTypeError);
+        JS_ALWAYS_TRUE(js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_THROWTYPEERROR,
+                                          ObjectValue(*throwTypeError)));
     }
 
     return proto;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 6674e4a42583..52c68e5bfd0c 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -614,7 +614,8 @@ RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp)
 
     /* FIXME: Once bug 470510 is fixed, make this an assert. */
     if (script->compileAndGo) {
-        if (fp->scopeChain().getGlobal()->isCleared()) {
+        int32 flags = fp->scopeChain().getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
+        if (flags & JSGLOBAL_FLAGS_CLEARED) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CLEARED_SCOPE);
             return false;
         }
@@ -6470,7 +6471,7 @@ END_CASE(JSOP_XMLPI)
 BEGIN_CASE(JSOP_GETFUNNS)
 {
     Value rval;
-    if (!cx->fp()->scopeChain().getGlobal()->getFunctionNamespace(cx, &rval))
+    if (!js_GetFunctionNamespace(cx, &rval))
         goto error;
     PUSH_COPY(rval);
 }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 91ad0ee2a74e..ee8a9ce94db8 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -922,7 +922,22 @@ obj_valueOf(JSContext *cx, uintN argc, Value *vp)
 JSBool
 js_CheckContentSecurityPolicy(JSContext *cx, JSObject *scopeobj)
 {
-    return scopeobj->getGlobal()->isEvalAllowed(cx);
+    // CSP is static per document, so if our check said yes before, that
+    // answer is still valid.
+    JSObject *global = scopeobj->getGlobal();
+    Value v = global->getReservedSlot(JSRESERVED_GLOBAL_EVAL_ALLOWED);
+    if (v.isUndefined()) {
+        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
+
+        // if there are callbacks, make sure that the CSP callback is installed and
+        // that it permits eval().
+        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
+                     callbacks->contentSecurityPolicyAllows(cx));
+
+        // update the cache in the global object for the result of the security check
+        js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_EVAL_ALLOWED, v);
+    }
+    return !v.isFalse();
 }
 
 /* We should be able to assert this for *any* fp->scopeChain(). */
@@ -1304,7 +1319,9 @@ DirectEval(JSContext *cx, const CallArgs &call)
 bool
 IsBuiltinEvalForScope(JSObject *scopeChain, const Value &v)
 {
-    return scopeChain->getGlobal()->getOriginalEval() == v;
+    JSObject *global = scopeChain->getGlobal();
+    JS_ASSERT((global->getClass()->flags & JSCLASS_GLOBAL_FLAGS) == JSCLASS_GLOBAL_FLAGS);
+    return global->getReservedSlot(JSRESERVED_GLOBAL_EVAL) == v;
 }
 
 bool
@@ -3779,8 +3796,10 @@ js_InitObjectClass(JSContext *cx, JSObject *obj)
     JSObject *evalobj = js_DefineFunction(cx, obj, id, eval, 1, JSFUN_STUB_GSOPS);
     if (!evalobj)
         return NULL;
-    if (obj->isGlobal())
-        obj->asGlobal()->setOriginalEval(evalobj);
+    if (obj->isGlobal()) {
+        if (!js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL, ObjectValue(*evalobj)))
+            return NULL;
+    }
 
     return proto;
 }
@@ -6541,13 +6560,14 @@ js_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 slot, const Value &v)
     return true;
 }
 
-GlobalObject *
+JSObject *
 JSObject::getGlobal() const
 {
     JSObject *obj = const_cast<JSObject *>(this);
     while (JSObject *parent = obj->getParent())
         obj = parent;
-    return obj->asGlobal();
+    JS_ASSERT(obj->isGlobal());
+    return obj;
 }
 
 JSBool
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 6ea319198ed5..95853e7754e9 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -261,7 +261,6 @@ namespace js {
 
 struct NativeIterator;
 class RegExp;
-class GlobalObject;
 
 }
 
@@ -699,14 +698,12 @@ struct JSObject : js::gc::Cell {
         parent = newParent;
     }
 
-    JS_FRIEND_API(js::GlobalObject *) getGlobal() const;
+    JS_FRIEND_API(JSObject *) getGlobal() const;
 
     bool isGlobal() const {
         return !!(getClass()->flags & JSCLASS_IS_GLOBAL);
     }
 
-    inline js::GlobalObject *asGlobal();
-
     void *getPrivate() const {
         JS_ASSERT(getClass()->flags & JSCLASS_HAS_PRIVATE);
         return privateData;
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 7b70d47cf58d..bbe90784fb7c 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -58,7 +58,6 @@
 /* Headers included for inline implementations used by this header. */
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "GlobalObject.h"
 #include "jsnum.h"
 #include "jsscriptinlines.h"
 #include "jsstr.h"
diff --git a/js/src/jsregexp.h b/js/src/jsregexp.h
index 429cbd5df4c4..0168c2882b96 100644
--- a/js/src/jsregexp.h
+++ b/js/src/jsregexp.h
@@ -167,7 +167,7 @@ class RegExpStatics
   public:
     RegExpStatics() : bufferLink(NULL), copied(false) { clear(); }
 
-    static RegExpStatics *extractFrom(GlobalObject *globalObj);
+    static RegExpStatics *extractFrom(JSObject *global);
 
     /* Mutators. */
 
diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index fdd182f80c62..38517563be8f 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -65,7 +65,7 @@ namespace js {
 extern Class regexp_statics_class;
 
 static inline JSObject *
-regexp_statics_construct(JSContext *cx, GlobalObject *parent)
+regexp_statics_construct(JSContext *cx, JSObject *parent)
 {
     JSObject *obj = NewObject<WithProto::Given>(cx, &regexp_statics_class, NULL, parent);
     if (!obj)
@@ -593,9 +593,9 @@ RegExp::extractFrom(JSObject *obj)
 /* RegExpStatics inlines. */
 
 inline RegExpStatics *
-RegExpStatics::extractFrom(js::GlobalObject *globalObj)
+RegExpStatics::extractFrom(JSObject *global)
 {
-    Value resVal = globalObj->getRegExpStatics();
+    Value resVal = global->getReservedSlot(JSRESERVED_GLOBAL_REGEXP_STATICS);
     RegExpStatics *res = static_cast<RegExpStatics *>(resVal.toObject().getPrivate());
     return res;
 }
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index f806a6460812..c7726f9a2b16 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -7216,13 +7216,13 @@ js_InitXMLClasses(JSContext *cx, JSObject *obj)
     return js_InitXMLClass(cx, obj);
 }
 
-namespace js {
-
-bool
-GlobalObject::getFunctionNamespace(JSContext *cx, Value *vp)
+JSBool
+js_GetFunctionNamespace(JSContext *cx, Value *vp)
 {
-    Value &v = getSlotRef(FUNCTION_NS);
-    if (v.isUndefined()) {
+    JSObject *global = cx->hasfp() ? cx->fp()->scopeChain().getGlobal() : cx->globalObject;
+
+    *vp = global->getReservedSlot(JSRESERVED_GLOBAL_FUNCTION_NS);
+    if (vp->isUndefined()) {
         JSRuntime *rt = cx->runtime;
         JSLinearString *prefix = rt->atomState.typeAtoms[JSTYPE_FUNCTION];
         JSLinearString *uri = rt->atomState.functionNamespaceURIAtom;
@@ -7239,15 +7239,14 @@ GlobalObject::getFunctionNamespace(JSContext *cx, Value *vp)
          */
         obj->clearProto();
 
-        v.setObject(*obj);
+        vp->setObject(*obj);
+        if (!js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_FUNCTION_NS, *vp))
+            return false;
     }
 
-    *vp = v;
     return true;
 }
 
-} // namespace js
-
 /*
  * Note the asymmetry between js_GetDefaultXMLNamespace and js_SetDefaultXML-
  * Namespace.  Get searches fp->scopeChain for JS_DEFAULT_XML_NAMESPACE_ID,
diff --git a/js/src/jsxml.h b/js/src/jsxml.h
index 5fef407bfe4e..566ec5daaf39 100644
--- a/js/src/jsxml.h
+++ b/js/src/jsxml.h
@@ -279,6 +279,9 @@ js_InitXMLClass(JSContext *cx, JSObject *obj);
 extern JSObject *
 js_InitXMLClasses(JSContext *cx, JSObject *obj);
 
+extern JSBool
+js_GetFunctionNamespace(JSContext *cx, js::Value *vp);
+
 /*
  * If obj is QName corresponding to function::name, set *funidp to name's id,
  * otherwise set *funidp to void.
diff --git a/js/src/xpconnect/wrappers/WrapperFactory.cpp b/js/src/xpconnect/wrappers/WrapperFactory.cpp
index f081abe7bc2b..29c50bf234f7 100644
--- a/js/src/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/src/xpconnect/wrappers/WrapperFactory.cpp
@@ -113,8 +113,7 @@ WrapperFactory::WaiveXray(JSContext *cx, JSObject *obj)
             JSAutoEnterCompartment ac;
             if (!ac.enter(cx, obj))
                 return nsnull;
-            wobj = JSWrapper::New(cx, obj, proto, JS_GetGlobalForObject(cx, obj),
-                                  &WaiveXrayWrapperWrapper);
+            wobj = JSWrapper::New(cx, obj, proto, obj->getGlobal(), &WaiveXrayWrapperWrapper);
             if (!wobj)
                 return nsnull;
 
@@ -254,7 +253,7 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
     JSWrapper *wrapper;
     CompartmentPrivate *targetdata = static_cast<CompartmentPrivate *>(target->data);
     if (AccessCheck::isChrome(target)) {
-        if (AccessCheck::isChrome(origin) || JS_GetGlobalForObject(cx, obj)->isSystem()) {
+        if (AccessCheck::isChrome(origin) || obj->getGlobal()->isSystem()) {
             wrapper = &JSCrossCompartmentWrapper::singleton;
         } else if (flags & WAIVE_XRAY_WRAPPER_FLAG) {
             // If we waived the X-ray wrapper for this object, wrap it into a
@@ -382,7 +381,7 @@ JSObject *
 WrapperFactory::WrapSOWObject(JSContext *cx, JSObject *obj)
 {
     JSObject *wrapperObj =
-        JSWrapper::New(cx, obj, obj->getProto(), JS_GetGlobalForObject(cx, obj),
+        JSWrapper::New(cx, obj, obj->getProto(), obj->getGlobal(),
                        &FilteringWrapper<JSWrapper,
                                          OnlyIfSubjectIsSystem>::singleton);
     return wrapperObj;

From 0888f09b1598b99648284eb8b318a0606d12df84 Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Thu, 21 Apr 2011 13:44:29 -0700
Subject: [PATCH 456/509] Bug 651915 - Fix MarkStack size. r=billm

---
 js/src/jscntxt.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index ae0a0d8c0f23..66245eb61b02 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1069,9 +1069,9 @@ struct JSRuntime {
     JSObject           *gcWeakMapList;
 
     /* Pre-allocated space for the GC mark stacks. Pointer type ensures alignment. */
-    void                *gcMarkStackObjs[js::OBJECT_MARK_STACK_SIZE];
-    void                *gcMarkStackXMLs[js::XML_MARK_STACK_SIZE];
-    void                *gcMarkStackLarges[js::LARGE_MARK_STACK_SIZE];
+    void                *gcMarkStackObjs[js::OBJECT_MARK_STACK_SIZE / sizeof(void *)];
+    void                *gcMarkStackXMLs[js::XML_MARK_STACK_SIZE / sizeof(void *)];
+    void                *gcMarkStackLarges[js::LARGE_MARK_STACK_SIZE / sizeof(void *)];
 
     /*
      * Compartment that triggered GC. If more than one Compatment need GC,

From 80a3a71ea829d5efbf2f2931abc801846e258d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= <none@none>
Date: Fri, 22 Apr 2011 01:23:35 +0200
Subject: [PATCH 457/509] Bug 631928 - Check for libffi_cv_as_x86_pcrel should
 not look for just "warning". r=ted

---
 js/src/ctypes/libffi.patch        | 120 ++++++++++++++++++++++++------
 js/src/ctypes/libffi/configure    |   6 +-
 js/src/ctypes/libffi/configure.ac |   6 +-
 3 files changed, 102 insertions(+), 30 deletions(-)

diff --git a/js/src/ctypes/libffi.patch b/js/src/ctypes/libffi.patch
index 6d29b58b67ec..12344eba191c 100644
--- a/js/src/ctypes/libffi.patch
+++ b/js/src/ctypes/libffi.patch
@@ -1,9 +1,10 @@
-Patch libffi to fix bug 550602, bug 538216, bug545634, bug 594611, and bug 605421.
+Patch libffi to fix bug 550602, bug 538216, bug545634, bug 594611, bug 605421
+and bug 631928.
 
 diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
 --- a/js/src/ctypes/libffi/Makefile.in
 +++ b/js/src/ctypes/libffi/Makefile.in
-@@ -192,17 +192,17 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+@@ -199,17 +199,17 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  CCLD = $(CC)
  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -22,7 +23,12 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  TEXINFOS = doc/libffi.texi
  TEXI2DVI = texi2dvi
  TEXI2PDF = $(TEXI2DVI) --pdf --batch
-@@ -966,7 +966,7 @@ distclean-compile:
+@@ -986,57 +986,57 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi64.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/freebsd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/sysv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/unix64.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/win32.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/win64.Plo@am__quote@
  
@@ -31,7 +37,7 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCCAS_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
  @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@@ -974,7 +974,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ $<
  
@@ -40,7 +46,7 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCCAS_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
  @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
  @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@@ -982,7 +982,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
@@ -49,7 +55,7 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCCAS_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
  @am__fastdepCCAS_TRUE@	$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  @am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@@ -990,7 +990,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCCAS_FALSE@	$(LTCPPASCOMPILE) -c -o $@ $<
  
@@ -58,7 +64,7 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@@ -998,7 +998,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
  
@@ -67,7 +73,7 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
  @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@@ -1006,7 +1006,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
@@ -76,7 +82,17 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
  @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@@ -1108,7 +1108,7 @@ mostlyclean-vti:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+@@ -1129,17 +1129,17 @@ $(srcdir)/doc/stamp-vti: doc/libffi.texi $(top_srcdir)/configure
+ 	-@rm -f vti.tmp
+ 	@cp $(srcdir)/doc/version.texi $@
+ 
+ mostlyclean-vti:
+ 	-rm -f vti.tmp
  
  maintainer-clean-vti:
  @MAINTAINER_MODE_TRUE@	-rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
@@ -85,10 +101,15 @@ diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
  	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
  	$(DVIPS) -o $@ $<
  
+ uninstall-dvi-am:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+ 	for p in $$list; do \
+ 	  $(am__strip_dir) \
 diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
 --- a/js/src/ctypes/libffi/configure
 +++ b/js/src/ctypes/libffi/configure
-@@ -9016,17 +9016,17 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8903,17 +8903,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Tell ltmain to make .dll files, not .so files.
        shrext_cmds=".dll"
        # FIXME: Setting linknames here is a bad hack.
@@ -107,7 +128,30 @@ diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
  
    archive_cmds_need_lc=no
    hardcode_direct=no
-
+@@ -12270,20 +12270,20 @@ fi
+ 
+ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports pc related relocs" >&5
+ $as_echo_n "checking assembler supports pc related relocs... " >&6; }
+ if test "${libffi_cv_as_x86_pcrel+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	libffi_cv_as_x86_pcrel=yes
++	libffi_cv_as_x86_pcrel=no
+ 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
+-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
+-	    libffi_cv_as_x86_pcrel=no
++	if $CC $CFLAGS -c conftest.s > /dev/null; then
++	    libffi_cv_as_x86_pcrel=yes
+ 	fi
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_x86_pcrel" >&5
+ $as_echo "$libffi_cv_as_x86_pcrel" >&6; }
+     if test "x$libffi_cv_as_x86_pcrel" = xyes; then
+ 
+ $as_echo "#define HAVE_AS_X86_PCREL 1" >>confdefs.h
 diff --git a/js/src/ctypes/libffi/src/x86/ffi64.c b/js/src/ctypes/libffi/src/x86/ffi64.c
 --- a/js/src/ctypes/libffi/src/x86/ffi64.c
 +++ b/js/src/ctypes/libffi/src/x86/ffi64.c
@@ -155,14 +199,14 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
  
  #include <stdlib.h>
  
+-/* ffi_prep_args is called by the assembly routine once stack space
+-   has been allocated for the function's arguments */
 +/* Forward declares. */
 +static int vfp_type_p (ffi_type *);
 +static void layout_vfp_args (ffi_cif *);
-+
- /* ffi_prep_args is called by the assembly routine once stack space
--   has been allocated for the function's arguments */
--
+ 
 -void ffi_prep_args(char *stack, extended_cif *ecif)
++/* ffi_prep_args is called by the assembly routine once stack space
 +   has been allocated for the function's arguments
 +   
 +   The vfp_space parameter is the load area for VFP regs, the return
@@ -181,7 +225,7 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
  
    if ( ecif->cif->flags == FFI_TYPE_STRUCT ) {
      *(void **) argp = ecif->rvalue;
-@@ -49,16 +57,31 @@ void ffi_prep_args(char *stack, extended
+@@ -49,16 +57,31 @@ void ffi_prep_args(char *stack, extended_cif *ecif)
    p_argv = ecif->avalue;
  
    for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
@@ -213,7 +257,7 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
        if ((*p_arg)->type == FFI_TYPE_STRUCT)
  	argp = (char *) ALIGN(argp, 4);
  
-@@ -98,23 +121,25 @@ void ffi_prep_args(char *stack, extended
+@@ -98,23 +121,25 @@ void ffi_prep_args(char *stack, extended_cif *ecif)
  	    }
  	  else
  	    {
@@ -241,7 +285,7 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
    /* Set the return type flag */
    switch (cif->rtype->type)
      {
-@@ -125,137 +150,176 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+@@ -125,137 +150,176 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
        break;
  
      case FFI_TYPE_SINT64:
@@ -410,6 +454,8 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
    for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++)
      {
        size_t z;
+-
+-      size_t alignment = (*p_arg)->alignment;
 +      size_t alignment;
 +  
 +      if (cif->abi == FFI_VFP
@@ -418,8 +464,7 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
 +	  *p_argv++ = (void*)(vfp_stack + cif->vfp_args[vi++]);
 +	  continue;
 +	}
- 
--      size_t alignment = (*p_arg)->alignment;
++
 +      alignment = (*p_arg)->alignment;
        if (alignment < 4)
  	alignment = 4;
@@ -429,7 +474,7 @@ diff --git a/js/src/ctypes/libffi/src/arm/ffi.c b/js/src/ctypes/libffi/src/arm/f
        }
  
        z = (*p_arg)->size;
-@@ -290,20 +354,147 @@ ffi_prep_incoming_args_SYSV(char *stack,
+@@ -290,20 +354,147 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
  
  ffi_status
  ffi_prep_closure_loc (ffi_closure* closure,
@@ -983,9 +1028,9 @@ diff --git a/js/src/ctypes/libffi/testsuite/libffi.call/cls_longdouble_va.c b/js
  {
  	char*		format	= *(char**)args[0];
  	long double	ldValue	= *(long double*)args[1];
-diff -r bb9089ae2322 js/src/ctypes/libffi/include/ffi.h.in
---- a/js/src/ctypes/libffi/include/ffi.h.in	Fri Jan 21 15:40:14 2011 -0800
-+++ b/js/src/ctypes/libffi/include/ffi.h.in	Thu Jan 27 19:10:51 2011 +0100
+diff --git a/js/src/ctypes/libffi/include/ffi.h.in b/js/src/ctypes/libffi/include/ffi.h.in
+--- a/js/src/ctypes/libffi/include/ffi.h.in
++++ b/js/src/ctypes/libffi/include/ffi.h.in
 @@ -72,25 +72,37 @@ extern "C" {
  #endif
  
@@ -1074,3 +1119,30 @@ diff -r bb9089ae2322 js/src/ctypes/libffi/include/ffi.h.in
  #  define FFI_SIZEOF_JAVA_RAW FFI_SIZEOF_ARG
  #endif
  
+diff --git a/js/src/ctypes/libffi/configure.ac b/js/src/ctypes/libffi/configure.ac
+--- a/js/src/ctypes/libffi/configure.ac
++++ b/js/src/ctypes/libffi/configure.ac
+@@ -272,20 +272,20 @@ if test x$TARGET = xSPARC; then
+        AC_DEFINE(HAVE_AS_REGISTER_PSEUDO_OP, 1,
+ 	       [Define if your assembler supports .register.])
+     fi
+ fi
+ 
+ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
+     AC_CACHE_CHECK([assembler supports pc related relocs],
+ 	libffi_cv_as_x86_pcrel, [
+-	libffi_cv_as_x86_pcrel=yes
++	libffi_cv_as_x86_pcrel=no
+ 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
+-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
+-	    libffi_cv_as_x86_pcrel=no
++	if $CC $CFLAGS -c conftest.s > /dev/null; then
++	    libffi_cv_as_x86_pcrel=yes
+ 	fi
+ 	])
+     if test "x$libffi_cv_as_x86_pcrel" = xyes; then
+ 	AC_DEFINE(HAVE_AS_X86_PCREL, 1,
+ 		  [Define if your assembler supports PC relative relocs.])
+     fi
+ 
+     AC_CACHE_CHECK([assembler .ascii pseudo-op support],
diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
index 67ccf207b34c..93ba5843fd35 100755
--- a/js/src/ctypes/libffi/configure
+++ b/js/src/ctypes/libffi/configure
@@ -12275,10 +12275,10 @@ if test "${libffi_cv_as_x86_pcrel+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-	libffi_cv_as_x86_pcrel=yes
+	libffi_cv_as_x86_pcrel=no
 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-	    libffi_cv_as_x86_pcrel=no
+	if $CC $CFLAGS -c conftest.s > /dev/null; then
+	    libffi_cv_as_x86_pcrel=yes
 	fi
 
 fi
diff --git a/js/src/ctypes/libffi/configure.ac b/js/src/ctypes/libffi/configure.ac
index 50f24bcdf493..e85cff10cdcc 100644
--- a/js/src/ctypes/libffi/configure.ac
+++ b/js/src/ctypes/libffi/configure.ac
@@ -277,10 +277,10 @@ fi
 if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
     AC_CACHE_CHECK([assembler supports pc related relocs],
 	libffi_cv_as_x86_pcrel, [
-	libffi_cv_as_x86_pcrel=yes
+	libffi_cv_as_x86_pcrel=no
 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-	if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-	    libffi_cv_as_x86_pcrel=no
+	if $CC $CFLAGS -c conftest.s > /dev/null; then
+	    libffi_cv_as_x86_pcrel=yes
 	fi
 	])
     if test "x$libffi_cv_as_x86_pcrel" = xyes; then

From 49d36fefbe58d39424b1c3cdfc5578f4a2cb9412 Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Fri, 22 Apr 2011 07:29:22 -0700
Subject: [PATCH 458/509] Bug 647482 (followup): Re-enable jstests in |make
 check| (r=dmandelin)

---
 js/src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index a2d4b89a3f00..9ee700c87a58 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -674,7 +674,7 @@ check-jstests:
 
 
 check:: check-jit-test
-#check:: check-jstests
+check:: check-jstests
 check-valgrind:: check-jit-test-valgrind
 
 DIST_GARBAGE = config.cache config.log config.status \

From 9ba16fd0fdee9d4d8f2fd41f372f8a1f855e1e1f Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Fri, 22 Apr 2011 07:29:59 -0700
Subject: [PATCH 459/509] Minor usage-string typo fix. No bug, no review.

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

diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 5de88ed47cca..6bfffbb8b8e7 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -627,7 +627,7 @@ usage(void)
                       "                Default is %u.\n", DEFAULT_MAX_STACK_SIZE);
 #ifdef DEBUG
     fprintf(gErrFile, "  -A <max>      After <max> memory allocations, act like we're OOM.\n");
-    fprintf(gErrFile, "  -O <max>      At exit, print the number of memory allocations in \n"
+    fprintf(gErrFile, "  -O            At exit, print the number of memory allocations in \n"
                       "                the program.\n");
 #endif
 #ifdef JS_THREADSAFE

From a9ca7cf9785fb0cd697d28c7bea4e22eb4f15231 Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Fri, 22 Apr 2011 11:40:55 -0700
Subject: [PATCH 460/509] Backed out changeset d851d44ad77a

---
 js/src/assembler/assembler/ARMAssembler.h     |    5 -
 js/src/assembler/assembler/ARMv7Assembler.h   |    5 -
 .../assembler/AbstractMacroAssembler.h        |    5 -
 js/src/assembler/assembler/CodeLocation.h     |   16 +-
 js/src/assembler/assembler/LinkBuffer.h       |    5 -
 js/src/assembler/assembler/X86Assembler.h     |    5 -
 js/src/jscompartment.cpp                      |    4 +-
 js/src/methodjit/BaseAssembler.h              |   39 +-
 js/src/methodjit/Compiler.cpp                 |  662 ++++++---
 js/src/methodjit/Compiler.h                   |   65 +-
 js/src/methodjit/FrameState.cpp               |   13 -
 js/src/methodjit/FrameState.h                 |    5 -
 js/src/methodjit/InlineFrameAssembler.h       |  157 +++
 js/src/methodjit/InvokeHelpers.cpp            |  163 ++-
 js/src/methodjit/MethodJIT.cpp                |   35 +-
 js/src/methodjit/MethodJIT.h                  |   24 +-
 js/src/methodjit/MonoIC.cpp                   | 1202 ++++++++---------
 js/src/methodjit/MonoIC.h                     |  137 +-
 js/src/methodjit/PolyIC.h                     |    6 +
 js/src/methodjit/StubCalls-inl.h              |   17 -
 js/src/methodjit/StubCalls.h                  |   37 +
 js/src/methodjit/StubCompiler.cpp             |   27 -
 js/src/methodjit/StubCompiler.h               |    2 -
 23 files changed, 1553 insertions(+), 1083 deletions(-)
 create mode 100644 js/src/methodjit/InlineFrameAssembler.h

diff --git a/js/src/assembler/assembler/ARMAssembler.h b/js/src/assembler/assembler/ARMAssembler.h
index 7643f41b7eda..d45a1e41043f 100644
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -1114,11 +1114,6 @@ namespace JSC {
             return true;
         }
 
-        static bool canLinkJump(void* code, JmpSrc where, void* value)
-        {
-            return true;
-        }
-
         static void linkCall(void* code, JmpSrc from, void* to)
         {
             js::JaegerSpew(js::JSpew_Insns,
diff --git a/js/src/assembler/assembler/ARMv7Assembler.h b/js/src/assembler/assembler/ARMv7Assembler.h
index e00de0117ebd..e1478ba2c91d 100644
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -1633,11 +1633,6 @@ public:
     {
         return true;
     }
-
-    static bool canLinkJump(void* code, JmpSrc where, void* value)
-    {
-        return true;
-    }
     
     static void relinkCall(void* from, void* to)
     {
diff --git a/js/src/assembler/assembler/AbstractMacroAssembler.h b/js/src/assembler/assembler/AbstractMacroAssembler.h
index 7cd15efd3196..260380acd307 100644
--- a/js/src/assembler/assembler/AbstractMacroAssembler.h
+++ b/js/src/assembler/assembler/AbstractMacroAssembler.h
@@ -579,11 +579,6 @@ protected:
         return AssemblerType::canRelinkJump(jump.dataLocation(), destination.dataLocation());
     }
 
-    static bool canPatchJump(void *code, Jump jump, CodeLocationLabel target)
-    {
-        return AssemblerType::canLinkJump(code, jump.m_jmp, target.dataLocation());
-    }
-
     static void repatchNearCall(CodeLocationNearCall nearCall, CodeLocationLabel destination)
     {
         AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress());
diff --git a/js/src/assembler/assembler/CodeLocation.h b/js/src/assembler/assembler/CodeLocation.h
index 56e7259559ba..490157688614 100644
--- a/js/src/assembler/assembler/CodeLocation.h
+++ b/js/src/assembler/assembler/CodeLocation.h
@@ -59,11 +59,11 @@ class CodeLocationDataLabelPtr;
 class CodeLocationCommon : public MacroAssemblerCodePtr {
 public:
     CodeLocationInstruction instructionAtOffset(int offset);
-    CodeLocationLabel labelAtOffset(int offset) const;
-    CodeLocationJump jumpAtOffset(int offset) const;
-    CodeLocationCall callAtOffset(int offset) const;
+    CodeLocationLabel labelAtOffset(int offset);
+    CodeLocationJump jumpAtOffset(int offset);
+    CodeLocationCall callAtOffset(int offset);
     CodeLocationNearCall nearCallAtOffset(int offset);
-    CodeLocationDataLabelPtr dataLabelPtrAtOffset(int offset) const;
+    CodeLocationDataLabelPtr dataLabelPtrAtOffset(int offset);
     CodeLocationDataLabel32 dataLabel32AtOffset(int offset);
 
 protected:
@@ -146,19 +146,19 @@ inline CodeLocationInstruction CodeLocationCommon::instructionAtOffset(int offse
     return CodeLocationInstruction(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationLabel CodeLocationCommon::labelAtOffset(int offset) const
+inline CodeLocationLabel CodeLocationCommon::labelAtOffset(int offset)
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationLabel(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationJump CodeLocationCommon::jumpAtOffset(int offset) const
+inline CodeLocationJump CodeLocationCommon::jumpAtOffset(int offset)
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationJump(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationCall CodeLocationCommon::callAtOffset(int offset) const
+inline CodeLocationCall CodeLocationCommon::callAtOffset(int offset)
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationCall(reinterpret_cast<char*>(dataLocation()) + offset);
@@ -170,7 +170,7 @@ inline CodeLocationNearCall CodeLocationCommon::nearCallAtOffset(int offset)
     return CodeLocationNearCall(reinterpret_cast<char*>(dataLocation()) + offset);
 }
 
-inline CodeLocationDataLabelPtr CodeLocationCommon::dataLabelPtrAtOffset(int offset) const
+inline CodeLocationDataLabelPtr CodeLocationCommon::dataLabelPtrAtOffset(int offset)
 {
     ASSERT_VALID_CODE_OFFSET(offset);
     return CodeLocationDataLabelPtr(reinterpret_cast<char*>(dataLocation()) + offset);
diff --git a/js/src/assembler/assembler/LinkBuffer.h b/js/src/assembler/assembler/LinkBuffer.h
index 65c39e106ece..eac984c8d466 100644
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -119,11 +119,6 @@ public:
             MacroAssembler::linkJump(code(), list.m_jumps[i], label);
     }
 
-    bool canLink(Jump jump, CodeLocationLabel label)
-    {
-        return MacroAssembler::canPatchJump(code(), jump, label);
-    }
-
     void patch(DataLabelPtr label, void* value)
     {
         MacroAssembler::linkPointer(code(), label.m_label, value);
diff --git a/js/src/assembler/assembler/X86Assembler.h b/js/src/assembler/assembler/X86Assembler.h
index d79a40afd1c5..fb12f78f478c 100644
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -2387,11 +2387,6 @@ public:
         intptr_t offset = reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(from);
         return (offset == static_cast<int32_t>(offset));
     }
-
-    static bool canLinkJump(void* code, JmpSrc where, void* value)
-    {
-        return canRelinkJump(reinterpret_cast<char*>(code) + where.m_offset, value);
-    }
     
     static void relinkCall(void* from, void* to)
     {
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 37d72a8e5512..f2a4e2e2bcad 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -512,8 +512,8 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
     for (JSCList *cursor = scripts.next; cursor != &scripts; cursor = cursor->next) {
         JSScript *script = reinterpret_cast<JSScript *>(cursor);
         if (script->hasJITCode()) {
+            mjit::ic::SweepCallICs(cx, script, discardScripts);
             if (discardScripts) {
-                mjit::ic::PurgeICs(cx, script);
                 if (script->jitNormal &&
                     ScriptPoolDestroyed(cx, script->jitNormal, releaseInterval, counter)) {
                     mjit::ReleaseScriptCode(cx, script);
@@ -523,8 +523,6 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
                     ScriptPoolDestroyed(cx, script->jitCtor, releaseInterval, counter)) {
                     mjit::ReleaseScriptCode(cx, script);
                 }
-            } else {
-                mjit::ic::SweepICs(cx, script);
             }
         }
     }
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index f89b0d24b764..400e373a932b 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -608,10 +608,8 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
 
         /* PC -> regs->pc :( */
-        if (pc) {
-            storePtr(ImmPtr(pc),
-                     FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc)));
-        }
+        storePtr(ImmPtr(pc),
+                 FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc)));
     }
 
     // An infallible VM call is a stub call (taking a VMFrame & and one
@@ -695,39 +693,6 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         return fails;
     }
 
-    //
-    // Class to assist with computing offsets into a frame being pushed from JIT code.
-    struct AdjustedFrame {
-        AdjustedFrame(uint32 baseOffset)
-         : baseOffset(baseOffset)
-        { }
-
-        uint32 baseOffset;
-
-        JSC::MacroAssembler::Address addrOf(uint32 offset) {
-            return JSC::MacroAssembler::Address(JSFrameReg, baseOffset + offset);
-        }
-    };
-
-    // Implements JSStackFrame::initCallFrameCallerHalf.
-    DataLabelPtr emitStaticFrame(bool isNew, uint32 frameDepth, void *returnAddress) {
-        AdjustedFrame newfp(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
-    
-        Address flagsAddr = newfp.addrOf(JSStackFrame::offsetOfFlags());
-        uint32 extraFlags = isNew ? JSFRAME_CONSTRUCTING : 0;
-        store32(Imm32(JSFRAME_FUNCTION | extraFlags), flagsAddr);
-    
-        Address prevAddr = newfp.addrOf(JSStackFrame::offsetOfPrev());
-        storePtr(JSFrameReg, prevAddr);
-    
-        Address ncodeAddr = newfp.addrOf(JSStackFrame::offsetOfncode());
-        DataLabelPtr ptr = storePtrWithPatch(ImmPtr(returnAddress), ncodeAddr);
-    
-        addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
-
-        return ptr;
-    }
-
     void loadObjClass(RegisterID objReg, RegisterID destReg) {
         loadPtr(Address(objReg, offsetof(JSObject, clasp)), destReg);
     }
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index a393918b2f4d..b1d3615fd6fd 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -55,6 +55,7 @@
 #include "FrameState-inl.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
+#include "InlineFrameAssembler.h"
 #include "jscompartment.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
@@ -98,6 +99,7 @@ mjit::Compiler::Compiler(JSContext *cx, JSStackFrame *fp)
 #if defined JS_MONOIC
     getGlobalNames(CompilerAllocPolicy(cx, *thisFromCtor())),
     setGlobalNames(CompilerAllocPolicy(cx, *thisFromCtor())),
+    callICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     equalityICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     traceICs(CompilerAllocPolicy(cx, *thisFromCtor())),
 #endif
@@ -106,7 +108,7 @@ mjit::Compiler::Compiler(JSContext *cx, JSStackFrame *fp)
     getElemICs(CompilerAllocPolicy(cx, *thisFromCtor())),
     setElemICs(CompilerAllocPolicy(cx, *thisFromCtor())),
 #endif
-    callICs(CompilerAllocPolicy(cx, *thisFromCtor())),
+    callPatches(CompilerAllocPolicy(cx, *thisFromCtor())),
     callSites(CompilerAllocPolicy(cx, *thisFromCtor())), 
     doubleList(CompilerAllocPolicy(cx, *thisFromCtor())),
     jumpTables(CompilerAllocPolicy(cx, *thisFromCtor())),
@@ -431,10 +433,10 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     /* Please keep in sync with JITScript::scriptDataSize! */
     size_t totalBytes = sizeof(JITScript) +
                         sizeof(NativeMapEntry) * nNmapLive +
-                        sizeof(ic::CallIC) * callICs.length() +
 #if defined JS_MONOIC
                         sizeof(ic::GetGlobalNameIC) * getGlobalNames.length() +
                         sizeof(ic::SetGlobalNameIC) * setGlobalNames.length() +
+                        sizeof(ic::CallICInfo) * callICs.length() +
                         sizeof(ic::EqualityICInfo) * equalityICs.length() +
                         sizeof(ic::TraceICInfo) * traceICs.length() +
 #endif
@@ -456,7 +458,6 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     cursor += sizeof(JITScript);
 
     jit->code = JSC::MacroAssemblerCodeRef(result, execPool, masm.size() + stubcc.size());
-    jit->script = script;
     jit->invokeEntry = result;
     jit->singleStepMode = script->singleStepMode;
     if (fun) {
@@ -488,58 +489,6 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     }
     JS_ASSERT(ix == jit->nNmapPairs);
 
-    ic::CallIC *callICs_ = (ic::CallIC *)cursor;
-    jit->nCallICs = callICs.length();
-    cursor += sizeof(ic::CallIC) * jit->nCallICs;
-    for (size_t i = 0; i < jit->nCallICs; i++) {
-        const CallICInfo &from = callICs[i];
-        ic::CallIC &to = callICs_[i];
-
-        to.fastPathStart = fullCode.locationOf(from.fastPathStart);
-        to.slowPathStart = stubCode.locationOf(from.slowPathStart);
-        to.frameSize = from.frameSize;
-        to.pc = from.pc;
-
-        uint32 offset = fullCode.locationOf(from.fastPathRejoin) - to.fastPathStart;
-        to.inlineRejoinOffset = offset;
-        JS_ASSERT(to.inlineRejoinOffset == offset);
-
-        offset = fullCode.locationOf(from.completedRejoinOffset) - to.fastPathStart;
-        to.completedRejoinOffset = offset;
-        JS_ASSERT(to.completedRejoinOffset == offset);
-
-        offset = fullCode.locationOf(from.inlineJump) - to.fastPathStart;
-        to.inlineJumpOffset = offset;
-        JS_ASSERT(to.inlineJumpOffset == offset);
-
-        offset = stubCode.locationOf(from.slowPathCall) - to.slowPathStart;
-        to.slowCallOffset = offset;
-        JS_ASSERT(to.slowCallOffset == offset);
-
-        offset = from.rval.offset;
-        to.rvalOffset = offset;
-        JS_ASSERT(offset == to.rvalOffset);
-
-        to.calleeData = from.calleeData;
-
-        if (from.hasExtendedInlinePath) {
-            to.hasExtendedInlinePath = true;
-            fullCode.patch(from.ncodePatch, to.returnAddress());
-
-            offset = fullCode.locationOf(from.calleePtr) - to.fastPathStart;
-            to.inlineCalleeGuard = offset;
-            JS_ASSERT(offset == to.inlineCalleeGuard);
-
-            offset = fullCode.locationOf(from.inlineCall) - to.fastPathStart;
-            to.inlineCallOffset = offset;
-            JS_ASSERT(offset == to.inlineCallOffset);
-        }
-
-        stubCode.patch(from.paramAddr, &to);
-        if (from.speculatedFunCallOrApply)
-            stubCode.patch(from.failedSpeculationParam, &to);
-    }
-
 #if defined JS_MONOIC
     ic::GetGlobalNameIC *getGlobalNames_ = (ic::GetGlobalNameIC *)cursor;
     jit->nGetGlobalNames = getGlobalNames.length();
@@ -589,6 +538,65 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
         stubCode.patch(from.addrLabel, &to);
     }
 
+    ic::CallICInfo *jitCallICs = (ic::CallICInfo *)cursor;
+    jit->nCallICs = callICs.length();
+    cursor += sizeof(ic::CallICInfo) * jit->nCallICs;
+    for (size_t i = 0; i < jit->nCallICs; i++) {
+        jitCallICs[i].reset();
+        jitCallICs[i].funGuard = fullCode.locationOf(callICs[i].funGuard);
+        jitCallICs[i].funJump = fullCode.locationOf(callICs[i].funJump);
+        jitCallICs[i].slowPathStart = stubCode.locationOf(callICs[i].slowPathStart);
+
+        /* Compute the hot call offset. */
+        uint32 offset = fullCode.locationOf(callICs[i].hotJump) -
+                        fullCode.locationOf(callICs[i].funGuard);
+        jitCallICs[i].hotJumpOffset = offset;
+        JS_ASSERT(jitCallICs[i].hotJumpOffset == offset);
+
+        /* Compute the join point offset. */
+        offset = fullCode.locationOf(callICs[i].joinPoint) -
+                 fullCode.locationOf(callICs[i].funGuard);
+        jitCallICs[i].joinPointOffset = offset;
+        JS_ASSERT(jitCallICs[i].joinPointOffset == offset);
+                                        
+        /* Compute the OOL call offset. */
+        offset = stubCode.locationOf(callICs[i].oolCall) -
+                 stubCode.locationOf(callICs[i].slowPathStart);
+        jitCallICs[i].oolCallOffset = offset;
+        JS_ASSERT(jitCallICs[i].oolCallOffset == offset);
+
+        /* Compute the OOL jump offset. */
+        offset = stubCode.locationOf(callICs[i].oolJump) -
+                 stubCode.locationOf(callICs[i].slowPathStart);
+        jitCallICs[i].oolJumpOffset = offset;
+        JS_ASSERT(jitCallICs[i].oolJumpOffset == offset);
+
+        /* Compute the start of the OOL IC call. */
+        offset = stubCode.locationOf(callICs[i].icCall) -
+                 stubCode.locationOf(callICs[i].slowPathStart);
+        jitCallICs[i].icCallOffset = offset;
+        JS_ASSERT(jitCallICs[i].icCallOffset == offset);
+
+        /* Compute the slow join point offset. */
+        offset = stubCode.locationOf(callICs[i].slowJoinPoint) -
+                 stubCode.locationOf(callICs[i].slowPathStart);
+        jitCallICs[i].slowJoinOffset = offset;
+        JS_ASSERT(jitCallICs[i].slowJoinOffset == offset);
+
+        /* Compute the join point offset for continuing on the hot path. */
+        offset = stubCode.locationOf(callICs[i].hotPathLabel) -
+                 stubCode.locationOf(callICs[i].funGuard);
+        jitCallICs[i].hotPathOffset = offset;
+        JS_ASSERT(jitCallICs[i].hotPathOffset == offset);
+
+        jitCallICs[i].pc = callICs[i].pc;
+        jitCallICs[i].frameSize = callICs[i].frameSize;
+        jitCallICs[i].funObjReg = callICs[i].funObjReg;
+        jitCallICs[i].funPtrReg = callICs[i].funPtrReg;
+        stubCode.patch(callICs[i].addrLabel1, &jitCallICs[i]);
+        stubCode.patch(callICs[i].addrLabel2, &jitCallICs[i]);
+    }
+
     ic::EqualityICInfo *jitEqualityICs = (ic::EqualityICInfo *)cursor;
     jit->nEqualityICs = equalityICs.length();
     cursor += sizeof(ic::EqualityICInfo) * jit->nEqualityICs;
@@ -641,6 +649,15 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     }
 #endif /* JS_MONOIC */
 
+    for (size_t i = 0; i < callPatches.length(); i++) {
+        CallPatchInfo &patch = callPatches[i];
+
+        if (patch.hasFastNcode)
+            fullCode.patch(patch.fastNcodePatch, fullCode.locationOf(patch.joinPoint));
+        if (patch.hasSlowNcode)
+            stubCode.patch(patch.slowNcodePatch, fullCode.locationOf(patch.joinPoint));
+    }
+
 #ifdef JS_POLYIC
     ic::GetElementIC *jitGetElems = (ic::GetElementIC *)cursor;
     jit->nGetElems = getElemICs.length();
@@ -2345,6 +2362,42 @@ mjit::Compiler::addReturnSite(Label joinPoint, uint32 id)
     addCallSite(site);
 }
 
+void
+mjit::Compiler::emitUncachedCall(uint32 argc, bool callingNew)
+{
+    CallPatchInfo callPatch;
+
+    RegisterID r0 = Registers::ReturnReg;
+    VoidPtrStubUInt32 stub = callingNew ? stubs::UncachedNew : stubs::UncachedCall;
+
+    frame.syncAndKill(Registers(Registers::AvailRegs), Uses(argc + 2));
+    prepareStubCall(Uses(argc + 2));
+    masm.move(Imm32(argc), Registers::ArgReg1);
+    INLINE_STUBCALL(stub);
+
+    Jump notCompiled = masm.branchTestPtr(Assembler::Zero, r0, r0);
+
+    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+    callPatch.hasFastNcode = true;
+    callPatch.fastNcodePatch =
+        masm.storePtrWithPatch(ImmPtr(NULL),
+                               Address(JSFrameReg, JSStackFrame::offsetOfncode()));
+
+    masm.jump(r0);
+    callPatch.joinPoint = masm.label();
+    addReturnSite(callPatch.joinPoint, __LINE__);
+    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
+
+    frame.popn(argc + 2);
+    frame.takeReg(JSReturnReg_Type);
+    frame.takeReg(JSReturnReg_Data);
+    frame.pushRegs(JSReturnReg_Type, JSReturnReg_Data);
+
+    stubcc.linkExitDirect(notCompiled, stubcc.masm.label());
+    stubcc.rejoin(Changes(0));
+    callPatches.append(callPatch);
+}
+
 static bool
 IsLowerableFunCallOrApply(jsbytecode *pc)
 {
@@ -2356,6 +2409,90 @@ IsLowerableFunCallOrApply(jsbytecode *pc)
 #endif
 }
 
+void
+mjit::Compiler::checkCallApplySpeculation(uint32 callImmArgc, uint32 speculatedArgc,
+                                          FrameEntry *origCallee, FrameEntry *origThis,
+                                          MaybeRegisterID origCalleeType, RegisterID origCalleeData,
+                                          MaybeRegisterID origThisType, RegisterID origThisData,
+                                          Jump *uncachedCallSlowRejoin, CallPatchInfo *uncachedCallPatch)
+{
+    JS_ASSERT(IsLowerableFunCallOrApply(PC));
+
+    /*
+     * if (origCallee.isObject() &&
+     *     origCallee.toObject().isFunction &&
+     *     origCallee.toObject().getFunctionPrivate() == js_fun_{call,apply})
+     */
+    MaybeJump isObj;
+    if (origCalleeType.isSet())
+        isObj = masm.testObject(Assembler::NotEqual, origCalleeType.reg());
+    Jump isFun = masm.testFunction(Assembler::NotEqual, origCalleeData);
+    masm.loadObjPrivate(origCalleeData, origCalleeData);
+    Native native = *PC == JSOP_FUNCALL ? js_fun_call : js_fun_apply;
+    Jump isNative = masm.branchPtr(Assembler::NotEqual,
+                                   Address(origCalleeData, JSFunction::offsetOfNativeOrScript()),
+                                   ImmPtr(JS_FUNC_TO_DATA_PTR(void *, native)));
+
+    /*
+     * If speculation fails, we can't use the ic, since it is compiled on the
+     * assumption that speculation succeeds. Instead, just do an uncached call.
+     */
+    {
+        if (isObj.isSet())
+            stubcc.linkExitDirect(isObj.getJump(), stubcc.masm.label());
+        stubcc.linkExitDirect(isFun, stubcc.masm.label());
+        stubcc.linkExitDirect(isNative, stubcc.masm.label());
+
+        int32 frameDepthAdjust;
+        if (applyTricks == LazyArgsObj) {
+            OOL_STUBCALL(stubs::Arguments);
+            frameDepthAdjust = +1;
+        } else {
+            frameDepthAdjust = 0;
+        }
+
+        stubcc.masm.move(Imm32(callImmArgc), Registers::ArgReg1);
+        JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW CALL CODE ---- \n");
+        OOL_STUBCALL_LOCAL_SLOTS(JS_FUNC_TO_DATA_PTR(void *, stubs::UncachedCall),
+                           frame.localSlots() + frameDepthAdjust);
+        JaegerSpew(JSpew_Insns, " ---- END SLOW CALL CODE ---- \n");
+
+        RegisterID r0 = Registers::ReturnReg;
+        Jump notCompiled = stubcc.masm.branchTestPtr(Assembler::Zero, r0, r0);
+
+        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+        Address ncodeAddr(JSFrameReg, JSStackFrame::offsetOfncode());
+        uncachedCallPatch->hasSlowNcode = true;
+        uncachedCallPatch->slowNcodePatch = stubcc.masm.storePtrWithPatch(ImmPtr(NULL), ncodeAddr);
+
+        stubcc.masm.jump(r0);
+        addReturnSite(masm.label(), __LINE__);
+
+        notCompiled.linkTo(stubcc.masm.label(), &stubcc.masm);
+
+        /*
+         * inlineCallHelper will link uncachedCallSlowRejoin to the join point
+         * at the end of the ic. At that join point, the return value of the
+         * call is assumed to be in registers, so load them before jumping.
+         */
+        JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW RESTORE CODE ---- \n");
+        Address rval = frame.addressOf(origCallee);  /* vp[0] == rval */
+        stubcc.masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
+        *uncachedCallSlowRejoin = stubcc.masm.jump();
+        JaegerSpew(JSpew_Insns, " ---- END SLOW RESTORE CODE ---- \n");
+    }
+
+    /*
+     * For simplicity, we don't statically specialize calls to
+     * ic::SplatApplyArgs based on applyTricks. Rather, this state is
+     * communicated dynamically through the VMFrame.
+     */
+    if (*PC == JSOP_FUNAPPLY) {
+        masm.store32(Imm32(applyTricks == LazyArgsObj),
+                     FrameAddress(offsetof(VMFrame, u.call.lazyArgsObj)));
+    }
+}
+
 /* This predicate must be called before the current op mutates the FrameState. */
 bool
 mjit::Compiler::canUseApplyTricks()
@@ -2368,218 +2505,315 @@ mjit::Compiler::canUseApplyTricks()
            !debugMode();
 }
 
+/* See MonoIC.cpp, CallCompiler for more information on call ICs. */
 void
 mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
 {
+    /* Check for interrupts on function call */
     interruptCheckHelper();
 
-    int32 numArgsPushedBeforeCall;
+    int32 speculatedArgc;
     if (applyTricks == LazyArgsObj) {
         frame.pop();
-        numArgsPushedBeforeCall = 1;
+        speculatedArgc = 1;
     } else {
-        numArgsPushedBeforeCall = callImmArgc;
+        speculatedArgc = callImmArgc;
     }
 
-    FrameEntry *origCallee = frame.peek(-(numArgsPushedBeforeCall + 2));
-    FrameEntry *origThis = frame.peek(-(numArgsPushedBeforeCall + 1));
+    FrameEntry *origCallee = frame.peek(-(speculatedArgc + 2));
+    FrameEntry *origThis = frame.peek(-(speculatedArgc + 1));
 
-    // If constructing, |this| can be bogus.
+    /* 'this' does not need to be synced for constructing. */
     if (callingNew)
         frame.discardFe(origThis);
 
-    CallICInfo ic((JSOp)*PC);
-    ic.pc = PC;
+    /*
+     * From the presence of JSOP_FUN{CALL,APPLY}, we speculate that we are
+     * going to call js_fun_{call,apply}. Normally, this call would go through
+     * js::Invoke to ultimately call 'this'. We can do much better by having
+     * the callIC cache and call 'this' directly. However, if it turns out that
+     * we are not actually calling js_fun_call, the callIC must act as normal.
+     */
+    bool lowerFunCallOrApply = IsLowerableFunCallOrApply(PC);
 
-    MaybeRegisterID origCalleeType, origCalleeData;
+    /*
+     * Currently, constant values are not functions, so don't even try to
+     * optimize. This lets us assume that callee/this have regs below.
+     */
+#ifdef JS_MONOIC
+    if (debugMode() ||
+        origCallee->isConstant() || origCallee->isNotType(JSVAL_TYPE_OBJECT) ||
+        (lowerFunCallOrApply &&
+         (origThis->isConstant() || origThis->isNotType(JSVAL_TYPE_OBJECT)))) {
+#endif
+        if (applyTricks == LazyArgsObj) {
+            /* frame.pop() above reset us to pre-JSOP_ARGUMENTS state */
+            jsop_arguments();
+            frame.pushSynced();
+        }
+        emitUncachedCall(callImmArgc, callingNew);
+        return;
+#ifdef JS_MONOIC
+    }
 
-    // Get the callee in registers.
-    if (origCallee->isConstant())
-        frame.forgetConstant(origCallee);
-    frame.ensureFullRegs(origCallee, &origCalleeType, &origCalleeData);
+    /* Initialized by both branches below. */
+    CallGenInfo     callIC(PC);
+    CallPatchInfo   callPatch;
+    MaybeRegisterID icCalleeType; /* type to test for function-ness */
+    RegisterID      icCalleeData; /* data to call */
+    Address         icRvalAddr;   /* return slot on slow-path rejoin */
 
-    MaybeJump failedSpeculationSlowRejoin;
-    ic.speculatedFunCallOrApply = IsLowerableFunCallOrApply(PC);
+    /*
+     * IC space must be reserved (using RESERVE_IC_SPACE or RESERVE_OOL_SPACE) between the
+     * following labels (as used in finishThisUp):
+     *  - funGuard -> hotJump
+     *  - funGuard -> joinPoint
+     *  - funGuard -> hotPathLabel
+     *  - slowPathStart -> oolCall
+     *  - slowPathStart -> oolJump
+     *  - slowPathStart -> icCall
+     *  - slowPathStart -> slowJoinPoint
+     * Because the call ICs are fairly long (compared to PICs), we don't reserve the space in each
+     * path until the first usage of funGuard (for the in-line path) or slowPathStart (for the
+     * out-of-line path).
+     */
 
-#define FTC(b, x) FunctionTemplateConditional((b), x<true>, x<false>)
-#define FTDP(x) JS_FUNC_TO_DATA_PTR(void *, (x))
+    /* Initialized only on lowerFunCallOrApply branch. */
+    Jump            uncachedCallSlowRejoin;
+    CallPatchInfo   uncachedCallPatch;
 
-    // Sync the frame on the inline path, keeping the callee in registers.
-    MaybeRegisterID calleeType;
     {
+        MaybeRegisterID origCalleeType, maybeOrigCalleeData;
+        RegisterID origCalleeData;
+
+        /* Get the callee in registers. */
+        frame.ensureFullRegs(origCallee, &origCalleeType, &maybeOrigCalleeData);
+        origCalleeData = maybeOrigCalleeData.reg();
         PinRegAcrossSyncAndKill p1(frame, origCalleeData), p2(frame, origCalleeType);
 
-        // From the presence of JSOP_FUN{CALL,APPLY}, we speculate that we are
-        // going to call js_fun_{call,apply}. Normally, this call would go
-        // through js::Invoke to ultimately call 'this'. We can do much better
-        // by having the callIC cache and call 'this' directly. However, if it
-        // turns out that we are not actually calling js_fun_call, we default
-        // to a slower path that can stay in JIT code but goes through a stub
-        // call to create frames.
-        if (ic.speculatedFunCallOrApply) {
-            MaybeRegisterID origThisType, origThisData;
+        if (lowerFunCallOrApply) {
+            MaybeRegisterID origThisType, maybeOrigThisData;
+            RegisterID origThisData;
             {
-                // Get thisv in registers. The payload will always have a register
-                // if using FUNCALL, or FUNAPPLY with lazy args.
-                if (origThis->isConstant())
-                    frame.forgetConstant(origThis);
-                frame.ensureFullRegs(origThis, &origThisType, &origThisData);
+                /* Get thisv in registers. */
+                frame.ensureFullRegs(origThis, &origThisType, &maybeOrigThisData);
+                origThisData = maybeOrigThisData.reg();
                 PinRegAcrossSyncAndKill p3(frame, origThisData), p4(frame, origThisType);
 
-                // This will leave pinned regs untouched.
-                frame.syncAndKill(Registers(Registers::AvailRegs), Uses(numArgsPushedBeforeCall + 2));
+                /* Leaves pinned regs untouched. */
+                frame.syncAndKill(Registers(Registers::AvailRegs), Uses(speculatedArgc + 2));
             }
 
-            // Guard that the speculation of (callee=fun_call/fun_apply) is accurate.
-            MaybeJump typeGuard;
-            if (origCalleeType.isSet())
-                typeGuard = masm.testObject(Assembler::NotEqual, origCalleeType.reg());
-            Jump claspGuard = masm.testFunction(Assembler::NotEqual, origCalleeData.reg());
+            checkCallApplySpeculation(callImmArgc, speculatedArgc,
+                                      origCallee, origThis,
+                                      origCalleeType, origCalleeData,
+                                      origThisType, origThisData,
+                                      &uncachedCallSlowRejoin, &uncachedCallPatch);
 
-            Native native = (ic.op == JSOP_FUNCALL) ? js_fun_call : js_fun_apply;
-            Address nativeAddr(origCalleeData.reg(), JSFunction::offsetOfNativeOrScript());
-            masm.loadObjPrivate(origCalleeData.reg(), origCalleeData.reg());
-            Jump funGuard = masm.branchPtr(Assembler::NotEqual, nativeAddr,
-                                           ImmPtr(JS_FUNC_TO_DATA_PTR(void *, native)));
+            icCalleeType = origThisType;
+            icCalleeData = origThisData;
+            icRvalAddr = frame.addressOf(origThis);
 
-            // If speculation fails, act as though we never speculated. Call
-            // special functions which will adjust the stack and try to at
-            // least stay within this VMFrame, if the actual callee can be
-            // JIT'd. Note there is no IC path here.
-            {
-                if (typeGuard.isSet())
-                    stubcc.linkExitDirect(typeGuard.get(), stubcc.masm.label());
-                stubcc.linkExitDirect(claspGuard, stubcc.masm.label());
-                stubcc.linkExitDirect(funGuard, stubcc.masm.label());
-
-                ic.failedSpeculationParam =
-                    stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
-                void *ptr = (ic.op == JSOP_FUNCALL)
-                            ? JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunCall)
-                            : (applyTricks == LazyArgsObj)
-                              ? JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunApplyLazyArgs)
-                              : JS_FUNC_TO_DATA_PTR(void *, ic::FailedFunApply);
-                OOL_STUBCALL(ptr);
-
-                FrameSize frameSize;
-                frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall);
-                failedSpeculationSlowRejoin =
-                    stubcc.emitCallTail(frameSize, frame.addressOf(origCallee));
-            }
-
-            ic.calleeData = origThisData.reg();
-            calleeType = origThisType;
-
-            if (ic.op == JSOP_FUNCALL) {
-                ic.frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall - 1);
-            } else {
-                ic.frameSize.initDynamic();
-
-                // Make sure the speculated callee's registers can't be
-                // clobbered by the ensuing stub call. First, reserve both
-                // registers so allocating one does not clobber the other,
-                // then give new registers as needed.
-                Registers regs;
-                regs.takeReg(ic.calleeData);
-                if (calleeType.isSet())
-                    regs.takeReg(calleeType.reg());
-                if (!Registers::isSaved(ic.calleeData)) {
-                    RegisterID r = regs.takeRegInMask(Registers::SavedRegs);
-                    masm.move(ic.calleeData, r);
-                    ic.calleeData = r;
-                }
-                if (calleeType.isSet() && !Registers::isSaved(calleeType.reg())) {
-                    RegisterID r = regs.takeRegInMask(Registers::SavedRegs);
-                    masm.move(calleeType.reg(), r);
-                    calleeType = r;
-                }
-
-                // Splat the apply args on the inline path, so it's always taken
-                // before the actual call IC.
-                void *funptr = FTDP(FTC((applyTricks == LazyArgsObj), ic::SplatApplyArgs));
-                INLINE_STUBCALL(funptr);
-            }
-
-            ic.rval = frame.addressOf(origThis);
+            /*
+             * For f.call(), since we compile the ic under the (checked)
+             * assumption that call == js_fun_call, we still have a static
+             * frame size. For f.apply(), the frame size depends on the dynamic
+             * length of the array passed to apply.
+             */
+            if (*PC == JSOP_FUNCALL)
+                callIC.frameSize.initStatic(frame.localSlots(), speculatedArgc - 1);
+            else
+                callIC.frameSize.initDynamic();
         } else {
-            frame.syncAndKill(Registers(Registers::AvailRegs), Uses(numArgsPushedBeforeCall + 2));
-            ic.frameSize.initStatic(frame.localSlots(), numArgsPushedBeforeCall);
-            ic.rval = frame.addressOf(origCallee);
-            ic.calleeData = origCalleeData.reg();
-            calleeType = origCalleeType;
+            /* Leaves pinned regs untouched. */
+            frame.syncAndKill(Registers(Registers::AvailRegs), Uses(speculatedArgc + 2));
+
+            icCalleeType = origCalleeType;
+            icCalleeData = origCalleeData;
+            icRvalAddr = frame.addressOf(origCallee);
+            callIC.frameSize.initStatic(frame.localSlots(), speculatedArgc);
         }
     }
 
+    /* Test the type if necessary. Failing this always takes a really slow path. */
+    MaybeJump notObjectJump;
+    if (icCalleeType.isSet())
+        notObjectJump = masm.testObject(Assembler::NotEqual, icCalleeType.reg());
+
+    /*
+     * For an optimized apply, keep icCalleeData and funPtrReg in a
+     * callee-saved registers for the subsequent ic::SplatApplyArgs call.
+     */
+    Registers tempRegs;
+    if (callIC.frameSize.isDynamic() && !Registers::isSaved(icCalleeData)) {
+        RegisterID x = tempRegs.takeRegInMask(Registers::SavedRegs);
+        masm.move(icCalleeData, x);
+        icCalleeData = x;
+    } else {
+        tempRegs.takeReg(icCalleeData);
+    }
+    RegisterID funPtrReg = tempRegs.takeRegInMask(Registers::SavedRegs);
+
+    /* Reserve space just before initialization of funGuard. */
     RESERVE_IC_SPACE(masm);
+
+    /*
+     * Guard on the callee identity. This misses on the first run. If the
+     * callee is scripted, compiled/compilable, and argc == nargs, then this
+     * guard is patched, and the compiled code address is baked in.
+     */
+    Jump j = masm.branchPtrWithPatch(Assembler::NotEqual, icCalleeData, callIC.funGuard);
+    callIC.funJump = j;
+
+    /* Reserve space just before initialization of slowPathStart. */
     RESERVE_OOL_SPACE(stubcc.masm);
 
-    MaybeJump typeGuard;
-    if (calleeType.isSet())
-        typeGuard = masm.testObject(Assembler::NotEqual, calleeType.reg());
+    Jump rejoin1, rejoin2;
+    {
+        RESERVE_OOL_SPACE(stubcc.masm);
+        stubcc.linkExitDirect(j, stubcc.masm.label());
+        callIC.slowPathStart = stubcc.masm.label();
 
-    ic.fastPathStart = masm.label();
+        /*
+         * Test if the callee is even a function. If this doesn't match, we
+         * take a _really_ slow path later.
+         */
+        Jump notFunction = stubcc.masm.testFunction(Assembler::NotEqual, icCalleeData);
 
-    // If speculating funApply, splat the apply args in the OOL path, to
-    // simplify the OOL and generated paths.
-    if (ic.frameSize.isDynamic()) {
-        // No inline path for speculation.
-        ic.inlineJump = masm.jump();
-        ic.hasExtendedInlinePath = false;
-    } else {
-        // For static argc, we attempt to inline the best-case call sequence.
-        ic.inlineJump = masm.branchPtrWithPatch(Assembler::NotEqual, ic.calleeData, ic.calleePtr);
-        ic.ncodePatch = masm.emitStaticFrame(callingNew, frame.localSlots(), NULL);
-        ic.hasExtendedInlinePath = true;
-        ic.inlineCall = masm.jump();
+        /* Test if the function is scripted. */
+        RegisterID tmp = tempRegs.takeAnyReg();
+        stubcc.masm.loadObjPrivate(icCalleeData, funPtrReg);
+        stubcc.masm.load16(Address(funPtrReg, offsetof(JSFunction, flags)), tmp);
+        stubcc.masm.and32(Imm32(JSFUN_KINDMASK), tmp);
+        Jump isNative = stubcc.masm.branch32(Assembler::Below, tmp, Imm32(JSFUN_INTERPRETED));
+        tempRegs.putReg(tmp);
+
+        /*
+         * N.B. After this call, the frame will have a dynamic frame size.
+         * Check after the function is known not to be a native so that the
+         * catch-all/native path has a static depth.
+         */
+        if (callIC.frameSize.isDynamic())
+            OOL_STUBCALL(ic::SplatApplyArgs);
+
+        /*
+         * No-op jump that gets patched by ic::New/Call to the stub generated
+         * by generateFullCallStub.
+         */
+        Jump toPatch = stubcc.masm.jump();
+        toPatch.linkTo(stubcc.masm.label(), &stubcc.masm);
+        callIC.oolJump = toPatch;
+        callIC.icCall = stubcc.masm.label();
+
+        /*
+         * At this point the function is definitely scripted, so we try to
+         * compile it and patch either funGuard/funJump or oolJump. This code
+         * is only executed once.
+         */
+        callIC.addrLabel1 = stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
+        void *icFunPtr = JS_FUNC_TO_DATA_PTR(void *, callingNew ? ic::New : ic::Call);
+        if (callIC.frameSize.isStatic())
+            callIC.oolCall = OOL_STUBCALL_LOCAL_SLOTS(icFunPtr, frame.localSlots());
+        else
+            callIC.oolCall = OOL_STUBCALL_LOCAL_SLOTS(icFunPtr, -1);
+
+        callIC.funObjReg = icCalleeData;
+        callIC.funPtrReg = funPtrReg;
+
+        /*
+         * The IC call either returns NULL, meaning call completed, or a
+         * function pointer to jump to. Caveat: Must restore JSFrameReg
+         * because a new frame has been pushed.
+         */
+        rejoin1 = stubcc.masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
+                                            Registers::ReturnReg);
+        if (callIC.frameSize.isStatic())
+            stubcc.masm.move(Imm32(callIC.frameSize.staticArgc()), JSParamReg_Argc);
+        else
+            stubcc.masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
+        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+        callPatch.hasSlowNcode = true;
+        callPatch.slowNcodePatch =
+            stubcc.masm.storePtrWithPatch(ImmPtr(NULL),
+                                          Address(JSFrameReg, JSStackFrame::offsetOfncode()));
+        stubcc.masm.jump(Registers::ReturnReg);
+
+        /*
+         * This ool path is the catch-all for everything but scripted function
+         * callees. For native functions, ic::NativeNew/NativeCall will repatch
+         * funGaurd/funJump with a fast call stub. All other cases
+         * (non-function callable objects and invalid callees) take the slow
+         * path through js::Invoke.
+         */
+        if (notObjectJump.isSet())
+            stubcc.linkExitDirect(notObjectJump.get(), stubcc.masm.label());
+        notFunction.linkTo(stubcc.masm.label(), &stubcc.masm);
+        isNative.linkTo(stubcc.masm.label(), &stubcc.masm);
+
+        callIC.addrLabel2 = stubcc.masm.moveWithPatch(ImmPtr(NULL), Registers::ArgReg1);
+        OOL_STUBCALL(callingNew ? ic::NativeNew : ic::NativeCall);
+
+        rejoin2 = stubcc.masm.jump();
     }
 
-#define FTC_IC(b, x, ic) FunctionTemplateConditional((b), x<true, ic>, x<false, ic>)
+    /*
+     * If the call site goes to a closure over the same function, it will
+     * generate an out-of-line stub that joins back here.
+     */
+    callIC.hotPathLabel = masm.label();
 
-    ic.slowPathStart = stubcc.masm.label();
-    stubcc.linkExitDirect(ic.inlineJump, ic.slowPathStart);
-    if (typeGuard.isSet())
-        stubcc.linkExitDirect(typeGuard.get(), ic.slowPathStart);
+    uint32 flags = 0;
+    if (callingNew)
+        flags |= JSFRAME_CONSTRUCTING;
 
-    void *funptr = (callingNew)
-                   ? FTDP(FTC(!debugMode(), ic::New))
-                   : debugMode()
-                     ? FTDP(FTC_IC((ic.frameSize.isDynamic()), ic::Call, false))
-                     : FTDP(FTC_IC((ic.frameSize.isDynamic()), ic::Call, true));
-    passICAddress(&ic);
-    if (ic.frameSize.isStatic())
-        ic.slowPathCall = OOL_STUBCALL(funptr);
-    else
-        ic.slowPathCall = OOL_STUBCALL_LOCAL_SLOTS(funptr, -1);
-    Jump slowRejoin = stubcc.emitCallTail(ic.frameSize, ic.rval);
+    InlineFrameAssembler inlFrame(masm, callIC, flags);
+    callPatch.hasFastNcode = true;
+    callPatch.fastNcodePatch = inlFrame.assemble(NULL);
 
-#undef FTC_NOIC
-#undef FTC_IC
-#undef FTDP
-#undef FTC
-
-    // Inline calls return here, and must restore the frame pointer.
-    ic.fastPathRejoin = masm.label();
-    addReturnSite(ic.fastPathRejoin, __LINE__);
+    callIC.hotJump = masm.jump();
+    callIC.joinPoint = callPatch.joinPoint = masm.label();
+    addReturnSite(callPatch.joinPoint, __LINE__);
+    if (lowerFunCallOrApply)
+        uncachedCallPatch.joinPoint = callIC.joinPoint;
     masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
 
-    // Completed calls are not inline and therefore don't restore JSFrameReg.
-    ic.completedRejoinOffset = masm.label();
+    /*
+     * We've placed hotJump, joinPoint and hotPathLabel, and no other labels are located by offset
+     * in the in-line path so we can check the IC space now.
+     */
+    CHECK_IC_SPACE();
 
-    // Slow paths (non-JIT) can safely rejoin here; |fp| has not changed.
-    if (failedSpeculationSlowRejoin.isSet())
-        stubcc.crossJump(failedSpeculationSlowRejoin.get(), masm.label());
-    stubcc.crossJump(slowRejoin, masm.label());
-
-    frame.popn(numArgsPushedBeforeCall + 2);
+    frame.popn(speculatedArgc + 2);
     frame.takeReg(JSReturnReg_Type);
     frame.takeReg(JSReturnReg_Data);
     frame.pushRegs(JSReturnReg_Type, JSReturnReg_Data);
 
-    CHECK_IC_SPACE();
+    /*
+     * Now that the frame state is set, generate the rejoin path. Note that, if
+     * lowerFunCallOrApply, we cannot just call 'stubcc.rejoin' since the return
+     * value has been placed at vp[1] which is not the stack address associated
+     * with frame.peek(-1).
+     */
+    callIC.slowJoinPoint = stubcc.masm.label();
+    rejoin1.linkTo(callIC.slowJoinPoint, &stubcc.masm);
+    rejoin2.linkTo(callIC.slowJoinPoint, &stubcc.masm);
+    JaegerSpew(JSpew_Insns, " ---- BEGIN SLOW RESTORE CODE ---- \n");
+    stubcc.masm.loadValueAsComponents(icRvalAddr, JSReturnReg_Type, JSReturnReg_Data);
+    stubcc.crossJump(stubcc.masm.jump(), masm.label());
+    JaegerSpew(JSpew_Insns, " ---- END SLOW RESTORE CODE ---- \n");
+
     CHECK_OOL_SPACE();
-    callICs.append(ic);
+
+    if (lowerFunCallOrApply)
+        stubcc.crossJump(uncachedCallSlowRejoin, masm.label());
+
+    callICs.append(callIC);
+    callPatches.append(callPatch);
+    if (lowerFunCallOrApply)
+        callPatches.append(uncachedCallPatch);
 
     applyTricks = NoApplyTricks;
+#endif
 }
 
 /*
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 470c5226ae02..95d807497f5b 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -126,9 +126,48 @@ class Compiler : public BaseCompiler
     };
 
     /* InlineFrameAssembler wants to see this. */
+  public:
+    struct CallGenInfo {
+        CallGenInfo(jsbytecode *pc) : pc(pc) {}
+
+        /*
+         * These members map to members in CallICInfo. See that structure for
+         * more comments.
+         */
+        jsbytecode   *pc;
+        DataLabelPtr funGuard;
+        Jump         funJump;
+        Jump         hotJump;
+        Call         oolCall;
+        Label        joinPoint;
+        Label        slowJoinPoint;
+        Label        slowPathStart;
+        Label        hotPathLabel;
+        DataLabelPtr addrLabel1;
+        DataLabelPtr addrLabel2;
+        Jump         oolJump;
+        Label        icCall;
+        RegisterID   funObjReg;
+        RegisterID   funPtrReg;
+        FrameSize    frameSize;
+    };
+
   private:
 #endif
 
+    /*
+     * Writes of call return addresses which needs to be delayed until the final
+     * absolute address of the join point is known.
+     */
+    struct CallPatchInfo {
+        CallPatchInfo() : hasFastNcode(false), hasSlowNcode(false) {}
+        Label joinPoint;
+        DataLabelPtr fastNcodePatch;
+        DataLabelPtr slowNcodePatch;
+        bool hasFastNcode;
+        bool hasSlowNcode;
+    };
+
     struct BaseICInfo {
         BaseICInfo(JSOp op) : op(op)
         { }
@@ -149,23 +188,6 @@ class Compiler : public BaseCompiler
         }
     };
 
-    struct CallICInfo : public BaseICInfo {
-        CallICInfo(JSOp op) : BaseICInfo(op)
-        { }
-        jsbytecode *pc;
-        RegisterID calleeData;
-        FrameSize frameSize;
-        Jump inlineJump;
-        bool speculatedFunCallOrApply;
-        DataLabelPtr failedSpeculationParam;
-        DataLabelPtr ncodePatch;
-        DataLabelPtr calleePtr;
-        Address rval;
-        Label completedRejoinOffset;
-        bool hasExtendedInlinePath;
-        Jump inlineCall;
-    };
-
     struct GetElementICInfo : public BaseICInfo {
         GetElementICInfo(JSOp op) : BaseICInfo(op)
         { }
@@ -320,6 +342,7 @@ class Compiler : public BaseCompiler
 #if defined JS_MONOIC
     js::Vector<GetGlobalNameICInfo, 16, CompilerAllocPolicy> getGlobalNames;
     js::Vector<SetGlobalNameICInfo, 16, CompilerAllocPolicy> setGlobalNames;
+    js::Vector<CallGenInfo, 64, CompilerAllocPolicy> callICs;
     js::Vector<EqualityGenInfo, 64, CompilerAllocPolicy> equalityICs;
     js::Vector<TraceGenInfo, 64, CompilerAllocPolicy> traceICs;
 #endif
@@ -328,7 +351,7 @@ class Compiler : public BaseCompiler
     js::Vector<GetElementICInfo, 16, CompilerAllocPolicy> getElemICs;
     js::Vector<SetElementICInfo, 16, CompilerAllocPolicy> setElemICs;
 #endif
-    js::Vector<CallICInfo, 16, CompilerAllocPolicy> callICs;
+    js::Vector<CallPatchInfo, 64, CompilerAllocPolicy> callPatches;
     js::Vector<InternalCallSite, 64, CompilerAllocPolicy> callSites;
     js::Vector<DoublePatch, 16, CompilerAllocPolicy> doubleList;
     js::Vector<JumpTable, 16> jumpTables;
@@ -409,6 +432,12 @@ class Compiler : public BaseCompiler
     void emitReturnValue(Assembler *masm, FrameEntry *fe);
     void dispatchCall(VoidPtrStubUInt32 stub, uint32 argc);
     void interruptCheckHelper();
+    void emitUncachedCall(uint32 argc, bool callingNew);
+    void checkCallApplySpeculation(uint32 callImmArgc, uint32 speculatedArgc,
+                                   FrameEntry *origCallee, FrameEntry *origThis,
+                                   MaybeRegisterID origCalleeType, RegisterID origCalleeData,
+                                   MaybeRegisterID origThisType, RegisterID origThisData,
+                                   Jump *uncachedCallSlowRejoin, CallPatchInfo *uncachedCallPatch);
     void inlineCallHelper(uint32 argc, bool callingNew);
     void fixPrimitiveReturn(Assembler *masm, FrameEntry *fe);
     void jsop_gnameinc(JSOp op, VoidStubAtom stub, uint32 index);
diff --git a/js/src/methodjit/FrameState.cpp b/js/src/methodjit/FrameState.cpp
index 0061e1f9b38d..5dbc015902a7 100644
--- a/js/src/methodjit/FrameState.cpp
+++ b/js/src/methodjit/FrameState.cpp
@@ -1693,16 +1693,3 @@ FrameState::maybeUnpinReg(MaybeRegisterID reg)
         unpinReg(reg.reg());
 }
 
-void
-FrameState::forgetConstant(FrameEntry *fe)
-{
-    JS_ASSERT(fe->isConstant());
-    RegisterID typeReg = allocReg();
-    RegisterID dataReg = allocReg();
-    masm.loadValueAsComponents(fe->getValue(), typeReg, dataReg);
-    regstate[typeReg].associate(fe, RematInfo::TYPE);
-    regstate[dataReg].associate(fe, RematInfo::DATA);
-    fe->type.setRegister(typeReg);
-    fe->data.setRegister(dataReg);
-}
-
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index 8c840ca3e306..c7f214bf780a 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -704,11 +704,6 @@ class FrameState
     MaybeRegisterID maybePinType(FrameEntry *fe);
     void maybeUnpinReg(MaybeRegisterID reg);
 
-    /*
-     * Given a constant FrameEntry, assigns its contents to registers.
-     */
-    void forgetConstant(FrameEntry *fe);
-
     /*
      * Dups the top item on the stack.
      */
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
new file mode 100644
index 000000000000..0e60478a7ac9
--- /dev/null
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
+ * May 28, 2008.
+ *
+ * The Initial Developer of the Original Code is
+ *   Brendan Eich <brendan@mozilla.org>
+ *
+ * Contributor(s):
+ *   David Anderson <danderson@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#if !defined jsjaeger_inl_frame_asm_h__ && defined JS_METHODJIT && defined JS_MONOIC
+#define jsjaeger_inl_frame_asm_h__
+
+#include "assembler/assembler/MacroAssembler.h"
+#include "assembler/assembler/CodeLocation.h"
+#include "methodjit/MethodJIT.h"
+#include "CodeGenIncludes.h"
+
+namespace js {
+namespace mjit {
+
+struct AdjustedFrame {
+    AdjustedFrame(uint32 baseOffset)
+     : baseOffset(baseOffset)
+    { }
+
+    uint32 baseOffset;
+
+    JSC::MacroAssembler::Address addrOf(uint32 offset) {
+        return JSC::MacroAssembler::Address(JSFrameReg, baseOffset + offset);
+    }
+};
+
+/*
+ * This is used for emitting code to inline callee-side frame creation and
+ * should jit code equivalent to JSStackFrame::initCallFrameCallerHalf.
+ *
+ * Once finished, JSFrameReg is advanced to be the new fp.
+ */
+class InlineFrameAssembler {
+    typedef JSC::MacroAssembler::RegisterID RegisterID;
+    typedef JSC::MacroAssembler::Address Address;
+    typedef JSC::MacroAssembler::Imm32 Imm32;
+    typedef JSC::MacroAssembler::ImmPtr ImmPtr;
+    typedef JSC::MacroAssembler::DataLabelPtr DataLabelPtr;
+
+    Assembler &masm;
+    FrameSize  frameSize;       // size of the caller's frame
+    RegisterID funObjReg;       // register containing the function object (callee)
+    jsbytecode *pc;             // bytecode location at the caller call site
+    uint32     flags;           // frame flags
+
+  public:
+    /*
+     * Register state, so consumers of this class can restrict which registers
+     * can and can't be clobbered.
+     */
+    Registers  tempRegs;
+
+    InlineFrameAssembler(Assembler &masm, ic::CallICInfo &ic, uint32 flags)
+      : masm(masm), pc(ic.pc), flags(flags)
+    {
+        frameSize = ic.frameSize;
+        funObjReg = ic.funObjReg;
+        tempRegs.takeReg(ic.funPtrReg);
+        tempRegs.takeReg(funObjReg);
+    }
+
+    InlineFrameAssembler(Assembler &masm, Compiler::CallGenInfo &gen, uint32 flags)
+      : masm(masm), pc(gen.pc), flags(flags)
+    {
+        frameSize = gen.frameSize;
+        funObjReg = gen.funObjReg;
+        tempRegs.takeReg(funObjReg);
+    }
+
+    DataLabelPtr assemble(void *ncode)
+    {
+        JS_ASSERT((flags & ~JSFRAME_CONSTRUCTING) == 0);
+
+        /* Generate JSStackFrame::initCallFrameCallerHalf. */
+
+        DataLabelPtr ncodePatch;
+        if (frameSize.isStatic()) {
+            uint32 frameDepth = frameSize.staticLocalSlots();
+            AdjustedFrame newfp(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
+
+            Address flagsAddr = newfp.addrOf(JSStackFrame::offsetOfFlags());
+            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
+            Address prevAddr = newfp.addrOf(JSStackFrame::offsetOfPrev());
+            masm.storePtr(JSFrameReg, prevAddr);
+            Address ncodeAddr = newfp.addrOf(JSStackFrame::offsetOfncode());
+            ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
+
+            masm.addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
+        } else {
+            /*
+             * If the frame size is dynamic, then the fast path generated by
+             * generateFullCallStub must be used. Thus, this code is executed
+             * after stubs::SplatApplyArgs has been called. SplatApplyArgs
+             * stores the dynamic stack pointer (i.e., regs.sp after pushing a
+             * dynamic number of arguments) to VMFrame.regs, so we just load it
+             * here to get the new frame pointer.
+             */
+            RegisterID newfp = tempRegs.takeAnyReg();
+            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), newfp);
+
+            Address flagsAddr(newfp, JSStackFrame::offsetOfFlags());
+            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
+            Address prevAddr(newfp, JSStackFrame::offsetOfPrev());
+            masm.storePtr(JSFrameReg, prevAddr);
+            Address ncodeAddr(newfp, JSStackFrame::offsetOfncode());
+            ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
+
+            masm.move(newfp, JSFrameReg);
+            tempRegs.putReg(newfp);
+        }
+
+        return ncodePatch;
+    }
+};
+
+
+} /* namespace mjit */
+} /* namespace js */
+
+#endif /* jsjaeger_inl_frame_asm_h__ */
+
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 83784bdabc29..1fba629ac481 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -170,6 +170,43 @@ top:
     return NULL;
 }
 
+/*
+ * Clean up a frame and return.
+ */
+static void
+InlineReturn(VMFrame &f)
+{
+    JSContext *cx = f.cx;
+    JSStackFrame *fp = f.regs.fp;
+
+    JS_ASSERT(f.fp() != f.entryfp);
+
+    JS_ASSERT(!js_IsActiveWithOrBlock(cx, &fp->scopeChain(), 0));
+
+    Value *newsp = fp->actualArgs() - 1;
+    newsp[-1] = fp->returnValue();
+    cx->stack().popInlineFrame(cx, fp->prev(), newsp);
+}
+
+void JS_FASTCALL
+stubs::SlowCall(VMFrame &f, uint32 argc)
+{
+    Value *vp = f.regs.sp - (argc + 2);
+
+    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
+        THROW();
+}
+
+void JS_FASTCALL
+stubs::SlowNew(VMFrame &f, uint32 argc)
+{
+    JSContext *cx = f.cx;
+    Value *vp = f.regs.sp - (argc + 2);
+
+    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
+        THROW();
+}
+
 /*
  * This function must only be called after the early prologue, since it depends
  * on fp->exec.fun.
@@ -268,9 +305,6 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     JSFunction *fun = callee.getFunctionPrivate();
     JSScript *script = fun->script();
 
-    /* Update regs.pc since we didn't bother to do that in generated code. */
-    f.regs.pc = script->code;
-
     /*
      * FixupArity/RemovePartialFrame expect to be called after the early
      * prologue.
@@ -289,7 +323,7 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     /* These would have been initialized by the prologue. */
     f.regs.fp = fp;
     f.regs.sp = fp->base();
-    JS_ASSERT(f.regs.pc == script->code);
+    f.regs.pc = script->code;
 
     if (fun->isHeavyweight() && !js::CreateFunCallObject(cx, fp))
         THROWV(NULL);
@@ -308,6 +342,96 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     return NULL;
 }
 
+static inline bool
+UncachedInlineCall(VMFrame &f, uint32 flags, void **pret, bool *unjittable, uint32 argc)
+{
+    JSContext *cx = f.cx;
+    Value *vp = f.regs.sp - (argc + 2);
+    JSObject &callee = vp->toObject();
+    JSFunction *newfun = callee.getFunctionPrivate();
+    JSScript *newscript = newfun->script();
+
+    /* Get pointer to new frame/slots, prepare arguments. */
+    StackSpace &stack = cx->stack();
+    JSStackFrame *newfp = stack.getInlineFrameWithinLimit(cx, f.regs.sp, argc,
+                                                          newfun, newscript, &flags,
+                                                          f.entryfp, &f.stackLimit);
+    if (JS_UNLIKELY(!newfp))
+        return false;
+
+    /* Initialize frame, locals. */
+    newfp->initCallFrame(cx, callee, newfun, argc, flags);
+    SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
+
+    /* Officially push the frame. */
+    stack.pushInlineFrame(cx, newscript, newfp, &f.regs);
+    JS_ASSERT(newfp == f.regs.fp);
+
+    /* Scope with a call object parented by callee's parent. */
+    if (newfun->isHeavyweight() && !js::CreateFunCallObject(cx, newfp))
+        return false;
+
+    /* Try to compile if not already compiled. */
+    if (newscript->getJITStatus(newfp->isConstructing()) == JITScript_None) {
+        CompileStatus status = CanMethodJIT(cx, newscript, newfp, CompileRequest_Interpreter);
+        if (status == Compile_Error) {
+            /* A runtime exception was thrown, get out. */
+            InlineReturn(f);
+            return false;
+        }
+        if (status == Compile_Abort)
+            *unjittable = true;
+    }
+
+    /* If newscript was successfully compiled, run it. */
+    if (JITScript *jit = newscript->getJIT(newfp->isConstructing())) {
+        *pret = jit->invokeEntry;
+        return true;
+    }
+
+    /* Otherwise, run newscript in the interpreter. */
+    bool ok = !!Interpret(cx, cx->fp());
+    InlineReturn(f);
+
+    *pret = NULL;
+    return ok;
+}
+
+void * JS_FASTCALL
+stubs::UncachedNew(VMFrame &f, uint32 argc)
+{
+    UncachedCallResult ucr;
+    UncachedNewHelper(f, argc, &ucr);
+    return ucr.codeAddr;
+}
+
+void
+stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
+{
+    ucr->init();
+
+    JSContext *cx = f.cx;
+    Value *vp = f.regs.sp - (argc + 2);
+
+    /* Try to do a fast inline call before the general Invoke path. */
+    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpreted()) {
+        ucr->callee = &vp->toObject();
+        if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
+            THROW();
+    } else {
+        if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
+            THROW();
+    }
+}
+
+void * JS_FASTCALL
+stubs::UncachedCall(VMFrame &f, uint32 argc)
+{
+    UncachedCallResult ucr;
+    UncachedCallHelper(f, argc, &ucr);
+    return ucr.codeAddr;
+}
+
 void JS_FASTCALL
 stubs::Eval(VMFrame &f, uint32 argc)
 {
@@ -326,6 +450,37 @@ stubs::Eval(VMFrame &f, uint32 argc)
     f.regs.sp = vp + 1;
 }
 
+void
+stubs::UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
+{
+    ucr->init();
+
+    JSContext *cx = f.cx;
+    Value *vp = f.regs.sp - (argc + 2);
+
+    if (IsFunctionObject(*vp, &ucr->callee)) {
+        ucr->callee = &vp->toObject();
+        ucr->fun = GET_FUNCTION_PRIVATE(cx, ucr->callee);
+
+        if (ucr->fun->isInterpreted()) {
+            if (!UncachedInlineCall(f, 0, &ucr->codeAddr, &ucr->unjittable, argc))
+                THROW();
+            return;
+        }
+
+        if (ucr->fun->isNative()) {
+            if (!CallJSNative(cx, ucr->fun->u.n.native, argc, vp))
+                THROW();
+            return;
+        }
+    }
+
+    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
+        THROW();
+
+    return;
+}
+
 void JS_FASTCALL
 stubs::PutActivationObjects(VMFrame &f)
 {
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index 1d1efd6498b2..c2af0ec5f0f7 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -752,31 +752,31 @@ JITScript::nmapSectionLimit() const
     return (char *)nmap() + sizeof(NativeMapEntry) * nNmapPairs;
 }
 
-ic::CallIC *
-JITScript::callICs() const
-{
-    return (ic::CallIC *)nmapSectionLimit();
-}
-
 #ifdef JS_MONOIC
 ic::GetGlobalNameIC *
 JITScript::getGlobalNames() const
 {
-    return (ic::GetGlobalNameIC *)((char *)callICs() + sizeof(ic::CallIC) * nCallICs);
+    return (ic::GetGlobalNameIC *)nmapSectionLimit();
 }
 
 ic::SetGlobalNameIC *
 JITScript::setGlobalNames() const
 {
-    return (ic::SetGlobalNameIC *)((char *)getGlobalNames() +
+    return (ic::SetGlobalNameIC *)((char *)nmapSectionLimit() +
             sizeof(ic::GetGlobalNameIC) * nGetGlobalNames);
 }
 
+ic::CallICInfo *
+JITScript::callICs() const
+{
+    return (ic::CallICInfo *)((char *)setGlobalNames() +
+            sizeof(ic::SetGlobalNameIC) * nSetGlobalNames);
+}
+
 ic::EqualityICInfo *
 JITScript::equalityICs() const
 {
-    return (ic::EqualityICInfo *)((char *)setGlobalNames() +
-            sizeof(ic::SetGlobalNameIC) * nSetGlobalNames);
+    return (ic::EqualityICInfo *)((char *)callICs() + sizeof(ic::CallICInfo) * nCallICs);
 }
 
 ic::TraceICInfo *
@@ -794,7 +794,7 @@ JITScript::monoICSectionsLimit() const
 char *
 JITScript::monoICSectionsLimit() const
 {
-    return (char *)callICs() + sizeof(ic::CallIC) * nCallICs;
+    return nmapSectionsLimit();
 }
 #endif  // JS_MONOIC
 
@@ -870,6 +870,10 @@ mjit::JITScript::~JITScript()
     {
         (*pExecPool)->release();
     }
+    
+    ic::CallICInfo *callICs_ = callICs();
+    for (uint32 i = 0; i < nCallICs; i++)
+        callICs_[i].releasePools();
 #endif
 }
 
@@ -882,6 +886,7 @@ mjit::JITScript::scriptDataSize()
 #if defined JS_MONOIC
         sizeof(ic::GetGlobalNameIC) * nGetGlobalNames +
         sizeof(ic::SetGlobalNameIC) * nSetGlobalNames +
+        sizeof(ic::CallICInfo) * nCallICs +
         sizeof(ic::EqualityICInfo) * nEqualityICs +
         sizeof(ic::TraceICInfo) * nTraceICs +
 #endif
@@ -987,11 +992,11 @@ JITScript::nativeToPC(void *returnAddress) const
 {
     size_t low = 0;
     size_t high = nCallICs;
-    js::mjit::ic::CallIC *callICs_ = callICs();
+    js::mjit::ic::CallICInfo *callICs_ = callICs();
     while (high > low + 1) {
         /* Could overflow here on a script with 2 billion calls. Oh well. */
         size_t mid = (high + low) / 2;
-        void *entry = callICs_[mid].fastPathStart.executableAddress();
+        void *entry = callICs_[mid].funGuard.executableAddress();
 
         /*
          * Use >= here as the return address of the call is likely to be
@@ -1003,9 +1008,9 @@ JITScript::nativeToPC(void *returnAddress) const
             low = mid;
     }
 
-    js::mjit::ic::CallIC &ic = callICs_[low];
+    js::mjit::ic::CallICInfo &ic = callICs_[low];
 
-    JS_ASSERT((uint8*)ic.fastPathStart.executableAddress() + ic.inlineRejoinOffset == returnAddress);
+    JS_ASSERT((uint8*)ic.funGuard.executableAddress() + ic.joinPointOffset == returnAddress);
     return ic.pc;
 }
 
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index 58eddf516870..e1741e95731f 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -100,6 +100,7 @@ struct VMFrame
             void *ptr3;
         } x;
         struct {
+            uint32 lazyArgsObj;
             uint32 dynamicArgc;
         } call;
     } u;
@@ -188,12 +189,6 @@ extern "C" void JaegerStubVeneer(void);
 
 namespace mjit {
 
-enum LookupStatus {
-    Lookup_Error = 0,
-    Lookup_Uncacheable,
-    Lookup_Cacheable
-};
-
 /*
  * Trampolines to force returns from jit code.
  * See also TrampolineCompiler::generateForceReturn(Fast).
@@ -298,7 +293,7 @@ namespace ic {
     struct SetGlobalNameIC;
     struct EqualityICInfo;
     struct TraceICInfo;
-    struct CallIC;
+    struct CallICInfo;
 # endif
 }
 }
@@ -323,6 +318,8 @@ typedef void (JS_FASTCALL *VoidStubJSObj)(VMFrame &, JSObject *);
 typedef void (JS_FASTCALL *VoidStubPC)(VMFrame &, jsbytecode *);
 typedef JSBool (JS_FASTCALL *BoolStubUInt32)(VMFrame &f, uint32);
 #ifdef JS_MONOIC
+typedef void (JS_FASTCALL *VoidStubCallIC)(VMFrame &, js::mjit::ic::CallICInfo *);
+typedef void * (JS_FASTCALL *VoidPtrStubCallIC)(VMFrame &, js::mjit::ic::CallICInfo *);
 typedef void (JS_FASTCALL *VoidStubGetGlobal)(VMFrame &, js::mjit::ic::GetGlobalNameIC *);
 typedef void (JS_FASTCALL *VoidStubSetGlobal)(VMFrame &, js::mjit::ic::SetGlobalNameIC *);
 typedef JSBool (JS_FASTCALL *BoolStubEqualityIC)(VMFrame &, js::mjit::ic::EqualityICInfo *);
@@ -346,7 +343,6 @@ struct NativeMapEntry {
 struct JITScript {
     typedef JSC::MacroAssemblerCodeRef CodeRef;
     CodeRef         code;       /* pool & code addresses */
-    JSScript        *script;    /* parent script */
 
 
     void            *invokeEntry;       /* invoke address */
@@ -364,10 +360,10 @@ struct JITScript {
     uint32          nNmapPairs:31;      /* The NativeMapEntrys are sorted by .bcOff.
                                            .ncode values may not be NULL. */
     bool            singleStepMode:1;   /* compiled in "single step mode" */
-    uint32          nCallICs;
 #ifdef JS_MONOIC
     uint32          nGetGlobalNames;
     uint32          nSetGlobalNames;
+    uint32          nCallICs;
     uint32          nEqualityICs;
     uint32          nTraceICs;
 #endif
@@ -385,10 +381,10 @@ struct JITScript {
 #endif
 
     NativeMapEntry *nmap() const;
-    ic::CallIC *callICs() const;
 #ifdef JS_MONOIC
     ic::GetGlobalNameIC *getGlobalNames() const;
     ic::SetGlobalNameIC *setGlobalNames() const;
+    ic::CallICInfo *callICs() const;
     ic::EqualityICInfo *equalityICs() const;
     ic::TraceICInfo *traceICs() const;
 #endif
@@ -407,10 +403,10 @@ struct JITScript {
         return jcheck >= jitcode && jcheck < jitcode + code.m_size;
     }
 
-    void sweepICs(JSContext *cx);   // After GC, sweeps ICs caching dead objects.
-    void purgeICs(JSContext *cx);   // On pool-decaying GC, removes all extra ICs
-    void purgeMICs();               // Removes mono ICs only, on shape-regen GC
-    void purgePICs();               // Removes poly ICs only, on every GC
+    void nukeScriptDependentICs();
+    void sweepCallICs(JSContext *cx, bool purgeAll);
+    void purgeMICs();
+    void purgePICs();
 
     size_t scriptDataSize();
 
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index ee48097fead2..d3db5ecfecb5 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -48,8 +48,8 @@
 #include "methodjit/CodeGenIncludes.h"
 #include "methodjit/Compiler.h"
 #include "methodjit/ICRepatcher.h"
-#include "methodjit/MethodJIT-inl.h"
 #include "methodjit/PolyIC.h"
+#include "InlineFrameAssembler.h"
 #include "jsobj.h"
 
 #include "jsinterpinlines.h"
@@ -69,7 +69,6 @@ typedef JSC::MacroAssembler::ImmPtr ImmPtr;
 typedef JSC::MacroAssembler::Call Call;
 typedef JSC::MacroAssembler::Label Label;
 typedef JSC::MacroAssembler::DataLabel32 DataLabel32;
-typedef JSC::MacroAssembler::DataLabelPtr DataLabelPtr;
 
 #if defined JS_MONOIC
 
@@ -537,6 +536,505 @@ ic::Equality(VMFrame &f, ic::EqualityICInfo *ic)
     return ic->stub(f);
 }
 
+static void * JS_FASTCALL
+SlowCallFromIC(VMFrame &f, ic::CallICInfo *ic)
+{
+    stubs::SlowCall(f, ic->frameSize.getArgc(f));
+    return NULL;
+}
+
+static void * JS_FASTCALL
+SlowNewFromIC(VMFrame &f, ic::CallICInfo *ic)
+{
+    stubs::SlowNew(f, ic->frameSize.staticArgc());
+    return NULL;
+}
+
+/*
+ * Calls have an inline path and an out-of-line path. The inline path is used
+ * in the fastest case: the method has JIT'd code, and |argc == nargs|.
+ * 
+ * The inline path and OOL path are separated by a guard on the identity of
+ * the callee object. This guard starts as NULL and always fails on the first
+ * hit. On the OOL path, the callee is verified to be both a function and a
+ * scripted function. If these conditions hold, |ic::Call| is invoked.
+ *
+ * |ic::Call| first ensures that the callee has JIT code. If it doesn't, the
+ * call to |ic::Call| is patched to a slow path. If it does have JIT'd code,
+ * the following cases can occur:
+ *
+ *   1) args != nargs: The call to |ic::Call| is patched with a dynamically
+ *      generated stub. This stub inlines a path that looks like:
+ *      ----
+ *      push frame
+ *      if (callee is not compiled) {
+ *          Compile(callee);
+ *      }
+ *      call callee->arityLabel
+ *
+ *      The arity label is a special entry point for correcting frames for
+ *      arity mismatches.
+ *
+ *   2) args == nargs, and the inline call site was not patched yet.
+ *      The guard dividing the two paths is patched to guard on the given
+ *      function object identity, and the proceeding call is patched to
+ *      directly call the JIT code.
+ *
+ *   3) args == nargs, and the inline call site was patched already.
+ *      A small stub is created which extends the original guard to also
+ *      guard on the JSFunction lying underneath the function object.
+ *
+ * If the OOL path does not have a scripted function, but does have a
+ * scripted native, then a small stub is generated which inlines the native
+ * invocation.
+ */
+class CallCompiler : public BaseCompiler
+{
+    VMFrame &f;
+    CallICInfo &ic;
+    bool callingNew;
+
+  public:
+    CallCompiler(VMFrame &f, CallICInfo &ic, bool callingNew)
+      : BaseCompiler(f.cx), f(f), ic(ic), callingNew(callingNew)
+    {
+    }
+
+    JSC::ExecutablePool *poolForSize(LinkerHelper &linker, CallICInfo::PoolIndex index)
+    {
+        JSC::ExecutablePool *ep = linker.init(f.cx);
+        if (!ep)
+            return NULL;
+        JS_ASSERT(!ic.pools[index]);
+        ic.pools[index] = ep;
+        return ep;
+    }
+
+    void disable(JITScript *jit)
+    {
+        JSC::CodeLocationCall oolCall = ic.slowPathStart.callAtOffset(ic.oolCallOffset);
+        Repatcher repatch(jit);
+        JSC::FunctionPtr fptr = callingNew
+                                ? JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, SlowNewFromIC))
+                                : JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, SlowCallFromIC));
+        repatch.relink(oolCall, fptr);
+    }
+
+    bool generateFullCallStub(JITScript *from, JSScript *script, uint32 flags)
+    {
+        /*
+         * Create a stub that works with arity mismatches. Like the fast-path,
+         * this allocates a frame on the caller side, but also performs extra
+         * checks for compilability. Perhaps this should be a separate, shared
+         * trampoline, but for now we generate it dynamically.
+         */
+        Assembler masm;
+        InlineFrameAssembler inlFrame(masm, ic, flags);
+        RegisterID t0 = inlFrame.tempRegs.takeAnyReg();
+
+        /* Generate the inline frame creation. */
+        inlFrame.assemble(ic.funGuard.labelAtOffset(ic.joinPointOffset).executableAddress());
+
+        /* funPtrReg is still valid. Check if a compilation is needed. */
+        Address scriptAddr(ic.funPtrReg, offsetof(JSFunction, u) +
+                           offsetof(JSFunction::U::Scripted, script));
+        masm.loadPtr(scriptAddr, t0);
+
+        /*
+         * Test if script->nmap is NULL - same as checking ncode, but faster
+         * here since ncode has two failure modes and we need to load out of
+         * nmap anyway.
+         */
+        size_t offset = callingNew
+                        ? offsetof(JSScript, jitArityCheckCtor)
+                        : offsetof(JSScript, jitArityCheckNormal);
+        masm.loadPtr(Address(t0, offset), t0);
+        Jump hasCode = masm.branchPtr(Assembler::Above, t0, ImmPtr(JS_UNJITTABLE_SCRIPT));
+
+        /* Try and compile. On success we get back the nmap pointer. */
+        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+        void *compilePtr = JS_FUNC_TO_DATA_PTR(void *, stubs::CompileFunction);
+        if (ic.frameSize.isStatic()) {
+            masm.move(Imm32(ic.frameSize.staticArgc()), Registers::ArgReg1);
+            masm.fallibleVMCall(compilePtr, script->code, ic.frameSize.staticLocalSlots());
+        } else {
+            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), Registers::ArgReg1);
+            masm.fallibleVMCall(compilePtr, script->code, -1);
+        }
+        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+
+        Jump notCompiled = masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
+                                              Registers::ReturnReg);
+
+        masm.jump(Registers::ReturnReg);
+
+        hasCode.linkTo(masm.label(), &masm);
+
+        /* Get nmap[ARITY], set argc, call. */
+        if (ic.frameSize.isStatic())
+            masm.move(Imm32(ic.frameSize.staticArgc()), JSParamReg_Argc);
+        else
+            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
+        masm.jump(t0);
+
+        LinkerHelper linker(masm);
+        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_ScriptStub);
+        if (!ep)
+            return false;
+
+        if (!linker.verifyRange(from)) {
+            disable(from);
+            return true;
+        }
+
+        linker.link(notCompiled, ic.slowPathStart.labelAtOffset(ic.slowJoinOffset));
+        JSC::CodeLocationLabel cs = linker.finalize();
+
+        JaegerSpew(JSpew_PICs, "generated CALL stub %p (%d bytes)\n", cs.executableAddress(),
+                   masm.size());
+
+        Repatcher repatch(from);
+        JSC::CodeLocationJump oolJump = ic.slowPathStart.jumpAtOffset(ic.oolJumpOffset);
+        repatch.relink(oolJump, cs);
+
+        return true;
+    }
+
+    bool patchInlinePath(JITScript *from, JSScript *script, JSObject *obj)
+    {
+        JS_ASSERT(ic.frameSize.isStatic());
+        JITScript *jit = script->getJIT(callingNew);
+
+        /* Very fast path. */
+        Repatcher repatch(from);
+
+        if (!repatch.canRelink(ic.funGuard.jumpAtOffset(ic.hotJumpOffset),
+                               JSC::CodeLocationLabel(jit->fastEntry))) {
+            return false;
+        }
+
+        ic.fastGuardedObject = obj;
+
+        repatch.repatch(ic.funGuard, obj);
+        repatch.relink(ic.funGuard.jumpAtOffset(ic.hotJumpOffset),
+                       JSC::CodeLocationLabel(jit->fastEntry));
+
+        JaegerSpew(JSpew_PICs, "patched CALL path %p (obj: %p)\n",
+                   ic.funGuard.executableAddress(), ic.fastGuardedObject);
+
+        return true;
+    }
+
+    bool generateStubForClosures(JITScript *from, JSObject *obj)
+    {
+        JS_ASSERT(ic.frameSize.isStatic());
+
+        /* Slightly less fast path - guard on fun->getFunctionPrivate() instead. */
+        Assembler masm;
+
+        Registers tempRegs;
+        tempRegs.takeReg(ic.funObjReg);
+
+        RegisterID t0 = tempRegs.takeAnyReg();
+
+        /* Guard that it's actually a function object. */
+        Jump claspGuard = masm.testObjClass(Assembler::NotEqual, ic.funObjReg, &js_FunctionClass);
+
+        /* Guard that it's the same function. */
+        JSFunction *fun = obj->getFunctionPrivate();
+        masm.loadObjPrivate(ic.funObjReg, t0);
+        Jump funGuard = masm.branchPtr(Assembler::NotEqual, t0, ImmPtr(fun));
+        Jump done = masm.jump();
+
+        LinkerHelper linker(masm);
+        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_ClosureStub);
+        if (!ep)
+            return false;
+
+        ic.hasJsFunCheck = true;
+
+        if (!linker.verifyRange(from)) {
+            disable(from);
+            return true;
+        }
+
+        linker.link(claspGuard, ic.slowPathStart);
+        linker.link(funGuard, ic.slowPathStart);
+        linker.link(done, ic.funGuard.labelAtOffset(ic.hotPathOffset));
+        JSC::CodeLocationLabel cs = linker.finalize();
+
+        JaegerSpew(JSpew_PICs, "generated CALL closure stub %p (%d bytes)\n",
+                   cs.executableAddress(), masm.size());
+
+        Repatcher repatch(from);
+        repatch.relink(ic.funJump, cs);
+
+        return true;
+    }
+
+    bool generateNativeStub()
+    {
+        JITScript *jit = f.jit();
+
+        /* Snapshot the frameDepth before SplatApplyArgs modifies it. */
+        uintN initialFrameDepth = f.regs.sp - f.regs.fp->slots();
+
+        /*
+         * SplatApplyArgs has not been called, so we call it here before
+         * potentially touching f.u.call.dynamicArgc.
+         */
+        Value *vp;
+        if (ic.frameSize.isStatic()) {
+            JS_ASSERT(f.regs.sp - f.regs.fp->slots() == (int)ic.frameSize.staticLocalSlots());
+            vp = f.regs.sp - (2 + ic.frameSize.staticArgc());
+        } else {
+            JS_ASSERT(*f.regs.pc == JSOP_FUNAPPLY && GET_ARGC(f.regs.pc) == 2);
+            if (!ic::SplatApplyArgs(f))       /* updates regs.sp */
+                THROWV(true);
+            vp = f.regs.sp - (2 + f.u.call.dynamicArgc);
+        }
+
+        JSObject *obj;
+        if (!IsFunctionObject(*vp, &obj))
+            return false;
+
+        JSFunction *fun = obj->getFunctionPrivate();
+        if ((!callingNew && !fun->isNative()) || (callingNew && !fun->isConstructor()))
+            return false;
+
+        if (callingNew)
+            vp[1].setMagicWithObjectOrNullPayload(NULL);
+
+        if (!CallJSNative(cx, fun->u.n.native, ic.frameSize.getArgc(f), vp))
+            THROWV(true);
+
+        /* Right now, take slow-path for IC misses or multiple stubs. */
+        if (ic.fastGuardedNative || ic.hasJsFunCheck)
+            return true;
+
+        /* Native MIC needs to warm up first. */
+        if (!ic.hit) {
+            ic.hit = true;
+            return true;
+        }
+
+        /* Generate fast-path for calling this native. */
+        Assembler masm;
+
+        /* Guard on the function object identity, for now. */
+        Jump funGuard = masm.branchPtr(Assembler::NotEqual, ic.funObjReg, ImmPtr(obj));
+
+        /* N.B. After this call, the frame will have a dynamic frame size. */
+        if (ic.frameSize.isDynamic()) {
+            masm.fallibleVMCall(JS_FUNC_TO_DATA_PTR(void *, ic::SplatApplyArgs),
+                                f.regs.pc, initialFrameDepth);
+        }
+
+        Registers tempRegs;
+#ifndef JS_CPU_X86
+        tempRegs.takeReg(Registers::ArgReg0);
+        tempRegs.takeReg(Registers::ArgReg1);
+        tempRegs.takeReg(Registers::ArgReg2);
+#endif
+        RegisterID t0 = tempRegs.takeAnyReg();
+
+        /* Store pc. */
+        masm.storePtr(ImmPtr(cx->regs->pc),
+                       FrameAddress(offsetof(VMFrame, regs.pc)));
+
+        /* Store sp (if not already set by ic::SplatApplyArgs). */
+        if (ic.frameSize.isStatic()) {
+            uint32 spOffset = sizeof(JSStackFrame) + initialFrameDepth * sizeof(Value);
+            masm.addPtr(Imm32(spOffset), JSFrameReg, t0);
+            masm.storePtr(t0, FrameAddress(offsetof(VMFrame, regs.sp)));
+        }
+
+        /* Store fp. */
+        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+
+        /* Grab cx. */
+#ifdef JS_CPU_X86
+        RegisterID cxReg = tempRegs.takeAnyReg();
+#else
+        RegisterID cxReg = Registers::ArgReg0;
+#endif
+        masm.loadPtr(FrameAddress(offsetof(VMFrame, cx)), cxReg);
+
+        /* Compute vp. */
+#ifdef JS_CPU_X86
+        RegisterID vpReg = t0;
+#else
+        RegisterID vpReg = Registers::ArgReg2;
+#endif
+        MaybeRegisterID argcReg;
+        if (ic.frameSize.isStatic()) {
+            uint32 vpOffset = sizeof(JSStackFrame) + (vp - f.regs.fp->slots()) * sizeof(Value);
+            masm.addPtr(Imm32(vpOffset), JSFrameReg, vpReg);
+        } else {
+            argcReg = tempRegs.takeAnyReg();
+            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), argcReg.reg());
+            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), vpReg);
+
+            /* vpOff = (argc + 2) * sizeof(Value) */
+            RegisterID vpOff = tempRegs.takeAnyReg();
+            masm.move(argcReg.reg(), vpOff);
+            masm.add32(Imm32(2), vpOff);  /* callee, this */
+            JS_STATIC_ASSERT(sizeof(Value) == 8);
+            masm.lshift32(Imm32(3), vpOff);
+            masm.subPtr(vpOff, vpReg);
+
+            tempRegs.putReg(vpOff);
+        }
+
+        /* Mark vp[1] as magic for |new|. */
+        if (callingNew) {
+            Value v;
+            v.setMagicWithObjectOrNullPayload(NULL);
+            masm.storeValue(v, Address(vpReg, sizeof(Value)));
+        }
+
+        masm.setupABICall(Registers::NormalCall, 3);
+        masm.storeArg(2, vpReg);
+        if (ic.frameSize.isStatic())
+            masm.storeArg(1, Imm32(ic.frameSize.staticArgc()));
+        else
+            masm.storeArg(1, argcReg.reg());
+        masm.storeArg(0, cxReg);
+
+        js::Native native = fun->u.n.native;
+
+        /*
+         * Call RegExp.test instead of exec if the result will not be used or
+         * will only be used to test for existence.
+         */
+        if (native == js_regexp_exec && !CallResultEscapes(f.regs.pc))
+            native = js_regexp_test;
+
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, native), false);
+
+        Jump hasException = masm.branchTest32(Assembler::Zero, Registers::ReturnReg,
+                                              Registers::ReturnReg);
+        
+
+        Jump done = masm.jump();
+
+        /* Move JaegerThrowpoline into register for very far jump on x64. */
+        hasException.linkTo(masm.label(), &masm);
+        masm.throwInJIT();
+
+        LinkerHelper linker(masm);
+        JSC::ExecutablePool *ep = poolForSize(linker, CallICInfo::Pool_NativeStub);
+        if (!ep)
+            THROWV(true);
+
+        ic.fastGuardedNative = obj;
+
+        if (!linker.verifyRange(jit)) {
+            disable(jit);
+            return true;
+        }
+
+        linker.link(done, ic.slowPathStart.labelAtOffset(ic.slowJoinOffset));
+        linker.link(funGuard, ic.slowPathStart);
+        JSC::CodeLocationLabel cs = linker.finalize();
+
+        JaegerSpew(JSpew_PICs, "generated native CALL stub %p (%d bytes)\n",
+                   cs.executableAddress(), masm.size());
+
+        Repatcher repatch(jit);
+        repatch.relink(ic.funJump, cs);
+
+        return true;
+    }
+
+    void *update()
+    {
+        JITScript *jit = f.jit();
+
+        stubs::UncachedCallResult ucr;
+        if (callingNew)
+            stubs::UncachedNewHelper(f, ic.frameSize.staticArgc(), &ucr);
+        else
+            stubs::UncachedCallHelper(f, ic.frameSize.getArgc(f), &ucr);
+
+        // If the function cannot be jitted (generally unjittable or empty script),
+        // patch this site to go to a slow path always.
+        if (!ucr.codeAddr) {
+            if (ucr.unjittable)
+                disable(jit);
+            return NULL;
+        }
+            
+        JSFunction *fun = ucr.fun;
+        JS_ASSERT(fun);
+        JSScript *script = fun->script();
+        JS_ASSERT(script);
+        JSObject *callee = ucr.callee;
+        JS_ASSERT(callee);
+
+        uint32 flags = callingNew ? JSFRAME_CONSTRUCTING : 0;
+
+        if (!ic.hit) {
+            ic.hit = true;
+            return ucr.codeAddr;
+        }
+
+        if (!ic.frameSize.isStatic() || ic.frameSize.staticArgc() != fun->nargs) {
+            if (!generateFullCallStub(jit, script, flags))
+                THROWV(NULL);
+        } else {
+            if (!ic.fastGuardedObject && patchInlinePath(jit, script, callee)) {
+                // Nothing, done.
+            } else if (ic.fastGuardedObject &&
+                       !ic.hasJsFunCheck &&
+                       !ic.fastGuardedNative &&
+                       ic.fastGuardedObject->getFunctionPrivate() == fun) {
+                /*
+                 * Note: Multiple "function guard" stubs are not yet
+                 * supported, thus the fastGuardedNative check.
+                 */
+                if (!generateStubForClosures(jit, callee))
+                    THROWV(NULL);
+            } else {
+                if (!generateFullCallStub(jit, script, flags))
+                    THROWV(NULL);
+            }
+        }
+
+        return ucr.codeAddr;
+    }
+};
+
+void * JS_FASTCALL
+ic::Call(VMFrame &f, CallICInfo *ic)
+{
+    CallCompiler cc(f, *ic, false);
+    return cc.update();
+}
+
+void * JS_FASTCALL
+ic::New(VMFrame &f, CallICInfo *ic)
+{
+    CallCompiler cc(f, *ic, true);
+    return cc.update();
+}
+
+void JS_FASTCALL
+ic::NativeCall(VMFrame &f, CallICInfo *ic)
+{
+    CallCompiler cc(f, *ic, false);
+    if (!cc.generateNativeStub())
+        stubs::SlowCall(f, ic->frameSize.getArgc(f));
+}
+
+void JS_FASTCALL
+ic::NativeNew(VMFrame &f, CallICInfo *ic)
+{
+    CallCompiler cc(f, *ic, true);
+    if (!cc.generateNativeStub())
+        stubs::SlowNew(f, ic->frameSize.staticArgc());
+}
+
 static const unsigned MANY_ARGS = 1024;
 static const unsigned MIN_SPACE = 500;
 
@@ -598,7 +1096,6 @@ BumpStack(VMFrame &f, uintN inc)
  * All successful paths through SplatApplyArgs must set f.u.call.dynamicArgc
  * and f.regs.sp.
  */
-template <bool LazyArgsObj>
 JSBool JS_FASTCALL
 ic::SplatApplyArgs(VMFrame &f)
 {
@@ -616,7 +1113,7 @@ ic::SplatApplyArgs(VMFrame &f)
      *
      *  | Function.prototype.apply | f | x | arguments |
      */
-    if (LazyArgsObj) {
+    if (f.u.call.lazyArgsObj) {
         Value *vp = f.regs.sp - 3;
         JS_ASSERT(JS_CALLEE(cx, vp).toObject().getFunctionPrivate()->u.n.native == js_fun_apply);
 
@@ -711,561 +1208,6 @@ ic::SplatApplyArgs(VMFrame &f)
     f.u.call.dynamicArgc = n;
     return true;
 }
-template JSBool JS_FASTCALL ic::SplatApplyArgs<true>(VMFrame &f);
-template JSBool JS_FASTCALL ic::SplatApplyArgs<false>(VMFrame &f);
-
-template <bool IsNew>
-static bool
-CallHelper(VMFrame &f, ic::CallIC *ic, CallDescription &call)
-{
-    Value *vp = f.regs.sp - (2 + call.argc);
-
-    // Take the slowest path if the callee is not a funobj, or if the function
-    // is native and constructing.
-    if (vp->isObject()) {
-        call.callee = &vp->toObject();
-        call.fun = call.callee->isFunction() ? call.callee->getFunctionPrivate() : NULL;
-    } else {
-        call.callee = call.fun = NULL;
-    }
-
-    if (!call.fun || call.fun->isNative()) {
-        if (IsNew)
-            return InvokeConstructor(f.cx, InvokeArgsAlreadyOnTheStack(vp, call.argc));
-        if (!call.fun)
-            return Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, call.argc), 0);
-        return CallJSNative(f.cx, call.fun->u.n.native, call.argc, vp);
-    }
-
-    // The function is interpreted.
-    uint32 flags = IsNew ? JSFRAME_CONSTRUCTING : 0;
-    JSScript *newscript = call.fun->script();
-    StackSpace &stack = f.cx->stack();
-    JSStackFrame *newfp = stack.getInlineFrameWithinLimit(f.cx, f.regs.sp, call.argc,
-                                                          call.fun, newscript, &flags,
-                                                          f.entryfp, &f.stackLimit);
-    if (!newfp)
-        return false;
-
-    // Initialize the frame and locals.
-    newfp->initCallFrame(f.cx, *call.callee, call.fun, call.argc, flags);
-    SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
-
-    // Officially push the frame.
-    stack.pushInlineFrame(f.cx, newscript, newfp, &f.regs);
-    JS_ASSERT(newfp == f.regs.fp);
-
-    /* Scope with a call object parented by callee's parent. */
-    if (call.fun->isHeavyweight() && !js::CreateFunCallObject(f.cx, newfp))
-        return false;
-
-    // Try to compile the method if it's not already compiled.
-    call.unjittable = false;
-    if (newscript->getJITStatus(IsNew) == JITScript_None) {
-        CompileStatus status = CanMethodJIT(f.cx, newscript, newfp, CompileRequest_Interpreter);
-        if (status == Compile_Error) {
-            // A runtime exception was thrown, get out.
-            InlineReturn(f);
-            return false;
-        }
-        if (status == Compile_Abort)
-            call.unjittable = true;
-    }
-
-    // If the script was successfully compiled, we're now done.
-    if (JITScript *jit = newscript->getJIT(IsNew)) {
-        newfp->setNativeReturnAddress(ic->returnAddress());
-        call.code = jit->invokeEntry;
-        return true;
-    }
-
-    // Otherwise, run the script in the interpreter.
-    bool ok = !!Interpret(f.cx, f.fp());
-    InlineReturn(f);
-    call.code = NULL;
-
-    return ok;
-}
-
-template <bool IsNew, bool UpdateIC>
-static bool
-CallICTail(VMFrame &f, ic::CallIC *ic, CallDescription &call)
-{
-    JITScript *jit = f.jit();
-    (void)jit;
-
-    if (!CallHelper<IsNew>(f, ic, call))
-        return false;
-    if (UpdateIC) {
-        if (!ic->update(f.cx, jit, call))
-            return false;
-    }
-    return true;
-}
-
-void * JS_FASTCALL
-ic::FailedFunApplyLazyArgs(VMFrame &f, ic::CallIC *ic)
-{
-    // Reify the lazy argsobj.
-    f.regs.sp++;
-    if (!js_GetArgsValue(f.cx, f.fp(), &f.regs.sp[-1]))
-        THROWV(NULL);
-    return ic::FailedFunApply(f, ic);
-}
-
-void * JS_FASTCALL
-ic::FailedFunApply(VMFrame &f, ic::CallIC *ic)
-{
-    CallDescription call(2);
-    if (!CallICTail<false, false>(f, ic, call))
-        THROWV(NULL);
-    return call.code;
-}
-
-void * JS_FASTCALL
-ic::FailedFunCall(VMFrame &f, ic::CallIC *ic)
-{
-    CallDescription call(ic->frameSize.staticArgc() + 1);
-    if (!CallICTail<false, false>(f, ic, call))
-        THROWV(NULL);
-    return call.code;
-}
-
-template <bool DynamicArgc, bool UpdateIC>
-void * JS_FASTCALL
-ic::Call(VMFrame &f, ic::CallIC *ic)
-{
-    CallDescription call(DynamicArgc
-                         ? f.u.call.dynamicArgc
-                         : ic->frameSize.staticArgc());
-    if (!CallICTail<false, UpdateIC>(f, ic, call))
-        THROWV(NULL);
-    return call.code;
-}
-template void * JS_FASTCALL ic::Call<true, true>(VMFrame &f, ic::CallIC *ic);
-template void * JS_FASTCALL ic::Call<true, false>(VMFrame &f, ic::CallIC *ic);
-template void * JS_FASTCALL ic::Call<false, true>(VMFrame &f, ic::CallIC *ic);
-template void * JS_FASTCALL ic::Call<false, false>(VMFrame &f, ic::CallIC *ic);
-
-template <bool UpdateIC>
-void * JS_FASTCALL
-ic::New(VMFrame &f, ic::CallIC *ic)
-{
-    CallDescription call(ic->frameSize.staticArgc());
-    if (!CallICTail<true, UpdateIC>(f, ic, call))
-        THROWV(NULL);
-    return call.code;
-}
-template void * JS_FASTCALL ic::New<true>(VMFrame &f, ic::CallIC *ic);
-template void * JS_FASTCALL ic::New<false>(VMFrame &f, ic::CallIC *ic);
-
-JSOp
-ic::CallIC::op() const
-{
-    return JSOp(*pc);
-}
-
-class CallAssembler
-{
-    JSContext *cx;
-    const ic::CallIC &ic;
-    JITScript *jit;
-    CallDescription &call;
-    Registers tempRegs;
-
-    // Guards that always go to the slowest path.
-    MaybeJump claspGuard;
-
-    // Must be patched during linking.
-    MaybeJump nativeDone;
-    MaybeJump takeSlowPath;
-    MaybeJump interpDone;
-
-  public:
-    Assembler masm;
-
-  public:
-    CallAssembler(JSContext *cx, ic::CallIC &ic, JITScript *jit, CallDescription &call)
-      : cx(cx),
-        ic(ic),
-        jit(jit),
-        call(call)
-    {
-        tempRegs.takeReg(ic.calleeData);
-    }
-
-    void emitStaticFrame(uint32 frameDepth)
-    {
-        masm.emitStaticFrame(ic.op() == JSOP_NEW, frameDepth, ic.returnAddress());
-    }
-
-    void emitDynamicFrame()
-    {
-        RegisterID newfp = tempRegs.takeAnyReg();
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), newfp);
-    
-        Address flagsAddr(newfp, JSStackFrame::offsetOfFlags());
-        uint32 extraFlags = (ic.op() == JSOP_NEW) ? JSFRAME_CONSTRUCTING : 0;
-        masm.store32(Imm32(JSFRAME_FUNCTION | extraFlags), flagsAddr);
-    
-        Address prevAddr(newfp, JSStackFrame::offsetOfPrev());
-        masm.storePtr(JSFrameReg, prevAddr);
-    
-        Address ncodeAddr(newfp, JSStackFrame::offsetOfncode());
-        masm.storePtr(ImmPtr(ic.returnAddress()), ncodeAddr);
-    
-        masm.move(newfp, JSFrameReg);
-        tempRegs.putReg(newfp);
-    }
-
-    Jump emitNativeCall(Native native)
-    {
-        // Call RegExp.test instead of exec if the result will not eb used or
-        // will only be used to test for existance.
-        if (native == js_regexp_exec && !CallResultEscapes(cx->regs->pc))
-            native = js_regexp_test;
-
-        Registers tempRegs; // note, separate from member variable for convenience.
-#ifndef JS_CPU_X86
-        tempRegs.takeReg(Registers::ArgReg0);
-        tempRegs.takeReg(Registers::ArgReg1);
-        tempRegs.takeReg(Registers::ArgReg2);
-#endif
-
-        // Store the PC.
-        masm.storePtr(ImmPtr(ic.pc), FrameAddress(offsetof(VMFrame, regs.pc)));
-
-        // Store |sp| (SplatApplyArgs has already been called so that's not
-        // needed here).
-        RegisterID t0 = tempRegs.takeAnyReg();
-        if (ic.frameSize.isStatic()) {
-            uint32 spOffset = sizeof(JSStackFrame) + ic.frameSize.staticLocalSlots() * sizeof(Value);
-            masm.addPtr(Imm32(spOffset), JSFrameReg, t0);
-            masm.storePtr(t0, FrameAddress(offsetof(VMFrame, regs.sp)));
-        }
-
-        // Store the frame pointer.
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
-
-        // Grab cx.
-#ifdef JS_CPU_X86
-        RegisterID cxReg = tempRegs.takeAnyReg();
-#else
-        RegisterID cxReg = Registers::ArgReg0;
-#endif
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, cx)), cxReg);
-
-        // Compute vp.
-#ifdef JS_CPU_X86
-        RegisterID argcReg = tempRegs.takeAnyReg();
-        RegisterID vpReg = t0;
-#else
-        RegisterID argcReg = Registers::ArgReg1;
-        RegisterID vpReg = Registers::ArgReg2;
-#endif
-        if (ic.frameSize.isStatic()) {
-            uint32 vpOffset = ic.frameSize.staticLocalSlots() - (ic.frameSize.staticArgc() + 2);
-            masm.addPtr(Imm32(sizeof(JSStackFrame) + vpOffset * sizeof(Value)), JSFrameReg, vpReg);
-        } else {
-            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), argcReg);
-            masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), vpReg);
-
-            // vpOff = (argc + 2) * sizeof(Value)
-            RegisterID vpOff = tempRegs.takeAnyReg();
-            masm.move(argcReg, vpOff);
-            masm.add32(Imm32(2), vpOff); // callee, this
-            JS_STATIC_ASSERT(sizeof(Value) == 8);
-            masm.lshift32(Imm32(3), vpOff);
-            masm.subPtr(vpOff, vpReg);
-            tempRegs.putReg(vpOff);
-        }
-
-        // Mark vp[1] as magic for |new|.
-        if (ic.op() == JSOP_NEW) {
-            Value v;
-            v.setMagicWithObjectOrNullPayload(NULL);
-            masm.storeValue(v, Address(vpReg, sizeof(Value)));
-        }
-
-        masm.setupABICall(Registers::NormalCall, 3);
-        masm.storeArg(2, vpReg);
-        if (ic.frameSize.isStatic())
-            masm.storeArg(1, Imm32(ic.frameSize.staticArgc()));
-        else
-            masm.storeArg(1, argcReg);
-        masm.storeArg(0, cxReg);
-        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, native), false);
-
-        Jump hasException = masm.branchTest32(Assembler::Zero, Registers::ReturnReg,
-                                              Registers::ReturnReg);
-
-        Address rval(JSFrameReg, ic.rvalOffset);
-        masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
-        Jump done = masm.jump();
-
-        hasException.linkTo(masm.label(), &masm);
-        masm.throwInJIT();
-
-        return done;
-    }
-
-    void emitLoadArgc(RegisterID reg)
-    {
-        if (ic.frameSize.isStatic())
-            masm.move(Imm32(ic.frameSize.staticArgc()), reg);
-        else
-            masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), reg);
-    }
-
-    void emitGeneric()
-    {
-        RegisterID tmp = tempRegs.takeAnyReg();
-
-        // ic.calleeData is definitely a funobj at this point.
-        masm.loadObjPrivate(ic.calleeData, ic.calleeData);
-        masm.load16(Address(ic.calleeData, offsetof(JSFunction, flags)), tmp);
-        masm.and32(Imm32(JSFUN_KINDMASK), tmp);
-
-        takeSlowPath = masm.branch32(Assembler::Below, tmp, Imm32(JSFUN_INTERPRETED));
-        if (ic.frameSize.isStatic())
-            emitStaticFrame(ic.frameSize.staticLocalSlots());
-        else
-            emitDynamicFrame();
-
-        Address scriptAddr(ic.calleeData, offsetof(JSFunction, u.i.script));
-        masm.loadPtr(scriptAddr, tmp);
-
-        // Test if the script has JIT code.
-        size_t offset = (ic.op() == JSOP_NEW)
-                        ? offsetof(JSScript, jitArityCheckCtor)
-                        : offsetof(JSScript, jitArityCheckNormal);
-        masm.loadPtr(Address(tmp, offset), Registers::ReturnReg);
-        Jump hasCode = masm.branchPtr(Assembler::Above, Registers::ReturnReg,
-                                      ImmPtr(JS_UNJITTABLE_SCRIPT));
-
-        // Try and compile. On success we get back the nmap pointer.
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
-        emitLoadArgc(Registers::ArgReg1);
-
-        void *ptr = JS_FUNC_TO_DATA_PTR(void *, stubs::CompileFunction);
-        if (ic.frameSize.isStatic())
-            masm.fallibleVMCall(ptr, NULL, ic.frameSize.staticLocalSlots());
-        else
-            masm.fallibleVMCall(ptr, NULL, -1);
-
-        // Must reload JSFrameReg since CompileFunction could re-adjust it.
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-
-        // NULL return means Interpret() was called, and this will jump to the
-        // "completed call" join point. Otherwise, we jump directly to JIT
-        // code: the frame is setup and ncode (the "inline call" join point)
-        // has been stored one way or another.
-        interpDone = masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
-                                        Registers::ReturnReg);
-
-        masm.jump(Registers::ReturnReg);
-
-        hasCode.linkTo(masm.label(), &masm);
-        emitLoadArgc(JSParamReg_Argc);
-        masm.jump(Registers::ReturnReg);
-    }
-
-    bool link(Repatcher &repatcher)
-    {
-        JS_ASSERT(!ic.pool);
-        JS_ASSERT(!ic.guardedNative);
-
-        LinkerHelper linker(masm);
-        JSC::ExecutablePool *ep = linker.init(cx);
-        if (!ep)
-            return false;
-        if (!linker.verifyRange(jit)) {
-            ep->release();
-            return true;
-        }
-
-        ic.pool = ep;
-        linker.link(claspGuard.get(), ic.slowPathStart);
-        linker.link(takeSlowPath.get(), ic.slowPathStart);
-        linker.link(interpDone.get(), ic.completedRejoinLabel());
-
-        if (nativeDone.isSet()) {
-            // Note: jump to the "completed call" finish point, not the inline
-            // call finish point.
-            linker.link(nativeDone.get(), ic.completedRejoinLabel());
-            ic.guardedNative = call.callee;
-        }
-
-        JSC::CodeLocationLabel cs = linker.finalize();
-        JaegerSpew(JSpew_PICs, "generated call IC at %p\n", cs.executableAddress());
-
-        // Finally, patch the inline path.
-        repatcher.relink(ic.inlineJump(), cs);
-        return true;
-    }
-
-  public:
-    bool assemble(Repatcher &repatcher)
-    {
-        // Call ICs generate one or more fast-paths. The fast paths fall into
-        // the following categories:
-        //
-        // Monomorphic scripted function-object, with matching args:
-        //   After a type check and callee guard, frame creation is completely
-        //   inlined, as is the function invocaton. If the callee guard fails,
-        //   there is an additional path that tries to unravel the funobj to
-        //   see if its internal JSFunction matches.
-        //
-        // Monomorphic native function-object:
-        //   After a type check and callee guard, native invocation is
-        //   completely inlined.
-        //
-        // If these guards fail, a slow path is taken instead. The slow path
-        // checks whether the callee is a function or not, and then, whether it
-        // is scripted or native. If not a function, it jumps back to the OOL
-        // path. If scripted, it attempts an inline call (and may try to compile
-        // an uncompiled function). If native, it goes to the slow path, but
-        // it would not be difficult to invoke a generic native handler using
-        // the same emitNativeCall() routine.
- 
-        // If there's a native, generate a specialized path to call it.
-        MaybeJump calleeGuard;
-        if (call.fun->isNative()) {
-            calleeGuard = masm.branchPtr(Assembler::NotEqual, ic.calleeData, ImmPtr(call.callee));
-            nativeDone = emitNativeCall(call.fun->u.n.native);
-        }
-    
-        // Emit a general call path. We reach this if all callee guards fail, or
-        // if the frame size is dynamic (fun.apply speculation), this path is
-        // always taken. Note that the clasp guard might already have been
-        // emitted.
-        if (calleeGuard.isSet())
-            calleeGuard.get().linkTo(masm.label(), &masm);
-        claspGuard = masm.testFunction(Assembler::NotEqual, ic.calleeData);
-
-        emitGeneric();
-
-        return link(repatcher);
-    }
-};
-
-typedef void * (JS_FASTCALL *CallICFun)(VMFrame &, ic::CallIC *);
-template <bool UpdateIC>
-CallICFun GetCallICFun(JSOp op, const FrameSize &frameSize)
-{
-    if (op == JSOP_NEW)
-        return ic::New<UpdateIC>;
-    if (frameSize.isStatic())
-        return ic::Call<false, UpdateIC>;
-    return ic::Call<true, UpdateIC>;
-}
-
-void
-CallIC::disable(Repatcher &repatcher)
-{
-    CallICFun fun = GetCallICFun<false>(op(), frameSize);
-    repatcher.relink(slowCall(), JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, fun)));
-}
-
-void
-CallIC::reenable(JITScript *jit, Repatcher &repatcher)
-{
-    // Never re-enable if in debug mode.
-    if (jit->script->debugMode)
-        return;
-    CallICFun fun = GetCallICFun<true>(op(), frameSize);
-    repatcher.relink(slowCall(), JSC::FunctionPtr(JS_FUNC_TO_DATA_PTR(void *, fun)));
-}
-
-void
-CallIC::purgeInlineGuard(Repatcher &repatcher)
-{
-    JS_ASSERT(hasExtendedInlinePath);
-    repatcher.repatch(calleePtr(), NULL);
-    inlineCallee = NULL;
-}
-
-void
-CallIC::purgeStub(Repatcher &repatcher)
-{
-    repatcher.relink(inlineJump(), slowPathStart);
-    pool->release();
-    pool = NULL;
-    guardedNative = NULL;
-}
-
-void
-CallIC::purge(JITScript *jit, Repatcher &repatcher)
-{
-    reenable(jit, repatcher);
-    if (inlineCallee)
-        purgeInlineGuard(repatcher);
-    if (pool)
-        purgeStub(repatcher);
-}
-
-bool
-CallIC::shouldDisable(JSContext *cx, JITScript *jit, CallDescription &call)
-{
-    // Callee is not a funobj, don't bother caching.
-    if (!call.fun)
-        return true;
-
-    // If interpreted and unjittable, also don't bother caching.
-    if (call.fun->isInterpreted() && call.unjittable)
-        return true;
-
-    // CallICs do not support debug mode yet.
-    JS_ASSERT(!jit->script->debugMode);
-    return false;
-}
-
-bool
-CallIC::update(JSContext *cx, JITScript *jit, CallDescription &call)
-{
-    if (shouldDisable(cx, jit, call)) {
-        Repatcher repatcher(jit);
-        disable(repatcher);
-        return true;
-    }
-
-    // If the callee is interpreted, but doesn't yet have JIT code, delay
-    // building the IC until it has become hot enough to compile.
-    if (call.fun->isInterpreted() && !call.code) {
-        // This should have been caught earlier.
-        JS_ASSERT(!call.unjittable);
-        return true;
-    }
-
-    // Disable the IC builder now that we'll be attaching one IC.
-    Repatcher repatcher(jit);
-    disable(repatcher);
-
-    // At this point, the IC is probably incomplete in one of two ways:
-    // (1) The inline path is not patched (either unhit or GC'd), or
-    // (2) There is no generated stub (either unhit or GC'd).
-
-    // Try to patch the inline path, if we can.
-    if (call.fun->isInterpreted() &&
-        hasExtendedInlinePath &&
-        frameSize.staticArgc() == call.fun->nargs &&
-        !inlineCallee)
-    {
-        JS_ASSERT(cx->fp()->jit() == call.fun->script()->getJIT(op() == JSOP_NEW));
-
-        JSC::CodeLocationLabel target(cx->fp()->jit()->fastEntry);
-        repatcher.relink(inlineCall(), target);
-        repatcher.repatch(calleePtr(), call.callee);
-        inlineCallee = call.callee;
-    }
-
-    // Always generate a stub.
-    if (!pool) {
-        CallAssembler ca(cx, *this, jit, call);
-        return ca.assemble(repatcher);
-    }
-    return true;
-}
 
 void
 JITScript::purgeMICs()
@@ -1307,26 +1249,28 @@ ic::PurgeMICs(JSContext *cx, JSScript *script)
 }
 
 void
-JITScript::sweepICs(JSContext *cx)
+JITScript::nukeScriptDependentICs()
 {
+    if (!nCallICs)
+        return;
+
     Repatcher repatcher(this);
 
-    ic::CallIC *callICs_ = callICs();
+    ic::CallICInfo *callICs_ = callICs();
     for (uint32 i = 0; i < nCallICs; i++) {
-        ic::CallIC &ic = callICs_[i];
-        bool killedInline = ic.inlineCallee && IsAboutToBeFinalized(cx, ic.inlineCallee);
-        bool killedNative = ic.guardedNative && IsAboutToBeFinalized(cx, ic.guardedNative);
-        if (killedInline)
-            ic.purgeInlineGuard(repatcher);
-        if (killedNative)
-            ic.purgeStub(repatcher);
-        if (killedInline || killedNative)
-            ic.reenable(this, repatcher);
+        ic::CallICInfo &ic = callICs_[i];
+        if (!ic.fastGuardedObject)
+            continue;
+        repatcher.repatch(ic.funGuard, NULL);
+        repatcher.relink(ic.funJump, ic.slowPathStart);
+        ic.releasePool(CallICInfo::Pool_ClosureStub);
+        ic.fastGuardedObject = NULL;
+        ic.hasJsFunCheck = false;
     }
 }
 
 void
-JITScript::purgeICs(JSContext *cx)
+JITScript::sweepCallICs(JSContext *cx, bool purgeAll)
 {
     Repatcher repatcher(this);
 
@@ -1336,58 +1280,96 @@ JITScript::purgeICs(JSContext *cx)
      * alive pools that we are trying to destroy (see JSCompartment::sweep).
      */
 
-    uint32 released = 0;
+    ic::CallICInfo *callICs_ = callICs();
+    for (uint32 i = 0; i < nCallICs; i++) {
+        ic::CallICInfo &ic = callICs_[i];
 
-    ic::CallIC *callICs_ = callICs();
-    for (uint32 i = 0; i < nCallICs; i++)
-        callICs_[i].purge(this, repatcher);
+        /*
+         * If the object is unreachable, we're guaranteed not to be currently
+         * executing a stub generated by a guard on that object. This lets us
+         * precisely GC call ICs while keeping the identity guard safe.
+         */
+        bool fastFunDead = ic.fastGuardedObject &&
+            (purgeAll || IsAboutToBeFinalized(cx, ic.fastGuardedObject));
+        bool nativeDead = ic.fastGuardedNative &&
+            (purgeAll || IsAboutToBeFinalized(cx, ic.fastGuardedNative));
 
-    ic::EqualityICInfo *equalityICs_ = equalityICs();
-    for (uint32 i = 0; i < nEqualityICs; i++) {
-        ic::EqualityICInfo &ic = equalityICs_[i];
-        if (!ic.generated)
-            continue;
+        /*
+         * There are three conditions where we need to relink:
+         * (1) purgeAll is true.
+         * (2) The native is dead, since it always has a stub.
+         * (3) The fastFun is dead *and* there is a closure stub.
+         *
+         * Note although both objects can be non-NULL, there can only be one
+         * of [closure, native] stub per call IC.
+         */
+        if (purgeAll || nativeDead || (fastFunDead && ic.hasJsFunCheck)) {
+            repatcher.relink(ic.funJump, ic.slowPathStart);
+            ic.hit = false;
+        }
 
-        JSC::FunctionPtr fptr(JS_FUNC_TO_DATA_PTR(void *, ic::Equality));
-        repatcher.relink(ic.stubCall, fptr);
-        repatcher.relink(ic.jumpToStub, ic.stubEntry);
+        if (fastFunDead) {
+            repatcher.repatch(ic.funGuard, NULL);
+            ic.releasePool(CallICInfo::Pool_ClosureStub);
+            ic.hasJsFunCheck = false;
+            ic.fastGuardedObject = NULL;
+        }
 
-        ic.generated = false;
-        released++;
+        if (nativeDead) {
+            ic.releasePool(CallICInfo::Pool_NativeStub);
+            ic.fastGuardedNative = NULL;
+        }
+
+        if (purgeAll) {
+            ic.releasePool(CallICInfo::Pool_ScriptStub);
+            JSC::CodeLocationJump oolJump = ic.slowPathStart.jumpAtOffset(ic.oolJumpOffset);
+            JSC::CodeLocationLabel icCall = ic.slowPathStart.labelAtOffset(ic.icCallOffset);
+            repatcher.relink(oolJump, icCall);
+        }
     }
 
-    ic::SetGlobalNameIC *setGlobalNames_ = setGlobalNames();
-    for (uint32 i = 0; i < nSetGlobalNames; i ++) {
-        ic::SetGlobalNameIC &ic = setGlobalNames_[i];
-        if (!ic.hasExtraStub)
-            continue;
-        repatcher.relink(ic.fastPathStart.jumpAtOffset(ic.inlineShapeJump), ic.slowPathStart);
-        ic.hasExtraStub = false;
-        released++;
-    }
+    if (purgeAll) {
+        /* Purge ICs generating stubs into execPools. */
+        uint32 released = 0;
 
-    JS_ASSERT(released == execPools.length());
-    for (uint32 i = 0; i < released; i++)
-        execPools[i]->release();
-    execPools.clear();
+        ic::EqualityICInfo *equalityICs_ = equalityICs();
+        for (uint32 i = 0; i < nEqualityICs; i++) {
+            ic::EqualityICInfo &ic = equalityICs_[i];
+            if (!ic.generated)
+                continue;
+
+            JSC::FunctionPtr fptr(JS_FUNC_TO_DATA_PTR(void *, ic::Equality));
+            repatcher.relink(ic.stubCall, fptr);
+            repatcher.relink(ic.jumpToStub, ic.stubEntry);
+
+            ic.generated = false;
+            released++;
+        }
+
+        ic::SetGlobalNameIC *setGlobalNames_ = setGlobalNames();
+        for (uint32 i = 0; i < nSetGlobalNames; i ++) {
+            ic::SetGlobalNameIC &ic = setGlobalNames_[i];
+            if (!ic.hasExtraStub)
+                continue;
+            repatcher.relink(ic.fastPathStart.jumpAtOffset(ic.inlineShapeJump), ic.slowPathStart);
+            ic.hasExtraStub = false;
+            released++;
+        }
+
+        JS_ASSERT(released == execPools.length());
+        for (uint32 i = 0; i < released; i++)
+            execPools[i]->release();
+        execPools.clear();
+    }
 }
 
 void
-ic::SweepICs(JSContext *cx, JSScript *script)
+ic::SweepCallICs(JSContext *cx, JSScript *script, bool purgeAll)
 {
     if (script->jitNormal)
-        script->jitNormal->sweepICs(cx);
+        script->jitNormal->sweepCallICs(cx, purgeAll);
     if (script->jitCtor)
-        script->jitCtor->sweepICs(cx);
-}
-
-void
-ic::PurgeICs(JSContext *cx, JSScript *script)
-{
-    if (script->jitNormal)
-        script->jitNormal->purgeICs(cx);
-    if (script->jitCtor)
-        script->jitCtor->purgeICs(cx);
+        script->jitCtor->sweepCallICs(cx, purgeAll);
 }
 
 #endif /* JS_MONOIC */
diff --git a/js/src/methodjit/MonoIC.h b/js/src/methodjit/MonoIC.h
index 5d8857659b81..ec33db7e7bd0 100644
--- a/js/src/methodjit/MonoIC.h
+++ b/js/src/methodjit/MonoIC.h
@@ -187,96 +187,91 @@ struct EqualityICInfo {
 
 JSBool JS_FASTCALL Equality(VMFrame &f, ic::EqualityICInfo *ic);
 
-struct CallDescription {
-    CallDescription(uint32 argc) : argc(argc), code(NULL)
-    { }
-    JSObject    *callee;
-    JSFunction  *fun;
-    uint32      argc;
-    void        *code;
-    bool        unjittable;     // Only set if fun && fun->isInterpreted()
-};
-
-struct CallIC {
+/* See MonoIC.cpp, CallCompiler for more information on call ICs. */
+struct CallICInfo {
     typedef JSC::MacroAssembler::RegisterID RegisterID;
-    typedef JSC::MacroAssembler::Call Call;
 
-    JSC::CodeLocationLabel fastPathStart;
+    enum PoolIndex {
+        Pool_ScriptStub,
+        Pool_ClosureStub,
+        Pool_NativeStub,
+        Total_Pools
+    };
+
+    JSC::ExecutablePool *pools[Total_Pools];
+
+    /* Used for rooting and reification. */
+    JSObject *fastGuardedObject;
+    JSObject *fastGuardedNative;
+
+    /* PC at the call site. */
+    jsbytecode *pc;
+
+    FrameSize frameSize;
+
+    /* Function object identity guard. */
+    JSC::CodeLocationDataLabelPtr funGuard;
+
+    /* Starting point for all slow call paths. */
     JSC::CodeLocationLabel slowPathStart;
 
-    jsbytecode  *pc;
-    FrameSize   frameSize;
+    /* Inline to OOL jump, redirected by stubs. */
+    JSC::CodeLocationJump funJump;
 
-    uint32      slowCallOffset : 12;        // For repatching the slow call.
-    uint32      inlineRejoinOffset : 10;    // Return address for inline calls.
-    uint32      completedRejoinOffset : 10; // Return address for completed clals.
-    uint32      inlineJumpOffset : 10;      // For patching the inline path.
-    uint32      inlineCalleeGuard : 10;     // If there is an extended inline
-                                            // path, this is the offest to
-                                            // patch the guarded callee obj.
-    uint32      inlineCallOffset : 10;      // Offset of jump-to-script instruction
+    /* Offset to inline scripted call, from funGuard. */
+    uint32 hotJumpOffset   : 16;
+    uint32 joinPointOffset : 16;
 
-    RegisterID  calleeData : 5;
-    bool hasExtendedInlinePath : 1;
+    /* Out of line slow call. */
+    uint32 oolCallOffset   : 16;
 
-    // Offset the return value from JSFrameReg.
-    uint32 rvalOffset;
+    /* Jump to patch for out-of-line scripted calls. */
+    uint32 oolJumpOffset   : 16;
 
-    // If a path has been generated, |pool| is non-NULL.
-    mutable JSC::ExecutablePool *pool;
+    /* Label for out-of-line call to IC function. */
+    uint32 icCallOffset    : 16;
 
-    // inlineCallee is the funobj being guarded on the inline path,
-    // if hasExtendedInlinePath is true. Otherwise, it is unused.
-    mutable JSObject *inlineCallee;
+    /* Offset for deep-fun check to rejoin at. */
+    uint32 hotPathOffset   : 16;
 
-    // guardedNative is non-NULL if |pool| is non-NULL and a native stub
-    // has been generated.
-    mutable JSObject *guardedNative;
+    /* Join point for all slow call paths. */
+    uint32 slowJoinOffset  : 16;
 
-    bool shouldDisable(JSContext *cx, JITScript *jit, CallDescription &call);
-    void purge(JITScript *jit, Repatcher &repatcher);
-    void disable(Repatcher &repatcher);
-    bool update(JSContext *cx, JITScript *jit, CallDescription &call);
-    JSOp op() const;
-    void reenable(JITScript *jit, Repatcher &repatcher);
-    void purgeInlineGuard(Repatcher &repatcher);
-    void purgeStub(Repatcher &repatcher);
+    RegisterID funObjReg : 5;
+    RegisterID funPtrReg : 5;
+    bool hit : 1;
+    bool hasJsFunCheck : 1;
 
-    JSC::CodeLocationLabel inlineRejoinLabel() const {
-       return fastPathStart.labelAtOffset(inlineRejoinOffset);
+    inline void reset() {
+        fastGuardedObject = NULL;
+        fastGuardedNative = NULL;
+        hit = false;
+        hasJsFunCheck = false;
+        pools[0] = pools[1] = pools[2] = NULL;
     }
-    void *returnAddress() const {
-        return inlineRejoinLabel().executableAddress();
+
+    inline void releasePools() {
+        releasePool(Pool_ScriptStub);
+        releasePool(Pool_ClosureStub);
+        releasePool(Pool_NativeStub);
     }
-    JSC::CodeLocationLabel completedRejoinLabel() const {
-        return fastPathStart.labelAtOffset(completedRejoinOffset);
-    }
-    JSC::CodeLocationJump inlineJump() const {
-        return fastPathStart.jumpAtOffset(inlineJumpOffset);
-    }
-    JSC::CodeLocationCall slowCall() const {
-        return slowPathStart.callAtOffset(slowCallOffset);
-    }
-    JSC::CodeLocationDataLabelPtr calleePtr() const {
-        JS_ASSERT(hasExtendedInlinePath);
-        return fastPathStart.dataLabelPtrAtOffset(inlineCalleeGuard);
-    }
-    JSC::CodeLocationJump inlineCall() const {
-        JS_ASSERT(hasExtendedInlinePath);
-        return fastPathStart.jumpAtOffset(inlineCallOffset);
+
+    inline void releasePool(PoolIndex index) {
+        if (pools[index]) {
+            pools[index]->release();
+            pools[index] = NULL;
+        }
     }
 };
 
-template <bool UpdateIC> void * JS_FASTCALL New(VMFrame &f, ic::CallIC *ic);
-template <bool DynamicArgc, bool UpdateIC> void * JS_FASTCALL Call(VMFrame &f, ic::CallIC *ic);
-template <bool LazyArgsObj> JSBool JS_FASTCALL SplatApplyArgs(VMFrame &f);
-void * JS_FASTCALL FailedFunCall(VMFrame &f, ic::CallIC *ic);
-void * JS_FASTCALL FailedFunApply(VMFrame &f, ic::CallIC *ic);
-void * JS_FASTCALL FailedFunApplyLazyArgs(VMFrame &f, ic::CallIC *ic);
+void * JS_FASTCALL New(VMFrame &f, ic::CallICInfo *ic);
+void * JS_FASTCALL Call(VMFrame &f, ic::CallICInfo *ic);
+void JS_FASTCALL NativeNew(VMFrame &f, ic::CallICInfo *ic);
+void JS_FASTCALL NativeCall(VMFrame &f, ic::CallICInfo *ic);
+JSBool JS_FASTCALL SplatApplyArgs(VMFrame &f);
 
 void PurgeMICs(JSContext *cx, JSScript *script);
-void SweepICs(JSContext *cx, JSScript *script);
-void PurgeICs(JSContext *cx, JSScript *script);
+void SweepCallICs(JSContext *cx, JSScript *script, bool purgeAll);
 
 } /* namespace ic */
 } /* namespace mjit */
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index 411cb5806ff6..9fa7bcfb02aa 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -63,6 +63,12 @@ static const uint32 MAX_GETELEM_IC_STUBS = 17;
 
 void PurgePICs(JSContext *cx);
 
+enum LookupStatus {
+    Lookup_Error = 0,
+    Lookup_Uncacheable,
+    Lookup_Cacheable
+};
+
 struct BaseIC : public MacroAssemblerTypedefs {
     BaseIC() { }
 
diff --git a/js/src/methodjit/StubCalls-inl.h b/js/src/methodjit/StubCalls-inl.h
index 4df2cc0a8895..84ce86153d2f 100644
--- a/js/src/methodjit/StubCalls-inl.h
+++ b/js/src/methodjit/StubCalls-inl.h
@@ -70,23 +70,6 @@ ReportAtomNotDefined(JSContext *cx, JSAtom *atom)
         js_ReportIsNotDefined(cx, printable.ptr());
 }
 
-// Clean up a frame and return.
-static inline void
-InlineReturn(VMFrame &f)
-{
-    JSContext *cx = f.cx;
-    JSStackFrame *fp = f.regs.fp;
-
-    JS_ASSERT(f.fp() != f.entryfp);
-
-    JS_ASSERT(!js_IsActiveWithOrBlock(cx, &fp->scopeChain(), 0));
-
-    Value *newsp = fp->actualArgs() - 1;
-    newsp[-1] = fp->returnValue();
-    cx->stack().popInlineFrame(cx, fp->prev(), newsp);
-}
-
-
 #define NATIVE_SET(cx,obj,shape,entry,strict,vp)                              \
     JS_BEGIN_MACRO                                                            \
         if (shape->hasDefaultSetter() &&                                      \
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index c0679b22fcd2..989bfa7c491d 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -66,10 +66,47 @@ void JS_FASTCALL InitMethod(VMFrame &f, JSAtom *atom);
 void JS_FASTCALL HitStackQuota(VMFrame &f);
 void * JS_FASTCALL FixupArity(VMFrame &f, uint32 argc);
 void * JS_FASTCALL CompileFunction(VMFrame &f, uint32 argc);
+void JS_FASTCALL SlowNew(VMFrame &f, uint32 argc);
+void JS_FASTCALL SlowCall(VMFrame &f, uint32 argc);
+void * JS_FASTCALL UncachedNew(VMFrame &f, uint32 argc);
+void * JS_FASTCALL UncachedCall(VMFrame &f, uint32 argc);
 void JS_FASTCALL Eval(VMFrame &f, uint32 argc);
 void JS_FASTCALL ScriptDebugPrologue(VMFrame &f);
 void JS_FASTCALL ScriptDebugEpilogue(VMFrame &f);
 
+/*
+ * Result struct for UncachedXHelper.
+ *
+ * These functions can have one of two results:
+ *
+ *   (1) The function was executed in the interpreter. Then all fields
+ *       are NULL except unjittable.
+ *
+ *   (2) The function was not executed, and the function has been compiled
+ *       to JM native code. Then all fields are non-NULL.
+ */
+struct UncachedCallResult {
+    JSObject   *callee;       // callee object
+    JSFunction *fun;          // callee function
+    void       *codeAddr;     // code address of compiled callee function
+    bool       unjittable;    // did we try to JIT and fail?
+
+    void init() {
+        callee = NULL;
+        fun = NULL;
+        codeAddr = NULL;
+        unjittable = false;
+    }        
+};
+
+/*
+ * Helper functions for stubs and IC functions for calling functions.
+ * These functions either execute the function, return a native code
+ * pointer that can be used to call the function, or throw.
+ */
+void UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr);
+void UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr);
+
 void JS_FASTCALL CreateThis(VMFrame &f, JSObject *proto);
 void JS_FASTCALL Throw(VMFrame &f);
 void JS_FASTCALL PutActivationObjects(VMFrame &f);
diff --git a/js/src/methodjit/StubCompiler.cpp b/js/src/methodjit/StubCompiler.cpp
index 95a6249f2e65..1bde46072a6f 100644
--- a/js/src/methodjit/StubCompiler.cpp
+++ b/js/src/methodjit/StubCompiler.cpp
@@ -222,30 +222,3 @@ StubCompiler::jumpInScript(Jump j, jsbytecode *target)
     }
 }
 
-// Emits code for an out-of-line path where a stub call has either performed a
-// call already, or has returned a JIT address to enter.
-JSC::MacroAssembler::Jump
-StubCompiler::emitCallTail(const FrameSize &frameSize, JSC::MacroAssembler::Address rval)
-{
-    RegisterID r0 = Registers::ReturnReg;
-
-    // The convention is that, if the return value is NULL, then the call has
-    // already completed, and the return value must be loaded from the stack.
-    // Otherwise, the call has not yet taken place, and we should jump to it:
-    // the frame is set up, even ncode.
-    Jump noJIT = masm.branchTestPtr(Assembler::Zero, r0, r0);
-    if (frameSize.isStatic())
-        masm.move(Imm32(frameSize.staticArgc()), JSParamReg_Argc);
-    else
-        masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
-    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-    masm.jump(r0);
-
-    // In the non-JIT case, we demand the return value be placed in a
-    // consistent location, that is, in the |this| position for speculated
-    // funcall/funapply and in |callee| otherwise.
-    noJIT.linkTo(masm.label(), &masm);
-    masm.loadValueAsComponents(rval, JSReturnReg_Type, JSReturnReg_Data);
-    return masm.jump();
-}
-
diff --git a/js/src/methodjit/StubCompiler.h b/js/src/methodjit/StubCompiler.h
index 291ac3c21704..e7a8ccc88060 100644
--- a/js/src/methodjit/StubCompiler.h
+++ b/js/src/methodjit/StubCompiler.h
@@ -51,7 +51,6 @@ namespace js {
 namespace mjit {
 
 class Compiler;
-class FrameSize;
 
 class StubCompiler
 {
@@ -137,7 +136,6 @@ class StubCompiler
     void fixCrossJumps(uint8 *ncode, size_t offset, size_t total);
     bool jumpInScript(Jump j, jsbytecode *target);
     void crossJump(Jump j, Label l);
-    Jump emitCallTail(const FrameSize &frameSize, JSC::MacroAssembler::Address rval);
 
     Call emitStubCall(void *ptr, uint32 id);
     Call emitStubCall(void *ptr, int32 slots, uint32 id);

From b9d338b51ddae89137cf75019090e5e1b53f4d13 Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Fri, 22 Apr 2011 12:00:35 -0700
Subject: [PATCH 461/509] Turn off jstests during |make check| on configs which
 turned tinderbox orange (no bug, r=jimb,orange) CLOSED TREE

The bad configs are:
   - windows with either --disable-tracejit or --disable-methodjit
   - mac with --enable-dtrace
---
 js/src/Makefile.in | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 9ee700c87a58..54a3063e31b3 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -653,6 +653,8 @@ check-jit-test-valgrind::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
 	        --valgrind --no-slow --no-progress --tinderbox --jitflags=$(JITFLAGS) $(DIST)/bin/js$(BIN_SUFFIX)
 
+check:: check-jit-test
+check-valgrind:: check-jit-test-valgrind
 
 # jstests doesn't have a --jitflags option, so we need to loop, updating the
 # exit code (RC) after each invocation.
@@ -672,10 +674,28 @@ check-jstests:
 		done; \
 	exit $$RC
 
+# FIXME:
+# We want to run check-jstests as part of |make check| on all platforms, on
+# tinderbox. However, some configurations don't work quite right just yet.
+# Rather than risking regressions in major configurations while fixing these
+# secondary configuration, we work around them and fix the bugs later.
+#
+#   Bug 652154: On Windows, SM(!m !t) don't work because of path problems with
+#				their unusual directory layout
+#
+#   Bug 652155: On Mac, SM(d) doesn't work for unknown reasons 
 
-check:: check-jit-test
+ifeq ($(OS_ARCH),WINNT)
+ifdef ENABLE_METHODJIT
+ifdef ENABLE_TRACEJIT
 check:: check-jstests
-check-valgrind:: check-jit-test-valgrind
+endif
+endif
+else
+ifndef HAVE_DTRACE
+check:: check-jstests
+endif
+endif
 
 DIST_GARBAGE = config.cache config.log config.status \
    config/autoconf.mk \

From 3061720c848168f61b336a0b9d1ca67e82b79b9f Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Mon, 18 Apr 2011 16:50:47 -0400
Subject: [PATCH 462/509] Bug 641655 - Add a js::GlobalObject subtype of
 JSObject.  r=njn

---
 js/src/GlobalObject.cpp                      | 204 +++++++++++++++++++
 js/src/GlobalObject.h                        | 164 +++++++++++++++
 js/src/Makefile.in                           |   2 +
 js/src/jsapi.cpp                             | 131 +-----------
 js/src/jsapi.h                               |  14 +-
 js/src/jscntxtinlines.h                      |   4 +-
 js/src/jsfun.cpp                             |   7 +-
 js/src/jsinterp.cpp                          |   5 +-
 js/src/jsobj.cpp                             |  32 +--
 js/src/jsobj.h                               |   5 +-
 js/src/jsobjinlines.h                        |   1 +
 js/src/jsregexp.h                            |   2 +-
 js/src/jsregexpinlines.h                     |   6 +-
 js/src/jsxml.cpp                             |  19 +-
 js/src/jsxml.h                               |   3 -
 js/src/xpconnect/wrappers/WrapperFactory.cpp |  43 ++--
 16 files changed, 443 insertions(+), 199 deletions(-)
 create mode 100644 js/src/GlobalObject.cpp
 create mode 100644 js/src/GlobalObject.h

diff --git a/js/src/GlobalObject.cpp b/js/src/GlobalObject.cpp
new file mode 100644
index 000000000000..b137179b04b1
--- /dev/null
+++ b/js/src/GlobalObject.cpp
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey global object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "GlobalObject.h"
+
+#include "jscntxt.h"
+#include "jsexn.h"
+#include "json.h"
+
+#include "jsobjinlines.h"
+#include "jsregexpinlines.h"
+
+using namespace js;
+
+JSObject *
+js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
+{
+    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
+
+    /* If cx has no global object, use obj so prototypes can be found. */
+    if (!cx->globalObject)
+        JS_SetGlobalObject(cx, obj);
+
+    /* Record Function and Object in cx->resolvingList. */
+    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
+    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
+    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
+
+    /* Initialize the function class first so constructors can be made. */
+    JSObject *fun_proto;
+    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
+        return NULL;
+    if (!fun_proto) {
+        fun_proto = js_InitFunctionClass(cx, obj);
+        if (!fun_proto)
+            return NULL;
+    } else {
+        JSObject *ctor = JS_GetConstructor(cx, fun_proto);
+        if (!ctor)
+            return NULL;
+        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
+                                 ObjectValue(*ctor), 0, 0, 0)) {
+            return NULL;
+        }
+    }
+
+    /* Initialize the object class next so Object.prototype works. */
+    JSObject *obj_proto;
+    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
+        return NULL;
+    if (!obj_proto)
+        obj_proto = js_InitObjectClass(cx, obj);
+    if (!obj_proto)
+        return NULL;
+
+    /* Function.prototype and the global object delegate to Object.prototype. */
+    fun_proto->setProto(obj_proto);
+    if (!obj->getProto())
+        obj->setProto(obj_proto);
+
+    return fun_proto;
+}
+
+namespace js {
+
+GlobalObject *
+GlobalObject::create(JSContext *cx, Class *clasp)
+{
+    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
+
+    JSObject *obj = NewNonFunction<WithProto::Given>(cx, clasp, NULL, NULL);
+    if (!obj)
+        return NULL;
+
+    GlobalObject *globalObj = obj->asGlobal();
+
+    globalObj->syncSpecialEquality();
+
+    /* Construct a regexp statics object for this global object. */
+    JSObject *res = regexp_statics_construct(cx, globalObj);
+    if (!res)
+        return NULL;
+    globalObj->setSlot(REGEXP_STATICS, ObjectValue(*res));
+    globalObj->setFlags(0);
+    return globalObj;
+}
+
+bool
+GlobalObject::initStandardClasses(JSContext *cx)
+{
+    /* Native objects get their reserved slots from birth. */
+    JS_ASSERT(numSlots() >= JSSLOT_FREE(getClass()));
+
+    JSAtomState &state = cx->runtime->atomState;
+
+    /* Define a top-level property 'undefined' with the undefined value. */
+    if (!defineProperty(cx, ATOM_TO_JSID(state.typeAtoms[JSTYPE_VOID]), UndefinedValue(),
+                        PropertyStub, StrictPropertyStub, JSPROP_PERMANENT | JSPROP_READONLY))
+    {
+        return false;
+    }
+
+    if (!js_InitFunctionAndObjectClasses(cx, this))
+        return false;
+
+    /* Initialize the rest of the standard objects and functions. */
+    return js_InitArrayClass(cx, this) &&
+           js_InitBooleanClass(cx, this) &&
+           js_InitExceptionClasses(cx, this) &&
+           js_InitMathClass(cx, this) &&
+           js_InitNumberClass(cx, this) &&
+           js_InitJSONClass(cx, this) &&
+           js_InitRegExpClass(cx, this) &&
+           js_InitStringClass(cx, this) &&
+           js_InitTypedArrayClasses(cx, this) &&
+#if JS_HAS_XML_SUPPORT
+           js_InitXMLClasses(cx, this) &&
+#endif
+#if JS_HAS_GENERATORS
+           js_InitIteratorClasses(cx, this) &&
+#endif
+           js_InitDateClass(cx, this) &&
+           js_InitProxyClass(cx, this);
+}
+
+void
+GlobalObject::clear(JSContext *cx)
+{
+    /* This can return false but that doesn't mean it failed. */
+    unbrand(cx);
+
+    for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
+        setSlot(key, UndefinedValue());
+
+    /* Clear regexp statics. */
+    RegExpStatics::extractFrom(this)->clear();
+
+    /* Clear the CSP eval-is-allowed cache. */
+    setSlot(EVAL_ALLOWED, UndefinedValue());
+
+    /*
+     * Mark global as cleared. If we try to execute any compile-and-go
+     * scripts from here on, we will throw.
+     */
+    int32 flags = getSlot(FLAGS).toInt32();
+    flags |= FLAGS_CLEARED;
+    setSlot(FLAGS, Int32Value(flags));
+}
+
+bool
+GlobalObject::isEvalAllowed(JSContext *cx)
+{
+    Value &v = getSlotRef(EVAL_ALLOWED);
+    if (v.isUndefined()) {
+        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
+
+        /*
+         * If there are callbacks, make sure that the CSP callback is installed
+         * and that it permits eval(), then cache the result.
+         */
+        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
+                     callbacks->contentSecurityPolicyAllows(cx));
+    }
+    return !v.isFalse();
+}
+
+} // namespace js
diff --git a/js/src/GlobalObject.h b/js/src/GlobalObject.h
new file mode 100644
index 000000000000..4108b0a65c00
--- /dev/null
+++ b/js/src/GlobalObject.h
@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=78:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey global object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GlobalObject_h___
+#define GlobalObject_h___
+
+#include "jsfun.h"
+
+extern JSObject *
+js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj);
+
+namespace js {
+
+/*
+ * Global object slots are reserved as follows:
+ *
+ * [0, JSProto_LIMIT)
+ *   Stores the original value of the constructor for the corresponding
+ *   JSProtoKey.
+ * [JSProto_LIMIT, 2 * JSProto_LIMIT)
+ *   Stores the prototype, if any, for the constructor for the corresponding
+ *   JSProtoKey offset from JSProto_LIMIT.
+ * [2 * JSProto_LIMIT, 3 * JSProto_LIMIT)
+ *   Stores the current value of the global property named for the JSProtoKey
+ *   for the corresponding JSProtoKey offset from 2 * JSProto_LIMIT.
+ * [3 * JSProto_LIMIT, RESERVED_SLOTS)
+ *   Various one-off values: ES5 13.2.3's [[ThrowTypeError]], RegExp statics,
+ *   the Namespace object for E4X's function::, the original eval for this
+ *   global object (implementing |var eval = otherWindow.eval; eval(...)| as an
+ *   indirect eval), a bit indicating whether this object has been cleared
+ *   (see JS_ClearScope), and a cache for whether eval is allowed (per the
+ *   global's Content Security Policy).
+ *
+ * The first two ranges are necessary to implement js::FindClassObject,
+ * js::FindClassPrototype, and spec language speaking in terms of "the original
+ * Array prototype object", or "as if by the expression new Array()" referring
+ * to the original Array constructor.  The third range stores the (writable and
+ * even deletable) Object, Array, &c. properties (although a slot won't be used
+ * again if its property is deleted and readded).
+ */
+class GlobalObject : public ::JSObject {
+    /*
+     * Count of slots to store built-in constructors, prototypes, and initial
+     * visible properties for the constructors.
+     */
+    static const uintN STANDARD_CLASS_SLOTS  = JSProto_LIMIT * 3;
+
+    /* One-off properties stored after slots for built-ins. */
+    static const uintN THROWTYPEERROR        = STANDARD_CLASS_SLOTS;
+    static const uintN REGEXP_STATICS        = THROWTYPEERROR + 1;
+    static const uintN FUNCTION_NS           = REGEXP_STATICS + 1;
+    static const uintN EVAL_ALLOWED          = FUNCTION_NS + 1;
+    static const uintN EVAL                  = EVAL_ALLOWED + 1;
+    static const uintN FLAGS                 = EVAL + 1;
+
+    /* Total reserved-slot count for global objects. */
+    static const uintN RESERVED_SLOTS = FLAGS + 1;
+
+    void staticAsserts() {
+        /*
+         * The slot count must be in the public API for JSCLASS_GLOBAL_FLAGS,
+         * and we aren't going to expose GlobalObject, so just assert that the
+         * two values are synchronized.
+         */
+        JS_STATIC_ASSERT(JSCLASS_GLOBAL_SLOT_COUNT == RESERVED_SLOTS);
+    }
+
+    static const int32 FLAGS_CLEARED = 0x1;
+
+    void setFlags(int32 flags) {
+        setSlot(FLAGS, Int32Value(flags));
+    }
+
+  public:
+    static GlobalObject *create(JSContext *cx, Class *clasp);
+
+    void setThrowTypeError(JSFunction *fun) {
+        Value &v = getSlotRef(THROWTYPEERROR);
+        // Our bootstrapping code is currently too convoluted to correctly and
+        // confidently assert this.
+        // JS_ASSERT(v.isUndefined());
+        v.setObject(*fun);
+    }
+
+    JSObject *getThrowTypeError() const {
+        return &getSlot(THROWTYPEERROR).toObject();
+    }
+
+    Value getRegExpStatics() const {
+        return getSlot(REGEXP_STATICS);
+    }
+
+    void clear(JSContext *cx);
+
+    bool isCleared() const {
+        return getSlot(FLAGS).toInt32() & FLAGS_CLEARED;
+    }
+
+    bool isEvalAllowed(JSContext *cx);
+
+    const Value &getOriginalEval() const {
+        return getSlot(EVAL);
+    }
+
+    void setOriginalEval(JSObject *evalobj) {
+        Value &v = getSlotRef(EVAL);
+        // Our bootstrapping code is currently too convoluted to correctly and
+        // confidently assert this.
+        // JS_ASSERT(v.isUndefined());
+        v.setObject(*evalobj);
+    }
+
+    bool getFunctionNamespace(JSContext *cx, Value *vp);
+
+    bool initStandardClasses(JSContext *cx);
+};
+
+} // namespace js
+
+js::GlobalObject *
+JSObject::asGlobal()
+{
+    JS_ASSERT(isGlobal());
+    return reinterpret_cast<js::GlobalObject *>(this);
+}
+
+#endif /* GlobalObject_h___ */
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 54a3063e31b3..3130e97d5266 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -147,6 +147,7 @@ CPPSRCS		= \
 		jsgcmark.cpp \
 		jsgcchunk.cpp \
 		jsgcstats.cpp \
+		GlobalObject.cpp \
 		jshash.cpp \
 		jsinterp.cpp \
 		jsinvoke.cpp \
@@ -212,6 +213,7 @@ INSTALLED_HEADERS = \
 		jsgcchunk.h \
 		jsgcstats.h \
 		jscompartment.h \
+		GlobalObject.h \
 		jshash.h \
 		jsinterp.h \
 		jsinttypes.h \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index eb08cf173ae4..9cca598433aa 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1523,56 +1523,6 @@ JS_SetGlobalObject(JSContext *cx, JSObject *obj)
         cx->resetCompartment();
 }
 
-JSObject *
-js_InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
-{
-    JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
-    JSObject *fun_proto, *obj_proto;
-
-    /* If cx has no global object, use obj so prototypes can be found. */
-    if (!cx->globalObject)
-        JS_SetGlobalObject(cx, obj);
-
-    /* Record Function and Object in cx->resolvingList. */
-    JSAtom **classAtoms = cx->runtime->atomState.classAtoms;
-    AutoResolving resolving1(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Function]));
-    AutoResolving resolving2(cx, obj, ATOM_TO_JSID(classAtoms[JSProto_Object]));
-
-    /* Initialize the function class first so constructors can be made. */
-    if (!js_GetClassPrototype(cx, obj, JSProto_Function, &fun_proto))
-        return NULL;
-    if (!fun_proto) {
-        fun_proto = js_InitFunctionClass(cx, obj);
-        if (!fun_proto)
-            return NULL;
-    } else {
-        JSObject *ctor;
-
-        ctor = JS_GetConstructor(cx, fun_proto);
-        if (!ctor)
-            return NULL;
-        if (!obj->defineProperty(cx, ATOM_TO_JSID(CLASS_ATOM(cx, Function)),
-                                 ObjectValue(*ctor), 0, 0, 0)) {
-            return NULL;
-        }
-    }
-
-    /* Initialize the object class next so Object.prototype works. */
-    if (!js_GetClassPrototype(cx, obj, JSProto_Object, &obj_proto))
-        return NULL;
-    if (!obj_proto)
-        obj_proto = js_InitObjectClass(cx, obj);
-    if (!obj_proto)
-        return NULL;
-
-    /* Function.prototype and the global object delegate to Object.prototype. */
-    fun_proto->setProto(obj_proto);
-    if (!obj->getProto())
-        obj->setProto(obj_proto);
-
-    return fun_proto;
-}
-
 JS_PUBLIC_API(JSBool)
 JS_InitStandardClasses(JSContext *cx, JSObject *obj)
 {
@@ -1588,36 +1538,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
         JS_SetGlobalObject(cx, obj);
     assertSameCompartment(cx, obj);
 
-    /* Define a top-level property 'undefined' with the undefined value. */
-    JSAtom *atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
-    if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
-                             PropertyStub, StrictPropertyStub,
-                             JSPROP_PERMANENT | JSPROP_READONLY)) {
-        return JS_FALSE;
-    }
-
-    /* Function and Object require cooperative bootstrapping magic. */
-    if (!js_InitFunctionAndObjectClasses(cx, obj))
-        return JS_FALSE;
-
-    /* Initialize the rest of the standard objects and functions. */
-    return js_InitArrayClass(cx, obj) &&
-           js_InitBooleanClass(cx, obj) &&
-           js_InitExceptionClasses(cx, obj) &&
-           js_InitMathClass(cx, obj) &&
-           js_InitNumberClass(cx, obj) &&
-           js_InitJSONClass(cx, obj) &&
-           js_InitRegExpClass(cx, obj) &&
-           js_InitStringClass(cx, obj) &&
-           js_InitTypedArrayClasses(cx, obj) &&
-#if JS_HAS_XML_SUPPORT
-           js_InitXMLClasses(cx, obj) &&
-#endif
-#if JS_HAS_GENERATORS
-           js_InitIteratorClasses(cx, obj) &&
-#endif
-           js_InitDateClass(cx, obj) &&
-           js_InitProxyClass(cx, obj);
+    return obj->asGlobal()->initStandardClasses(cx);
 }
 
 #define CLASP(name)                 (&js_##name##Class)
@@ -3078,22 +2999,8 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp)
 {
     JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
     CHECK_REQUEST(cx);
-    JS_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
-    JSObject *obj = NewNonFunction<WithProto::Given>(cx, Valueify(clasp), NULL, NULL);
-    if (!obj)
-        return NULL;
 
-    obj->syncSpecialEquality();
-
-    /* Construct a regexp statics object for this global object. */
-    JSObject *res = regexp_statics_construct(cx, obj);
-    if (!res ||
-        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_REGEXP_STATICS, ObjectValue(*res)) ||
-        !js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Int32Value(0))) {
-        return NULL;
-    }
-
-    return obj;
+    return GlobalObject::create(cx, Valueify(clasp));
 }
 
 class AutoHoldCompartment {
@@ -3987,27 +3894,8 @@ JS_ClearScope(JSContext *cx, JSObject *obj)
         js_ClearNative(cx, obj);
 
     /* Clear cached class objects on the global object. */
-    if (obj->isGlobal()) {
-        /* This can return false but that doesn't mean it failed. */
-        obj->unbrand(cx);
-
-        for (int key = JSProto_Null; key < JSProto_LIMIT * 3; key++)
-            JS_SetReservedSlot(cx, obj, key, JSVAL_VOID);
-
-        /* Clear regexp statics. */
-        RegExpStatics::extractFrom(obj)->clear();
-
-        /* Clear the CSP eval-is-allowed cache. */
-        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL_ALLOWED, JSVAL_VOID);
-
-        /*
-         * Mark global as cleared. If we try to execute any compile-and-go
-         * scripts from here on, we will throw.
-         */
-        int32 flags = obj->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
-        flags |= JSGLOBAL_FLAGS_CLEARED;
-        JS_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_FLAGS, Jsvalify(Int32Value(flags)));
-    }
+    if (obj->isGlobal())
+        obj->asGlobal()->clear(cx);
 
     js_InitRandom(cx);
 }
@@ -5898,7 +5786,7 @@ JS_NewRegExpObject(JSContext *cx, JSObject *obj, char *bytes, size_t length, uin
     jschar *chars = js_InflateString(cx, bytes, &length);
     if (!chars)
         return NULL;
-    RegExpStatics *res = RegExpStatics::extractFrom(obj);
+    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
     JSObject *reobj = RegExp::createObject(cx, res, chars, length, flags);
     cx->free_(chars);
     return reobj;
@@ -5908,7 +5796,7 @@ JS_PUBLIC_API(JSObject *)
 JS_NewUCRegExpObject(JSContext *cx, JSObject *obj, jschar *chars, size_t length, uintN flags)
 {
     CHECK_REQUEST(cx);
-    RegExpStatics *res = RegExpStatics::extractFrom(obj);
+    RegExpStatics *res = RegExpStatics::extractFrom(obj->asGlobal());
     return RegExp::createObject(cx, res, chars, length, flags);
 }
 
@@ -5918,7 +5806,7 @@ JS_SetRegExpInput(JSContext *cx, JSObject *obj, JSString *input, JSBool multilin
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, input);
 
-    RegExpStatics::extractFrom(obj)->reset(input, !!multiline);
+    RegExpStatics::extractFrom(obj->asGlobal())->reset(input, !!multiline);
 }
 
 JS_PUBLIC_API(void)
@@ -5927,7 +5815,7 @@ JS_ClearRegExpStatics(JSContext *cx, JSObject *obj)
     CHECK_REQUEST(cx);
     JS_ASSERT(obj);
 
-    RegExpStatics::extractFrom(obj)->clear();
+    RegExpStatics::extractFrom(obj->asGlobal())->clear();
 }
 
 JS_PUBLIC_API(JSBool)
@@ -5944,7 +5832,8 @@ JS_ExecuteRegExp(JSContext *cx, JSObject *obj, JSObject *reobj, jschar *chars, s
     if (!str)
         return false;
 
-    return re->execute(cx, RegExpStatics::extractFrom(obj), str, indexp, test, Valueify(rval));
+    return re->execute(cx, RegExpStatics::extractFrom(obj->asGlobal()), str, indexp, test,
+                       Valueify(rval));
 }
 
 JS_PUBLIC_API(JSObject *)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index c8ecf328a15c..c15273c6f45c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2010,16 +2010,6 @@ struct JSClass {
 #define JSCLASS_FREEZE_PROTO            (1<<(JSCLASS_HIGH_FLAGS_SHIFT+5))
 #define JSCLASS_FREEZE_CTOR             (1<<(JSCLASS_HIGH_FLAGS_SHIFT+6))
 
-/* Additional global reserved slots, beyond those for standard prototypes. */
-#define JSRESERVED_GLOBAL_SLOTS_COUNT     7
-#define JSRESERVED_GLOBAL_THIS            (JSProto_LIMIT * 3)
-#define JSRESERVED_GLOBAL_THROWTYPEERROR  (JSRESERVED_GLOBAL_THIS + 1)
-#define JSRESERVED_GLOBAL_REGEXP_STATICS  (JSRESERVED_GLOBAL_THROWTYPEERROR + 1)
-#define JSRESERVED_GLOBAL_FUNCTION_NS     (JSRESERVED_GLOBAL_REGEXP_STATICS + 1)
-#define JSRESERVED_GLOBAL_EVAL_ALLOWED    (JSRESERVED_GLOBAL_FUNCTION_NS + 1)
-#define JSRESERVED_GLOBAL_EVAL            (JSRESERVED_GLOBAL_EVAL_ALLOWED + 1)
-#define JSRESERVED_GLOBAL_FLAGS           (JSRESERVED_GLOBAL_EVAL + 1)
-
 /* Global flags. */
 #define JSGLOBAL_FLAGS_CLEARED          0x1
 
@@ -2034,9 +2024,9 @@ struct JSClass {
  * with the following flags. Failure to use JSCLASS_GLOBAL_FLAGS was
  * prevously allowed, but is now an ES5 violation and thus unsupported.
  */
+#define JSCLASS_GLOBAL_SLOT_COUNT      (JSProto_LIMIT * 3 + 6)
 #define JSCLASS_GLOBAL_FLAGS                                                  \
-    (JSCLASS_IS_GLOBAL |                                                      \
-     JSCLASS_HAS_RESERVED_SLOTS(JSRESERVED_GLOBAL_THIS + JSRESERVED_GLOBAL_SLOTS_COUNT))
+    (JSCLASS_IS_GLOBAL | JSCLASS_HAS_RESERVED_SLOTS(JSCLASS_GLOBAL_SLOT_COUNT))
 
 /* Fast access to the original value of each standard class's prototype. */
 #define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 8)
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 875cce0afa2d..8c2a57a4fe74 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -51,7 +51,7 @@
 
 namespace js {
 
-static inline JSObject *
+static inline GlobalObject *
 GetGlobalForScopeChain(JSContext *cx)
 {
     /*
@@ -73,7 +73,7 @@ GetGlobalForScopeChain(JSContext *cx)
         return NULL;
     }
     OBJ_TO_INNER_OBJECT(cx, scope);
-    return scope;
+    return scope->asGlobal();
 }
 
 }
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 393b8d606268..f155cc32581f 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -98,7 +98,7 @@ using namespace js::gc;
 inline JSObject *
 JSObject::getThrowTypeError() const
 {
-    return &getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_THROWTYPEERROR).toObject();
+    return getGlobal()->getThrowTypeError();
 }
 
 JSBool
@@ -2693,14 +2693,13 @@ js_InitFunctionClass(JSContext *cx, JSObject *obj)
 
     if (obj->isGlobal()) {
         /* ES5 13.2.3: Construct the unique [[ThrowTypeError]] function object. */
-        JSObject *throwTypeError =
+        JSFunction *throwTypeError =
             js_NewFunction(cx, NULL, reinterpret_cast<Native>(ThrowTypeError), 0,
                            0, obj, NULL);
         if (!throwTypeError)
             return NULL;
 
-        JS_ALWAYS_TRUE(js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_THROWTYPEERROR,
-                                          ObjectValue(*throwTypeError)));
+        obj->asGlobal()->setThrowTypeError(throwTypeError);
     }
 
     return proto;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 52c68e5bfd0c..6674e4a42583 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -614,8 +614,7 @@ RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp)
 
     /* FIXME: Once bug 470510 is fixed, make this an assert. */
     if (script->compileAndGo) {
-        int32 flags = fp->scopeChain().getGlobal()->getReservedSlot(JSRESERVED_GLOBAL_FLAGS).toInt32();
-        if (flags & JSGLOBAL_FLAGS_CLEARED) {
+        if (fp->scopeChain().getGlobal()->isCleared()) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CLEARED_SCOPE);
             return false;
         }
@@ -6471,7 +6470,7 @@ END_CASE(JSOP_XMLPI)
 BEGIN_CASE(JSOP_GETFUNNS)
 {
     Value rval;
-    if (!js_GetFunctionNamespace(cx, &rval))
+    if (!cx->fp()->scopeChain().getGlobal()->getFunctionNamespace(cx, &rval))
         goto error;
     PUSH_COPY(rval);
 }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index ee8a9ce94db8..91ad0ee2a74e 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -922,22 +922,7 @@ obj_valueOf(JSContext *cx, uintN argc, Value *vp)
 JSBool
 js_CheckContentSecurityPolicy(JSContext *cx, JSObject *scopeobj)
 {
-    // CSP is static per document, so if our check said yes before, that
-    // answer is still valid.
-    JSObject *global = scopeobj->getGlobal();
-    Value v = global->getReservedSlot(JSRESERVED_GLOBAL_EVAL_ALLOWED);
-    if (v.isUndefined()) {
-        JSSecurityCallbacks *callbacks = JS_GetSecurityCallbacks(cx);
-
-        // if there are callbacks, make sure that the CSP callback is installed and
-        // that it permits eval().
-        v.setBoolean((!callbacks || !callbacks->contentSecurityPolicyAllows) ||
-                     callbacks->contentSecurityPolicyAllows(cx));
-
-        // update the cache in the global object for the result of the security check
-        js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_EVAL_ALLOWED, v);
-    }
-    return !v.isFalse();
+    return scopeobj->getGlobal()->isEvalAllowed(cx);
 }
 
 /* We should be able to assert this for *any* fp->scopeChain(). */
@@ -1319,9 +1304,7 @@ DirectEval(JSContext *cx, const CallArgs &call)
 bool
 IsBuiltinEvalForScope(JSObject *scopeChain, const Value &v)
 {
-    JSObject *global = scopeChain->getGlobal();
-    JS_ASSERT((global->getClass()->flags & JSCLASS_GLOBAL_FLAGS) == JSCLASS_GLOBAL_FLAGS);
-    return global->getReservedSlot(JSRESERVED_GLOBAL_EVAL) == v;
+    return scopeChain->getGlobal()->getOriginalEval() == v;
 }
 
 bool
@@ -3796,10 +3779,8 @@ js_InitObjectClass(JSContext *cx, JSObject *obj)
     JSObject *evalobj = js_DefineFunction(cx, obj, id, eval, 1, JSFUN_STUB_GSOPS);
     if (!evalobj)
         return NULL;
-    if (obj->isGlobal()) {
-        if (!js_SetReservedSlot(cx, obj, JSRESERVED_GLOBAL_EVAL, ObjectValue(*evalobj)))
-            return NULL;
-    }
+    if (obj->isGlobal())
+        obj->asGlobal()->setOriginalEval(evalobj);
 
     return proto;
 }
@@ -6560,14 +6541,13 @@ js_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 slot, const Value &v)
     return true;
 }
 
-JSObject *
+GlobalObject *
 JSObject::getGlobal() const
 {
     JSObject *obj = const_cast<JSObject *>(this);
     while (JSObject *parent = obj->getParent())
         obj = parent;
-    JS_ASSERT(obj->isGlobal());
-    return obj;
+    return obj->asGlobal();
 }
 
 JSBool
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 95853e7754e9..6ea319198ed5 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -261,6 +261,7 @@ namespace js {
 
 struct NativeIterator;
 class RegExp;
+class GlobalObject;
 
 }
 
@@ -698,12 +699,14 @@ struct JSObject : js::gc::Cell {
         parent = newParent;
     }
 
-    JS_FRIEND_API(JSObject *) getGlobal() const;
+    JS_FRIEND_API(js::GlobalObject *) getGlobal() const;
 
     bool isGlobal() const {
         return !!(getClass()->flags & JSCLASS_IS_GLOBAL);
     }
 
+    inline js::GlobalObject *asGlobal();
+
     void *getPrivate() const {
         JS_ASSERT(getClass()->flags & JSCLASS_HAS_PRIVATE);
         return privateData;
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index bbe90784fb7c..7b70d47cf58d 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -58,6 +58,7 @@
 /* Headers included for inline implementations used by this header. */
 #include "jsbool.h"
 #include "jscntxt.h"
+#include "GlobalObject.h"
 #include "jsnum.h"
 #include "jsscriptinlines.h"
 #include "jsstr.h"
diff --git a/js/src/jsregexp.h b/js/src/jsregexp.h
index 0168c2882b96..429cbd5df4c4 100644
--- a/js/src/jsregexp.h
+++ b/js/src/jsregexp.h
@@ -167,7 +167,7 @@ class RegExpStatics
   public:
     RegExpStatics() : bufferLink(NULL), copied(false) { clear(); }
 
-    static RegExpStatics *extractFrom(JSObject *global);
+    static RegExpStatics *extractFrom(GlobalObject *globalObj);
 
     /* Mutators. */
 
diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index 38517563be8f..fdd182f80c62 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -65,7 +65,7 @@ namespace js {
 extern Class regexp_statics_class;
 
 static inline JSObject *
-regexp_statics_construct(JSContext *cx, JSObject *parent)
+regexp_statics_construct(JSContext *cx, GlobalObject *parent)
 {
     JSObject *obj = NewObject<WithProto::Given>(cx, &regexp_statics_class, NULL, parent);
     if (!obj)
@@ -593,9 +593,9 @@ RegExp::extractFrom(JSObject *obj)
 /* RegExpStatics inlines. */
 
 inline RegExpStatics *
-RegExpStatics::extractFrom(JSObject *global)
+RegExpStatics::extractFrom(js::GlobalObject *globalObj)
 {
-    Value resVal = global->getReservedSlot(JSRESERVED_GLOBAL_REGEXP_STATICS);
+    Value resVal = globalObj->getRegExpStatics();
     RegExpStatics *res = static_cast<RegExpStatics *>(resVal.toObject().getPrivate());
     return res;
 }
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index c7726f9a2b16..f806a6460812 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -7216,13 +7216,13 @@ js_InitXMLClasses(JSContext *cx, JSObject *obj)
     return js_InitXMLClass(cx, obj);
 }
 
-JSBool
-js_GetFunctionNamespace(JSContext *cx, Value *vp)
-{
-    JSObject *global = cx->hasfp() ? cx->fp()->scopeChain().getGlobal() : cx->globalObject;
+namespace js {
 
-    *vp = global->getReservedSlot(JSRESERVED_GLOBAL_FUNCTION_NS);
-    if (vp->isUndefined()) {
+bool
+GlobalObject::getFunctionNamespace(JSContext *cx, Value *vp)
+{
+    Value &v = getSlotRef(FUNCTION_NS);
+    if (v.isUndefined()) {
         JSRuntime *rt = cx->runtime;
         JSLinearString *prefix = rt->atomState.typeAtoms[JSTYPE_FUNCTION];
         JSLinearString *uri = rt->atomState.functionNamespaceURIAtom;
@@ -7239,14 +7239,15 @@ js_GetFunctionNamespace(JSContext *cx, Value *vp)
          */
         obj->clearProto();
 
-        vp->setObject(*obj);
-        if (!js_SetReservedSlot(cx, global, JSRESERVED_GLOBAL_FUNCTION_NS, *vp))
-            return false;
+        v.setObject(*obj);
     }
 
+    *vp = v;
     return true;
 }
 
+} // namespace js
+
 /*
  * Note the asymmetry between js_GetDefaultXMLNamespace and js_SetDefaultXML-
  * Namespace.  Get searches fp->scopeChain for JS_DEFAULT_XML_NAMESPACE_ID,
diff --git a/js/src/jsxml.h b/js/src/jsxml.h
index 566ec5daaf39..5fef407bfe4e 100644
--- a/js/src/jsxml.h
+++ b/js/src/jsxml.h
@@ -279,9 +279,6 @@ js_InitXMLClass(JSContext *cx, JSObject *obj);
 extern JSObject *
 js_InitXMLClasses(JSContext *cx, JSObject *obj);
 
-extern JSBool
-js_GetFunctionNamespace(JSContext *cx, js::Value *vp);
-
 /*
  * If obj is QName corresponding to function::name, set *funidp to name's id,
  * otherwise set *funidp to void.
diff --git a/js/src/xpconnect/wrappers/WrapperFactory.cpp b/js/src/xpconnect/wrappers/WrapperFactory.cpp
index 29c50bf234f7..6cbfafd9ae9e 100644
--- a/js/src/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/src/xpconnect/wrappers/WrapperFactory.cpp
@@ -113,7 +113,8 @@ WrapperFactory::WaiveXray(JSContext *cx, JSObject *obj)
             JSAutoEnterCompartment ac;
             if (!ac.enter(cx, obj))
                 return nsnull;
-            wobj = JSWrapper::New(cx, obj, proto, obj->getGlobal(), &WaiveXrayWrapperWrapper);
+            wobj = JSWrapper::New(cx, obj, proto, JS_GetGlobalForObject(cx, obj),
+                                  &WaiveXrayWrapperWrapper);
             if (!wobj)
                 return nsnull;
 
@@ -253,22 +254,36 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
     JSWrapper *wrapper;
     CompartmentPrivate *targetdata = static_cast<CompartmentPrivate *>(target->data);
     if (AccessCheck::isChrome(target)) {
-        if (AccessCheck::isChrome(origin) || obj->getGlobal()->isSystem()) {
+        if (AccessCheck::isChrome(origin)) {
             wrapper = &JSCrossCompartmentWrapper::singleton;
-        } else if (flags & WAIVE_XRAY_WRAPPER_FLAG) {
-            // If we waived the X-ray wrapper for this object, wrap it into a
-            // special wrapper to transitively maintain the X-ray waiver.
-            wrapper = &CrossOriginWrapper::singleton;
         } else {
-            // Native objects must be wrapped into an X-ray wrapper.
-            if (IS_WN_WRAPPER(obj) || obj->getClass()->ext.innerObject) {
-                typedef XrayWrapper<JSCrossCompartmentWrapper> Xray;
-                wrapper = &Xray::singleton;
-                xrayHolder = Xray::createHolder(cx, obj, parent);
-                if (!xrayHolder)
+            bool isSystem;
+            {
+                JSAutoEnterCompartment ac;
+                if (!ac.enter(cx, obj))
                     return nsnull;
+                JSObject *globalObj = JS_GetGlobalForObject(cx, obj);
+                JS_ASSERT(globalObj);
+                isSystem = JS_IsSystemObject(cx, globalObj);
+            }
+
+            if (isSystem) {
+                wrapper = &JSCrossCompartmentWrapper::singleton;
+            } else if (flags & WAIVE_XRAY_WRAPPER_FLAG) {
+                // If we waived the X-ray wrapper for this object, wrap it into a
+                // special wrapper to transitively maintain the X-ray waiver.
+                wrapper = &CrossOriginWrapper::singleton;
             } else {
-                wrapper = &NoWaiverWrapper::singleton;
+                // Native objects must be wrapped into an X-ray wrapper.
+                if (IS_WN_WRAPPER(obj) || obj->getClass()->ext.innerObject) {
+                    typedef XrayWrapper<JSCrossCompartmentWrapper> Xray;
+                    wrapper = &Xray::singleton;
+                    xrayHolder = Xray::createHolder(cx, obj, parent);
+                    if (!xrayHolder)
+                        return nsnull;
+                } else {
+                    wrapper = &NoWaiverWrapper::singleton;
+                }
             }
         }
     } else if (AccessCheck::isChrome(origin)) {
@@ -381,7 +396,7 @@ JSObject *
 WrapperFactory::WrapSOWObject(JSContext *cx, JSObject *obj)
 {
     JSObject *wrapperObj =
-        JSWrapper::New(cx, obj, obj->getProto(), obj->getGlobal(),
+        JSWrapper::New(cx, obj, obj->getProto(), JS_GetGlobalForObject(cx, obj),
                        &FilteringWrapper<JSWrapper,
                                          OnlyIfSubjectIsSystem>::singleton);
     return wrapperObj;

From 766f50317e3b9f7f53e3baaa37c151f1f606772b Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Fri, 22 Apr 2011 22:46:59 -0400
Subject: [PATCH 463/509] Bug 649575 - Date.prototype.toISOString must throw a
 RangeError for non-finite dates.  r=jwalden

---
 js/src/js.msg                           |  1 +
 js/src/jsdate.cpp                       | 10 +++++--
 js/src/tests/ecma_5/Date/15.9.4.2.js    | 36 +++++++++++++++----------
 js/src/tests/ecma_5/Date/jstests.list   |  1 +
 js/src/tests/ecma_5/Date/toISOString.js | 24 +++++++++++++++++
 5 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 js/src/tests/ecma_5/Date/toISOString.js

diff --git a/js/src/js.msg b/js/src/js.msg
index 7084a5ffd8bb..36de8ed00625 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -349,3 +349,4 @@ MSG_DEF(JSMSG_NON_NATIVE_SCOPE,       266, 0, JSEXN_TYPEERR, "non-native scope o
 MSG_DEF(JSMSG_STRICT_FUNCTION_STATEMENT, 267, 0, JSEXN_SYNTAXERR, "in strict mode code, functions may be declared only at top level or immediately within another function")
 MSG_DEF(JSMSG_INVALID_FOR_IN_INIT,    268, 0, JSEXN_SYNTAXERR, "for-in loop let declaration may not have an initializer")
 MSG_DEF(JSMSG_CLEARED_SCOPE,          269, 0, JSEXN_TYPEERR, "attempt to run compile-and-go script on a cleared scope")
+MSG_DEF(JSMSG_INVALID_DATE,           270, 0, JSEXN_RANGEERR, "invalid date")
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 4ac109fb7025..51ab41926286 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -2047,10 +2047,16 @@ date_utc_format(JSContext *cx, Value *vp,
         return false;
 
     char buf[100];
-    if (!JSDOUBLE_IS_FINITE(utctime))
+    if (!JSDOUBLE_IS_FINITE(utctime)) {
+        if (printFunc == print_iso_string) {
+            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INVALID_DATE);
+            return false;
+        }
+
         JS_snprintf(buf, sizeof buf, js_NaN_date_str);
-    else
+    } else {
         (*printFunc)(buf, sizeof buf, utctime);
+    }
 
     JSString *str = JS_NewStringCopyZ(cx, buf);
     if (!str)
diff --git a/js/src/tests/ecma_5/Date/15.9.4.2.js b/js/src/tests/ecma_5/Date/15.9.4.2.js
index feafebba81c7..3638d40b0ccb 100644
--- a/js/src/tests/ecma_5/Date/15.9.4.2.js
+++ b/js/src/tests/ecma_5/Date/15.9.4.2.js
@@ -43,7 +43,8 @@ var BUGNUMBER = 430930;
 test();
 //-----------------------------------------------------------------------------
 
-function iso(d){
+function iso(d)
+{
   return new Date(d).toISOString();
 }
 
@@ -54,6 +55,14 @@ function check(s, millis){
   reportCompare(expected, actual, description);
 }
 
+function checkInvalid(s)
+{
+  description = "Date.parse('"+s+"') produces invalid date";
+  expected = NaN;
+  actual = Date.parse(s);
+  reportCompare(expected, actual, description);
+}
+
 function dd(year, month, day, hour, minute, second, millis){
   return Date.UTC(year, month-1, day, hour, minute, second, millis);
 }
@@ -113,30 +122,29 @@ function test()
   check("2009-07-23",                    dd(2009,7,23,0,0,0,0));
   check("2009-07",                       dd(2009,7,1,0,0,0,0));
   check("2009",                          dd(2009,1,1,0,0,0,0));
-  check("",                              NaN);
 
   // one field too big
-  check("2009-13-23T19:53:21.001+12:00", NaN);
-  check("2009-07-32T19:53:21.001+12:00", NaN);
-  check("2009-07-23T25:53:21.001+12:00", NaN);
-  check("2009-07-23T19:60:21.001+12:00", NaN);
-  check("2009-07-23T19:53:60.001+12:00", NaN);
-  check("2009-07-23T19:53:21.001+24:00", NaN);
-  check("2009-07-23T19:53:21.001+12:60", NaN);
+  checkInvalid("2009-13-23T19:53:21.001+12:00");
+  checkInvalid("2009-07-32T19:53:21.001+12:00");
+  checkInvalid("2009-07-23T25:53:21.001+12:00");
+  checkInvalid("2009-07-23T19:60:21.001+12:00");
+  checkInvalid("2009-07-23T19:53:60.001+12:00");
+  checkInvalid("2009-07-23T19:53:21.001+24:00");
+  checkInvalid("2009-07-23T19:53:21.001+12:60");
 
   // other month ends
   check("2009-06-30T19:53:21.001+12:00", dd(2009,6,30,7,53,21,1));
-  check("2009-06-31T19:53:21.001+12:00", NaN);
+  checkInvalid("2009-06-31T19:53:21.001+12:00");
   check("2009-02-28T19:53:21.001+12:00", dd(2009,2,28,7,53,21,1));
-  check("2009-02-29T19:53:21.001+12:00", NaN);
+  checkInvalid("2009-02-29T19:53:21.001+12:00");
   check("2008-02-29T19:53:21.001+12:00", dd(2008,2,29,7,53,21,1));
-  check("2008-02-30T19:53:21.001+12:00", NaN);
+  checkInvalid("2008-02-30T19:53:21.001+12:00");
 
   // limits of representation
-  check("-271821-04-19T23:59:59.999Z", NaN);
+  checkInvalid("-271821-04-19T23:59:59.999Z");
   check("-271821-04-20", -8.64e15);
   check("+275760-09-13", 8.64e15);
-  check("+275760-09-13T00:00:00.001Z", NaN);
+  checkInvalid("+275760-09-13T00:00:00.001Z");
 
   check("-269845-07-23T19:53:21.001+12:00", dd(-269845,7,23,7,53,21,1));
   check("+273785-07-23T19:53:21.001+12:00", dd(273785,7,23,7,53,21,1));
diff --git a/js/src/tests/ecma_5/Date/jstests.list b/js/src/tests/ecma_5/Date/jstests.list
index bd68c378ed84..948e485cd853 100644
--- a/js/src/tests/ecma_5/Date/jstests.list
+++ b/js/src/tests/ecma_5/Date/jstests.list
@@ -1,3 +1,4 @@
 url-prefix ../../jsreftest.html?test=ecma_5/Date/
 script 15.9.4.2.js
 script toJSON-01.js
+script toISOString.js
diff --git a/js/src/tests/ecma_5/Date/toISOString.js b/js/src/tests/ecma_5/Date/toISOString.js
new file mode 100644
index 000000000000..9eb41293450b
--- /dev/null
+++ b/js/src/tests/ecma_5/Date/toISOString.js
@@ -0,0 +1,24 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+function throwsRangeError(t) {
+    try {
+        var date = new Date();
+        date.setTime(t);
+        var r = date.toISOString();
+        throw new Error("toISOString didn't throw, instead returned " + r);
+    } catch (err) {
+        assertEq(err instanceof RangeError, true, 'wrong error: ' + err);
+        return;
+    }
+    assertEq(0, 1, 'not good, nyan, nyan');
+}
+
+throwsRangeError(Infinity);
+throwsRangeError(-Infinity);
+throwsRangeError(NaN);
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);

From e4524a8b39f962bef4d627327608fab1bf8e45af Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jandemooij@gmail.com>
Date: Sat, 23 Apr 2011 09:49:59 +0200
Subject: [PATCH 464/509] Bug 652060 - Fix double check in JSVAL_SAME_TYPE_IMPL
 on 64-bit. r=luke

---
 js/src/jit-test/tests/basic/bug652060.js | 9 +++++++++
 js/src/jsvalue.h                         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 js/src/jit-test/tests/basic/bug652060.js

diff --git a/js/src/jit-test/tests/basic/bug652060.js b/js/src/jit-test/tests/basic/bug652060.js
new file mode 100644
index 000000000000..d7d5609a093a
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug652060.js
@@ -0,0 +1,9 @@
+var x = -false;
+var y = -0;
+assertEq(-x === x, true);
+assertEq(-x === y, true);
+assertEq(-y !== y, false);
+
+assertEq(-x == x, true);
+assertEq(-x == y, true);
+assertEq(-y != y, false);
diff --git a/js/src/jsvalue.h b/js/src/jsvalue.h
index 4b990fce4811..ce542f4cb931 100644
--- a/js/src/jsvalue.h
+++ b/js/src/jsvalue.h
@@ -254,7 +254,7 @@ static JS_ALWAYS_INLINE JSBool
 JSVAL_SAME_TYPE_IMPL(jsval_layout lhs, jsval_layout rhs)
 {
     uint64 lbits = lhs.asBits, rbits = rhs.asBits;
-    return (lbits <= JSVAL_TAG_MAX_DOUBLE && rbits <= JSVAL_TAG_MAX_DOUBLE) ||
+    return (lbits <= JSVAL_SHIFTED_TAG_MAX_DOUBLE && rbits <= JSVAL_SHIFTED_TAG_MAX_DOUBLE) ||
            (((lbits ^ rbits) & 0xFFFF800000000000LL) == 0);
 }
 

From be7a60429e9350915a78962f7434f21ef543b235 Mon Sep 17 00:00:00 2001
From: Igor Bukanov <igor@mir2.org>
Date: Sat, 23 Apr 2011 00:12:05 +0200
Subject: [PATCH 465/509] bug 652185 - r=luke

---
 js/src/jsregexp.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp
index b0e8cc023512..40ca19a25fd1 100644
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@@ -454,6 +454,13 @@ js_XDRRegExpObject(JSXDRState *xdr, JSObject **objp)
             return false;
         obj->clearParent();
         obj->clearProto();
+
+        /*
+         * initRegExp can GC before storing re in the private field of the
+         * object. At that point the only reference to the source string could
+         * be from the malloc-allocated GC-invisible re. So we must anchor.
+         */
+        JS::Anchor<JSString *> anchor(source);
         AlreadyIncRefed<RegExp> re = RegExp::create(xdr->cx, source, flagsword);
         if (!re)
             return false;

From f017a31a3fd6e0afd329c0bea55eacc6e195e22f Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Sat, 23 Apr 2011 12:47:23 -0700
Subject: [PATCH 466/509] Disable jstests on all platforms again (r=orange)

---
 js/src/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 3130e97d5266..c5f581299be3 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -690,12 +690,12 @@ check-jstests:
 ifeq ($(OS_ARCH),WINNT)
 ifdef ENABLE_METHODJIT
 ifdef ENABLE_TRACEJIT
-check:: check-jstests
+#check:: check-jstests
 endif
 endif
 else
 ifndef HAVE_DTRACE
-check:: check-jstests
+#check:: check-jstests
 endif
 endif
 

From c2c0ea13b658f24027b05c34e9aa4c4fbba37dd0 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 25 Apr 2011 10:02:07 +0900
Subject: [PATCH 467/509] Bug 604302 - Windows DLL blocklist support for
 Windows x64. r=vlad

---
 toolkit/xre/nsWindowsDllBlocklist.cpp |   6 -
 toolkit/xre/nsWindowsDllInterceptor.h | 152 ++++++++++++++++++++++++++
 toolkit/xre/nsWindowsWMain.cpp        |   2 +-
 3 files changed, 153 insertions(+), 7 deletions(-)

diff --git a/toolkit/xre/nsWindowsDllBlocklist.cpp b/toolkit/xre/nsWindowsDllBlocklist.cpp
index 24cb8c455cf6..b431d8002ddf 100644
--- a/toolkit/xre/nsWindowsDllBlocklist.cpp
+++ b/toolkit/xre/nsWindowsDllBlocklist.cpp
@@ -56,12 +56,6 @@
 // define this for very verbose dll load debug spew
 #undef DEBUG_very_verbose
 
-// The signature for LdrLoadDll changed at some point, with the second arg
-// becoming a PULONG instead of a ULONG.  This should only matter on 64-bit
-// systems, for which there was no support earlier -- on 32-bit systems,
-// they should be the same size.
-PR_STATIC_ASSERT(sizeof(PULONG) == sizeof(ULONG));
-
 typedef NTSTATUS (NTAPI *LdrLoadDll_func) (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileName, PHANDLE handle);
 
 static LdrLoadDll_func stub_LdrLoadDll = 0;
diff --git a/toolkit/xre/nsWindowsDllInterceptor.h b/toolkit/xre/nsWindowsDllInterceptor.h
index 7ca552f4f371..df26f40c997e 100644
--- a/toolkit/xre/nsWindowsDllInterceptor.h
+++ b/toolkit/xre/nsWindowsDllInterceptor.h
@@ -151,6 +151,7 @@ protected:
     byteptr_t origBytes = (byteptr_t) origFunction;
 
     int nBytes = 0;
+#if defined(_M_IX86)
     while (nBytes < 5) {
       // Understand some simple instructions that might be found in a
       // prologue; we might need to extend this as necessary.
@@ -183,6 +184,117 @@ protected:
         return 0;
       }
     }
+#elif defined(_M_X64)
+    int pJmp32 = 0;
+
+    while (nBytes < 13) {
+
+      // if found JMP 32bit offset, next bytes must be NOP 
+      if (pJmp32) {
+        if (origBytes[nBytes++] != 0x90)
+          return 0;
+
+        continue;
+      } 
+        
+      if (origBytes[nBytes] == 0x41) {
+        // REX.B
+        nBytes++;
+
+        if ((origBytes[nBytes] & 0xf0) == 0x50) {
+          // push/pop with Rx register
+          nBytes++;
+        } else if (origBytes[nBytes] >= 0xb8 && origBytes[nBytes] <= 0xbf) {
+          // mov r32, imm32
+          nBytes += 5;
+        } else {
+          return 0;
+        }
+      } else if (origBytes[nBytes] == 0x45) {
+        // REX.R & REX.B
+        nBytes++;
+
+        if (origBytes[nBytes] == 0x33) {
+          // xor r32, r32
+          nBytes += 2;
+        } else {
+          return 0;
+        }
+      } else if (origBytes[nBytes] == 0x48) {
+        // REX.W
+        nBytes++;
+
+        if (origBytes[nBytes] == 0x81 && (origBytes[nBytes+1] & 0xf8) == 0xe8) {
+          // sub r, dword
+          nBytes += 6;
+        } else if (origBytes[nBytes] == 0x83 &&
+                  (origBytes[nBytes+1] & 0xf8) == 0xe8) {
+          // sub r, byte
+          nBytes += 3;
+        } else if (origBytes[nBytes] == 0x83 &&
+                  (origBytes[nBytes+1] & 0xf8) == 0x60) {
+          // and [r+d], imm8
+          nBytes += 5;
+        } else if (origBytes[nBytes] == 0x89) {
+          // MOV r/m64, r64
+          if ((origBytes[nBytes+1] & 0xc0) == 0x40) {
+            if ((origBytes[nBytes+1] & 0x7) == 0x04) {
+              // mov [SIB+disp8], r64
+              nBytes += 4;
+            } else {
+              // mov [r64+disp8], r64
+              nBytes += 3;
+            }
+          } else {
+            // complex mov
+            return 0;
+          }
+        } else if (origBytes[nBytes] == 0x8b) {
+          // mov r64, r/m64
+          if ((origBytes[nBytes+1] & 0xc0) == 0x40) {
+            if ((origBytes[nBytes+1] & 0x7) == 0x04) {
+              // mov r64, [SIB+disp8]
+              nBytes += 4;
+            } else {
+              // mov r64, [r64+disp8]
+              nBytes += 3;
+            }
+          } else if ((origBytes[nBytes+1] & 0xc0) == 0xc0) {
+            // MOV r64, r64
+            nBytes += 2;
+          } else {
+            // complex MOV
+            return 0;
+          }
+        } else {
+          // not support yet!
+          return 0;
+        }
+      } else if ((origBytes[nBytes] & 0xf0) == 0x50) {
+        // 1-byte push/pop
+        nBytes++;
+      } else if (origBytes[nBytes] == 0x90) {
+        // nop
+        nBytes++;
+      } else if (origBytes[nBytes] == 0xe9) {
+        pJmp32 = nBytes;
+        // jmp 32bit offset
+        nBytes += 5;
+      } else if (origBytes[nBytes] == 0xff) {
+        nBytes++;
+        if ((origBytes[nBytes] & 0xf8) == 0xf0) {
+          // push r64
+          nBytes++;
+        } else {
+          return 0;
+        }
+      } else {
+        return 0;
+      }
+    }
+#else
+#error "Unknown processor type"
+#endif
 
     if (nBytes > 100) {
       //printf ("Too big!");
@@ -194,8 +306,35 @@ protected:
     // OrigFunction+N, the target of the trampoline
     byteptr_t trampDest = origBytes + nBytes;
 
+#if defined(_M_IX86)
     tramp[nBytes] = 0xE9; // jmp
     *((intptr_t*)(tramp+nBytes+1)) = (intptr_t)trampDest - (intptr_t)(tramp+nBytes+5); // target displacement
+#elif defined(_M_X64)
+    // If JMP32 opcode found, we don't insert to trampoline jump 
+    if (pJmp32) {
+      // convert JMP 32bit offset to JMP 64bit direct
+      byteptr_t directJmpAddr = origBytes + pJmp32 + 5 + (*((LONG*)(origBytes+pJmp32+1)));
+      // mov r11, address
+      tramp[pJmp32]   = 0x49;
+      tramp[pJmp32+1] = 0xbb;
+      *((intptr_t*)(tramp+pJmp32+2)) = (intptr_t)directJmpAddr;
+
+      // jmp r11
+      tramp[pJmp32+10] = 0x41;
+      tramp[pJmp32+11] = 0xff;
+      tramp[pJmp32+12] = 0xe3;
+    } else {
+      // mov r11, address
+      tramp[nBytes] = 0x49;
+      tramp[nBytes+1] = 0xbb;
+      *((intptr_t*)(tramp+nBytes+2)) = (intptr_t)trampDest;
+
+      // jmp r11
+      tramp[nBytes+10] = 0x41;
+      tramp[nBytes+11] = 0xff;
+      tramp[nBytes+12] = 0xe3;
+    }
+#endif
 
     // ensure we can modify the original code
     DWORD op;
@@ -204,9 +343,22 @@ protected:
       return 0;
     }
 
+#if defined(_M_IX86)
     // now modify the original bytes
     origBytes[0] = 0xE9; // jmp
     *((intptr_t*)(origBytes+1)) = (intptr_t)dest - (intptr_t)(origBytes+5); // target displacement
+#elif defined(_M_X64)
+    // mov r11, address
+    origBytes[0] = 0x49;
+    origBytes[1] = 0xbb;
+
+    *((intptr_t*)(origBytes+2)) = (intptr_t)dest;
+
+    // jmp r11
+    origBytes[10] = 0x41;
+    origBytes[11] = 0xff;
+    origBytes[12] = 0xe3;
+#endif
 
     // restore protection; if this fails we can't really do anything about it
     VirtualProtectEx(GetCurrentProcess(), origFunction, nBytes, op, &op);
diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index f971e3743987..e8ca59973505 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -12,7 +12,7 @@
 #include "nsSetDllDirectory.h"
 #endif
 
-#if defined(_MSC_VER) && defined(_M_IX86) && defined(XRE_WANT_DLL_BLOCKLIST)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && defined(XRE_WANT_DLL_BLOCKLIST)
 #include "nsWindowsDllBlocklist.cpp"
 #else
 #undef XRE_WANT_DLL_BLOCKLIST

From bc04a0aef52497c0b761b7e73c7785ded3f29349 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Mon, 25 Apr 2011 16:32:20 +0100
Subject: [PATCH 468/509] Bug 433063 - write tests for bug 418206 (Some SVG
 files that appear to hang Mozilla).

---
 content/svg/content/test/Makefile.in          |  1 +
 .../test/test_bbox-with-invalid-viewBox.xhtml | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml

diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in
index 8d2d129619ac..b05978acbe73 100644
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -60,6 +60,7 @@ _TEST_FILES = \
 		test_animLengthRelativeUnits.xhtml \
 		test_animLengthUnits.xhtml \
 		test_bbox.xhtml \
+		test_bbox-with-invalid-viewBox.xhtml \
 		bbox-helper.svg \
 		bounds-helper.svg \
 		test_dataTypes.html \
diff --git a/content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml b/content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml
new file mode 100644
index 000000000000..cd73345cbb84
--- /dev/null
+++ b/content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=433063
+-->
+<head>
+  <title>Test for getBBox when the viewBox is invalid</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+
+<svg id="svg" xmlns="http://www.w3.org/2000/svg"
+     style="width:200px; height:200px;" viewBox="0 0 200 0">
+  <rect width="120" height="120"/>
+</svg>
+
+<pre id="test">
+<script class="testbody" type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+
+function run()
+{
+  var bbox = $("svg").getBBox();
+  is(bbox.x, 0, "Check bbox.x");
+  is(bbox.y, 0, "Check bbox.y");
+  is(bbox.width, 120, "Check bbox.width");
+  is(bbox.height, 120, "Check bbox.height");
+  SimpleTest.finish();
+}
+
+window.addEventListener("load", run, false);
+</script>
+</pre>
+</body>
+</html>

From bb250db9680879eb504f88159f2abd531b9c177f Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 25 Apr 2011 13:46:51 -0400
Subject: [PATCH 469/509] Bug 649997 part 1.  Stop touching rv in
 DO_FOR_EACH_ROWGROUP on table rows collections.  r=peterv

---
 .../html/content/src/nsHTMLTableElement.cpp   | 79 ++++++++-----------
 1 file changed, 34 insertions(+), 45 deletions(-)

diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp
index 6068e045b981..efa3e8d9884c 100644
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -95,6 +95,13 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(nsHTMLTableElement,
                                                      nsGenericHTMLElement)
 
+  already_AddRefed<nsIDOMHTMLTableSectionElement> GetTHead() {
+    return GetSection(nsGkAtoms::thead);
+  }
+  already_AddRefed<nsIDOMHTMLTableSectionElement> GetTFoot() {
+    return GetSection(nsGkAtoms::tfoot);
+  }
+  nsContentList* TBodies();
 protected:
   already_AddRefed<nsIDOMHTMLTableSectionElement> GetSection(nsIAtom *aTag);
 
@@ -186,10 +193,7 @@ TableRowsCollection::Init()
     if (mParent) {                                                   \
       /* THead */                                                    \
       nsCOMPtr<nsIDOMHTMLTableSectionElement> rowGroup;              \
-      rv = mParent->GetTHead(getter_AddRefs(rowGroup));              \
-      if (NS_FAILED(rv)) {                                           \
-        break;                                                       \
-      }                                                              \
+      rowGroup = mParent->GetTHead();                                \
       nsCOMPtr<nsIDOMHTMLCollection> rows;                           \
       if (rowGroup) {                                                \
         rowGroup->GetRows(getter_AddRefs(rows));                     \
@@ -197,35 +201,20 @@ TableRowsCollection::Init()
           _code                                                      \
         } while (0);                                                 \
       }                                                              \
-      nsCOMPtr<nsIDOMHTMLCollection> _tbodies;                       \
       /* TBodies */                                                  \
-      rv = mParent->GetTBodies(getter_AddRefs(_tbodies));            \
-      if (NS_FAILED(rv)) {                                           \
-        break;                                                       \
-      }                                                              \
-      if (_tbodies) {                                                \
-        nsCOMPtr<nsIDOMNode> _node;                                  \
-        PRUint32 _tbodyIndex = 0;                                    \
-        rv = _tbodies->Item(_tbodyIndex, getter_AddRefs(_node));     \
-        if (NS_FAILED(rv)) {                                         \
-          break;                                                     \
-        }                                                            \
-        while (_node) {                                              \
-          rowGroup = do_QueryInterface(_node);                       \
-          if (rowGroup) {                                            \
-            rowGroup->GetRows(getter_AddRefs(rows));                 \
-            do { /* gives scoping */                                 \
-              _code                                                  \
-            } while (0);                                             \
-          }                                                          \
-          rv = _tbodies->Item(++_tbodyIndex, getter_AddRefs(_node)); \
-          if (NS_FAILED(rv)) {                                       \
-            break;                                                   \
-          }                                                          \
-        }                                                            \
-        if (NS_FAILED(rv)) {                                         \
-          break;                                                     \
+      nsContentList *_tbodies = mParent->TBodies();                  \
+      nsINode * _node;                                               \
+      PRUint32 _tbodyIndex = 0;                                      \
+      _node = _tbodies->GetNodeAt(_tbodyIndex);                      \
+      while (_node) {                                                \
+        rowGroup = do_QueryInterface(_node);                         \
+        if (rowGroup) {                                              \
+          rowGroup->GetRows(getter_AddRefs(rows));                   \
+          do { /* gives scoping */                                   \
+            _code                                                    \
+          } while (0);                                               \
         }                                                            \
+        _node = _tbodies->GetNodeAt(++_tbodyIndex);                  \
       }                                                              \
       /* orphan rows */                                              \
       rows = mOrphanRows;                                            \
@@ -233,10 +222,7 @@ TableRowsCollection::Init()
         _code                                                        \
       } while (0);                                                   \
       /* TFoot */                                                    \
-      rv = mParent->GetTFoot(getter_AddRefs(rowGroup));              \
-      if (NS_FAILED(rv)) {                                           \
-        break;                                                       \
-      }                                                              \
+      rowGroup = mParent->GetTFoot();                                \
       rows = nsnull;                                                 \
       if (rowGroup) {                                                \
         rowGroup->GetRows(getter_AddRefs(rows));                     \
@@ -266,13 +252,12 @@ NS_IMETHODIMP
 TableRowsCollection::GetLength(PRUint32* aLength)
 {
   *aLength=0;
-  nsresult rv = NS_OK;
 
   DO_FOR_EACH_ROWGROUP(
     *aLength += CountRowsInRowGroup(rows);
   );
 
-  return rv;
+  return NS_OK;
 }
 
 // Returns the item at index aIndex if available. If null is returned,
@@ -298,7 +283,6 @@ GetItemOrCountInRowGroup(nsIDOMHTMLCollection* rows,
 nsIContent*
 TableRowsCollection::GetNodeAt(PRUint32 aIndex, nsresult *aResult)
 {
-  nsresult rv = NS_OK;
   DO_FOR_EACH_ROWGROUP(
     PRUint32 count;
     nsIContent* node = GetItemOrCountInRowGroup(rows, aIndex, &count);
@@ -310,7 +294,7 @@ TableRowsCollection::GetNodeAt(PRUint32 aIndex, nsresult *aResult)
     aIndex -= count;
   );
 
-  *aResult = rv;
+  *aResult = NS_OK;
 
   return nsnull;
 }
@@ -348,7 +332,6 @@ TableRowsCollection::GetNamedItem(const nsAString& aName,
                                   nsWrapperCache** aCache,
                                   nsresult* aResult)
 {
-  nsresult rv = NS_OK;
   DO_FOR_EACH_ROWGROUP(
     nsISupports* item = GetNamedItemInRowGroup(rows, aName, aCache, aResult);
     if (NS_FAILED(*aResult) || item) {
@@ -356,7 +339,7 @@ TableRowsCollection::GetNamedItem(const nsAString& aName,
     }
   );
   *aCache = nsnull;
-  *aResult = rv;
+  *aResult = NS_OK;
   return nsnull;
 }
 
@@ -510,7 +493,7 @@ nsHTMLTableElement::GetSection(nsIAtom *aTag)
 NS_IMETHODIMP
 nsHTMLTableElement::GetTHead(nsIDOMHTMLTableSectionElement** aValue)
 {
-  *aValue = GetSection(nsGkAtoms::thead).get();
+  *aValue = GetTHead().get();
 
   return NS_OK;
 }
@@ -547,7 +530,7 @@ nsHTMLTableElement::SetTHead(nsIDOMHTMLTableSectionElement* aValue)
 NS_IMETHODIMP
 nsHTMLTableElement::GetTFoot(nsIDOMHTMLTableSectionElement** aValue)
 {
-  *aValue = GetSection(nsGkAtoms::tfoot).get();
+  *aValue = GetTFoot().get();
 
   return NS_OK;
 }
@@ -596,6 +579,13 @@ nsHTMLTableElement::GetRows(nsIDOMHTMLCollection** aValue)
 
 NS_IMETHODIMP
 nsHTMLTableElement::GetTBodies(nsIDOMHTMLCollection** aValue)
+{
+  NS_ADDREF(*aValue = TBodies());
+  return NS_OK;
+}
+
+nsContentList*
+nsHTMLTableElement::TBodies()
 {
   if (!mTBodies) {
     // Not using NS_GetContentList because this should not be cached
@@ -606,8 +596,7 @@ nsHTMLTableElement::GetTBodies(nsIDOMHTMLCollection** aValue)
                                  PR_FALSE);
   }
 
-  NS_ADDREF(*aValue = mTBodies);
-  return NS_OK;
+  return mTBodies;
 }
 
 NS_IMETHODIMP

From 6c6ae3b73ca9ff29d4a775308463affed9e6216d Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 25 Apr 2011 13:46:57 -0400
Subject: [PATCH 470/509] Bug 649997 part 2.  Change
 nsIHTMLCollection::GetNodeAt to not use an nsresult outparam.  r=peterv

---
 content/base/src/nsContentList.cpp               |  7 -------
 content/base/src/nsContentList.h                 |  2 +-
 content/html/content/public/nsIHTMLCollection.h  |  6 +++---
 content/html/content/src/nsHTMLFormElement.cpp   |  6 ++----
 content/html/content/src/nsHTMLSelectElement.cpp |  9 +++------
 content/html/content/src/nsHTMLSelectElement.h   |  2 +-
 content/html/content/src/nsHTMLTableElement.cpp  | 12 ++++--------
 dom/base/nsDOMClassInfo.cpp                      |  9 ++++-----
 8 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp
index 6902c2ffbcc8..eaae57fd97a4 100644
--- a/content/base/src/nsContentList.cpp
+++ b/content/base/src/nsContentList.cpp
@@ -615,13 +615,6 @@ nsContentList::GetNodeAt(PRUint32 aIndex)
   return Item(aIndex, PR_TRUE);
 }
 
-nsIContent*
-nsContentList::GetNodeAt(PRUint32 aIndex, nsresult* aResult)
-{
-  *aResult = NS_OK;
-  return Item(aIndex, PR_TRUE);
-}
-
 nsISupports*
 nsContentList::GetNamedItem(const nsAString& aName, nsWrapperCache **aCache,
                             nsresult* aResult)
diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h
index 24d10435551b..1d9f15cfb9b4 100644
--- a/content/base/src/nsContentList.h
+++ b/content/base/src/nsContentList.h
@@ -260,7 +260,7 @@ public:
   virtual PRInt32 IndexOf(nsIContent* aContent);
 
   // nsIHTMLCollection
-  virtual nsIContent* GetNodeAt(PRUint32 aIndex, nsresult* aResult);
+  // GetNodeAt already declared as part of nsINodeList
   virtual nsISupports* GetNamedItem(const nsAString& aName,
                                     nsWrapperCache** aCache,
                                     nsresult* aResult);
diff --git a/content/html/content/public/nsIHTMLCollection.h b/content/html/content/public/nsIHTMLCollection.h
index 13166a46a382..014641cff543 100644
--- a/content/html/content/public/nsIHTMLCollection.h
+++ b/content/html/content/public/nsIHTMLCollection.h
@@ -45,8 +45,8 @@ class nsWrapperCache;
 
 // IID for the nsIHTMLCollection interface
 #define NS_IHTMLCOLLECTION_IID \
-{ 0xf38b43dc, 0x74d4, 0x4b11, \
- { 0xa6, 0xc9, 0xf8, 0xf4, 0xb5, 0xd3, 0x84, 0xe3 } }
+{ 0xf615e447, 0xbdab, 0x4469, \
+ { 0x92, 0x7c, 0x15, 0xb3, 0xed, 0x07, 0x36, 0x2e } }
 
 /**
  * An internal interface that allows QI-less getting of nodes from HTML
@@ -60,7 +60,7 @@ public:
   /**
    * Get the node at the index.  Returns null if the index is out of bounds.
    */
-  virtual nsIContent* GetNodeAt(PRUint32 aIndex, nsresult* aResult) = 0;
+  virtual nsIContent* GetNodeAt(PRUint32 aIndex) = 0;
 
   /**
    * Get the node for the name.  Returns null if no node exists for the name.
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 5dea27259821..caf80a7abf39 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -121,12 +121,10 @@ public:
   // nsIDOMHTMLCollection interface
   NS_DECL_NSIDOMHTMLCOLLECTION
 
-  virtual nsIContent* GetNodeAt(PRUint32 aIndex, nsresult* aResult)
+  virtual nsIContent* GetNodeAt(PRUint32 aIndex)
   {
     FlushPendingNotifications();
 
-    *aResult = NS_OK;
-
     return mElements.SafeElementAt(aIndex, nsnull);
   }
   virtual nsISupports* GetNamedItem(const nsAString& aName,
@@ -2306,7 +2304,7 @@ NS_IMETHODIMP
 nsFormControlList::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 {
   nsresult rv;
-  nsISupports* item = GetNodeAt(aIndex, &rv);
+  nsISupports* item = GetNodeAt(aIndex);
   if (!item) {
     *aReturn = nsnull;
 
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index eb885e90edbf..68cac32c362c 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -2169,22 +2169,19 @@ nsHTMLOptionCollection::SetSelectedIndex(PRInt32 aSelectedIndex)
 NS_IMETHODIMP
 nsHTMLOptionCollection::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 {
-  nsresult rv;
-  nsISupports* item = GetNodeAt(aIndex, &rv);
+  nsISupports* item = GetNodeAt(aIndex);
   if (!item) {
     *aReturn = nsnull;
 
-    return rv;
+    return NS_OK;
   }
 
   return CallQueryInterface(item, aReturn);
 }
 
 nsIContent*
-nsHTMLOptionCollection::GetNodeAt(PRUint32 aIndex, nsresult* aResult)
+nsHTMLOptionCollection::GetNodeAt(PRUint32 aIndex)
 {
-  *aResult = NS_OK;
-
   return static_cast<nsIContent*>(ItemAsOption(aIndex));
 }
 
diff --git a/content/html/content/src/nsHTMLSelectElement.h b/content/html/content/src/nsHTMLSelectElement.h
index f8653f7ea727..b7a5a586a7dd 100644
--- a/content/html/content/src/nsHTMLSelectElement.h
+++ b/content/html/content/src/nsHTMLSelectElement.h
@@ -87,7 +87,7 @@ public:
   // nsIDOMHTMLCollection interface, all its methods are defined in
   // nsIDOMHTMLOptionsCollection
 
-  virtual nsIContent* GetNodeAt(PRUint32 aIndex, nsresult* aResult);
+  virtual nsIContent* GetNodeAt(PRUint32 aIndex);
   virtual nsISupports* GetNamedItem(const nsAString& aName,
                                     nsWrapperCache** aCache,
                                     nsresult* aResult);
diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp
index efa3e8d9884c..1eb8f9abca04 100644
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -126,7 +126,7 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIDOMHTMLCOLLECTION
 
-  virtual nsIContent* GetNodeAt(PRUint32 aIndex, nsresult* aResult);
+  virtual nsIContent* GetNodeAt(PRUint32 aIndex);
   virtual nsISupports* GetNamedItem(const nsAString& aName,
                                     nsWrapperCache **aCache,
                                     nsresult* aResult);
@@ -281,7 +281,7 @@ GetItemOrCountInRowGroup(nsIDOMHTMLCollection* rows,
 }
 
 nsIContent*
-TableRowsCollection::GetNodeAt(PRUint32 aIndex, nsresult *aResult)
+TableRowsCollection::GetNodeAt(PRUint32 aIndex)
 {
   DO_FOR_EACH_ROWGROUP(
     PRUint32 count;
@@ -294,21 +294,17 @@ TableRowsCollection::GetNodeAt(PRUint32 aIndex, nsresult *aResult)
     aIndex -= count;
   );
 
-  *aResult = NS_OK;
-
   return nsnull;
 }
 
 NS_IMETHODIMP 
 TableRowsCollection::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 {
-  nsresult rv;
-
-  nsISupports* node = GetNodeAt(aIndex, &rv);
+  nsISupports* node = GetNodeAt(aIndex);
   if (!node) {
     *aReturn = nsnull;
 
-    return rv;
+    return NS_OK;
   }
 
   return CallQueryInterface(node, aReturn);
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 1044b69ba39f..fe592839c5f0 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -8351,7 +8351,7 @@ nsHTMLCollectionSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
 #endif
 
   nsINode *item;
-  *aCache = item = collection->GetNodeAt(aIndex, aResult);
+  *aCache = item = collection->GetNodeAt(aIndex);
   return item;
 }
 
@@ -8413,7 +8413,7 @@ nsContentListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
   nsContentList *list = nsContentList::FromSupports(aNative);
 
   nsIContent *item;
-  *aCache = item = list->GetNodeAt(aIndex, aResult);
+  *aCache = item = list->GetNodeAt(aIndex);
   return item;
 }
 
@@ -9491,8 +9491,7 @@ nsHTMLSelectElementSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext
 
     nsHTMLOptionCollection *options = s->GetOptions();
     if (options) {
-      nsresult rv;
-      nsISupports *node = options->GetNodeAt(n, &rv);
+      nsISupports *node = options->GetNodeAt(n);
       if (node) {
         *objp = obj;
         *_retval = JS_DefineElement(cx, obj, n, JSVAL_VOID, nsnull, nsnull,
@@ -9521,7 +9520,7 @@ nsHTMLSelectElementSH::GetProperty(nsIXPConnectWrappedNative *wrapper,
     nsHTMLOptionCollection *options = s->GetOptions();
 
     if (options) {
-      nsISupports *node = options->GetNodeAt(n, &rv);
+      nsISupports *node = options->GetNodeAt(n);
 
       rv = WrapNative(cx, JS_GetGlobalForScopeChain(cx), node,
                       &NS_GET_IID(nsIDOMNode), PR_TRUE, vp);

From 86080d05006bfd96cec66597588cc92fdb6c47ab Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 25 Apr 2011 13:46:59 -0400
Subject: [PATCH 471/509] Bug 649997 part 3.  Change
 nsIHTMLCollection::GetNamedItem to not use an nsresult outparam.  r=peterv

---
 content/base/src/nsContentList.cpp            |  5 +----
 content/base/src/nsContentList.h              |  3 +--
 .../html/content/public/nsIHTMLCollection.h   |  7 +++----
 .../html/content/src/nsHTMLFormElement.cpp    |  5 +----
 .../html/content/src/nsHTMLSelectElement.cpp  |  5 +----
 .../html/content/src/nsHTMLSelectElement.h    |  3 +--
 .../html/content/src/nsHTMLTableElement.cpp   | 21 +++++++------------
 dom/base/nsDOMClassInfo.cpp                   |  4 ++--
 8 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp
index eaae57fd97a4..01579c52da60 100644
--- a/content/base/src/nsContentList.cpp
+++ b/content/base/src/nsContentList.cpp
@@ -616,11 +616,8 @@ nsContentList::GetNodeAt(PRUint32 aIndex)
 }
 
 nsISupports*
-nsContentList::GetNamedItem(const nsAString& aName, nsWrapperCache **aCache,
-                            nsresult* aResult)
+nsContentList::GetNamedItem(const nsAString& aName, nsWrapperCache **aCache)
 {
-  *aResult = NS_OK;
-
   nsIContent *item;
   *aCache = item = NamedItem(aName, PR_TRUE);
   return item;
diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h
index 1d9f15cfb9b4..877b9aba7c1b 100644
--- a/content/base/src/nsContentList.h
+++ b/content/base/src/nsContentList.h
@@ -262,8 +262,7 @@ public:
   // nsIHTMLCollection
   // GetNodeAt already declared as part of nsINodeList
   virtual nsISupports* GetNamedItem(const nsAString& aName,
-                                    nsWrapperCache** aCache,
-                                    nsresult* aResult);
+                                    nsWrapperCache** aCache);
 
   // nsContentList public methods
   NS_HIDDEN_(nsINode*) GetParentObject() { return mRootNode; }
diff --git a/content/html/content/public/nsIHTMLCollection.h b/content/html/content/public/nsIHTMLCollection.h
index 014641cff543..aa6dca0f82bd 100644
--- a/content/html/content/public/nsIHTMLCollection.h
+++ b/content/html/content/public/nsIHTMLCollection.h
@@ -45,8 +45,8 @@ class nsWrapperCache;
 
 // IID for the nsIHTMLCollection interface
 #define NS_IHTMLCOLLECTION_IID \
-{ 0xf615e447, 0xbdab, 0x4469, \
- { 0x92, 0x7c, 0x15, 0xb3, 0xed, 0x07, 0x36, 0x2e } }
+{ 0x84a68396, 0x518d, 0x4fa8, \
+ { 0x8f, 0x7f, 0xa0, 0x60, 0x55, 0xff, 0xef, 0xba } }
 
 /**
  * An internal interface that allows QI-less getting of nodes from HTML
@@ -66,8 +66,7 @@ public:
    * Get the node for the name.  Returns null if no node exists for the name.
    */
   virtual nsISupports* GetNamedItem(const nsAString& aName,
-                                    nsWrapperCache** aCache,
-                                    nsresult* aResult) = 0;
+                                    nsWrapperCache** aCache) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIHTMLCollection, NS_IHTMLCOLLECTION_IID)
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index caf80a7abf39..ea90386c6a5b 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -128,11 +128,8 @@ public:
     return mElements.SafeElementAt(aIndex, nsnull);
   }
   virtual nsISupports* GetNamedItem(const nsAString& aName,
-                                    nsWrapperCache **aCache,
-                                    nsresult* aResult)
+                                    nsWrapperCache **aCache)
   {
-    *aResult = NS_OK;
-
     nsISupports *item = NamedItemInternal(aName, PR_TRUE);
     *aCache = nsnull;
     return item;
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index 68cac32c362c..f5adee34b6ef 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -2206,11 +2206,8 @@ GetNamedItemHelper(nsTArray<nsRefPtr<nsHTMLOptionElement> > &aElements,
 
 nsISupports*
 nsHTMLOptionCollection::GetNamedItem(const nsAString& aName,
-                                     nsWrapperCache **aCache,
-                                     nsresult* aResult)
+                                     nsWrapperCache **aCache)
 {
-  *aResult = NS_OK;
-
   nsINode *item = GetNamedItemHelper(mElements, aName);
   *aCache = item;
   return item;
diff --git a/content/html/content/src/nsHTMLSelectElement.h b/content/html/content/src/nsHTMLSelectElement.h
index b7a5a586a7dd..44cc86c0e795 100644
--- a/content/html/content/src/nsHTMLSelectElement.h
+++ b/content/html/content/src/nsHTMLSelectElement.h
@@ -89,8 +89,7 @@ public:
 
   virtual nsIContent* GetNodeAt(PRUint32 aIndex);
   virtual nsISupports* GetNamedItem(const nsAString& aName,
-                                    nsWrapperCache** aCache,
-                                    nsresult* aResult);
+                                    nsWrapperCache** aCache);
 
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsHTMLOptionCollection,
                                            nsIHTMLCollection)
diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp
index 1eb8f9abca04..cd159605d5b2 100644
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -128,8 +128,7 @@ public:
 
   virtual nsIContent* GetNodeAt(PRUint32 aIndex);
   virtual nsISupports* GetNamedItem(const nsAString& aName,
-                                    nsWrapperCache **aCache,
-                                    nsresult* aResult);
+                                    nsWrapperCache **aCache);
 
   NS_IMETHOD    ParentDestroyed();
 
@@ -312,30 +311,27 @@ TableRowsCollection::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 
 static nsISupports*
 GetNamedItemInRowGroup(nsIDOMHTMLCollection* aRows, const nsAString& aName,
-                       nsWrapperCache** aCache, nsresult* aResult)
+                       nsWrapperCache** aCache)
 {
   nsCOMPtr<nsIHTMLCollection> rows = do_QueryInterface(aRows);
   if (rows) {
-    return rows->GetNamedItem(aName, aCache, aResult);
+    return rows->GetNamedItem(aName, aCache);
   }
 
-  *aResult = NS_OK;
   return nsnull;
 }
 
 nsISupports* 
 TableRowsCollection::GetNamedItem(const nsAString& aName,
-                                  nsWrapperCache** aCache,
-                                  nsresult* aResult)
+                                  nsWrapperCache** aCache)
 {
   DO_FOR_EACH_ROWGROUP(
-    nsISupports* item = GetNamedItemInRowGroup(rows, aName, aCache, aResult);
-    if (NS_FAILED(*aResult) || item) {
+    nsISupports* item = GetNamedItemInRowGroup(rows, aName, aCache);
+    if (item) {
       return item;
     }
   );
   *aCache = nsnull;
-  *aResult = NS_OK;
   return nsnull;
 }
 
@@ -343,13 +339,12 @@ NS_IMETHODIMP
 TableRowsCollection::NamedItem(const nsAString& aName,
                                nsIDOMNode** aReturn)
 {
-  nsresult rv;
   nsWrapperCache *cache;
-  nsISupports* item = GetNamedItem(aName, &cache, &rv);
+  nsISupports* item = GetNamedItem(aName, &cache);
   if (!item) {
     *aReturn = nsnull;
 
-    return rv;
+    return NS_OK;
   }
 
   return CallQueryInterface(item, aReturn);
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index fe592839c5f0..d8a32e3c172c 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -8373,7 +8373,7 @@ nsHTMLCollectionSH::GetNamedItem(nsISupports *aNative,
   }
 #endif
 
-  return collection->GetNamedItem(aName, aCache, aResult);
+  return collection->GetNamedItem(aName, aCache);
 }
 
 
@@ -8423,7 +8423,7 @@ nsContentListSH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
 {
   nsContentList *list = nsContentList::FromSupports(aNative);
 
-  return list->GetNamedItem(aName, aCache, aResult);
+  return list->GetNamedItem(aName, aCache);
 }
 
 NS_IMETHODIMP

From 0544e9d3a8cd8ff73aac35574c7b54df3c554ccd Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 25 Apr 2011 10:58:42 -0700
Subject: [PATCH 472/509] Bug 652559: Fix signed/unsigned comparison build
 warning in nsGlobalWindow.cpp. r=bz

---
 dom/base/nsGlobalWindow.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index a4912c349b10..6c0547a84185 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8808,14 +8808,14 @@ nsGlobalWindow::SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
   interval = NS_MAX(aIsInterval ? 1 : 0, interval);
 
   // Make sure we don't proceed with an interval larger than our timer
-  // code can handle.
-  if (interval > PR_IntervalToMilliseconds(DOM_MAX_TIMEOUT_VALUE)) {
-    interval = PR_IntervalToMilliseconds(DOM_MAX_TIMEOUT_VALUE);
+  // code can handle. (Note: we already forced |interval| to be non-negative,
+  // so the PRUint32 cast (to avoid compiler warnings) is ok.)
+  PRUint32 maxTimeoutMs = PR_IntervalToMilliseconds(DOM_MAX_TIMEOUT_VALUE);
+  if (static_cast<PRUint32>(interval) > maxTimeoutMs) {
+    interval = maxTimeoutMs;
   }
 
   nsTimeout *timeout = new nsTimeout();
-  if (!timeout)
-    return NS_ERROR_OUT_OF_MEMORY;
 
   // Increment the timeout's reference count to represent this function's hold
   // on the timeout.

From c42f3d59f96f1728816617f1e33b24f35f2a85b4 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Mon, 25 Apr 2011 10:59:07 -0700
Subject: [PATCH 473/509] Bug 652361 - [OS/2] build break in nsObjectFrame
 after checkin for bug 266236

---
 build/os2/test_os2.cmd           | 0
 layout/generic/nsObjectFrame.cpp | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 build/os2/test_os2.cmd

diff --git a/build/os2/test_os2.cmd b/build/os2/test_os2.cmd
old mode 100644
new mode 100755
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 44903f596b67..52cac4009641 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -224,6 +224,7 @@ using mozilla::DefaultXDisplay;
 #define INCL_PM
 #define INCL_GPI
 #include <os2.h>
+#include "gfxOS2Surface.h"
 #endif
 
 #ifdef CreateEvent // Thank you MS.
@@ -1663,7 +1664,7 @@ nsObjectFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 
 #ifdef XP_OS2
 static void *
-GetPSFromRC(nsRenderingContext& aRC)
+GetPSFromRC(nsRenderingContext& aRenderingContext)
 {
   nsRefPtr<gfxASurface>
     surf = aRenderingContext.ThebesContext()->CurrentSurface();

From f8bea8674e3a35bebd2578213664b388dbe7d232 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Mon, 25 Apr 2011 10:59:10 -0700
Subject: [PATCH 474/509] Bug 649841: Raise low-memory-warning condition on
 android to 512MB. r=dougt

---
 embedding/android/GeckoApp.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index bea7ec76f376..3ac1eac676f3 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -265,7 +265,7 @@ abstract public class GeckoApp
     }
 
     boolean IsUnsupportedDevice() {
-        // We don't currently support devices with less than 256Mb of RAM, warn on first run
+        // We don't currently support devices with less than 512Mb of RAM, warn on first run
         File meminfo = new File("/proc/meminfo");
         try {
             BufferedReader br = new BufferedReader(new FileReader(meminfo));
@@ -277,7 +277,7 @@ abstract public class GeckoApp
             totalMem = st.nextToken();
 
             Log.i("GeckoMemory", "MemTotal: " + Integer.parseInt(totalMem));
-            return Integer.parseInt(totalMem) <= 262144L;
+            return Integer.parseInt(totalMem) <= 524288L;
         } catch (Exception ex) {
             // Will catch  NullPointerException if totalMem isn't found,
             // a NumberFormatException if the token isn't parsible

From 453274e6ee5a2d06f4a68e10d41c9b78cf678d8c Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 25 Apr 2011 11:53:50 -0700
Subject: [PATCH 475/509] Bug 652438 - Add back OOM checks in
 JSString::getChars (r=waldo)

---
 js/src/jsstr.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index f85740bddf07..35b846d174e0 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -694,13 +694,17 @@ JS_STATIC_ASSERT(sizeof(JSStaticAtom) == sizeof(JSString));
 JS_ALWAYS_INLINE const jschar *
 JSString::getChars(JSContext *cx)
 {
-    return ensureLinear(cx)->chars();
+    if (JSLinearString *str = ensureLinear(cx))
+        return str->chars();
+    return NULL;
 }
 
 JS_ALWAYS_INLINE const jschar *
 JSString::getCharsZ(JSContext *cx)
 {
-    return ensureFlat(cx)->chars();
+    if (JSFlatString *str = ensureFlat(cx))
+        return str->chars();
+    return NULL;
 }
 
 JS_ALWAYS_INLINE JSLinearString *

From e4d9fd7a96cf11a065255ded0a3d94b2c20fa52a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 25 Apr 2011 15:02:54 -0400
Subject: [PATCH 476/509] Bug 517579 - TEST-UNEXPECTED-FAIL |
 test_bug413909.html | Secure page did not load, adding exception failed?;
 r=ted

---
 .../ssl/tests/mochitest/bugs/test_bug413909.html       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug413909.html b/security/manager/ssl/tests/mochitest/bugs/test_bug413909.html
index 52e9553761a0..13bd33bde671 100644
--- a/security/manager/ssl/tests/mochitest/bugs/test_bug413909.html
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug413909.html
@@ -14,7 +14,6 @@ var certOverrideService = Components.classes["@mozilla.org/security/certoverride
   .getService(Components.interfaces.nsICertOverrideService);
 var cert = null;
 var certListener = null;
-var frameLoadTimeout = null;
 
 SimpleTest.waitForExplicitFinish();
 
@@ -101,7 +100,6 @@ function onFrameLoad()
     "bug413909.xn--hxajbheg2az3al.xn--jxalpdlp", -1);
   apiTest(false);
 
-  clearTimeout(frameLoadTimeout);
   SimpleTest.finish();
 }
 
@@ -120,14 +118,6 @@ function onWindowLoad()
   {
     // ignore
   }
-  
-  // There is no error event indicating frame load error,
-  // simulate using timeout.
-  frameLoadTimeout = setTimeout(function() 
-  {
-    ok(false, "Secure page did not load, adding exception failed?");
-    SimpleTest.finish();
-  }, 5000);
 
   window.frame1.location.reload();
 }

From fa0d0ed2305f2d69b5bec971b844bd95ba2ce69e Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Mon, 25 Apr 2011 15:06:47 -0400
Subject: [PATCH 477/509] Bug 648865 - Remove WINCE code from
 js/src/assembler/* ; r=dmandelin

---
 js/src/assembler/jit/ExecutableAllocator.h | 11 -----
 js/src/assembler/wtf/Assertions.cpp        |  8 +--
 js/src/assembler/wtf/Assertions.h          |  8 ---
 js/src/assembler/wtf/Platform.h            | 57 ----------------------
 4 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h
index 78f0002e7330..8be6cd47b68d 100644
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -64,12 +64,6 @@ extern  "C" void sync_instruction_memory(caddr_t v, u_int len);
 #include <sys/cachectl.h>
 #endif
 
-#if WTF_PLATFORM_WINCE
-// From pkfuncs.h (private header file from the Platform Builder)
-#define CACHE_SYNC_ALL 0x07F
-extern "C" __declspec(dllimport) void CacheRangeFlush(LPVOID pAddr, DWORD dwLength, DWORD dwFlags);
-#endif
-
 #if ENABLE_ASSEMBLER_WX_EXCLUSIVE
 #define PROTECTION_FLAGS_RW (PROT_READ | PROT_WRITE)
 #define PROTECTION_FLAGS_RX (PROT_READ | PROT_EXEC)
@@ -405,11 +399,6 @@ public:
             : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
             : "r0", "r1", "r2");
     }
-#elif WTF_PLATFORM_WINCE
-    static void cacheFlush(void* code, size_t size)
-    {
-        CacheRangeFlush(code, size, CACHE_SYNC_ALL);
-    }
 #elif WTF_CPU_SPARC
     static void cacheFlush(void* code, size_t size)
     {
diff --git a/js/src/assembler/wtf/Assertions.cpp b/js/src/assembler/wtf/Assertions.cpp
index 2d6293ccb6a5..e2091d7f3066 100644
--- a/js/src/assembler/wtf/Assertions.cpp
+++ b/js/src/assembler/wtf/Assertions.cpp
@@ -30,7 +30,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#if WTF_COMPILER_MSVC && !WTF_PLATFORM_WINCE
+#if WTF_COMPILER_MSVC
 #ifndef WINVER
 #define WINVER 0x0500
 #endif
@@ -41,10 +41,6 @@
 #include <crtdbg.h>
 #endif
 
-#if WTF_PLATFORM_WINCE
-#include <winbase.h>
-#endif
-
 extern "C" {
 
 WTF_ATTRIBUTE_PRINTF(1, 0)
@@ -64,7 +60,7 @@ static void printf_stderr_common(const char* format, ...)
 
 static void printCallSite(const char* file, int line, const char* function)
 {
-#if WTF_COMPILER_MSVC && !WTF_PLATFORM_WINCE && defined _DEBUG
+#if WTF_COMPILER_MSVC && defined _DEBUG
     _CrtDbgReport(_CRT_WARN, file, line, NULL, "%s\n", function);
 #else
     printf_stderr_common("(%s:%d %s)\n", file, line, function);
diff --git a/js/src/assembler/wtf/Assertions.h b/js/src/assembler/wtf/Assertions.h
index 535600cea167..6c9da1e2e8fb 100644
--- a/js/src/assembler/wtf/Assertions.h
+++ b/js/src/assembler/wtf/Assertions.h
@@ -140,14 +140,6 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann
 
 /* ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED */
 
-#if WTF_PLATFORM_WINCE && !WTF_PLATFORM_TORCHMOBILE
-/* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
-#include "jswin.h"
-#undef min
-#undef max
-#undef ERROR
-#endif
-
 #if WTF_PLATFORM_WIN_OS || WTF_PLATFORM_SYMBIAN
 /* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */
 #undef ASSERT
diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
index ce3b9491c555..68713cd4c810 100644
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -326,14 +326,6 @@
 #define WTF_PLATFORM_WIN_OS 1
 #endif
 
-/* PLATFORM(WINCE) */
-/* Operating system level dependencies for Windows CE that should be used */
-/* regardless of operating environment */
-/* Note that for this platform PLATFORM(WIN_OS) is also defined. */
-#if defined(_WIN32_WCE)
-#define WTF_PLATFORM_WINCE 1
-#endif
-
 /* PLATFORM(LINUX) */
 /* Operating system level dependencies for Linux-like systems that */
 /* should be used regardless of operating environment */
@@ -482,22 +474,6 @@
 #endif
 
 
-/* PLATFORM(WINCE) && PLATFORM(QT)
-   We can not determine the endianess at compile time. For
-   Qt for Windows CE the endianess is specified in the
-   device specific makespec
-*/
-#if WTF_PLATFORM_WINCE && WTF_PLATFORM_QT
-#   include <QtGlobal>
-#   undef WTF_PLATFORM_BIG_ENDIAN
-#   undef WTF_PLATFORM_MIDDLE_ENDIAN
-#   if Q_BYTE_ORDER == Q_BIG_EDIAN
-#       define WTF_PLATFORM_BIG_ENDIAN 1
-#   endif
-
-#   include <ce_time.h>
-#endif
-
 #if (WTF_PLATFORM_IPHONE || WTF_PLATFORM_MAC || WTF_PLATFORM_WIN || WTF_PLATFORM_OS2 || (WTF_PLATFORM_QT && WTF_PLATFORM_DARWIN && !ENABLE_SINGLE_THREADED)) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
 #define ENABLE_JSC_MULTIPLE_THREADS 1
 #endif
@@ -507,37 +483,8 @@
 #define WTF_USE_QUERY_PERFORMANCE_COUNTER  1
 #endif
 
-#if WTF_PLATFORM_WINCE && !WTF_PLATFORM_QT
-#undef ENABLE_JSC_MULTIPLE_THREADS
-#define ENABLE_JSC_MULTIPLE_THREADS        0
-#define USE_SYSTEM_MALLOC                  0
-#define ENABLE_ICONDATABASE                0
-#define ENABLE_JAVASCRIPT_DEBUGGER         0
-#define ENABLE_FTPDIR                      0
-#define ENABLE_PAN_SCROLLING               0
-#define ENABLE_WML                         1
-#define HAVE_ACCESSIBILITY                 0
-
-#define NOMINMAX       // Windows min and max conflict with standard macros
-#define NOSHLWAPI      // shlwapi.h not available on WinCe
-
-// MSDN documentation says these functions are provided with uspce.lib.  But we cannot find this file.
-#define __usp10__      // disable "usp10.h"
-
-#define _INC_ASSERT    // disable "assert.h"
-#define assert(x)
-
-// _countof is only included in CE6; for CE5 we need to define it ourself
-#ifndef _countof
-#define _countof(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
-#endif  /* PLATFORM(WINCE) && !PLATFORM(QT) */
-
 #if WTF_PLATFORM_QT
 #define WTF_USE_QT4_UNICODE 1
-#elif WTF_PLATFORM_WINCE
-#define WTF_USE_WINCE_UNICODE 1
 #elif WTF_PLATFORM_GTK
 /* The GTK+ Unicode backend is configurable */
 #else
@@ -669,11 +616,7 @@
 
 #elif WTF_PLATFORM_WIN_OS
 
-#if WTF_PLATFORM_WINCE
-#define HAVE_ERRNO_H 0
-#else
 #define HAVE_SYS_TIMEB_H 1
-#endif
 #define HAVE_VIRTUALALLOC 1
 
 #elif WTF_PLATFORM_SYMBIAN

From d901f8c00e340a98671260dd7db330d98b7f1140 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Mon, 25 Apr 2011 12:06:59 -0700
Subject: [PATCH 478/509] Bug 652361 - Revert accidental chmod of
 build/os2/test_os2.cmd in previous cset for this bug. DONTBUILD

---
 build/os2/test_os2.cmd | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 build/os2/test_os2.cmd

diff --git a/build/os2/test_os2.cmd b/build/os2/test_os2.cmd
old mode 100755
new mode 100644

From 6207979552c109fe0f9330483398b97e3c45117a Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 25 Apr 2011 15:15:28 -0400
Subject: [PATCH 479/509] Bug 649997 followup.  Don't return uninitialized rv. 
 Caught by ms2ger

---
 content/html/content/src/nsHTMLFormElement.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index ea90386c6a5b..b181096da0ad 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -2300,12 +2300,11 @@ nsFormControlList::GetLength(PRUint32* aLength)
 NS_IMETHODIMP
 nsFormControlList::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
 {
-  nsresult rv;
   nsISupports* item = GetNodeAt(aIndex);
   if (!item) {
     *aReturn = nsnull;
 
-    return rv;
+    return NS_OK;
   }
 
   return CallQueryInterface(item, aReturn);

From 63e44689d1d428cf9ed405682e805dcbeb4b9410 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 25 Apr 2011 13:20:14 -0700
Subject: [PATCH 480/509] Bug 605707 - r=igor

---
 js/src/jsregexpinlines.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index fdd182f80c62..2f0e67ef7789 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -443,6 +443,12 @@ RegExp::createObjectNoStatics(JSContext *cx, const jschar *chars, size_t length,
     JSString *str = js_NewStringCopyN(cx, chars, length);
     if (!str)
         return NULL;
+    /*
+     * NewBuiltinClassInstance can GC before we store re in the private field
+     * of the object. At that point the only reference to the source string
+     * could be from the malloc-allocated GC-invisible re. So we must anchor.
+     */
+    JS::Anchor<JSString *> anchor(str);
     AlreadyIncRefed<RegExp> re = RegExp::create(cx, str, flags);
     if (!re)
         return NULL;

From d77591f2eeacecd316ff5d65f6feeeaa73ae7973 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Mon, 25 Apr 2011 13:20:14 -0700
Subject: [PATCH 481/509] Bug 651973 - Release RegExp on error, r=cdleary

---
 js/src/jsregexpinlines.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index 2f0e67ef7789..74bce9edb157 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -453,12 +453,11 @@ RegExp::createObjectNoStatics(JSContext *cx, const jschar *chars, size_t length,
     if (!re)
         return NULL;
     JSObject *obj = NewBuiltinClassInstance(cx, &js_RegExpClass);
-    if (!obj) {
+    if (!obj ||
+        !obj->initRegExp(cx, re.get())) {
         re->decref(cx);
         return NULL;
     }
-    if (!obj->initRegExp(cx, re.get()))
-        return NULL;
     return obj;
 }
 

From 67e7a42892a98a3ba9f9ab2553356a81683302d0 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 25 Apr 2011 17:05:17 -0400
Subject: [PATCH 482/509] Backout changeset 13f6847dd840 (bug 616684) because
 it changes code semantics in a bad way, which results in problems like the
 crash in bug 652580, possibly among others

---
 .../src/atk/nsMaiInterfaceComponent.cpp       |  2 +
 accessible/src/base/nsCoreUtils.cpp           | 22 +++---
 accessible/src/html/nsHyperTextAccessible.cpp |  2 +
 accessible/src/msaa/nsAccessNodeWrap.cpp      |  1 +
 content/base/src/nsContentAreaDragDrop.cpp    |  1 +
 content/base/src/nsContentUtils.cpp           |  4 +-
 content/base/src/nsDocument.cpp               | 14 ++--
 content/base/src/nsDocument.h                 |  6 ++
 content/base/src/nsGenericElement.cpp         |  1 +
 content/events/src/nsDOMDragEvent.cpp         |  4 +-
 content/events/src/nsDOMKeyboardEvent.cpp     |  6 +-
 content/events/src/nsDOMMouseEvent.cpp        |  8 ++-
 content/events/src/nsDOMMouseScrollEvent.cpp  |  6 +-
 content/events/src/nsDOMMozTouchEvent.cpp     |  5 +-
 content/events/src/nsDOMScrollAreaEvent.cpp   | 11 ++-
 .../events/src/nsDOMSimpleGestureEvent.cpp    |  2 +-
 content/events/src/nsDOMUIEvent.cpp           | 12 ++--
 content/events/src/nsDOMUIEvent.h             |  9 +--
 content/events/src/nsDOMXULCommandEvent.cpp   |  6 +-
 content/events/src/nsEventStateManager.cpp    |  1 +
 content/html/document/src/nsHTMLDocument.cpp  |  6 --
 content/smil/nsDOMTimeEvent.cpp               |  5 +-
 content/smil/nsDOMTimeEvent.h                 |  4 +-
 content/svg/content/src/nsSVGElement.cpp      |  2 +
 .../xml/document/src/nsXMLPrettyPrinter.cpp   | 20 ++++--
 content/xul/content/src/nsXULElement.cpp      |  6 +-
 dom/Makefile.in                               |  1 +
 dom/base/nsDOMClassInfo.cpp                   | 11 +++
 dom/base/nsGlobalWindow.cpp                   | 28 ++++++++
 dom/base/nsGlobalWindow.h                     |  8 +++
 dom/interfaces/base/domstubs.idl              |  5 ++
 dom/interfaces/base/nsIDOMWindow.idl          | 11 +--
 dom/interfaces/base/nsIDOMWindow2.idl         |  2 +-
 dom/interfaces/base/nsIDOMWindowInternal.idl  |  2 +-
 dom/interfaces/core/nsIDOMDocument.idl        |  9 +--
 dom/interfaces/core/nsIDOMXMLDocument.idl     |  2 +-
 dom/interfaces/css/Makefile.in                |  1 +
 dom/interfaces/css/nsIDOMViewCSS.idl          | 49 ++++++++++++++
 dom/interfaces/events/nsIDOMDragEvent.idl     |  5 +-
 dom/interfaces/events/nsIDOMKeyEvent.idl      |  4 +-
 dom/interfaces/events/nsIDOMMouseEvent.idl    |  4 +-
 .../events/nsIDOMMouseScrollEvent.idl         |  4 +-
 dom/interfaces/events/nsIDOMMozTouchEvent.idl |  4 +-
 dom/interfaces/events/nsIDOMNSMouseEvent.idl  |  4 +-
 .../events/nsIDOMScrollAreaEvent.idl          |  4 +-
 .../events/nsIDOMSimpleGestureEvent.idl       |  4 +-
 dom/interfaces/events/nsIDOMUIEvent.idl       |  6 +-
 dom/interfaces/html/nsIDOMHTMLDocument.idl    |  2 +-
 dom/interfaces/smil/nsIDOMTimeEvent.idl       |  6 +-
 dom/interfaces/svg/nsIDOMSVGDocument.idl      |  2 +-
 dom/interfaces/svg/nsIDOMSVGZoomEvent.idl     |  2 +-
 dom/interfaces/views/Makefile.in              | 54 +++++++++++++++
 dom/interfaces/views/nsIDOMAbstractView.idl   | 53 +++++++++++++++
 dom/interfaces/views/nsIDOMDocumentView.idl   | 54 +++++++++++++++
 dom/interfaces/xul/nsIDOMXULCommandEvent.idl  |  4 +-
 editor/libeditor/html/nsHTMLAbsPosition.cpp   |  9 ++-
 .../libeditor/html/nsHTMLAnonymousUtils.cpp   |  8 +--
 editor/libeditor/html/nsHTMLCSSUtils.cpp      | 67 ++++++++++---------
 editor/libeditor/html/nsHTMLCSSUtils.h        | 29 ++++----
 .../browser/webBrowser/nsContextMenuInfo.cpp  | 22 +++---
 .../spellcheck/src/mozInlineSpellWordUtil.cpp | 16 +++--
 .../spellcheck/src/mozInlineSpellWordUtil.h   |  3 +-
 extensions/widgetutils/src/nsWidgetUtils.cpp  | 23 +++++--
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  6 +-
 layout/inspector/src/inLayoutUtils.cpp        | 17 +++--
 toolkit/toolkit-makefiles.sh                  |  1 +
 widget/src/cocoa/nsMenuItemIconX.mm           | 31 +++++----
 widget/src/cocoa/nsMenuUtilsX.mm              |  5 +-
 xpfe/appshell/src/nsXULWindow.cpp             |  5 +-
 69 files changed, 547 insertions(+), 206 deletions(-)
 create mode 100644 dom/interfaces/css/nsIDOMViewCSS.idl
 create mode 100644 dom/interfaces/views/Makefile.in
 create mode 100644 dom/interfaces/views/nsIDOMAbstractView.idl
 create mode 100644 dom/interfaces/views/nsIDOMDocumentView.idl

diff --git a/accessible/src/atk/nsMaiInterfaceComponent.cpp b/accessible/src/atk/nsMaiInterfaceComponent.cpp
index 588e3441a454..863026e66e3b 100644
--- a/accessible/src/atk/nsMaiInterfaceComponent.cpp
+++ b/accessible/src/atk/nsMaiInterfaceComponent.cpp
@@ -45,6 +45,8 @@
 #include "nsCoreUtils.h"
 
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index 081888febad0..f7d660f6c849 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -43,12 +43,15 @@
 #include "nsAccessNode.h"
 
 #include "nsIDocument.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMRange.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDocShell.h"
@@ -422,12 +425,13 @@ nsCoreUtils::GetScreenCoordsForWindow(nsINode *aNode)
   nsCOMPtr<nsIDocShellTreeItem> rootTreeItem;
   treeItem->GetRootTreeItem(getter_AddRefs(rootTreeItem));
   nsCOMPtr<nsIDOMDocument> domDoc = do_GetInterface(rootTreeItem);
-  if (!domDoc)
+  nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(domDoc));
+  if (!docView)
     return coords;
 
-  nsCOMPtr<nsIDOMWindow> window;
-  domDoc->GetDefaultView(getter_AddRefs(window));
-  nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(window));
+  nsCOMPtr<nsIDOMAbstractView> abstractView;
+  docView->GetDefaultView(getter_AddRefs(abstractView));
+  nsCOMPtr<nsIDOMWindowInternal> windowInter(do_QueryInterface(abstractView));
   if (!windowInter)
     return coords;
 
@@ -593,14 +597,14 @@ nsCoreUtils::GetComputedStyleDeclaration(const nsAString& aPseudoElt,
   if (!document)
     return nsnull;
 
-  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(document->GetWindow());
-  if (!window)
+  nsCOMPtr<nsIDOMViewCSS> viewCSS(do_QueryInterface(document->GetWindow()));
+  if (!viewCSS)
     return nsnull;
 
-  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
+  nsIDOMCSSStyleDeclaration* cssDecl = nsnull;
   nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(content));
-  window->GetComputedStyle(domElement, aPseudoElt, getter_AddRefs(cssDecl));
-  return cssDecl.forget();
+  viewCSS->GetComputedStyle(domElement, aPseudoElt, &cssDecl);
+  return cssDecl;
 }
 
 already_AddRefed<nsIBoxObject>
diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index ae826053be8b..912641c32301 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -47,9 +47,11 @@
 
 #include "nsIClipboard.h"
 #include "nsContentCID.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMDocument.h"
 #include "nsPIDOMWindow.h"        
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMWindowInternal.h"
diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index 9c8dc89f21f5..3129dec2d2fa 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -52,6 +52,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMNSHTMLElement.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsIPrefService.h"
diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp
index 675bbdb68d49..6d52bb5915da 100644
--- a/content/base/src/nsContentAreaDragDrop.cpp
+++ b/content/base/src/nsContentAreaDragDrop.cpp
@@ -54,6 +54,7 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMDragEvent.h"
+#include "nsIDOMAbstractView.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentRange.h"
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index e6876383fa44..cae96e74ac5c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -168,6 +168,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIChromeRegistry.h"
 #include "nsIMIMEHeaderParam.h"
 #include "nsIDOMXULCommandEvent.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMDragEvent.h"
 #include "nsDOMDataTransfer.h"
 #include "nsHtml5Module.h"
@@ -5500,8 +5501,9 @@ nsContentUtils::DispatchXULCommand(nsIContent* aTarget,
   nsCOMPtr<nsIDOMXULCommandEvent> xulCommand = do_QueryInterface(event);
   nsCOMPtr<nsIPrivateDOMEvent> pEvent = do_QueryInterface(xulCommand);
   NS_ENSURE_STATE(pEvent);
+  nsCOMPtr<nsIDOMAbstractView> view = do_QueryInterface(doc->GetWindow());
   nsresult rv = xulCommand->InitCommandEvent(NS_LITERAL_STRING("command"),
-                                             PR_TRUE, PR_TRUE, doc->GetWindow(),
+                                             PR_TRUE, PR_TRUE, view,
                                              0, aCtrl, aAlt, aShift, aMeta,
                                              aSourceEvent);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index e8a86425e8d1..5700367d00e9 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -75,6 +75,8 @@
 #include "nsDOMAttribute.h"
 #include "nsIDOMDOMStringList.h"
 #include "nsIDOMDOMImplementation.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMDocumentXBL.h"
 #include "mozilla/FunctionTimer.h"
 #include "nsGenericElement.h"
@@ -5067,14 +5069,16 @@ nsDocument::CreateTreeWalker(nsIDOMNode *aRoot,
 
 
 NS_IMETHODIMP
-nsDocument::GetDefaultView(nsIDOMWindow** aDefaultView)
+nsDocument::GetDefaultView(nsIDOMAbstractView** aDefaultView)
 {
-  *aDefaultView = nsnull;
   nsPIDOMWindow* win = GetWindow();
-  if (!win) {
-    return NS_OK;
+  if (win) {
+    return CallQueryInterface(win, aDefaultView);
   }
-  return CallQueryInterface(win, aDefaultView);
+
+  *aDefaultView = nsnull;
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 541c78512844..4863e417bd3f 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -52,6 +52,7 @@
 #include "nsTArray.h"
 #include "nsHashSets.h"
 #include "nsIDOMXMLDocument.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMDocumentXBL.h"
 #include "nsIDOMNSDocument.h"
 #include "nsIDOMNSDocumentStyle.h"
@@ -497,6 +498,7 @@ class nsDocument : public nsIDocument,
                    public nsIDOMDocumentEvent,
                    public nsIDOM3DocumentEvent,
                    public nsIDOMNSDocumentStyle,
+                   public nsIDOMDocumentView,
                    public nsIDOMDocumentRange,
                    public nsIDOMDocumentTraversal,
                    public nsIDOMDocumentXBL,
@@ -812,6 +814,9 @@ public:
   // nsIDOMNSDocumentStyle
   NS_DECL_NSIDOMNSDOCUMENTSTYLE
 
+  // nsIDOMDocumentView
+  NS_DECL_NSIDOMDOCUMENTVIEW
+
   // nsIDOMDocumentRange
   NS_DECL_NSIDOMDOCUMENTRANGE
 
@@ -1258,6 +1263,7 @@ protected:
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocument, nsDocument)      \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMNSDocument, nsDocument)    \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentEvent, nsDocument) \
+  NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentView, nsDocument)  \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocumentTraversal,         \
                                      nsDocument)                              \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMEventTarget, nsDocument)   \
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 2e31ff32a52b..8388ece9e828 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -92,6 +92,7 @@
 
 #include "nsBindingManager.h"
 #include "nsXBLBinding.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIXBLService.h"
 #include "nsPIDOMWindow.h"
 #include "nsIBoxObject.h"
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index abb29ba8e28e..3622ed48cbab 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -80,7 +80,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent)
 NS_IMETHODIMP
 nsDOMDragEvent::InitDragEvent(const nsAString & aType,
                               PRBool aCanBubble, PRBool aCancelable,
-                              nsIDOMWindow* aView, PRInt32 aDetail,
+                              nsIDOMAbstractView* aView, PRInt32 aDetail,
                               PRInt32 aScreenX, PRInt32 aScreenY,
                               PRInt32 aClientX, PRInt32 aClientY, 
                               PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey,
@@ -132,5 +132,7 @@ nsresult NS_NewDOMDragEvent(nsIDOMEvent** aInstancePtrResult,
                             nsDragEvent *aEvent) 
 {
   nsDOMDragEvent* event = new nsDOMDragEvent(aPresContext, aEvent);
+  NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
+
   return CallQueryInterface(event, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMKeyboardEvent.cpp b/content/events/src/nsDOMKeyboardEvent.cpp
index e69a875183a8..33cc4ed450ba 100644
--- a/content/events/src/nsDOMKeyboardEvent.cpp
+++ b/content/events/src/nsDOMKeyboardEvent.cpp
@@ -175,7 +175,7 @@ nsDOMKeyboardEvent::GetWhich(PRUint32* aWhich)
 
 NS_IMETHODIMP
 nsDOMKeyboardEvent::InitKeyEvent(const nsAString& aType, PRBool aCanBubble, PRBool aCancelable,
-                                 nsIDOMWindow* aView, PRBool aCtrlKey, PRBool aAltKey,
+                                 nsIDOMAbstractView* aView, PRBool aCtrlKey, PRBool aAltKey,
                                  PRBool aShiftKey, PRBool aMetaKey,
                                  PRUint32 aKeyCode, PRUint32 aCharCode)
 {
@@ -198,5 +198,9 @@ nsresult NS_NewDOMKeyboardEvent(nsIDOMEvent** aInstancePtrResult,
                                 nsKeyEvent *aEvent)
 {
   nsDOMKeyboardEvent* it = new nsDOMKeyboardEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
index 322fc60b9994..dbedcde48bea 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -104,7 +104,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent)
 
 NS_IMETHODIMP
 nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                nsIDOMWindow* aView, PRInt32 aDetail, PRInt32 aScreenX, 
+                                nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX, 
                                 PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY, 
                                 PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey, 
                                 PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget)
@@ -147,7 +147,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo
 
 NS_IMETHODIMP
 nsDOMMouseEvent::InitNSMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                  nsIDOMWindow *aView, PRInt32 aDetail, PRInt32 aScreenX,
+                                  nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX,
                                   PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY,
                                   PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey,
                                   PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget,
@@ -313,5 +313,9 @@ nsresult NS_NewDOMMouseEvent(nsIDOMEvent** aInstancePtrResult,
                              nsInputEvent *aEvent) 
 {
   nsDOMMouseEvent* it = new nsDOMMouseEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMouseScrollEvent.cpp b/content/events/src/nsDOMMouseScrollEvent.cpp
index ac61c741286d..34bda3a5ddea 100644
--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@@ -88,7 +88,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsDOMMouseEvent)
 
 NS_IMETHODIMP
 nsDOMMouseScrollEvent::InitMouseScrollEvent(const nsAString & aType, PRBool aCanBubble, PRBool aCancelable,
-                                nsIDOMWindow *aView, PRInt32 aDetail, PRInt32 aScreenX, 
+                                nsIDOMAbstractView *aView, PRInt32 aDetail, PRInt32 aScreenX, 
                                 PRInt32 aScreenY, PRInt32 aClientX, PRInt32 aClientY, 
                                 PRBool aCtrlKey, PRBool aAltKey, PRBool aShiftKey, 
                                 PRBool aMetaKey, PRUint16 aButton, nsIDOMEventTarget *aRelatedTarget,
@@ -129,5 +129,9 @@ nsresult NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
                                    nsInputEvent *aEvent) 
 {
   nsDOMMouseScrollEvent* it = new nsDOMMouseScrollEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMMozTouchEvent.cpp b/content/events/src/nsDOMMozTouchEvent.cpp
index 0c517e9dd06e..03faf82f72f9 100644
--- a/content/events/src/nsDOMMozTouchEvent.cpp
+++ b/content/events/src/nsDOMMozTouchEvent.cpp
@@ -85,7 +85,7 @@ NS_IMETHODIMP
 nsDOMMozTouchEvent::InitMozTouchEvent(const nsAString& aTypeArg,
                                       PRBool aCanBubbleArg,
                                       PRBool aCancelableArg,
-                                      nsIDOMWindow* aViewArg,
+                                      nsIDOMAbstractView* aViewArg,
                                       PRInt32 aDetailArg,
                                       PRInt32 aScreenX,
                                       PRInt32 aScreenY,
@@ -127,5 +127,8 @@ nsresult NS_NewDOMMozTouchEvent(nsIDOMEvent** aInstancePtrResult,
                                      nsMozTouchEvent *aEvent)
 {
   nsDOMMozTouchEvent *it = new nsDOMMozTouchEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMScrollAreaEvent.cpp b/content/events/src/nsDOMScrollAreaEvent.cpp
index 44c373b0febc..5712179653b4 100644
--- a/content/events/src/nsDOMScrollAreaEvent.cpp
+++ b/content/events/src/nsDOMScrollAreaEvent.cpp
@@ -101,7 +101,7 @@ NS_IMETHODIMP
 nsDOMScrollAreaEvent::InitScrollAreaEvent(const nsAString &aEventType,
                                           PRBool aCanBubble,
                                           PRBool aCancelable,
-                                          nsIDOMWindow *aView,
+                                          nsIDOMAbstractView *aView,
                                           PRInt32 aDetail,
                                           float aX, float aY,
                                           float aWidth, float aHeight)
@@ -155,6 +155,11 @@ NS_NewDOMScrollAreaEvent(nsIDOMEvent **aInstancePtrResult,
                          nsPresContext *aPresContext,
                          nsScrollAreaEvent *aEvent)
 {
-  nsDOMScrollAreaEvent* it = new nsDOMScrollAreaEvent(aPresContext, aEvent);
-  return CallQueryInterface(it, aInstancePtrResult);
+  nsDOMScrollAreaEvent *ev = new nsDOMScrollAreaEvent(aPresContext, aEvent);
+
+  if (!ev) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return CallQueryInterface(ev, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMSimpleGestureEvent.cpp b/content/events/src/nsDOMSimpleGestureEvent.cpp
index c3d3b59f1c44..61374c488fa8 100644
--- a/content/events/src/nsDOMSimpleGestureEvent.cpp
+++ b/content/events/src/nsDOMSimpleGestureEvent.cpp
@@ -95,7 +95,7 @@ NS_IMETHODIMP
 nsDOMSimpleGestureEvent::InitSimpleGestureEvent(const nsAString& aTypeArg,
                                                 PRBool aCanBubbleArg,
                                                 PRBool aCancelableArg,
-                                                nsIDOMWindow* aViewArg,
+                                                nsIDOMAbstractView* aViewArg,
                                                 PRInt32 aDetailArg,
                                                 PRInt32 aScreenX, 
                                                 PRInt32 aScreenY,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index c25f1cbfcb87..07bcba00a9d3 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -176,7 +176,7 @@ nsDOMUIEvent::GetClientPoint()
 }
 
 NS_IMETHODIMP
-nsDOMUIEvent::GetView(nsIDOMWindow** aView)
+nsDOMUIEvent::GetView(nsIDOMAbstractView** aView)
 {
   *aView = mView;
   NS_IF_ADDREF(*aView);
@@ -191,11 +191,7 @@ nsDOMUIEvent::GetDetail(PRInt32* aDetail)
 }
 
 NS_IMETHODIMP
-nsDOMUIEvent::InitUIEvent(const nsAString& typeArg,
-                          PRBool canBubbleArg,
-                          PRBool cancelableArg,
-                          nsIDOMWindow* viewArg,
-                          PRInt32 detailArg)
+nsDOMUIEvent::InitUIEvent(const nsAString & typeArg, PRBool canBubbleArg, PRBool cancelableArg, nsIDOMAbstractView *viewArg, PRInt32 detailArg)
 {
   nsresult rv = nsDOMEvent::InitEvent(typeArg, canBubbleArg, cancelableArg);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -422,5 +418,9 @@ nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult,
                           nsGUIEvent *aEvent) 
 {
   nsDOMUIEvent* it = new nsDOMUIEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsDOMUIEvent.h b/content/events/src/nsDOMUIEvent.h
index 22cee7ade555..a242af36f5be 100644
--- a/content/events/src/nsDOMUIEvent.h
+++ b/content/events/src/nsDOMUIEvent.h
@@ -36,11 +36,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsDOMUIEvent_h
-#define nsDOMUIEvent_h
+#ifndef nsDOMUIEvent_h__
+#define nsDOMUIEvent_h__
 
 #include "nsIDOMUIEvent.h"
 #include "nsIDOMNSUIEvent.h"
+#include "nsIDOMAbstractView.h"
 #include "nsDOMEvent.h"
 
 class nsDOMUIEvent : public nsDOMEvent,
@@ -77,7 +78,7 @@ protected:
   nsIntPoint GetPagePoint();
   
 protected:
-  nsCOMPtr<nsIDOMWindow> mView;
+  nsCOMPtr<nsIDOMAbstractView> mView;
   PRInt32 mDetail;
   nsIntPoint mClientPoint;
   // Screenpoint is mEvent->refPoint.
@@ -89,4 +90,4 @@ protected:
   NS_FORWARD_NSIDOMUIEVENT(nsDOMUIEvent::) \
   NS_FORWARD_TO_NSDOMEVENT
 
-#endif // nsDOMUIEvent_h
+#endif // nsDOMUIEvent_h__
diff --git a/content/events/src/nsDOMXULCommandEvent.cpp b/content/events/src/nsDOMXULCommandEvent.cpp
index 30611e651112..1090d318f62b 100644
--- a/content/events/src/nsDOMXULCommandEvent.cpp
+++ b/content/events/src/nsDOMXULCommandEvent.cpp
@@ -118,7 +118,7 @@ nsDOMXULCommandEvent::GetSourceEvent(nsIDOMEvent** aSourceEvent)
 NS_IMETHODIMP
 nsDOMXULCommandEvent::InitCommandEvent(const nsAString& aType,
                                        PRBool aCanBubble, PRBool aCancelable,
-                                       nsIDOMWindow* aView,
+                                       nsIDOMAbstractView *aView,
                                        PRInt32 aDetail,
                                        PRBool aCtrlKey, PRBool aAltKey,
                                        PRBool aShiftKey, PRBool aMetaKey,
@@ -144,5 +144,9 @@ nsresult NS_NewDOMXULCommandEvent(nsIDOMEvent** aInstancePtrResult,
                                   nsInputEvent *aEvent) 
 {
   nsDOMXULCommandEvent* it = new nsDOMXULCommandEvent(aPresContext, aEvent);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   return CallQueryInterface(it, aInstancePtrResult);
 }
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 2f95f42e5662..b87f2f04ad39 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -118,6 +118,7 @@
 #include "nsIDOMMouseScrollEvent.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIDOMEventTarget.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMNSUIEvent.h"
 #include "nsDOMDragEvent.h"
 #include "nsIDOMNSEditableElement.h"
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index df3c7088a718..98e17655f5ce 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1388,12 +1388,6 @@ nsHTMLDocument::NormalizeDocument()
   return nsDocument::NormalizeDocument();
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::GetDefaultView(nsIDOMWindow** aWindow)
-{
-  return nsDocument::GetDefaultView(aWindow);
-}
-
 //
 // nsIDOMHTMLDocument interface implementation
 //
diff --git a/content/smil/nsDOMTimeEvent.cpp b/content/smil/nsDOMTimeEvent.cpp
index d37dc033c37b..100a385b31c3 100644
--- a/content/smil/nsDOMTimeEvent.cpp
+++ b/content/smil/nsDOMTimeEvent.cpp
@@ -39,6 +39,7 @@
 #include "nsGUIEvent.h"
 #include "nsPresContext.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsIDOMAbstractView.h"
 
 nsDOMTimeEvent::nsDOMTimeEvent(nsPresContext* aPresContext, nsEvent* aEvent)
   : nsDOMEvent(aPresContext, aEvent ? aEvent : new nsUIEvent(PR_FALSE, 0, 0)),
@@ -91,7 +92,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMTimeEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
 
 NS_IMETHODIMP
-nsDOMTimeEvent::GetView(nsIDOMWindow** aView)
+nsDOMTimeEvent::GetView(nsIDOMAbstractView** aView)
 {
   *aView = mView;
   NS_IF_ADDREF(*aView);
@@ -107,7 +108,7 @@ nsDOMTimeEvent::GetDetail(PRInt32* aDetail)
 
 NS_IMETHODIMP
 nsDOMTimeEvent::InitTimeEvent(const nsAString& aTypeArg,
-                              nsIDOMWindow* aViewArg,
+                              nsIDOMAbstractView* aViewArg,
                               PRInt32 aDetailArg)
 {
   nsresult rv = nsDOMEvent::InitEvent(aTypeArg, PR_FALSE /*doesn't bubble*/,
diff --git a/content/smil/nsDOMTimeEvent.h b/content/smil/nsDOMTimeEvent.h
index 9ff25f5e37ca..632b8ddc19a9 100644
--- a/content/smil/nsDOMTimeEvent.h
+++ b/content/smil/nsDOMTimeEvent.h
@@ -58,8 +58,8 @@ public:
   NS_FORWARD_TO_NSDOMEVENT
 
 private:
-  nsCOMPtr<nsIDOMWindow> mView;
-  PRInt32 mDetail;
+  nsCOMPtr<nsIDOMAbstractView> mView;
+  PRInt32                      mDetail;
 };
 
 #endif // NS_DOMTIMEEVENT_H_
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
index e885ef81906c..6818d4f9a215 100644
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -51,6 +51,8 @@
 #include "nsStyleConsts.h"
 #include "nsDOMError.h"
 #include "nsIPresShell.h"
+#include "nsIDOMViewCSS.h"
+#include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIServiceManager.h"
 #include "nsIXBLService.h"
 #include "nsGkAtoms.h"
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/content/xml/document/src/nsXMLPrettyPrinter.cpp
index 504db4af51db..e6b963561bc8 100644
--- a/content/xml/document/src/nsXMLPrettyPrinter.cpp
+++ b/content/xml/document/src/nsXMLPrettyPrinter.cpp
@@ -38,7 +38,10 @@
  
 #include "nsXMLPrettyPrinter.h"
 #include "nsContentUtils.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMCSSStyleDeclaration.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMDocumentXBL.h"
 #include "nsIObserver.h"
 #include "nsIXSLTProcessor.h"
@@ -92,13 +95,16 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
         nsCOMPtr<nsIDOMCSSStyleDeclaration> computedStyle;
         nsCOMPtr<nsIDOMDocument> frameOwnerDoc;
         frameElem->GetOwnerDocument(getter_AddRefs(frameOwnerDoc));
-        if (frameOwnerDoc) {
-            nsCOMPtr<nsIDOMWindow> window;
-            frameOwnerDoc->GetDefaultView(getter_AddRefs(window));
-            if (window) {
-                window->GetComputedStyle(frameElem,
-                                         EmptyString(),
-                                         getter_AddRefs(computedStyle));
+        nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(frameOwnerDoc);
+        if (docView) {
+            nsCOMPtr<nsIDOMAbstractView> defaultView;
+            docView->GetDefaultView(getter_AddRefs(defaultView));
+            nsCOMPtr<nsIDOMViewCSS> defaultCSSView =
+                do_QueryInterface(defaultView);
+            if (defaultCSSView) {
+                defaultCSSView->GetComputedStyle(frameElem,
+                                                 EmptyString(),
+                                                 getter_AddRefs(computedStyle));
             }
         }
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 23279f0f2116..a91eab34d349 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -118,6 +119,7 @@
 #include "nsXULDocument.h"
 #include "nsXULPopupListener.h"
 #include "nsRuleWalker.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsCSSParser.h"
 #include "nsIListBoxObject.h"
diff --git a/dom/Makefile.in b/dom/Makefile.in
index e2d79ad032ab..cb57d182cb44 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -50,6 +50,7 @@ DIRS = \
   interfaces/html \
   interfaces/events \
   interfaces/stylesheets \
+  interfaces/views \
   interfaces/sidebar \
   interfaces/css \
   interfaces/traversal \
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index d8a32e3c172c..6cd2e5f57a1c 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -192,6 +192,7 @@
 #include "nsBindingManager.h"
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsStyleSet.h"
@@ -252,6 +253,7 @@
 #include "nsIDOMDocumentRange.h"
 #include "nsIDOMDocumentTraversal.h"
 #include "nsIDOMDocumentXBL.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMLinkStyle.h"
 #include "nsIDOMHTMLDocument.h"
@@ -2271,6 +2273,7 @@ nsDOMClassInfo::RegisterExternalClasses()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentEvent)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentStyle)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSDocumentStyle)                            \
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentView)                               \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentRange)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTraversal)                          \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentXBL)                                \
@@ -2347,6 +2350,8 @@ nsDOMClassInfo::Init()
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
@@ -2358,6 +2363,8 @@ nsDOMClassInfo::Init()
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
     DOM_CLASSINFO_MAP_END
@@ -3064,6 +3071,8 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(RangeException, nsIDOMRangeException)
@@ -3946,6 +3955,8 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMViewCSS)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMAbstractView)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMModalContentWindow)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 6c0547a84185..c16f4f62471b 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -111,6 +111,7 @@
 #endif
 #include "nsIDOMDocument.h"
 #include "nsIDOMNSDocument.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEvent.h"
@@ -1333,6 +1334,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
   NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
   NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMWindow)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMViewCSS)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMAbstractView)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageWindow)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
@@ -7936,6 +7939,10 @@ nsGlobalWindow::UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent)
   }
 }
 
+//*****************************************************************************
+// nsGlobalWindow::nsIDOMViewCSS
+//*****************************************************************************
+
 NS_IMETHODIMP
 nsGlobalWindow::GetComputedStyle(nsIDOMElement* aElt,
                                  const nsAString& aPseudoElt,
@@ -7972,6 +7979,27 @@ nsGlobalWindow::GetComputedStyle(nsIDOMElement* aElt,
   return NS_OK;
 }
 
+//*****************************************************************************
+// nsGlobalWindow::nsIDOMAbstractView
+//*****************************************************************************
+
+NS_IMETHODIMP
+nsGlobalWindow::GetDocument(nsIDOMDocumentView ** aDocumentView)
+{
+  NS_ENSURE_ARG_POINTER(aDocumentView);
+
+  nsresult rv = NS_OK;
+
+  if (mDocument) {
+    rv = CallQueryInterface(mDocument, aDocumentView);
+  }
+  else {
+    *aDocumentView = nsnull;
+  }
+
+  return rv;
+}
+
 //*****************************************************************************
 // nsGlobalWindow::nsIDOMStorageWindow
 //*****************************************************************************
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 4c533df74503..dac3c390d91a 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -62,6 +62,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDOMClientInformation.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEventTarget.h"
@@ -279,6 +280,7 @@ class nsGlobalWindow : public nsPIDOMWindow,
                        public nsPIDOMEventTarget,
                        public nsIDOM3EventTarget,
                        public nsIDOMNSEventTarget,
+                       public nsIDOMViewCSS,
                        public nsIDOMStorageWindow,
                        public nsIDOMStorageIndexedDB,
                        public nsSupportsWeakReference,
@@ -417,6 +419,12 @@ public:
   virtual NS_HIDDEN_(void) MaybeUpdateTouchState();
   virtual NS_HIDDEN_(void) UpdateTouchState();
 
+  // nsIDOMViewCSS
+  NS_DECL_NSIDOMVIEWCSS
+
+  // nsIDOMAbstractView
+  NS_DECL_NSIDOMABSTRACTVIEW
+
   // nsIDOMStorageWindow
   NS_DECL_NSIDOMSTORAGEWINDOW
 
diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl
index 1a4496dddad8..3dd14bb44d75 100644
--- a/dom/interfaces/base/domstubs.idl
+++ b/dom/interfaces/base/domstubs.idl
@@ -77,6 +77,10 @@ interface nsIDOMLinkStyle;
 interface nsIDOMStyleSheet;
 interface nsIDOMMediaList;
 
+// Views
+interface nsIDOMAbstractView;
+interface nsIDOMDocumentView;
+
 // Base
 interface nsIDOMWindow;
 interface nsIDOMWindowInternal;
@@ -126,3 +130,4 @@ interface nsIDOMRange;
 interface nsIDOMCRMFObject;
 interface nsIDOMCrypto;
 interface nsIDOMPkcs11;
+
diff --git a/dom/interfaces/base/nsIDOMWindow.idl b/dom/interfaces/base/nsIDOMWindow.idl
index ec0414e05708..fdc98011b44c 100644
--- a/dom/interfaces/base/nsIDOMWindow.idl
+++ b/dom/interfaces/base/nsIDOMWindow.idl
@@ -47,10 +47,11 @@ interface nsISelection;
  * contain child windows if the document in the window contains a
  * HTML frameset document or if the document contains iframe elements.
  *
- * @see <http://www.whatwg.org/html/#window>
+ * This interface is not officially defined by any standard bodies, it
+ * originates from the defacto DOM Level 0 standard.
  */
 
-[scriptable, uuid(ff7d278f-93db-4078-b89a-058c8e1270b4)]
+[scriptable, uuid(a6cf906b-15b3-11d2-932e-00805f8add32)]
 interface nsIDOMWindow : nsISupports
 {
   /**
@@ -149,10 +150,4 @@ interface nsIDOMWindow : nsISupports
    * Method for sizing this window to the content in the window.
    */
   void                      sizeToContent();
-
-  /**
-   * @see <http://dev.w3.org/csswg/cssom/#dom-window-getcomputedstyle>
-   */
-  nsIDOMCSSStyleDeclaration getComputedStyle(in nsIDOMElement elt, 
-                                             [optional] in DOMString pseudoElt);
 };
diff --git a/dom/interfaces/base/nsIDOMWindow2.idl b/dom/interfaces/base/nsIDOMWindow2.idl
index a69d0ae88162..510e3178f081 100644
--- a/dom/interfaces/base/nsIDOMWindow2.idl
+++ b/dom/interfaces/base/nsIDOMWindow2.idl
@@ -40,7 +40,7 @@
 interface nsIDOMOfflineResourceList;
 interface nsIDOMBlob;
 
-[scriptable, uuid(e2796e00-14de-4ce0-acfe-0374bc0e715d)]
+[scriptable, uuid(efff0d88-3b94-4375-bdeb-676a847ecd7d)]
 interface nsIDOMWindow2 : nsIDOMWindow
 {
   /**
diff --git a/dom/interfaces/base/nsIDOMWindowInternal.idl b/dom/interfaces/base/nsIDOMWindowInternal.idl
index 27e2d3167aba..114b39d40926 100644
--- a/dom/interfaces/base/nsIDOMWindowInternal.idl
+++ b/dom/interfaces/base/nsIDOMWindowInternal.idl
@@ -46,7 +46,7 @@ interface nsIVariant;
 interface nsIAnimationFrameListener;
 interface nsIDOMMediaQueryList;
 
-[scriptable, uuid(4d95736f-8130-43cb-a276-5bc554eca80a)]
+[scriptable, uuid(04eafa93-efbe-4254-9d65-91c344fa7ff2)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index 68956bbe4d18..e9587254012b 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -52,7 +52,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(d12f0ecf-434a-4b5c-81ad-354e3b9037b9)]
+[scriptable, uuid(2d305b95-a030-4d24-a12c-7fabf61a8c3c)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -108,11 +108,4 @@ interface nsIDOMDocument : nsIDOMNode
                                         raises(DOMException);
   // Introduced in DOM Level 3:
   void               normalizeDocument();
-
-  /**
-   * The window associated with this document.
-   *
-   * @see http://www.whatwg.org/html/#dom-document-defaultview
-   */
-  readonly attribute nsIDOMWindow    defaultView;
 };
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 3069153065ac..224ba547c50e 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(68e4448c-eb64-48ea-801a-0c83008d2607)]
+[scriptable, uuid(f493687c-ea80-471b-965b-11467ebea24b)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/css/Makefile.in b/dom/interfaces/css/Makefile.in
index b432a249adbf..a0b4c64838c8 100644
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -71,6 +71,7 @@ XPIDLSRCS =					\
 	nsIDOMDocumentCSS.idl			\
 	nsIDOMRGBColor.idl			\
 	nsIDOMRect.idl				\
+	nsIDOMViewCSS.idl			\
 	nsIDOMNSRGBAColor.idl			\
 	$(NULL)
 
diff --git a/dom/interfaces/css/nsIDOMViewCSS.idl b/dom/interfaces/css/nsIDOMViewCSS.idl
new file mode 100644
index 000000000000..2eb66fc9e9f9
--- /dev/null
+++ b/dom/interfaces/css/nsIDOMViewCSS.idl
@@ -0,0 +1,49 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Johnny Stenback <jst@netscape.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIDOMAbstractView.idl"
+
+[scriptable, uuid(0b9341f3-95d4-4fa4-adcd-e119e0db2889)]
+interface nsIDOMViewCSS : nsIDOMAbstractView
+{
+  /**
+   * @see <http://dev.w3.org/csswg/cssom/#dom-window-getcomputedstyle>
+   */
+  nsIDOMCSSStyleDeclaration getComputedStyle(in nsIDOMElement elt, 
+                                             [optional] in DOMString pseudoElt);
+};
diff --git a/dom/interfaces/events/nsIDOMDragEvent.idl b/dom/interfaces/events/nsIDOMDragEvent.idl
index 13e25628e296..a443f7d5e3ec 100644
--- a/dom/interfaces/events/nsIDOMDragEvent.idl
+++ b/dom/interfaces/events/nsIDOMDragEvent.idl
@@ -38,9 +38,10 @@
 #include "domstubs.idl"
 #include "nsIDOMMouseEvent.idl"
 
+interface nsIDOMAbstractView;
 interface nsIDOMDataTransfer;
 
-[scriptable, uuid(0f4fef03-c0e9-406c-a754-c01148e431ae)]
+[scriptable, uuid(98351627-62d7-4b07-bbf3-78009b20764b)]
 interface nsIDOMDragEvent : nsIDOMMouseEvent
 {
   readonly attribute nsIDOMDataTransfer dataTransfer;
@@ -48,7 +49,7 @@ interface nsIDOMDragEvent : nsIDOMMouseEvent
   void initDragEvent(in DOMString typeArg,
                      in boolean canBubbleArg,
                      in boolean cancelableArg,
-                     in nsIDOMWindow aView,
+                     in nsIDOMAbstractView aView,
                      in long aDetail,
                      in long aScreenX,
                      in long aScreenY,
diff --git a/dom/interfaces/events/nsIDOMKeyEvent.idl b/dom/interfaces/events/nsIDOMKeyEvent.idl
index 18e770dd603c..c0ed1dfc59aa 100644
--- a/dom/interfaces/events/nsIDOMKeyEvent.idl
+++ b/dom/interfaces/events/nsIDOMKeyEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(e44d7977-20f2-442e-bc13-0f2f52992a4c)]
+[scriptable, uuid(028e0e6e-8b01-11d3-aae7-0010838a3123)]
 interface nsIDOMKeyEvent : nsIDOMUIEvent
 {
   const unsigned long DOM_VK_CANCEL         = 0x03;
@@ -193,7 +193,7 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent
   void                      initKeyEvent(in DOMString typeArg,
                                          in boolean canBubbleArg,
                                          in boolean cancelableArg,
-                                         in nsIDOMWindow viewArg,
+                                         in nsIDOMAbstractView viewArg,
                                          in boolean ctrlKeyArg,
                                          in boolean altKeyArg,
                                          in boolean shiftKeyArg,
diff --git a/dom/interfaces/events/nsIDOMMouseEvent.idl b/dom/interfaces/events/nsIDOMMouseEvent.idl
index 7f0d763b9edb..f21e93d8b614 100644
--- a/dom/interfaces/events/nsIDOMMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseEvent.idl
@@ -47,7 +47,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(73558605-f479-493e-86d1-9794cd117fef)]
+[scriptable, uuid(ff751edc-8b02-aae7-0010-8301838a3123)]
 interface nsIDOMMouseEvent : nsIDOMUIEvent
 {
   readonly attribute long               screenX;
@@ -67,7 +67,7 @@ interface nsIDOMMouseEvent : nsIDOMUIEvent
   void                      initMouseEvent(in DOMString typeArg,
                                            in boolean canBubbleArg,
                                            in boolean cancelableArg,
-                                           in nsIDOMWindow viewArg,
+                                           in nsIDOMAbstractView viewArg,
                                            in long detailArg,
                                            in long screenXArg,
                                            in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
index fafce7cb327f..269061fab605 100644
--- a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMMouseEvent.idl"
 
-[scriptable, uuid(af08bce0-6821-4bac-8964-0fcee4be549a)]
+[scriptable, uuid(ba8d1a7e-b475-4542-8d32-01e7ea7b8091)]
 interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
 {
   const long HORIZONTAL_AXIS = 1;
@@ -49,7 +49,7 @@ interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
   void                initMouseScrollEvent(in DOMString typeArg,
                                            in boolean canBubbleArg,
                                            in boolean cancelableArg,
-                                           in nsIDOMWindow viewArg,
+                                           in nsIDOMAbstractView viewArg,
                                            in long detailArg,
                                            in long screenXArg,
                                            in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMMozTouchEvent.idl b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
index d9f73c5bc8e8..b9439dfa06fc 100644
--- a/dom/interfaces/events/nsIDOMMozTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
@@ -40,7 +40,7 @@
 #include "nsIDOMMouseEvent.idl"
 
 
-[scriptable, uuid(e9ed248b-1995-482f-8407-33ae7744bb9c)]
+[scriptable, uuid(9b454391-0190-4313-a070-1e26e9bf6f31)]
 interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
 {
   readonly attribute unsigned long streamId;
@@ -48,7 +48,7 @@ interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
   void initMozTouchEvent(in DOMString typeArg,
                          in boolean canBubbleArg,
                          in boolean cancelableArg,
-                         in nsIDOMWindow viewArg,
+                         in nsIDOMAbstractView viewArg,
                          in long detailArg,
                          in long screenXArg,
                          in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMNSMouseEvent.idl b/dom/interfaces/events/nsIDOMNSMouseEvent.idl
index abf10c770905..a9b54780d177 100644
--- a/dom/interfaces/events/nsIDOMNSMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMNSMouseEvent.idl
@@ -43,7 +43,7 @@
  * by providing various information related to the mouse event.
  */
 
-[scriptable, uuid(8418a402-3c9b-431a-80a7-a59b23ed57a0)]
+[scriptable, uuid(f5dd5fbb-f4ff-4277-819c-f31aa1dafc32)]
 interface nsIDOMNSMouseEvent : nsIDOMMouseEvent
 {
   // Finger or touch pressure event value
@@ -63,7 +63,7 @@ interface nsIDOMNSMouseEvent : nsIDOMMouseEvent
   void                initNSMouseEvent(in DOMString typeArg,
                                        in boolean canBubbleArg,
                                        in boolean cancelableArg,
-                                       in nsIDOMWindow viewArg,
+                                       in nsIDOMAbstractView viewArg,
                                        in long detailArg,
                                        in long screenXArg,
                                        in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
index b4ad5b9fd174..0cbc870b8425 100644
--- a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
+++ b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
@@ -37,7 +37,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(911c3352-6690-421c-9bbe-6bd34f1600dc)]
+[scriptable, uuid(b2f49035-4a2f-4e62-8fb0-deb68b0de4d9)]
 interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
 {
   // Scroll area client rect
@@ -49,7 +49,7 @@ interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
   void initScrollAreaEvent(in DOMString aEventType,
                            in boolean aCanBubble,
                            in boolean aCancelable,
-                           in nsIDOMWindow aView,
+                           in nsIDOMAbstractView aView,
                            in long aDetail,
                            in float x,
                            in float y,
diff --git a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
index 625acd43b056..91d1ac23d461 100644
--- a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
+++ b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
@@ -97,7 +97,7 @@
  * consuming events.
  */
 
-[scriptable, uuid(fe6b7df3-be7c-4a0b-99a2-da84e956e2f5)]
+[scriptable, uuid(cb68e879-f710-415d-a871-9a550860df01)]
 interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
 {
   /* Swipe direction constants */
@@ -148,7 +148,7 @@ interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
   void initSimpleGestureEvent(in DOMString typeArg,
                               in boolean canBubbleArg,
                               in boolean cancelableArg,
-                              in nsIDOMWindow viewArg,
+                              in nsIDOMAbstractView viewArg,
                               in long detailArg,
                               in long screenXArg,
                               in long screenYArg,
diff --git a/dom/interfaces/events/nsIDOMUIEvent.idl b/dom/interfaces/events/nsIDOMUIEvent.idl
index 155858d1964c..cbd86bfe10dd 100644
--- a/dom/interfaces/events/nsIDOMUIEvent.idl
+++ b/dom/interfaces/events/nsIDOMUIEvent.idl
@@ -47,14 +47,14 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(25f28689-3f78-47e8-8d76-15b936faf8c1)]
+[scriptable, uuid(a6cf90c3-15b3-11d2-932e-00805f8add32)]
 interface nsIDOMUIEvent : nsIDOMEvent
 {
-  readonly attribute nsIDOMWindow       view;
+  readonly attribute nsIDOMAbstractView view;
   readonly attribute long               detail;
   void                      initUIEvent(in DOMString typeArg,
                                         in boolean canBubbleArg,
                                         in boolean cancelableArg,
-                                        in nsIDOMWindow viewArg,
+                                        in nsIDOMAbstractView viewArg,
                                         in long detailArg);
 };
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index bc957bec92d6..53972ff95ae9 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(42bb545e-be46-4f4f-8c0a-6c948ea0c1d4)]
+[scriptable, uuid(2d7a0f2e-6b1c-4e93-bbea-122eb0a8a513)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            title;
diff --git a/dom/interfaces/smil/nsIDOMTimeEvent.idl b/dom/interfaces/smil/nsIDOMTimeEvent.idl
index 086b7aebe23f..af1e5bc5ea09 100644
--- a/dom/interfaces/smil/nsIDOMTimeEvent.idl
+++ b/dom/interfaces/smil/nsIDOMTimeEvent.idl
@@ -45,13 +45,13 @@
  * http://www.w3.org/TR/SVG/animate.html#InterfaceTimeEvent
  */
 
-[scriptable, uuid(873785cc-d8be-48af-8b30-5c566e3f4e6e)]
+[scriptable, uuid(0d309c26-ddbb-44cb-9af1-3008972349e3)]
 interface nsIDOMTimeEvent : nsIDOMEvent
 {
   readonly attribute long detail;
-  readonly attribute nsIDOMWindow view;
+  readonly attribute nsIDOMAbstractView view;
   
   void initTimeEvent(in DOMString typeArg,
-                     in nsIDOMWindow viewArg,
+                     in nsIDOMAbstractView viewArg,
                      in long detailArg);
 };
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index 78faa0f9b0db..89aff8b4048f 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,7 +39,7 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(907f1ada-5ace-4789-8c25-0c79f251044d)]
+[scriptable, uuid(dcac0765-b258-4e0b-9862-6470eb9876ba)]
 interface nsIDOMSVGDocument : nsIDOMDocument
                          /* , nsIDOMDocumentEvent */
 {
diff --git a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
index 839845422287..edf22923df90 100644
--- a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
@@ -45,7 +45,7 @@
 interface nsIDOMSVGRect;
 interface nsIDOMSVGPoint;
 
-[scriptable, uuid(7298880d-127d-470d-a8ac-e5a8e5969270)]
+[scriptable, uuid(339a8c7a-552e-4cbc-8d96-8370a3939358)]
 interface nsIDOMSVGZoomEvent : nsIDOMUIEvent
 {
   readonly attribute nsIDOMSVGRect  zoomRectScreen;
diff --git a/dom/interfaces/views/Makefile.in b/dom/interfaces/views/Makefile.in
new file mode 100644
index 000000000000..6137d4a5c4fc
--- /dev/null
+++ b/dom/interfaces/views/Makefile.in
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= dom
+XPIDL_MODULE	= dom_views
+GRE_MODULE	= 1
+
+SDK_XPIDLSRCS =                                 \
+	nsIDOMDocumentView.idl			\
+	nsIDOMAbstractView.idl			\
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/views/nsIDOMAbstractView.idl b/dom/interfaces/views/nsIDOMAbstractView.idl
new file mode 100644
index 000000000000..eedc3e05384d
--- /dev/null
+++ b/dom/interfaces/views/nsIDOMAbstractView.idl
@@ -0,0 +1,53 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Johnny Stenback <jst@netscape.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+/**
+ * The nsIDOMAbstractView interface is a datatype for a view in the
+ * Document Object Model.
+ *
+ * For more information on this interface please see
+ * http://www.w3.org/TR/DOM-Level-2-Views
+ */
+
+[scriptable, uuid(F51EBADE-8B1A-11D3-AAE7-0010830123B4)]
+interface nsIDOMAbstractView : nsISupports
+{
+  readonly attribute nsIDOMDocumentView     document;
+};
diff --git a/dom/interfaces/views/nsIDOMDocumentView.idl b/dom/interfaces/views/nsIDOMDocumentView.idl
new file mode 100644
index 000000000000..a78ef779be65
--- /dev/null
+++ b/dom/interfaces/views/nsIDOMDocumentView.idl
@@ -0,0 +1,54 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Johnny Stenback <jst@netscape.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+/**
+ * The nsIDOMDocumentView interface is a datatype for a document that
+ * supports views in the Document Object Model.
+ *
+ * For more information on this interface please see
+ * http://www.w3.org/TR/DOM-Level-2-Views
+ */
+
+[scriptable, uuid(1ACDB2BA-1DD2-11B2-95BC-9542495D2569)]
+interface nsIDOMDocumentView : nsISupports
+{
+  readonly attribute nsIDOMAbstractView     defaultView;
+};
+
diff --git a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
index 803857f05fb3..0f8263a3344a 100644
--- a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
+++ b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
@@ -43,7 +43,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(1d78da1e-2177-4b8f-9b11-41e78d1e60f7)]
+[scriptable, uuid(f9fa8205-a988-4828-9228-f3332d5475ac)]
 interface nsIDOMXULCommandEvent : nsIDOMUIEvent
 {
   /**
@@ -68,7 +68,7 @@ interface nsIDOMXULCommandEvent : nsIDOMUIEvent
   void initCommandEvent(in DOMString typeArg,
                         in boolean canBubbleArg,
                         in boolean cancelableArg,
-                        in nsIDOMWindow viewArg,
+                        in nsIDOMAbstractView viewArg,
                         in long detailArg,
                         in boolean ctrlKeyArg,
                         in boolean altKeyArg,
diff --git a/editor/libeditor/html/nsHTMLAbsPosition.cpp b/editor/libeditor/html/nsHTMLAbsPosition.cpp
index 5c685dc5cc11..c3b72590d251 100644
--- a/editor/libeditor/html/nsHTMLAbsPosition.cpp
+++ b/editor/libeditor/html/nsHTMLAbsPosition.cpp
@@ -690,14 +690,13 @@ nsHTMLEditor::CheckPositionedElementBGandFG(nsIDOMElement * aElement,
                                          bgColorStr);
     NS_ENSURE_SUCCESS(res, res);
     if (bgColorStr.EqualsLiteral("transparent")) {
-      nsCOMPtr<nsIDOMWindow> window;
-      res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(window));
-      NS_ENSURE_SUCCESS(res, res);
 
+      nsCOMPtr<nsIDOMViewCSS> viewCSS;
+      res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(viewCSS));
+      NS_ENSURE_SUCCESS(res, res);
       nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
-      res = window->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
+      res = viewCSS->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
       NS_ENSURE_SUCCESS(res, res);
-
       // from these declarations, get the one we want and that one only
       nsCOMPtr<nsIDOMCSSValue> colorCssValue;
       res = cssDecl->GetPropertyCSSValue(NS_LITERAL_STRING("color"), getter_AddRefs(colorCssValue));
diff --git a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
index b7aea69a67d4..79a0f6924281 100644
--- a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
+++ b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
@@ -430,13 +430,13 @@ nsHTMLEditor::GetPositionAndDimensions(nsIDOMElement * aElement,
     // Yes, it is absolutely positioned
     mResizedObjectIsAbsolutelyPositioned = PR_TRUE;
 
-    nsCOMPtr<nsIDOMWindow> window;
-    res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(window));
-    NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIDOMViewCSS> viewCSS;
+    res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(viewCSS));
+    NS_ENSURE_TRUE(viewCSS, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
     // Get the all the computed css styles attached to the element node
-    res = window->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
+    res = viewCSS->GetComputedStyle(aElement, EmptyString(), getter_AddRefs(cssDecl));
     NS_ENSURE_SUCCESS(res, res);
 
     aBorderLeft = GetCSSFloatValue(cssDecl, NS_LITERAL_STRING("border-left-width"));
diff --git a/editor/libeditor/html/nsHTMLCSSUtils.cpp b/editor/libeditor/html/nsHTMLCSSUtils.cpp
index 19e46b5e3a32..884a00d46909 100644
--- a/editor/libeditor/html/nsHTMLCSSUtils.cpp
+++ b/editor/libeditor/html/nsHTMLCSSUtils.cpp
@@ -47,6 +47,7 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIContent.h"
 #include "nsIAtom.h"
 #include "nsTextEditUtils.h"
@@ -537,36 +538,35 @@ nsresult
 nsHTMLCSSUtils::GetComputedProperty(nsIDOMNode *aNode, nsIAtom *aProperty,
                                     nsAString & aValue)
 {
-  nsCOMPtr<nsIDOMWindow> window;
-  nsresult res = GetDefaultViewCSS(aNode, getter_AddRefs(window));
+  nsCOMPtr<nsIDOMViewCSS> viewCSS = nsnull;
+  nsresult res = GetDefaultViewCSS(aNode, getter_AddRefs(viewCSS));
   NS_ENSURE_SUCCESS(res, res);
 
-  return GetCSSInlinePropertyBase(aNode, aProperty, aValue, window, COMPUTED_STYLE_TYPE);
+  return GetCSSInlinePropertyBase(aNode, aProperty, aValue, viewCSS, COMPUTED_STYLE_TYPE);
 }
 
 nsresult
 nsHTMLCSSUtils::GetCSSInlinePropertyBase(nsIDOMNode *aNode, nsIAtom *aProperty,
-                                         nsAString& aValue,
-                                         nsIDOMWindow* aWindow,
-                                         PRUint8 aStyleType)
+                                        nsAString &aValue,
+                                        nsIDOMViewCSS *aViewCSS,
+                                        PRUint8 aStyleType)
 {
   aValue.Truncate();
   NS_ENSURE_TRUE(aProperty, NS_ERROR_NULL_POINTER);
 
-  nsCOMPtr<nsIDOMElement> element;
+  nsCOMPtr<nsIDOMElement>element;
   nsresult res = GetElementContainerOrSelf(aNode, getter_AddRefs(element));
   NS_ENSURE_SUCCESS(res, res);
 
   switch (aStyleType) {
     case COMPUTED_STYLE_TYPE:
-      if (element && aWindow) {
+      if (element && aViewCSS) {
         nsAutoString value, propString;
         nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl;
         aProperty->ToString(propString);
         // Get the all the computed css styles attached to the element node
-        res = aWindow->GetComputedStyle(element, EmptyString(), getter_AddRefs(cssDecl));
-        if (NS_FAILED(res) || !cssDecl)
-          return res;
+        res = aViewCSS->GetComputedStyle(element, EmptyString(), getter_AddRefs(cssDecl));
+        if (NS_FAILED(res) || !cssDecl) return res;
         // from these declarations, get the one we want and that one only
         res = cssDecl->GetPropertyValue(propString, value);
         NS_ENSURE_SUCCESS(res, res);
@@ -591,28 +591,33 @@ nsHTMLCSSUtils::GetCSSInlinePropertyBase(nsIDOMNode *aNode, nsIAtom *aProperty,
 }
 
 nsresult
-nsHTMLCSSUtils::GetDefaultViewCSS(nsIDOMNode *aNode, nsIDOMWindow **aViewCSS)
+nsHTMLCSSUtils::GetDefaultViewCSS(nsIDOMNode *aNode, nsIDOMViewCSS **aViewCSS)
 {
-  *aViewCSS = nsnull;
-  nsCOMPtr<nsIDOMElement> element;
+  nsCOMPtr<nsIDOMElement>element;
   nsresult res = GetElementContainerOrSelf(aNode, getter_AddRefs(element));
   NS_ENSURE_SUCCESS(res, res);
 
-  if (!element) {
-    return NS_OK;
+  // if we have an element node
+  if (element) {
+    // find the owner document
+    nsCOMPtr<nsIDOMDocument> doc;
+    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(element);
+    res = node->GetOwnerDocument(getter_AddRefs(doc));
+    NS_ENSURE_SUCCESS(res, res);
+    if (doc) {
+      nsCOMPtr<nsIDOMDocumentView> documentView = do_QueryInterface(doc);
+      nsCOMPtr<nsIDOMAbstractView> abstractView;
+      // from the document, get the abtractView
+      res = documentView->GetDefaultView(getter_AddRefs(abstractView));
+      NS_ENSURE_SUCCESS(res, res);
+      if (abstractView) {
+        // from the abstractView, get the CSS view
+        CallQueryInterface(abstractView, aViewCSS);
+        return NS_OK;
+      }
+    }
   }
-  // find the owner document
-  nsCOMPtr<nsIDOMDocument> doc;
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(element);
-  res = node->GetOwnerDocument(getter_AddRefs(doc));
-  NS_ENSURE_SUCCESS(res, res);
-  if (!doc) {
-    return NS_OK;
-  }
-  nsCOMPtr<nsIDOMWindow> window;
-  res = doc->GetDefaultView(getter_AddRefs(window));
-  NS_ENSURE_SUCCESS(res, res);
-  window.forget(aViewCSS);
+  *aViewCSS = nsnull;
   return NS_OK;
 }
 
@@ -1082,9 +1087,9 @@ nsHTMLCSSUtils::GetCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode,
   if (theElement && IsCSSEditableProperty(theElement, aHTMLProperty, aAttribute)) {
     // Yes, the requested HTML style has a CSS equivalence in this implementation
     // Retrieve the default ViewCSS if we are asked for computed styles
-    nsCOMPtr<nsIDOMWindow> window;
+    nsCOMPtr<nsIDOMViewCSS> viewCSS = nsnull;
     if (COMPUTED_STYLE_TYPE == aStyleType) {
-      res = GetDefaultViewCSS(theElement, getter_AddRefs(window));
+      res = GetDefaultViewCSS(theElement, getter_AddRefs(viewCSS));
       NS_ENSURE_SUCCESS(res, res);
     }
     nsTArray<nsIAtom*> cssPropertyArray;
@@ -1099,7 +1104,7 @@ nsHTMLCSSUtils::GetCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode,
       nsAutoString valueString;
       // retrieve the specified/computed value of the property
       res = GetCSSInlinePropertyBase(theElement, cssPropertyArray[index],
-                                     valueString, window, aStyleType);
+                                     valueString, viewCSS, aStyleType);
       NS_ENSURE_SUCCESS(res, res);
       // append the value to aValueString (possibly with a leading whitespace)
       if (index) aValueString.Append(PRUnichar(' '));
diff --git a/editor/libeditor/html/nsHTMLCSSUtils.h b/editor/libeditor/html/nsHTMLCSSUtils.h
index 54ddf2ea7994..f310aecf544a 100644
--- a/editor/libeditor/html/nsHTMLCSSUtils.h
+++ b/editor/libeditor/html/nsHTMLCSSUtils.h
@@ -42,6 +42,7 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIHTMLEditor.h"
@@ -53,7 +54,6 @@
 #define COMPUTED_STYLE_TYPE     2
 
 class nsHTMLEditor;
-class nsIDOMWindow;
 
 typedef void (*nsProcessValueFunc)(const nsAString * aInputString, nsAString & aOutputString,
                                    const char * aDefaultValueString,
@@ -312,13 +312,12 @@ public:
     */
   nsresult GetElementContainerOrSelf(nsIDOMNode * aNode, nsIDOMElement ** aElement);
 
-  /**
-   * Gets the default Window for a given node.
+  /** Gets the default DOMView for a given node
    *
-   * @param aNode    the node we want the default Window for
-   * @param aWindow  [OUT] the default Window
+   * @param aNode               the node we want the default DOMView for
+   * @param aViewCSS            [OUT] the default DOMViewCSS
    */
-  nsresult        GetDefaultViewCSS(nsIDOMNode* aNode, nsIDOMWindow** aWindow);
+  nsresult        GetDefaultViewCSS(nsIDOMNode * aNode, nsIDOMViewCSS ** aViewCSS);
 
 
 private:
@@ -384,17 +383,17 @@ private:
                                    PRBool aRemoveProperty);
 
   /** back-end for GetSpecifiedProperty and GetComputedProperty
-   *
-   * @param aNode               [IN] a DOM node
-   * @param aProperty           [IN] a CSS property
-   * @param aValue              [OUT] the retrieved value for this property
-   * @param aWindow             [IN] the window we need in case we query computed styles
-   * @param aStyleType          [IN] SPECIFIED_STYLE_TYPE to query the specified style values
-   *                                 COMPUTED_STYLE_TYPE  to query the computed style values
-   */
+    *
+    * @param aNode               [IN] a DOM node
+    * @param aProperty           [IN] a CSS property
+    * @param aValue              [OUT] the retrieved value for this property
+    * @param aViewCSS            [IN] the ViewCSS we need in case we query computed styles
+    * @param aStyleType          [IN] SPECIFIED_STYLE_TYPE to query the specified style values
+                                      COMPUTED_STYLE_TYPE  to query the computed style values
+    */
   nsresult    GetCSSInlinePropertyBase(nsIDOMNode * aNode, nsIAtom * aProperty,
                                        nsAString & aValue,
-                                       nsIDOMWindow* aWindow,
+                                       nsIDOMViewCSS * aViewCSS,
                                        PRUint8 aStyleType);
 
 
diff --git a/embedding/browser/webBrowser/nsContextMenuInfo.cpp b/embedding/browser/webBrowser/nsContextMenuInfo.cpp
index e0b6c68fe1f2..f3fb991e7aff 100644
--- a/embedding/browser/webBrowser/nsContextMenuInfo.cpp
+++ b/embedding/browser/webBrowser/nsContextMenuInfo.cpp
@@ -1,5 +1,6 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -50,7 +51,9 @@
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIDOMHTMLAreaElement.h"
 #include "nsIDOMHTMLLinkElement.h"
-#include "nsIDOMWindow.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMAbstractView.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSValue.h"
 #include "nsIDOMCSSPrimitiveValue.h"
@@ -290,10 +293,13 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR
 
   nsCOMPtr<nsIDOMDocument> document;
   domNode->GetOwnerDocument(getter_AddRefs(document));
-  NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
+  nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(document));
+  NS_ENSURE_TRUE(docView, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDOMWindow> window;
-  document->GetDefaultView(getter_AddRefs(window));
+  nsCOMPtr<nsIDOMAbstractView> defaultView;
+  docView->GetDefaultView(getter_AddRefs(defaultView));
+  nsCOMPtr<nsIDOMViewCSS> defaultCSSView(do_QueryInterface(defaultView));
+  NS_ENSURE_TRUE(defaultCSSView, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIDOMCSSPrimitiveValue> primitiveValue;
   nsAutoString bgStringValue;
@@ -321,8 +327,8 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR
       break;
     
     nsCOMPtr<nsIDOMCSSStyleDeclaration> computedStyle;
-    window->GetComputedStyle(domElement, EmptyString(),
-                             getter_AddRefs(computedStyle));
+    defaultCSSView->GetComputedStyle(domElement, EmptyString(),
+                                     getter_AddRefs(computedStyle));
     if (computedStyle) {
       nsCOMPtr<nsIDOMCSSValue> cssValue;
       computedStyle->GetPropertyCSSValue(NS_LITERAL_STRING("background-image"),
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index 5e7644b1438b..2ca15167ecff 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -41,6 +41,7 @@
 #include "nsIAtom.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIDOMCSSStyleDeclaration.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMRange.h"
@@ -102,10 +103,13 @@ mozInlineSpellWordUtil::Init(nsWeakPtr aWeakEditor)
   NS_ENSURE_SUCCESS(rv, rv);
 
   // view
-  nsCOMPtr<nsIDOMWindow> window;
-  rv = domDoc->GetDefaultView(getter_AddRefs(window));
+  nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(domDoc, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIDOMAbstractView> abstractView;
+  rv = docView->GetDefaultView(getter_AddRefs(abstractView));
+  NS_ENSURE_SUCCESS(rv, rv);
+  mCSSView = do_QueryInterface(abstractView, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
-  mCSSView = window;
 
   // Find the root node for the editor. For contenteditable we'll need something
   // cleverer here.
@@ -494,7 +498,7 @@ ContainsDOMWordSeparator(nsIDOMNode* aNode, PRInt32 aBeforeOffset,
 }
 
 static PRBool
-IsBreakElement(nsIDOMWindow* aDocView, nsIDOMNode* aNode)
+IsBreakElement(nsIDOMViewCSS* aDocView, nsIDOMNode* aNode)
 {
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aNode);
   if (!element)
@@ -533,8 +537,8 @@ IsBreakElement(nsIDOMWindow* aDocView, nsIDOMNode* aNode)
 }
 
 struct CheckLeavingBreakElementClosure {
-  nsIDOMWindow* mDocView;
-  PRPackedBool  mLeftBreakElement;
+  nsIDOMViewCSS* mDocView;
+  PRPackedBool   mLeftBreakElement;
 };
 
 static void
diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.h b/extensions/spellcheck/src/mozInlineSpellWordUtil.h
index 8cedaecc7732..9591f8f530ea 100644
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.h
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.h
@@ -38,6 +38,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentRange.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDocument.h"
 #include "nsString.h"
 #include "nsTArray.h"
@@ -125,7 +126,7 @@ private:
   // cached stuff for the editor, set by Init
   nsCOMPtr<nsIDOMDocumentRange> mDOMDocumentRange;
   nsCOMPtr<nsIDocument>         mDocument;
-  nsCOMPtr<nsIDOMWindow>        mCSSView;
+  nsCOMPtr<nsIDOMViewCSS>       mCSSView;
   nsCOMPtr<nsIUGenCategory>     mCategories;
 
   // range to check, see SetRange
diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp
index 1e17808025cb..57cf60749829 100644
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp
+++ b/extensions/widgetutils/src/nsWidgetUtils.cpp
@@ -39,7 +39,9 @@
 
 #include "nsCURILoader.h"
 #include "nsICategoryManager.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentView.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsIDOMNSDocument.h"
@@ -66,6 +68,7 @@
 #include "nsIDOMEventTarget.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindow.h"
+//#include ".h"
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMKeyListener.h"
 #include "nsIDOMCompositionListener.h"
@@ -425,22 +428,28 @@ nsWidgetUtils::IsXULNode(nsIDOMNode *aNode, PRUint32 *aType)
 }
 
 nsresult
-nsWidgetUtils::GetDOMWindowByNode(nsIDOMNode* aNode, nsIDOMWindow** aDOMWindow)
+nsWidgetUtils::GetDOMWindowByNode(nsIDOMNode *aNode, nsIDOMWindow * *aDOMWindow)
 {
+  nsresult rv;
   nsCOMPtr<nsIDOMDocument> nodeDoc;
-  nsresult rv = aNode->GetOwnerDocument(getter_AddRefs(nodeDoc));
+  rv = aNode->GetOwnerDocument(getter_AddRefs(nodeDoc));
   NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIDOMWindow> window;
-  rv = nodeDoc->GetDefaultView(getter_AddRefs(window));
+  nsCOMPtr<nsIDOMDocumentView> docView = do_QueryInterface(nodeDoc, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
-  window.forget(aDOMWindow);
+  nsCOMPtr<nsIDOMAbstractView> absView;
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = docView->GetDefaultView(getter_AddRefs(absView));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(absView, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  *aDOMWindow = window;
+  NS_IF_ADDREF(*aDOMWindow);
   return rv;
 }
 
 void
 nsWidgetUtils::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
-                                     nsIDOMEventTarget **aChromeTarget)
+                                 nsIDOMEventTarget **aChromeTarget)
 {
     nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin));
     nsPIDOMEventTarget* chromeEventHandler = nsnull;
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 9c88d14a3c2a..469d1b4625bc 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -71,7 +71,6 @@ members = [
     #'nsIDOMWindow.document',
     'nsIDOMWindow.getSelection',
     'nsIDOMWindow.scrollByLines',
-    'nsIDOMWindow.getComputedStyle',
     'nsIDOMJSWindow.dump',
     'nsIDOMScreen.top',
     'nsIDOMScreen.height',
@@ -109,7 +108,6 @@ members = [
     'nsIDOMDocument.createTextNode',
     'nsIDOMDocument.documentURI',
     'nsIDOMDocument.adoptNode',
-    'nsIDOMDocument.defaultView',
     'nsIDOMElement.removeAttributeNS',
     'nsIDOMElement.removeAttribute',
     'nsIDOMElement.getAttribute',
@@ -175,6 +173,7 @@ members = [
     'nsIDOMElementCSSInlineStyle.*',
     'nsIDOMCSS2Properties.*',
     'nsIDOMRect.*',
+    'nsIDOMViewCSS.getComputedStyle',
     'nsIDOMCSSStyleDeclaration.*',
 
     # dom/interfaces/events
@@ -387,6 +386,9 @@ members = [
     'nsIDOMDocumentTraversal.createNodeIterator',
     'nsIDOMNodeIterator.nextNode',
 
+    # dom/interfaces/views
+    'nsIDOMDocumentView.defaultView',
+
     # dom/interfaces/xbl - None.
 
     # dom/interfaces/xpath
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 7fc4b345af28..111b2bf4febd 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -37,6 +37,8 @@
 
 #include "inLayoutUtils.h"
 
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMAbstractView.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
 #include "nsIContentViewer.h"
@@ -58,14 +60,15 @@ inLayoutUtils::GetWindowFor(nsIDOMNode* aNode)
 nsIDOMWindowInternal*
 inLayoutUtils::GetWindowFor(nsIDOMDocument* aDoc)
 {
-  nsCOMPtr<nsIDOMWindow> window;
-  aDoc->GetDefaultView(getter_AddRefs(window));
-  if (!window) {
-    return nsnull;
-  }
+  nsCOMPtr<nsIDOMDocumentView> doc = do_QueryInterface(aDoc);
+  if (!doc) return nsnull;
   
-  nsCOMPtr<nsIDOMWindowInternal> windowInternal = do_QueryInterface(window);
-  return windowInternal;
+  nsCOMPtr<nsIDOMAbstractView> view;
+  doc->GetDefaultView(getter_AddRefs(view));
+  if (!view) return nsnull;
+  
+  nsCOMPtr<nsIDOMWindowInternal> window = do_QueryInterface(view);
+  return window;
 }
 
 nsIPresShell* 
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 1f040fdff122..5e058bd5722a 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -70,6 +70,7 @@ MAKEFILES_dom="
   dom/interfaces/stylesheets/Makefile
   dom/interfaces/threads/Makefile
   dom/interfaces/traversal/Makefile
+  dom/interfaces/views/Makefile
   dom/interfaces/xbl/Makefile
   dom/interfaces/xpath/Makefile
   dom/interfaces/xul/Makefile
diff --git a/widget/src/cocoa/nsMenuItemIconX.mm b/widget/src/cocoa/nsMenuItemIconX.mm
index 3605a8c89d23..343d5b551ffd 100644
--- a/widget/src/cocoa/nsMenuItemIconX.mm
+++ b/widget/src/cocoa/nsMenuItemIconX.mm
@@ -49,6 +49,8 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsWidgetAtoms.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSValue.h"
@@ -199,27 +201,24 @@ nsMenuItemIconX::GetIconURI(nsIURI** aIconURI)
   if (!hasImageAttr) {
     // If the content node has no "image" attribute, get the
     // "list-style-image" property from CSS.
-    nsCOMPtr<nsIDOMDocument> domDocument =
-      do_QueryInterface(mContent->GetDocument());
-    if (!domDocument)
-      return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMDocumentView> domDocumentView =
+     do_QueryInterface(mContent->GetDocument());
+    if (!domDocumentView) return NS_ERROR_FAILURE;
 
-    nsCOMPtr<nsIDOMWindow> window;
-    rv = domDocument->GetDefaultView(getter_AddRefs(window));
-    if (NS_FAILED(rv))
-      return rv;
-    if (!window)
-      return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMAbstractView> domAbstractView;
+    rv = domDocumentView->GetDefaultView(getter_AddRefs(domAbstractView));
+    if (NS_FAILED(rv)) return rv;
+
+    nsCOMPtr<nsIDOMViewCSS> domViewCSS = do_QueryInterface(domAbstractView);
+    if (!domViewCSS) return NS_ERROR_FAILURE;
 
     nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mContent);
-    if (!domElement)
-      return NS_ERROR_FAILURE;
+    if (!domElement) return NS_ERROR_FAILURE;
 
 
-    rv = window->GetComputedStyle(domElement, EmptyString(),
-                                  getter_AddRefs(cssStyleDecl));
-    if (NS_FAILED(rv))
-      return rv;
+    rv = domViewCSS->GetComputedStyle(domElement, EmptyString(),
+                                      getter_AddRefs(cssStyleDecl));
+    if (NS_FAILED(rv)) return rv;
 
     NS_NAMED_LITERAL_STRING(listStyleImage, "list-style-image");
     rv = cssStyleDecl->GetPropertyCSSValue(listStyleImage,
diff --git a/widget/src/cocoa/nsMenuUtilsX.mm b/widget/src/cocoa/nsMenuUtilsX.mm
index eecef2c4f284..f05a50914343 100644
--- a/widget/src/cocoa/nsMenuUtilsX.mm
+++ b/widget/src/cocoa/nsMenuUtilsX.mm
@@ -51,6 +51,7 @@
 #include "nsIDOMXULCommandEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsPIDOMWindow.h"
+#include "nsIDOMAbstractView.h"
 
 void nsMenuUtilsX::DispatchCommandTo(nsIContent* aTargetContent)
 {
@@ -65,13 +66,13 @@ void nsMenuUtilsX::DispatchCommandTo(nsIContent* aTargetContent)
                           getter_AddRefs(event));
     nsCOMPtr<nsIDOMXULCommandEvent> command = do_QueryInterface(event);
     nsCOMPtr<nsIPrivateDOMEvent> pEvent = do_QueryInterface(command);
+    nsCOMPtr<nsIDOMAbstractView> view = do_QueryInterface(doc->GetWindow());
 
     // FIXME: Should probably figure out how to init this with the actual
     // pressed keys, but this is a big old edge case anyway. -dwh
     if (pEvent &&
         NS_SUCCEEDED(command->InitCommandEvent(NS_LITERAL_STRING("command"),
-                                               PR_TRUE, PR_TRUE,
-                                               doc->GetWindow(), 0,
+                                               PR_TRUE, PR_TRUE, view, 0,
                                                PR_FALSE, PR_FALSE, PR_FALSE,
                                                PR_FALSE, nsnull))) {
       pEvent->SetTrusted(PR_TRUE);
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 59262b0cfe50..9d5f889aa67c 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1,6 +1,7 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 ci et: */
-/* ***** BEGIN LICENSE BLOCK *****
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -83,6 +84,8 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIWindowWatcher.h"
 #include "nsIURI.h"
+#include "nsIDOMDocumentView.h"
+#include "nsIDOMViewCSS.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsITimelineService.h"
 #include "nsAppShellCID.h"

From 654e5af166ae115fccf840be325fc9a01426bb62 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 25 Apr 2011 14:08:43 -0700
Subject: [PATCH 483/509] Bug 613294: Upgrading a restartless add-on to a
 non-restartless add-on doesn't call the uninstall method. r=robstrong

---
 toolkit/mozapps/extensions/XPIProvider.jsm    |  67 ++++++--
 .../test/addons/test_bootstrap1_4/install.rdf |  23 +++
 .../test/xpcshell/test_bootstrap.js           | 150 +++++++++++++++++-
 .../extensions/test/xpcshell/test_updateid.js |   3 +-
 4 files changed, 227 insertions(+), 16 deletions(-)
 create mode 100644 toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf

diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index 5f6ce478265f..efc27a94f9cd 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -1723,8 +1723,7 @@ var XPIProvider = {
             addon = loadManifestFromZipFile(stagedXPI);
           }
           catch (e) {
-            ERROR("Unable to read add-on manifest for " + stagedXPI.leafName +
-                  " in XPI stage of " + aLocation.name, e);
+            ERROR("Unable to read add-on manifest from " + stagedXPI.path, e);
             continue;
           }
 
@@ -1822,7 +1821,7 @@ var XPIProvider = {
         }
 
         aManifests[aLocation.name][id] = null;
-        let existingAddonID = null;
+        let existingAddonID = id;
 
         // Check for a cached AddonInternal for this add-on, it may contain
         // updated compatibility information
@@ -1839,18 +1838,55 @@ var XPIProvider = {
             fis.init(jsonfile, -1, 0, 0);
             aManifests[aLocation.name][id] = json.decodeFromStream(fis,
                                                                    jsonfile.fileSize);
-            existingAddonID = aManifests[aLocation.name][id].existingAddonID;
+            existingAddonID = aManifests[aLocation.name][id].existingAddonID || id;
           }
           catch (e) {
-            ERROR("Unable to read add-on manifest for " + id + " in " +
-                  aLocation.name, e);
+            ERROR("Unable to read add-on manifest from " + jsonfile.path, e);
           }
           finally {
             fis.close();
           }
         }
 
+        // If there was no cached AddonInternal then load it directly
+        if (!aManifests[aLocation.name][id]) {
+          try {
+            aManifests[aLocation.name][id] = loadManifestFromFile(stageDirEntry);
+            existingAddonID = aManifests[aLocation.name][id].existingAddonID || id;
+          }
+          catch (e) {
+            // This add-on can't be installed so just remove it now
+            stageDirEntry.remove(true);
+            ERROR("Unable to read add-on manifest from " + stageDirEntry.path, e);
+          }
+        }
+
+        var oldBootstrap = null;
         LOG("Processing install of " + id + " in " + aLocation.name);
+        if (existingAddonID in this.bootstrappedAddons) {
+          try {
+            var existingAddon = aLocation.getLocationForID(existingAddonID);
+            if (this.bootstrappedAddons[existingAddonID].descriptor ==
+                existingAddon.persistentDescriptor) {
+              oldBootstrap = this.bootstrappedAddons[existingAddonID];
+
+              // We'll be replacing a currently active bootstrapped add-on so
+              // call its uninstall method
+              let oldVersion = aManifests[aLocation.name][id].version;
+              let newVersion = oldBootstrap.version;
+              let uninstallReason = Services.vc.compare(newVersion, oldVersion) < 0 ?
+                                    BOOTSTRAP_REASONS.ADDON_UPGRADE :
+                                    BOOTSTRAP_REASONS.ADDON_DOWNGRADE;
+
+              this.callBootstrapMethod(existingAddonID, oldBootstrap.version,
+                                       existingAddon, "uninstall", uninstallReason);
+              this.unloadBootstrapScope(existingAddonID);
+            }
+          }
+          catch (e) {
+          }
+        }
+
         try {
           var addonInstallLocation = aLocation.installAddon(id, stageDirEntry,
                                                             existingAddonID);
@@ -1861,6 +1897,13 @@ var XPIProvider = {
           ERROR("Failed to install staged add-on " + id + " in " + aLocation.name,
                 e);
           delete aManifests[aLocation.name][id];
+
+          if (oldBootstrap) {
+            // Re-install the old add-on
+            this.callBootstrapMethod(existingAddonID, oldBootstrap.version,
+                                     existingAddon, "install",
+                                     BOOTSTRAP_REASONS.ADDON_INSTALL);
+          }
           continue;
         }
       }
@@ -1873,7 +1916,7 @@ var XPIProvider = {
         // Non-critical, just saves some perf on startup if we clean this up.
         LOG("Error removing staging dir " + stagingDir.path, e);
       }
-    });
+    }, this);
     return changed;
   },
 
@@ -2523,6 +2566,11 @@ var XPIProvider = {
     // needs to be updated
     let updateDatabase = aAppChanged;
 
+    // Load the list of bootstrapped add-ons first so processFileChanges can
+    // modify it
+    this.bootstrappedAddons = JSON.parse(Prefs.getCharPref(PREF_BOOTSTRAP_ADDONS,
+                                         "{}"));
+
     // First install any new add-ons into the locations, if there are any
     // changes then we must update the database with the information in the
     // install locations
@@ -2542,11 +2590,6 @@ var XPIProvider = {
         Prefs.getBoolPref(PREF_INSTALL_DISTRO_ADDONS, true))
       updateDatabase = this.installDistributionAddons(manifests) | updateDatabase;
 
-    // Load the list of bootstrapped add-ons first so processFileChanges can
-    // modify it
-    this.bootstrappedAddons = JSON.parse(Prefs.getCharPref(PREF_BOOTSTRAP_ADDONS,
-                                         "{}"));
-
     let state = this.getInstallLocationStates();
 
     // If the database exists then the previous file cache can be trusted
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf
new file mode 100644
index 000000000000..2b88e0ad0bfb
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bootstrap1@tests.mozilla.org</em:id>
+    <em:version>4.0</em:version>
+
+    <!-- Front End MetaData -->
+    <em:name>Test Bootstrap 1</em:name>
+    <em:description>Test Description</em:description>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>1</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
index 12df42510d75..4ae57a969997 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
@@ -1073,7 +1073,7 @@ function run_test_23() {
       do_check_eq(install.addon.operationsRequiringRestart &
                   AddonManager.OP_NEEDS_RESTART_INSTALL, 0);
       do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "1.0");
-  
+
       let addon = install.addon;
       prepare_test({
         "bootstrap1@tests.mozilla.org": [
@@ -1166,6 +1166,152 @@ function run_test_24() {
     do_check_eq(getInstalledVersion2(), -1);
     do_check_eq(getActiveVersion2(), 1);
 
-    do_test_finished();
+    run_test_25();
+  });
+}
+
+// Tests that updating from a bootstrappable add-on to a normal add-on calls
+// the uninstall method
+function run_test_25() {
+  installAllFiles([do_get_addon("test_bootstrap1_1")], function() {
+    do_check_eq(getInstalledVersion(), 1);
+    do_check_eq(getActiveVersion(), 1);
+
+    installAllFiles([do_get_addon("test_bootstrap1_4")], function() {
+      // Needs a restart to complete this so the old version stays running
+      do_check_eq(getInstalledVersion(), 1);
+      do_check_eq(getActiveVersion(), 1);
+
+      AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+        do_check_neq(b1, null);
+        do_check_eq(b1.version, "1.0");
+        do_check_true(b1.isActive);
+        do_check_true(hasFlag(b1.pendingOperations, AddonManager.PENDING_UPGRADE));
+
+        restartManager();
+
+        do_check_eq(getInstalledVersion(), 0);
+        do_check_eq(getUninstallReason(), ADDON_UPGRADE);
+        do_check_eq(getActiveVersion(), 0);
+
+        AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+          do_check_neq(b1, null);
+          do_check_eq(b1.version, "4.0");
+          do_check_true(b1.isActive);
+          do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+
+          run_test_26();
+        });
+      });
+    });
+  });
+}
+
+// Tests that updating from a normal add-on to a bootstrappable add-on calls
+// the install method
+function run_test_26() {
+  installAllFiles([do_get_addon("test_bootstrap1_1")], function() {
+    // Needs a restart to complete this
+    do_check_eq(getInstalledVersion(), 0);
+    do_check_eq(getActiveVersion(), 0);
+
+    AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+      do_check_neq(b1, null);
+      do_check_eq(b1.version, "4.0");
+      do_check_true(b1.isActive);
+      do_check_true(hasFlag(b1.pendingOperations, AddonManager.PENDING_UPGRADE));
+
+      restartManager();
+
+      do_check_eq(getInstalledVersion(), 1);
+      do_check_eq(getInstallReason(), ADDON_DOWNGRADE);
+      do_check_eq(getActiveVersion(), 1);
+
+      AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+        do_check_neq(b1, null);
+        do_check_eq(b1.version, "1.0");
+        do_check_true(b1.isActive);
+        do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+
+        run_test_27();
+      });
+    });
+  });
+}
+
+// Tests that updating from a bootstrappable add-on to a normal add-on while
+// disabled calls the uninstall method
+function run_test_27() {
+  AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+    do_check_neq(b1, null);
+    b1.userDisabled = true;
+    do_check_eq(b1.version, "1.0");
+    do_check_false(b1.isActive);
+    do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+    do_check_eq(getInstalledVersion(), 1);
+    do_check_eq(getActiveVersion(), 0);
+
+    installAllFiles([do_get_addon("test_bootstrap1_4")], function() {
+      // Updating disabled things happens immediately
+      do_check_eq(getInstalledVersion(), 0);
+      do_check_eq(getUninstallReason(), ADDON_UPGRADE);
+      do_check_eq(getActiveVersion(), 0);
+
+      AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+        do_check_neq(b1, null);
+        do_check_eq(b1.version, "4.0");
+        do_check_false(b1.isActive);
+        do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+
+        restartManager();
+
+        do_check_eq(getInstalledVersion(), 0);
+        do_check_eq(getActiveVersion(), 0);
+
+        AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+          do_check_neq(b1, null);
+          do_check_eq(b1.version, "4.0");
+          do_check_false(b1.isActive);
+          do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+
+          run_test_28();
+        });
+      });
+    });
+  });
+}
+
+// Tests that updating from a normal add-on to a bootstrappable add-on when
+// disabled calls the install method
+function run_test_28() {
+  installAllFiles([do_get_addon("test_bootstrap1_1")], function() {
+    // Doesn't need a restart to complete this
+    do_check_eq(getInstalledVersion(), 1);
+    do_check_eq(getInstallReason(), ADDON_DOWNGRADE);
+    do_check_eq(getActiveVersion(), 0);
+
+    AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+      do_check_neq(b1, null);
+      do_check_eq(b1.version, "1.0");
+      do_check_false(b1.isActive);
+      do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+
+      restartManager();
+
+      do_check_eq(getInstalledVersion(), 1);
+      do_check_eq(getActiveVersion(), 0);
+
+      AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+        do_check_neq(b1, null);
+        b1.userDisabled = false;
+        do_check_eq(b1.version, "1.0");
+        do_check_true(b1.isActive);
+        do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
+        do_check_eq(getInstalledVersion(), 1);
+        do_check_eq(getActiveVersion(), 1);
+
+        do_test_finished();
+      });
+    });
   });
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js b/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
index 640fbfacf07e..295665616503 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
@@ -387,8 +387,7 @@ function check_test_6() {
       do_check_eq(a4, null);
       do_check_neq(a2, null);
 
-      // TODO bug 613294, uninstall methods aren't called in this case at the moment
-      do_check_eq(getInstalledVersion(), 4);
+      do_check_eq(getInstalledVersion(), 0);
       do_check_eq(getActiveVersion(), 0);
 
       end_test();

From 197e4a3428fd1fd9a564e1422095c638c4e58d68 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 26 Apr 2011 09:12:06 +1200
Subject: [PATCH 484/509] Bug 645268 - Dump failing console message to see
 where browser_webconsole_bug_595934_message_categories.js is going orange.
 r=jwatt

--HG--
extra : rebase_source : 41eac2b8f017468c5ef9cd480f8f8261775e4d5f
---
 .../browser/browser_webconsole_bug_595934_message_categories.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
index 32b0d4742e42..6efc53441e1c 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
@@ -128,6 +128,8 @@ let TestObserver = {
       }
     }
     else {
+      ok(false, aSubject.sourceName + ':' + aSubject.lineNumber + '; ' +
+                aSubject.errorMessage);
       executeSoon(finish);
     }
   }

From eccb67e3073632b233187a81cfb8b037b8b82667 Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Tue, 26 Apr 2011 00:28:30 +0200
Subject: [PATCH 485/509] Bug 202019 - Objects with [[Call]] arent
 automatically constructbale r=jorendorff

---
 dom/src/threads/nsDOMWorker.cpp               | 28 ++-----
 js/src/jit-test/tests/basic/bug579740.js      | 10 +--
 js/src/jit-test/tests/basic/bug630865-1.js    |  6 --
 js/src/jit-test/tests/basic/bug630865-2.js    |  6 --
 js/src/jit-test/tests/basic/bug630865-3.js    | 12 ---
 js/src/jit-test/tests/basic/bug630865-4.js    | 10 ---
 .../tests/basic/new-Function-prototype.js     | 11 ++-
 js/src/jit-test/tests/basic/testBug593559.js  |  4 +-
 .../tests/basic/testProxyConstructors.js      | 15 ++--
 js/src/jsfun.h                                |  4 +-
 js/src/jsinterp.cpp                           | 73 +++++++------------
 js/src/methodjit/InvokeHelpers.cpp            |  4 +-
 .../ecma_5/Function/builtin-no-construct.js   | 52 +++++++++++++
 js/src/tests/ecma_5/Function/jstests.list     |  1 +
 js/src/tests/ecma_5/misc/jstests.list         |  1 +
 .../ecma_5/misc/new-with-non-constructor.js   | 39 ++++++++++
 js/src/xpconnect/src/XPCWrapper.cpp           |  5 +-
 17 files changed, 149 insertions(+), 132 deletions(-)
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-1.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-2.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-3.js
 delete mode 100644 js/src/jit-test/tests/basic/bug630865-4.js
 create mode 100644 js/src/tests/ecma_5/Function/builtin-no-construct.js
 create mode 100644 js/src/tests/ecma_5/misc/new-with-non-constructor.js

diff --git a/dom/src/threads/nsDOMWorker.cpp b/dom/src/threads/nsDOMWorker.cpp
index 357e3d8de76f..f46c18e0a40c 100644
--- a/dom/src/threads/nsDOMWorker.cpp
+++ b/dom/src/threads/nsDOMWorker.cpp
@@ -383,11 +383,6 @@ nsDOMWorkerFunctions::NewXMLHttpRequest(JSContext* aCx,
                                         uintN aArgc,
                                         jsval* aVp)
 {
-  JSObject *obj = JS_THIS_OBJECT(aCx, aVp);
-  if (!obj) {
-    return JS_FALSE;
-  }
-
   nsDOMWorker* worker = static_cast<nsDOMWorker*>(JS_GetContextPrivate(aCx));
   NS_ASSERTION(worker, "This should be set by the DOM thread service!");
 
@@ -420,7 +415,7 @@ nsDOMWorkerFunctions::NewXMLHttpRequest(JSContext* aCx,
 
   nsCOMPtr<nsIXPConnectJSObjectHolder> xhrWrapped;
   jsval v;
-  rv = nsContentUtils::WrapNative(aCx, obj,
+  rv = nsContentUtils::WrapNative(aCx, JSVAL_TO_OBJECT(JS_CALLEE(aCx, aVp)),
                                   static_cast<nsIXMLHttpRequest*>(xhr), &v,
                                   getter_AddRefs(xhrWrapped));
   if (NS_FAILED(rv)) {
@@ -659,11 +654,8 @@ nsDOMWorkerFunctions::MakeNewWorker(JSContext* aCx,
                                     jsval* aVp,
                                     WorkerPrivilegeModel aPrivilegeModel)
 {
-  JSObject *obj = JS_THIS_OBJECT(aCx, aVp);
-  if (!obj) {
-    return JS_FALSE;
-  }
-
+  JSObject *obj = JSVAL_TO_OBJECT(JS_CALLEE(aCx, aVp));
+    
   nsDOMWorker* worker = static_cast<nsDOMWorker*>(JS_GetContextPrivate(aCx));
   NS_ASSERTION(worker, "This should be set by the DOM thread service!");
 
@@ -703,8 +695,8 @@ nsDOMWorkerFunctions::MakeNewWorker(JSContext* aCx,
 
   nsCOMPtr<nsIXPConnectJSObjectHolder> workerWrapped;
   jsval v;
-  rv = nsContentUtils::WrapNative(aCx, obj, static_cast<nsIWorker*>(newWorker),
-                                  &v, getter_AddRefs(workerWrapped));
+  rv = nsContentUtils::WrapNative(aCx, obj, static_cast<nsIWorker*>(newWorker), &v, 
+                                  getter_AddRefs(workerWrapped));
   if (NS_FAILED(rv)) {
     JS_ReportError(aCx, "Failed to wrap new worker!");
     return JS_FALSE;
@@ -767,7 +759,6 @@ nsDOMWorkerFunctions::CTypesLazyGetter(JSContext* aCx,
          JS_GetPropertyById(aCx, aObj, aId, aVp);
 }
 #endif
-
 JSFunctionSpec gDOMWorkerFunctions[] = {
   { "dump",                nsDOMWorkerFunctions::Dump,                1, 0 },
   { "setTimeout",          nsDOMWorkerFunctions::SetTimeout,          1, 0 },
@@ -775,19 +766,16 @@ JSFunctionSpec gDOMWorkerFunctions[] = {
   { "setInterval",         nsDOMWorkerFunctions::SetInterval,         1, 0 },
   { "clearInterval",       nsDOMWorkerFunctions::KillTimeout,         1, 0 },
   { "importScripts",       nsDOMWorkerFunctions::LoadScripts,         1, 0 },
-  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, 0 },
-  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, 0 },
+  { "XMLHttpRequest",      nsDOMWorkerFunctions::NewXMLHttpRequest,   0, JSFUN_CONSTRUCTOR },
+  { "Worker",              nsDOMWorkerFunctions::NewWorker,           1, JSFUN_CONSTRUCTOR },
   { "atob",                nsDOMWorkerFunctions::AtoB,                1, 0 },
   { "btoa",                nsDOMWorkerFunctions::BtoA,                1, 0 },
   { nsnull,                nsnull,                                    0, 0 }
 };
-
 JSFunctionSpec gDOMWorkerChromeFunctions[] = {
-  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, 0 },
+  { "ChromeWorker",        nsDOMWorkerFunctions::NewChromeWorker,     1, JSFUN_CONSTRUCTOR },
   { nsnull,                nsnull,                                    0, 0 }
 };
-
-
 enum DOMWorkerStructuredDataType
 {
   // We have a special tag for XPCWrappedNatives that are being passed between
diff --git a/js/src/jit-test/tests/basic/bug579740.js b/js/src/jit-test/tests/basic/bug579740.js
index 83ee967bfd86..26fa1ce22a10 100644
--- a/js/src/jit-test/tests/basic/bug579740.js
+++ b/js/src/jit-test/tests/basic/bug579740.js
@@ -1,7 +1,7 @@
-
-for (a = 0; a < 4; a++) {
-    new Math.round(0).t
+try {
+    for (a = 0; a < 4; a++) {
+        new Math.round(0).t
+    }
 }
-
+catch (e) {}
 /* Don't assert. */
-
diff --git a/js/src/jit-test/tests/basic/bug630865-1.js b/js/src/jit-test/tests/basic/bug630865-1.js
deleted file mode 100644
index 5203d1383d78..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Object.defineProperty(Function.prototype, "prototype", {set:function(){}});
-var x;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    x = new Function.prototype;
-assertEq(toString.call(x), "[object Object]");
-assertEq(Object.getPrototypeOf(x), Object.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-2.js b/js/src/jit-test/tests/basic/bug630865-2.js
deleted file mode 100644
index 4616891b3b31..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Function.prototype.prototype = function () {};
-var x;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    x = new Function.prototype;
-assertEq(toString.call(x), "[object Object]");
-assertEq(Object.getPrototypeOf(x), Function.prototype.prototype);
diff --git a/js/src/jit-test/tests/basic/bug630865-3.js b/js/src/jit-test/tests/basic/bug630865-3.js
deleted file mode 100644
index 5933b2cb3123..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-3.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var a = [];
-function next() {
-    var x = {};
-    a.push(x);
-    return x;
-}
-Object.defineProperty(Function.prototype, 'prototype', {get: next});
-var b = [];
-for (var i = 0; i < HOTLOOP + 2; i++)
-    b[i] = new Function.prototype;
-for (var i = 0; i < HOTLOOP + 2; i++)
-    assertEq(Object.getPrototypeOf(b[i]), a[i]);
diff --git a/js/src/jit-test/tests/basic/bug630865-4.js b/js/src/jit-test/tests/basic/bug630865-4.js
deleted file mode 100644
index fd9f8b5e2bb7..000000000000
--- a/js/src/jit-test/tests/basic/bug630865-4.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Object.defineProperty(Function.prototype, 'prototype',
-                      {get: function () { if (i == HOTLOOP + 1) throw "X"; }});
-var x;
-try {
-    for (var i = 0; i < HOTLOOP + 2; i++)
-        x = new Function.prototype;
-} catch (exc) {
-    assertEq(i, HOTLOOP + 1);
-    assertEq(exc, "X");
-}
diff --git a/js/src/jit-test/tests/basic/new-Function-prototype.js b/js/src/jit-test/tests/basic/new-Function-prototype.js
index 72bc5f78e8f2..943cbba350a3 100644
--- a/js/src/jit-test/tests/basic/new-Function-prototype.js
+++ b/js/src/jit-test/tests/basic/new-Function-prototype.js
@@ -1,19 +1,18 @@
 var funProto = Function.prototype;
 assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
-
 assertEq(parseInt.prototype, undefined);
-
 var oldObj;
 for (var i = 0, sz = RUNLOOP; i < sz; oldObj = obj, i++)
 {
-  var obj = new funProto;
-  assertEq(obj === oldObj, false);
-  assertEq(Object.prototype.toString.call(obj), "[object Object]");
+
+  try {
+    var obj = new funProto;
+  }
+  catch (e) {}
   assertEq(Object.getOwnPropertyDescriptor(funProto, "prototype"), undefined);
   assertEq(Object.getOwnPropertyDescriptor(parseInt, "prototype"), undefined);
   assertEq(parseInt.prototype, undefined);
 }
-
 checkStats({
   recorderStarted: 1,
   recorderAborted: 0,
diff --git a/js/src/jit-test/tests/basic/testBug593559.js b/js/src/jit-test/tests/basic/testBug593559.js
index c49e5367b976..15c29d779925 100644
--- a/js/src/jit-test/tests/basic/testBug593559.js
+++ b/js/src/jit-test/tests/basic/testBug593559.js
@@ -1,10 +1,8 @@
 var gen = (function () {yield})();
 var t = gen.throw;
-
 try {
     new t;
 } catch (e) {
     actual = "" + e;
 }
-assertEq(actual, "TypeError: Generator.prototype.throw called on incompatible Object");
-
+assertEq(actual, "TypeError: t is not a constructor");
diff --git a/js/src/jit-test/tests/basic/testProxyConstructors.js b/js/src/jit-test/tests/basic/testProxyConstructors.js
index 04665a78859f..14947e82bd5c 100644
--- a/js/src/jit-test/tests/basic/testProxyConstructors.js
+++ b/js/src/jit-test/tests/basic/testProxyConstructors.js
@@ -2,15 +2,16 @@
 
 // proxies can return primitives
 assertEq(new (Proxy.createFunction({}, function(){}, function(){})), undefined);
-
 x = Proxy.createFunction((function () {}), Uint16Array, wrap)
 new(wrap(x))
-
 // proxies can return the callee
 var x = Proxy.createFunction({}, function (q) { return q; });
-new x(x);
-
-// not an error
-new (Proxy.createFunction({}, "".indexOf));
-
+assertEq(new x(x), x);
+try {
+    var x = (Proxy.createFunction({}, "".indexOf));
+    new x;
+}
+catch (e) {
+    assertEq(e.message, 'new x is not a constructor');
+}
 throw "ExitCleanly"
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index e73c4e523e92..3a90fda2b2eb 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -152,12 +152,10 @@ struct JSFunction : public JSObject_Slots2
     bool isConstructor()     const { return flags & JSFUN_CONSTRUCTOR; }
     bool isHeavyweight()     const { return JSFUN_HEAVYWEIGHT_TEST(flags); }
     bool isFlatClosure()     const { return FUN_KIND(this) == JSFUN_FLAT_CLOSURE; }
-
     bool isFunctionPrototype() const { return flags & JSFUN_PROTOTYPE; }
-
+    bool isInterpretedConstructor() const { return isInterpreted() && !isFunctionPrototype(); }
     /* Returns the strictness of this function, which must be interpreted. */
     inline bool inStrictMode() const;
-
     void setArgCount(uint16 nargs) {
         JS_ASSERT(this->nargs == 0);
         this->nargs = nargs;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 6674e4a42583..91df9d9da51d 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1250,56 +1250,36 @@ InvokeConstructor(JSContext *cx, const CallArgs &argsRef)
     JS_ASSERT(!js_FunctionClass.construct);
     CallArgs args = argsRef;
 
-    JSObject *callee;
-    if (args.calleev().isPrimitive() || !(callee = &args.callee())->getParent()) {
-        js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
-        return false;
-    }
+    if (args.calleev().isObject()) {
+        JSObject *callee = &args.callee();
+        Class *clasp = callee->getClass();
+        if (clasp == &js_FunctionClass) {
+            JSFunction *fun = callee->getFunctionPrivate();
 
-    /* Handle the fast-constructors cases before falling into the general case . */
-    Class *clasp = callee->getClass();
-    JSFunction *fun = NULL;
-    if (clasp == &js_FunctionClass) {
-        fun = callee->getFunctionPrivate();
-        if (fun->isConstructor()) {
-            args.thisv().setMagicWithObjectOrNullPayload(NULL);
-            return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
-        }
-    } else if (clasp->construct) {
-        args.thisv().setMagicWithObjectOrNullPayload(NULL);
-        return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
-    }
-
-    /* Scripts create their own |this| in JSOP_BEGIN */
-    if (!fun || !fun->isInterpreted()) {
-        JSObject *obj = js_CreateThis(cx, callee);
-        if (!obj)
-            return false;
-        args.thisv().setObject(*obj);
-    }
-
-    if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
-        return false;
-
-    if (args.rval().isPrimitive()) {
-        if (clasp != &js_FunctionClass) {
-            /* native [[Construct]] returning primitive is error */
-            JSAutoByteString bytes;
-            if (js_ValueToPrintable(cx, args.rval(), &bytes)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_NEW_RESULT, bytes.ptr());
-                return false;
+            if (fun->isConstructor()) {
+                args.thisv().setMagicWithObjectOrNullPayload(NULL);
+                return CallJSNativeConstructor(cx, fun->u.n.native, args.argc(), args.base());
             }
+
+            if (!fun->isInterpretedConstructor())
+                goto error;
+
+            if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
+                return false;
+
+            JS_ASSERT(args.rval().isObject());
+            JS_RUNTIME_METER(cx->runtime, constructs);
+            return true;
+        }
+        if (clasp->construct) {
+            args.thisv().setMagicWithObjectOrNullPayload(NULL);
+            return CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
         }
-
-        /* The interpreter fixes rval for us. */
-        JS_ASSERT(!fun->isInterpreted());
-
-        args.rval() = args.thisv();
     }
 
-    JS_RUNTIME_METER(cx->runtime, constructs);
-    return true;
+error:
+    js_ReportIsNotFunction(cx, &args.calleev(), JSV2F_CONSTRUCT);
+    return false;
 }
 
 bool
@@ -4580,14 +4560,13 @@ BEGIN_CASE(JSOP_NEW)
     argc = GET_ARGC(regs.pc);
     vp = regs.sp - (2 + argc);
     JS_ASSERT(vp >= regs.fp->base());
-
     /*
      * Assign lval, callee, and newfun exactly as the code at inline_call: expects to
      * find them, to avoid nesting a js_Interpret call via js_InvokeConstructor.
      */
     if (IsFunctionObject(vp[0], &callee)) {
         newfun = callee->getFunctionPrivate();
-        if (newfun->isInterpreted()) {
+        if (newfun->isInterpretedConstructor()) {
             if (newfun->u.i.script->isEmpty()) {
                 JSObject *obj2 = js_CreateThisForFunction(cx, callee);
                 if (!obj2)
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 1fba629ac481..34816b113dbd 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -409,12 +409,10 @@ void
 stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
 {
     ucr->init();
-
     JSContext *cx = f.cx;
     Value *vp = f.regs.sp - (argc + 2);
-
     /* Try to do a fast inline call before the general Invoke path. */
-    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpreted()) {
+    if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpretedConstructor()) {
         ucr->callee = &vp->toObject();
         if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
             THROW();
diff --git a/js/src/tests/ecma_5/Function/builtin-no-construct.js b/js/src/tests/ecma_5/Function/builtin-no-construct.js
new file mode 100644
index 000000000000..b6c9e289f478
--- /dev/null
+++ b/js/src/tests/ecma_5/Function/builtin-no-construct.js
@@ -0,0 +1,52 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+function checkMethod(method) {
+    try {
+        new method();
+        assertEq(0, 1, "not reached " + method);
+    } catch (e) {
+        assertEq(e.message, "method is not a constructor");
+    }
+}
+
+function checkMethods(proto) {
+    var names = Object.getOwnPropertyNames(proto);
+    for (var i = 0; i < names.length; i++) {
+        var name = names[i];
+        if (name == "constructor")
+            continue;
+        var prop = proto[name];
+        if (typeof prop === "function")
+            checkMethod(prop);
+    }
+}
+
+checkMethod(Function.prototype);
+checkMethods(JSON);
+checkMethods(Math);
+checkMethods(Proxy);
+
+var builtin_ctors = [
+    Object, Function, Array, String, Boolean, Number, Date, RegExp, Error,
+    EvalError, RangeError, ReferenceError, SyntaxError, TypeError, URIError,
+];
+
+for (var i = 0; i < builtin_ctors.length; i++) {
+    checkMethods(builtin_ctors[i]);
+    checkMethods(builtin_ctors[i].prototype);
+}
+
+var builtin_funcs = [
+    eval, isFinite, isNaN, parseFloat, parseInt,
+    decodeURI, decodeURIComponent, encodeURI, encodeURIComponent
+];
+
+for (var i = 0; i < builtin_funcs.length; i++) {
+    checkMethod(builtin_funcs[i]);
+}
+
+if (typeof reportCompare == 'function')
+    reportCompare(0, 0, "ok");
diff --git a/js/src/tests/ecma_5/Function/jstests.list b/js/src/tests/ecma_5/Function/jstests.list
index 1813ecf32d19..242cbb91ec45 100644
--- a/js/src/tests/ecma_5/Function/jstests.list
+++ b/js/src/tests/ecma_5/Function/jstests.list
@@ -10,3 +10,4 @@ script function-call.js
 script redefine-arguments-length.js
 script builtin-no-prototype.js
 script Function-arguments-gc.js
+script builtin-no-construct.js
diff --git a/js/src/tests/ecma_5/misc/jstests.list b/js/src/tests/ecma_5/misc/jstests.list
index adc9a73792be..fdceb9111886 100644
--- a/js/src/tests/ecma_5/misc/jstests.list
+++ b/js/src/tests/ecma_5/misc/jstests.list
@@ -9,4 +9,5 @@ skip-if(!xulRuntime.shell) script function-definition-evaluate.js # needs evalua
 script future-reserved-words.js
 script builtin-methods-reject-null-undefined-this.js
 script regress-bug632003.js
+script new-with-non-constructor.js
 script error-undefined-message.js
diff --git a/js/src/tests/ecma_5/misc/new-with-non-constructor.js b/js/src/tests/ecma_5/misc/new-with-non-constructor.js
new file mode 100644
index 000000000000..7f73711b860a
--- /dev/null
+++ b/js/src/tests/ecma_5/misc/new-with-non-constructor.js
@@ -0,0 +1,39 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+function checkConstruct(thing, buggy) {
+    try {
+        new thing();
+        assertEq(0, 1, "not reached " + thing);
+    } catch (e) {
+        if (buggy)
+            assertEq(e.message, "new thing is not a constructor");
+        else
+            assertEq(e.message, "thing is not a constructor");
+    }
+}
+
+var re = /aaa/
+checkConstruct(re, false);
+
+var boundFunctionPrototype = Function.prototype.bind();
+checkConstruct(boundFunctionPrototype, true);
+
+var boundBuiltin = Math.sin.bind();
+checkConstruct(boundBuiltin, true);
+
+/* We set the proxies construct trap to undefined,
+ * so the call trap is used as constructor.
+ */
+
+var proxiedFunctionPrototype = Proxy.create({}, Function.prototype, undefined);
+checkConstruct(proxiedFunctionPrototype, false);
+
+var proxiedBuiltin = Proxy.create({}, parseInt, undefined);
+checkConstruct(proxiedBuiltin, false);
+
+
+if (typeof reportCompare == 'function')
+    reportCompare(0, 0, "ok");
diff --git a/js/src/xpconnect/src/XPCWrapper.cpp b/js/src/xpconnect/src/XPCWrapper.cpp
index 1af8e0ab6676..753c0e95bf29 100644
--- a/js/src/xpconnect/src/XPCWrapper.cpp
+++ b/js/src/xpconnect/src/XPCWrapper.cpp
@@ -103,7 +103,6 @@ XrayWrapperConstructor(JSContext *cx, uintN argc, jsval *vp)
   *vp = OBJECT_TO_JSVAL(obj);
   return JS_WrapValue(cx, vp);
 }
-
 // static
 PRBool
 AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
@@ -111,15 +110,13 @@ AttachNewConstructorObject(XPCCallContext &ccx, JSObject *aGlobalObject)
   JSObject *xpcnativewrapper =
     JS_DefineFunction(ccx, aGlobalObject, "XPCNativeWrapper",
                       XrayWrapperConstructor, 1,
-                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS);
+                      JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_STUB_GSOPS | JSFUN_CONSTRUCTOR);
   if (!xpcnativewrapper) {
     return PR_FALSE;
   }
-
   return JS_DefineFunction(ccx, xpcnativewrapper, "unwrap", UnwrapNW, 1,
                            JSPROP_READONLY | JSPROP_PERMANENT) != nsnull;
 }
-
 }
 
 namespace XPCWrapper {

From 68454aca6724b27d9cb0ca3b29067c2bebe7cc59 Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Tue, 26 Apr 2011 11:32:08 +1200
Subject: [PATCH 486/509] Bug 645773 - Typo fix in
 nsOggReader::GetSeekRanges(). r=roc

---
 content/media/ogg/nsOggReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index 922654d7c7b2..9f5b3f1e5147 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -1061,7 +1061,7 @@ nsresult nsOggReader::GetSeekRanges(nsTArray<SeekRange>& aRanges)
   nsresult res = mDecoder->GetCurrentStream()->GetCachedRanges(cached);
   NS_ENSURE_SUCCESS(res, res);
 
-  for (PRUint32 index = 0; index < aRanges.Length(); index++) {
+  for (PRUint32 index = 0; index < cached.Length(); index++) {
     nsByteRange& range = cached[index];
     PRInt64 startTime = -1;
     PRInt64 endTime = -1;

From 7a7383ffea1e16491ca4e31e6da8426d89336f5c Mon Sep 17 00:00:00 2001
From: Ryan VanderMuelen <ryanvm@gmail.com>
Date: Mon, 25 Apr 2011 18:17:32 -0700
Subject: [PATCH 487/509] Bug 646312: Enable methodjit by default for chrome
 JavaScript, r=dmandelin

---
 js/src/tests/user.js            | 4 ++--
 modules/libpref/src/init/all.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/tests/user.js b/js/src/tests/user.js
index 62ccc99666f9..4ded6fd1a551 100755
--- a/js/src/tests/user.js
+++ b/js/src/tests/user.js
@@ -29,9 +29,9 @@ user_pref("extensions.checkUpdateSecurity", false);
 user_pref("browser.EULA.override", true);
 user_pref("javascript.options.tracejit.chrome", true);
 user_pref("javascript.options.tracejit.content", true);
-user_pref("javascript.options.methodjit.chrome", false);
+user_pref("javascript.options.methodjit.chrome", true);
 user_pref("javascript.options.methodjit.content", true);
-user_pref("javascript.options.jitprofiling.chrome", false);
+user_pref("javascript.options.jitprofiling.chrome", true);
 user_pref("javascript.options.jitprofiling.content", true);
 user_pref("javascript.options.methodjit_always", false);
 user_pref("javascript.options.strict", false);
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index a647f2251f4d..1406c8017573 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -610,9 +610,9 @@ pref("javascript.options.relimit",          true);
 pref("javascript.options.tracejit.content",  true);
 pref("javascript.options.tracejit.chrome",   true);
 pref("javascript.options.methodjit.content", true);
-pref("javascript.options.methodjit.chrome",  false);
+pref("javascript.options.methodjit.chrome",  true);
 pref("javascript.options.jitprofiling.content", true);
-pref("javascript.options.jitprofiling.chrome",  false);
+pref("javascript.options.jitprofiling.chrome",  true);
 pref("javascript.options.methodjit_always", false);
 // This preference limits the memory usage of javascript.
 // If you want to change these values for your device,

From 76f0cc3edd6917d88842c2f71d0c2b0c920e3c8e Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 26 Apr 2011 15:02:38 +1200
Subject: [PATCH 488/509] Bug 652501 - Part 1: Allow reftests to clean up
 plugin and IPC process crash dumps. r=roc

---
 layout/tools/reftest/README.txt         |  21 +++++
 layout/tools/reftest/reftest-content.js |  20 ++++-
 layout/tools/reftest/reftest.js         | 101 +++++++++++++++++++++++-
 3 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/layout/tools/reftest/README.txt b/layout/tools/reftest/README.txt
index b8f846554aea..f1ec5b0ad86c 100644
--- a/layout/tools/reftest/README.txt
+++ b/layout/tools/reftest/README.txt
@@ -396,6 +396,7 @@ so 60/zoom is an integer.
 
 Printing Tests
 ==============
+
 Now that the patch for bug 374050 has landed
 (https://bugzilla.mozilla.org/show_bug.cgi?id=374050), it is possible to
 create reftests that run in a paginated context.
@@ -421,3 +422,23 @@ doesn't use exactly the same codepath as real print preview/print. In
 particular, scripting and frames are likely to cause problems; it is untested,
 though.  That said, it should be sufficient for testing layout issues related
 to pagination.
+
+Plugin and IPC Process Crash Tests
+==================================
+
+If you are running a test that causes an out-of-process plugin or IPC process
+under Electrolysis to crash as part of a reftest, this will cause process
+crash minidump files to be left in the profile directory.  The test
+infrastructure that runs the reftests will notice these minidump files and
+dump out information from them, and these additional error messages in the logs
+can end up erroneously being associated with other errors from the reftest run.
+They are also confusing, since the appearance of "PROCESS-CRASH" messages in
+the test run output can seem like a real problem, when in fact it is the
+expected behavior.
+
+To indicate to the reftest framework that a test is expecting a plugin or
+IPC process crash, have the test include "reftest-expect-process-crash" as
+one of the root element's classes by the time the test has finished.  This will
+cause any minidump files that are generated while running the test to be removed
+and they won't cause any error messages in the test run output.
+
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 7e05016ccb79..ffcd1c92c55f 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -464,6 +464,7 @@ function WaitForTestEnd(contentRootElement, inPrintMode) {
             state = STATE_COMPLETED;
             gFailureReason = "timed out while taking snapshot (bug in harness?)";
             RemoveListeners();
+            CheckForProcessCrashExpectation();
             setTimeout(RecordResult, 0);
             return;
         }
@@ -527,6 +528,7 @@ function OnDocumentLoad(event)
             // Go into reftest-wait mode belatedly.
             WaitForTestEnd(contentRootElement, inPrintMode);
         } else {
+            CheckForProcessCrashExpectation();
             RecordResult();
         }
     }
@@ -555,6 +557,17 @@ function OnDocumentLoad(event)
     }
 }
 
+function CheckForProcessCrashExpectation()
+{
+    var contentRootElement = content.document.documentElement;
+    if (contentRootElement &&
+        contentRootElement.hasAttribute('class') &&
+        contentRootElement.getAttribute('class').split(/\s+/)
+                          .indexOf("reftest-expect-process-crash") != -1) {
+        SendExpectProcessCrash();
+    }
+}
+
 function RecordResult()
 {
     LogInfo("RecordResult fired");
@@ -764,11 +777,16 @@ function SendInitCanvasWithSnapshot()
 }
 
 function SendScriptResults(runtimeMs, error, results)
- {
+{
     sendAsyncMessage("reftest:ScriptResults",
                      { runtimeMs: runtimeMs, error: error, results: results });
 }
 
+function SendExpectProcessCrash(runtimeMs)
+{
+    sendAsyncMessage("reftest:ExpectProcessCrash");
+}
+
 function SendTestDone(runtimeMs)
 {
     sendAsyncMessage("reftest:TestDone", { runtimeMs: runtimeMs });
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index fbb9fd75bd3f..1fd53728ef23 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -57,6 +57,10 @@ const NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX =
           "@mozilla.org/network/protocol;1?name=";
 const NS_XREAPPINFO_CONTRACTID =
           "@mozilla.org/xre/app-info;1";
+const NS_DIRECTORY_SERVICE_CONTRACTID =
+          "@mozilla.org/file/directory_service;1";
+const NS_OBSERVER_SERVICE_CONTRACTID =
+          "@mozilla.org/observer-service;1";
 
 var gLoadTimeout = 0;
 var gTimeoutHook = null;
@@ -115,6 +119,11 @@ var gSlowestTestURL;
 
 var gDrawWindowFlags;
 
+var gExpectingProcessCrash = false;
+var gExpectedCrashDumpFiles = [];
+var gUnexpectedCrashDumpFiles = { };
+var gCrashDumpDir;
+
 const TYPE_REFTEST_EQUAL = '==';
 const TYPE_REFTEST_NOTEQUAL = '!=';
 const TYPE_LOAD = 'load';     // test without a reference (just test that it does
@@ -205,6 +214,11 @@ function IDForEventTarget(event)
 
 function OnRefTestLoad()
 {
+    gCrashDumpDir = CC[NS_DIRECTORY_SERVICE_CONTRACTID]
+                    .getService(CI.nsIProperties)
+                    .get("ProfD", CI.nsIFile);
+    gCrashDumpDir.append("minidumps");
+
     var prefs = Components.classes["@mozilla.org/preferences-service;1"].
                 getService(Components.interfaces.nsIPrefBranch2);
     try {
@@ -278,7 +292,9 @@ function InitAndStartRefTests()
 
     gIOService = CC[IO_SERVICE_CONTRACTID].getService(CI.nsIIOService);
     gDebug = CC[DEBUG_CONTRACTID].getService(CI.nsIDebug2);
-    
+
+    RegisterProcessCrashObservers();
+
     if (gRemote) {
       gServer = null;
     } else {
@@ -1141,6 +1157,7 @@ function RecordResult(testRunTime, errorMsg, scriptResults)
             // First document has been loaded.
             // Proceed to load the second document.
 
+            CleanUpCrashDumpFiles();
             StartCurrentURI(2);
             break;
         case 2:
@@ -1201,6 +1218,7 @@ function RecordResult(testRunTime, errorMsg, scriptResults)
             UpdateCanvasCache(gURLs[0].url1, gCanvas1);
             UpdateCanvasCache(gURLs[0].url2, gCanvas2);
 
+            CleanUpCrashDumpFiles();
             FinishTestItem();
             break;
         default:
@@ -1217,6 +1235,55 @@ function LoadFailed(why)
     FinishTestItem();
 }
 
+function RemoveExpectedCrashDumpFiles()
+{
+    if (gExpectingProcessCrash) {
+        for each (let crashFilename in gExpectedCrashDumpFiles) {
+            let file = gCrashDumpDir.clone();
+            file.append(crashFilename);
+            if (file.exists()) {
+                file.remove(false);
+            }
+        }
+    }
+    gExpectedCrashDumpFiles.length = 0;
+}
+
+function FindUnexpectedCrashDumpFiles()
+{
+    if (!gCrashDumpDir.exists()) {
+        return;
+    }
+
+    let entries = gCrashDumpDir.directoryEntries;
+    if (!entries) {
+        return;
+    }
+
+    let foundCrashDumpFile = false;
+    while (entries.hasMoreElements()) {
+        let file = entries.getNext().QueryInterface(CI.nsIFile);
+        let path = String(file.path);
+        if (path.match(/\.(dmp|extra)$/) && !gUnexpectedCrashDumpFiles[path]) {
+            if (!foundCrashDumpFile) {
+                foundCrashDumpFile = true;
+                gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | " + gCurrentURL +
+                         " | This test left crash dumps behind, but we weren't expecting it to!\n");
+            }
+            gDumpLog("REFTEST INFO | Found unexpected crash dump file" + path +
+                     ".\n");
+            gUnexpectedCrashDumpFiles[path] = true;
+        }
+    }
+}
+
+function CleanUpCrashDumpFiles()
+{
+    RemoveExpectedCrashDumpFiles();
+    FindUnexpectedCrashDumpFiles();
+    gExpectingProcessCrash = false;
+}
+
 function FinishTestItem()
 {
     // Replace document with BLANK_URL_FOR_CLEARING in case there are
@@ -1316,6 +1383,10 @@ function RegisterMessageListenersAndLoadContentScript()
         "reftest:UpdateCanvasForInvalidation",
         function (m) { RecvUpdateCanvasForInvalidation(m.json.rects); }
     );
+    gBrowserMessageManager.addMessageListener(
+        "reftest:ExpectProcessCrash",
+        function (m) { RecvExpectProcessCrash(); }
+    );
 
     gBrowserMessageManager.loadFrameScript("chrome://reftest/content/reftest-content.js", true);
 }
@@ -1376,6 +1447,34 @@ function RecvUpdateCanvasForInvalidation(rects)
     UpdateCurrentCanvasForInvalidation(rects);
 }
 
+function OnProcessCrashed(subject, topic, data)
+{
+    var id;
+    subject = subject.QueryInterface(CI.nsIPropertyBag2);
+    if (topic == "plugin-crashed") {
+        id = subject.getPropertyAsAString("pluginDumpID");
+    } else if (topic == "ipc:content-shutdown") {
+        id = subject.getPropertyAsAString("dumpID");
+    }
+    if (id) {
+        gExpectedCrashDumpFiles.push(id + ".dmp");
+        gExpectedCrashDumpFiles.push(id + ".extra");
+    }
+}
+
+function RegisterProcessCrashObservers()
+{
+    var os = CC[NS_OBSERVER_SERVICE_CONTRACTID]
+             .getService(CI.nsIObserverService);
+    os.addObserver(OnProcessCrashed, "plugin-crashed", false);
+    os.addObserver(OnProcessCrashed, "ipc:content-shutdown", false);
+}
+
+function RecvExpectProcessCrash()
+{
+    gExpectingProcessCrash = true;
+}
+
 function SendClear()
 {
     gBrowserMessageManager.sendAsyncMessage("reftest:Clear");

From 7fa9b8a992149be37d994b9e6b989d539bbd05f5 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 26 Apr 2011 15:02:38 +1200
Subject: [PATCH 489/509] Bug 652501 - Part 2: Make existing plugin crash
 reftests clean up after themselves. r=roc

---
 layout/tools/reftest/README.txt                               | 1 -
 .../plugin/test/reftest/pluginproblemui-direction-1-ref.html  | 4 ++--
 modules/plugin/test/reftest/pluginproblemui-direction-1.html  | 4 ++--
 .../plugin/test/reftest/pluginproblemui-direction-2-ref.html  | 4 ++--
 modules/plugin/test/reftest/pluginproblemui-direction-2.html  | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/layout/tools/reftest/README.txt b/layout/tools/reftest/README.txt
index f1ec5b0ad86c..91c487209b69 100644
--- a/layout/tools/reftest/README.txt
+++ b/layout/tools/reftest/README.txt
@@ -441,4 +441,3 @@ IPC process crash, have the test include "reftest-expect-process-crash" as
 one of the root element's classes by the time the test has finished.  This will
 cause any minidump files that are generated while running the test to be removed
 and they won't cause any error messages in the test run output.
-
diff --git a/modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html b/modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
index f9983ee6347f..fafec34f4315 100644
--- a/modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
+++ b/modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
+<html class="reftest-expect-process-crash reftest-wait">
   <head>
     <title>Plugin Problem UI directionality test</title>
   </head>
@@ -9,7 +9,7 @@
       var plugin = document.getElementById("crashme");
       function checkForCrashUI() {
         if (getComputedStyle(plugin, null).MozBinding != "none") {
-          document.documentElement.removeAttribute("class");
+          document.documentElement.classList.remove("reftest-wait");
           clearInterval(interval);
         }
       }
diff --git a/modules/plugin/test/reftest/pluginproblemui-direction-1.html b/modules/plugin/test/reftest/pluginproblemui-direction-1.html
index b01f7df68f5e..9888850dc98b 100644
--- a/modules/plugin/test/reftest/pluginproblemui-direction-1.html
+++ b/modules/plugin/test/reftest/pluginproblemui-direction-1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
+<html class="reftest-expect-process-crash reftest-wait">
   <head>
     <title>Plugin Problem UI directionality test</title>
   </head>
@@ -9,7 +9,7 @@
       var plugin = document.getElementById("crashme");
       function checkForCrashUI() {
         if (getComputedStyle(plugin, null).MozBinding != "none") {
-          document.documentElement.removeAttribute("class");
+          document.documentElement.classList.remove("reftest-wait");
           clearInterval(interval);
         }
       }
diff --git a/modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html b/modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
index fdfd9b694218..e807b86b5bf8 100644
--- a/modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
+++ b/modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
+<html class="reftest-expect-process-crash reftest-wait">
   <head>
     <title>Plugin Problem UI directionality test</title>
   </head>
@@ -13,7 +13,7 @@
       var plugin = document.getElementById("crashme");
       function checkForCrashUI() {
         if (getComputedStyle(plugin, null).MozBinding != "none") {
-          document.documentElement.removeAttribute("class");
+          document.documentElement.classList.remove("reftest-wait");
           clearInterval(interval);
         }
       }
diff --git a/modules/plugin/test/reftest/pluginproblemui-direction-2.html b/modules/plugin/test/reftest/pluginproblemui-direction-2.html
index 84c3f308898a..95b358e3721a 100644
--- a/modules/plugin/test/reftest/pluginproblemui-direction-2.html
+++ b/modules/plugin/test/reftest/pluginproblemui-direction-2.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
+<html class="reftest-expect-process-crash reftest-wait">
   <head>
     <title>Plugin Problem UI directionality test</title>
   </head>
@@ -13,7 +13,7 @@
       var plugin = document.getElementById("crashme");
       function checkForCrashUI() {
         if (getComputedStyle(plugin, null).MozBinding != "none") {
-          document.documentElement.removeAttribute("class");
+          document.documentElement.classList.remove("reftest-wait");
           clearInterval(interval);
         }
       }

From e183176a0d0ce48407c6a0cf96278b22798d4bbf Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 26 Apr 2011 08:49:51 +0200
Subject: [PATCH 490/509] Bug 652306 - Move some parts of aboutDialog.css into
 branding. r=gavin

---
 browser/base/content/aboutDialog.css          | 57 -------------------
 browser/base/content/aboutDialog.xul          |  1 +
 .../branding/aurora/content/aboutDialog.css   | 20 +++++++
 browser/branding/aurora/content/jar.mn        |  1 +
 .../branding/nightly/content/aboutDialog.css  | 20 +++++++
 browser/branding/nightly/content/jar.mn       |  1 +
 .../branding/official/content/aboutDialog.css | 31 ++++++++++
 browser/branding/official/content/jar.mn      |  1 +
 .../unofficial/content/aboutDialog.css        | 20 +++++++
 browser/branding/unofficial/content/jar.mn    |  1 +
 10 files changed, 96 insertions(+), 57 deletions(-)
 create mode 100644 browser/branding/aurora/content/aboutDialog.css
 create mode 100644 browser/branding/nightly/content/aboutDialog.css
 create mode 100644 browser/branding/official/content/aboutDialog.css
 create mode 100644 browser/branding/unofficial/content/aboutDialog.css

diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
index 703e54527c15..ccad14fd36cf 100644
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -2,52 +2,12 @@
   width: 620px;
 }
 
-/* Official branding has Firefox logo on the left side of the window. 
-   Nightly/aurora branding has background image applied to entire window. */
-%ifdef MOZ_OFFICIAL_BRANDING
-#clientBox {
-  background-color: #F7F7F7;
-  color: #222222;
-}
-%else
-#aboutDialogContainer {
-  background-image: url("chrome://branding/content/about-background.png");
-  background-repeat: no-repeat;
-  background-color: #000;
-  color: #fff;
-}
-
-.text-link {
-  color: #fff !important;
-}
-%endif
-
-%ifdef MOZ_OFFICIAL_BRANDING
-#leftBox {
-  background-image: url("chrome://branding/content/about-logo.png");
-  background-repeat: no-repeat;
-  /* min-width and min-height create room for the logo */
-  min-width: 210px;
-  min-height: 210px;
-  margin-top:20px;
-  -moz-margin-start: 30px;
-}
-%endif
-
 #rightBox {
   background-image: url("chrome://branding/content/about-wordmark.png");
   background-repeat: no-repeat;
   /* padding-top creates room for the wordmark */
   padding-top: 38px;
   margin-top:20px;
-%ifdef MOZ_OFFICIAL_BRANDING
-  margin-left: 30px;
-  margin-right: 30px;
-%else 
-  /* this margin prevents text from overlapping the planet image */
-  margin-left: 280px;
-  margin-right: 20px;
-%endif
 }
 
 #rightBox:-moz-locale-dir(rtl) {
@@ -56,9 +16,6 @@
 
 #bottomBox {
   padding: 15px 10px 0;
-%ifndef MOZ_OFFICIAL_BRANDING
-  background-color: rgba(0,0,0,.7);
-%endif
 }
 
 #version {
@@ -87,9 +44,6 @@
 }
 
 #updateDeck > hbox > label:not([class="text-link"]) {
-%ifdef MOZ_OFFICIAL_BRANDING
-  color: #909090;
-%endif
   font-style:italic;
 }
 
@@ -113,17 +67,6 @@
   margin: 0 40px;
 }
 
-/* we assume trademark text only appears in offical builds */
-%ifdef MOZ_OFFICIAL_BRANDING
-#trademark {
-  font-size: xx-small;
-  text-align: center;
-  color: #999999;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-%endif
-
 #currentChannel {
   margin: 0;
   padding: 0;
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index 848e25e3d806..96d5d1dc4126 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -41,6 +41,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
diff --git a/browser/branding/aurora/content/aboutDialog.css b/browser/branding/aurora/content/aboutDialog.css
new file mode 100644
index 000000000000..f74c55cbef6c
--- /dev/null
+++ b/browser/branding/aurora/content/aboutDialog.css
@@ -0,0 +1,20 @@
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: #000;
+  color: #fff;
+}
+
+.text-link {
+  color: #fff !important;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the planet image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: rgba(0,0,0,.7);
+}
diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn
index e8d0d5b7d365..2413eb64a285 100644
--- a/browser/branding/aurora/content/jar.mn
+++ b/browser/branding/aurora/content/jar.mn
@@ -8,3 +8,4 @@ browser.jar:
   content/branding/icon64.png                    (icon64.png)
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/icon16.png                    (../default16.png)
+  content/branding/aboutDialog.css               (aboutDialog.css)
diff --git a/browser/branding/nightly/content/aboutDialog.css b/browser/branding/nightly/content/aboutDialog.css
new file mode 100644
index 000000000000..f74c55cbef6c
--- /dev/null
+++ b/browser/branding/nightly/content/aboutDialog.css
@@ -0,0 +1,20 @@
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: #000;
+  color: #fff;
+}
+
+.text-link {
+  color: #fff !important;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the planet image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: rgba(0,0,0,.7);
+}
diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn
index e8d0d5b7d365..2413eb64a285 100644
--- a/browser/branding/nightly/content/jar.mn
+++ b/browser/branding/nightly/content/jar.mn
@@ -8,3 +8,4 @@ browser.jar:
   content/branding/icon64.png                    (icon64.png)
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/icon16.png                    (../default16.png)
+  content/branding/aboutDialog.css               (aboutDialog.css)
diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css
new file mode 100644
index 000000000000..c83aec095e17
--- /dev/null
+++ b/browser/branding/official/content/aboutDialog.css
@@ -0,0 +1,31 @@
+#clientBox {
+  background-color: #F7F7F7;
+  color: #222222;
+}
+
+#leftBox {
+  background-image: url("chrome://branding/content/about-logo.png");
+  background-repeat: no-repeat;
+  /* min-width and min-height create room for the logo */
+  min-width: 210px;
+  min-height: 210px;
+  margin-top:20px;
+  -moz-margin-start: 30px;
+}
+
+#rightBox {
+  margin-left: 30px;
+  margin-right: 30px;
+}
+
+#updateDeck > hbox > label:not([class="text-link"]) {
+  color: #909090;
+}
+
+#trademark {
+  font-size: xx-small;
+  text-align: center;
+  color: #999999;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn
index 1706a95d373f..c0629c3db2ec 100644
--- a/browser/branding/official/content/jar.mn
+++ b/browser/branding/official/content/jar.mn
@@ -7,3 +7,4 @@ browser.jar:
   content/branding/icon64.png                    (icon64.png)
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/icon16.png                    (../default16.png)
+  content/branding/aboutDialog.css               (aboutDialog.css)
diff --git a/browser/branding/unofficial/content/aboutDialog.css b/browser/branding/unofficial/content/aboutDialog.css
new file mode 100644
index 000000000000..f74c55cbef6c
--- /dev/null
+++ b/browser/branding/unofficial/content/aboutDialog.css
@@ -0,0 +1,20 @@
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: #000;
+  color: #fff;
+}
+
+.text-link {
+  color: #fff !important;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the planet image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: rgba(0,0,0,.7);
+}
diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn
index e8d0d5b7d365..2413eb64a285 100644
--- a/browser/branding/unofficial/content/jar.mn
+++ b/browser/branding/unofficial/content/jar.mn
@@ -8,3 +8,4 @@ browser.jar:
   content/branding/icon64.png                    (icon64.png)
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/icon16.png                    (../default16.png)
+  content/branding/aboutDialog.css               (aboutDialog.css)

From e914ee7c0e29a6194073d5437571f0be51349170 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jandemooij@gmail.com>
Date: Tue, 26 Apr 2011 10:29:00 +0200
Subject: [PATCH 491/509] Bug 646938 - Fix NaN-check in jsop_stricteq.
 r=dvander

---
 js/src/jit-test/tests/jaeger/bug646938.js | 21 +++++++++++++++++++++
 js/src/methodjit/FastOps.cpp              | 15 +++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 js/src/jit-test/tests/jaeger/bug646938.js

diff --git a/js/src/jit-test/tests/jaeger/bug646938.js b/js/src/jit-test/tests/jaeger/bug646938.js
new file mode 100644
index 000000000000..0284bdce3d9e
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug646938.js
@@ -0,0 +1,21 @@
+function f() {
+    var x = -[NaN][0];
+    assertEq(x === x, false);
+    assertEq(x !== x, true);
+    assertEq(x == x, false);
+    assertEq(x != x, true);
+
+    var y = -("x" / {});
+    var z = y;
+    assertEq(y === z, false);
+    assertEq(y !== z, true);
+    assertEq(y == z, false);
+    assertEq(y != z, true);
+}
+f();
+
+function g(x, y) {
+    var z = x / y;
+    assertEq(z === z, false);
+}
+g(0, 0);
diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp
index dfed09f70e3a..fbcf91b06bb5 100644
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -1550,20 +1550,23 @@ mjit::Compiler::jsop_stricteq(JSOp op)
             return;
         }
         
-        /* Assume NaN is in canonical form. */
+        /* Assume NaN is either in canonical form or has the sign bit set (by jsop_neg). */
         RegisterID result = frame.allocReg(Registers::SingleByteRegs);
-        RegisterID treg = frame.tempRegForType(lhs);
+        RegisterID treg = frame.copyTypeIntoReg(lhs);
 
         Assembler::Condition oppositeCond = (op == JSOP_STRICTEQ) ? Assembler::NotEqual : Assembler::Equal;
 
+        /* Ignore the sign bit. */
+        masm.lshiftPtr(Imm32(1), treg);
 #ifndef JS_CPU_X64
-        static const int CanonicalNaNType = 0x7FF80000;
-        masm.setPtr(oppositeCond, treg, Imm32(CanonicalNaNType), result);
+        static const int ShiftedCanonicalNaNType = 0x7FF80000 << 1;
+        masm.setPtr(oppositeCond, treg, Imm32(ShiftedCanonicalNaNType), result);
 #else
-        static const void *CanonicalNaNType = (void *)0x7FF8000000000000; 
-        masm.move(ImmPtr(CanonicalNaNType), Registers::ScratchReg);
+        static const void *ShiftedCanonicalNaNType = (void *)(0x7FF8000000000000 << 1);
+        masm.move(ImmPtr(ShiftedCanonicalNaNType), Registers::ScratchReg);
         masm.setPtr(oppositeCond, treg, Registers::ScratchReg, result);
 #endif
+        frame.freeReg(treg);
 
         frame.popn(2);
         frame.pushTypedPayload(JSVAL_TYPE_BOOLEAN, result);

From 1e3c93a06e499eae9de5ae4d8ff4e416bb45172f Mon Sep 17 00:00:00 2001
From: Buu-Minh Ta <buu-minh.ta@m4x.org>
Date: Tue, 26 Apr 2011 10:48:58 +0200
Subject: [PATCH 492/509] Bug 615728 - When selecting an empty tab, autofocus
 on the location bar. r=dao

---
 browser/base/content/tabbrowser.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 710678dcdb92..1319ee8118d2 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -962,14 +962,13 @@
                 // In full screen mode, only bother making the location bar visible
                 // if the tab is a blank one.
                 oldBrowser._urlbarFocused = (gURLBar && gURLBar.focused);
-                if (newBrowser._urlbarFocused && gURLBar) {
-                  if (!window.fullScreen) {
-                    gURLBar.focus();
-                    break;
-                  } else if (isTabEmpty(this.mCurrentTab)) {
-                    focusAndSelectUrlBar();
-                    break;
-                  }
+                if (newBrowser._urlbarFocused && gURLBar && !window.fullScreen) {
+                  gURLBar.focus();
+                  break;
+                }
+                if (isTabEmpty(this.mCurrentTab)) {
+                  focusAndSelectUrlBar();
+                  break;
                 }
 
                 // If the find bar is focused, keep it focused.

From 2b874a847febc9520f6229ab9891f0c5728ff612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 26 Apr 2011 12:14:38 +0200
Subject: [PATCH 493/509] Backed out changeset e0110ab48587

---
 browser/base/content/tabbrowser.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 1319ee8118d2..710678dcdb92 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -962,13 +962,14 @@
                 // In full screen mode, only bother making the location bar visible
                 // if the tab is a blank one.
                 oldBrowser._urlbarFocused = (gURLBar && gURLBar.focused);
-                if (newBrowser._urlbarFocused && gURLBar && !window.fullScreen) {
-                  gURLBar.focus();
-                  break;
-                }
-                if (isTabEmpty(this.mCurrentTab)) {
-                  focusAndSelectUrlBar();
-                  break;
+                if (newBrowser._urlbarFocused && gURLBar) {
+                  if (!window.fullScreen) {
+                    gURLBar.focus();
+                    break;
+                  } else if (isTabEmpty(this.mCurrentTab)) {
+                    focusAndSelectUrlBar();
+                    break;
+                  }
                 }
 
                 // If the find bar is focused, keep it focused.

From 2cc83ff3e698678e596e71462692518aeff55a0d Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 26 Apr 2011 15:30:17 +0300
Subject: [PATCH 494/509] Bug 648573 - Implement touch event interfaces, r=jst,
 pref'ed off by default

---
 build/automation.py.in                     |   1 +
 content/base/public/nsContentUtils.h       |   5 +
 content/base/src/nsContentUtils.cpp        |  30 ++
 content/base/src/nsDocument.cpp            |  75 +++++
 content/base/src/nsDocument.h              |   7 +-
 content/base/src/nsGkAtomList.h            |   6 +
 content/events/public/nsIPrivateDOMEvent.h |   2 +
 content/events/src/Makefile.in             |   1 +
 content/events/src/nsDOMTouchEvent.cpp     | 341 +++++++++++++++++++++
 content/events/src/nsDOMTouchEvent.h       | 131 ++++++++
 content/events/src/nsEventDispatcher.cpp   |   4 +
 content/events/test/Makefile.in            |   1 +
 content/events/test/test_bug648573.html    | 105 +++++++
 dom/base/nsDOMClassInfo.cpp                | 161 ++++++++--
 dom/base/nsDOMClassInfo.h                  |  30 +-
 dom/base/nsDOMClassInfoClasses.h           |   4 +
 dom/base/nsScriptNameSpaceManager.cpp      |   5 +-
 dom/base/nsScriptNameSpaceManager.h        |   2 +
 dom/interfaces/events/Makefile.in          |   1 +
 dom/interfaces/events/nsIDOMTouchEvent.idl | 109 +++++++
 js/src/xpconnect/src/dom_quickstubs.qsconf |   7 +
 21 files changed, 998 insertions(+), 30 deletions(-)
 create mode 100644 content/events/src/nsDOMTouchEvent.cpp
 create mode 100644 content/events/src/nsDOMTouchEvent.h
 create mode 100644 content/events/test/test_bug648573.html
 create mode 100644 dom/interfaces/events/nsIDOMTouchEvent.idl

diff --git a/build/automation.py.in b/build/automation.py.in
index a29185d671a9..24cf0051dcd1 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -364,6 +364,7 @@ user_pref("media.cache_size", 100);
 user_pref("security.warn_viewing_mixed", false);
 user_pref("app.update.enabled", false);
 user_pref("browser.panorama.experienced_first_run", true); // Assume experienced
+user_pref("dom.w3c_touch_events.enabled", true);
 
 // Only load extensions from the application and user profile
 // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index ed9e2d7bdd35..dc4a10732228 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1771,6 +1771,11 @@ public:
   FindInternalContentViewer(const char* aType,
                             ContentViewerType* aLoaderType = nsnull);
 
+  /**
+   * Calling this adds support for
+   * ontouch* event handler DOM attributes.
+   */
+  static void InitializeTouchEventTable();
 private:
   static PRBool InitializeEventTable();
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index cae96e74ac5c..4e5e60bbb69a 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -210,6 +210,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #ifdef MOZ_MEDIA
 #include "nsHTMLMediaElement.h"
 #endif
+#include "nsDOMTouchEvent.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::layers;
@@ -726,6 +727,35 @@ nsContentUtils::InitializeEventTable() {
   return PR_TRUE;
 }
 
+void
+nsContentUtils::InitializeTouchEventTable()
+{
+  static PRBool sEventTableInitialized = PR_FALSE;
+  if (!sEventTableInitialized && sAtomEventTable && sStringEventTable) {
+    sEventTableInitialized = PR_TRUE;
+    static const EventNameMapping touchEventArray[] = {
+      { nsGkAtoms::ontouchstart, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT },
+      { nsGkAtoms::ontouchend, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT },
+      { nsGkAtoms::ontouchmove, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT },
+      { nsGkAtoms::ontouchenter, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT },
+      { nsGkAtoms::ontouchleave, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT },
+      { nsGkAtoms::ontouchcancel, NS_USER_DEFINED_EVENT, EventNameType_All, NS_INPUT_EVENT }
+    };
+    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(touchEventArray); ++i) {
+      if (!sAtomEventTable->Put(touchEventArray[i].mAtom, touchEventArray[i]) ||
+          !sStringEventTable->Put(Substring(nsDependentAtomString(touchEventArray[i].mAtom), 2),
+                                  touchEventArray[i])) {
+        delete sAtomEventTable;
+        sAtomEventTable = nsnull;
+        delete sStringEventTable;
+        sStringEventTable = nsnull;
+        return;
+      }
+    }
+  }
+}
+
+
 /**
  * Access a cached parser service. Don't addref. We need only one
  * reference to it and this class has that one.
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 5700367d00e9..de3e49e478cd 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -203,6 +203,7 @@ static NS_DEFINE_CID(kDOMEventGroupCID, NS_DOMEVENTGROUP_CID);
 #include "mozilla/dom/Link.h"
 #include "nsIHTMLDocument.h"
 #include "nsXULAppAPI.h"
+#include "nsDOMTouchEvent.h"
 
 using namespace mozilla::dom;
 
@@ -1701,6 +1702,7 @@ NS_INTERFACE_TABLE_HEAD(nsDocument)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer_MOZILLA_2_0_BRANCH)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIMutationObserver)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIApplicationCacheContainer)
+    NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMDocumentTouch)
   NS_OFFSET_AND_INTERFACE_TABLE_END
   NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
   NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDocument)
@@ -8321,3 +8323,76 @@ nsDocument::SetImagesNeedAnimating(PRBool aAnimating)
   // Update state.
   mAnimatingImages = aAnimating;
 }
+
+NS_IMETHODIMP
+nsDocument::CreateTouch(nsIDOMAbstractView* aView,
+                        nsIDOMEventTarget* aTarget,
+                        PRInt32 aIdentifier,
+                        PRInt32 aPageX,
+                        PRInt32 aPageY,
+                        PRInt32 aScreenX,
+                        PRInt32 aScreenY,
+                        PRInt32 aClientX,
+                        PRInt32 aClientY,
+                        PRInt32 aRadiusX,
+                        PRInt32 aRadiusY,
+                        float aRotationAngle,
+                        float aForce,
+                        nsIDOMTouchPoint** aRetVal)
+{
+  NS_ADDREF(*aRetVal = new nsDOMTouchPoint(aTarget,
+                                           aIdentifier,
+                                           aPageX,
+                                           aPageY,
+                                           aScreenX,
+                                           aScreenY,
+                                           aClientX,
+                                           aClientY,
+                                           aRadiusX,
+                                           aRadiusY,
+                                           aRotationAngle,
+                                           aForce));
+  return NS_OK;;
+}
+
+NS_IMETHODIMP
+nsDocument::CreateTouchList(nsIVariant* aPoints,
+                            nsIDOMTouchList** aRetVal)
+{
+  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList();
+  if (aPoints) {
+    PRUint16 type;
+    aPoints->GetDataType(&type);
+    if (type == nsIDataType::VTYPE_INTERFACE ||
+        type == nsIDataType::VTYPE_INTERFACE_IS) {
+      nsCOMPtr<nsISupports> data;
+      aPoints->GetAsISupports(getter_AddRefs(data));
+      nsCOMPtr<nsIDOMTouchPoint> point = do_QueryInterface(data);
+      if (point) {
+        retval->Append(point);
+      }
+    } else if (type == nsIDataType::VTYPE_ARRAY) {
+      PRUint16 valueType;
+      nsIID iid;
+      PRUint32 valueCount;
+      void* rawArray;
+      aPoints->GetAsArray(&valueType, &iid, &valueCount, &rawArray);
+      if (valueType == nsIDataType::VTYPE_INTERFACE ||
+          valueType == nsIDataType::VTYPE_INTERFACE_IS) {
+        nsISupports** values = static_cast<nsISupports**>(rawArray);
+        for (PRUint32 i = 0; i < valueCount; ++i) {
+          nsCOMPtr<nsISupports> supports = dont_AddRef(values[i]);
+          nsCOMPtr<nsIDOMTouchPoint> point = do_QueryInterface(supports);
+          if (point) {
+            retval->Append(point);
+          }
+        }
+      }
+      nsMemory::Free(rawArray);
+    }
+  }
+
+  *aRetVal = retval.forget().get();
+  return NS_OK;
+}
+
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 4863e417bd3f..9bc7387615dd 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -109,6 +109,7 @@
 #include "nsIChannelEventSink.h"
 #include "imgIRequest.h"
 #include "nsIDOMDOMImplementation.h"
+#include "nsIDOMTouchEvent.h"
 
 #define XML_DECLARATION_BITS_DECLARATION_EXISTS   (1 << 0)
 #define XML_DECLARATION_BITS_ENCODING_EXISTS      (1 << 1)
@@ -509,7 +510,8 @@ class nsDocument : public nsIDocument,
                    public nsIScriptObjectPrincipal,
                    public nsIRadioGroupContainer_MOZILLA_2_0_BRANCH,
                    public nsIApplicationCacheContainer,
-                   public nsStubMutationObserver
+                   public nsStubMutationObserver,
+                   public nsIDOMDocumentTouch
 {
 public:
   typedef mozilla::dom::Element Element;
@@ -841,6 +843,9 @@ public:
   // nsIApplicationCacheContainer
   NS_DECL_NSIAPPLICATIONCACHECONTAINER
 
+  // nsIDOMDocumentTouch
+  NS_DECL_NSIDOMDOCUMENTTOUCH
+
   virtual nsresult Init();
   
   virtual nsresult AddXMLEventsContent(nsIContent * aXMLEventsElement);
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index 875aa70ad917..6c261be46e7a 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -720,6 +720,12 @@ GK_ATOM(onselect, "onselect")
 GK_ATOM(onset, "onset")
 GK_ATOM(onsubmit, "onsubmit")
 GK_ATOM(ontext, "ontext")
+GK_ATOM(ontouchstart, "ontouchstart")
+GK_ATOM(ontouchend, "ontouchend")
+GK_ATOM(ontouchmove, "ontouchmove")
+GK_ATOM(ontouchenter, "ontouchenter")
+GK_ATOM(ontouchleave, "ontouchleave")
+GK_ATOM(ontouchcancel, "ontouchcancel")
 GK_ATOM(ontransitionend, "ontransitionend")
 GK_ATOM(onunderflow, "onunderflow")
 GK_ATOM(onunload, "onunload")
diff --git a/content/events/public/nsIPrivateDOMEvent.h b/content/events/public/nsIPrivateDOMEvent.h
index f0ae575d9ec3..781a561214c3 100644
--- a/content/events/public/nsIPrivateDOMEvent.h
+++ b/content/events/public/nsIPrivateDOMEvent.h
@@ -142,4 +142,6 @@ nsresult
 NS_NewDOMCloseEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsEvent* aEvent);
 nsresult
 NS_NewDOMMozTouchEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsMozTouchEvent* aEvent);
+nsresult
+NS_NewDOMTouchEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsInputEvent *aEvent);
 #endif // nsIPrivateDOMEvent_h__
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index f7e82fdd8bae..d4fd20d29f19 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -91,6 +91,7 @@ CPPSRCS		= \
 		nsDOMPopStateEvent.cpp \
 		nsDOMHashChangeEvent.cpp \
 		nsDOMCloseEvent.cpp \
+		nsDOMTouchEvent.cpp \
 		$(NULL)
 
 ifdef MOZ_CSS_ANIMATIONS
diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp
new file mode 100644
index 000000000000..e2a77f37dba0
--- /dev/null
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -0,0 +1,341 @@
+                     /* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is nsDOMTouchEvent.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsDOMTouchEvent.h"
+#include "nsGUIEvent.h"
+#include "nsDOMClassInfoID.h"
+#include "nsIClassInfo.h"
+#include "nsIXPCScriptable.h"
+#include "nsContentUtils.h"
+
+DOMCI_DATA(TouchPoint, nsDOMTouchPoint)
+
+NS_IMPL_CYCLE_COLLECTION_1(nsDOMTouchPoint, mTarget)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMTouchPoint)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMTouchPoint)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMTouchPoint)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TouchPoint)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMTouchPoint)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMTouchPoint)
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetIdentifier(PRInt32* aIdentifier)
+{
+  *aIdentifier = mIdentifier;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetTarget(nsIDOMEventTarget** aTarget)
+{
+  NS_IF_ADDREF(*aTarget = mTarget);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetScreenX(PRInt32* aScreenX)
+{
+  *aScreenX = mScreenX;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetScreenY(PRInt32* aScreenY)
+{
+  *aScreenY = mScreenY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetClientX(PRInt32* aClientX)
+{
+  *aClientX = mClientX;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetClientY(PRInt32* aClientY)
+{
+  *aClientY = mClientY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetPageX(PRInt32* aPageX)
+{
+  *aPageX = mPageX;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetPageY(PRInt32* aPageY)
+{
+  *aPageY = mPageY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetRadiusX(PRInt32* aRadiusX)
+{
+  *aRadiusX = mRadiusX;
+  return NS_OK;
+}
+                                             
+NS_IMETHODIMP
+nsDOMTouchPoint::GetRadiusY(PRInt32* aRadiusY)
+{
+  *aRadiusY = mRadiusY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetRotationAngle(float* aRotationAngle)
+{
+  *aRotationAngle = mRotationAngle;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchPoint::GetForce(float* aForce)
+{
+  *aForce = mForce;
+  return NS_OK;
+}
+
+// TouchList
+
+DOMCI_DATA(TouchList, nsDOMTouchList)
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMTouchList)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMTouchList)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMTouchList)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TouchList)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMTouchList)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mPoints)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMTouchList)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mPoints)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMTouchList)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMTouchList)
+
+NS_IMETHODIMP
+nsDOMTouchList::GetLength(PRUint32* aLength)
+{
+  *aLength = mPoints.Count();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchList::Item(PRUint32 aIndex, nsIDOMTouchPoint** aRetVal)
+{
+  NS_IF_ADDREF(*aRetVal = mPoints.SafeObjectAt(aIndex));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchList::IdentifiedPoint(PRInt32 aIdentifier, nsIDOMTouchPoint** aRetVal)
+{
+  for (PRInt32 i = 0; i < mPoints.Count(); ++i) {
+    nsCOMPtr<nsIDOMTouchPoint> point = mPoints[i];
+    PRInt32 identifier;
+    if (point && NS_SUCCEEDED(point->GetIdentifier(&identifier)) &&
+        aIdentifier == identifier) {
+      point.swap(*aRetVal);
+      break;
+    }
+  }
+  return NS_OK;
+}
+
+// TouchEvent
+
+nsDOMTouchEvent::nsDOMTouchEvent(nsPresContext* aPresContext,
+                                 nsInputEvent* aEvent)
+  : nsDOMUIEvent(aPresContext, aEvent ? aEvent :
+                                        new nsInputEvent(PR_FALSE, 0, nsnull))
+{
+  if (aEvent) {
+    mEventIsInternal = PR_FALSE;
+  } else {
+    mEventIsInternal = PR_TRUE;
+    mEvent->time = PR_Now();
+  }
+}
+
+nsDOMTouchEvent::~nsDOMTouchEvent()
+{
+  if (mEventIsInternal && mEvent) {
+    delete static_cast<nsInputEvent*>(mEvent);
+    mEvent = nsnull;
+  }
+}
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMTouchEvent)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTouches)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTargetTouches)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mChangedTouches)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTouches)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTargetTouches)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mChangedTouches)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+DOMCI_DATA(TouchEvent, nsDOMTouchEvent)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMTouchEvent)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMTouchEvent)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TouchEvent)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent)
+
+NS_IMPL_ADDREF_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)
+NS_IMPL_RELEASE_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)
+
+
+NS_IMETHODIMP
+nsDOMTouchEvent::InitTouchEvent(const nsAString& aType,
+                                PRBool aCanBubble,
+                                PRBool aCancelable,
+                                nsIDOMAbstractView* aView,
+                                PRInt32 aDetail,
+                                PRBool aCtrlKey,
+                                PRBool aAltKey,
+                                PRBool aShiftKey,
+                                PRBool aMetaKey,
+                                nsIDOMTouchList* aTouches,
+                                nsIDOMTouchList* aTargetTouches,
+                                nsIDOMTouchList* aChangedTouches)
+{
+  nsresult rv = nsDOMUIEvent::InitUIEvent(aType, aCanBubble, aCancelable, aView, aDetail);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  static_cast<nsInputEvent*>(mEvent)->isControl = aCtrlKey;
+  static_cast<nsInputEvent*>(mEvent)->isAlt = aAltKey;
+  static_cast<nsInputEvent*>(mEvent)->isShift = aShiftKey;
+  static_cast<nsInputEvent*>(mEvent)->isMeta = aMetaKey;
+  mTouches = aTouches;
+  mTargetTouches = aTargetTouches;
+  mChangedTouches = aChangedTouches;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetTouches(nsIDOMTouchList** aTouches)
+{
+  NS_IF_ADDREF(*aTouches = mTouches);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetTargetTouches(nsIDOMTouchList** aTargetTouches)
+{
+  NS_IF_ADDREF(*aTargetTouches = mTargetTouches);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetChangedTouches(nsIDOMTouchList** aChangedTouches)
+{
+  NS_IF_ADDREF(*aChangedTouches = mChangedTouches);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetAltKey(PRBool* aAltKey)
+{
+  *aAltKey = static_cast<nsInputEvent*>(mEvent)->isAlt;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetMetaKey(PRBool* aMetaKey)
+{
+  *aMetaKey = static_cast<nsInputEvent*>(mEvent)->isMeta;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetCtrlKey(PRBool* aCtrlKey)
+{
+  *aCtrlKey = static_cast<nsInputEvent*>(mEvent)->isControl;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDOMTouchEvent::GetShiftKey(PRBool* aShiftKey)
+{
+  *aShiftKey = static_cast<nsInputEvent*>(mEvent)->isShift;
+  return NS_OK;
+}
+
+PRBool
+nsDOMTouchEvent::PrefEnabled()
+{
+  static PRBool sDidCheckPref = PR_FALSE;
+  static PRBool sPrefValue = PR_FALSE;
+  if (!sDidCheckPref) {
+    sDidCheckPref = PR_TRUE;
+    sPrefValue = nsContentUtils::GetBoolPref("dom.w3c_touch_events.enabled", PR_FALSE);
+    if (sPrefValue) {
+      nsContentUtils::InitializeTouchEventTable();
+    }
+  }
+  return sPrefValue;
+}
+
+nsresult
+NS_NewDOMTouchEvent(nsIDOMEvent** aInstancePtrResult,
+                    nsPresContext* aPresContext,
+                    nsInputEvent *aEvent)
+{
+  nsDOMTouchEvent* it = new nsDOMTouchEvent(aPresContext, aEvent);
+
+  return CallQueryInterface(it, aInstancePtrResult);
+}
diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h
new file mode 100644
index 000000000000..7a581439659d
--- /dev/null
+++ b/content/events/src/nsDOMTouchEvent.h
@@ -0,0 +1,131 @@
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is nsDOMTouchEvent.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef nsDOMTouchEvent_h_
+#define nsDOMTouchEvent_h_
+
+#include "nsDOMUIEvent.h"
+#include "nsIDOMTouchEvent.h"
+#include "nsString.h"
+#include "nsCOMArray.h"
+
+class nsDOMTouchPoint : public nsIDOMTouchPoint
+{
+public:
+  nsDOMTouchPoint(nsIDOMEventTarget* aTarget,
+                  PRInt32 aIdentifier,
+                  PRInt32 aPageX,
+                  PRInt32 aPageY,
+                  PRInt32 aScreenX,
+                  PRInt32 aScreenY,
+                  PRInt32 aClientX,
+                  PRInt32 aClientY,
+                  PRInt32 aRadiusX,
+                  PRInt32 aRadiusY,
+                  float aRotationAngle,
+                  float aForce)
+  : mTarget(aTarget),
+    mIdentifier(aIdentifier),
+    mPageX(aPageX),
+    mPageY(aPageY),
+    mScreenX(aScreenX),
+    mScreenY(aScreenY),
+    mClientX(aClientX),
+    mClientY(aClientY),
+    mRadiusX(aRadiusX),
+    mRadiusY(aRadiusY),
+    mRotationAngle(aRotationAngle),
+    mForce(aForce)
+    {}
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMTouchPoint)
+  NS_DECL_NSIDOMTOUCHPOINT
+protected:
+  nsCOMPtr<nsIDOMEventTarget> mTarget;
+  PRInt32 mIdentifier;
+  PRInt32 mPageX;
+  PRInt32 mPageY;
+  PRInt32 mScreenX;
+  PRInt32 mScreenY;
+  PRInt32 mClientX;
+  PRInt32 mClientY;
+  PRInt32 mRadiusX;
+  PRInt32 mRadiusY;
+  float mRotationAngle;
+  float mForce;
+};
+
+class nsDOMTouchList : public nsIDOMTouchList
+{
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMTouchList)
+  NS_DECL_NSIDOMTOUCHLIST
+  
+  void Append(nsIDOMTouchPoint* aPoint)
+  {
+    mPoints.AppendObject(aPoint);
+  }
+
+  nsIDOMTouchPoint* GetItemAt(PRUint32 aIndex)
+  {
+    return mPoints.SafeObjectAt(aIndex);
+  }
+protected:
+  nsCOMArray<nsIDOMTouchPoint> mPoints;
+};
+
+class nsDOMTouchEvent : public nsDOMUIEvent,
+                        public nsIDOMTouchEvent
+{
+public:
+  nsDOMTouchEvent(nsPresContext* aPresContext, nsInputEvent* aEvent);
+  virtual ~nsDOMTouchEvent();
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMTouchEvent, nsDOMUIEvent)
+  NS_DECL_NSIDOMTOUCHEVENT
+
+  NS_FORWARD_TO_NSDOMUIEVENT
+
+  static PRBool PrefEnabled();
+protected:
+  nsCOMPtr<nsIDOMTouchList> mTouches;
+  nsCOMPtr<nsIDOMTouchList> mTargetTouches;
+  nsCOMPtr<nsIDOMTouchList> mChangedTouches;
+};
+
+#endif /* !defined(nsDOMTouchEvent_h_) */
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index cb18cf87ca66..56ecdf7bfcdf 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -52,6 +52,7 @@
 #include "nsDOMPopStateEvent.h"
 #include "nsDOMHashChangeEvent.h"
 #include "nsFrameLoader.h"
+#include "nsDOMTouchEvent.h"
 
 #define NS_TARGET_CHAIN_FORCE_CONTENT_DISPATCH  (1 << 0)
 #define NS_TARGET_CHAIN_WANTS_WILL_HANDLE_EVENT (1 << 1)
@@ -872,6 +873,9 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
     return NS_NewDOMAudioAvailableEvent(aDOMEvent, aPresContext, nsnull);
   if (aEventType.LowerCaseEqualsLiteral("closeevent"))
     return NS_NewDOMCloseEvent(aDOMEvent, aPresContext, nsnull);
+  if (aEventType.LowerCaseEqualsLiteral("touchevent") &&
+      nsDOMTouchEvent::PrefEnabled())
+    return NS_NewDOMTouchEvent(aDOMEvent, aPresContext, nsnull);
   if (aEventType.LowerCaseEqualsLiteral("hashchangeevent"))
     return NS_NewDOMHashChangeEvent(aDOMEvent, aPresContext, nsnull);
 
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 51b70d78da15..bce7ecd5078f 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -100,6 +100,7 @@ _TEST_FILES = \
 		test_bug607464.html \
 		test_bug624127.html \
 		test_bug641477.html \
+		test_bug648573.html \
 		$(NULL)
 
 #bug 585630
diff --git a/content/events/test/test_bug648573.html b/content/events/test/test_bug648573.html
new file mode 100644
index 000000000000..deb0ed9a6ff6
--- /dev/null
+++ b/content/events/test/test_bug648573.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=648573
+-->
+<head>
+  <title>Test for Bug 648573</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <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=648573">Mozilla Bug 648573</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 648573 **/
+
+ok("createTouch" in document, "Should have createTouch function");
+ok("createTouchList" in document, "Should have createTouchList function");
+ok(document.createEvent("touchevent"), "Should be able to create TouchEvent objects");
+
+var t1 = document.createTouch(window, document, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+is(t1.target, document, "Wrong target");
+is(t1.identifier, 1, "Wrong identifier");
+is(t1.pageX, 2, "Wrong pageX");
+is(t1.pageY, 3, "Wrong pageY");
+is(t1.screenX, 4, "Wrong screenX");
+is(t1.screenY, 5, "Wrong screenY");
+is(t1.clientX, 6, "Wrong clientX");
+is(t1.clientY, 7, "Wrong clientY");
+is(t1.radiusX, 8, "Wrong radiusX");
+is(t1.radiusY, 9, "Wrong radiusY");
+is(t1.rotationAngle, 10, "Wrong rotationAngle");
+is(t1.force, 11, "Wrong force");
+
+var t2 = document.createTouch();
+
+var l1 = document.createTouchList(t1);
+is(l1.length, 1, "Wrong length");
+is(l1.item(0), t1, "Wront item (1)");
+is(l1[0], t1, "Wront item (2)");
+
+var l2 = document.createTouchList([t1, t2]);
+is(l2.length, 2, "Wrong length");
+is(l2.item(0), t1, "Wront item (3)");
+is(l2.item(1), t2, "Wront item (4)");
+is(l2[0], t1, "Wront item (5)");
+is(l2[1], t2, "Wront item (6)");
+
+var l3 = document.createTouchList();
+
+var e = document.createEvent("touchevent");
+e.initTouchEvent("touchmove", true, true, window, 0, true, true, true, true,
+                 l1, l2, l3);
+is(e.touches, l1, "Wrong list (1)");
+is(e.targetTouches, l2, "Wrong list (2)");
+is(e.changedTouches, l3, "Wrong list (3)");
+ok(e.altKey, "Alt should be true");
+ok(e.metaKey, "Meta should be true");
+ok(e.ctrlKey, "Ctrl should be true");
+ok(e.shiftKey, "Shift should be true");
+
+
+var events =
+  ["touchstart",
+   "touchend",
+   "touchmove",
+   "touchenter",
+   "touchleave",
+   "touchcancel"];
+
+function runEventTest(type) {
+  var e = document.createEvent("touchevent");
+  e.initTouchEvent(type, true, true, window, 0, true, true, true, true,
+                   l1, l2, l3);
+  var t = document.createElement("div");
+  // Testing target.onFoo;
+  var didCall = false;
+  t["on" + type] = function (evt) {                       
+    is(evt, e, "Wrong event");
+    evt.target.didCall = true;
+  }
+  t.dispatchEvent(e);
+  ok(t.didCall, "Should have called the listener(1)");
+  
+  // Testing <element onFoo="">
+  t = document.createElement("div");
+  t.setAttribute("on" + type, "this.didCall = true;");
+  t.dispatchEvent(e);
+  ok(t.didCall, "Should have called the listener(2)");
+}
+
+for (var i = 0; i < events.length; ++i) {
+  runEventTest(events[i]);
+}
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 6cd2e5f57a1c..91d0c76febd3 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -512,6 +512,8 @@
 
 #include "nsIDOMMediaQueryList.h"
 
+#include "nsDOMTouchEvent.h"
+
 using namespace mozilla::dom;
 
 static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -611,6 +613,7 @@ DOMCI_DATA(Notation, void)
     PR_TRUE,                                                                  \
     0,                                                                        \
     PR_FALSE,                                                                 \
+    PR_FALSE,                                                                 \
     NS_DEFINE_CLASSINFO_DATA_DEBUG(_class)                                    \
   },
 
@@ -626,6 +629,7 @@ DOMCI_DATA(Notation, void)
     PR_TRUE,                                                                  \
     0,                                                                        \
     PR_TRUE,                                                                  \
+    PR_FALSE,                                                                 \
     NS_DEFINE_CLASSINFO_DATA_DEBUG(_class)                                    \
   },
 
@@ -1498,6 +1502,13 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(EventException, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
+  NS_DEFINE_CLASSINFO_DATA(TouchPoint, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(TouchList, nsDOMTouchListSH,
+                           ARRAY_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(TouchEvent, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
+
 #ifdef MOZ_CSS_ANIMATIONS
   NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframeRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -1670,6 +1681,13 @@ jsid nsDOMClassInfo::sKeyPath_id         = JSID_VOID;
 jsid nsDOMClassInfo::sAutoIncrement_id   = JSID_VOID;
 jsid nsDOMClassInfo::sUnique_id          = JSID_VOID;
 
+jsid nsDOMClassInfo::sOntouchstart_id    = JSID_VOID;
+jsid nsDOMClassInfo::sOntouchend_id      = JSID_VOID;
+jsid nsDOMClassInfo::sOntouchmove_id     = JSID_VOID;
+jsid nsDOMClassInfo::sOntouchenter_id    = JSID_VOID;
+jsid nsDOMClassInfo::sOntouchleave_id    = JSID_VOID;
+jsid nsDOMClassInfo::sOntouchcancel_id   = JSID_VOID;
+
 static const JSClass *sObjectClass = nsnull;
 
 /**
@@ -2000,6 +2018,13 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
   SET_JSID_TO_STRING(sAutoIncrement_id,   cx, "autoIncrement");
   SET_JSID_TO_STRING(sUnique_id,          cx, "unique");
 
+  SET_JSID_TO_STRING(sOntouchstart_id,    cx, "ontouchstart");
+  SET_JSID_TO_STRING(sOntouchend_id,      cx, "ontouchend");
+  SET_JSID_TO_STRING(sOntouchmove_id,     cx, "ontouchmove");
+  SET_JSID_TO_STRING(sOntouchenter_id,    cx, "ontouchenter");
+  SET_JSID_TO_STRING(sOntouchleave_id,    cx, "ontouchleave");
+  SET_JSID_TO_STRING(sOntouchcancel_id,   cx, "ontouchcancel");
+  
   return NS_OK;
 }
 
@@ -2135,6 +2160,7 @@ nsDOMClassInfo::RegisterClassName(PRInt32 aClassInfoID)
   nameSpaceManager->RegisterClassName(sClassInfoData[aClassInfoID].mName,
                                       aClassInfoID,
                                       sClassInfoData[aClassInfoID].mChromeOnly,
+                                      sClassInfoData[aClassInfoID].mDisabled,
                                       &sClassInfoData[aClassInfoID].mNameUTF16);
 
   return NS_OK;
@@ -2244,19 +2270,23 @@ nsDOMClassInfo::RegisterExternalClasses()
   return nameSpaceManager->RegisterExternalInterfaces(PR_TRUE);
 }
 
-#define _DOM_CLASSINFO_MAP_BEGIN(_class, _ifptr, _has_class_if)               \
+#define _DOM_CLASSINFO_MAP_BEGIN(_class, _ifptr, _has_class_if, _disabled)    \
   {                                                                           \
     nsDOMClassInfoData &d = sClassInfoData[eDOMClassInfo_##_class##_id];      \
     d.mProtoChainInterface = _ifptr;                                          \
     d.mHasClassInterface = _has_class_if;                                     \
     d.mInterfacesBitmap = kDOMClassInfo_##_class##_interfaces;                \
+    d.mDisabled = _disabled;                                                  \
     static const nsIID *interface_list[] = {
 
 #define DOM_CLASSINFO_MAP_BEGIN(_class, _interface)                           \
-  _DOM_CLASSINFO_MAP_BEGIN(_class, &NS_GET_IID(_interface), PR_TRUE)
+  _DOM_CLASSINFO_MAP_BEGIN(_class, &NS_GET_IID(_interface), PR_TRUE, PR_FALSE)
 
+#define DOM_CLASSINFO_MAP_BEGIN_MAYBE_DISABLE(_class, _interface, _disable)   \
+  _DOM_CLASSINFO_MAP_BEGIN(_class, &NS_GET_IID(_interface), PR_TRUE, _disable)
+  
 #define DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(_class, _interface)               \
-  _DOM_CLASSINFO_MAP_BEGIN(_class, &NS_GET_IID(_interface), PR_FALSE)
+  _DOM_CLASSINFO_MAP_BEGIN(_class, &NS_GET_IID(_interface), PR_FALSE, PR_FALSE)
 
 #define DOM_CLASSINFO_MAP_ENTRY(_if)                                          \
       &NS_GET_IID(_if),
@@ -2429,11 +2459,20 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDOMConstructor)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(XMLDocument, nsIDOMXMLDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMXMLDocument)
-    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
+  if (nsDOMTouchEvent::PrefEnabled()) {
+    DOM_CLASSINFO_MAP_BEGIN(XMLDocument, nsIDOMXMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMXMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTouch)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  } else {
+    DOM_CLASSINFO_MAP_BEGIN(XMLDocument, nsIDOMXMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMXMLDocument)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  }
 
   DOM_CLASSINFO_MAP_BEGIN(DocumentType, nsIDOMDocumentType)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentType)
@@ -2593,11 +2632,20 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
-    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
+  if (nsDOMTouchEvent::PrefEnabled()) {
+    DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTouch)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  } else {
+    DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  }
 
   DOM_CLASSINFO_MAP_BEGIN(HTMLOptionsCollection, nsIDOMHTMLOptionsCollection)
     // Order is significant.  nsIDOMHTMLOptionsCollection.length shadows
@@ -3006,11 +3054,20 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_END
 
 #ifdef MOZ_XUL
-  DOM_CLASSINFO_MAP_BEGIN(XULDocument, nsIDOMXULDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULDocument)
-    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
+  if (nsDOMTouchEvent::PrefEnabled()) {
+    DOM_CLASSINFO_MAP_BEGIN(XULDocument, nsIDOMXULDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTouch)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  } else {
+    DOM_CLASSINFO_MAP_BEGIN(XULDocument, nsIDOMXULDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULDocument)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END  
+  }
 
   DOM_CLASSINFO_MAP_BEGIN(XULElement, nsIDOMXULElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULElement)
@@ -3151,13 +3208,24 @@ nsDOMClassInfo::Init()
 
   // The SVG document
 
-  DOM_CLASSINFO_MAP_BEGIN(SVGDocument, nsIDOMSVGDocument)
-    // Order is significant.  nsIDOMDocument.title shadows
-    // nsIDOMSVGDocument.title, which is readonly.
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGDocument)
-    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
+  if (nsDOMTouchEvent::PrefEnabled()) {
+    DOM_CLASSINFO_MAP_BEGIN(SVGDocument, nsIDOMSVGDocument)
+      // Order is significant.  nsIDOMDocument.title shadows
+      // nsIDOMSVGDocument.title, which is readonly.
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTouch)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  } else {
+    DOM_CLASSINFO_MAP_BEGIN(SVGDocument, nsIDOMSVGDocument)
+      // Order is significant.  nsIDOMDocument.title shadows
+      // nsIDOMSVGDocument.title, which is readonly.
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocument)
+      DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGDocument)
+      DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_MAP_END
+  }
 
   // SVG element classes
 
@@ -4253,6 +4321,22 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIException)
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN_MAYBE_DISABLE(TouchPoint, nsIDOMTouchPoint,
+                                        !nsDOMTouchEvent::PrefEnabled())
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMTouchPoint)
+  DOM_CLASSINFO_MAP_END
+
+  DOM_CLASSINFO_MAP_BEGIN_MAYBE_DISABLE(TouchList, nsIDOMTouchList,
+                                        !nsDOMTouchEvent::PrefEnabled())
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMTouchList)
+  DOM_CLASSINFO_MAP_END
+  
+  DOM_CLASSINFO_MAP_BEGIN_MAYBE_DISABLE(TouchEvent, nsIDOMTouchEvent,
+                                        !nsDOMTouchEvent::PrefEnabled())
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMTouchEvent)
+    DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
 #ifdef MOZ_CSS_ANIMATIONS
   DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframeRule, nsIDOMMozCSSKeyframeRule)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframeRule)
@@ -5062,6 +5146,13 @@ nsDOMClassInfo::ShutDown()
   sAutoIncrement_id   = JSID_VOID;
   sUnique_id          = JSID_VOID;
 
+  sOntouchstart_id    = JSID_VOID;
+  sOntouchend_id      = JSID_VOID;
+  sOntouchmove_id     = JSID_VOID;
+  sOntouchenter_id    = JSID_VOID;
+  sOntouchleave_id    = JSID_VOID;
+  sOntouchcancel_id   = JSID_VOID;
+
   NS_IF_RELEASE(sXPConnect);
   NS_IF_RELEASE(sSecMan);
   sIsInitialized = PR_FALSE;
@@ -7602,13 +7693,21 @@ nsEventReceiverSH::ReallyIsEventName(jsid id, jschar aFirstChar)
   case 's' :
     return (id == sOnscroll_id       ||
             id == sOnselect_id       ||
-            id == sOnsubmit_id       ||
+            id == sOnsubmit_id       || 
             id == sOnseeked_id       ||
             id == sOnseeking_id      ||
             id == sOnstalled_id      ||
             id == sOnsuspend_id);
   case 't':
-    return id == sOntimeupdate_id;
+    return id == sOntimeupdate_id ||
+      (nsDOMTouchEvent::PrefEnabled() &&
+       (id == sOntouchstart_id ||
+        id == sOntouchend_id ||
+        id == sOntouchmove_id ||
+        id == sOntouchenter_id ||
+        id == sOntouchleave_id ||
+        id == sOntouchcancel_id));
+    
   case 'u' :
     return id == sOnunload_id;
   case 'v':
@@ -10289,6 +10388,14 @@ nsPaintRequestListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
   return list->GetItemAt(aIndex);
 }
 
+nsISupports*
+nsDOMTouchListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
+                            nsWrapperCache **aCache, nsresult *aResult)
+{
+  nsDOMTouchList* list = static_cast<nsDOMTouchList*>(aNative);
+  return list->GetItemAt(aIndex);
+}
+
 #ifdef MOZ_XUL
 // TreeColumns helper
 
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 731b12c1fa83..d1acc46fc6cb 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -98,7 +98,8 @@ struct nsDOMClassInfoData
   PRUint32 mScriptableFlags : 31; // flags must not use more than 31 bits!
   PRUint32 mHasClassInterface : 1;
   PRUint32 mInterfacesBitmap;
-  PRBool mChromeOnly;
+  PRPackedBool mChromeOnly;
+  PRPackedBool mDisabled;
 #ifdef NS_DEBUG
   PRUint32 mDebugID;
 #endif
@@ -359,6 +360,13 @@ public:
   static jsid sKeyPath_id;
   static jsid sAutoIncrement_id;
   static jsid sUnique_id;
+  
+  static jsid sOntouchstart_id;
+  static jsid sOntouchend_id;
+  static jsid sOntouchmove_id;
+  static jsid sOntouchenter_id;
+  static jsid sOntouchleave_id;
+  static jsid sOntouchcancel_id;
 
 protected:
   static JSPropertyOp sXPCNativeWrapperGetPropertyOp;
@@ -1504,6 +1512,26 @@ public:
   }
 };
 
+class nsDOMTouchListSH : public nsArraySH
+{
+protected:
+  nsDOMTouchListSH(nsDOMClassInfoData* aData) : nsArraySH(aData)
+  {
+  }
+
+  virtual ~nsDOMTouchListSH()
+  {
+  }
+
+  virtual nsISupports* GetItemAt(nsISupports *aNative, PRUint32 aIndex,
+                                 nsWrapperCache **aCache, nsresult *aResult);
+
+public:
+  static nsIClassInfo* doCreate(nsDOMClassInfoData* aData)
+  {
+    return new nsDOMTouchListSH(aData);
+  }
+};
 
 #ifdef MOZ_XUL
 // TreeColumns helper
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 79da288db987..628f177bdfdc 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -513,6 +513,10 @@ DOMCI_CLASS(IDBDatabaseException)
 
 DOMCI_CLASS(EventException)
 
+DOMCI_CLASS(TouchPoint)
+DOMCI_CLASS(TouchList)
+DOMCI_CLASS(TouchEvent)
+
 #ifdef MOZ_CSS_ANIMATIONS
 DOMCI_CLASS(MozCSSKeyframeRule)
 DOMCI_CLASS(MozCSSKeyframesRule)
diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp
index d1a75ff02676..5e6a952701eb 100644
--- a/dom/base/nsScriptNameSpaceManager.cpp
+++ b/dom/base/nsScriptNameSpaceManager.cpp
@@ -493,7 +493,8 @@ nsScriptNameSpaceManager::LookupName(const nsAString& aName,
                (PL_DHashTableOperate(&mGlobalNames, &aName,
                                         PL_DHASH_LOOKUP));
 
-  if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
+  if (PL_DHASH_ENTRY_IS_BUSY(entry) &&
+      !((&entry->mGlobalName)->mDisabled)) {
     *aNameStruct = &entry->mGlobalName;
     if (aClassName) {
       *aClassName = entry->mKey.get();
@@ -512,6 +513,7 @@ nsresult
 nsScriptNameSpaceManager::RegisterClassName(const char *aClassName,
                                             PRInt32 aDOMClassInfoID,
                                             PRBool aPrivileged,
+                                            PRBool aDisabled,
                                             const PRUnichar **aResult)
 {
   if (!nsCRT::IsAscii(aClassName)) {
@@ -539,6 +541,7 @@ nsScriptNameSpaceManager::RegisterClassName(const char *aClassName,
   s->mType = nsGlobalNameStruct::eTypeClassConstructor;
   s->mDOMClassInfoID = aDOMClassInfoID;
   s->mChromeOnly = aPrivileged;
+  s->mDisabled = aDisabled;
 
   return NS_OK;
 }
diff --git a/dom/base/nsScriptNameSpaceManager.h b/dom/base/nsScriptNameSpaceManager.h
index 89c1ef690f49..755c7aab5ac9 100644
--- a/dom/base/nsScriptNameSpaceManager.h
+++ b/dom/base/nsScriptNameSpaceManager.h
@@ -86,6 +86,7 @@ struct nsGlobalNameStruct
   } mType;
 
   PRBool mChromeOnly;
+  PRBool mDisabled;
 
   union {
     PRInt32 mDOMClassInfoID; // eTypeClassConstructor
@@ -131,6 +132,7 @@ public:
   nsresult RegisterClassName(const char *aClassName,
                              PRInt32 aDOMClassInfoID,
                              PRBool aPrivileged,
+                             PRBool aDisabled,
                              const PRUnichar **aResult);
 
   nsresult RegisterClassProto(const char *aClassName,
diff --git a/dom/interfaces/events/Makefile.in b/dom/interfaces/events/Makefile.in
index 24b38cc66e35..9b6fb45e8b59 100644
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@@ -88,6 +88,7 @@ XPIDLSRCS =					\
 	nsIDOMPopStateEvent.idl			\
 	nsIDOMCloseEvent.idl			\
 	nsIDOMEventException.idl		\
+	nsIDOMTouchEvent.idl			\
 	nsIDOMHashChangeEvent.idl		\
 	$(NULL)
 
diff --git a/dom/interfaces/events/nsIDOMTouchEvent.idl b/dom/interfaces/events/nsIDOMTouchEvent.idl
new file mode 100644
index 000000000000..f9f9c62b22cd
--- /dev/null
+++ b/dom/interfaces/events/nsIDOMTouchEvent.idl
@@ -0,0 +1,109 @@
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is nsIDOMTouchEvent.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIDOMUIEvent.idl"
+interface nsIVariant;
+
+/**
+ * @see http://dvcs.w3.org/hg/webevents/raw-file/tip/touchevents.html
+ */
+
+[scriptable, uuid(f9f200ad-228f-4879-bc9e-a13bd6bb82ef)]
+interface nsIDOMTouchPoint : nsISupports {
+  readonly attribute long              identifier;
+  readonly attribute nsIDOMEventTarget target;
+  readonly attribute long              pageX;
+  readonly attribute long              pageY;
+  readonly attribute long              screenX;
+  readonly attribute long              screenY;
+  readonly attribute long              clientX;
+  readonly attribute long              clientY;
+  readonly attribute long              radiusX;
+  readonly attribute long              radiusY;
+  readonly attribute float             rotationAngle;
+  readonly attribute float             force;
+};
+
+[scriptable, uuid(60706eb7-d50d-4379-b01c-e78e6af84213)]
+interface nsIDOMTouchList : nsISupports {
+  readonly attribute unsigned long length;
+  nsIDOMTouchPoint item(in unsigned long index);
+  nsIDOMTouchPoint identifiedPoint(in long identifier);
+};
+
+[scriptable, uuid(df94b20b-7998-4f00-935c-ee2c6b179711)]
+interface nsIDOMTouchEvent : nsIDOMUIEvent {
+  readonly attribute nsIDOMTouchList touches;
+  readonly attribute nsIDOMTouchList targetTouches;
+  readonly attribute nsIDOMTouchList changedTouches;
+  readonly attribute boolean         altKey;
+  readonly attribute boolean         metaKey;
+  readonly attribute boolean         ctrlKey;
+  readonly attribute boolean         shiftKey;
+  void initTouchEvent(in DOMString type,
+                      in boolean canBubble,
+                      in boolean cancelable,
+                      in nsIDOMAbstractView view,
+                      in long detail,
+                      in boolean ctrlKey,
+                      in boolean altKey,
+                      in boolean shiftKey,
+                      in boolean metaKey,
+                      in nsIDOMTouchList touches,
+                      in nsIDOMTouchList targetTouches,
+                      in nsIDOMTouchList changedTouches);
+};
+
+[scriptable, uuid(922e0f11-28b9-4560-9fb8-869fe143845f)]
+interface nsIDOMDocumentTouch : nsISupports {
+  nsIDOMTouchPoint createTouch([optional] in nsIDOMAbstractView view,
+                               [optional] in nsIDOMEventTarget target,
+                               [optional] in long identifier,
+                               [optional] in long pageX,
+                               [optional] in long pageY,
+                               [optional] in long screenX,
+                               [optional] in long screenY,
+                               [optional] in long clientX,
+                               [optional] in long clientY,
+                               [optional] in long radiusX,
+                               [optional] in long radiusY,
+                               [optional] in float rotationAngle,
+                               [optional] in float force);
+  
+
+  nsIDOMTouchList createTouchList([optional] in nsIVariant aPoints);
+};
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 469d1b4625bc..57f9e1e8cbbf 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -204,6 +204,10 @@ members = [
     'nsIDOMNSUIEvent.pageY',
     'nsIDOMNSUIEvent.isChar',
 
+    'nsIDOMTouchPoint.*',
+    'nsIDOMTouchList.*',
+    'nsIDOMTouchEvent.*',
+
     # dom/interfaces/geolocation - None.
 
     # dom/interfaces/html
@@ -503,6 +507,9 @@ irregularFilenames = {
     'nsIWebGLUniformLocation': 'nsIDOMWebGLRenderingContext',
 
     'nsIIndexedDatabaseUsageCallback': 'nsIIndexedDatabaseManager',
+
+    'nsIDOMTouchPoint': 'nsIDOMTouchEvent',
+    'nsIDOMTouchList': 'nsIDOMTouchEvent',
     }
 
 customIncludes = [

From 1818627b6e81a038cfddedd4e4dd22694193c1d6 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 26 Apr 2011 15:31:21 +0300
Subject: [PATCH 495/509] Bug 651984 - Add ability to detect if a page has
 registered touch event listeners, r=jst

---
 content/base/src/nsNodeUtils.cpp                |  3 +++
 content/events/public/nsIEventListenerManager.h | 14 ++++++++++----
 content/events/src/nsEventListenerManager.cpp   |  9 ++++++++-
 content/events/test/test_bug648573.html         |  6 ++++++
 dom/base/nsDOMWindowUtils.cpp                   | 13 +++++++++++++
 dom/base/nsPIDOMWindow.h                        |  9 +++++++--
 dom/interfaces/base/nsIDOMWindowUtils.idl       |  7 ++++++-
 7 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp
index fc9762a1b9ab..45a558522237 100644
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -558,6 +558,9 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep,
             window->SetHasAudioAvailableEventListeners();
           }
 #endif
+          if (elm->MayHaveTouchEventListener()) {
+            window->SetHasTouchEventListeners();
+          }
         }
       }
     }
diff --git a/content/events/public/nsIEventListenerManager.h b/content/events/public/nsIEventListenerManager.h
index 7d12e86b423f..fbf367b44a4a 100644
--- a/content/events/public/nsIEventListenerManager.h
+++ b/content/events/public/nsIEventListenerManager.h
@@ -56,8 +56,8 @@ class nsCxPusher;
  * Event listener manager interface.
  */
 #define NS_IEVENTLISTENERMANAGER_IID \
-{ 0xe86a148b, 0x0563, 0x454f, \
-  { 0x8c, 0xf2, 0xbd, 0xc4, 0x7c, 0xe6, 0xbe, 0x91 } }
+{ 0x8e8667ed, 0x10d3, 0x41e8, \
+  { 0x93, 0xfa, 0xa4, 0xc4, 0xea, 0x16, 0x85, 0xd5 } }
 
 class nsIEventListenerManager : public nsISupports {
 
@@ -69,6 +69,7 @@ public:
     mMayHaveCapturingListeners(PR_FALSE),
     mMayHaveSystemGroupListeners(PR_FALSE),
     mMayHaveAudioAvailableEventListener(PR_FALSE),
+    mMayHaveTouchEventListener(PR_FALSE),
     mNoListenerForEvent(0)
   {}
 
@@ -212,14 +213,19 @@ public:
    */
   PRBool MayHaveAudioAvailableEventListener() { return mMayHaveAudioAvailableEventListener; }
 
-
+  /**
+   * Returns PR_TRUE if there may be a touch event listener registered,
+   * PR_FALSE if there definitely isn't.
+   */
+  PRBool MayHaveTouchEventListener() { return mMayHaveTouchEventListener; }
 protected:
   PRUint32 mMayHavePaintEventListener : 1;
   PRUint32 mMayHaveMutationListeners : 1;
   PRUint32 mMayHaveCapturingListeners : 1;
   PRUint32 mMayHaveSystemGroupListeners : 1;
   PRUint32 mMayHaveAudioAvailableEventListener : 1;
-  PRUint32 mNoListenerForEvent : 27;
+  PRUint32 mMayHaveTouchEventListener : 1;
+  PRUint32 mNoListenerForEvent : 26;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventListenerManager,
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 0f78a1346d9a..45459b23584c 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -507,7 +507,14 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
     nsPIDOMWindow* window = GetInnerWindowForTarget();
     if (window)
       window->SetHasOrientationEventListener();
-  } else if (aType >= NS_MOZTOUCH_DOWN && aType <= NS_MOZTOUCH_UP) {
+  } else if ((aType >= NS_MOZTOUCH_DOWN && aType <= NS_MOZTOUCH_UP) ||
+             (aTypeAtom == nsGkAtoms::ontouchstart ||
+              aTypeAtom == nsGkAtoms::ontouchend ||
+              aTypeAtom == nsGkAtoms::ontouchmove ||
+              aTypeAtom == nsGkAtoms::ontouchenter ||
+              aTypeAtom == nsGkAtoms::ontouchleave ||
+              aTypeAtom == nsGkAtoms::ontouchcancel)) {
+    mMayHaveTouchEventListener = PR_TRUE;
     nsPIDOMWindow* window = GetInnerWindowForTarget();
     if (window)
       window->SetHasTouchEventListeners();
diff --git a/content/events/test/test_bug648573.html b/content/events/test/test_bug648573.html
index deb0ed9a6ff6..8e4053270fb1 100644
--- a/content/events/test/test_bug648573.html
+++ b/content/events/test/test_bug648573.html
@@ -20,6 +20,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648573
 
 /** Test for Bug 648573 **/
 
+ok(!SpecialPowers.DOMWindowUtils.mayHaveTouchEventListeners,
+  "There shouldn't be any touch event listeners yet.");
+
 ok("createTouch" in document, "Should have createTouch function");
 ok("createTouchList" in document, "Should have createTouchList function");
 ok(document.createEvent("touchevent"), "Should be able to create TouchEvent objects");
@@ -98,6 +101,9 @@ function runEventTest(type) {
 for (var i = 0; i < events.length; ++i) {
   runEventTest(events[i]);
 }
+
+ok(SpecialPowers.DOMWindowUtils.mayHaveTouchEventListeners,
+  "There should be touch event listeners.");
 </script>
 </pre>
 </body>
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index b36379adc171..ec8cfc7e240f 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1861,3 +1861,16 @@ nsDOMWindowUtils::LeafLayersPartitionWindow(PRBool* aResult)
 #endif
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsDOMWindowUtils::GetMayHaveTouchEventListeners(PRBool* aResult)
+{
+  if (!IsUniversalXPConnectCapable()) {
+    return NS_ERROR_DOM_SECURITY_ERR;
+  }
+
+  nsPIDOMWindow* innerWindow = mWindow->GetCurrentInnerWindow();
+  *aResult = innerWindow ? innerWindow->HasTouchEventListeners() : PR_FALSE;
+  return NS_OK;
+}
+
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index 9289e03908ce..5a9464436f8b 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -78,8 +78,8 @@ class nsIArray;
 class nsPIWindowRoot;
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x8d8be7db, 0xffaa, 0x4962, \
-  { 0xa7, 0x27, 0xb7, 0x0f, 0xc9, 0xfa, 0xd3, 0x0e } }
+{ 0xafc4849b, 0x21d3, 0x45ea, \
+  { 0x8b, 0xfd, 0x61, 0xec, 0x12, 0x5d, 0x38, 0x64 } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -442,6 +442,11 @@ public:
     MaybeUpdateTouchState();
   }
 
+  PRBool HasTouchEventListeners()
+  {
+    return mMayHaveTouchEventListener;
+  }
+
   /**
    * Call this to check whether some node (this window, its document,
    * or content in that document) has a MozAudioAvailable event listener.
diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
index 70fdbbead031..5ce06a617a0c 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -66,7 +66,7 @@ interface nsITransferable;
 interface nsIQueryContentEventResult;
 interface nsIDOMWindow;
 
-[scriptable, uuid(3828e648-af61-47e1-b9bc-89ca51bc19f2)]
+[scriptable, uuid(663e33d7-eca2-42e8-af92-5df6a5e222df)]
 interface nsIDOMWindowUtils : nsISupports {
 
   /**
@@ -881,4 +881,9 @@ interface nsIDOMWindowUtils : nsISupports {
    * the bounds of the window. Always returns true in non-DEBUG builds.
    */
   boolean leafLayersPartitionWindow();
+
+  /**
+   * true if the (current inner) window may have event listeners for touch events.
+   */
+  readonly attribute boolean mayHaveTouchEventListeners;
 };

From 768c786f0eb97561b77c17c96d7f5686a836bf2a Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Tue, 26 Apr 2011 16:23:01 +0200
Subject: [PATCH 496/509] Fix style nit request in Bug 651973 r=jorendorff via
 irc

---
 js/src/jsregexpinlines.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/jsregexpinlines.h b/js/src/jsregexpinlines.h
index 74bce9edb157..70db45413e1d 100644
--- a/js/src/jsregexpinlines.h
+++ b/js/src/jsregexpinlines.h
@@ -453,8 +453,7 @@ RegExp::createObjectNoStatics(JSContext *cx, const jschar *chars, size_t length,
     if (!re)
         return NULL;
     JSObject *obj = NewBuiltinClassInstance(cx, &js_RegExpClass);
-    if (!obj ||
-        !obj->initRegExp(cx, re.get())) {
+    if (!obj || !obj->initRegExp(cx, re.get())) {
         re->decref(cx);
         return NULL;
     }

From cdc68fa8055e9305bf23724bfe5885facd9a1f5e Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 26 Apr 2011 16:29:36 +0100
Subject: [PATCH 497/509] bug 643460 pt 1 - import OTS r.62 from
 http://code.google.com/p/ots/. r=jfkthame

---
 gfx/ots/include/opentype-sanitiser.h |   30 +-
 gfx/ots/include/ots-memory-stream.h  |    6 +-
 gfx/ots/src/cff.cc                   |    8 +-
 gfx/ots/src/cff_type2_charstring.h   |    2 +-
 gfx/ots/src/cmap.cc                  |  307 ++++--
 gfx/ots/src/cmap.h                   |   38 +-
 gfx/ots/src/gasp.cc                  |    3 +-
 gfx/ots/src/gdef.cc                  |  362 ++++++-
 gfx/ots/src/gdef.h                   |   23 +-
 gfx/ots/src/glyf.cc                  |    3 +-
 gfx/ots/src/gpos.cc                  |  779 +++++++++++++-
 gfx/ots/src/gpos.h                   |   16 +-
 gfx/ots/src/gsub.cc                  |  660 +++++++++++-
 gfx/ots/src/gsub.h                   |   14 +-
 gfx/ots/src/head.cc                  |    2 +-
 gfx/ots/src/hhea.cc                  |  117 +-
 gfx/ots/src/hhea.h                   |   14 +-
 gfx/ots/src/hmtx.cc                  |  107 +-
 gfx/ots/src/hmtx.h                   |    7 +-
 gfx/ots/src/kern.cc                  |    2 +-
 gfx/ots/src/layout.cc                | 1477 ++++++++++++++++++++++++++
 gfx/ots/src/layout.h                 |   68 ++
 gfx/ots/src/loca.cc                  |    2 +-
 gfx/ots/src/ltsh.cc                  |    2 +-
 gfx/ots/src/maxp.cc                  |    2 +-
 gfx/ots/src/metrics.cc               |  181 ++++
 gfx/ots/src/metrics.h                |   50 +
 gfx/ots/src/os2.cc                   |    4 +-
 gfx/ots/src/ots.cc                   |   36 +-
 gfx/ots/src/ots.h                    |   35 +-
 gfx/ots/src/post.cc                  |    2 +-
 gfx/ots/src/vdmx.cc                  |    2 +-
 gfx/ots/src/vhea.cc                  |   56 +
 gfx/ots/src/vhea.h                   |   20 +
 gfx/ots/src/vmtx.cc                  |   52 +
 gfx/ots/src/vmtx.h                   |   20 +
 gfx/ots/src/vorg.cc                  |    2 +-
 37 files changed, 4075 insertions(+), 436 deletions(-)
 create mode 100644 gfx/ots/src/layout.cc
 create mode 100644 gfx/ots/src/layout.h
 create mode 100644 gfx/ots/src/metrics.cc
 create mode 100644 gfx/ots/src/metrics.h
 create mode 100644 gfx/ots/src/vhea.cc
 create mode 100644 gfx/ots/src/vhea.h
 create mode 100644 gfx/ots/src/vmtx.cc
 create mode 100644 gfx/ots/src/vmtx.h

diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-sanitiser.h
index f91369222bee..63bf65f70469 100644
--- a/gfx/ots/include/opentype-sanitiser.h
+++ b/gfx/ots/include/opentype-sanitiser.h
@@ -5,7 +5,7 @@
 #ifndef OPENTYPE_SANITISER_H_
 #define OPENTYPE_SANITISER_H_
 
-#if defined(_MSC_VER)
+#if defined(_WIN32)
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef short int16_t;
@@ -14,16 +14,10 @@ typedef int int32_t;
 typedef unsigned int uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-#ifdef _WIN32
 #include <winsock2.h>  // for htons/ntohs
-#undef min
-#undef max
 #else
 #include <arpa/inet.h>
+#include <stdint.h>
 #endif
 
 #include <algorithm>  // for std::min
@@ -68,10 +62,8 @@ class OTSStream {
     }
 
     while (length >= 4) {
-      uint32_t tmp;
-      std::memcpy(&tmp, reinterpret_cast<const uint8_t *>(data) + offset,
-        sizeof(uint32_t));
-      chksum_ += ntohl(tmp);
+      chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(
+          reinterpret_cast<const uint8_t*>(data) + offset));
       length -= 4;
       offset += 4;
     }
@@ -104,6 +96,10 @@ class OTSStream {
     return true;
   }
 
+  bool WriteU8(uint8_t v) {
+    return Write(&v, sizeof(v));
+  }
+
   bool WriteU16(uint16_t v) {
     v = htons(v);
     return Write(&v, sizeof(v));
@@ -114,6 +110,11 @@ class OTSStream {
     return Write(&v, sizeof(v));
   }
 
+  bool WriteU24(uint32_t v) {
+    v = htonl(v);
+    return Write(reinterpret_cast<uint8_t*>(&v)+1, 3);
+  }
+
   bool WriteU32(uint32_t v) {
     v = htonl(v);
     return Write(&v, sizeof(v));
@@ -177,11 +178,8 @@ class OTSStream {
 //     partial output may have been written.
 //   input: the OpenType file
 //   length: the size, in bytes, of |input|
-//   preserve_otl_tables: whether to preserve OpenType Layout tables
-//                        (GDEF/GPOS/GSUB) without verification
 // -----------------------------------------------------------------------------
-bool Process(OTSStream *output, const uint8_t *input, size_t length,
-             bool preserve_otl_tables = false);
+bool Process(OTSStream *output, const uint8_t *input, size_t length);
 
 // Force to disable debug output even when the library is compiled with
 // -DOTS_DEBUG.
diff --git a/gfx/ots/include/ots-memory-stream.h b/gfx/ots/include/ots-memory-stream.h
index 1589791a5747..999b21f25b1f 100644
--- a/gfx/ots/include/ots-memory-stream.h
+++ b/gfx/ots/include/ots-memory-stream.h
@@ -18,7 +18,7 @@ class MemoryStream : public OTSStream {
       : ptr_(ptr), length_(length), off_(0) {
   }
 
-  bool WriteRaw(const void *data, size_t length) {
+  virtual bool WriteRaw(const void *data, size_t length) {
     if ((off_ + length > length_) ||
         (length > std::numeric_limits<size_t>::max() - off_)) {
       return false;
@@ -28,14 +28,14 @@ class MemoryStream : public OTSStream {
     return true;
   }
 
-  bool Seek(off_t position) {
+  virtual bool Seek(off_t position) {
     if (position < 0) return false;
     if (static_cast<size_t>(position) > length_) return false;
     off_ = position;
     return true;
   }
 
-  off_t Tell() const {
+  virtual off_t Tell() const {
     return off_;
   }
 
diff --git a/gfx/ots/src/cff.cc b/gfx/ots/src/cff.cc
index 0ad08ff447f1..c3e46a3862bc 100644
--- a/gfx/ots/src/cff.cc
+++ b/gfx/ots/src/cff.cc
@@ -19,12 +19,12 @@ namespace {
 enum DICT_OPERAND_TYPE {
   DICT_OPERAND_INTEGER,
   DICT_OPERAND_REAL,
-  DICT_OPERATOR
+  DICT_OPERATOR,
 };
 
 enum DICT_DATA_TYPE {
   DICT_DATA_TOPLEVEL,
-  DICT_DATA_FDARRAY
+  DICT_DATA_FDARRAY,
 };
 
 // see Appendix. A
@@ -104,6 +104,8 @@ bool ParseIndex(ots::Buffer *table, ots::CFFIndex *index) {
   }
 
   for (unsigned i = 1; i < index->offsets.size(); ++i) {
+    // We allow consecutive identical offsets here for zero-length strings.
+    // See http://crbug.com/69341 for more details.
     if (index->offsets[i] < index->offsets[i - 1]) {
       return OTS_FAILURE();
     }
@@ -975,7 +977,7 @@ bool ots_cff_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_cff_should_serialise(OpenTypeFile *file) {
-  return file->cff;
+  return file->cff != NULL;
 }
 
 bool ots_cff_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/cff_type2_charstring.h b/gfx/ots/src/cff_type2_charstring.h
index 6c29642d2a27..dbaea75b21df 100644
--- a/gfx/ots/src/cff_type2_charstring.h
+++ b/gfx/ots/src/cff_type2_charstring.h
@@ -90,7 +90,7 @@ enum Type2CharStringOperator {
   kHFlex = (12 << 8) + 34,
   kFlex = (12 << 8) + 35,
   kHFlex1 = (12 << 8) + 36,
-  kFlex1 = (12 << 8) + 37
+  kFlex1 = (12 << 8) + 37,
   // Operators that are obsoleted or undocumented, such as 'blend', will be
   // rejected.
 };
diff --git a/gfx/ots/src/cmap.cc b/gfx/ots/src/cmap.cc
index f90a32471cb5..591252a6ce93 100644
--- a/gfx/ots/src/cmap.cc
+++ b/gfx/ots/src/cmap.cc
@@ -32,7 +32,7 @@ struct Subtable314Range {
   uint32_t id_range_offset_offset;
 };
 
-// The maximum number of groups in format 12 or 13 subtables.
+// The maximum number of groups in format 12, 13 or 14 subtables.
 // Note: 0xFFFF is the maximum number of glyphs in a single font file.
 const unsigned kMaxCMAPGroups = 0xFFFF;
 
@@ -42,12 +42,26 @@ const size_t kFormat0ArraySize = 256;
 // The upper limit of the Unicode code point.
 const uint32_t kUnicodeUpperLimit = 0x10FFFF;
 
-// Parses either 3.0.4 or 3.1.4 tables.
-bool Parse3x4(ots::OpenTypeFile *file, int encoding,
+// The maximum number of UVS records (See below).
+const uint32_t kMaxCMAPSelectorRecords = 259;
+// The range of UVSes are:
+//   0x180B-0x180D (3 code points)
+//   0xFE00-0xFE0F (16 code points)
+//   0xE0100-0xE01EF (240 code points)
+const uint32_t kMongolianVSStart = 0x180B;
+const uint32_t kMongolianVSEnd = 0x180D;
+const uint32_t kVSStart = 0xFE00;
+const uint32_t kVSEnd = 0xFE0F;
+const uint32_t kIVSStart = 0xE0100;
+const uint32_t kIVSEnd = 0xE01EF;
+const uint32_t kUVSUpperLimit = 0xFFFFFF;
+
+// Parses Format 4 tables
+bool ParseFormat4(ots::OpenTypeFile *file, int platform, int encoding,
               const uint8_t *data, size_t length, uint16_t num_glyphs) {
   ots::Buffer subtable(data, length);
 
-  // 3.0.4 or 3.1.4 subtables are complex and, rather than expanding the
+  // 0.3.4, 3.0.4 or 3.1.4 subtables are complex and, rather than expanding the
   // whole thing and recompacting it, we validate it and include it verbatim
   // in the output.
 
@@ -229,12 +243,15 @@ bool Parse3x4(ots::OpenTypeFile *file, int encoding,
 
   // We accept the table.
   // TODO(yusukes): transcode the subtable.
-  if (encoding == 0) {
+  if (platform == 3 && encoding == 0) {
     file->cmap->subtable_3_0_4_data = data;
     file->cmap->subtable_3_0_4_length = length;
-  } else if (encoding == 1) {
+  } else if (platform == 3 && encoding == 1) {
     file->cmap->subtable_3_1_4_data = data;
     file->cmap->subtable_3_1_4_length = length;
+  } else if (platform == 0 && encoding == 3) {
+    file->cmap->subtable_0_3_4_data = data;
+    file->cmap->subtable_0_3_4_length = length;
   } else {
     return OTS_FAILURE();
   }
@@ -389,108 +406,137 @@ bool Parse31013(ots::OpenTypeFile *file,
   return true;
 }
 
-// Parses 0.5.14 tables.
 bool Parse0514(ots::OpenTypeFile *file,
                const uint8_t *data, size_t length, uint16_t num_glyphs) {
+  // Unicode Variation Selector table
   ots::Buffer subtable(data, length);
 
-  // Format 14 subtables are a bit complex, so rather than rebuilding the
-  // entire thing, we validate it and then include it verbatim in the output.
+  // Format 14 tables are simple. We parse these and fully serialise them
+  // later.
 
-  const off_t offset_var_selector_records = 10;
-  const size_t size_of_var_selector_record = 11;
-  const size_t size_of_def_uvs_table = 4;
-  const size_t size_of_non_def_uvs_table = 5;
-
-  if (!subtable.Skip(6)) { // skip format and length
-    return OTS_FAILURE();
-  }
-  uint32_t num_var_selector_records = 0;
-  if (!subtable.ReadU32(&num_var_selector_records)) {
-    return OTS_FAILURE();
-  }
-  if ((length - offset_var_selector_records) / size_of_var_selector_record <
-      num_var_selector_records) {
+  // Skip format (USHORT) and length (ULONG)
+  if (!subtable.Skip(6)) {
     return OTS_FAILURE();
   }
 
-  uint32_t prev_var_selector = 0;
-  for (uint32_t i = 0; i < num_var_selector_records; i++) {
-    uint32_t var_selector, def_uvs_offset, non_def_uvs_offset;
-    if (!subtable.ReadU24(&var_selector) ||
-        !subtable.ReadU32(&def_uvs_offset) ||
-        !subtable.ReadU32(&non_def_uvs_offset)) {
+  uint32_t num_records = 0;
+  if (!subtable.ReadU32(&num_records)) {
+    return OTS_FAILURE();
+  }
+  if (num_records == 0 || num_records > kMaxCMAPSelectorRecords) {
+    return OTS_FAILURE();
+  }
+
+  std::vector<ots::OpenTypeCMAPSubtableVSRecord>& records
+      = file->cmap->subtable_0_5_14;
+  records.resize(num_records);
+
+  for (unsigned i = 0; i < num_records; ++i) {
+    if (!subtable.ReadU24(&records[i].var_selector) ||
+        !subtable.ReadU32(&records[i].default_offset) ||
+        !subtable.ReadU32(&records[i].non_default_offset)) {
       return OTS_FAILURE();
     }
-    if (var_selector <= prev_var_selector ||
-        var_selector > kUnicodeUpperLimit ||
-        def_uvs_offset > length - 4 ||
-        non_def_uvs_offset > length - 4) {
+    // Checks the value of variation selector
+    if (!((records[i].var_selector >= kMongolianVSStart &&
+           records[i].var_selector <= kMongolianVSEnd) ||
+          (records[i].var_selector >= kVSStart &&
+           records[i].var_selector <= kVSEnd) ||
+          (records[i].var_selector >= kIVSStart &&
+           records[i].var_selector <= kIVSEnd))) {
+      return OTS_FAILURE();
+    }
+    if (i > 0 &&
+        records[i-1].var_selector >= records[i].var_selector) {
       return OTS_FAILURE();
     }
-    prev_var_selector = var_selector;
 
-    if (def_uvs_offset) {
-      uint32_t num_unicode_value_ranges;
-      memcpy(&num_unicode_value_ranges, data + def_uvs_offset, 4);
-      num_unicode_value_ranges = ntohl(num_unicode_value_ranges);
-      if ((length - def_uvs_offset) / size_of_def_uvs_table <
-           num_unicode_value_ranges) {
+    // Checks offsets
+    if (!records[i].default_offset && !records[i].non_default_offset) {
+      return OTS_FAILURE();
+    }
+    if (records[i].default_offset &&
+        records[i].default_offset >= length) {
+      return OTS_FAILURE();
+    }
+    if (records[i].non_default_offset &&
+        records[i].non_default_offset >= length) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < num_records; ++i) {
+    // Checks default UVS table
+    if (records[i].default_offset) {
+      subtable.set_offset(records[i].default_offset);
+      uint32_t num_ranges = 0;
+      if (!subtable.ReadU32(&num_ranges)) {
+        return OTS_FAILURE();
+      }
+      if (!num_ranges || num_ranges > kMaxCMAPGroups) {
         return OTS_FAILURE();
       }
 
-      const uint8_t *tables = data + def_uvs_offset + 4;
-      uint32_t prev_end_unicode = 0;
-      for (uint32_t j = 0; j < num_unicode_value_ranges;
-           j++, tables += size_of_def_uvs_table) {
-        uint32_t start_unicode = 0, end_unicode;
-        memcpy(reinterpret_cast<uint8_t*>(&start_unicode) + 1, tables, 3);
-        start_unicode = ntohl(start_unicode);
-        end_unicode = start_unicode + *(tables + 3);
-        if ((j > 0 && start_unicode <= prev_end_unicode) ||
-            end_unicode > kUnicodeUpperLimit) {
+      uint32_t last_unicode_value = 0;
+      std::vector<ots::OpenTypeCMAPSubtableVSRange>& ranges
+          = records[i].ranges;
+      ranges.resize(num_ranges);
+
+      for (unsigned j = 0; j < num_ranges; ++j) {
+        if (!subtable.ReadU24(&ranges[j].unicode_value) ||
+            !subtable.ReadU8(&ranges[j].additional_count)) {
           return OTS_FAILURE();
         }
-        prev_end_unicode = end_unicode;
+        const uint32_t check_value =
+            ranges[j].unicode_value + ranges[i].additional_count;
+        if (ranges[j].unicode_value == 0 ||
+            ranges[j].unicode_value > kUnicodeUpperLimit ||
+            check_value > kUVSUpperLimit ||
+            (last_unicode_value &&
+             ranges[j].unicode_value <= last_unicode_value)) {
+          return OTS_FAILURE();
+        }
+        last_unicode_value = check_value;
       }
     }
 
-    if (non_def_uvs_offset) {
-      uint32_t num_uvs_mappings;
-      memcpy(&num_uvs_mappings, data + non_def_uvs_offset, 4);
-      num_uvs_mappings = ntohl(num_uvs_mappings);
-      if ((length - non_def_uvs_offset) / size_of_non_def_uvs_table <
-          num_uvs_mappings) {
+    // Checks non default UVS table
+    if (records[i].non_default_offset) {
+      subtable.set_offset(records[i].non_default_offset);
+      uint32_t num_mappings = 0;
+      if (!subtable.ReadU32(&num_mappings)) {
+        return OTS_FAILURE();
+      }
+      if (!num_mappings || num_mappings > kMaxCMAPGroups) {
         return OTS_FAILURE();
       }
 
-      const uint8_t *tables = data + non_def_uvs_offset + 4;
-      uint32_t prev_unicode = 0;
-      for (uint32_t j = 0; j < num_uvs_mappings;
-           j++, tables += size_of_non_def_uvs_table) {
-        uint32_t unicode_value = 0;
-        memcpy(reinterpret_cast<uint8_t*>(&unicode_value) + 1, tables, 3);
-        unicode_value = ntohl(unicode_value);
-        if ((j > 0 && unicode_value <= prev_unicode) ||
-            unicode_value > kUnicodeUpperLimit) {
+      uint32_t last_unicode_value = 0;
+      std::vector<ots::OpenTypeCMAPSubtableVSMapping>& mappings
+          = records[i].mappings;
+      mappings.resize(num_mappings);
+
+      for (unsigned j = 0; j < num_mappings; ++j) {
+        if (!subtable.ReadU24(&mappings[j].unicode_value) ||
+            !subtable.ReadU16(&mappings[j].glyph_id)) {
           return OTS_FAILURE();
         }
-        uint16_t glyph;
-        memcpy(&glyph, tables + 3, 2);
-        glyph = ntohs(glyph);
-        if (glyph >= num_glyphs) {
+        if (mappings[j].glyph_id == 0 ||
+            mappings[j].unicode_value == 0 ||
+            mappings[j].unicode_value > kUnicodeUpperLimit ||
+            (last_unicode_value &&
+             mappings[j].unicode_value <= last_unicode_value)) {
           return OTS_FAILURE();
         }
-        prev_unicode = unicode_value;
+        last_unicode_value = mappings[j].unicode_value;
       }
     }
   }
 
-  // We accept the table.
-  // TODO: transcode the subtable.
-  file->cmap->subtable_0_5_14_data = data;
-  file->cmap->subtable_0_5_14_length = length;
-
+  if (subtable.offset() != length) {
+    return OTS_FAILURE();
+  }
+  file->cmap->subtable_0_5_14_length = subtable.offset();
   return true;
 }
 
@@ -685,8 +731,9 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   // Note:
   //  * 0-0-4 table is (usually) written as a 3-1-4 table. If 3-1-4 table
   //    also exists, the 0-0-4 table is ignored.
-  //  * 0-3-4 table is written as a 3-1-4 table. If 3-1-4 table also exists,
-  //    the 0-3-4 table is ignored.
+  //  * Unlike 0-0-4 table, 0-3-4 table is written as a 0-3-4 table.
+  //    Some fonts which include 0-5-14 table seems to be required 0-3-4
+  //    table. The 0-3-4 table will be wriiten even if 3-1-4 table also exists.
   //  * 0-3-12 table is written as a 3-10-12 table. If 3-10-12 table also
   //    exists, the 0-3-12 table is ignored.
   //
@@ -701,14 +748,14 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
         // table actually points to MS symbol data and thus should be parsed as
         // 3-0-4 table (e.g., marqueem.ttf and quixotic.ttf). This error will be
         // recovered in ots_cmap_serialise().
-        if (!Parse3x4(file, 1, data + subtable_headers[i].offset,
+        if (!ParseFormat4(file, 3, 1, data + subtable_headers[i].offset,
                       subtable_headers[i].length, num_glyphs)) {
           return OTS_FAILURE();
         }
       } else if ((subtable_headers[i].encoding == 3) &&
                  (subtable_headers[i].format == 4)) {
-        // parse and output the 0-3-4 table as 3-1-4 table.
-        if (!Parse3x4(file, 1, data + subtable_headers[i].offset,
+        // parse and output the 0-3-4 table as 0-3-4 table.
+        if (!ParseFormat4(file, 0, 3, data + subtable_headers[i].offset,
                       subtable_headers[i].length, num_glyphs)) {
           return OTS_FAILURE();
         }
@@ -726,7 +773,6 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
           return OTS_FAILURE();
         }
       }
-
     } else if (subtable_headers[i].platform == 1) {
       // Mac platform
 
@@ -738,7 +784,6 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
           return OTS_FAILURE();
         }
       }
-
     } else if (subtable_headers[i].platform == 3) {
       // MS platform
 
@@ -747,7 +792,8 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
         case 1:
           if (subtable_headers[i].format == 4) {
             // parse 3-0-4 or 3-1-4 table.
-            if (!Parse3x4(file, subtable_headers[i].encoding,
+            if (!ParseFormat4(file, subtable_headers[i].platform,
+                          subtable_headers[i].encoding,
                           data + subtable_headers[i].offset,
                           subtable_headers[i].length, num_glyphs)) {
               return OTS_FAILURE();
@@ -777,19 +823,21 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_cmap_should_serialise(OpenTypeFile *file) {
-  return file->cmap;
+  return file->cmap != NULL;
 }
 
 bool ots_cmap_serialise(OTSStream *out, OpenTypeFile *file) {
-  const bool have_0514 = file->cmap->subtable_0_5_14_data;
-  const bool have_100 = file->cmap->subtable_1_0_0.size();
-  const bool have_304 = file->cmap->subtable_3_0_4_data;
+  const bool have_034 = file->cmap->subtable_0_3_4_data != NULL;
+  const bool have_0514 = file->cmap->subtable_0_5_14.size() != 0;
+  const bool have_100 = file->cmap->subtable_1_0_0.size() != 0;
+  const bool have_304 = file->cmap->subtable_3_0_4_data != NULL;
   // MS Symbol and MS Unicode tables should not co-exist.
   // See the comment above in 0-0-4 parser.
   const bool have_314 = (!have_304) && file->cmap->subtable_3_1_4_data;
-  const bool have_31012 = file->cmap->subtable_3_10_12.size();
-  const bool have_31013 = file->cmap->subtable_3_10_13.size();
-  const unsigned num_subtables = static_cast<unsigned>(have_0514) +
+  const bool have_31012 = file->cmap->subtable_3_10_12.size() != 0;
+  const bool have_31013 = file->cmap->subtable_3_10_13.size() != 0;
+  const unsigned num_subtables = static_cast<unsigned>(have_034) +
+                                 static_cast<unsigned>(have_0514) +
                                  static_cast<unsigned>(have_100) +
                                  static_cast<unsigned>(have_304) +
                                  static_cast<unsigned>(have_314) +
@@ -799,7 +847,7 @@ bool ots_cmap_serialise(OTSStream *out, OpenTypeFile *file) {
 
   // Some fonts don't have 3-0-4 MS Symbol nor 3-1-4 Unicode BMP tables
   // (e.g., old fonts for Mac). We don't support them.
-  if (!have_304 && !have_314) {
+  if (!have_304 && !have_314 && !have_034) {
     return OTS_FAILURE();
   }
 
@@ -813,6 +861,65 @@ bool ots_cmap_serialise(OTSStream *out, OpenTypeFile *file) {
     return OTS_FAILURE();
   }
 
+  const off_t offset_034 = out->Tell();
+  if (have_034) {
+    if (!out->Write(file->cmap->subtable_0_3_4_data,
+                    file->cmap->subtable_0_3_4_length)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  const off_t offset_0514 = out->Tell();
+  if (have_0514) {
+    const std::vector<ots::OpenTypeCMAPSubtableVSRecord> &records
+        = file->cmap->subtable_0_5_14;
+    const unsigned num_records = records.size();
+    if (!out->WriteU16(14) ||
+        !out->WriteU32(file->cmap->subtable_0_5_14_length) ||
+        !out->WriteU32(num_records)) {
+      return OTS_FAILURE();
+    }
+    for (unsigned i = 0; i < num_records; ++i) {
+      if (!out->WriteU24(records[i].var_selector) ||
+          !out->WriteU32(records[i].default_offset) ||
+          !out->WriteU32(records[i].non_default_offset)) {
+        return OTS_FAILURE();
+      }
+    }
+    for (unsigned i = 0; i < num_records; ++i) {
+      if (records[i].default_offset) {
+        const std::vector<ots::OpenTypeCMAPSubtableVSRange> &ranges
+            = records[i].ranges;
+        const unsigned num_ranges = ranges.size();
+        if (!out->Seek(records[i].default_offset + offset_0514) ||
+            !out->WriteU32(num_ranges)) {
+          return OTS_FAILURE();
+        }
+        for (unsigned j = 0; j < num_ranges; ++j) {
+          if (!out->WriteU24(ranges[j].unicode_value) ||
+              !out->WriteU8(ranges[j].additional_count)) {
+            return OTS_FAILURE();
+          }
+        }
+      }
+      if (records[i].non_default_offset) {
+        const std::vector<ots::OpenTypeCMAPSubtableVSMapping> &mappings
+            = records[i].mappings;
+        const unsigned num_mappings = mappings.size();
+        if (!out->Seek(records[i].non_default_offset + offset_0514) ||
+            !out->WriteU32(num_mappings)) {
+          return OTS_FAILURE();
+        }
+        for (unsigned j = 0; j < num_mappings; ++j) {
+          if (!out->WriteU24(mappings[j].unicode_value) ||
+              !out->WriteU16(mappings[j].glyph_id)) {
+            return OTS_FAILURE();
+          }
+        }
+      }
+    }
+  }
+
   const off_t offset_100 = out->Tell();
   if (have_100) {
     if (!out->WriteU16(0) ||  // format
@@ -885,14 +992,6 @@ bool ots_cmap_serialise(OTSStream *out, OpenTypeFile *file) {
     }
   }
 
-  const off_t offset_0514 = out->Tell();
-  if (have_0514) {
-    if (!out->Write(file->cmap->subtable_0_5_14_data,
-                    file->cmap->subtable_0_5_14_length)) {
-      return OTS_FAILURE();
-    }
-  }
-
   const off_t table_end = out->Tell();
   // We might have hanging bytes from the above's checksum which the OTSStream
   // then merges into the table of offsets.
@@ -904,6 +1003,14 @@ bool ots_cmap_serialise(OTSStream *out, OpenTypeFile *file) {
     return OTS_FAILURE();
   }
 
+  if (have_034) {
+    if (!out->WriteU16(0) ||
+        !out->WriteU16(3) ||
+        !out->WriteU32(offset_034 - table_start)) {
+      return OTS_FAILURE();
+    }
+  }
+
   if (have_0514) {
     if (!out->WriteU16(0) ||
         !out->WriteU16(5) ||
diff --git a/gfx/ots/src/cmap.h b/gfx/ots/src/cmap.h
index 1b152c3446fd..5b09556b7291 100644
--- a/gfx/ots/src/cmap.h
+++ b/gfx/ots/src/cmap.h
@@ -17,25 +17,49 @@ struct OpenTypeCMAPSubtableRange {
   uint32_t start_glyph_id;
 };
 
+struct OpenTypeCMAPSubtableVSRange {
+  uint32_t unicode_value;
+  uint8_t additional_count;
+};
+
+struct OpenTypeCMAPSubtableVSMapping {
+  uint32_t unicode_value;
+  uint16_t glyph_id;
+};
+
+struct OpenTypeCMAPSubtableVSRecord {
+  uint32_t var_selector;
+  uint32_t default_offset;
+  uint32_t non_default_offset;
+  std::vector<OpenTypeCMAPSubtableVSRange> ranges;
+  std::vector<OpenTypeCMAPSubtableVSMapping> mappings;
+};
+
 struct OpenTypeCMAP {
   OpenTypeCMAP()
-      : subtable_3_0_4_data(NULL),
+      : subtable_0_3_4_data(NULL),
+        subtable_0_3_4_length(0),
+        subtable_0_5_14_length(0),
+        subtable_3_0_4_data(NULL),
         subtable_3_0_4_length(0),
         subtable_3_1_4_data(NULL),
-        subtable_3_1_4_length(0),
-        subtable_0_5_14_data(NULL),
-        subtable_0_5_14_length(0) {
+        subtable_3_1_4_length(0) {
   }
 
+  // Platform 0, Encoding 3, Format 4, Unicode BMP table.
+  const uint8_t *subtable_0_3_4_data;
+  size_t subtable_0_3_4_length;
+
+  // Platform 0, Encoding 5, Format 14, Unicode Variation Sequence table.
+  size_t subtable_0_5_14_length;
+  std::vector<OpenTypeCMAPSubtableVSRecord> subtable_0_5_14;
+
   // Platform 3, Encoding 0, Format 4, MS Symbol table.
   const uint8_t *subtable_3_0_4_data;
   size_t subtable_3_0_4_length;
   // Platform 3, Encoding 1, Format 4, MS Unicode BMP table.
   const uint8_t *subtable_3_1_4_data;
   size_t subtable_3_1_4_length;
-  // Platform 0, Encoding 5, Format 14, Unicode Variation Sequences table.
-  const uint8_t *subtable_0_5_14_data;
-  size_t subtable_0_5_14_length;
 
   // Platform 3, Encoding 10, Format 12, MS Unicode UCS-4 table.
   std::vector<OpenTypeCMAPSubtableRange> subtable_3_10_12;
diff --git a/gfx/ots/src/gasp.cc b/gfx/ots/src/gasp.cc
index bdbba1a84791..311219bf7593 100644
--- a/gfx/ots/src/gasp.cc
+++ b/gfx/ots/src/gasp.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <new>
 #include "gasp.h"
 
 // gasp - Grid-fitting And Scan-conversion Procedure
@@ -79,7 +78,7 @@ bool ots_gasp_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_gasp_should_serialise(OpenTypeFile *file) {
-  return file->gasp;
+  return file->gasp != NULL;
 }
 
 bool ots_gasp_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/gdef.cc b/gfx/ots/src/gdef.cc
index 48132d5a8a25..d5c44eab175d 100644
--- a/gfx/ots/src/gdef.cc
+++ b/gfx/ots/src/gdef.cc
@@ -1,37 +1,384 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gdef.h"
 
-// GDEF - Glyph Definition Table
+#include <limits>
+#include <vector>
+
+#include "gpos.h"
+#include "gsub.h"
+#include "layout.h"
+#include "maxp.h"
+
+// GDEF - The Glyph Definition Table
 // http://www.microsoft.com/typography/otspec/gdef.htm
 
+namespace {
+
+// The maximum class value in class definition tables.
+const uint16_t kMaxClassDefValue = 0xFFFF;
+// The maximum class value in the glyph class definision table.
+const uint16_t kMaxGlyphClassDefValue = 4;
+// The maximum format number of caret value tables.
+// We don't support format 3 for now. See the comment in
+// ParseLigCaretListTable() for the reason.
+const uint16_t kMaxCaretValueFormat = 2;
+
+bool ParseGlyphClassDefTable(ots::OpenTypeFile *file, const uint8_t *data,
+                             size_t length, const uint16_t num_glyphs) {
+  return ots::ParseClassDefTable(data, length, num_glyphs,
+                                 kMaxGlyphClassDefValue);
+}
+
+bool ParseAttachListTable(ots::OpenTypeFile *file, const uint8_t *data,
+                          size_t length, const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_coverage = 0;
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned attach_points_end = static_cast<unsigned>(4) + 2*glyph_count;
+  if (attach_points_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage == 0 || offset_coverage >= length ||
+      offset_coverage < attach_points_end) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    OTS_WARNING("bad glyph count: %u", glyph_count);
+    return OTS_FAILURE();
+  }
+
+  std::vector<uint16_t> attach_points;
+  attach_points.resize(glyph_count);
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    if (!subtable.ReadU16(&attach_points[i])) {
+      return OTS_FAILURE();
+    }
+    if (attach_points[i] >= length ||
+        attach_points[i] < attach_points_end) {
+      return OTS_FAILURE();
+    }
+  }
+
+  // Parse coverage table
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  // Parse attach point table
+  for (unsigned i = 0; i < attach_points.size(); ++i) {
+    subtable.set_offset(attach_points[i]);
+    uint16_t point_count = 0;
+    if (!subtable.ReadU16(&point_count)) {
+      return OTS_FAILURE();
+    }
+    if (point_count == 0) {
+      return OTS_FAILURE();
+    }
+    uint16_t last_point_index = 0;
+    uint16_t point_index = 0;
+    for (unsigned j = 0; j < point_count; ++j) {
+      if (!subtable.ReadU16(&point_index)) {
+        return OTS_FAILURE();
+      }
+      // Contour point indeces are in increasing numerical order
+      if (last_point_index != 0 && last_point_index >= point_index) {
+        OTS_WARNING("bad contour indeces: %u >= %u",
+                    last_point_index, point_index);
+        return OTS_FAILURE();
+      }
+      last_point_index = point_index;
+    }
+  }
+  return true;
+}
+
+bool ParseLigCaretListTable(ots::OpenTypeFile *file, const uint8_t *data,
+                            size_t length, const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+  uint16_t offset_coverage = 0;
+  uint16_t lig_glyph_count = 0;
+  if (!subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&lig_glyph_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned lig_glyphs_end = static_cast<unsigned>(4) + 2*lig_glyph_count;
+  if (lig_glyphs_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage == 0 || offset_coverage >= length ||
+      offset_coverage < lig_glyphs_end) {
+    return OTS_FAILURE();
+  }
+  if (lig_glyph_count > num_glyphs) {
+    OTS_WARNING("bad ligature glyph count: %u", lig_glyph_count);
+    return OTS_FAILURE();
+  }
+
+  std::vector<uint16_t> lig_glyphs;
+  lig_glyphs.resize(lig_glyph_count);
+  for (unsigned i = 0; i < lig_glyph_count; ++i) {
+    if (!subtable.ReadU16(&lig_glyphs[i])) {
+      return OTS_FAILURE();
+    }
+    if (lig_glyphs[i] >= length || lig_glyphs[i] < lig_glyphs_end) {
+      return OTS_FAILURE();
+    }
+  }
+
+  // Parse coverage table
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  // Parse ligature glyph table
+  for (unsigned i = 0; i < lig_glyphs.size(); ++i) {
+    subtable.set_offset(lig_glyphs[i]);
+    uint16_t caret_count = 0;
+    if (!subtable.ReadU16(&caret_count)) {
+      return OTS_FAILURE();
+    }
+    if (caret_count == 0) {
+      OTS_WARNING("bad caret value count: %u", caret_count);
+      return OTS_FAILURE();
+    }
+
+    std::vector<uint16_t> caret_values;
+    caret_values.resize(caret_count);
+    uint16_t last_offset_caret = 0;
+    unsigned caret_values_end = static_cast<unsigned>(2) * 2*caret_count;
+    for (unsigned j = 0; j < caret_count; ++j) {
+      if (!subtable.ReadU16(&caret_values[j])) {
+        return OTS_FAILURE();
+      }
+      if (caret_values[j] >= length || caret_values[j] < caret_values_end) {
+        return OTS_FAILURE();
+      }
+      // Caret offsets are in increasing coordinate order
+      if (last_offset_caret != 0 && last_offset_caret >= caret_values[j]) {
+        OTS_WARNING("offset isn't in increasing coordinate order: %u >= %u",
+                    last_offset_caret, caret_values[j]);
+        return OTS_FAILURE();
+      }
+      last_offset_caret = caret_values[j];
+    }
+
+    // Parse caret values table
+    for (unsigned j = 0; j < caret_count; ++j) {
+      subtable.set_offset(lig_glyphs[i] + caret_values[j]);
+      uint16_t caret_format = 0;
+      if (!subtable.ReadU16(&caret_format)) {
+        return OTS_FAILURE();
+      }
+      // TODO(bashi): We only support caret value format 1 and 2 for now
+      // because there are no fonts which contain caret value format 3
+      // as far as we investigated.
+      if (caret_format == 0 || caret_format > kMaxCaretValueFormat) {
+        OTS_WARNING("bad caret value format: %u", caret_format);
+        return OTS_FAILURE();
+      }
+      // CaretValueFormats contain a 2-byte field which could be
+      // arbitrary value.
+      if (!subtable.Skip(2)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+  return true;
+}
+
+bool ParseMarkAttachClassDefTable(ots::OpenTypeFile *file, const uint8_t *data,
+                                  size_t length, const uint16_t num_glyphs) {
+  return ots::ParseClassDefTable(data, length, num_glyphs, kMaxClassDefValue);
+}
+
+bool ParseMarkGlyphSetsDefTable(ots::OpenTypeFile *file, const uint8_t *data,
+                                size_t length, const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+  uint16_t format = 0;
+  uint16_t mark_set_count = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&mark_set_count)) {
+    return OTS_FAILURE();
+  }
+  if (format != 1) {
+    OTS_WARNING("bad mark glyph set table format: %u", format);
+    return OTS_FAILURE();
+  }
+
+  const unsigned mark_sets_end = static_cast<unsigned>(4) + 2*mark_set_count;
+  if (mark_sets_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < mark_set_count; ++i) {
+    uint32_t offset_coverage = 0;
+    if (!subtable.ReadU32(&offset_coverage)) {
+      return OTS_FAILURE();
+    }
+    if (offset_coverage >= length ||
+        offset_coverage < mark_sets_end) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offset_coverage,
+                                 length - offset_coverage, num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+  file->gdef->num_mark_glyph_sets = mark_set_count;
+  return true;
+}
+
+}  // namespace
+
+#define DROP_THIS_TABLE \
+  do { file->gdef->data = 0; file->gdef->length = 0; } while (0)
+
 namespace ots {
 
 bool ots_gdef_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+  // Grab the number of glyphs in the file from the maxp table to check
+  // GlyphIDs in GDEF table.
+  if (!file->maxp) {
+    return OTS_FAILURE();
+  }
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+
   Buffer table(data, length);
 
   OpenTypeGDEF *gdef = new OpenTypeGDEF;
   file->gdef = gdef;
 
-  if (!table.Skip(length)) {
+  uint32_t version = 0;
+  if (!table.ReadU32(&version)) {
+    return OTS_FAILURE();
+  }
+  if (version < 0x00010000 || version == 0x00010001) {
+    OTS_WARNING("bad GDEF version");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  if (version >= 0x00010002) {
+    gdef->version_2 = true;
+  }
+
+  uint16_t offset_glyph_class_def = 0;
+  uint16_t offset_attach_list = 0;
+  uint16_t offset_lig_caret_list = 0;
+  uint16_t offset_mark_attach_class_def = 0;
+  if (!table.ReadU16(&offset_glyph_class_def) ||
+      !table.ReadU16(&offset_attach_list) ||
+      !table.ReadU16(&offset_lig_caret_list) ||
+      !table.ReadU16(&offset_mark_attach_class_def)) {
+    return OTS_FAILURE();
+  }
+  uint16_t offset_mark_glyph_sets_def = 0;
+  if (gdef->version_2) {
+    if (!table.ReadU16(&offset_mark_glyph_sets_def)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  const unsigned gdef_header_end = static_cast<unsigned>(8) +
+      gdef->version_2 ? static_cast<unsigned>(2) : static_cast<unsigned>(0);
+  if (gdef_header_end > std::numeric_limits<uint16_t>::max()) {
     return OTS_FAILURE();
   }
 
+  // Parse subtables
+  if (offset_glyph_class_def) {
+    if (offset_glyph_class_def >= length ||
+        offset_glyph_class_def < gdef_header_end) {
+      return OTS_FAILURE();
+    }
+    if (!ParseGlyphClassDefTable(file, data + offset_glyph_class_def,
+                                 length - offset_glyph_class_def,
+                                 num_glyphs)) {
+      DROP_THIS_TABLE;
+      return true;
+    }
+    gdef->has_glyph_class_def = true;
+  }
+
+  if (offset_attach_list) {
+    if (offset_attach_list >= length ||
+        offset_attach_list < gdef_header_end) {
+      return OTS_FAILURE();
+    }
+    if (!ParseAttachListTable(file, data + offset_attach_list,
+                              length - offset_attach_list,
+                              num_glyphs)) {
+      DROP_THIS_TABLE;
+      return true;
+    }
+  }
+
+  if (offset_lig_caret_list) {
+    if (offset_lig_caret_list >= length ||
+        offset_lig_caret_list < gdef_header_end) {
+      return OTS_FAILURE();
+    }
+    if (!ParseLigCaretListTable(file, data + offset_lig_caret_list,
+                              length - offset_lig_caret_list,
+                              num_glyphs)) {
+      DROP_THIS_TABLE;
+      return true;
+    }
+  }
+
+  if (offset_mark_attach_class_def) {
+    if (offset_mark_attach_class_def >= length ||
+        offset_mark_attach_class_def < gdef_header_end) {
+      return OTS_FAILURE();
+    }
+    if (!ParseMarkAttachClassDefTable(file,
+                                      data + offset_mark_attach_class_def,
+                                      length - offset_mark_attach_class_def,
+                                      num_glyphs)) {
+      DROP_THIS_TABLE;
+      return true;
+    }
+    gdef->has_mark_attachment_class_def = true;
+  }
+
+  if (offset_mark_glyph_sets_def) {
+    if (offset_mark_glyph_sets_def >= length ||
+        offset_mark_glyph_sets_def < gdef_header_end) {
+      return OTS_FAILURE();
+    }
+    if (!ParseMarkGlyphSetsDefTable(file,
+                                    data + offset_mark_glyph_sets_def,
+                                    length - offset_mark_glyph_sets_def,
+                                    num_glyphs)) {
+      DROP_THIS_TABLE;
+      return true;
+    }
+    gdef->has_mark_glyph_sets_def = true;
+  }
   gdef->data = data;
   gdef->length = length;
   return true;
 }
 
 bool ots_gdef_should_serialise(OpenTypeFile *file) {
-  return file->preserve_otl && file->gdef;
+  const bool needed_tables_dropped =
+      (file->gsub && file->gsub->data == NULL) ||
+      (file->gpos && file->gpos->data == NULL);
+  return file->gdef != NULL && file->gdef->data != NULL &&
+      !needed_tables_dropped;
 }
 
 bool ots_gdef_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeGDEF *gdef = file->gdef;
-
-  if (!out->Write(gdef->data, gdef->length)) {
+  if (!out->Write(file->gdef->data, file->gdef->length)) {
     return OTS_FAILURE();
   }
 
@@ -43,3 +390,4 @@ void ots_gdef_free(OpenTypeFile *file) {
 }
 
 }  // namespace ots
+
diff --git a/gfx/ots/src/gdef.h b/gfx/ots/src/gdef.h
index 5e762b33a14d..f46f419c7419 100644
--- a/gfx/ots/src/gdef.h
+++ b/gfx/ots/src/gdef.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,10 +10,27 @@
 namespace ots {
 
 struct OpenTypeGDEF {
+  OpenTypeGDEF()
+      : version_2(false),
+        has_glyph_class_def(false),
+        has_mark_attachment_class_def(false),
+        has_mark_glyph_sets_def(false),
+        num_mark_glyph_sets(0),
+        data(NULL),
+        length(0) {
+  }
+
+  bool version_2;
+  bool has_glyph_class_def;
+  bool has_mark_attachment_class_def;
+  bool has_mark_glyph_sets_def;
+  uint16_t num_mark_glyph_sets;
+
   const uint8_t *data;
-  uint32_t length;
+  size_t length;
 };
 
 }  // namespace ots
 
-#endif  // OTS_GDEF_H_
+#endif
+
diff --git a/gfx/ots/src/glyf.cc b/gfx/ots/src/glyf.cc
index 69fcc02c3a0f..65da3e716998 100644
--- a/gfx/ots/src/glyf.cc
+++ b/gfx/ots/src/glyf.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <new>
 #include "glyf.h"
 
 #include <algorithm>
@@ -279,7 +278,7 @@ bool ots_glyf_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_glyf_should_serialise(OpenTypeFile *file) {
-  return file->glyf;
+  return file->glyf != NULL;
 }
 
 bool ots_glyf_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/gpos.cc b/gfx/ots/src/gpos.cc
index 434d909ad86f..503ce84f6a34 100644
--- a/gfx/ots/src/gpos.cc
+++ b/gfx/ots/src/gpos.cc
@@ -1,37 +1,801 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpos.h"
 
-// GPOS - Glyph Positioning Table
+#include <limits>
+#include <vector>
+
+#include "gdef.h"
+#include "gsub.h"
+#include "layout.h"
+#include "maxp.h"
+
+// GPOS - The Glyph Positioning Table
 // http://www.microsoft.com/typography/otspec/gpos.htm
 
+namespace {
+
+enum GPOS_TYPE {
+  GPOS_TYPE_SINGLE_ADJUSTMENT = 1,
+  GPOS_TYPE_PAIR_ADJUSTMENT = 2,
+  GPOS_TYPE_CURSIVE_ATTACHMENT = 3,
+  GPOS_TYPE_MARK_TO_BASE_ATTACHMENT = 4,
+  GPOS_TYPE_MARK_TO_LIGATURE_ATTACHMENT = 5,
+  GPOS_TYPE_MARK_TO_MARK_ATTACHMENT = 6,
+  GPOS_TYPE_CONTEXT_POSITIONING = 7,
+  GPOS_TYPE_CHAINED_CONTEXT_POSITIONING = 8,
+  GPOS_TYPE_EXTENSION_POSITIONING = 9,
+  GPOS_TYPE_RESERVED = 10
+};
+
+// The size of gpos header.
+const unsigned kGposHeaderSize = 10;
+// The maximum format number for anchor tables.
+const uint16_t kMaxAnchorFormat = 3;
+// The maximum number of class value.
+const uint16_t kMaxClassDefValue = 0xFFFF;
+
+// Lookup type parsers.
+bool ParseSingleAdjustment(const ots::OpenTypeFile *file,
+                           const uint8_t *data, const size_t length);
+bool ParsePairAdjustment(const ots::OpenTypeFile *file,
+                         const uint8_t *data, const size_t length);
+bool ParseCursiveAttachment(const ots::OpenTypeFile *file,
+                            const uint8_t *data, const size_t length);
+bool ParseMarkToBaseAttachment(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length);
+bool ParseMarkToLigatureAttachment(const ots::OpenTypeFile *file,
+                                   const uint8_t *data, const size_t length);
+bool ParseMarkToMarkAttachment(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length);
+bool ParseContextPositioning(const ots::OpenTypeFile *file,
+                             const uint8_t *data, const size_t length);
+bool ParseChainedContextPositioning(const ots::OpenTypeFile *file,
+                                    const uint8_t *data, const size_t length);
+bool ParseExtensionPositioning(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length);
+
+const ots::LookupSubtableParser::TypeParser kGposTypeParsers[] = {
+  {GPOS_TYPE_SINGLE_ADJUSTMENT, ParseSingleAdjustment},
+  {GPOS_TYPE_PAIR_ADJUSTMENT, ParsePairAdjustment},
+  {GPOS_TYPE_CURSIVE_ATTACHMENT, ParseCursiveAttachment},
+  {GPOS_TYPE_MARK_TO_BASE_ATTACHMENT, ParseMarkToBaseAttachment},
+  {GPOS_TYPE_MARK_TO_LIGATURE_ATTACHMENT, ParseMarkToLigatureAttachment},
+  {GPOS_TYPE_MARK_TO_MARK_ATTACHMENT, ParseMarkToMarkAttachment},
+  {GPOS_TYPE_CONTEXT_POSITIONING, ParseContextPositioning},
+  {GPOS_TYPE_CHAINED_CONTEXT_POSITIONING, ParseChainedContextPositioning},
+  {GPOS_TYPE_EXTENSION_POSITIONING, ParseExtensionPositioning}
+};
+
+const ots::LookupSubtableParser kGposLookupSubtableParser = {
+  GPOS_TYPE_RESERVED, GPOS_TYPE_EXTENSION_POSITIONING, kGposTypeParsers
+};
+
+// Shared Tables: ValueRecord, Anchor Table, and MarkArray
+
+bool ParseValueRecord(ots::Buffer* subtable, const uint8_t *data,
+                      const size_t length, const uint16_t value_format) {
+  // Check existence of adjustment fields.
+  for (unsigned i = 0; i < 4; ++i) {
+    if ((value_format >> i) & 0x1) {
+      // Just read the field since these fileds could take an arbitrary values.
+      if (!subtable->Skip(2)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+
+  // Check existence of offsets to device table.
+  for (unsigned i = 0; i < 4; ++i) {
+    if ((value_format >> (i + 4)) & 0x1) {
+      uint16_t offset = 0;
+      if (!subtable->ReadU16(&offset)) {
+        return OTS_FAILURE();
+      }
+      if (offset) {
+        // TODO(bashi): Is it possible that device tables locate before
+        // this record? No fonts contain such offset AKAIF.
+        if (offset >= length) {
+          return OTS_FAILURE();
+        }
+        if (!ots::ParseDeviceTable(data + offset, length - offset)) {
+          return OTS_FAILURE();
+        }
+      }
+    }
+  }
+  return true;
+}
+
+bool ParseAnchorTable(const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  // Read format and skip 2 2-byte fields that could be arbitrary values.
+  if (!subtable.ReadU16(&format) ||
+      !subtable.Skip(4)) {
+    return OTS_FAILURE();
+  }
+
+  if (format == 0 || format > kMaxAnchorFormat) {
+    return OTS_FAILURE();
+  }
+
+  // Format 2 and 3 has additional fields.
+  if (format == 2) {
+    // Format 2 provides an index to a glyph contour point, which will take
+    // arbitrary value.
+    uint16_t anchor_point = 0;
+    if (!subtable.ReadU16(&anchor_point)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 3) {
+    uint16_t offset_x_device = 0;
+    uint16_t offset_y_device = 0;
+    if (!subtable.ReadU16(&offset_x_device) ||
+        !subtable.ReadU16(&offset_y_device)) {
+      return OTS_FAILURE();
+    }
+    const unsigned format_end = static_cast<unsigned>(10);
+    if (offset_x_device) {
+      if (offset_x_device < format_end || offset_x_device >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ots::ParseDeviceTable(data + offset_x_device,
+                                 length - offset_x_device)) {
+        return OTS_FAILURE();
+      }
+    }
+    if (offset_y_device) {
+      if (offset_y_device < format_end || offset_y_device >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ots::ParseDeviceTable(data + offset_y_device,
+                                 length - offset_y_device)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+  return true;
+}
+
+bool ParseMarkArrayTable(const uint8_t *data, const size_t length,
+                         const uint16_t class_count) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t mark_count = 0;
+  if (!subtable.ReadU16(&mark_count)) {
+    return OTS_FAILURE();
+  }
+
+  // MarkRecord consists of 4-bytes.
+  const unsigned mark_records_end = static_cast<unsigned>(2) + mark_count * 4;
+  if (mark_records_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < mark_count; ++i) {
+    uint16_t class_value = 0;
+    uint16_t offset_mark_anchor = 0;
+    if (!subtable.ReadU16(&class_value) ||
+        !subtable.ReadU16(&offset_mark_anchor)) {
+      return OTS_FAILURE();
+    }
+    // |class_value| may take arbitrary values including 0 here so we don't
+    // check the value.
+    if (offset_mark_anchor < mark_records_end ||
+        offset_mark_anchor >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseAnchorTable(data + offset_mark_anchor,
+                          length - offset_mark_anchor)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+// Lookup Type 1:
+// Single Adjustment Positioning Subtable
+bool ParseSingleAdjustment(const ots::OpenTypeFile *file, const uint8_t *data,
+                           const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t value_format = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&value_format)) {
+    return OTS_FAILURE();
+  }
+
+  if (format == 1) {
+    // Format 1 exactly one value record.
+    if (!ParseValueRecord(&subtable, data, length, value_format)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 2) {
+    uint16_t value_count = 0;
+    if (!subtable.ReadU16(&value_count)) {
+      return OTS_FAILURE();
+    }
+    for (unsigned i = 0; i < value_count; ++i) {
+      if (!ParseValueRecord(&subtable, data, length, value_format)) {
+        return OTS_FAILURE();
+      }
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  if (offset_coverage < subtable.offset() || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage,
+                               file->maxp->num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParsePairSetTable(const uint8_t *data, const size_t length,
+                       const uint16_t value_format1,
+                       const uint16_t value_format2,
+                       const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t value_count = 0;
+  if (!subtable.ReadU16(&value_count)) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < value_count; ++i) {
+    // Check pair value record.
+    uint16_t glyph_id = 0;
+    if (!subtable.ReadU16(&glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_id >= num_glyphs) {
+      return OTS_FAILURE();
+    }
+    if (!ParseValueRecord(&subtable, data, length, value_format1)) {
+      return OTS_FAILURE();
+    }
+    if (!ParseValueRecord(&subtable, data, length, value_format2)) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParsePairPosFormat1(const uint8_t *data, const size_t length,
+                         const uint16_t value_format1,
+                         const uint16_t value_format2,
+                         const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  // Skip 8 bytes that are already read before.
+  if (!subtable.Skip(8)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t pair_set_count = 0;
+  if (!subtable.ReadU16(&pair_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned pair_pos_end = static_cast<unsigned>(10) +
+      pair_set_count * 2;
+  if (pair_pos_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < pair_set_count; ++i) {
+    uint16_t pair_set_offset = 0;
+    if (!subtable.ReadU16(&pair_set_offset)) {
+      return OTS_FAILURE();
+    }
+    if (pair_set_offset < pair_pos_end || pair_set_offset >= length) {
+      return OTS_FAILURE();
+    }
+    // Check pair set tables
+    if (!ParsePairSetTable(data + pair_set_offset, length - pair_set_offset,
+                           value_format1, value_format2,
+                           num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParsePairPosFormat2(const uint8_t *data, const size_t length,
+                         const uint16_t value_format1,
+                         const uint16_t value_format2,
+                         const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  // Skip 8 bytes that are already read before.
+  if (!subtable.Skip(8)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t offset_class_def1 = 0;
+  uint16_t offset_class_def2 = 0;
+  uint16_t class1_count = 0;
+  uint16_t class2_count = 0;
+  if (!subtable.ReadU16(&offset_class_def1) ||
+      !subtable.ReadU16(&offset_class_def2) ||
+      !subtable.ReadU16(&class1_count) ||
+      !subtable.ReadU16(&class2_count)) {
+    return OTS_FAILURE();
+  }
+
+  // Check class 1 records.
+  for (unsigned i = 0; i < class1_count; ++i) {
+    // Check class 2 records.
+    for (unsigned j = 0; j < class2_count; ++j) {
+      if (value_format1 && !ParseValueRecord(&subtable, data, length,
+                                             value_format1)) {
+        return OTS_FAILURE();
+      }
+      if (value_format2 && !ParseValueRecord(&subtable, data, length,
+                                             value_format2)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+
+  // Check class definition tables.
+  if (offset_class_def1 < subtable.offset() || offset_class_def1 >= length ||
+      offset_class_def2 < subtable.offset() || offset_class_def2 >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseClassDefTable(data + offset_class_def1,
+                               length - offset_class_def1,
+                               num_glyphs, kMaxClassDefValue)) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseClassDefTable(data + offset_class_def2,
+                               length - offset_class_def2,
+                               num_glyphs, kMaxClassDefValue)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+// Lookup Type 2:
+// Pair Adjustment Positioning Subtable
+bool ParsePairAdjustment(const ots::OpenTypeFile *file, const uint8_t *data,
+                         const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t value_format1 = 0;
+  uint16_t value_format2 = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&value_format1) ||
+      !subtable.ReadU16(&value_format2)) {
+    return OTS_FAILURE();
+  }
+
+  if (format == 1) {
+    if (!ParsePairPosFormat1(data, length, value_format1, value_format2,
+                             file->maxp->num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 2) {
+    if (!ParsePairPosFormat2(data, length, value_format1, value_format2,
+                             file->maxp->num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  if (offset_coverage < subtable.offset() || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage,
+                               file->maxp->num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+// Lookup Type 3
+// Cursive Attachment Positioning Subtable
+bool ParseCursiveAttachment(const ots::OpenTypeFile *file, const uint8_t *data,
+                            const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t entry_exit_count = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&entry_exit_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+
+  // Check entry exit records.
+  const unsigned entry_exit_records_end = static_cast<unsigned>(6) +
+      entry_exit_count * 2;
+  if (entry_exit_records_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < entry_exit_count; ++i) {
+    uint16_t offset_entry_anchor = 0;
+    uint16_t offset_exit_anchor = 0;
+    if (!subtable.ReadU16(&offset_entry_anchor) ||
+        !subtable.ReadU16(&offset_exit_anchor)) {
+      return OTS_FAILURE();
+    }
+    // These offsets could be NULL.
+    if (offset_entry_anchor) {
+      if (offset_entry_anchor < entry_exit_records_end ||
+          offset_entry_anchor >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ParseAnchorTable(data + offset_entry_anchor,
+                            length - offset_entry_anchor)) {
+        return OTS_FAILURE();
+      }
+    }
+    if (offset_exit_anchor) {
+      if (offset_exit_anchor < entry_exit_records_end ||
+         offset_exit_anchor >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ParseAnchorTable(data + offset_exit_anchor,
+                            length - offset_exit_anchor)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+
+  if (offset_coverage < subtable.offset() || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage,
+                               file->maxp->num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseAnchorArrayTable(const uint8_t *data, const size_t length,
+                           const uint16_t class_count) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t record_count = 0;
+  if (!subtable.ReadU16(&record_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned anchor_array_end = static_cast<unsigned>(2) +
+      record_count * class_count * 2;
+  if (anchor_array_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < record_count; ++i) {
+    for (unsigned j = 0; j < class_count; ++j) {
+      uint16_t offset_record = 0;
+      if (!subtable.ReadU16(&offset_record)) {
+        return OTS_FAILURE();
+      }
+      // |offset_record| could be NULL.
+      if (offset_record) {
+        if (offset_record < anchor_array_end || offset_record >= length) {
+          return OTS_FAILURE();
+        }
+        if (!ParseAnchorTable(data + offset_record,
+                              length - offset_record)) {
+          return OTS_FAILURE();
+        }
+      }
+    }
+  }
+  return true;
+}
+
+bool ParseLigatureArrayTable(const uint8_t *data, const size_t length,
+                             const uint16_t class_count) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t ligature_count = 0;
+  if (!subtable.ReadU16(&ligature_count)) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < ligature_count; ++i) {
+    uint16_t offset_ligature_attach = 0;
+    if (!subtable.ReadU16(&offset_ligature_attach)) {
+      return OTS_FAILURE();
+    }
+    if (offset_ligature_attach < 2 || offset_ligature_attach >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseAnchorArrayTable(data + offset_ligature_attach,
+                               length - offset_ligature_attach, class_count)) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+// Common parser for Lookup Type 4, 5 and 6.
+bool ParseMarkToAttachmentSubtables(const ots::OpenTypeFile *file,
+                                    const uint8_t *data, const size_t length,
+                                    const GPOS_TYPE type) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage1 = 0;
+  uint16_t offset_coverage2 = 0;
+  uint16_t class_count = 0;
+  uint16_t offset_mark_array = 0;
+  uint16_t offset_type_specific_array = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage1) ||
+      !subtable.ReadU16(&offset_coverage2) ||
+      !subtable.ReadU16(&class_count) ||
+      !subtable.ReadU16(&offset_mark_array) ||
+      !subtable.ReadU16(&offset_type_specific_array)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned header_end = static_cast<unsigned>(subtable.offset());
+  if (header_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage1 < header_end || offset_coverage1 >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage1,
+                               length - offset_coverage1,
+                               file->maxp->num_glyphs)) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage2 < header_end || offset_coverage2 >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage2,
+                               length - offset_coverage2,
+                               file->maxp->num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  if (offset_mark_array < header_end || offset_mark_array >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ParseMarkArrayTable(data + offset_mark_array,
+                           length - offset_mark_array, class_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (offset_type_specific_array < header_end ||
+      offset_type_specific_array >= length) {
+    return OTS_FAILURE();
+  }
+  if (type == GPOS_TYPE_MARK_TO_BASE_ATTACHMENT ||
+      type == GPOS_TYPE_MARK_TO_MARK_ATTACHMENT) {
+    if (!ParseAnchorArrayTable(data + offset_type_specific_array,
+                               length - offset_type_specific_array,
+                               class_count)) {
+      return OTS_FAILURE();
+    }
+  } else if (type == GPOS_TYPE_MARK_TO_LIGATURE_ATTACHMENT) {
+    if (!ParseLigatureArrayTable(data + offset_type_specific_array,
+                                 length - offset_type_specific_array,
+                                 class_count)) {
+      return OTS_FAILURE();
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+// Lookup Type 4:
+// MarkToBase Attachment Positioning Subtable
+bool ParseMarkToBaseAttachment(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length) {
+  return ParseMarkToAttachmentSubtables(file, data, length,
+                                        GPOS_TYPE_MARK_TO_BASE_ATTACHMENT);
+}
+
+// Lookup Type 5:
+// MarkToLigature Attachment Positioning Subtable
+bool ParseMarkToLigatureAttachment(const ots::OpenTypeFile *file,
+                                   const uint8_t *data, const size_t length) {
+  return ParseMarkToAttachmentSubtables(file, data, length,
+                                        GPOS_TYPE_MARK_TO_LIGATURE_ATTACHMENT);
+}
+
+// Lookup Type 6:
+// MarkToMark Attachment Positioning Subtable
+bool ParseMarkToMarkAttachment(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length) {
+  return ParseMarkToAttachmentSubtables(file, data, length,
+                                        GPOS_TYPE_MARK_TO_MARK_ATTACHMENT);
+}
+
+// Lookup Type 7:
+// Contextual Positioning Subtables
+bool ParseContextPositioning(const ots::OpenTypeFile *file,
+                             const uint8_t *data, const size_t length) {
+  return ots::ParseContextSubtable(data, length, file->maxp->num_glyphs,
+                                   file->gpos->num_lookups);
+}
+
+// Lookup Type 8:
+// Chaining Contexual Positioning Subtable
+bool ParseChainedContextPositioning(const ots::OpenTypeFile *file,
+                                    const uint8_t *data, const size_t length) {
+  return ots::ParseChainingContextSubtable(data, length,
+                                           file->maxp->num_glyphs,
+                                           file->gpos->num_lookups);
+}
+
+// Lookup Type 9:
+// Extension Positioning
+bool ParseExtensionPositioning(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length) {
+  return ots::ParseExtensionSubtable(file, data, length,
+                                     &kGposLookupSubtableParser);
+}
+
+}  // namespace
+
+#define DROP_THIS_TABLE \
+  do { file->gpos->data = 0; file->gpos->length = 0; } while (0)
+
 namespace ots {
 
+// As far as I checked, following fonts contain invalid GPOS table and
+// OTS will drop their GPOS table.
+//
+// # invalid delta format in device table
+// samanata.ttf
+//
+// # bad size range in device table
+// Sarai_07.ttf
+//
+// # bad offset to PairSetTable
+// chandas1-2.ttf
+//
+// # bad offset to FeatureTable
+// glrso12.ttf
+// gllr12.ttf
+// glbo12.ttf
+// glb12.ttf
+// glro12.ttf
+// glbso12.ttf
+// glrc12.ttf
+// glrsc12.ttf
+// glbs12.ttf
+// glrs12.ttf
+// glr12.ttf
+//
+// # ScriptRecords aren't sorted by tag
+// Garogier_unhinted.otf
+//
+// # bad start coverage index in CoverageFormat2
+// AndBasR.ttf
+// CharisSILB.ttf
+// CharisSILBI.ttf
+// CharisSILI.ttf
+// CharisSILR.ttf
+// DoulosSILR.ttf
+// GenBasBI.ttf
+// GenBasI.ttf
+// GenBkBasI.ttf
+// GenBkBasB.ttf
+// GenBkBasR.ttf
+// Padauk-Bold.ttf
+// Padauk.ttf
+//
+// # Contour point indexes aren't sorted
+// Arial Unicode.ttf
+
 bool ots_gpos_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+  // Parsing GPOS table requires num_glyphs which is contained in maxp table.
+  if (!file->maxp) {
+    return OTS_FAILURE();
+  }
+
   Buffer table(data, length);
 
   OpenTypeGPOS *gpos = new OpenTypeGPOS;
   file->gpos = gpos;
 
-  if (!table.Skip(length)) {
+  uint32_t version = 0;
+  uint16_t offset_script_list = 0;
+  uint16_t offset_feature_list = 0;
+  uint16_t offset_lookup_list = 0;
+  if (!table.ReadU32(&version) ||
+      !table.ReadU16(&offset_script_list) ||
+      !table.ReadU16(&offset_feature_list) ||
+      !table.ReadU16(&offset_lookup_list)) {
     return OTS_FAILURE();
   }
 
+  if (version != 0x00010000) {
+    OTS_WARNING("bad GPOS version");
+    DROP_THIS_TABLE;
+    return true;
+  }
+  if ((offset_script_list < kGposHeaderSize ||
+       offset_script_list >= length) ||
+      (offset_feature_list < kGposHeaderSize ||
+       offset_feature_list >= length) ||
+      (offset_lookup_list < kGposHeaderSize ||
+       offset_lookup_list >= length)) {
+    OTS_WARNING("bad offset in GPOS header");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  if (!ParseLookupListTable(file, data + offset_lookup_list,
+                            length - offset_lookup_list,
+                            &kGposLookupSubtableParser,
+                            &gpos->num_lookups)) {
+    OTS_WARNING("faild to parse lookup list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  uint16_t num_features = 0;
+  if (!ParseFeatureListTable(data + offset_feature_list,
+                             length - offset_feature_list, gpos->num_lookups,
+                             &num_features)) {
+    OTS_WARNING("faild to parse feature list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  if (!ParseScriptListTable(data + offset_script_list,
+                            length - offset_script_list, num_features)) {
+    OTS_WARNING("faild to parse script list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
   gpos->data = data;
   gpos->length = length;
   return true;
 }
 
 bool ots_gpos_should_serialise(OpenTypeFile *file) {
-  return file->preserve_otl && file->gpos;
+  const bool needed_tables_dropped =
+      (file->gdef && file->gdef->data == NULL) ||
+      (file->gsub && file->gsub->data == NULL);
+  return file->gpos != NULL && file->gpos->data != NULL &&
+      !needed_tables_dropped;
 }
 
 bool ots_gpos_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeGPOS *gpos = file->gpos;
-
-  if (!out->Write(gpos->data, gpos->length)) {
+  if (!out->Write(file->gpos->data, file->gpos->length)) {
     return OTS_FAILURE();
   }
 
@@ -43,3 +807,4 @@ void ots_gpos_free(OpenTypeFile *file) {
 }
 
 }  // namespace ots
+
diff --git a/gfx/ots/src/gpos.h b/gfx/ots/src/gpos.h
index c4a40cd5fdd6..3a4034f6ff8a 100644
--- a/gfx/ots/src/gpos.h
+++ b/gfx/ots/src/gpos.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,10 +10,20 @@
 namespace ots {
 
 struct OpenTypeGPOS {
+  OpenTypeGPOS()
+      : num_lookups(0),
+        data(NULL),
+        length(0) {
+  }
+
+  // Number of lookups in GPOS table
+  uint16_t num_lookups;
+
   const uint8_t *data;
-  uint32_t length;
+  size_t length;
 };
 
 }  // namespace ots
 
-#endif  // OTS_GPOS_H_
+#endif
+
diff --git a/gfx/ots/src/gsub.cc b/gfx/ots/src/gsub.cc
index 60627fc58de2..44ef4a055f5a 100644
--- a/gfx/ots/src/gsub.cc
+++ b/gfx/ots/src/gsub.cc
@@ -1,37 +1,682 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gsub.h"
 
-// GSUB - Glyph Substitution Table
+#include <limits>
+#include <vector>
+
+#include "gdef.h"
+#include "gpos.h"
+#include "layout.h"
+#include "maxp.h"
+
+// GSUB - The Glyph Substitution Table
 // http://www.microsoft.com/typography/otspec/gsub.htm
 
+namespace {
+
+// The GSUB header size
+const size_t kGsubHeaderSize = 8;
+
+enum GSUB_TYPE {
+  GSUB_TYPE_SINGLE = 1,
+  GSUB_TYPE_MULTIPLE = 2,
+  GSUB_TYPE_ALTERNATE = 3,
+  GSUB_TYPE_LIGATURE = 4,
+  GSUB_TYPE_CONTEXT = 5,
+  GSUB_TYPE_CHANGING_CONTEXT = 6,
+  GSUB_TYPE_EXTENSION_SUBSTITUTION = 7,
+  GSUB_TYPE_REVERSE_CHAINING_CONTEXT_SINGLE = 8,
+  GSUB_TYPE_RESERVED = 9
+};
+
+// Lookup type parsers.
+bool ParseSingleSubstitution(const ots::OpenTypeFile *file,
+                             const uint8_t *data, const size_t length);
+bool ParseMutipleSubstitution(const ots::OpenTypeFile *file,
+                              const uint8_t *data, const size_t length);
+bool ParseAlternateSubstitution(const ots::OpenTypeFile *file,
+                                const uint8_t *data, const size_t length);
+bool ParseLigatureSubstitution(const ots::OpenTypeFile *file,
+      const uint8_t *data, const size_t length);
+bool ParseContextSubstitution(const ots::OpenTypeFile *file,
+                              const uint8_t *data, const size_t length);
+bool ParseChainingContextSubstitution(const ots::OpenTypeFile *file,
+                                      const uint8_t *data,
+                                      const size_t length);
+bool ParseExtensionSubstitution(const ots::OpenTypeFile *file,
+                                const uint8_t *data, const size_t length);
+bool ParseReverseChainingContextSingleSubstitution(
+    const ots::OpenTypeFile *file, const uint8_t *data, const size_t length);
+
+const ots::LookupSubtableParser::TypeParser kGsubTypeParsers[] = {
+  {GSUB_TYPE_SINGLE, ParseSingleSubstitution},
+  {GSUB_TYPE_MULTIPLE, ParseMutipleSubstitution},
+  {GSUB_TYPE_ALTERNATE, ParseAlternateSubstitution},
+  {GSUB_TYPE_LIGATURE, ParseLigatureSubstitution},
+  {GSUB_TYPE_CONTEXT, ParseContextSubstitution},
+  {GSUB_TYPE_CHANGING_CONTEXT, ParseChainingContextSubstitution},
+  {GSUB_TYPE_EXTENSION_SUBSTITUTION, ParseExtensionSubstitution},
+  {GSUB_TYPE_REVERSE_CHAINING_CONTEXT_SINGLE,
+    ParseReverseChainingContextSingleSubstitution}
+};
+
+const ots::LookupSubtableParser kGsubLookupSubtableParser = {
+  GSUB_TYPE_RESERVED, GSUB_TYPE_EXTENSION_SUBSTITUTION, kGsubTypeParsers
+};
+
+// Lookup Type 1:
+// Single Substitution Subtable
+bool ParseSingleSubstitution(const ots::OpenTypeFile *file,
+                             const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage)) {
+    return OTS_FAILURE();
+  }
+
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+  if (format == 1) {
+    // Parse SingleSubstFormat1
+    int16_t delta_glyph_id = 0;
+    if (!subtable.ReadS16(&delta_glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (std::abs(delta_glyph_id) >= num_glyphs) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 2) {
+    // Parse SingleSubstFormat2
+    uint16_t glyph_count = 0;
+    if (!subtable.ReadU16(&glyph_count)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_count > num_glyphs) {
+      return OTS_FAILURE();
+    }
+    for (unsigned i = 0; i < glyph_count; ++i) {
+      uint16_t substitute = 0;
+      if (!subtable.ReadU16(&substitute)) {
+        return OTS_FAILURE();
+      }
+      if (substitute >= num_glyphs) {
+        OTS_WARNING("too large substitute: %u", substitute);
+        return OTS_FAILURE();
+      }
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  if (offset_coverage < subtable.offset() || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseSequenceTable(const uint8_t *data, const size_t length,
+                        const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t substitute = 0;
+    if (!subtable.ReadU16(&substitute)) {
+      return OTS_FAILURE();
+    }
+    if (substitute >= num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+// Lookup Type 2:
+// Multiple Substitution Subtable
+bool ParseMutipleSubstitution(const ots::OpenTypeFile *file,
+                              const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t sequence_count = 0;
+
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&sequence_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+  const unsigned sequence_end = static_cast<unsigned>(6) +
+      sequence_count * 2;
+  if (sequence_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < sequence_count; ++i) {
+    uint16_t offset_sequence = 0;
+    if (!subtable.ReadU16(&offset_sequence)) {
+      return OTS_FAILURE();
+    }
+    if (offset_sequence < sequence_end || offset_sequence >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseSequenceTable(data + offset_sequence, length - offset_sequence,
+                            num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  if (offset_coverage < sequence_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseAlternateSetTable(const uint8_t *data, const size_t length,
+                            const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t alternate = 0;
+    if (!subtable.ReadU16(&alternate)) {
+      return OTS_FAILURE();
+    }
+    if (alternate >= num_glyphs) {
+      OTS_WARNING("too arge alternate: %u", alternate);
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+// Lookup Type 3:
+// Alternate Substitution Subtable
+bool ParseAlternateSubstitution(const ots::OpenTypeFile *file,
+                                const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t alternate_set_count = 0;
+
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&alternate_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+  const unsigned alternate_set_end = static_cast<unsigned>(6) +
+      alternate_set_count * 2;
+  if (alternate_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < alternate_set_count; ++i) {
+    uint16_t offset_alternate_set = 0;
+    if (!subtable.ReadU16(&offset_alternate_set)) {
+      return OTS_FAILURE();
+    }
+    if (offset_alternate_set < alternate_set_end ||
+        offset_alternate_set >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseAlternateSetTable(data + offset_alternate_set,
+                                length - offset_alternate_set,
+                                num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  if (offset_coverage < alternate_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseLigatureTable(const uint8_t *data, const size_t length,
+                        const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t lig_glyph = 0;
+  uint16_t comp_count = 0;
+
+  if (!subtable.ReadU16(&lig_glyph) ||
+      !subtable.ReadU16(&comp_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (lig_glyph >= num_glyphs) {
+    OTS_WARNING("too large lig_glyph: %u", lig_glyph);
+    return OTS_FAILURE();
+  }
+  if (comp_count == 0 || comp_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < comp_count - static_cast<unsigned>(1); ++i) {
+    uint16_t component = 0;
+    if (!subtable.ReadU16(&component)) {
+      return OTS_FAILURE();
+    }
+    if (component >= num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseLigatureSetTable(const uint8_t *data, const size_t length,
+                           const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t ligature_count = 0;
+
+  if (!subtable.ReadU16(&ligature_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned ligature_end = static_cast<unsigned>(2) + ligature_count * 2;
+  if (ligature_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < ligature_count; ++i) {
+    uint16_t offset_ligature = 0;
+    if (!subtable.ReadU16(&offset_ligature)) {
+      return OTS_FAILURE();
+    }
+    if (offset_ligature < ligature_end || offset_ligature >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseLigatureTable(data + offset_ligature, length - offset_ligature,
+                            num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+// Lookup Type 4:
+// Ligature Substitution Subtable
+bool ParseLigatureSubstitution(const ots::OpenTypeFile *file,
+                               const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+  uint16_t lig_set_count = 0;
+
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&lig_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+  const unsigned ligature_set_end = static_cast<unsigned>(6) +
+      lig_set_count * 2;
+  if (ligature_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < lig_set_count; ++i) {
+    uint16_t offset_ligature_set = 0;
+    if (!subtable.ReadU16(&offset_ligature_set)) {
+      return OTS_FAILURE();
+    }
+    if (offset_ligature_set < ligature_set_end ||
+        offset_ligature_set >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseLigatureSetTable(data + offset_ligature_set,
+                               length - offset_ligature_set, num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  if (offset_coverage < ligature_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseSubstLookupRecord(ots::Buffer *subtable, const uint16_t num_glyphs,
+                            const uint16_t num_lookups) {
+  uint16_t sequence_index = 0;
+  uint16_t lookup_list_index = 0;
+
+  if (!subtable->ReadU16(&sequence_index) ||
+      !subtable->ReadU16(&lookup_list_index)) {
+    return OTS_FAILURE();
+  }
+  if (sequence_index >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (lookup_list_index >= num_lookups) {
+    return OTS_FAILURE();
+  }
+  return true;
+}
+
+// Lookup Type 5:
+// Contextual Substitution Subtable
+bool ParseContextSubstitution(const ots::OpenTypeFile *file,
+                              const uint8_t *data, const size_t length) {
+  return ots::ParseContextSubtable(data, length, file->maxp->num_glyphs,
+                                   file->gsub->num_lookups);
+}
+
+// Lookup Type 6:
+// Chaining Contextual Substitution Subtable
+bool ParseChainingContextSubstitution(const ots::OpenTypeFile *file,
+                                      const uint8_t *data,
+                                      const size_t length) {
+  return ots::ParseChainingContextSubtable(data, length,
+                                           file->maxp->num_glyphs,
+                                           file->gsub->num_lookups);
+}
+
+// Lookup Type 7:
+// Extension Substition
+bool ParseExtensionSubstitution(const ots::OpenTypeFile *file,
+                                const uint8_t *data, const size_t length) {
+  return ots::ParseExtensionSubtable(file, data, length,
+                                     &kGsubLookupSubtableParser);
+}
+
+// Lookup Type 8:
+// Reverse Chaining Contexual Single Substitution Subtable
+bool ParseReverseChainingContextSingleSubstitution(
+    const ots::OpenTypeFile *file, const uint8_t *data, const size_t length) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t offset_coverage = 0;
+
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&offset_coverage)) {
+    return OTS_FAILURE();
+  }
+
+  const uint16_t num_glyphs = file->maxp->num_glyphs;
+
+  uint16_t backtrack_glyph_count = 0;
+  if (!subtable.ReadU16(&backtrack_glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (backtrack_glyph_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  std::vector<uint16_t> offsets_backtrack;
+  offsets_backtrack.reserve(backtrack_glyph_count);
+  for (unsigned i = 0; i < backtrack_glyph_count; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    offsets_backtrack.push_back(offset);
+  }
+
+  uint16_t lookahead_glyph_count = 0;
+  if (!subtable.ReadU16(&lookahead_glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (lookahead_glyph_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  std::vector<uint16_t> offsets_lookahead;
+  offsets_lookahead.reserve(lookahead_glyph_count);
+  for (unsigned i = 0; i < lookahead_glyph_count; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    offsets_lookahead.push_back(offset);
+  }
+
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t substitute = 0;
+    if (!subtable.ReadU16(&substitute)) {
+      return OTS_FAILURE();
+    }
+    if (substitute >= num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  const unsigned substitute_end = static_cast<unsigned>(10) +
+      (backtrack_glyph_count + lookahead_glyph_count + glyph_count) * 2;
+  if (substitute_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+
+  if (offset_coverage < substitute_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < backtrack_glyph_count; ++i) {
+    if (offsets_backtrack[i] < substitute_end ||
+        offsets_backtrack[i] >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offsets_backtrack[i],
+                                 length - offsets_backtrack[i], num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < lookahead_glyph_count; ++i) {
+    if (offsets_lookahead[i] < substitute_end ||
+        offsets_lookahead[i] >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offsets_lookahead[i],
+                                 length - offsets_lookahead[i], num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+}  // namespace
+
+#define DROP_THIS_TABLE \
+  do { file->gsub->data = 0; file->gsub->length = 0; } while (0)
+
 namespace ots {
 
+// As far as I checked, following fonts contain invalid values in GSUB table.
+// OTS will drop their GSUB table.
+//
+// # too large substitute (value is 0xFFFF)
+// kaiu.ttf
+// mingliub2.ttf
+// mingliub1.ttf
+// mingliub0.ttf
+// GraublauWeb.otf
+// GraublauWebBold.otf
+//
+// # too large alternate (value is 0xFFFF)
+// ManchuFont.ttf
+//
+// # bad offset to lang sys table (NULL offset)
+// DejaVuMonoSansBold.ttf
+// DejaVuMonoSansBoldOblique.ttf
+// DejaVuMonoSansOblique.ttf
+// DejaVuSansMono-BoldOblique.ttf
+// DejaVuSansMono-Oblique.ttf
+// DejaVuSansMono-Bold.ttf
+//
+// # bad start coverage index
+// GenBasBI.ttf
+// GenBasI.ttf
+// AndBasR.ttf
+// GenBkBasI.ttf
+// CharisSILR.ttf
+// CharisSILBI.ttf
+// CharisSILI.ttf
+// CharisSILB.ttf
+// DoulosSILR.ttf
+// CharisSILBI.ttf
+// GenBkBasB.ttf
+// GenBkBasR.ttf
+// GenBkBasBI.ttf
+// GenBasB.ttf
+// GenBasR.ttf
+//
+// # glyph range is overlapping
+// KacstTitleL.ttf
+// KacstDecorative.ttf
+// KacstTitle.ttf
+// KacstArt.ttf
+// KacstPoster.ttf
+// KacstQurn.ttf
+// KacstDigital.ttf
+// KacstBook.ttf
+// KacstFarsi.ttf
+
 bool ots_gsub_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+  // Parsing gsub table requires |file->maxp->num_glyphs|
+  if (!file->maxp) {
+    return OTS_FAILURE();
+  }
+
   Buffer table(data, length);
 
   OpenTypeGSUB *gsub = new OpenTypeGSUB;
   file->gsub = gsub;
 
-  if (!table.Skip(length)) {
+  uint32_t version = 0;
+  uint16_t offset_script_list = 0;
+  uint16_t offset_feature_list = 0;
+  uint16_t offset_lookup_list = 0;
+  if (!table.ReadU32(&version) ||
+      !table.ReadU16(&offset_script_list) ||
+      !table.ReadU16(&offset_feature_list) ||
+      !table.ReadU16(&offset_lookup_list)) {
     return OTS_FAILURE();
   }
 
+  if (version != 0x00010000) {
+    OTS_WARNING("bad GSUB version");
+    DROP_THIS_TABLE;
+    return true;
+  }
+  if ((offset_script_list < kGsubHeaderSize ||
+       offset_script_list >= length) ||
+      (offset_feature_list < kGsubHeaderSize ||
+       offset_feature_list >= length) ||
+      (offset_lookup_list < kGsubHeaderSize ||
+       offset_lookup_list >= length)) {
+    OTS_WARNING("bad offset in GSUB header");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  if (!ParseLookupListTable(file, data + offset_lookup_list,
+                            length - offset_lookup_list,
+                            &kGsubLookupSubtableParser,
+                            &gsub->num_lookups)) {
+    OTS_WARNING("faild to parse lookup list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  uint16_t num_features = 0;
+  if (!ParseFeatureListTable(data + offset_feature_list,
+                             length - offset_feature_list, gsub->num_lookups,
+                             &num_features)) {
+    OTS_WARNING("faild to parse feature list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
+  if (!ParseScriptListTable(data + offset_script_list,
+                            length - offset_script_list, num_features)) {
+    OTS_WARNING("faild to parse script list table");
+    DROP_THIS_TABLE;
+    return true;
+  }
+
   gsub->data = data;
   gsub->length = length;
   return true;
 }
 
 bool ots_gsub_should_serialise(OpenTypeFile *file) {
-  return file->preserve_otl && file->gsub;
+  const bool needed_tables_dropped =
+      (file->gdef && file->gdef->data == NULL) ||
+      (file->gpos && file->gpos->data == NULL);
+  return file->gsub != NULL && file->gsub->data != NULL
+      && !needed_tables_dropped;
 }
 
 bool ots_gsub_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeGSUB *gsub = file->gsub;
-
-  if (!out->Write(gsub->data, gsub->length)) {
+  if (!out->Write(file->gsub->data, file->gsub->length)) {
     return OTS_FAILURE();
   }
 
@@ -43,3 +688,4 @@ void ots_gsub_free(OpenTypeFile *file) {
 }
 
 }  // namespace ots
+
diff --git a/gfx/ots/src/gsub.h b/gfx/ots/src/gsub.h
index 7a05e6e73a26..f6f8cd3b15cf 100644
--- a/gfx/ots/src/gsub.h
+++ b/gfx/ots/src/gsub.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 Mozilla Foundation. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,10 +10,20 @@
 namespace ots {
 
 struct OpenTypeGSUB {
+  OpenTypeGSUB()
+      : num_lookups(0),
+        data(NULL),
+        length(0) {
+  }
+
+  // Number of lookups in GPSUB table
+  uint16_t num_lookups;
+
   const uint8_t *data;
-  uint32_t length;
+  size_t length;
 };
 
 }  // namespace ots
 
 #endif  // OTS_GSUB_H_
+
diff --git a/gfx/ots/src/head.cc b/gfx/ots/src/head.cc
index 16f3a6eca2dd..110d6736c5fc 100644
--- a/gfx/ots/src/head.cc
+++ b/gfx/ots/src/head.cc
@@ -115,7 +115,7 @@ bool ots_head_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_head_should_serialise(OpenTypeFile *file) {
-  return file->head;
+  return file->head != NULL;
 }
 
 bool ots_head_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/hhea.cc b/gfx/ots/src/hhea.cc
index 4d7e6237f7dc..0342ba5bcb34 100644
--- a/gfx/ots/src/hhea.cc
+++ b/gfx/ots/src/hhea.cc
@@ -9,142 +9,41 @@
 
 // hhea - Horizontal Header
 // http://www.microsoft.com/opentype/otspec/hhea.htm
-// vhea - Vertical Header
-// http://www.microsoft.com/opentype/otspec/vhea.htm
-// This file is used for both tables because they share the same structures.
 
 namespace ots {
 
-bool ots_Xhea_parse(OpenTypeFile *file, const uint8_t *data, size_t length,
-                    OpenTypeHHEA **out_hhea) {
+bool ots_hhea_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   Buffer table(data, length);
   OpenTypeHHEA *hhea = new OpenTypeHHEA;
-  *out_hhea = hhea;
+  file->hhea = hhea;
 
-  if (!table.ReadU32(&hhea->version)) {
+  if (!table.ReadU32(&hhea->header.version)) {
     return OTS_FAILURE();
   }
-  if (hhea->version >> 16 != 1) {
+  if (hhea->header.version >> 16 != 1) {
     return OTS_FAILURE();
   }
 
-  if (!table.ReadS16(&hhea->ascent) ||
-      !table.ReadS16(&hhea->descent) ||
-      !table.ReadS16(&hhea->linegap) ||
-      !table.ReadU16(&hhea->adv_width_max) ||
-      !table.ReadS16(&hhea->min_lsb) ||
-      !table.ReadS16(&hhea->min_rsb) ||
-      !table.ReadS16(&hhea->x_max_extent) ||
-      !table.ReadS16(&hhea->caret_slope_rise) ||
-      !table.ReadS16(&hhea->caret_slope_run) ||
-      !table.ReadS16(&hhea->caret_offset)) {
-    return OTS_FAILURE();
-  }
-
-  if (hhea->ascent < 0) {
-    OTS_WARNING("bad ascent: %d", hhea->ascent);
-    hhea->ascent = 0;
-  }
-  if (hhea->linegap < 0) {
-    OTS_WARNING("bad linegap: %d", hhea->linegap);
-    hhea->linegap = 0;
-  }
-
-  if (!file->head) {
-    return OTS_FAILURE();
-  }
-
-  // if the font is non-slanted, caret_offset should be zero.
-  if (!(file->head->mac_style & 2) &&
-      (hhea->caret_offset != 0)) {
-    OTS_WARNING("bad caret offset: %d", hhea->caret_offset);
-    hhea->caret_offset = 0;
-  }
-
-  // skip the reserved bytes
-  if (!table.Skip(8)) {
-    return OTS_FAILURE();
-  }
-
-  int16_t data_format;
-  if (!table.ReadS16(&data_format)) {
-    return OTS_FAILURE();
-  }
-  if (data_format) {
-    return OTS_FAILURE();
-  }
-
-  if (!table.ReadU16(&hhea->num_hmetrics)) {
-    return OTS_FAILURE();
-  }
-
-  if (!file->maxp) {
-    return OTS_FAILURE();
-  }
-
-  if (hhea->num_hmetrics > file->maxp->num_glyphs) {
+  if (!ParseMetricsHeader(file, &table, &hhea->header)) {
     return OTS_FAILURE();
   }
 
   return true;
 }
 
-bool ots_hhea_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
-  return ots_Xhea_parse(file, data, length, &file->hhea);
-}
-
-bool ots_vhea_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
-  return ots_Xhea_parse(file, data, length, &file->vhea);
-}
-
 bool ots_hhea_should_serialise(OpenTypeFile *file) {
-  return file->hhea;
-}
-
-bool ots_vhea_should_serialise(OpenTypeFile *file) {
-  return file->preserve_otl && file->vhea;
-}
-
-bool ots_Xhea_serialise(OTSStream *out, OpenTypeFile *file, const OpenTypeHHEA *hhea) {
-  if (!out->WriteS16(hhea->ascent) ||
-      !out->WriteS16(hhea->descent) ||
-      !out->WriteS16(hhea->linegap) ||
-      !out->WriteU16(hhea->adv_width_max) ||
-      !out->WriteS16(hhea->min_lsb) ||
-      !out->WriteS16(hhea->min_rsb) ||
-      !out->WriteS16(hhea->x_max_extent) ||
-      !out->WriteS16(hhea->caret_slope_rise) ||
-      !out->WriteS16(hhea->caret_slope_run) ||
-      !out->WriteS16(hhea->caret_offset) ||
-      !out->WriteR64(0) ||  // reserved
-      !out->WriteS16(0) ||  // metric data format
-      !out->WriteU16(hhea->num_hmetrics)) {
-    return OTS_FAILURE();
-  }
-
-  return true;
+  return file->hhea != NULL;
 }
 
 bool ots_hhea_serialise(OTSStream *out, OpenTypeFile *file) {
-  if (!out->WriteU32(0x00010000)) {
+  if (!SerialiseMetricsHeader(out, &file->hhea->header)) {
     return OTS_FAILURE();
   }
-  return ots_Xhea_serialise(out, file, file->hhea);
-}
-
-bool ots_vhea_serialise(OTSStream *out, OpenTypeFile *file) {
-  if (!out->WriteU32(file->vhea->version)) {
-    return OTS_FAILURE();
-  }
-  return ots_Xhea_serialise(out, file, file->vhea);
+  return true;
 }
 
 void ots_hhea_free(OpenTypeFile *file) {
   delete file->hhea;
 }
 
-void ots_vhea_free(OpenTypeFile *file) {
-  delete file->vhea;
-}
-
 }  // namespace ots
diff --git a/gfx/ots/src/hhea.h b/gfx/ots/src/hhea.h
index 5c2192d7bcd9..bdea9aa0da4b 100644
--- a/gfx/ots/src/hhea.h
+++ b/gfx/ots/src/hhea.h
@@ -5,23 +5,13 @@
 #ifndef OTS_HHEA_H_
 #define OTS_HHEA_H_
 
+#include "metrics.h"
 #include "ots.h"
 
 namespace ots {
 
 struct OpenTypeHHEA {
-  uint32_t version;
-  int16_t ascent;
-  int16_t descent;
-  int16_t linegap;
-  uint16_t adv_width_max;
-  int16_t min_lsb;
-  int16_t min_rsb;
-  int16_t x_max_extent;
-  int16_t caret_slope_rise;
-  int16_t caret_slope_run;
-  int16_t caret_offset;
-  uint16_t num_hmetrics;
+  OpenTypeMetricsHeader header;
 };
 
 }  // namespace ots
diff --git a/gfx/ots/src/hmtx.cc b/gfx/ots/src/hmtx.cc
index 60e6c7535cc5..ea7491d2e38c 100644
--- a/gfx/ots/src/hmtx.cc
+++ b/gfx/ots/src/hmtx.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <new>
 #include "hmtx.h"
 
 #include "hhea.h"
@@ -10,125 +9,39 @@
 
 // hmtx - Horizontal Metrics
 // http://www.microsoft.com/opentype/otspec/hmtx.htm
-// vmtx - Vertical Metrics
-// http://www.microsoft.com/opentype/otspec/vmtx.htm
-// This file is used for both tables because they share the same structures.
 
 namespace ots {
 
-bool ots_Xmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length,
-                    const OpenTypeHHEA *hhea, OpenTypeHMTX **out_hmtx) {
+bool ots_hmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   Buffer table(data, length);
   OpenTypeHMTX *hmtx = new OpenTypeHMTX;
-  *out_hmtx = hmtx;
+  file->hmtx = hmtx;
 
-  if (!hhea || !file->maxp) {
+  if (!file->hhea || !file->maxp) {
     return OTS_FAILURE();
   }
 
-  // |num_hmetrics| is a uint16_t, so it's bounded < 65536. This limits that
-  // amount of memory that we'll allocate for this to a sane amount.
-  const unsigned num_hmetrics = hhea->num_hmetrics;
-
-  if (num_hmetrics > file->maxp->num_glyphs) {
+  if (!ParseMetricsTable(&table, file->maxp->num_glyphs,
+                         &file->hhea->header, &hmtx->metrics)) {
     return OTS_FAILURE();
   }
-  if (!num_hmetrics) {
-    return OTS_FAILURE();
-  }
-  const unsigned num_lsbs = file->maxp->num_glyphs - num_hmetrics;
-
-  hmtx->metrics.reserve(num_hmetrics);
-  for (unsigned i = 0; i < num_hmetrics; ++i) {
-    uint16_t adv = 0;
-    int16_t lsb = 0;
-    if (!table.ReadU16(&adv) || !table.ReadS16(&lsb)) {
-      return OTS_FAILURE();
-    }
-
-    // Since so many fonts don't have proper value on |adv| and |lsb|,
-    // we should not call ots_failure() here. For example, about 20% of fonts
-    // in http://www.princexml.com/fonts/ (200+ fonts) fails these tests.
-    if (adv > hhea->adv_width_max) {
-      OTS_WARNING("bad adv: %u > %u", adv, hhea->adv_width_max);
-      adv = hhea->adv_width_max;
-    }
-    if (lsb < hhea->min_lsb) {
-      OTS_WARNING("bad lsb: %d < %d", lsb, hhea->min_lsb);
-      lsb = hhea->min_lsb;
-    }
-
-    hmtx->metrics.push_back(std::make_pair(adv, lsb));
-  }
-
-  hmtx->lsbs.reserve(num_lsbs);
-  for (unsigned i = 0; i < num_lsbs; ++i) {
-    int16_t lsb;
-    if (!table.ReadS16(&lsb)) {
-      // Some Japanese fonts (e.g., mona.ttf) fail this test.
-      return OTS_FAILURE();
-    }
-
-    if (lsb < hhea->min_lsb) {
-      // The same as above. Three fonts in http://www.fontsquirrel.com/fontface
-      // (e.g., Notice2Std.otf) have weird lsb values.
-      OTS_WARNING("bad lsb: %d < %d", lsb, hhea->min_lsb);
-      lsb = hhea->min_lsb;
-    }
-
-    hmtx->lsbs.push_back(lsb);
-  }
 
   return true;
 }
 
-bool ots_hmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
-  return ots_Xmtx_parse(file, data, length, file->hhea, &file->hmtx);
-}
-
-bool ots_vmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
-  return ots_Xmtx_parse(file, data, length, file->vhea, &file->vmtx);
-}
-
 bool ots_hmtx_should_serialise(OpenTypeFile *file) {
-  return file->hmtx;
-}
-
-bool ots_vmtx_should_serialise(OpenTypeFile *file) {
-  return file->preserve_otl && file->vmtx;
-}
-
-bool ots_Xmtx_serialise(OTSStream *out, OpenTypeFile *file, const OpenTypeHMTX *hmtx) {
-  for (unsigned i = 0; i < hmtx->metrics.size(); ++i) {
-    if (!out->WriteU16(hmtx->metrics[i].first) ||
-        !out->WriteS16(hmtx->metrics[i].second)) {
-      return OTS_FAILURE();
-    }
-  }
-
-  for (unsigned i = 0; i < hmtx->lsbs.size(); ++i) {
-    if (!out->WriteS16(hmtx->lsbs[i])) {
-      return OTS_FAILURE();
-    }
-  }
-
-  return true;
+  return file->hmtx != NULL;
 }
 
 bool ots_hmtx_serialise(OTSStream *out, OpenTypeFile *file) {
-  return ots_Xmtx_serialise(out, file, file->hmtx);
-}
-
-bool ots_vmtx_serialise(OTSStream *out, OpenTypeFile *file) {
-  return ots_Xmtx_serialise(out, file, file->vmtx);
+  if (!SerialiseMetricsTable(out, &file->hmtx->metrics)) {
+    return OTS_FAILURE();
+  }
+  return true;
 }
 
 void ots_hmtx_free(OpenTypeFile *file) {
   delete file->hmtx;
 }
 
-void ots_vmtx_free(OpenTypeFile *file) {
-  delete file->vmtx;
-}
-
 }  // namespace ots
diff --git a/gfx/ots/src/hmtx.h b/gfx/ots/src/hmtx.h
index 79a9cb6ddc89..435949c5e4cb 100644
--- a/gfx/ots/src/hmtx.h
+++ b/gfx/ots/src/hmtx.h
@@ -5,16 +5,13 @@
 #ifndef OTS_HMTX_H_
 #define OTS_HMTX_H_
 
-#include <utility>  // std::pair
-#include <vector>
-
+#include "metrics.h"
 #include "ots.h"
 
 namespace ots {
 
 struct OpenTypeHMTX {
-  std::vector<std::pair<uint16_t, int16_t> > metrics;
-  std::vector<int16_t> lsbs;
+  OpenTypeMetricsTable metrics;
 };
 
 }  // namespace ots
diff --git a/gfx/ots/src/kern.cc b/gfx/ots/src/kern.cc
index 9f150ac879bb..d0f0a65d946f 100644
--- a/gfx/ots/src/kern.cc
+++ b/gfx/ots/src/kern.cc
@@ -155,7 +155,7 @@ bool ots_kern_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 
 bool ots_kern_should_serialise(OpenTypeFile *file) {
   if (!file->glyf) return false;  // this table is not for CFF fonts.
-  return file->kern;
+  return file->kern != NULL;
 }
 
 bool ots_kern_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/layout.cc b/gfx/ots/src/layout.cc
new file mode 100644
index 000000000000..9877e6c05f62
--- /dev/null
+++ b/gfx/ots/src/layout.cc
@@ -0,0 +1,1477 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "layout.h"
+
+#include <limits>
+#include <vector>
+
+#include "gdef.h"
+
+// OpenType Layout Common Table Formats
+// http://www.microsoft.com/typography/otspec/chapter2.htm
+
+namespace {
+
+// The 'DFLT' tag of script table.
+const uint32_t kScriptTableTagDflt = 0x44464c54;
+// The value which represents there is no required feature index.
+const uint16_t kNoRequiredFeatureIndexDefined = 0xFFFF;
+// The lookup flag bit which indicates existence of MarkFilteringSet.
+const uint16_t kUseMarkFilteringSetBit = 0x0010;
+// The lookup flags which require GDEF table.
+const uint16_t kGdefRequiredFlags = 0x0002 | 0x0004 | 0x0008;
+// The mask for MarkAttachmentType.
+const uint16_t kMarkAttachmentTypeMask = 0xFF00;
+// The maximum type number of format for device tables.
+const uint16_t kMaxDeltaFormatType = 3;
+// The maximum number of class value.
+const uint16_t kMaxClassDefValue = 0xFFFF;
+
+struct ScriptRecord {
+  uint32_t tag;
+  uint16_t offset;
+};
+
+struct LangSysRecord {
+  uint32_t tag;
+  uint16_t offset;
+};
+
+struct FeatureRecord {
+  uint32_t tag;
+  uint16_t offset;
+};
+
+bool ParseLangSysTable(ots::Buffer *subtable, const uint32_t tag,
+                       const uint16_t num_features) {
+  uint16_t offset_lookup_order = 0;
+  uint16_t req_feature_index = 0;
+  uint16_t feature_count = 0;
+  if (!subtable->ReadU16(&offset_lookup_order) ||
+      !subtable->ReadU16(&req_feature_index) ||
+      !subtable->ReadU16(&feature_count)) {
+    return OTS_FAILURE();
+  }
+  // |offset_lookup_order| is reserved and should be NULL.
+  if (offset_lookup_order != 0) {
+    return OTS_FAILURE();
+  }
+  if (req_feature_index != kNoRequiredFeatureIndexDefined &&
+      req_feature_index >= num_features) {
+    return OTS_FAILURE();
+  }
+  if (feature_count > num_features) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < feature_count; ++i) {
+    uint16_t feature_index = 0;
+    if (!subtable->ReadU16(&feature_index)) {
+      return OTS_FAILURE();
+    }
+    if (feature_index >= num_features) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParseScriptTable(const uint8_t *data, const size_t length,
+                      const uint32_t tag, const uint16_t num_features) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_default_lang_sys = 0;
+  uint16_t lang_sys_count = 0;
+  if (!subtable.ReadU16(&offset_default_lang_sys) ||
+      !subtable.ReadU16(&lang_sys_count)) {
+    return OTS_FAILURE();
+  }
+
+  // The spec requires a script table for 'DFLT' tag must contain non-NULL
+  // |offset_default_lang_sys| and |lang_sys_count| == 0
+  if (tag == kScriptTableTagDflt &&
+      (offset_default_lang_sys == 0 || lang_sys_count != 0)) {
+    OTS_WARNING("DFLT table doesn't satisfy the spec.");
+    return OTS_FAILURE();
+  }
+
+  const unsigned lang_sys_record_end = static_cast<unsigned>(4) +
+      lang_sys_count * 6;
+  if (lang_sys_record_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+
+  std::vector<LangSysRecord> lang_sys_records;
+  lang_sys_records.resize(lang_sys_count);
+  uint32_t last_tag = 0;
+  for (unsigned i = 0; i < lang_sys_count; ++i) {
+    if (!subtable.ReadU32(&lang_sys_records[i].tag) ||
+        !subtable.ReadU16(&lang_sys_records[i].offset)) {
+      return OTS_FAILURE();
+    }
+    // The record array must store the records alphabetically by tag
+    if (last_tag != 0 && last_tag > lang_sys_records[i].tag) {
+      return OTS_FAILURE();
+    }
+    if (lang_sys_records[i].offset < lang_sys_record_end ||
+        lang_sys_records[i].offset >= length) {
+      OTS_WARNING("bad offset to lang sys table: %x",
+                  lang_sys_records[i].offset);
+      return OTS_FAILURE();
+    }
+    last_tag = lang_sys_records[i].tag;
+  }
+
+  // Check lang sys tables
+  for (unsigned i = 0; i < lang_sys_count; ++i) {
+    subtable.set_offset(lang_sys_records[i].offset);
+    if (!ParseLangSysTable(&subtable, lang_sys_records[i].tag, num_features)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseFeatureTable(const uint8_t *data, const size_t length,
+                       const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_feature_params = 0;
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&offset_feature_params) ||
+      !subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned feature_table_end = static_cast<unsigned>(4) +
+      num_lookups * 2;
+  if (feature_table_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  // |offset_feature_params| is generally set to NULL.
+  if (offset_feature_params != 0 &&
+      (offset_feature_params < feature_table_end ||
+       offset_feature_params >= length)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    uint16_t lookup_index = 0;
+    if (!subtable.ReadU16(&lookup_index)) {
+      return OTS_FAILURE();
+    }
+    // lookup index starts with 0.
+    if (lookup_index >= num_lookups) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParseLookupTable(ots::OpenTypeFile *file, const uint8_t *data,
+                      const size_t length,
+                      const ots::LookupSubtableParser* parser) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t lookup_type = 0;
+  uint16_t lookup_flag = 0;
+  uint16_t subtable_count = 0;
+  if (!subtable.ReadU16(&lookup_type) ||
+      !subtable.ReadU16(&lookup_flag) ||
+      !subtable.ReadU16(&subtable_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (lookup_type == 0 || lookup_type > parser->num_types) {
+    return OTS_FAILURE();
+  }
+
+  // Check lookup flags.
+  if ((lookup_flag & kGdefRequiredFlags) &&
+      (!file->gdef || !file->gdef->has_glyph_class_def)) {
+    return OTS_FAILURE();
+  }
+  if ((lookup_flag & kMarkAttachmentTypeMask) &&
+      (!file->gdef || !file->gdef->has_mark_attachment_class_def)) {
+    return OTS_FAILURE();
+  }
+  bool use_mark_filtering_set = false;
+  if (lookup_flag & kUseMarkFilteringSetBit) {
+    if (!file->gdef || !file->gdef->has_mark_glyph_sets_def) {
+      return OTS_FAILURE();
+    }
+    use_mark_filtering_set = true;
+  }
+
+  std::vector<uint16_t> subtables;
+  subtables.reserve(subtable_count);
+  // If the |kUseMarkFilteringSetBit| of |lookup_flag| is set,
+  // extra 2 bytes will follow after subtable offset array.
+  const unsigned lookup_table_end =
+      static_cast<unsigned>(use_mark_filtering_set ? 8 : 6) +
+      subtable_count * 2;
+  if (lookup_table_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < subtable_count; ++i) {
+    uint16_t offset_subtable = 0;
+    if (!subtable.ReadU16(&offset_subtable)) {
+      return OTS_FAILURE();
+    }
+    if (offset_subtable < lookup_table_end ||
+        offset_subtable >= length) {
+      return OTS_FAILURE();
+    }
+    subtables.push_back(offset_subtable);
+  }
+  if (subtables.size() != subtable_count) {
+    return OTS_FAILURE();
+  }
+
+  if (use_mark_filtering_set) {
+    uint16_t mark_filtering_set = 0;
+    if (!subtable.ReadU16(&mark_filtering_set)) {
+      return OTS_FAILURE();
+    }
+    if (file->gdef->num_mark_glyph_sets == 0 ||
+        mark_filtering_set >= file->gdef->num_mark_glyph_sets) {
+      return OTS_FAILURE();
+    }
+  }
+
+  // Parse lookup subtables for this lookup type.
+  for (unsigned i = 0; i < subtable_count; ++i) {
+    if (!parser->Parse(file, data + subtables[i], length - subtables[i],
+                       lookup_type)) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParseClassDefFormat1(const uint8_t *data, size_t length,
+                          const uint16_t num_glyphs,
+                          const uint16_t num_classes) {
+  ots::Buffer subtable(data, length);
+
+  // Skip format field.
+  if (!subtable.Skip(2)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t start_glyph = 0;
+  if (!subtable.ReadU16(&start_glyph)) {
+    return OTS_FAILURE();
+  }
+  if (start_glyph > num_glyphs) {
+    OTS_WARNING("bad start glyph ID: %u", start_glyph);
+    return OTS_FAILURE();
+  }
+
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    OTS_WARNING("bad glyph count: %u", glyph_count);
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t class_value = 0;
+    if (!subtable.ReadU16(&class_value)) {
+      return OTS_FAILURE();
+    }
+    if (class_value > num_classes) {
+      OTS_WARNING("bad class value: %u", class_value);
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseClassDefFormat2(const uint8_t *data, size_t length,
+                          const uint16_t num_glyphs,
+                          const uint16_t num_classes) {
+  ots::Buffer subtable(data, length);
+
+  // Skip format field.
+  if (!subtable.Skip(2)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t range_count = 0;
+  if (!subtable.ReadU16(&range_count)) {
+    return OTS_FAILURE();
+  }
+  if (range_count > num_glyphs) {
+    OTS_WARNING("bad range count: %u", range_count);
+    return OTS_FAILURE();
+  }
+
+  uint16_t last_end = 0;
+  for (unsigned i = 0; i < range_count; ++i) {
+    uint16_t start = 0;
+    uint16_t end = 0;
+    uint16_t class_value = 0;
+    if (!subtable.ReadU16(&start) ||
+        !subtable.ReadU16(&end) ||
+        !subtable.ReadU16(&class_value)) {
+      return OTS_FAILURE();
+    }
+    if (start > end || (last_end && start <= last_end)) {
+      OTS_WARNING("glyph range is overlapping.");
+      return OTS_FAILURE();
+    }
+    if (class_value > num_classes) {
+      OTS_WARNING("bad class value: %u", class_value);
+      return OTS_FAILURE();
+    }
+    last_end = end;
+  }
+
+  return true;
+}
+
+bool ParseCoverageFormat1(const uint8_t *data, size_t length,
+                          const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  // Skip format field.
+  if (!subtable.Skip(2)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t glyph_count = 0;
+  if (!subtable.ReadU16(&glyph_count)) {
+    return OTS_FAILURE();
+  }
+  if (glyph_count > num_glyphs) {
+    OTS_WARNING("bad glyph count: %u", glyph_count);
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t glyph = 0;
+    if (!subtable.ReadU16(&glyph)) {
+      return OTS_FAILURE();
+    }
+    if (glyph > num_glyphs) {
+      OTS_WARNING("bad glyph ID: %u", glyph);
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseCoverageFormat2(const uint8_t *data, size_t length,
+                          const uint16_t num_glyphs) {
+  ots::Buffer subtable(data, length);
+
+  // Skip format field.
+  if (!subtable.Skip(2)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t range_count = 0;
+  if (!subtable.ReadU16(&range_count)) {
+    return OTS_FAILURE();
+  }
+  if (range_count > num_glyphs) {
+    OTS_WARNING("bad range count: %u", range_count);
+    return OTS_FAILURE();
+  }
+  uint16_t last_end = 0;
+  uint16_t last_start_coverage_index = 0;
+  for (unsigned i = 0; i < range_count; ++i) {
+    uint16_t start = 0;
+    uint16_t end = 0;
+    uint16_t start_coverage_index = 0;
+    if (!subtable.ReadU16(&start) ||
+        !subtable.ReadU16(&end) ||
+        !subtable.ReadU16(&start_coverage_index)) {
+      return OTS_FAILURE();
+    }
+    if (start > end || (last_end && start <= last_end)) {
+      OTS_WARNING("glyph range is overlapping.");
+      return OTS_FAILURE();
+    }
+    if (start_coverage_index != last_start_coverage_index) {
+      OTS_WARNING("bad start coverage index.");
+      return OTS_FAILURE();
+    }
+    last_end = end;
+    last_start_coverage_index += end - start + 1;
+  }
+
+  return true;
+}
+
+// Parsers for Contextual subtables in GSUB/GPOS tables.
+
+bool ParseLookupRecord(ots::Buffer *subtable, const uint16_t num_glyphs,
+                       const uint16_t num_lookups) {
+  uint16_t sequence_index = 0;
+  uint16_t lookup_list_index = 0;
+  if (!subtable->ReadU16(&sequence_index) ||
+      !subtable->ReadU16(&lookup_list_index)) {
+    return OTS_FAILURE();
+  }
+  if (sequence_index >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (lookup_list_index >= num_lookups) {
+    return OTS_FAILURE();
+  }
+  return true;
+}
+
+bool ParseRuleSubtable(const uint8_t *data, const size_t length,
+                       const uint16_t num_glyphs,
+                       const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t glyph_count = 0;
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&glyph_count) ||
+      !subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (glyph_count == 0 || glyph_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count - static_cast<unsigned>(1); ++i) {
+    uint16_t glyph_id = 0;
+    if (!subtable.ReadU16(&glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_id > num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParseRuleSetTable(const uint8_t *data, const size_t length,
+                       const uint16_t num_glyphs,
+                       const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t rule_count = 0;
+  if (!subtable.ReadU16(&rule_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned rule_end = static_cast<unsigned>(2) +
+      rule_count * 2;
+  if (rule_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < rule_count; ++i) {
+    uint16_t offset_rule = 0;
+    if (!subtable.ReadU16(&offset_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_rule < rule_end || offset_rule >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseRuleSubtable(data + offset_rule, length - offset_rule,
+                           num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseContextFormat1(const uint8_t *data, const size_t length,
+                         const uint16_t num_glyphs,
+                         const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_coverage = 0;
+  uint16_t rule_set_count = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&rule_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned rule_set_end = static_cast<unsigned>(6) +
+      rule_set_count * 2;
+  if (rule_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage < rule_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < rule_set_count; ++i) {
+    uint16_t offset_rule = 0;
+    if (!subtable.ReadU16(&offset_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_rule < rule_set_end || offset_rule >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseRuleSetTable(data + offset_rule, length - offset_rule,
+                           num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseClassRuleTable(const uint8_t *data, const size_t length,
+                         const uint16_t num_glyphs,
+                         const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t glyph_count = 0;
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&glyph_count) ||
+      !subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (glyph_count == 0 || glyph_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+
+  // ClassRule table contains an array of classes. Each value of classes
+  // could take arbitrary values including zero so we don't check these value.
+  const unsigned num_classes = glyph_count - static_cast<unsigned>(1);
+  if (!subtable.Skip(2 * num_classes)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+  return true;
+}
+
+bool ParseClassSetTable(const uint8_t *data, const size_t length,
+                        const uint16_t num_glyphs,
+                        const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t class_rule_count = 0;
+  if (!subtable.ReadU16(&class_rule_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned class_rule_end = static_cast<unsigned>(2) +
+      class_rule_count * 2;
+  if (class_rule_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < class_rule_count; ++i) {
+    uint16_t offset_class_rule = 0;
+    if (!subtable.ReadU16(&offset_class_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_class_rule < class_rule_end || offset_class_rule >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseClassRuleTable(data + offset_class_rule,
+                             length - offset_class_rule, num_glyphs,
+                             num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseContextFormat2(const uint8_t *data, const size_t length,
+                            const uint16_t num_glyphs,
+                            const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_coverage = 0;
+  uint16_t offset_class_def = 0;
+  uint16_t class_set_cnt = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&offset_class_def) ||
+      !subtable.ReadU16(&class_set_cnt)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned class_set_end = static_cast<unsigned>(8) +
+      class_set_cnt * 2;
+  if (class_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage < class_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  if (offset_class_def < class_set_end || offset_class_def >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseClassDefTable(data + offset_class_def,
+                               length - offset_class_def,
+                               num_glyphs, kMaxClassDefValue)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < class_set_cnt; ++i) {
+    uint16_t offset_class_rule = 0;
+    if (!subtable.ReadU16(&offset_class_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_class_rule) {
+      if (offset_class_rule < class_set_end || offset_class_rule >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ParseClassSetTable(data + offset_class_rule,
+                              length - offset_class_rule, num_glyphs,
+                              num_lookups)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+
+  return true;
+}
+
+bool ParseContextFormat3(const uint8_t *data, const size_t length,
+                         const uint16_t num_glyphs,
+                         const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t glyph_count = 0;
+  uint16_t lookup_count = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&glyph_count) ||
+      !subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (glyph_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  const unsigned lookup_record_end = static_cast<unsigned>(6) +
+      glyph_count * 2 + lookup_count * 4;
+  if (lookup_record_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < glyph_count; ++i) {
+    uint16_t offset_coverage = 0;
+    if (!subtable.ReadU16(&offset_coverage)) {
+      return OTS_FAILURE();
+    }
+    if (offset_coverage < lookup_record_end || offset_coverage >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offset_coverage,
+                                 length - offset_coverage, num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+// Parsers for Chaning Contextual subtables in GSUB/GPOS tables.
+
+bool ParseChainRuleSubtable(const uint8_t *data, const size_t length,
+                            const uint16_t num_glyphs,
+                            const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t backtrack_count = 0;
+  if (!subtable.ReadU16(&backtrack_count)) {
+    return OTS_FAILURE();
+  }
+  if (backtrack_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < backtrack_count; ++i) {
+    uint16_t glyph_id = 0;
+    if (!subtable.ReadU16(&glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_id > num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  uint16_t input_count = 0;
+  if (!subtable.ReadU16(&input_count)) {
+    return OTS_FAILURE();
+  }
+  if (input_count == 0 || input_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < input_count - static_cast<unsigned>(1); ++i) {
+    uint16_t glyph_id = 0;
+    if (!subtable.ReadU16(&glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_id > num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  uint16_t lookahead_count = 0;
+  if (!subtable.ReadU16(&lookahead_count)) {
+    return OTS_FAILURE();
+  }
+  if (lookahead_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < lookahead_count; ++i) {
+    uint16_t glyph_id = 0;
+    if (!subtable.ReadU16(&glyph_id)) {
+      return OTS_FAILURE();
+    }
+    if (glyph_id > num_glyphs) {
+      return OTS_FAILURE();
+    }
+  }
+
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainRuleSetTable(const uint8_t *data, const size_t length,
+                            const uint16_t num_glyphs,
+                            const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t chain_rule_count = 0;
+  if (!subtable.ReadU16(&chain_rule_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned chain_rule_end = static_cast<unsigned>(2) +
+      chain_rule_count * 2;
+  if (chain_rule_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < chain_rule_count; ++i) {
+    uint16_t offset_chain_rule = 0;
+    if (!subtable.ReadU16(&offset_chain_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_chain_rule < chain_rule_end || offset_chain_rule >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseChainRuleSubtable(data + offset_chain_rule,
+                                length - offset_chain_rule,
+                                num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainContextFormat1(const uint8_t *data, const size_t length,
+                              const uint16_t num_glyphs,
+                              const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_coverage = 0;
+  uint16_t chain_rule_set_count = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&chain_rule_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned chain_rule_set_end = static_cast<unsigned>(6) +
+      chain_rule_set_count * 2;
+  if (chain_rule_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage < chain_rule_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < chain_rule_set_count; ++i) {
+    uint16_t offset_chain_rule_set = 0;
+    if (!subtable.ReadU16(&offset_chain_rule_set)) {
+      return OTS_FAILURE();
+    }
+    if (offset_chain_rule_set < chain_rule_set_end ||
+        offset_chain_rule_set >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseChainRuleSetTable(data + offset_chain_rule_set,
+                                   length - offset_chain_rule_set,
+                                   num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainClassRuleSubtable(const uint8_t *data, const size_t length,
+                                 const uint16_t num_glyphs,
+                                 const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  // In this subtable, we don't check the value of classes for now since
+  // these could take arbitrary values.
+
+  uint16_t backtrack_count = 0;
+  if (!subtable.ReadU16(&backtrack_count)) {
+    return OTS_FAILURE();
+  }
+  if (backtrack_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (!subtable.Skip(2 * backtrack_count)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t input_count = 0;
+  if (!subtable.ReadU16(&input_count)) {
+    return OTS_FAILURE();
+  }
+  if (input_count == 0 || input_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (!subtable.Skip(2 * (input_count - 1))) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t lookahead_count = 0;
+  if (!subtable.ReadU16(&lookahead_count)) {
+    return OTS_FAILURE();
+  }
+  if (lookahead_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (!subtable.Skip(2 * lookahead_count)) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainClassSetTable(const uint8_t *data, const size_t length,
+                             const uint16_t num_glyphs,
+                             const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t chain_class_rule_count = 0;
+  if (!subtable.ReadU16(&chain_class_rule_count)) {
+    return OTS_FAILURE();
+  }
+  const unsigned chain_class_rule_end = static_cast<unsigned>(2) +
+      chain_class_rule_count * 2;
+  if (chain_class_rule_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < chain_class_rule_count; ++i) {
+    uint16_t offset_chain_class_rule = 0;
+    if (!subtable.ReadU16(&offset_chain_class_rule)) {
+      return OTS_FAILURE();
+    }
+    if (offset_chain_class_rule < chain_class_rule_end ||
+        offset_chain_class_rule >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ParseChainClassRuleSubtable(data + offset_chain_class_rule,
+                                     length - offset_chain_class_rule,
+                                     num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainContextFormat2(const uint8_t *data, const size_t length,
+                              const uint16_t num_glyphs,
+                              const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t offset_coverage = 0;
+  uint16_t offset_backtrack_class_def = 0;
+  uint16_t offset_input_class_def = 0;
+  uint16_t offset_lookahead_class_def = 0;
+  uint16_t chain_class_set_count = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&offset_coverage) ||
+      !subtable.ReadU16(&offset_backtrack_class_def) ||
+      !subtable.ReadU16(&offset_input_class_def) ||
+      !subtable.ReadU16(&offset_lookahead_class_def) ||
+      !subtable.ReadU16(&chain_class_set_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned chain_class_set_end = static_cast<unsigned>(12) +
+      chain_class_set_count * 2;
+  if (chain_class_set_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  if (offset_coverage < chain_class_set_end || offset_coverage >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseCoverageTable(data + offset_coverage,
+                               length - offset_coverage, num_glyphs)) {
+    return OTS_FAILURE();
+  }
+
+  // Classes for backtrack/lookahead sequences might not be defined.
+  if (offset_backtrack_class_def) {
+    if (offset_backtrack_class_def < chain_class_set_end ||
+        offset_backtrack_class_def >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseClassDefTable(data + offset_backtrack_class_def,
+                                 length - offset_backtrack_class_def,
+                                 num_glyphs, kMaxClassDefValue)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  if (offset_input_class_def < chain_class_set_end ||
+      offset_input_class_def >= length) {
+    return OTS_FAILURE();
+  }
+  if (!ots::ParseClassDefTable(data + offset_input_class_def,
+                               length - offset_input_class_def,
+                               num_glyphs, kMaxClassDefValue)) {
+    return OTS_FAILURE();
+  }
+
+  if (offset_lookahead_class_def) {
+    if (offset_lookahead_class_def < chain_class_set_end ||
+        offset_lookahead_class_def >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseClassDefTable(data + offset_lookahead_class_def,
+                                 length - offset_lookahead_class_def,
+                                 num_glyphs, kMaxClassDefValue)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < chain_class_set_count; ++i) {
+    uint16_t offset_chain_class_set = 0;
+    if (!subtable.ReadU16(&offset_chain_class_set)) {
+      return OTS_FAILURE();
+    }
+    // |offset_chain_class_set| could be NULL.
+    if (offset_chain_class_set) {
+      if (offset_chain_class_set < chain_class_set_end ||
+          offset_chain_class_set >= length) {
+        return OTS_FAILURE();
+      }
+      if (!ParseChainClassSetTable(data + offset_chain_class_set,
+                                   length - offset_chain_class_set,
+                                   num_glyphs, num_lookups)) {
+        return OTS_FAILURE();
+      }
+    }
+  }
+
+  return true;
+}
+
+bool ParseChainContextFormat3(const uint8_t *data, const size_t length,
+                              const uint16_t num_glyphs,
+                              const uint16_t num_lookups) {
+  ots::Buffer subtable(data, length);
+
+  uint16_t backtrack_count = 0;
+  // Skip format field.
+  if (!subtable.Skip(2) ||
+      !subtable.ReadU16(&backtrack_count)) {
+    return OTS_FAILURE();
+  }
+
+  if (backtrack_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  std::vector<uint16_t> offsets_backtrack;
+  offsets_backtrack.reserve(backtrack_count);
+  for (unsigned i = 0; i < backtrack_count; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    offsets_backtrack.push_back(offset);
+  }
+  if (offsets_backtrack.size() != backtrack_count) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t input_count = 0;
+  if (!subtable.ReadU16(&input_count)) {
+    return OTS_FAILURE();
+  }
+  if (input_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  std::vector<uint16_t> offsets_input;
+  offsets_input.reserve(input_count);
+  for (unsigned i = 0; i < input_count; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    offsets_input.push_back(offset);
+  }
+  if (offsets_input.size() != input_count) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t lookahead_count = 0;
+  if (!subtable.ReadU16(&lookahead_count)) {
+    return OTS_FAILURE();
+  }
+  if (lookahead_count >= num_glyphs) {
+    return OTS_FAILURE();
+  }
+  std::vector<uint16_t> offsets_lookahead;
+  offsets_lookahead.reserve(lookahead_count);
+  for (unsigned i = 0; i < lookahead_count; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    offsets_lookahead.push_back(offset);
+  }
+  if (offsets_lookahead.size() != lookahead_count) {
+    return OTS_FAILURE();
+  }
+
+  uint16_t lookup_count = 0;
+  if (!subtable.ReadU16(&lookup_count)) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < lookup_count; ++i) {
+    if (!ParseLookupRecord(&subtable, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  const unsigned lookup_record_end = static_cast<unsigned>(10) +
+      (backtrack_count + input_count + lookahead_count) * 2 + lookup_count * 4;
+  if (lookup_record_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < backtrack_count; ++i) {
+    if (offsets_backtrack[i] < lookup_record_end ||
+        offsets_backtrack[i] >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offsets_backtrack[i],
+                                 length - offsets_backtrack[i], num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+  for (unsigned i = 0; i < input_count; ++i) {
+    if (offsets_input[i] < lookup_record_end || offsets_input[i] >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offsets_input[i],
+                                 length - offsets_input[i], num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+  for (unsigned i = 0; i < lookahead_count; ++i) {
+    if (offsets_lookahead[i] < lookup_record_end ||
+        offsets_lookahead[i] >= length) {
+      return OTS_FAILURE();
+    }
+    if (!ots::ParseCoverageTable(data + offsets_lookahead[i],
+                                 length - offsets_lookahead[i], num_glyphs)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+}  // namespace
+
+namespace ots {
+
+bool LookupSubtableParser::Parse(const OpenTypeFile *file, const uint8_t *data,
+                                 const size_t length,
+                                 const uint16_t lookup_type) const {
+  for (unsigned i = 0; i < num_types; ++i) {
+    if (parsers[i].type == lookup_type && parsers[i].parse) {
+      if (!parsers[i].parse(file, data, length)) {
+        return OTS_FAILURE();
+      }
+      return true;
+    }
+  }
+  return OTS_FAILURE();
+}
+
+// Parsing ScriptListTable requires number of features so we need to
+// parse FeatureListTable before calling this function.
+bool ParseScriptListTable(const uint8_t *data, const size_t length,
+                          const uint16_t num_features) {
+  Buffer subtable(data, length);
+
+  uint16_t script_count = 0;
+  if (!subtable.ReadU16(&script_count)) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned script_record_end = static_cast<unsigned>(2) +
+      script_count * 6;
+  if (script_record_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  std::vector<ScriptRecord> script_list;
+  script_list.reserve(script_count);
+  uint32_t last_tag = 0;
+  for (unsigned i = 0; i < script_count; ++i) {
+    ScriptRecord record;
+    if (!subtable.ReadU32(&record.tag) ||
+        !subtable.ReadU16(&record.offset)) {
+      return OTS_FAILURE();
+    }
+    // Script tags should be arranged alphabetically by tag
+    if (last_tag != 0 && last_tag > record.tag) {
+      // Several fonts don't arrange tags alphabetically.
+      // It seems that the order of tags might not be a security issue
+      // so we just warn it.
+      OTS_WARNING("tags aren't arranged alphabetically.");
+    }
+    last_tag = record.tag;
+    if (record.offset < script_record_end || record.offset >= length) {
+      return OTS_FAILURE();
+    }
+    script_list.push_back(record);
+  }
+  if (script_list.size() != script_count) {
+    return OTS_FAILURE();
+  }
+
+  // Check script records.
+  for (unsigned i = 0; i < script_count; ++i) {
+    if (!ParseScriptTable(data + script_list[i].offset,
+                          length - script_list[i].offset,
+                          script_list[i].tag, num_features)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+// Parsing FeatureListTable requires number of lookups so we need to parse
+// LookupListTable before calling this function.
+bool ParseFeatureListTable(const uint8_t *data, const size_t length,
+                           const uint16_t num_lookups,
+                           uint16_t* num_features) {
+  Buffer subtable(data, length);
+
+  uint16_t feature_count = 0;
+  if (!subtable.ReadU16(&feature_count)) {
+    return OTS_FAILURE();
+  }
+
+  std::vector<FeatureRecord> feature_records;
+  feature_records.resize(feature_count);
+  const unsigned feature_record_end = static_cast<unsigned>(2) +
+      feature_count * 6;
+  if (feature_record_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  uint32_t last_tag = 0;
+  for (unsigned i = 0; i < feature_count; ++i) {
+    if (!subtable.ReadU32(&feature_records[i].tag) ||
+        !subtable.ReadU16(&feature_records[i].offset)) {
+      return OTS_FAILURE();
+    }
+    // Feature record array should be arranged alphabetically by tag
+    if (last_tag != 0 && last_tag > feature_records[i].tag) {
+      // Several fonts don't arrange tags alphabetically.
+      // It seems that the order of tags might not be a security issue
+      // so we just warn it.
+      OTS_WARNING("tags aren't arranged alphabetically.");
+    }
+    last_tag = feature_records[i].tag;
+    if (feature_records[i].offset < feature_record_end ||
+        feature_records[i].offset >= length) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < feature_count; ++i) {
+    if (!ParseFeatureTable(data + feature_records[i].offset,
+                           length - feature_records[i].offset, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  }
+  *num_features = feature_count;
+  return true;
+}
+
+// For parsing GPOS/GSUB tables, this function should be called at first to
+// obtain the number of lookups because parsing FeatureTableList requires
+// the number.
+bool ParseLookupListTable(OpenTypeFile *file, const uint8_t *data,
+                          const size_t length,
+                          const LookupSubtableParser* parser,
+                          uint16_t *num_lookups) {
+  Buffer subtable(data, length);
+
+  if (!subtable.ReadU16(num_lookups)) {
+    return OTS_FAILURE();
+  }
+
+  std::vector<uint16_t> lookups;
+  lookups.reserve(*num_lookups);
+  const unsigned lookup_end = static_cast<unsigned>(2) +
+      (*num_lookups) * 2;
+  if (lookup_end > std::numeric_limits<uint16_t>::max()) {
+    return OTS_FAILURE();
+  }
+  for (unsigned i = 0; i < *num_lookups; ++i) {
+    uint16_t offset = 0;
+    if (!subtable.ReadU16(&offset)) {
+      return OTS_FAILURE();
+    }
+    if (offset < lookup_end || offset >= length) {
+      return OTS_FAILURE();
+    }
+    lookups.push_back(offset);
+  }
+  if (lookups.size() != *num_lookups) {
+    return OTS_FAILURE();
+  }
+
+  for (unsigned i = 0; i < *num_lookups; ++i) {
+    if (!ParseLookupTable(file, data + lookups[i], length - lookups[i],
+                          parser)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+bool ParseClassDefTable(const uint8_t *data, size_t length,
+                        const uint16_t num_glyphs,
+                        const uint16_t num_classes) {
+  Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  if (!subtable.ReadU16(&format)) {
+    return OTS_FAILURE();
+  }
+  if (format == 1) {
+    return ParseClassDefFormat1(data, length, num_glyphs, num_classes);
+  } else if (format == 2) {
+    return ParseClassDefFormat2(data, length, num_glyphs, num_classes);
+  }
+
+  return OTS_FAILURE();
+}
+
+bool ParseCoverageTable(const uint8_t *data, size_t length,
+                        const uint16_t num_glyphs) {
+  Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  if (!subtable.ReadU16(&format)) {
+    return OTS_FAILURE();
+  }
+  if (format == 1) {
+    return ParseCoverageFormat1(data, length, num_glyphs);
+  } else if (format == 2) {
+    return ParseCoverageFormat2(data, length, num_glyphs);
+  }
+
+  return OTS_FAILURE();
+}
+
+bool ParseDeviceTable(const uint8_t *data, size_t length) {
+  Buffer subtable(data, length);
+
+  uint16_t start_size = 0;
+  uint16_t end_size = 0;
+  uint16_t delta_format = 0;
+  if (!subtable.ReadU16(&start_size) ||
+      !subtable.ReadU16(&end_size) ||
+      !subtable.ReadU16(&delta_format)) {
+    return OTS_FAILURE();
+  }
+  if (start_size > end_size) {
+    OTS_WARNING("bad size range: %u > %u", start_size, end_size);
+    return OTS_FAILURE();
+  }
+  if (delta_format == 0 || delta_format > kMaxDeltaFormatType) {
+    OTS_WARNING("bad delta format: %u", delta_format);
+    return OTS_FAILURE();
+  }
+  // The number of delta values per uint16. The device table should contain
+  // at least |num_units| * 2 bytes compressed data.
+  const unsigned num_units = (end_size - start_size) /
+      (1 << (4 - delta_format)) + 1;
+  // Just skip |num_units| * 2 bytes since the compressed data could take
+  // arbitrary values.
+  if (!subtable.Skip(num_units * 2)) {
+    return OTS_FAILURE();
+  }
+  return true;
+}
+
+bool ParseContextSubtable(const uint8_t *data, const size_t length,
+                          const uint16_t num_glyphs,
+                          const uint16_t num_lookups) {
+  Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  if (!subtable.ReadU16(&format)) {
+    return OTS_FAILURE();
+  }
+
+  if (format == 1) {
+    if (!ParseContextFormat1(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 2) {
+    if (!ParseContextFormat2(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 3) {
+    if (!ParseContextFormat3(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseChainingContextSubtable(const uint8_t *data, const size_t length,
+                                  const uint16_t num_glyphs,
+                                  const uint16_t num_lookups) {
+  Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  if (!subtable.ReadU16(&format)) {
+    return OTS_FAILURE();
+  }
+
+  if (format == 1) {
+    if (!ParseChainContextFormat1(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 2) {
+    if (!ParseChainContextFormat2(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else if (format == 3) {
+    if (!ParseChainContextFormat3(data, length, num_glyphs, num_lookups)) {
+      return OTS_FAILURE();
+    }
+  } else {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseExtensionSubtable(const OpenTypeFile *file,
+                            const uint8_t *data, const size_t length,
+                            const LookupSubtableParser* parser) {
+  Buffer subtable(data, length);
+
+  uint16_t format = 0;
+  uint16_t lookup_type = 0;
+  uint32_t offset_extension = 0;
+  if (!subtable.ReadU16(&format) ||
+      !subtable.ReadU16(&lookup_type) ||
+      !subtable.ReadU32(&offset_extension)) {
+    return OTS_FAILURE();
+  }
+
+  if (format != 1) {
+    return OTS_FAILURE();
+  }
+  // |lookup_type| should be other than |parser->extension_type|.
+  if (lookup_type < 1 || lookup_type > parser->num_types ||
+      lookup_type == parser->extension_type) {
+    return OTS_FAILURE();
+  }
+
+  const unsigned format_end = static_cast<unsigned>(8);
+  if (offset_extension < format_end ||
+      offset_extension >= length) {
+    return OTS_FAILURE();
+  }
+
+  // Parse the extension subtable of |lookup_type|.
+  if (!parser->Parse(file, data + offset_extension, length - offset_extension,
+                     lookup_type)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+}  // namespace ots
+
diff --git a/gfx/ots/src/layout.h b/gfx/ots/src/layout.h
new file mode 100644
index 000000000000..7a1589cec76d
--- /dev/null
+++ b/gfx/ots/src/layout.h
@@ -0,0 +1,68 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OTS_LAYOUT_H_
+#define OTS_LAYOUT_H_
+
+#include "ots.h"
+
+// Utility functions for OpenType layout common table formats.
+// http://www.microsoft.com/typography/otspec/chapter2.htm
+
+namespace ots {
+
+
+struct LookupSubtableParser {
+  struct TypeParser {
+    uint16_t type;
+    bool (*parse)(const OpenTypeFile *file, const uint8_t *data,
+                  const size_t length);
+  };
+  size_t num_types;
+  uint16_t extension_type;
+  const TypeParser *parsers;
+
+  bool Parse(const OpenTypeFile *file, const uint8_t *data,
+             const size_t length, const uint16_t lookup_type) const;
+};
+
+bool ParseScriptListTable(const uint8_t *data, const size_t length,
+                          const uint16_t num_features);
+
+bool ParseFeatureListTable(const uint8_t *data, const size_t length,
+                           const uint16_t num_lookups,
+                           uint16_t *num_features);
+
+bool ParseLookupListTable(OpenTypeFile *file, const uint8_t *data,
+                          const size_t length,
+                          const LookupSubtableParser* parser,
+                          uint16_t* num_lookups);
+
+bool ParseClassDefTable(const uint8_t *data, size_t length,
+                        const uint16_t num_glyphs,
+                        const uint16_t num_classes);
+
+bool ParseCoverageTable(const uint8_t *data, size_t length,
+                        const uint16_t num_glyphs);
+
+bool ParseDeviceTable(const uint8_t *data, size_t length);
+
+// Parser for 'Contextual' subtable shared by GSUB/GPOS tables.
+bool ParseContextSubtable(const uint8_t *data, const size_t length,
+                          const uint16_t num_glyphs,
+                          const uint16_t num_lookups);
+
+// Parser for 'Chaining Contextual' subtable shared by GSUB/GPOS tables.
+bool ParseChainingContextSubtable(const uint8_t *data, const size_t length,
+                                  const uint16_t num_glyphs,
+                                  const uint16_t num_lookups);
+
+bool ParseExtensionSubtable(const OpenTypeFile *file,
+                            const uint8_t *data, const size_t length,
+                            const LookupSubtableParser* parser);
+
+}  // namespace ots
+
+#endif  // OTS_LAYOUT_H_
+
diff --git a/gfx/ots/src/loca.cc b/gfx/ots/src/loca.cc
index 5cafaacde098..a2947b279922 100644
--- a/gfx/ots/src/loca.cc
+++ b/gfx/ots/src/loca.cc
@@ -63,7 +63,7 @@ bool ots_loca_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_loca_should_serialise(OpenTypeFile *file) {
-  return file->loca;
+  return file->loca != NULL;
 }
 
 bool ots_loca_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/ltsh.cc b/gfx/ots/src/ltsh.cc
index 3e504d4928b3..9145527dc745 100644
--- a/gfx/ots/src/ltsh.cc
+++ b/gfx/ots/src/ltsh.cc
@@ -56,7 +56,7 @@ bool ots_ltsh_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 
 bool ots_ltsh_should_serialise(OpenTypeFile *file) {
   if (!file->glyf) return false;  // this table is not for CFF fonts.
-  return file->ltsh;
+  return file->ltsh != NULL;
 }
 
 bool ots_ltsh_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/maxp.cc b/gfx/ots/src/maxp.cc
index c3e2b0dfb757..7edd9686ab4d 100644
--- a/gfx/ots/src/maxp.cc
+++ b/gfx/ots/src/maxp.cc
@@ -71,7 +71,7 @@ bool ots_maxp_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_maxp_should_serialise(OpenTypeFile *file) {
-  return file->maxp;
+  return file->maxp != NULL;
 }
 
 bool ots_maxp_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/metrics.cc b/gfx/ots/src/metrics.cc
new file mode 100644
index 000000000000..2e9190f192e0
--- /dev/null
+++ b/gfx/ots/src/metrics.cc
@@ -0,0 +1,181 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "metrics.h"
+
+#include "head.h"
+#include "maxp.h"
+
+// OpenType horizontal and vertical common header format
+// http://www.microsoft.com/opentype/otspec/hhea.htm
+// http://www.microsoft.com/opentype/otspec/vhea.htm
+
+namespace ots {
+
+bool ParseMetricsHeader(OpenTypeFile *file, Buffer *table,
+                        OpenTypeMetricsHeader *header) {
+  if (!table->ReadS16(&header->ascent) ||
+      !table->ReadS16(&header->descent) ||
+      !table->ReadS16(&header->linegap) ||
+      !table->ReadU16(&header->adv_width_max) ||
+      !table->ReadS16(&header->min_sb1) ||
+      !table->ReadS16(&header->min_sb2) ||
+      !table->ReadS16(&header->max_extent) ||
+      !table->ReadS16(&header->caret_slope_rise) ||
+      !table->ReadS16(&header->caret_slope_run) ||
+      !table->ReadS16(&header->caret_offset)) {
+    return OTS_FAILURE();
+  }
+
+  if (header->ascent < 0) {
+    OTS_WARNING("bad ascent: %d", header->ascent);
+    header->ascent = 0;
+  }
+  if (header->linegap < 0) {
+    OTS_WARNING("bad linegap: %d", header->linegap);
+    header->linegap = 0;
+  }
+
+  if (!file->head) {
+    return OTS_FAILURE();
+  }
+
+  // if the font is non-slanted, caret_offset should be zero.
+  if (!(file->head->mac_style & 2) &&
+      (header->caret_offset != 0)) {
+    OTS_WARNING("bad caret offset: %d", header->caret_offset);
+    header->caret_offset = 0;
+  }
+
+  // skip the reserved bytes
+  if (!table->Skip(8)) {
+    return OTS_FAILURE();
+  }
+
+  int16_t data_format;
+  if (!table->ReadS16(&data_format)) {
+    return OTS_FAILURE();
+  }
+  if (data_format) {
+    return OTS_FAILURE();
+  }
+
+  if (!table->ReadU16(&header->num_metrics)) {
+    return OTS_FAILURE();
+  }
+
+  if (!file->maxp) {
+    return OTS_FAILURE();
+  }
+
+  if (header->num_metrics > file->maxp->num_glyphs) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool SerialiseMetricsHeader(OTSStream *out,
+                            const OpenTypeMetricsHeader *header) {
+  if (!out->WriteU32(header->version) ||
+      !out->WriteS16(header->ascent) ||
+      !out->WriteS16(header->descent) ||
+      !out->WriteS16(header->linegap) ||
+      !out->WriteU16(header->adv_width_max) ||
+      !out->WriteS16(header->min_sb1) ||
+      !out->WriteS16(header->min_sb2) ||
+      !out->WriteS16(header->max_extent) ||
+      !out->WriteS16(header->caret_slope_rise) ||
+      !out->WriteS16(header->caret_slope_run) ||
+      !out->WriteS16(header->caret_offset) ||
+      !out->WriteR64(0) ||  // reserved
+      !out->WriteS16(0) ||  // metric data format
+      !out->WriteU16(header->num_metrics)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ParseMetricsTable(Buffer *table,
+                       const uint16_t num_glyphs,
+                       const OpenTypeMetricsHeader *header,
+                       OpenTypeMetricsTable *metrics) {
+  // |num_metrics| is a uint16_t, so it's bounded < 65536. This limits that
+  // amount of memory that we'll allocate for this to a sane amount.
+  const unsigned num_metrics = header->num_metrics;
+
+  if (num_metrics > num_glyphs) {
+    return OTS_FAILURE();
+  }
+  if (!num_metrics) {
+    return OTS_FAILURE();
+  }
+  const unsigned num_sbs = num_glyphs - num_metrics;
+
+  metrics->entries.reserve(num_metrics);
+  for (unsigned i = 0; i < num_metrics; ++i) {
+    uint16_t adv = 0;
+    int16_t sb = 0;
+    if (!table->ReadU16(&adv) || !table->ReadS16(&sb)) {
+      return OTS_FAILURE();
+    }
+
+    // Since so many fonts don't have proper value on |adv| and |sb|,
+    // we should not call ots_failure() here. For example, about 20% of fonts
+    // in http://www.princexml.com/fonts/ (200+ fonts) fails these tests.
+    if (adv > header->adv_width_max) {
+      OTS_WARNING("bad adv: %u > %u", adv, header->adv_width_max);
+      adv = header->adv_width_max;
+    }
+
+    if (sb < header->min_sb1) {
+      OTS_WARNING("bad sb: %d < %d", sb, header->min_sb1);
+      sb = header->min_sb1;
+    }
+
+    metrics->entries.push_back(std::make_pair(adv, sb));
+  }
+
+  metrics->sbs.reserve(num_sbs);
+  for (unsigned i = 0; i < num_sbs; ++i) {
+    int16_t sb;
+    if (!table->ReadS16(&sb)) {
+      // Some Japanese fonts (e.g., mona.ttf) fail this test.
+      return OTS_FAILURE();
+    }
+
+    if (sb < header->min_sb1) {
+      // The same as above. Three fonts in http://www.fontsquirrel.com/fontface
+      // (e.g., Notice2Std.otf) have weird lsb values.
+      OTS_WARNING("bad lsb: %d < %d", sb, header->min_sb1);
+      sb = header->min_sb1;
+    }
+
+    metrics->sbs.push_back(sb);
+  }
+
+  return true;
+}
+
+bool SerialiseMetricsTable(OTSStream *out,
+                           const OpenTypeMetricsTable *metrics) {
+  for (unsigned i = 0; i < metrics->entries.size(); ++i) {
+    if (!out->WriteU16(metrics->entries[i].first) ||
+        !out->WriteS16(metrics->entries[i].second)) {
+      return OTS_FAILURE();
+    }
+  }
+
+  for (unsigned i = 0; i < metrics->sbs.size(); ++i) {
+    if (!out->WriteS16(metrics->sbs[i])) {
+      return OTS_FAILURE();
+    }
+  }
+
+  return true;
+}
+
+}  // namespace ots
+
diff --git a/gfx/ots/src/metrics.h b/gfx/ots/src/metrics.h
new file mode 100644
index 000000000000..46559e1772a2
--- /dev/null
+++ b/gfx/ots/src/metrics.h
@@ -0,0 +1,50 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OTS_METRICS_H_
+#define OTS_METRICS_H_
+
+#include <utility>  // std::pair
+#include <vector>
+
+#include "ots.h"
+
+namespace ots {
+
+struct OpenTypeMetricsHeader {
+  uint32_t version;
+  int16_t ascent;
+  int16_t descent;
+  int16_t linegap;
+  uint16_t adv_width_max;
+  int16_t min_sb1;
+  int16_t min_sb2;
+  int16_t max_extent;
+  int16_t caret_slope_rise;
+  int16_t caret_slope_run;
+  int16_t caret_offset;
+  uint16_t num_metrics;
+};
+
+struct OpenTypeMetricsTable {
+  std::vector<std::pair<uint16_t, int16_t> > entries;
+  std::vector<int16_t> sbs;
+};
+
+bool ParseMetricsHeader(OpenTypeFile *file, Buffer *table,
+                        OpenTypeMetricsHeader *header);
+bool SerialiseMetricsHeader(OTSStream *out,
+                            const OpenTypeMetricsHeader *header);
+
+bool ParseMetricsTable(Buffer *table,
+                       const uint16_t num_glyphs,
+                       const OpenTypeMetricsHeader *header,
+                       OpenTypeMetricsTable *metrics);
+bool SerialiseMetricsTable(OTSStream *out,
+                           const OpenTypeMetricsTable *metrics);
+
+}  // namespace ots
+
+#endif  // OTS_METRICS_H_
+
diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc
index 70edea16424c..23688ef289f3 100644
--- a/gfx/ots/src/os2.cc
+++ b/gfx/ots/src/os2.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <cstddef>
-
 #include "os2.h"
 
 #include "head.h"
@@ -214,7 +212,7 @@ bool ots_os2_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_os2_should_serialise(OpenTypeFile *file) {
-  return file->os2;
+  return file->os2 != NULL;
 }
 
 bool ots_os2_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/ots.cc b/gfx/ots/src/ots.cc
index 7c0cf2b078f7..ff0ee76ef803 100644
--- a/gfx/ots/src/ots.cc
+++ b/gfx/ots/src/ots.cc
@@ -14,18 +14,7 @@
 #include <vector>
 
 // The OpenType Font File
-// http://www.microsoft.com/opentype/otspec/otff.htm
-
-#define F(name, capname) \
-  namespace ots { \
-  bool ots_##name##_parse(OpenTypeFile *f, const uint8_t *d, size_t l); \
-  bool ots_##name##_should_serialise(OpenTypeFile *f); \
-  bool ots_##name##_serialise(OTSStream *s, OpenTypeFile *f); \
-  void ots_##name##_free(OpenTypeFile *f); \
-  }
-  // TODO(yusukes): change these function names to follow Chromium coding rule.
-FOR_EACH_TABLE_TYPE
-#undef F
+// http://www.microsoft.com/typography/otspec/cmap.htm
 
 namespace {
 
@@ -142,18 +131,20 @@ const struct {
     ots::ots_vorg_should_serialise, ots::ots_vorg_free, false },
   { Tag("kern"), ots::ots_kern_parse, ots::ots_kern_serialise,
     ots::ots_kern_should_serialise, ots::ots_kern_free, false },
-  { Tag("vhea"), ots::ots_vhea_parse, ots::ots_vhea_serialise,
-    ots::ots_vhea_should_serialise, ots::ots_vhea_free, false },
-  { Tag("vmtx"), ots::ots_vmtx_parse, ots::ots_vmtx_serialise,
-    ots::ots_vmtx_should_serialise, ots::ots_vmtx_free, false },
+  // We need to parse GDEF table in advance of parsing GSUB/GPOS tables
+  // because they could refer GDEF table.
   { Tag("GDEF"), ots::ots_gdef_parse, ots::ots_gdef_serialise,
     ots::ots_gdef_should_serialise, ots::ots_gdef_free, false },
   { Tag("GPOS"), ots::ots_gpos_parse, ots::ots_gpos_serialise,
     ots::ots_gpos_should_serialise, ots::ots_gpos_free, false },
   { Tag("GSUB"), ots::ots_gsub_parse, ots::ots_gsub_serialise,
     ots::ots_gsub_should_serialise, ots::ots_gsub_free, false },
-  // TODO(yusukes): Support GDEF, GPOS, GSUB, mort, base, and jstf tables.
-  { 0, NULL, NULL, NULL, NULL, false }
+  { Tag("vhea"), ots::ots_vhea_parse, ots::ots_vhea_serialise,
+    ots::ots_vhea_should_serialise, ots::ots_vhea_free, false },
+  { Tag("vmtx"), ots::ots_vmtx_parse, ots::ots_vmtx_serialise,
+    ots::ots_vmtx_should_serialise, ots::ots_vmtx_free, false },
+  // TODO(bashi): Support mort, base, and jstf tables.
+  { 0, NULL, NULL, NULL, NULL, false },
 };
 
 bool IsValidVersionTag(uint32_t tag) {
@@ -379,7 +370,10 @@ bool ProcessGeneric(ots::OpenTypeFile *header, ots::OTSStream *output,
     // since we required that the file be < 1GB in length, and that the table
     // length is < 1GB, the following addtion doesn't overflow
     const uint32_t end_byte = Round4(tables[i].offset + tables[i].length);
-    if (!end_byte || end_byte > length) {
+    // Some fonts which are automatically generated by a font generator
+    // called TTX seems not to add 0-padding to the final table. It might be
+    // ok to accept these fonts so we round up the length of the font file.
+    if (!end_byte || end_byte > Round4(length)) {
       return OTS_FAILURE();
     }
   }
@@ -591,14 +585,12 @@ void DisableDebugOutput() {
   g_debug_output = false;
 }
 
-bool Process(OTSStream *output, const uint8_t *data, size_t length, bool preserveOTL) {
+bool Process(OTSStream *output, const uint8_t *data, size_t length) {
   OpenTypeFile header;
   if (length < 4) {
     return OTS_FAILURE();
   }
 
-  header.preserve_otl = preserveOTL;
-
   bool result;
   if (data[0] == 'w' && data[1] == 'O' && data[2] == 'F' && data[3] == 'F') {
     result = ProcessWOFF(&header, output, data, length);
diff --git a/gfx/ots/src/ots.h b/gfx/ots/src/ots.h
index 6cf2bee0d305..5acb81fb0461 100644
--- a/gfx/ots/src/ots.h
+++ b/gfx/ots/src/ots.h
@@ -102,13 +102,12 @@ class Buffer {
   }
 
   bool ReadU24(uint32_t *value) {
-    if (offset_ + 4 > length_) {
+    if (offset_ + 3 > length_) {
       return OTS_FAILURE();
     }
-    *value = 0;
-    std::memcpy(reinterpret_cast<uint8_t*>(value) + 1,
-                buffer_ + offset_, 3);
-    *value = ntohl(*value);
+    *value = static_cast<uint32_t>(buffer_[offset_]) << 16 |
+        static_cast<uint32_t>(buffer_[offset_ + 1]) << 8 |
+        static_cast<uint32_t>(buffer_[offset_ + 2]);
     offset_ += 3;
     return true;
   }
@@ -163,7 +162,10 @@ class Buffer {
   F(cvt, CVT) \
   F(fpgm, FPGM) \
   F(gasp, GASP) \
+  F(gdef, GDEF) \
   F(glyf, GLYF) \
+  F(gpos, GPOS) \
+  F(gsub, GSUB) \
   F(hdmx, HDMX) \
   F(head, HEAD) \
   F(hhea, HHEA) \
@@ -177,20 +179,14 @@ class Buffer {
   F(post, POST) \
   F(prep, PREP) \
   F(vdmx, VDMX) \
-  F(vhea, VHEA) \
-  F(vmtx, VMTX) \
   F(vorg, VORG) \
-  F(gdef, GDEF) \
-  F(gpos, GPOS) \
-  F(gsub, GSUB)
+  F(vhea, VHEA) \
+  F(vmtx, VMTX)
 
 #define F(name, capname) struct OpenType##capname;
 FOR_EACH_TABLE_TYPE
 #undef F
 
-#define OpenTypeVHEA OpenTypeHHEA
-#define OpenTypeVMTX OpenTypeHMTX
-
 struct OpenTypeFile {
   OpenTypeFile() {
 #define F(name, capname) name = NULL;
@@ -204,15 +200,20 @@ struct OpenTypeFile {
   uint16_t entry_selector;
   uint16_t range_shift;
 
-  // This is used to tell the GDEF/GPOS/GSUB parsers whether to preserve the
-  // OpenType Layout tables (**without** any checking).
-  bool preserve_otl;
-
 #define F(name, capname) OpenType##capname *name;
 FOR_EACH_TABLE_TYPE
 #undef F
 };
 
+#define F(name, capname) \
+bool ots_##name##_parse(OpenTypeFile *f, const uint8_t *d, size_t l); \
+bool ots_##name##_should_serialise(OpenTypeFile *f); \
+bool ots_##name##_serialise(OTSStream *s, OpenTypeFile *f); \
+void ots_##name##_free(OpenTypeFile *f);
+// TODO(yusukes): change these function names to follow Chromium coding rule.
+FOR_EACH_TABLE_TYPE
+#undef F
+
 }  // namespace ots
 
 #endif  // OTS_H_
diff --git a/gfx/ots/src/post.cc b/gfx/ots/src/post.cc
index 4e7eae1ed17b..74ba45305867 100644
--- a/gfx/ots/src/post.cc
+++ b/gfx/ots/src/post.cc
@@ -120,7 +120,7 @@ bool ots_post_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 }
 
 bool ots_post_should_serialise(OpenTypeFile *file) {
-  return file->post;
+  return file->post != NULL;
 }
 
 bool ots_post_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/vdmx.cc b/gfx/ots/src/vdmx.cc
index e607076d15bd..b400002b95d9 100644
--- a/gfx/ots/src/vdmx.cc
+++ b/gfx/ots/src/vdmx.cc
@@ -122,7 +122,7 @@ bool ots_vdmx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 
 bool ots_vdmx_should_serialise(OpenTypeFile *file) {
   if (!file->glyf) return false;  // this table is not for CFF fonts.
-  return file->vdmx;
+  return file->vdmx != NULL;
 }
 
 bool ots_vdmx_serialise(OTSStream *out, OpenTypeFile *file) {
diff --git a/gfx/ots/src/vhea.cc b/gfx/ots/src/vhea.cc
new file mode 100644
index 000000000000..b37b73a7f1f2
--- /dev/null
+++ b/gfx/ots/src/vhea.cc
@@ -0,0 +1,56 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "vhea.h"
+
+#include "gsub.h"
+#include "head.h"
+#include "maxp.h"
+
+// vhea - Vertical Header Table
+// http://www.microsoft.com/opentype/otspec/vhea.htm
+
+namespace ots {
+
+bool ots_vhea_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+  Buffer table(data, length);
+  OpenTypeVHEA *vhea = new OpenTypeVHEA;
+  file->vhea = vhea;
+
+  if (!table.ReadU32(&vhea->header.version)) {
+    return OTS_FAILURE();
+  }
+  if (vhea->header.version != 0x00010000 &&
+      vhea->header.version != 0x00011000) {
+    return OTS_FAILURE();
+  }
+
+  if (!ParseMetricsHeader(file, &table, &vhea->header)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ots_vhea_should_serialise(OpenTypeFile *file) {
+  // vhea should'nt serialise when vmtx doesn't exist.
+  // Firefox developer pointed out that vhea/vmtx should serialise iff GSUB is
+  // preserved. See http://crbug.com/77386
+  return file->vhea != NULL && file->vmtx != NULL &&
+      ots_gsub_should_serialise(file);
+}
+
+bool ots_vhea_serialise(OTSStream *out, OpenTypeFile *file) {
+  if (!SerialiseMetricsHeader(out, &file->vhea->header)) {
+    return OTS_FAILURE();
+  }
+  return true;
+}
+
+void ots_vhea_free(OpenTypeFile *file) {
+  delete file->vhea;
+}
+
+}  // namespace ots
+
diff --git a/gfx/ots/src/vhea.h b/gfx/ots/src/vhea.h
new file mode 100644
index 000000000000..f8efde73177e
--- /dev/null
+++ b/gfx/ots/src/vhea.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OTS_VHEA_H_
+#define OTS_VHEA_H_
+
+#include "metrics.h"
+#include "ots.h"
+
+namespace ots {
+
+struct OpenTypeVHEA {
+  OpenTypeMetricsHeader header;
+};
+
+}  // namespace ots
+
+#endif  // OTS_VHEA_H_
+
diff --git a/gfx/ots/src/vmtx.cc b/gfx/ots/src/vmtx.cc
new file mode 100644
index 000000000000..04761aba35c2
--- /dev/null
+++ b/gfx/ots/src/vmtx.cc
@@ -0,0 +1,52 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "vmtx.h"
+
+#include "gsub.h"
+#include "maxp.h"
+#include "vhea.h"
+
+// vmtx - Vertical Metrics Table
+// http://www.microsoft.com/opentype/otspec/vmtx.htm
+
+namespace ots {
+
+bool ots_vmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+  Buffer table(data, length);
+  OpenTypeVMTX *vmtx = new OpenTypeVMTX;
+  file->vmtx = vmtx;
+
+  if (!file->vhea || !file->maxp) {
+    return OTS_FAILURE();
+  }
+
+  if (!ParseMetricsTable(&table, file->maxp->num_glyphs,
+                         &file->vhea->header, &vmtx->metrics)) {
+    return OTS_FAILURE();
+  }
+
+  return true;
+}
+
+bool ots_vmtx_should_serialise(OpenTypeFile *file) {
+  // vmtx should serialise when vhea and GSUB are preserved.
+  // See the comment in ots_vhea_should_serialise().
+  return file->vmtx != NULL && file->vhea != NULL &&
+      ots_gsub_should_serialise(file);
+}
+
+bool ots_vmtx_serialise(OTSStream *out, OpenTypeFile *file) {
+  if (!SerialiseMetricsTable(out, &file->vmtx->metrics)) {
+    return OTS_FAILURE();
+  }
+  return true;
+}
+
+void ots_vmtx_free(OpenTypeFile *file) {
+  delete file->vmtx;
+}
+
+}  // namespace ots
+
diff --git a/gfx/ots/src/vmtx.h b/gfx/ots/src/vmtx.h
new file mode 100644
index 000000000000..061dc73ed34f
--- /dev/null
+++ b/gfx/ots/src/vmtx.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OTS_VMTX_H_
+#define OTS_VMTX_H_
+
+#include "metrics.h"
+#include "ots.h"
+
+namespace ots {
+
+struct OpenTypeVMTX {
+  OpenTypeMetricsTable metrics;
+};
+
+}  // namespace ots
+
+#endif  // OTS_VMTX_H_
+
diff --git a/gfx/ots/src/vorg.cc b/gfx/ots/src/vorg.cc
index 9b70a98e96eb..61658fda6123 100644
--- a/gfx/ots/src/vorg.cc
+++ b/gfx/ots/src/vorg.cc
@@ -66,7 +66,7 @@ bool ots_vorg_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
 
 bool ots_vorg_should_serialise(OpenTypeFile *file) {
   if (!file->cff) return false;  // this table is not for fonts with TT glyphs.
-  return file->vorg;
+  return file->vorg != NULL;
 }
 
 bool ots_vorg_serialise(OTSStream *out, OpenTypeFile *file) {

From d544378ca279284e64f529ac298385a83457ba25 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 26 Apr 2011 16:29:39 +0100
Subject: [PATCH 498/509] bug 643460 pt 2 - apply patches to OTS for local
 build/platform issues. r=jfkthame

---
 gfx/ots/README.mozilla               | 10 +++++
 gfx/ots/include/opentype-sanitiser.h |  6 ++-
 gfx/ots/ots-fix-gcc46.patch          | 18 +++++++++
 gfx/ots/ots-fix-sparc64.patch        | 26 ++++++++++++
 gfx/ots/ots-fix-vc10.patch           | 60 ++++++++++++++++++++++++++++
 gfx/ots/src/Makefile.in              | 10 +++++
 gfx/ots/src/gasp.h                   |  1 +
 gfx/ots/src/glyf.h                   |  1 +
 gfx/ots/src/metrics.h                |  1 +
 gfx/ots/src/os2.cc                   |  2 +
 10 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 gfx/ots/README.mozilla
 create mode 100644 gfx/ots/ots-fix-gcc46.patch
 create mode 100644 gfx/ots/ots-fix-sparc64.patch
 create mode 100644 gfx/ots/ots-fix-vc10.patch

diff --git a/gfx/ots/README.mozilla b/gfx/ots/README.mozilla
new file mode 100644
index 000000000000..1d70edd1a321
--- /dev/null
+++ b/gfx/ots/README.mozilla
@@ -0,0 +1,10 @@
+This is the Sanitiser for OpenType project, from http://code.google.com/p/ots/.
+
+Current revision: r62
+
+Applied local patches:
+    ots-fix-vc10.patch - workaround for VS10 STL wrappers (bug 602558)
+
+    ots-fix-gcc46.patch - fix os2.cc compile error for GCC 4.6 (bug 628252)
+
+    ots-fix-sparc64.patch - fix alignment error on sparc64 (bug 643137)
diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-sanitiser.h
index 63bf65f70469..6434171a1652 100644
--- a/gfx/ots/include/opentype-sanitiser.h
+++ b/gfx/ots/include/opentype-sanitiser.h
@@ -62,8 +62,10 @@ class OTSStream {
     }
 
     while (length >= 4) {
-      chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(
-          reinterpret_cast<const uint8_t*>(data) + offset));
+      uint32_t tmp;
+      std::memcpy(&tmp, reinterpret_cast<const uint8_t *>(data) + offset,
+        sizeof(uint32_t));
+      chksum_ += ntohl(tmp);
       length -= 4;
       offset += 4;
     }
diff --git a/gfx/ots/ots-fix-gcc46.patch b/gfx/ots/ots-fix-gcc46.patch
new file mode 100644
index 000000000000..8b4c25c618a9
--- /dev/null
+++ b/gfx/ots/ots-fix-gcc46.patch
@@ -0,0 +1,18 @@
+diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc
+--- a/gfx/ots/src/os2.cc
++++ b/gfx/ots/src/os2.cc
+@@ -1,12 +1,14 @@
+ // Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
++
+ #include "os2.h"
+ 
+ #include "head.h"
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+ 
+ namespace ots {
diff --git a/gfx/ots/ots-fix-sparc64.patch b/gfx/ots/ots-fix-sparc64.patch
new file mode 100644
index 000000000000..2f5bed550ae5
--- /dev/null
+++ b/gfx/ots/ots-fix-sparc64.patch
@@ -0,0 +1,26 @@
+diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-sanitiser.h
+--- a/gfx/ots/include/opentype-sanitiser.h
++++ b/gfx/ots/include/opentype-sanitiser.h
+@@ -57,18 +57,20 @@ class OTSStream {
+ 
+     if (chksum_buffer_offset_ == 4) {
+       // TODO(yusukes): This cast breaks the strict-aliasing rule.
+       chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(chksum_buffer_));
+       chksum_buffer_offset_ = 0;
+     }
+ 
+     while (length >= 4) {
+-      chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(
+-          reinterpret_cast<const uint8_t*>(data) + offset));
++      uint32_t tmp;
++      std::memcpy(&tmp, reinterpret_cast<const uint8_t *>(data) + offset,
++        sizeof(uint32_t));
++      chksum_ += ntohl(tmp);
+       length -= 4;
+       offset += 4;
+     }
+ 
+     if (length) {
+       if (chksum_buffer_offset_ != 0) return false;  // not reached
+       if (length > 4) return false;  // not reached
+       std::memcpy(chksum_buffer_,
diff --git a/gfx/ots/ots-fix-vc10.patch b/gfx/ots/ots-fix-vc10.patch
new file mode 100644
index 000000000000..bd09f38f9119
--- /dev/null
+++ b/gfx/ots/ots-fix-vc10.patch
@@ -0,0 +1,60 @@
+diff --git a/gfx/ots/src/gasp.h b/gfx/ots/src/gasp.h
+--- a/gfx/ots/src/gasp.h
++++ b/gfx/ots/src/gasp.h
+@@ -1,15 +1,16 @@
+ // Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ #ifndef OTS_GASP_H_
+ #define OTS_GASP_H_
+ 
++#include <new>
+ #include <utility>  // std::pair
+ #include <vector>
+ 
+ #include "ots.h"
+ 
+ namespace ots {
+ 
+ struct OpenTypeGASP {
+diff --git a/gfx/ots/src/glyf.h b/gfx/ots/src/glyf.h
+--- a/gfx/ots/src/glyf.h
++++ b/gfx/ots/src/glyf.h
+@@ -1,15 +1,16 @@
+ // Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ #ifndef OTS_GLYF_H_
+ #define OTS_GLYF_H_
+ 
++#include <new>
+ #include <utility>  // std::pair
+ #include <vector>
+ 
+ #include "ots.h"
+ 
+ namespace ots {
+ 
+ struct OpenTypeGLYF {
+diff --git a/gfx/ots/src/metrics.h b/gfx/ots/src/metrics.h
+--- a/gfx/ots/src/metrics.h
++++ b/gfx/ots/src/metrics.h
+@@ -1,15 +1,16 @@
+ // Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ #ifndef OTS_METRICS_H_
+ #define OTS_METRICS_H_
+ 
++#include <new>
+ #include <utility>  // std::pair
+ #include <vector>
+ 
+ #include "ots.h"
+ 
+ namespace ots {
+ 
+ struct OpenTypeMetricsHeader {
diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in
index d0a381df39eb..84b42f4a75d7 100644
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -52,15 +52,19 @@ CPPSRCS	= \
   hhea.cc \
   hmtx.cc \
   kern.cc \
+  layout.cc \
   loca.cc \
   ltsh.cc \
   maxp.cc \
+  metrics.cc \
   name.cc \
   os2.cc  \
   ots.cc  \
   post.cc \
   prep.cc \
   vdmx.cc \
+  vhea.cc \
+  vmtx.cc \
   vorg.cc \
   gdef.cc \
   gpos.cc \
@@ -82,3 +86,9 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DPACKAGE_VERSION="\"moz\""
 DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""
+DEFINES += -DNOMINMAX
+
+# Suppress ANSI strict warnings
+# because Googlers don't care about comma-at-end-of-enumerator errors.
+CXXFLAGS := $(filter-out -pedantic,$(CXXFLAGS))
+CFLAGS := $(filter-out -pedantic,$(CFLAGS))
diff --git a/gfx/ots/src/gasp.h b/gfx/ots/src/gasp.h
index f3f434ffe2a3..d8c0b033f239 100644
--- a/gfx/ots/src/gasp.h
+++ b/gfx/ots/src/gasp.h
@@ -5,6 +5,7 @@
 #ifndef OTS_GASP_H_
 #define OTS_GASP_H_
 
+#include <new>
 #include <utility>  // std::pair
 #include <vector>
 
diff --git a/gfx/ots/src/glyf.h b/gfx/ots/src/glyf.h
index d2eda7752c79..2b54260fbc86 100644
--- a/gfx/ots/src/glyf.h
+++ b/gfx/ots/src/glyf.h
@@ -5,6 +5,7 @@
 #ifndef OTS_GLYF_H_
 #define OTS_GLYF_H_
 
+#include <new>
 #include <utility>  // std::pair
 #include <vector>
 
diff --git a/gfx/ots/src/metrics.h b/gfx/ots/src/metrics.h
index 46559e1772a2..05b9ad5a04b7 100644
--- a/gfx/ots/src/metrics.h
+++ b/gfx/ots/src/metrics.h
@@ -5,6 +5,7 @@
 #ifndef OTS_METRICS_H_
 #define OTS_METRICS_H_
 
+#include <new>
 #include <utility>  // std::pair
 #include <vector>
 
diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc
index 23688ef289f3..2e93edd72ccb 100644
--- a/gfx/ots/src/os2.cc
+++ b/gfx/ots/src/os2.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cstddef>
+
 #include "os2.h"
 
 #include "head.h"

From 9eff6e5ef5b34191c725b7eb7ba5f0b520871a2c Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 26 Apr 2011 16:29:43 +0100
Subject: [PATCH 499/509] bug 643460 pt 3 - remove
 gfx.downloadable_fonts.sanitize.preserve_otl_tables preference, no longer
 needed with new OTS version. r=jfkthame

---
 gfx/thebes/gfxPlatform.cpp      | 16 ----------------
 gfx/thebes/gfxPlatform.h        |  6 ------
 gfx/thebes/gfxUserFontSet.cpp   |  3 +--
 modules/libpref/src/init/all.js |  5 -----
 4 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 1874f41ba92d..f0c8d508ed2a 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -149,8 +149,6 @@ SRGBOverrideObserver::Observe(nsISupports *aSubject,
 
 #define GFX_DOWNLOADABLE_FONTS_ENABLED "gfx.downloadable_fonts.enabled"
 #define GFX_DOWNLOADABLE_FONTS_SANITIZE "gfx.downloadable_fonts.sanitize"
-#define GFX_DOWNLOADABLE_FONTS_SANITIZE_PRESERVE_OTL \
-            "gfx.downloadable_fonts.sanitize.preserve_otl_tables"
 
 #define GFX_PREF_HARFBUZZ_SCRIPTS "gfx.font_rendering.harfbuzz.scripts"
 #define HARFBUZZ_SCRIPTS_DEFAULT  gfxUnicodeProperties::SHAPING_DEFAULT
@@ -225,7 +223,6 @@ gfxPlatform::gfxPlatform()
     mUseHarfBuzzScripts = UNINITIALIZED_VALUE;
     mAllowDownloadableFonts = UNINITIALIZED_VALUE;
     mDownloadableFontsSanitize = UNINITIALIZED_VALUE;
-    mSanitizePreserveOTLTables = UNINITIALIZED_VALUE;
 }
 
 gfxPlatform*
@@ -446,17 +443,6 @@ gfxPlatform::SanitizeDownloadedFonts()
     return mDownloadableFontsSanitize;
 }
 
-PRBool
-gfxPlatform::PreserveOTLTablesWhenSanitizing()
-{
-    if (mSanitizePreserveOTLTables == UNINITIALIZED_VALUE) {
-        mSanitizePreserveOTLTables =
-            GetBoolPref(GFX_DOWNLOADABLE_FONTS_SANITIZE_PRESERVE_OTL, PR_FALSE);
-    }
-
-    return mSanitizePreserveOTLTables;
-}
-
 PRBool
 gfxPlatform::UseHarfBuzzForScript(PRInt32 aScriptCode)
 {
@@ -1253,8 +1239,6 @@ gfxPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref)
         mAllowDownloadableFonts = UNINITIALIZED_VALUE;
     } else if (!strcmp(GFX_DOWNLOADABLE_FONTS_SANITIZE, aPref)) {
         mDownloadableFontsSanitize = UNINITIALIZED_VALUE;
-    } else if (!strcmp(GFX_DOWNLOADABLE_FONTS_SANITIZE_PRESERVE_OTL, aPref)) {
-        mSanitizePreserveOTLTables = UNINITIALIZED_VALUE;
     } else if (!strcmp(GFX_PREF_HARFBUZZ_SCRIPTS, aPref)) {
         mUseHarfBuzzScripts = UNINITIALIZED_VALUE;
         gfxTextRunWordCache::Flush();
diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h
index 4b24a8baf912..acd26e98420d 100644
--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -257,11 +257,6 @@ public:
      */
     PRBool SanitizeDownloadedFonts();
 
-    /**
-     * Whether to preserve OpenType layout tables when sanitizing
-     */
-    PRBool PreserveOTLTablesWhenSanitizing();
-
     /**
      * Whether to use the harfbuzz shaper (depending on script complexity).
      *
@@ -382,7 +377,6 @@ protected:
                                                
     PRBool  mAllowDownloadableFonts;
     PRBool  mDownloadableFontsSanitize;
-    PRBool  mSanitizePreserveOTLTables;
 
     // which scripts should be shaped with harfbuzz
     PRInt32 mUseHarfBuzzScripts;
diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
index 5224b3cdfc01..b7028e8ac433 100644
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -363,8 +363,7 @@ SanitizeOpenTypeData(const PRUint8* aData, PRUint32 aLength,
     // limit output/expansion to 256MB
     ExpandingMemoryStream output(aIsCompressed ? aLength * 2 : aLength,
                                  1024 * 1024 * 256);
-    if (ots::Process(&output, aData, aLength,
-        gfxPlatform::GetPlatform()->PreserveOTLTablesWhenSanitizing())) {
+    if (ots::Process(&output, aData, aLength)) {
         aSaneLength = output.Tell();
         return static_cast<PRUint8*>(output.forget());
     } else {
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 530497d22de3..645611418b6b 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -194,11 +194,6 @@ pref("gfx.color_management.rendering_intent", 0);
 pref("gfx.downloadable_fonts.enabled", true);
 pref("gfx.downloadable_fonts.fallback_delay", 3000);
 pref("gfx.downloadable_fonts.sanitize", true);
-#ifdef XP_MACOSX
-pref("gfx.downloadable_fonts.sanitize.preserve_otl_tables", false);
-#else
-pref("gfx.downloadable_fonts.sanitize.preserve_otl_tables", true);
-#endif
 
 // see gfx/thebes/gfxUnicodeProperties.h for definitions of script bits
 #ifdef XP_MACOSX

From 5c163adc543727678a1eb24304cf103b9396b228 Mon Sep 17 00:00:00 2001
From: Luke Wagner <lw@mozilla.com>
Date: Wed, 13 Apr 2011 09:27:37 -0700
Subject: [PATCH 500/509] Bug 644074 - Simplify and consolidate VM stack code
 into js/src/vm/Stack*

---
 dom/base/nsGlobalWindow.cpp                |    5 +-
 ipc/testshell/XPCShellEnvironment.cpp      |   11 +-
 js/src/Makefile.in                         |   16 +-
 js/src/jsapi.cpp                           |   49 +-
 js/src/jsarray.cpp                         |   10 +-
 js/src/jscntxt.cpp                         |  588 +-------
 js/src/jscntxt.h                           |  841 +-----------
 js/src/jscntxtinlines.h                    |  448 +-----
 js/src/jscompartment.cpp                   |    2 +-
 js/src/jscompartment.h                     |    4 +
 js/src/jsdate.cpp                          |    6 +-
 js/src/jsdbgapi.cpp                        |   83 +-
 js/src/jsemit.cpp                          |    2 +-
 js/src/jsexn.cpp                           |    8 +-
 js/src/jsfriendapi.cpp                     |    6 +
 js/src/jsfriendapi.h                       |    3 +
 js/src/jsfun.cpp                           |   76 +-
 js/src/jsfun.h                             |   20 +-
 js/src/jsgc.cpp                            |   30 +-
 js/src/jsgc.h                              |    2 +-
 js/src/jsinterp.cpp                        |  507 ++++---
 js/src/jsinterp.h                          |  889 +-----------
 js/src/jsinterpinlines.h                   |  441 +-----
 js/src/jsiter.cpp                          |   42 +-
 js/src/jsiter.h                            |   24 +-
 js/src/jslock.h                            |    2 +-
 js/src/jsobj.cpp                           |   58 +-
 js/src/jsobj.h                             |   13 +-
 js/src/jsobjinlines.h                      |   14 +-
 js/src/json.cpp                            |   10 +-
 js/src/jsopcode.cpp                        |   27 +-
 js/src/jsparse.cpp                         |   11 +-
 js/src/jsparse.h                           |   12 +-
 js/src/jspropertycache.cpp                 |    4 +-
 js/src/jsprvtd.h                           |   10 +-
 js/src/jsscopeinlines.h                    |    2 +-
 js/src/jsscript.cpp                        |   13 +-
 js/src/jsscript.h                          |    2 +-
 js/src/jsscriptinlines.h                   |    6 +-
 js/src/jsstr.cpp                           |    5 +-
 js/src/jsstrinlines.h                      |    2 +-
 js/src/jstracer.cpp                        |  577 ++++----
 js/src/jstracer.h                          |   20 +-
 js/src/jsvalue.h                           |   82 --
 js/src/jswrapper.cpp                       |    2 +-
 js/src/jswrapper.h                         |    2 +-
 js/src/jsxml.cpp                           |   14 +-
 js/src/methodjit/BaseAssembler.h           |    8 +-
 js/src/methodjit/Compiler.cpp              |   65 +-
 js/src/methodjit/Compiler.h                |    4 +-
 js/src/methodjit/FrameState-inl.h          |    8 +-
 js/src/methodjit/FrameState.h              |    4 +-
 js/src/methodjit/InlineFrameAssembler.h    |   26 +-
 js/src/methodjit/InvokeHelpers.cpp         |  143 +-
 js/src/methodjit/MachineRegs.h             |    2 +-
 js/src/methodjit/MethodJIT-inl.h           |    4 +-
 js/src/methodjit/MethodJIT.cpp             |   56 +-
 js/src/methodjit/MethodJIT.h               |   15 +-
 js/src/methodjit/MonoIC.cpp                |   45 +-
 js/src/methodjit/PolyIC.cpp                |   24 +-
 js/src/methodjit/RematInfo.h               |    4 +-
 js/src/methodjit/Retcon.cpp                |   10 +-
 js/src/methodjit/Retcon.h                  |    2 +-
 js/src/methodjit/StubCalls.cpp             |   55 +-
 js/src/methodjit/TrampolineCompiler.cpp    |    8 +-
 js/src/methodjit/TrampolineMasmX64.asm     |    2 +-
 js/src/methodjit/TrampolineMingwX64.s      |    2 +-
 js/src/methodjit/TrampolineSUNWX64.s       |    4 +-
 js/src/methodjit/TrampolineSUNWX86.s       |    4 +-
 js/src/shell/js.cpp                        |   33 +-
 js/src/tracejit/Writer.cpp                 |   14 +-
 js/src/tracejit/Writer.h                   |   12 +-
 js/src/vm/Stack-inl.h                      | 1084 +++++++++++++++
 js/src/vm/Stack.cpp                        |  739 ++++++++++
 js/src/vm/Stack.h                          | 1449 ++++++++++++++++++++
 js/src/xpconnect/src/nsXPConnect.cpp       |   15 +-
 js/src/xpconnect/src/xpcprivate.h          |    6 +-
 js/src/xpconnect/src/xpcstack.cpp          |    5 +-
 js/src/xpconnect/src/xpcthreadcontext.cpp  |    2 +-
 js/src/xpconnect/src/xpcwrappedjsclass.cpp |    2 +-
 js/src/xpconnect/wrappers/AccessCheck.cpp  |    5 +-
 81 files changed, 4595 insertions(+), 4267 deletions(-)
 create mode 100644 js/src/vm/Stack-inl.h
 create mode 100644 js/src/vm/Stack.cpp
 create mode 100644 js/src/vm/Stack.h

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index c16f4f62471b..bb18b927cfb6 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -63,6 +63,7 @@
 #include "prmem.h"
 #include "jsapi.h"              // for JSAutoRequest
 #include "jsdbgapi.h"           // for JS_ClearWatchPointsForObject
+#include "jsfriendapi.h"        // for JS_GetFrameScopeChainRaw
 #include "nsReadableUtils.h"
 #include "nsDOMClassInfo.h"
 #include "nsJSEnvironment.h"
@@ -5851,13 +5852,13 @@ nsGlobalWindow::CallerInnerWindow()
   JSStackFrame *fp = nsnull;
   JS_FrameIterator(cx, &fp);
   if (fp) {
-    while (fp->isDummyFrame()) {
+    while (!JS_IsScriptFrame(cx, fp)) {
       if (!JS_FrameIterator(cx, &fp))
         break;
     }
 
     if (fp)
-      scope = &fp->scopeChain();
+      scope = JS_GetFrameScopeChainRaw(fp);
   }
 
   if (!scope)
diff --git a/ipc/testshell/XPCShellEnvironment.cpp b/ipc/testshell/XPCShellEnvironment.cpp
index 5074dcd958f2..547fbe54b3ab 100644
--- a/ipc/testshell/XPCShellEnvironment.cpp
+++ b/ipc/testshell/XPCShellEnvironment.cpp
@@ -46,8 +46,6 @@
 #include "base/basictypes.h"
 
 #include "jsapi.h"
-#include "jscntxt.h"
-#include "jsdbgapi.h"
 #include "jsprf.h"
 
 #include "xpcpublic.h"
@@ -406,13 +404,14 @@ GC(JSContext *cx,
    jsval *vp)
 {
     JSRuntime *rt;
-    uint32 preBytes;
+    uint32 preBytes, postBytes;
 
-    rt = cx->runtime;
-    preBytes = rt->gcBytes;
+    rt = JS_GetRuntime(cx);
+    preBytes = JS_GetGCParameter(rt, JSGC_BYTES);
     JS_GC(cx);
+    postBytes = JS_GetGCParameter(rt, JSGC_BYTES);
     fprintf(stdout, "before %lu, after %lu, break %08lx\n",
-           (unsigned long)preBytes, (unsigned long)rt->gcBytes,
+           (unsigned long)preBytes, (unsigned long)postBytes,
 #ifdef XP_UNIX
            (unsigned long)sbrk(0)
 #else
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 42dcfb5fffb4..c5f2eabc1a94 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -181,6 +181,7 @@ CPPSRCS		= \
 		jsxml.cpp \
 		prmjtime.cpp \
 		sharkctl.cpp \
+		Stack.cpp \
 		$(NULL)
 
 INSTALLED_HEADERS = \
@@ -267,6 +268,19 @@ INSTALLED_HEADERS = \
 		prmjtime.h \
 		$(NULL)
 
+###############################################
+# BEGIN include sources for the vm subdirectory
+#
+VPATH		+= \
+		$(srcdir)/vm 	\
+		$(NULL)
+
+EXPORTS_NAMESPACES = vm
+
+EXPORTS_vm = \
+		Stack.h			\
+		$(NULL)
+
 ###############################################
 # BEGIN include sources for low-level code shared with Gecko
 #
@@ -274,7 +288,7 @@ VPATH		+= \
 		$(srcdir)/../../mfbt \
 		$(NULL)
 
-EXPORTS_NAMESPACES = mozilla
+EXPORTS_NAMESPACES += mozilla
 
 EXPORTS_mozilla = \
 		Util.h          \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9cca598433aa..f686989f59fd 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -90,16 +90,15 @@
 #include "jstypedarray.h"
 
 #include "jsatominlines.h"
-#include "jscntxtinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscopeinlines.h"
-#include "jscntxtinlines.h"
 #include "jsregexpinlines.h"
 #include "jsscriptinlines.h"
 #include "jsstrinlines.h"
 #include "assembler/wtf/Platform.h"
 
+#include "vm/Stack-inl.h"
+
 #if ENABLE_YARR_JIT
 #include "assembler/jit/ExecutableAllocator.h"
 #include "methodjit/Logging.h"
@@ -845,7 +844,7 @@ JS_SetRuntimePrivate(JSRuntime *rt, void *data)
 static void
 StartRequest(JSContext *cx)
 {
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
     JS_ASSERT(CURRENT_THREAD_IS_ME(t));
 
     if (t->data.requestDepth) {
@@ -855,7 +854,7 @@ StartRequest(JSContext *cx)
         AutoLockGC lock(rt);
 
         /* Wait until the GC is finished. */
-        if (rt->gcThread != cx->thread) {
+        if (rt->gcThread != cx->thread()) {
             while (rt->gcThread)
                 JS_AWAIT_GC_DONE(rt);
         }
@@ -879,7 +878,7 @@ StartRequest(JSContext *cx)
 static void
 StopRequest(JSContext *cx)
 {
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
     JS_ASSERT(CURRENT_THREAD_IS_ME(t));
     JS_ASSERT(t->data.requestDepth != 0);
     if (t->data.requestDepth != 1) {
@@ -947,7 +946,7 @@ JS_PUBLIC_API(jsrefcount)
 JS_SuspendRequest(JSContext *cx)
 {
 #ifdef JS_THREADSAFE
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
     JS_ASSERT(CURRENT_THREAD_IS_ME(t));
 
     jsrefcount saveDepth = t->data.requestDepth;
@@ -967,7 +966,7 @@ JS_PUBLIC_API(void)
 JS_ResumeRequest(JSContext *cx, jsrefcount saveDepth)
 {
 #ifdef JS_THREADSAFE
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
     JS_ASSERT(CURRENT_THREAD_IS_ME(t));
     if (saveDepth == 0)
         return;
@@ -984,7 +983,7 @@ JS_PUBLIC_API(JSBool)
 JS_IsInRequest(JSContext *cx)
 {
 #ifdef JS_THREADSAFE
-    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
+    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread()));
     return JS_THREAD_DATA(cx)->requestDepth != 0;
 #else
     return false;
@@ -1519,7 +1518,7 @@ JS_SetGlobalObject(JSContext *cx, JSObject *obj)
     CHECK_REQUEST(cx);
 
     cx->globalObject = obj;
-    if (!cx->hasfp())
+    if (!cx->running())
         cx->resetCompartment();
 }
 
@@ -2762,7 +2761,7 @@ JS_PUBLIC_API(void)
 JS_SetNativeStackQuota(JSContext *cx, size_t stackSize)
 {
 #ifdef JS_THREADSAFE
-    JS_ASSERT(cx->thread);
+    JS_ASSERT(cx->thread());
 #endif
 
 #if JS_STACK_GROWTH_DIRECTION > 0
@@ -4210,7 +4209,7 @@ JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, parent);  // XXX no funobj for now
     if (!parent) {
-        if (cx->hasfp())
+        if (cx->running())
             parent = GetScopeChain(cx, cx->fp());
         if (!parent)
             parent = cx->globalObject;
@@ -5107,7 +5106,7 @@ JS_New(JSContext *cx, JSObject *ctor, uintN argc, jsval *argv)
     // of object to create, create it, and clamp the return value to an object,
     // among other details. js_InvokeConstructor does the hard work.
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc, &args))
         return NULL;
 
     args.calleev().setObject(*ctor);
@@ -5141,7 +5140,7 @@ JS_PUBLIC_API(JSOperationCallback)
 JS_SetOperationCallback(JSContext *cx, JSOperationCallback callback)
 {
 #ifdef JS_THREADSAFE
-    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
+    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread()));
 #endif
     JSOperationCallback old = cx->operationCallback;
     cx->operationCallback = callback;
@@ -5183,9 +5182,9 @@ JS_IsRunning(JSContext *cx)
     VOUCH_DOES_NOT_REQUIRE_STACK();
 
 #ifdef JS_TRACER
-    JS_ASSERT_IF(JS_ON_TRACE(cx) && JS_TRACE_MONITOR_ON_TRACE(cx)->tracecx == cx, cx->hasfp());
+    JS_ASSERT_IF(JS_ON_TRACE(cx) && JS_TRACE_MONITOR_ON_TRACE(cx)->tracecx == cx, cx->running());
 #endif
-    JSStackFrame *fp = cx->maybefp();
+    StackFrame *fp = cx->maybefp();
     while (fp && fp->isDummyFrame())
         fp = fp->prev();
     return fp != NULL;
@@ -5195,11 +5194,11 @@ JS_PUBLIC_API(JSStackFrame *)
 JS_SaveFrameChain(JSContext *cx)
 {
     CHECK_REQUEST(cx);
-    JSStackFrame *fp = js_GetTopStackFrame(cx);
+    StackFrame *fp = js_GetTopStackFrame(cx);
     if (!fp)
         return NULL;
-    cx->saveActiveSegment();
-    return fp;
+    cx->stack.saveActiveSegment();
+    return Jsvalify(fp);
 }
 
 JS_PUBLIC_API(void)
@@ -5207,10 +5206,10 @@ JS_RestoreFrameChain(JSContext *cx, JSStackFrame *fp)
 {
     CHECK_REQUEST(cx);
     JS_ASSERT_NOT_ON_TRACE(cx);
-    JS_ASSERT(!cx->hasfp());
+    JS_ASSERT(!cx->running());
     if (!fp)
         return;
-    cx->restoreSegment();
+    cx->stack.restoreSegment();
 }
 
 /************************************************************************/
@@ -6031,9 +6030,9 @@ JS_SetContextThread(JSContext *cx)
 {
 #ifdef JS_THREADSAFE
     JS_ASSERT(!cx->outstandingRequests);
-    if (cx->thread) {
-        JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
-        return reinterpret_cast<jsword>(cx->thread->id);
+    if (cx->thread()) {
+        JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread()));
+        return reinterpret_cast<jsword>(cx->thread()->id);
     }
 
     if (!js_InitContextThread(cx)) {
@@ -6057,7 +6056,7 @@ JS_ClearContextThread(JSContext *cx)
      * is a harmless no-op.
      */
     JS_ASSERT(cx->outstandingRequests == 0);
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
     if (!t)
         return 0;
     JS_ASSERT(CURRENT_THREAD_IS_ME(t));
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 4e7d133d9403..cf7f23bf785b 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -111,6 +111,8 @@
 #include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
@@ -366,7 +368,7 @@ GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp
         index < obj->getArgsInitialLength() &&
         !(*vp = obj->getArgsElement(uint32(index))).isMagic(JS_ARGS_HOLE)) {
         *hole = JS_FALSE;
-        JSStackFrame *fp = (JSStackFrame *)obj->getPrivate();
+        StackFrame *fp = (StackFrame *)obj->getPrivate();
         if (fp != JS_ARGUMENTS_OBJECT_ON_TRACE) {
             if (fp)
                 *vp = fp->canonicalActualArg(index);
@@ -434,7 +436,7 @@ GetElements(JSContext *cx, JSObject *aobj, jsuint length, Value *vp)
          * fast path for deleted properties (MagicValue(JS_ARGS_HOLE) since
          * this requires general-purpose property lookup.
          */
-        if (JSStackFrame *fp = (JSStackFrame *) aobj->getPrivate()) {
+        if (StackFrame *fp = (StackFrame *) aobj->getPrivate()) {
             JS_ASSERT(fp->numActualArgs() <= JS_ARGS_LENGTH_MAX);
             if (!fp->forEachCanonicalActualArg(CopyNonHoleArgsTo(aobj, vp)))
                 goto found_deleted_prop;
@@ -1411,14 +1413,14 @@ array_toString(JSContext *cx, uintN argc, Value *vp)
 
     LeaveTrace(cx);
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, 0, &args))
+    if (!cx->stack.pushInvokeArgs(cx, 0, &args))
         return false;
 
     args.calleev() = join;
     args.thisv().setObject(*obj);
 
     /* Do the call. */
-    if (!Invoke(cx, args, 0))
+    if (!Invoke(cx, args))
         return false;
     *vp = args.rval();
     return true;
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 94c2c9ca5877..e8a2283d85cb 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -74,6 +74,7 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jspubtd.h"
+#include "jsscan.h"
 #include "jsscope.h"
 #include "jsscript.h"
 #include "jsstaticcheck.h"
@@ -86,449 +87,11 @@
 
 #include "jscntxtinlines.h"
 #include "jscompartment.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 
-#ifdef XP_WIN
-# include "jswin.h"
-#elif defined(XP_OS2)
-# define INCL_DOSMEMMGR
-# include <os2.h>
-#else
-# include <unistd.h>
-# include <sys/mman.h>
-# if !defined(MAP_ANONYMOUS)
-#  if defined(MAP_ANON)
-#   define MAP_ANONYMOUS MAP_ANON
-#  else
-#   define MAP_ANONYMOUS 0
-#  endif
-# endif
-#endif
-
 using namespace js;
 using namespace js::gc;
 
-JS_REQUIRES_STACK bool
-StackSegment::contains(const JSStackFrame *fp) const
-{
-    JS_ASSERT(inContext());
-
-    if (fp < initialFrame)
-        return false;
-
-    JSStackFrame *start;
-    if (isActive()) {
-        JS_ASSERT(cx->hasfp() && this == cx->activeSegment());
-        start = cx->fp();
-    } else {
-        JS_ASSERT(suspendedRegs && suspendedRegs->fp);
-        start = suspendedRegs->fp;
-    }
-
-    if (fp > start)
-        return false;
-
-#ifdef DEBUG
-    bool found = false;
-    JSStackFrame *stop = initialFrame->prev();
-    for (JSStackFrame *f = start; !found && f != stop; f = f->prev()) {
-        if (f == fp) {
-            found = true;
-            break;
-        }
-    }
-    JS_ASSERT(found);
-#endif
-
-    return true;
-}
-
-JSStackFrame *
-StackSegment::computeNextFrame(JSStackFrame *fp) const
-{
-    JS_ASSERT(contains(fp));
-    JS_ASSERT(fp != getCurrentFrame());
-
-    JSStackFrame *next = getCurrentFrame();
-    JSStackFrame *prev;
-    while ((prev = next->prev()) != fp)
-        next = prev;
-    return next;
-}
-
-StackSpace::StackSpace()
-  : base(NULL),
-#ifdef XP_WIN
-    commitEnd(NULL),
-#endif
-    end(NULL),
-    currentSegment(NULL),
-#ifdef DEBUG
-    invokeSegment(NULL),
-    invokeFrame(NULL),
-#endif
-    invokeArgEnd(NULL)
-{
-}
-
-bool
-StackSpace::init()
-{
-    void *p;
-#ifdef XP_WIN
-    p = VirtualAlloc(NULL, CAPACITY_BYTES, MEM_RESERVE, PAGE_READWRITE);
-    if (!p)
-        return false;
-    void *check = VirtualAlloc(p, COMMIT_BYTES, MEM_COMMIT, PAGE_READWRITE);
-    if (p != check)
-        return false;
-    base = reinterpret_cast<Value *>(p);
-    commitEnd = base + COMMIT_VALS;
-    end = base + CAPACITY_VALS;
-#elif defined(XP_OS2)
-    if (DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY) &&
-        DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE))
-        return false;
-    base = reinterpret_cast<Value *>(p);
-    end = base + CAPACITY_VALS;
-#else
-    JS_ASSERT(CAPACITY_BYTES % getpagesize() == 0);
-    p = mmap(NULL, CAPACITY_BYTES, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    if (p == MAP_FAILED)
-        return false;
-    base = reinterpret_cast<Value *>(p);
-    end = base + CAPACITY_VALS;
-#endif
-    return true;
-}
-
-StackSpace::~StackSpace()
-{
-    if (!base)
-        return;
-#ifdef XP_WIN
-    VirtualFree(base, (commitEnd - base) * sizeof(Value), MEM_DECOMMIT);
-    VirtualFree(base, 0, MEM_RELEASE);
-#elif defined(XP_OS2)
-    DosFreeMem(base);
-#else
-#ifdef SOLARIS
-    munmap((caddr_t)base, CAPACITY_BYTES);
-#else
-    munmap(base, CAPACITY_BYTES);
-#endif
-#endif
-}
-
-#ifdef XP_WIN
-JS_FRIEND_API(bool)
-StackSpace::bumpCommit(Value *from, ptrdiff_t nvals) const
-{
-    JS_ASSERT(end - from >= nvals);
-    Value *newCommit = commitEnd;
-    Value *request = from + nvals;
-
-    /* Use a dumb loop; will probably execute once. */
-    JS_ASSERT((end - newCommit) % COMMIT_VALS == 0);
-    do {
-        newCommit += COMMIT_VALS;
-        JS_ASSERT((end - newCommit) >= 0);
-    } while (newCommit < request);
-
-    /* The cast is safe because CAPACITY_BYTES is small. */
-    int32 size = static_cast<int32>(newCommit - commitEnd) * sizeof(Value);
-
-    if (!VirtualAlloc(commitEnd, size, MEM_COMMIT, PAGE_READWRITE))
-        return false;
-    commitEnd = newCommit;
-    return true;
-}
-#endif
-
-void
-StackSpace::mark(JSTracer *trc)
-{
-    /*
-     * The correctness/completeness of marking depends on the continuity
-     * invariants described by the StackSegment and StackSpace definitions.
-     *
-     * NB:
-     * Stack slots might be torn or uninitialized in the presence of method
-     * JIT'd code. Arguments are an exception and are always fully synced
-     * (so they can be read by functions).
-     */
-    Value *end = firstUnused();
-    for (StackSegment *seg = currentSegment; seg; seg = seg->getPreviousInMemory()) {
-        STATIC_ASSERT(ubound(end) >= 0);
-        if (seg->inContext()) {
-            /* This may be the only pointer to the initialVarObj. */
-            if (seg->hasInitialVarObj())
-                MarkObject(trc, seg->getInitialVarObj(), "varobj");
-
-            /* Mark slots/args trailing off of the last stack frame. */
-            JSStackFrame *fp = seg->getCurrentFrame();
-            MarkStackRangeConservatively(trc, fp->slots(), end);
-
-            /* Mark stack frames and slots/args between stack frames. */
-            JSStackFrame *initial = seg->getInitialFrame();
-            for (JSStackFrame *f = fp; f != initial; f = f->prev()) {
-                js_TraceStackFrame(trc, f);
-                MarkStackRangeConservatively(trc, f->prev()->slots(), (Value *)f);
-            }
-
-            /* Mark initial stack frame and leading args. */
-            js_TraceStackFrame(trc, initial);
-            MarkStackRangeConservatively(trc, seg->valueRangeBegin(), (Value *)initial);
-        } else {
-            /* Mark slots/args trailing off segment. */
-            MarkValueRange(trc, seg->valueRangeBegin(), end, "stack");
-        }
-        end = (Value *)seg;
-    }
-}
-
-bool
-StackSpace::pushSegmentForInvoke(JSContext *cx, uintN argc, InvokeArgsGuard *ag)
-{
-    Value *start = firstUnused();
-    ptrdiff_t nvals = VALUES_PER_STACK_SEGMENT + 2 + argc;
-    if (!ensureSpace(cx, start, nvals))
-        return false;
-
-    StackSegment *seg = new(start) StackSegment;
-    seg->setPreviousInMemory(currentSegment);
-    currentSegment = seg;
-
-    ag->cx = cx;
-    ag->seg = seg;
-    ImplicitCast<CallArgs>(*ag) = CallArgsFromVp(argc, seg->valueRangeBegin());
-
-    /* Use invokeArgEnd to root [vp, vpend) until the frame is pushed. */
-#ifdef DEBUG
-    ag->prevInvokeSegment = invokeSegment;
-    invokeSegment = seg;
-    ag->prevInvokeFrame = invokeFrame;
-    invokeFrame = NULL;
-#endif
-    ag->prevInvokeArgEnd = invokeArgEnd;
-    invokeArgEnd = ag->argv() + ag->argc();
-    return true;
-}
-
-void
-StackSpace::popSegmentForInvoke(const InvokeArgsGuard &ag)
-{
-    JS_ASSERT(!currentSegment->inContext());
-    JS_ASSERT(ag.seg == currentSegment);
-    JS_ASSERT(invokeSegment == currentSegment);
-    JS_ASSERT(invokeArgEnd == ag.argv() + ag.argc());
-
-    currentSegment = currentSegment->getPreviousInMemory();
-
-#ifdef DEBUG
-    invokeSegment = ag.prevInvokeSegment;
-    invokeFrame = ag.prevInvokeFrame;
-#endif
-    invokeArgEnd = ag.prevInvokeArgEnd;
-}
-
-bool
-StackSpace::getSegmentAndFrame(JSContext *cx, uintN vplen, uintN nslots,
-                               FrameGuard *fg) const
-{
-    Value *start = firstUnused();
-    uintN nvals = VALUES_PER_STACK_SEGMENT + vplen + VALUES_PER_STACK_FRAME + nslots;
-    if (!ensureSpace(cx, start, nvals))
-        return false;
-
-    fg->seg_ = new(start) StackSegment;
-    fg->vp_ = start + VALUES_PER_STACK_SEGMENT;
-    fg->fp_ = reinterpret_cast<JSStackFrame *>(fg->vp() + vplen);
-    return true;
-}
-
-void
-StackSpace::pushSegmentAndFrame(JSContext *cx, JSFrameRegs *regs, FrameGuard *fg)
-{
-    /* Caller should have already initialized regs. */
-    JS_ASSERT(regs->fp == fg->fp());
-    StackSegment *seg = fg->segment();
-
-    /* Register new segment/frame with the context. */
-    cx->pushSegmentAndFrame(seg, *regs);
-
-    /* Officially push the segment/frame on the stack. */
-    seg->setPreviousInMemory(currentSegment);
-    currentSegment = seg;
-
-    /* Mark as 'pushed' in the guard. */
-    fg->cx_ = cx;
-}
-
-void
-StackSpace::popSegmentAndFrame(JSContext *cx)
-{
-    JS_ASSERT(isCurrentAndActive(cx));
-    JS_ASSERT(cx->hasActiveSegment());
-
-    PutActivationObjects(cx, cx->fp());
-
-    /* Officially pop the segment/frame from the stack. */
-    currentSegment = currentSegment->getPreviousInMemory();
-
-    /* Unregister pushed segment/frame from the context. */
-    cx->popSegmentAndFrame();
-
-    /*
-     * N.B. This StackSpace should be GC-able without any operations after
-     * cx->popSegmentAndFrame executes since it can trigger GC.
-     */
-}
-
-FrameGuard::~FrameGuard()
-{
-    if (!pushed())
-        return;
-    JS_ASSERT(cx_->activeSegment() == segment());
-    JS_ASSERT(cx_->maybefp() == fp());
-    cx_->stack().popSegmentAndFrame(cx_);
-}
-
-bool
-StackSpace::getExecuteFrame(JSContext *cx, JSScript *script, ExecuteFrameGuard *fg) const
-{
-    return getSegmentAndFrame(cx, 2, script->nslots, fg);
-}
-
-void
-StackSpace::pushExecuteFrame(JSContext *cx, JSObject *initialVarObj, ExecuteFrameGuard *fg)
-{
-    JSStackFrame *fp = fg->fp();
-    JSScript *script = fp->script();
-    fg->regs_.pc = script->code;
-    fg->regs_.fp = fp;
-    fg->regs_.sp = fp->base();
-    pushSegmentAndFrame(cx, &fg->regs_, fg);
-    fg->seg_->setInitialVarObj(initialVarObj);
-}
-
-bool
-StackSpace::pushDummyFrame(JSContext *cx, JSObject &scopeChain, DummyFrameGuard *fg)
-{
-    if (!getSegmentAndFrame(cx, 0 /*vplen*/, 0 /*nslots*/, fg))
-        return false;
-    fg->fp()->initDummyFrame(cx, scopeChain);
-    fg->regs_.fp = fg->fp();
-    fg->regs_.pc = NULL;
-    fg->regs_.sp = fg->fp()->slots();
-    pushSegmentAndFrame(cx, &fg->regs_, fg);
-    return true;
-}
-
-bool
-StackSpace::getGeneratorFrame(JSContext *cx, uintN vplen, uintN nslots, GeneratorFrameGuard *fg)
-{
-    return getSegmentAndFrame(cx, vplen, nslots, fg);
-}
-
-void
-StackSpace::pushGeneratorFrame(JSContext *cx, JSFrameRegs *regs, GeneratorFrameGuard *fg)
-{
-    JS_ASSERT(regs->fp == fg->fp());
-    JS_ASSERT(regs->fp->prev() == cx->maybefp());
-    pushSegmentAndFrame(cx, regs, fg);
-}
-
-bool
-StackSpace::bumpCommitAndLimit(JSStackFrame *base, Value *sp, uintN nvals, Value **limit) const
-{
-    JS_ASSERT(sp >= firstUnused());
-    JS_ASSERT(sp + nvals >= *limit);
-#ifdef XP_WIN
-    if (commitEnd <= *limit) {
-        Value *quotaEnd = (Value *)base + STACK_QUOTA;
-        if (sp + nvals < quotaEnd) {
-            if (!ensureSpace(NULL, sp, nvals))
-                return false;
-            *limit = Min(quotaEnd, commitEnd);
-            return true;
-        }
-    }
-#endif
-    return false;
-}
-
-void
-FrameRegsIter::initSlow()
-{
-    if (!curseg) {
-        curfp = NULL;
-        cursp = NULL;
-        curpc = NULL;
-        return;
-    }
-
-    JS_ASSERT(curseg->isSuspended());
-    curfp = curseg->getSuspendedFrame();
-    cursp = curseg->getSuspendedRegs()->sp;
-    curpc = curseg->getSuspendedRegs()->pc;
-}
-
-/*
- * Using the invariant described in the js::StackSegment comment, we know that,
- * when a pair of prev-linked stack frames are in the same segment, the
- * first frame's address is the top of the prev-frame's stack, modulo missing
- * arguments.
- */
-void
-FrameRegsIter::incSlow(JSStackFrame *fp, JSStackFrame *prev)
-{
-    JS_ASSERT(prev);
-    JS_ASSERT(curpc == curfp->pc(cx, fp));
-    JS_ASSERT(fp == curseg->getInitialFrame());
-
-    /*
-     * If fp is in cs and the prev-frame is in csprev, it is not necessarily
-     * the case that |cs->getPreviousInContext == csprev| or that
-     * |csprev->getSuspendedFrame == prev| (because of indirect eval and
-     * JS_EvaluateInStackFrame). To compute prev's sp, we need to do a linear
-     * scan, keeping track of what is immediately after prev in memory.
-     */
-    curseg = curseg->getPreviousInContext();
-    cursp = curseg->getSuspendedRegs()->sp;
-    JSStackFrame *f = curseg->getSuspendedFrame();
-    while (f != prev) {
-        if (f == curseg->getInitialFrame()) {
-            curseg = curseg->getPreviousInContext();
-            cursp = curseg->getSuspendedRegs()->sp;
-            f = curseg->getSuspendedFrame();
-        } else {
-            cursp = f->formalArgsEnd();
-            f = f->prev();
-        }
-    }
-}
-
-AllFramesIter::AllFramesIter(JSContext *cx)
-  : curcs(cx->stack().getCurrentSegment()),
-    curfp(curcs ? curcs->getCurrentFrame() : NULL)
-{
-}
-
-AllFramesIter&
-AllFramesIter::operator++()
-{
-    JS_ASSERT(!done());
-    if (curfp == curcs->getInitialFrame()) {
-        curcs = curcs->getPreviousInMemory();
-        curfp = curcs ? curcs->getCurrentFrame() : NULL;
-    } else {
-        curfp = curfp->prev();
-    }
-    return *this;
-}
-
 namespace js {
 
 ThreadData::ThreadData()
@@ -649,16 +212,23 @@ js_InitContextThread(JSContext *cx)
         return false;
 
     JS_APPEND_LINK(&cx->threadLinks, &thread->contextList);
-    cx->thread = thread;
+    cx->setThread(thread);
     return true;
 }
 
+void
+JSContext::setThread(JSThread *thread)
+{
+    thread_ = thread;
+    stack.threadReset();
+}
+
 void
 js_ClearContextThread(JSContext *cx)
 {
-    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
+    JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread()));
     JS_REMOVE_AND_INIT_LINK(&cx->threadLinks);
-    cx->thread = NULL;
+    cx->setThread(NULL);
 }
 
 #endif /* JS_THREADSAFE */
@@ -711,7 +281,7 @@ js_PurgeThreads(JSContext *cx)
         JSThread *thread = e.front().value;
 
         if (JS_CLIST_IS_EMPTY(&thread->contextList)) {
-            JS_ASSERT(cx->thread != thread);
+            JS_ASSERT(cx->thread() != thread);
             Foreground::delete_(thread);
             e.removeFront();
         } else {
@@ -892,7 +462,7 @@ DumpEvalCacheMeter(JSContext *cx)
 
         fprintf(fp, "eval cache meter (%p):\n",
 #ifdef JS_THREADSAFE
-                (void *) cx->thread
+                (void *) cx->thread()
 #else
                 (void *) cx->runtime
 #endif
@@ -980,8 +550,8 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
      * optimized builds. We assume that the embedding knows that an OOM error
      * cannot happen in JS_SetContextThread.
      */
-    JS_ASSERT(cx->thread && CURRENT_THREAD_IS_ME(cx->thread));
-    if (!cx->thread)
+    JS_ASSERT(cx->thread() && CURRENT_THREAD_IS_ME(cx->thread()));
+    if (!cx->thread())
         JS_SetContextThread(cx);
 
     /*
@@ -990,7 +560,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
      * on this cx contributes to cx->thread->data.requestDepth and there is no
      * JS_SuspendRequest calls that set aside the counter.
      */
-    JS_ASSERT(cx->outstandingRequests <= cx->thread->data.requestDepth);
+    JS_ASSERT(cx->outstandingRequests <= cx->thread()->data.requestDepth);
 #endif
 
     if (mode != JSDCM_NEW_FAILED) {
@@ -1012,7 +582,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
      * Typically we are called outside a request, so ensure that the GC is not
      * running before removing the context from rt->contextList, see bug 477021.
      */
-    if (cx->thread->data.requestDepth == 0)
+    if (cx->thread()->data.requestDepth == 0)
         js_WaitForGC(rt);
 #endif
     JS_REMOVE_LINK(&cx->link);
@@ -1043,7 +613,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
              * force or maybe run the GC, but by that point, rt->state will
              * not be JSRTS_UP, and that GC attempt will return early.
              */
-            if (cx->thread->data.requestDepth == 0)
+            if (cx->thread()->data.requestDepth == 0)
                 JS_BeginRequest(cx);
 #endif
 
@@ -1089,7 +659,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
     }
 #ifdef JS_THREADSAFE
 #ifdef DEBUG
-    JSThread *t = cx->thread;
+    JSThread *t = cx->thread();
 #endif
     js_ClearContextThread(cx);
     JS_ASSERT_IF(JS_CLIST_IS_EMPTY(&t->contextList), !t->data.requestDepth);
@@ -1123,7 +693,7 @@ js_NextActiveContext(JSRuntime *rt, JSContext *cx)
     JSContext *iter = cx;
 #ifdef JS_THREADSAFE
     while ((cx = js_ContextIterator(rt, JS_FALSE, &iter)) != NULL) {
-        if (cx->outstandingRequests && cx->thread->data.requestDepth)
+        if (cx->outstandingRequests && cx->thread()->data.requestDepth)
             break;
     }
     return cx;
@@ -1191,7 +761,7 @@ PopulateReportBlame(JSContext *cx, JSErrorReport *report)
      * Walk stack until we find a frame that is associated with some script
      * rather than a native frame.
      */
-    for (JSStackFrame *fp = js_GetTopStackFrame(cx); fp; fp = fp->prev()) {
+    for (StackFrame *fp = js_GetTopStackFrame(cx); fp; fp = fp->prev()) {
         if (fp->pc(cx)) {
             report->filename = fp->script()->filename;
             report->lineno = js_FramePCToLineNumber(cx, fp);
@@ -1253,22 +823,24 @@ js_ReportOutOfMemory(JSContext *cx)
 }
 
 void
-js_ReportOutOfScriptQuota(JSContext *cx)
+js_ReportOutOfScriptQuota(JSContext *maybecx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                         JSMSG_SCRIPT_STACK_QUOTA);
-}
-
-JS_FRIEND_API(void)
-js_ReportOverRecursed(JSContext *cx)
-{
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
+    if (maybecx)
+        JS_ReportErrorNumber(maybecx, js_GetErrorMessage, NULL, JSMSG_SCRIPT_STACK_QUOTA);
 }
 
 void
-js_ReportAllocationOverflow(JSContext *cx)
+js_ReportOverRecursed(JSContext *maybecx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_ALLOC_OVERFLOW);
+    if (maybecx)
+        JS_ReportErrorNumber(maybecx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
+}
+
+void
+js_ReportAllocationOverflow(JSContext *maybecx)
+{
+    if (maybecx)
+        JS_ReportErrorNumber(maybecx, js_GetErrorMessage, NULL, JSMSG_ALLOC_OVERFLOW);
 }
 
 /*
@@ -1286,7 +858,7 @@ checkReportFlags(JSContext *cx, uintN *flags)
          * We assume that if the top frame is a native, then it is strict if
          * the nearest scripted frame is strict, see bug 536306.
          */
-        JSStackFrame *fp = js_GetScriptedCaller(cx, NULL);
+        StackFrame *fp = js_GetScriptedCaller(cx, NULL);
         if (fp && fp->script()->strictModeCode)
             *flags &= ~JSREPORT_WARNING;
         else if (cx->hasStrictOption())
@@ -1781,7 +1353,7 @@ TriggerOperationCallback(JSContext *cx)
      */
     ThreadData *td;
 #ifdef JS_THREADSAFE
-    JSThread *thread = cx->thread;
+    JSThread *thread = cx->thread();
     if (!thread)
         return;
     td = &thread->data;
@@ -1800,8 +1372,8 @@ TriggerAllOperationCallbacks(JSRuntime *rt)
 
 } /* namespace js */
 
-JSStackFrame *
-js_GetScriptedCaller(JSContext *cx, JSStackFrame *fp)
+StackFrame *
+js_GetScriptedCaller(JSContext *cx, StackFrame *fp)
 {
     if (!fp)
         fp = js_GetTopStackFrame(cx);
@@ -1824,7 +1396,7 @@ js_GetCurrentBytecodePC(JSContext* cx)
 #endif
     {
         JS_ASSERT_NOT_ON_TRACE(cx);  /* for static analysis */
-        pc = cx->regs ? cx->regs->pc : NULL;
+        pc = cx->running() ? cx->regs().pc : NULL;
         if (!pc)
             return NULL;
         imacpc = cx->fp()->maybeImacropc();
@@ -1891,14 +1463,14 @@ JSContext::JSContext(JSRuntime *rt)
   : hasVersionOverride(false),
     runtime(rt),
     compartment(NULL),
-    regs(NULL),
+    stack(thisDuringConstruction()),
     busyArrays()
 {}
 
 JSContext::~JSContext()
 {
 #ifdef JS_THREADSAFE
-    JS_ASSERT(!thread);
+    JS_ASSERT(!thread_);
 #endif
 
     /* Free the stuff hanging off of cx. */
@@ -1924,7 +1496,7 @@ void
 JSContext::resetCompartment()
 {
     JSObject *scopeobj;
-    if (hasfp()) {
+    if (stack.running()) {
         scopeobj = &fp()->scopeChain();
     } else {
         scopeobj = globalObject;
@@ -1969,71 +1541,10 @@ JSContext::wrapPendingException()
         setPendingException(v);
 }
 
-void
-JSContext::pushSegmentAndFrame(js::StackSegment *newseg, JSFrameRegs &newregs)
-{
-    JS_ASSERT(regs != &newregs);
-    if (hasActiveSegment())
-        currentSegment->suspend(regs);
-    newseg->setPreviousInContext(currentSegment);
-    currentSegment = newseg;
-    setCurrentRegs(&newregs);
-    newseg->joinContext(this, newregs.fp);
-}
-
-void
-JSContext::popSegmentAndFrame()
-{
-    JS_ASSERT_IF(regs->fp->hasCallObj(), !regs->fp->callObj().getPrivate());
-    JS_ASSERT_IF(regs->fp->hasArgsObj(), !regs->fp->argsObj().getPrivate());
-    JS_ASSERT(currentSegment->maybeContext() == this);
-    JS_ASSERT(currentSegment->getInitialFrame() == regs->fp);
-
-    /*
-     * NB: This function calls resetCompartment, which may GC, so the stack needs
-     * to be in a GC-able state by that point.
-     */
-
-    currentSegment->leaveContext();
-    currentSegment = currentSegment->getPreviousInContext();
-    if (currentSegment) {
-        if (currentSegment->isSaved()) {
-            setCurrentRegs(NULL);
-            resetCompartment();
-        } else {
-            setCurrentRegs(currentSegment->getSuspendedRegs());
-            currentSegment->resume();
-        }
-    } else {
-        JS_ASSERT(regs->fp->prev() == NULL);
-        setCurrentRegs(NULL);
-        resetCompartment();
-    }
-    maybeMigrateVersionOverride();
-}
-
-void
-JSContext::saveActiveSegment()
-{
-    JS_ASSERT(hasActiveSegment());
-    currentSegment->save(regs);
-    setCurrentRegs(NULL);
-    resetCompartment();
-}
-
-void
-JSContext::restoreSegment()
-{
-    js::StackSegment *ccs = currentSegment;
-    setCurrentRegs(ccs->getSuspendedRegs());
-    ccs->restore();
-    resetCompartment();
-}
-
 JSGenerator *
-JSContext::generatorFor(JSStackFrame *fp) const
+JSContext::generatorFor(StackFrame *fp) const
 {
-    JS_ASSERT(stack().contains(fp) && fp->isGeneratorFrame());
+    JS_ASSERT(stack.contains(fp) && fp->isGeneratorFrame());
     JS_ASSERT(!fp->isFloatingGenerator());
     JS_ASSERT(!genStack.empty());
 
@@ -2049,17 +1560,6 @@ JSContext::generatorFor(JSStackFrame *fp) const
     return NULL;
 }
 
-StackSegment *
-StackSpace::containingSegment(const JSStackFrame *target)
-{
-    for (StackSegment *seg = currentSegment; seg; seg = seg->getPreviousInMemory()) {
-        if (seg->contains(target))
-            return seg;
-    }
-    JS_NOT_REACHED("frame not in stack space");
-    return NULL;
-}
-
 JS_FRIEND_API(void)
 JSRuntime::onTooMuchMalloc()
 {
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 66245eb61b02..d87a2d1a60eb 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -67,6 +67,8 @@
 #include "jsvector.h"
 #include "prmjtime.h"
 
+#include "vm/Stack.h"
+
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4100) /* Silence unreferenced formal parameter warnings */
@@ -91,11 +93,8 @@ namespace js {
 /* Tracer constants. */
 static const size_t MONITOR_N_GLOBAL_STATES = 4;
 static const size_t FRAGMENT_TABLE_SIZE = 512;
-static const size_t MAX_NATIVE_STACK_SLOTS = 4096;
-static const size_t MAX_CALL_STACK_ENTRIES = 500;
 static const size_t MAX_GLOBAL_SLOTS = 4096;
 static const size_t GLOBAL_SLOTS_BUFFER_SIZE = MAX_GLOBAL_SLOTS + 1;
-static const size_t MAX_SLOW_NATIVE_EXTRA_SLOTS = 16;
 
 /* Forward declarations of tracer types. */
 class VMAllocator;
@@ -118,647 +117,6 @@ namespace mjit {
 class JaegerCompartment;
 }
 
-/*
- * A StackSegment (referred to as just a 'segment') contains a prev-linked set
- * of stack frames and the slots associated with each frame. A segment and its
- * contained frames/slots also have a precise memory layout that is described
- * in the js::StackSpace comment. A key layout invariant for segments is that
- * prev-linked frames are adjacent in memory, separated only by the values that
- * constitute the locals and expression stack of the prev-frame.
- *
- * The set of stack frames in a non-empty segment start at the segment's
- * "current frame", which is the most recently pushed frame, and ends at the
- * segment's "initial frame". Note that, while all stack frames in a segment
- * are prev-linked, not all prev-linked frames are in the same segment. Hence,
- * for a segment |ss|, |ss->getInitialFrame()->prev| may be non-null and in a
- * different segment. This occurs when the VM reenters itself (via Invoke or
- * Execute). In full generality, a single context may contain a forest of trees
- * of stack frames. With respect to this forest, a segment contains a linear
- * path along a single tree, not necessarily to the root.
- *
- * The frames of a non-empty segment must all be in the same context and thus
- * each non-empty segment is referred to as being "in" a context. Segments in a
- * context have an additional state of being either "active" or "suspended". A
- * suspended segment |ss| has a "suspended frame" which is snapshot of |cx->regs|
- * when the segment was suspended and serves as the current frame of |ss|.
- * There is at most one active segment in a given context. Segments in a
- * context execute LIFO and are maintained in a stack.  The top of this stack
- * is the context's "current segment". If a context |cx| has an active segment
- * |ss|, then:
- *   1. |ss| is |cx|'s current segment,
- *   2. |cx->regs != NULL|, and
- *   3. |ss|'s current frame is |cx->regs->fp|.
- * Moreover, |cx->regs != NULL| iff |cx| has an active segment.
- *
- * An empty segment is not associated with any context. Empty segments are
- * created when there is not an active segment for a context at the top of the
- * stack and claim space for the arguments of an Invoke before the Invoke's
- * stack frame is pushed. During the intervals when the arguments have been
- * pushed, but not the stack frame, the segment cannot be pushed onto the
- * context, since that would require some hack to deal with cx->fp not being
- * the current frame of cx->currentSegment.
- *
- * Finally, (to support JS_SaveFrameChain/JS_RestoreFrameChain) a suspended
- * segment may or may not be "saved". Normally, when the active segment is
- * popped, the previous segment (which is necessarily suspended) becomes
- * active. If the previous segment was saved, however, then it stays suspended
- * until it is made active by a call to JS_RestoreFrameChain. This is why a
- * context may have a current segment, but not an active segment.
- */
-class StackSegment
-{
-    /* The context to which this segment belongs. */
-    JSContext           *cx;
-
-    /* Link for JSContext segment stack mentioned in big comment above. */
-    StackSegment        *previousInContext;
-
-    /* Link for StackSpace segment stack mentioned in StackSpace comment. */
-    StackSegment        *previousInMemory;
-
-    /* The first frame executed in this segment. null iff cx is null */
-    JSStackFrame        *initialFrame;
-
-    /* If this segment is suspended, |cx->regs| when it was suspended. */
-    JSFrameRegs         *suspendedRegs;
-
-    /* The varobj on entry to initialFrame. */
-    JSObject            *initialVarObj;
-
-    /* Whether this segment was suspended by JS_SaveFrameChain. */
-    bool                saved;
-
-    /* Align at 8 bytes on all platforms. */
-#if JS_BITS_PER_WORD == 32
-    void                *padding;
-#endif
-
-    /*
-     * To make isActive a single null-ness check, this non-null constant is
-     * assigned to suspendedRegs when !inContext.
-     */
-#define NON_NULL_SUSPENDED_REGS ((JSFrameRegs *)0x1)
-
-  public:
-    StackSegment()
-      : cx(NULL), previousInContext(NULL), previousInMemory(NULL),
-        initialFrame(NULL), suspendedRegs(NON_NULL_SUSPENDED_REGS),
-        initialVarObj(NULL), saved(false)
-    {
-        JS_ASSERT(!inContext());
-    }
-
-    /* Safe casts guaranteed by the contiguous-stack layout. */
-
-    Value *valueRangeBegin() const {
-        return (Value *)(this + 1);
-    }
-
-    /*
-     * As described in the comment at the beginning of the class, a segment
-     * is in one of three states:
-     *
-     *  !inContext:  the segment has been created to root arguments for a
-     *               future call to Invoke.
-     *  isActive:    the segment describes a set of stack frames in a context,
-     *               where the top frame currently executing.
-     *  isSuspended: like isActive, but the top frame has been suspended.
-     */
-
-    bool inContext() const {
-        JS_ASSERT(!!cx == !!initialFrame);
-        JS_ASSERT_IF(!cx, suspendedRegs == NON_NULL_SUSPENDED_REGS && !saved);
-        return cx;
-    }
-
-    bool isActive() const {
-        JS_ASSERT_IF(!suspendedRegs, cx && !saved);
-        JS_ASSERT_IF(!cx, suspendedRegs == NON_NULL_SUSPENDED_REGS);
-        return !suspendedRegs;
-    }
-
-    bool isSuspended() const {
-        JS_ASSERT_IF(!cx || !suspendedRegs, !saved);
-        JS_ASSERT_IF(!cx, suspendedRegs == NON_NULL_SUSPENDED_REGS);
-        return cx && suspendedRegs;
-    }
-
-    /* Substate of suspended, queryable in any state. */
-
-    bool isSaved() const {
-        JS_ASSERT_IF(saved, isSuspended());
-        return saved;
-    }
-
-    /* Transitioning between inContext <--> isActive */
-
-    void joinContext(JSContext *cx, JSStackFrame *f) {
-        JS_ASSERT(!inContext());
-        this->cx = cx;
-        initialFrame = f;
-        suspendedRegs = NULL;
-        JS_ASSERT(isActive());
-    }
-
-    void leaveContext() {
-        JS_ASSERT(isActive());
-        this->cx = NULL;
-        initialFrame = NULL;
-        suspendedRegs = NON_NULL_SUSPENDED_REGS;
-        JS_ASSERT(!inContext());
-    }
-
-    JSContext *maybeContext() const {
-        return cx;
-    }
-
-#undef NON_NULL_SUSPENDED_REGS
-
-    /* Transitioning between isActive <--> isSuspended */
-
-    void suspend(JSFrameRegs *regs) {
-        JS_ASSERT(isActive());
-        JS_ASSERT(regs && regs->fp && contains(regs->fp));
-        suspendedRegs = regs;
-        JS_ASSERT(isSuspended());
-    }
-
-    void resume() {
-        JS_ASSERT(isSuspended());
-        suspendedRegs = NULL;
-        JS_ASSERT(isActive());
-    }
-
-    /* When isSuspended, transitioning isSaved <--> !isSaved */
-
-    void save(JSFrameRegs *regs) {
-        JS_ASSERT(!isSuspended());
-        suspend(regs);
-        saved = true;
-        JS_ASSERT(isSaved());
-    }
-
-    void restore() {
-        JS_ASSERT(isSaved());
-        saved = false;
-        resume();
-        JS_ASSERT(!isSuspended());
-    }
-
-    /* Data available when inContext */
-
-    JSStackFrame *getInitialFrame() const {
-        JS_ASSERT(inContext());
-        return initialFrame;
-    }
-
-    inline JSFrameRegs *getCurrentRegs() const;
-    inline JSStackFrame *getCurrentFrame() const;
-
-    /* Data available when isSuspended. */
-
-    JSFrameRegs *getSuspendedRegs() const {
-        JS_ASSERT(isSuspended());
-        return suspendedRegs;
-    }
-
-    JSStackFrame *getSuspendedFrame() const {
-        return suspendedRegs->fp;
-    }
-
-    /* JSContext / js::StackSpace bookkeeping. */
-
-    void setPreviousInContext(StackSegment *seg) {
-        previousInContext = seg;
-    }
-
-    StackSegment *getPreviousInContext() const  {
-        return previousInContext;
-    }
-
-    void setPreviousInMemory(StackSegment *seg) {
-        previousInMemory = seg;
-    }
-
-    StackSegment *getPreviousInMemory() const  {
-        return previousInMemory;
-    }
-
-    void setInitialVarObj(JSObject *obj) {
-        JS_ASSERT(inContext());
-        initialVarObj = obj;
-    }
-
-    bool hasInitialVarObj() {
-        JS_ASSERT(inContext());
-        return initialVarObj != NULL;
-    }
-
-    JSObject &getInitialVarObj() const {
-        JS_ASSERT(inContext() && initialVarObj);
-        return *initialVarObj;
-    }
-
-    JS_REQUIRES_STACK bool contains(const JSStackFrame *fp) const;
-
-    JSStackFrame *computeNextFrame(JSStackFrame *fp) const;
-};
-
-static const size_t VALUES_PER_STACK_SEGMENT = sizeof(StackSegment) / sizeof(Value);
-JS_STATIC_ASSERT(sizeof(StackSegment) % sizeof(Value) == 0);
-
-/* See StackSpace::pushInvokeArgs. */
-class InvokeArgsGuard : public CallArgs
-{
-    friend class StackSpace;
-    JSContext        *cx;  /* null implies nothing pushed */
-    StackSegment     *seg;
-    Value            *prevInvokeArgEnd;
-#ifdef DEBUG
-    StackSegment     *prevInvokeSegment;
-    JSStackFrame     *prevInvokeFrame;
-#endif
-  public:
-    InvokeArgsGuard() : cx(NULL), seg(NULL) {}
-    ~InvokeArgsGuard();
-    bool pushed() const { return cx != NULL; }
-};
-
-/*
- * This type can be used to call Invoke when the arguments have already been
- * pushed onto the stack as part of normal execution.
- */
-struct InvokeArgsAlreadyOnTheStack : CallArgs
-{
-    InvokeArgsAlreadyOnTheStack(Value *vp, uintN argc) : CallArgs(argc, vp + 2) {}
-};
-
-/* See StackSpace::pushInvokeFrame. */
-class InvokeFrameGuard
-{
-    friend class StackSpace;
-    JSContext        *cx_;  /* null implies nothing pushed */
-    JSFrameRegs      regs_;
-    JSFrameRegs      *prevRegs_;
-  public:
-    InvokeFrameGuard() : cx_(NULL) {}
-    ~InvokeFrameGuard() { if (pushed()) pop(); }
-    bool pushed() const { return cx_ != NULL; }
-    void pop();
-    JSStackFrame *fp() const { return regs_.fp; }
-};
-
-/* Reusable base; not for direct use. */
-class FrameGuard
-{
-    friend class StackSpace;
-    JSContext        *cx_;  /* null implies nothing pushed */
-    StackSegment     *seg_;
-    Value            *vp_;
-    JSStackFrame     *fp_;
-  public:
-    FrameGuard() : cx_(NULL), vp_(NULL), fp_(NULL) {}
-    JS_REQUIRES_STACK ~FrameGuard();
-    bool pushed() const { return cx_ != NULL; }
-    StackSegment *segment() const { return seg_; }
-    Value *vp() const { return vp_; }
-    JSStackFrame *fp() const { return fp_; }
-};
-
-/* See StackSpace::pushExecuteFrame. */
-class ExecuteFrameGuard : public FrameGuard
-{
-    friend class StackSpace;
-    JSFrameRegs      regs_;
-};
-
-/* See StackSpace::pushDummyFrame. */
-class DummyFrameGuard : public FrameGuard
-{
-    friend class StackSpace;
-    JSFrameRegs      regs_;
-};
-
-/* See StackSpace::pushGeneratorFrame. */
-class GeneratorFrameGuard : public FrameGuard
-{};
-
-/*
- * Stack layout
- *
- * Each ThreadData has one associated StackSpace object which allocates all
- * segments for the thread. StackSpace performs all such allocations in a
- * single, fixed-size buffer using a specific layout scheme that allows some
- * associations between segments, frames, and slots to be implicit, rather
- * than explicitly stored as pointers. To maintain useful invariants, stack
- * space is not given out arbitrarily, but rather allocated/deallocated for
- * specific purposes. The use cases currently supported are: calling a function
- * with arguments (e.g. Invoke), executing a script (e.g. Execute), inline
- * interpreter calls, and pushing "dummy" frames for bookkeeping purposes. See
- * associated member functions below.
- *
- * First, we consider the layout of individual segments. (See the
- * js::StackSegment comment for terminology.) A non-empty segment (i.e., a
- * segment in a context) has the following layout:
- *
- *           initial frame                 current frame ------.  if regs,
- *          .------------.                           |         |  regs->sp
- *          |            V                           V         V
- *   |segment| slots |frame| slots |frame| slots |frame| slots |
- *                       |  ^          |  ^          |
- *          ? <----------'  `----------'  `----------'
- *                prev          prev          prev
- *
- * Moreover, the bytes in the following ranges form a contiguous array of
- * Values that are marked during GC:
- *   1. between a segment and its first frame
- *   2. between two adjacent frames in a segment
- *   3. between a segment's current frame and (if fp->regs) fp->regs->sp
- * Thus, the VM must ensure that all such Values are safe to be marked.
- *
- * An empty segment is followed by arguments that are rooted by the
- * StackSpace::invokeArgEnd pointer:
- *
- *              invokeArgEnd
- *                   |
- *                   V
- *   |segment| slots |
- *
- * Above the level of segments, a StackSpace is simply a contiguous sequence
- * of segments kept in a linked list:
- *
- *   base                       currentSegment  firstUnused            end
- *    |                               |             |                   |
- *    V                               V             V                   V
- *    |segment| --- |segment| --- |segment| ------- |                   |
- *         | ^           | ^           |
- *   0 <---' `-----------' `-----------'
- *   previous    previous       previous
- *
- * Both js::StackSpace and JSContext maintain a stack of segments, the top of
- * which is the "current segment" for that thread or context, respectively.
- * Since different contexts can arbitrarily interleave execution in a single
- * thread, these stacks are different enough that a segment needs both
- * "previousInMemory" and "previousInContext".
- *
- * For example, in a single thread, a function in segment S1 in a context CX1
- * may call out into C++ code that reenters the VM in a context CX2, which
- * creates a new segment S2 in CX2, and CX1 may or may not equal CX2.
- *
- * Note that there is some structure to this interleaving of segments:
- *   1. the inclusion from segments in a context to segments in a thread
- *      preserves order (in terms of previousInContext and previousInMemory,
- *      respectively).
- *   2. the mapping from stack frames to their containing segment preserves
- *      order (in terms of prev and previousInContext, respectively).
- */
-class StackSpace
-{
-    Value *base;
-#ifdef XP_WIN
-    mutable Value *commitEnd;
-#endif
-    Value *end;
-    StackSegment *currentSegment;
-#ifdef DEBUG
-    /*
-     * Keep track of which segment/frame bumped invokeArgEnd so that
-     * firstUnused() can assert that, when invokeArgEnd is used as the top of
-     * the stack, it is being used appropriately.
-     */
-    StackSegment *invokeSegment;
-    JSStackFrame *invokeFrame;
-#endif
-    Value        *invokeArgEnd;
-
-    friend class InvokeArgsGuard;
-    friend class InvokeFrameGuard;
-    friend class FrameGuard;
-
-    bool pushSegmentForInvoke(JSContext *cx, uintN argc, InvokeArgsGuard *ag);
-    void popSegmentForInvoke(const InvokeArgsGuard &ag);
-
-    bool pushInvokeFrameSlow(JSContext *cx, const InvokeArgsGuard &ag,
-                             InvokeFrameGuard *fg);
-    void popInvokeFrameSlow(const CallArgs &args);
-
-    bool getSegmentAndFrame(JSContext *cx, uintN vplen, uintN nslots,
-                            FrameGuard *fg) const;
-    void pushSegmentAndFrame(JSContext *cx, JSFrameRegs *regs, FrameGuard *fg);
-    void popSegmentAndFrame(JSContext *cx);
-
-    struct EnsureSpaceCheck {
-        inline bool operator()(const StackSpace &, JSContext *, Value *, uintN);
-    };
-
-    struct LimitCheck {
-        JSStackFrame *base;
-        Value **limit;
-        LimitCheck(JSStackFrame *base, Value **limit) : base(base), limit(limit) {}
-        inline bool operator()(const StackSpace &, JSContext *, Value *, uintN);
-    };
-
-    template <class Check>
-    inline JSStackFrame *getCallFrame(JSContext *cx, Value *sp, uintN nactual,
-                                      JSFunction *fun, JSScript *script,
-                                      uint32 *pflags, Check check) const;
-
-    inline void popInvokeArgs(const InvokeArgsGuard &args);
-    inline void popInvokeFrame(const InvokeFrameGuard &ag);
-
-    inline Value *firstUnused() const;
-
-    inline bool isCurrentAndActive(JSContext *cx) const;
-    friend class AllFramesIter;
-    StackSegment *getCurrentSegment() const { return currentSegment; }
-
-#ifdef XP_WIN
-    /* Commit more memory from the reserved stack space. */
-    JS_FRIEND_API(bool) bumpCommit(Value *from, ptrdiff_t nvals) const;
-#endif
-
-  public:
-    static const size_t CAPACITY_VALS   = 512 * 1024;
-    static const size_t CAPACITY_BYTES  = CAPACITY_VALS * sizeof(Value);
-    static const size_t COMMIT_VALS     = 16 * 1024;
-    static const size_t COMMIT_BYTES    = COMMIT_VALS * sizeof(Value);
-
-    /*
-     * SunSpider and v8bench have roughly an average of 9 slots per script.
-     * Our heuristic for a quick over-recursion check uses a generous slot
-     * count based on this estimate. We take this frame size and multiply it
-     * by the old recursion limit from the interpreter.
-     *
-     * Worst case, if an average size script (<=9 slots) over recurses, it'll
-     * effectively be the same as having increased the old inline call count
-     * to <= 5,000.
-     */
-    static const size_t STACK_QUOTA    = (VALUES_PER_STACK_FRAME + 18) *
-                                         JS_MAX_INLINE_CALL_COUNT;
-
-    StackSpace();
-    ~StackSpace();
-
-    bool init();
-
-#ifdef DEBUG
-    template <class T>
-    bool contains(T *t) const {
-        char *v = (char *)t;
-        JS_ASSERT(size_t(-1) - uintptr_t(t) >= sizeof(T));
-        return v >= (char *)base && v + sizeof(T) <= (char *)end;
-    }
-#endif
-
-    /*
-     * When we LeaveTree, we need to rebuild the stack, which requires stack
-     * allocation. There is no good way to handle an OOM for these allocations,
-     * so this function checks that they cannot occur using the size of the
-     * TraceNativeStorage as a conservative upper bound.
-     */
-    inline bool ensureEnoughSpaceToEnterTrace();
-
-    /* +1 for slow native's stack frame. */
-    static const ptrdiff_t MAX_TRACE_SPACE_VALS =
-      MAX_NATIVE_STACK_SLOTS + MAX_CALL_STACK_ENTRIES * VALUES_PER_STACK_FRAME +
-      (VALUES_PER_STACK_SEGMENT + VALUES_PER_STACK_FRAME /* synthesized slow native */);
-
-    /* Mark all segments, frames, and slots on the stack. */
-    JS_REQUIRES_STACK void mark(JSTracer *trc);
-
-    /*
-     * For all five use cases below:
-     *  - The boolean-valued functions call js_ReportOutOfScriptQuota on OOM.
-     *  - The "get*Frame" functions do not change any global state, they just
-     *    check OOM and return pointers to an uninitialized frame with the
-     *    requested missing arguments/slots. Only once the "push*Frame"
-     *    function has been called is global state updated. Thus, between
-     *    "get*Frame" and "push*Frame", the frame and slots are unrooted.
-     *  - The "push*Frame" functions will set fp->prev; the caller needn't.
-     *  - Functions taking "*Guard" arguments will use the guard's destructor
-     *    to pop the allocation. The caller must ensure the guard has the
-     *    appropriate lifetime.
-     *  - The get*Frame functions put the 'nmissing' slots contiguously after
-     *    the arguments.
-     */
-
-    /*
-     * pushInvokeArgs allocates |argc + 2| rooted values that will be passed as
-     * the arguments to Invoke. A single allocation can be used for multiple
-     * Invoke calls. The InvokeArgumentsGuard passed to Invoke must come from
-     * an immediately-enclosing (stack-wise) call to pushInvokeArgs.
-     */
-    bool pushInvokeArgs(JSContext *cx, uintN argc, InvokeArgsGuard *ag);
-
-    /* These functions are called inside Invoke, not Invoke clients. */
-    bool getInvokeFrame(JSContext *cx, const CallArgs &args, JSFunction *fun,
-                        JSScript *script, uint32 *flags, InvokeFrameGuard *fg) const;
-
-    void pushInvokeFrame(JSContext *cx, const CallArgs &args, InvokeFrameGuard *fg);
-
-    /* These functions are called inside Execute, not Execute clients. */
-    bool getExecuteFrame(JSContext *cx, JSScript *script, ExecuteFrameGuard *fg) const;
-    void pushExecuteFrame(JSContext *cx, JSObject *initialVarObj, ExecuteFrameGuard *fg);
-
-    /* Get the segment which contains the target frame. */
-    js::StackSegment *containingSegment(const JSStackFrame *target);
-
-    /*
-     * Since RAII cannot be used for inline frames, callers must manually
-     * call pushInlineFrame/popInlineFrame.
-     */
-    inline JSStackFrame *getInlineFrame(JSContext *cx, Value *sp, uintN nactual,
-                                        JSFunction *fun, JSScript *script,
-                                        uint32 *flags) const;
-    inline void pushInlineFrame(JSContext *cx, JSScript *script, JSStackFrame *fp,
-                                JSFrameRegs *regs);
-    inline void popInlineFrame(JSContext *cx, JSStackFrame *prev, js::Value *newsp);
-
-    /* These functions are called inside SendToGenerator. */
-    bool getGeneratorFrame(JSContext *cx, uintN vplen, uintN nslots,
-                           GeneratorFrameGuard *fg);
-    void pushGeneratorFrame(JSContext *cx, JSFrameRegs *regs, GeneratorFrameGuard *fg);
-
-    /* Pushes a JSStackFrame::isDummyFrame. */
-    bool pushDummyFrame(JSContext *cx, JSObject &scopeChain, DummyFrameGuard *fg);
-
-    /* Check and bump the given stack limit. */
-    inline JSStackFrame *getInlineFrameWithinLimit(JSContext *cx, Value *sp, uintN nactual,
-                                                   JSFunction *fun, JSScript *script, uint32 *flags,
-                                                   JSStackFrame *base, Value **limit) const;
-
-    /*
-     * Compute a stack limit for entering method jit code which allows the
-     * method jit to check for end-of-stack and over-recursion with a single
-     * comparison. See STACK_QUOTA above.
-     */
-    inline Value *getStackLimit(JSContext *cx);
-
-    /*
-     * Try to bump the given 'limit' by bumping the commit limit. Return false
-     * if fully committed or if 'limit' exceeds 'base' + STACK_QUOTA.
-     */
-    bool bumpCommitAndLimit(JSStackFrame *base, Value *from, uintN nvals, Value **limit) const;
-
-    /*
-     * Allocate nvals on the top of the stack, report error on failure.
-     * N.B. the caller must ensure |from >= firstUnused()|.
-     */
-    inline bool ensureSpace(JSContext *maybecx, Value *from, ptrdiff_t nvals) const;
-};
-
-JS_STATIC_ASSERT(StackSpace::CAPACITY_VALS % StackSpace::COMMIT_VALS == 0);
-
-/*
- * While |cx->fp|'s pc/sp are available in |cx->regs|, to compute the saved
- * value of pc/sp for any other frame, it is necessary to know about that
- * frame's next-frame. This iterator maintains this information when walking
- * a chain of stack frames starting at |cx->fp|.
- *
- * Usage:
- *   for (FrameRegsIter i(cx); !i.done(); ++i)
- *     ... i.fp() ... i.sp() ... i.pc()
- */
-class FrameRegsIter
-{
-    JSContext         *cx;
-    StackSegment      *curseg;
-    JSStackFrame      *curfp;
-    Value             *cursp;
-    jsbytecode        *curpc;
-
-    void initSlow();
-    void incSlow(JSStackFrame *fp, JSStackFrame *prev);
-
-  public:
-    JS_REQUIRES_STACK inline FrameRegsIter(JSContext *cx);
-
-    bool done() const { return curfp == NULL; }
-    inline FrameRegsIter &operator++();
-
-    JSStackFrame *fp() const { return curfp; }
-    Value *sp() const { return cursp; }
-    jsbytecode *pc() const { return curpc; }
-};
-
-/*
- * Utility class for iteration over all active stack frames.
- */
-class AllFramesIter
-{
-public:
-    AllFramesIter(JSContext *cx);
-
-    bool done() const { return curfp == NULL; }
-    AllFramesIter& operator++();
-
-    JSStackFrame *fp() const { return curfp; }
-
-private:
-    StackSegment *curcs;
-    JSStackFrame *curfp;
-};
-
 /*
  * GetSrcNote cache to avoid O(n^2) growth in finding a source note for a
  * given pc in a script. We use the script->code pointer to tag the cache,
@@ -930,7 +288,7 @@ struct JSThread {
     }
 };
 
-#define JS_THREAD_DATA(cx)      (&(cx)->thread->data)
+#define JS_THREAD_DATA(cx)      (&(cx)->thread()->data)
 
 extern JSThread *
 js_CurrentThread(JSRuntime *rt);
@@ -1610,6 +968,7 @@ typedef HashSet<JSObject *,
 struct JSContext
 {
     explicit JSContext(JSRuntime *rt);
+    JSContext *thisDuringConstruction() { return this; }
     ~JSContext();
 
     /* JSRuntime contextList linkage. */
@@ -1652,39 +1011,21 @@ struct JSContext
     /* GC heap compartment. */
     JSCompartment       *compartment;
 
-    /* Currently executing frame and regs, set by stack operations. */
-    JS_REQUIRES_STACK
-    JSFrameRegs         *regs;
+    /* Current execution stack. */
+    js::ContextStack    stack;
 
-    /* Current frame accessors. */
-
-    JSStackFrame* fp() {
-        JS_ASSERT(regs && regs->fp);
-        return regs->fp;
-    }
-
-    JSStackFrame* maybefp() {
-        JS_ASSERT_IF(regs, regs->fp);
-        return regs ? regs->fp : NULL;
-    }
-
-    bool hasfp() {
-        JS_ASSERT_IF(regs, regs->fp);
-        return !!regs;
-    }
-
-  public:
-    friend class js::StackSpace;
-    friend bool js::Interpret(JSContext *, JSStackFrame *, uintN, JSInterpMode);
+    /* ContextStack convenience functions */
+    bool running() const              { return stack.running(); }
+    js::StackFrame* fp() const        { return stack.fp(); }
+    js::StackFrame* maybefp() const   { return stack.maybefp(); }
+    js::FrameRegs& regs() const       { return stack.regs(); }
+    js::FrameRegs* maybeRegs() const  { return stack.maybeRegs(); }
 
+    /* Set cx->compartment based on the current scope chain. */
     void resetCompartment();
-    void wrapPendingException();
 
-    /* For grep-ability, changes to 'regs' should call this function. */
-    void setCurrentRegs(JSFrameRegs *regs) {
-        JS_ASSERT_IF(regs, regs->fp);
-        this->regs = regs;
-    }
+    /* Wrap cx->exception for the current compartment. */
+    void wrapPendingException();
 
     /* Temporary arena pool used while compiling and decompiling. */
     JSArenaPool         tempPool;
@@ -1719,76 +1060,15 @@ struct JSContext
     void                *data;
     void                *data2;
 
-  private:
-    /* Linked list of segments. See StackSegment. */
-    js::StackSegment *currentSegment;
-
-  public:
-    void assertSegmentsInSync() const {
-#ifdef DEBUG
-        if (regs) {
-            JS_ASSERT(currentSegment->isActive());
-            if (js::StackSegment *prev = currentSegment->getPreviousInContext())
-                JS_ASSERT(!prev->isActive());
-        } else {
-            JS_ASSERT_IF(currentSegment, !currentSegment->isActive());
-        }
-#endif
-    }
-
-    /* Return whether this context has an active segment. */
-    bool hasActiveSegment() const {
-        assertSegmentsInSync();
-        return !!regs;
-    }
-
-    /* Assuming there is an active segment, return it. */
-    js::StackSegment *activeSegment() const {
-        JS_ASSERT(hasActiveSegment());
-        return currentSegment;
-    }
-
-    /* Return the current segment, which may or may not be active. */
-    js::StackSegment *getCurrentSegment() const {
-        assertSegmentsInSync();
-        return currentSegment;
-    }
-
     inline js::RegExpStatics *regExpStatics();
 
-  private:
-    /* Add the given segment to the list as the new active segment. */
-    void pushSegmentAndFrame(js::StackSegment *newseg, JSFrameRegs &regs);
-
-    /* Remove the active segment and make the next segment active. */
-    void popSegmentAndFrame();
-
-  public:
-    /* Mark the top segment as suspended, without pushing a new one. */
-    void saveActiveSegment();
-
-    /* Undoes calls to suspendActiveSegment. */
-    void restoreSegment();
-
-    /* Search the call stack for the nearest frame with static level targetLevel. */
-    JSStackFrame *findFrameAtLevel(uintN targetLevel) const {
-        JSStackFrame *fp = regs->fp;
-        while (true) {
-            JS_ASSERT(fp && fp->isScriptFrame());
-            if (fp->script()->staticLevel == targetLevel)
-                break;
-            fp = fp->prev();
-        }
-        return fp;
-    }
-
   public:
     /*
      * The default script compilation version can be set iff there is no code running.
      * This typically occurs via the JSAPI right after a context is constructed.
      */
     bool canSetDefaultVersion() const {
-        return !regs && !hasVersionOverride;
+        return !stack.running() && !hasVersionOverride;
     }
 
     /* Force a version for future script compilation. */
@@ -1825,23 +1105,17 @@ struct JSContext
         return true;
     }
 
-  private:
     /*
-     * If there is no code currently executing, turn the override version into
-     * the default version.
-     *
-     * NB: the only time the version is potentially capable of migrating is
-     * on return from the Execute or ExternalInvoke paths as they call through
-     * JSContext::popSegmentAndFrame.
+     * If there is no code on the stack, turn the override version into the
+     * default version.
      */
     void maybeMigrateVersionOverride() {
-        if (JS_LIKELY(!isVersionOverridden() || currentSegment))
+        if (JS_LIKELY(!isVersionOverridden() && stack.empty()))
             return;
         defaultVersion = versionOverride;
         clearVersionOverride();
     }
 
-  public:
     /*
      * Return:
      * - The override version, if there is an override version.
@@ -1854,13 +1128,13 @@ struct JSContext
         if (hasVersionOverride)
             return versionOverride;
 
-        if (regs) {
+        if (stack.running()) {
             /* There may be a scripted function somewhere on the stack! */
-            JSStackFrame *fp = regs->fp;
-            while (fp && !fp->isScriptFrame())
-                fp = fp->prev();
-            if (fp)
-                return fp->script()->getVersion();
+            js::StackFrame *f = fp();
+            while (f && !f->isScriptFrame())
+                f = f->prev();
+            if (f)
+                return f->script()->getVersion();
         }
 
         return defaultVersion;
@@ -1895,7 +1169,14 @@ struct JSContext
     bool hasAtLineOption() const { return hasRunOption(JSOPTION_ATLINE); }
 
 #ifdef JS_THREADSAFE
-    JSThread            *thread;
+  private:
+    JSThread            *thread_;
+  public:
+    JSThread *thread() const { return thread_; }
+
+    void setThread(JSThread *thread);
+    static const size_t threadOffset() { return offsetof(JSContext, thread_); }
+
     unsigned            outstandingRequests;/* number of JS_BeginRequest calls
                                                without the corresponding
                                                JS_EndRequest. */
@@ -1940,6 +1221,8 @@ struct JSContext
 #ifdef JS_METHODJIT
     bool                 methodJitEnabled;
     bool                 profilingEnabled;
+
+    inline js::mjit::JaegerCompartment *jaegerCompartment();
 #endif
 
     /* Caller must be holding runtime->gcLock. */
@@ -1973,12 +1256,8 @@ struct JSContext
     js::Vector<JSGenerator *, 2, js::SystemAllocPolicy> genStack;
 
   public:
-#ifdef JS_METHODJIT
-    inline js::mjit::JaegerCompartment *jaegerCompartment();
-#endif
-
     /* Return the generator object for the given generator frame. */
-    JSGenerator *generatorFor(JSStackFrame *fp) const;
+    JSGenerator *generatorFor(js::StackFrame *fp) const;
 
     /* Early OOM-check. */
     inline bool ensureGeneratorStackSpace();
@@ -2037,14 +1316,10 @@ struct JSContext
 
     void purge();
 
-    js::StackSpace &stack() const {
-        return JS_THREAD_DATA(this)->stackSpace;
-    }
-
 #ifdef DEBUG
     void assertValidStackDepth(uintN depth) {
-        JS_ASSERT(0 <= regs->sp - regs->fp->base());
-        JS_ASSERT(depth <= uintptr_t(regs->sp - regs->fp->base()));
+        JS_ASSERT(0 <= regs().sp - fp()->base());
+        JS_ASSERT(depth <= uintptr_t(regs().sp - fp()->base()));
     }
 #else
     void assertValidStackDepth(uintN /*depth*/) {}
@@ -2076,30 +1351,28 @@ struct JSContext
     JS_FRIEND_API(void) checkMallocGCPressure(void *p);
 }; /* struct JSContext */
 
+namespace js {
+
 #ifdef JS_THREADSAFE
-# define JS_THREAD_ID(cx)       ((cx)->thread ? (cx)->thread->id : 0)
+# define JS_THREAD_ID(cx)       ((cx)->thread() ? (cx)->thread()->id : 0)
 #endif
 
 #if defined JS_THREADSAFE && defined DEBUG
 
-namespace js {
-
 class AutoCheckRequestDepth {
     JSContext *cx;
   public:
-    AutoCheckRequestDepth(JSContext *cx) : cx(cx) { cx->thread->checkRequestDepth++; }
+    AutoCheckRequestDepth(JSContext *cx) : cx(cx) { cx->thread()->checkRequestDepth++; }
 
     ~AutoCheckRequestDepth() {
-        JS_ASSERT(cx->thread->checkRequestDepth != 0);
-        cx->thread->checkRequestDepth--;
+        JS_ASSERT(cx->thread()->checkRequestDepth != 0);
+        cx->thread()->checkRequestDepth--;
     }
 };
 
-}
-
 # define CHECK_REQUEST(cx)                                                    \
-    JS_ASSERT((cx)->thread);                                                  \
-    JS_ASSERT((cx)->thread->data.requestDepth || (cx)->thread == (cx)->runtime->gcThread); \
+    JS_ASSERT((cx)->thread());                                                \
+    JS_ASSERT((cx)->thread()->data.requestDepth || (cx)->thread() == (cx)->runtime->gcThread); \
     AutoCheckRequestDepth _autoCheckRequestDepth(cx);
 
 #else
@@ -2108,22 +1381,20 @@ class AutoCheckRequestDepth {
 #endif
 
 static inline uintN
-FramePCOffset(JSContext *cx, JSStackFrame* fp)
+FramePCOffset(JSContext *cx, js::StackFrame* fp)
 {
     jsbytecode *pc = fp->hasImacropc() ? fp->imacropc() : fp->pc(cx);
     return uintN(pc - fp->script()->code);
 }
 
 static inline JSAtom **
-FrameAtomBase(JSContext *cx, JSStackFrame *fp)
+FrameAtomBase(JSContext *cx, js::StackFrame *fp)
 {
     return fp->hasImacropc()
            ? COMMON_ATOMS_START(&cx->runtime->atomState)
            : fp->script()->atomMap.vector;
 }
 
-namespace js {
-
 struct AutoResolving {
   public:
     enum Kind {
@@ -2992,10 +2263,10 @@ js_ReportOutOfMemory(JSContext *cx);
  * Report that cx->scriptStackQuota is exhausted.
  */
 void
-js_ReportOutOfScriptQuota(JSContext *cx);
+js_ReportOutOfScriptQuota(JSContext *maybecx);
 
-extern JS_FRIEND_API(void)
-js_ReportOverRecursed(JSContext *cx);
+extern void
+js_ReportOverRecursed(JSContext *maybecx);
 
 extern JS_FRIEND_API(void)
 js_ReportAllocationOverflow(JSContext *cx);
@@ -3055,8 +2326,8 @@ js_ReportValueErrorFlags(JSContext *cx, uintN flags, const uintN errorNumber,
 extern JSErrorFormatString js_ErrorFormatString[JSErr_Limit];
 
 #ifdef JS_THREADSAFE
-# define JS_ASSERT_REQUEST_DEPTH(cx)  (JS_ASSERT((cx)->thread),               \
-                                       JS_ASSERT((cx)->thread->data.requestDepth >= 1))
+# define JS_ASSERT_REQUEST_DEPTH(cx)  (JS_ASSERT((cx)->thread()),             \
+                                       JS_ASSERT((cx)->thread()->data.requestDepth >= 1))
 #else
 # define JS_ASSERT_REQUEST_DEPTH(cx)  ((void) 0)
 #endif
@@ -3092,8 +2363,8 @@ TriggerAllOperationCallbacks(JSRuntime *rt);
 
 } /* namespace js */
 
-extern JSStackFrame *
-js_GetScriptedCaller(JSContext *cx, JSStackFrame *fp);
+extern js::StackFrame *
+js_GetScriptedCaller(JSContext *cx, js::StackFrame *fp);
 
 extern jsbytecode*
 js_GetCurrentBytecodePC(JSContext* cx);
@@ -3116,7 +2387,7 @@ LeaveTrace(JSContext *cx);
  *
  * Defined in jstracer.cpp if JS_TRACER is defined.
  */
-static JS_FORCES_STACK JS_INLINE JSStackFrame *
+static JS_FORCES_STACK JS_INLINE js::StackFrame *
 js_GetTopStackFrame(JSContext *cx)
 {
     js::LeaveTrace(cx);
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 8c2a57a4fe74..fb00563431ba 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -43,7 +43,6 @@
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "jsparse.h"
 #include "jsstaticcheck.h"
 #include "jsxml.h"
 #include "jsregexp.h"
@@ -64,7 +63,7 @@ GetGlobalForScopeChain(JSContext *cx)
      */
     VOUCH_DOES_NOT_REQUIRE_STACK();
 
-    if (cx->hasfp())
+    if (cx->running())
         return cx->fp()->scopeChain().getGlobal();
 
     JSObject *scope = cx->globalObject;
@@ -76,425 +75,6 @@ GetGlobalForScopeChain(JSContext *cx)
     return scope->asGlobal();
 }
 
-}
-
-#ifdef JS_METHODJIT
-inline js::mjit::JaegerCompartment *JSContext::jaegerCompartment()
-{
-    return compartment->jaegerCompartment;
-}
-#endif
-
-inline bool
-JSContext::ensureGeneratorStackSpace()
-{
-    bool ok = genStack.reserve(genStack.length() + 1);
-    if (!ok)
-        js_ReportOutOfMemory(this);
-    return ok;
-}
-
-inline js::RegExpStatics *
-JSContext::regExpStatics()
-{
-    return js::RegExpStatics::extractFrom(js::GetGlobalForScopeChain(this));
-}
-
-namespace js {
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE JSFrameRegs *
-StackSegment::getCurrentRegs() const
-{
-    JS_ASSERT(inContext());
-    return isActive() ? cx->regs : getSuspendedRegs();
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE JSStackFrame *
-StackSegment::getCurrentFrame() const
-{
-    return getCurrentRegs()->fp;
-}
-
-JS_REQUIRES_STACK inline Value *
-StackSpace::firstUnused() const
-{
-    StackSegment *seg = currentSegment;
-    if (!seg) {
-        JS_ASSERT(invokeArgEnd == NULL);
-        return base;
-    }
-    if (seg->inContext()) {
-        Value *sp = seg->getCurrentRegs()->sp;
-        if (invokeArgEnd > sp) {
-            JS_ASSERT(invokeSegment == currentSegment);
-            JS_ASSERT_IF(seg->maybeContext()->hasfp(),
-                         invokeFrame == seg->maybeContext()->fp());
-            return invokeArgEnd;
-        }
-        return sp;
-    }
-    JS_ASSERT(invokeArgEnd);
-    JS_ASSERT(invokeSegment == currentSegment);
-    return invokeArgEnd;
-}
-
-
-/* Inline so we don't need the friend API. */
-JS_ALWAYS_INLINE bool
-StackSpace::isCurrentAndActive(JSContext *cx) const
-{
-#ifdef DEBUG
-    JS_ASSERT_IF(cx->getCurrentSegment(),
-                 cx->getCurrentSegment()->maybeContext() == cx);
-    cx->assertSegmentsInSync();
-#endif
-    return currentSegment &&
-           currentSegment->isActive() &&
-           currentSegment == cx->getCurrentSegment();
-}
-
-STATIC_POSTCONDITION(!return || ubound(from) >= nvals)
-JS_ALWAYS_INLINE bool
-StackSpace::ensureSpace(JSContext *maybecx, Value *from, ptrdiff_t nvals) const
-{
-    JS_ASSERT(from >= firstUnused());
-#ifdef XP_WIN
-    JS_ASSERT(from <= commitEnd);
-    if (commitEnd - from >= nvals)
-        goto success;
-    if (end - from < nvals) {
-        if (maybecx)
-            js_ReportOutOfScriptQuota(maybecx);
-        return false;
-    }
-    if (!bumpCommit(from, nvals)) {
-        if (maybecx)
-            js_ReportOutOfScriptQuota(maybecx);
-        return false;
-    }
-    goto success;
-#else
-    if (end - from < nvals) {
-        if (maybecx)
-            js_ReportOutOfScriptQuota(maybecx);
-        return false;
-    }
-    goto success;
-#endif
-  success:
-#ifdef DEBUG
-    memset(from, 0xde, nvals * sizeof(js::Value));
-#endif
-    return true;
-}
-
-JS_ALWAYS_INLINE bool
-StackSpace::ensureEnoughSpaceToEnterTrace()
-{
-#ifdef XP_WIN
-    return ensureSpace(NULL, firstUnused(), MAX_TRACE_SPACE_VALS);
-#endif
-    return end - firstUnused() > MAX_TRACE_SPACE_VALS;
-}
-
-JS_ALWAYS_INLINE bool
-StackSpace::EnsureSpaceCheck::operator()(const StackSpace &stack, JSContext *cx,
-                                         Value *from, uintN nvals)
-{
-    return stack.ensureSpace(cx, from, nvals);
-}
-
-JS_ALWAYS_INLINE bool
-StackSpace::LimitCheck::operator()(const StackSpace &stack, JSContext *cx,
-                                   Value *from, uintN nvals)
-{
-    JS_ASSERT(from == stack.firstUnused());
-    JS_ASSERT(from < *limit);
-    if (*limit - from >= ptrdiff_t(nvals))
-        return true;
-    if (stack.bumpCommitAndLimit(base, from, nvals, limit))
-        return true;
-    js_ReportOverRecursed(cx);
-    return false;
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-StackSpace::pushInvokeArgs(JSContext *cx, uintN argc, InvokeArgsGuard *ag)
-{
-    if (JS_UNLIKELY(!isCurrentAndActive(cx)))
-        return pushSegmentForInvoke(cx, argc, ag);
-
-    Value *sp = cx->regs->sp;
-    Value *start = invokeArgEnd > sp ? invokeArgEnd : sp;
-    JS_ASSERT(start == firstUnused());
-    uintN nvals = 2 + argc;
-    if (!ensureSpace(cx, start, nvals))
-        return false;
-
-    Value *vp = start;
-    Value *vpend = vp + nvals;
-    /* Don't need to MakeRangeGCSafe: the VM stack is conservatively marked. */
-
-    /* Use invokeArgEnd to root [vp, vpend) until the frame is pushed. */
-    ag->prevInvokeArgEnd = invokeArgEnd;
-    invokeArgEnd = vpend;
-#ifdef DEBUG
-    ag->prevInvokeSegment = invokeSegment;
-    invokeSegment = currentSegment;
-    ag->prevInvokeFrame = invokeFrame;
-    invokeFrame = cx->maybefp();
-#endif
-
-    ag->cx = cx;
-    ImplicitCast<CallArgs>(*ag) = CallArgsFromVp(argc, vp);
-    return true;
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE void
-StackSpace::popInvokeArgs(const InvokeArgsGuard &ag)
-{
-    if (JS_UNLIKELY(ag.seg != NULL)) {
-        popSegmentForInvoke(ag);
-        return;
-    }
-
-    JS_ASSERT(isCurrentAndActive(ag.cx));
-    JS_ASSERT(invokeSegment == currentSegment);
-    JS_ASSERT(invokeFrame == ag.cx->maybefp());
-    JS_ASSERT(invokeArgEnd == ag.argv() + ag.argc());
-
-#ifdef DEBUG
-    invokeSegment = ag.prevInvokeSegment;
-    invokeFrame = ag.prevInvokeFrame;
-#endif
-    invokeArgEnd = ag.prevInvokeArgEnd;
-}
-
-JS_ALWAYS_INLINE
-InvokeArgsGuard::~InvokeArgsGuard()
-{
-    if (JS_UNLIKELY(!pushed()))
-        return;
-    cx->stack().popInvokeArgs(*this);
-}
-
-template <class Check>
-JS_REQUIRES_STACK JS_ALWAYS_INLINE JSStackFrame *
-StackSpace::getCallFrame(JSContext *cx, Value *firstUnused, uintN nactual,
-                         JSFunction *fun, JSScript *script, uint32 *flags,
-                         Check check) const
-{
-    JS_ASSERT(fun->script() == script);
-
-    /* Include an extra sizeof(JSStackFrame) for the method-jit. */
-    uintN nvals = VALUES_PER_STACK_FRAME + script->nslots;
-    uintN nformal = fun->nargs;
-
-    /* Maintain layout invariant: &formalArgs[0] == ((Value *)fp) - nformal. */
-
-    if (nactual == nformal) {
-        if (JS_UNLIKELY(!check(*this, cx, firstUnused, nvals)))
-            return NULL;
-        return reinterpret_cast<JSStackFrame *>(firstUnused);
-    }
-
-    if (nactual < nformal) {
-        *flags |= JSFRAME_UNDERFLOW_ARGS;
-        uintN nmissing = nformal - nactual;
-        if (JS_UNLIKELY(!check(*this, cx, firstUnused, nmissing + nvals)))
-            return NULL;
-        SetValueRangeToUndefined(firstUnused, nmissing);
-        return reinterpret_cast<JSStackFrame *>(firstUnused + nmissing);
-    }
-
-    *flags |= JSFRAME_OVERFLOW_ARGS;
-    uintN ncopy = 2 + nformal;
-    if (JS_UNLIKELY(!check(*this, cx, firstUnused, ncopy + nvals)))
-        return NULL;
-
-    Value *dst = firstUnused;
-    Value *src = firstUnused - (2 + nactual);
-    PodCopy(dst, src, ncopy);
-    Debug_SetValueRangeToCrashOnTouch(src, ncopy);
-    return reinterpret_cast<JSStackFrame *>(firstUnused + ncopy);
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-StackSpace::getInvokeFrame(JSContext *cx, const CallArgs &args,
-                           JSFunction *fun, JSScript *script,
-                           uint32 *flags, InvokeFrameGuard *fg) const
-{
-    JS_ASSERT(firstUnused() == args.argv() + args.argc());
-
-    Value *firstUnused = args.argv() + args.argc();
-    fg->regs_.fp = getCallFrame(cx, firstUnused, args.argc(), fun, script, flags,
-                                EnsureSpaceCheck());
-    fg->regs_.sp = fg->regs_.fp->slots() + script->nfixed;
-    fg->regs_.pc = script->code;
-
-    return fg->regs_.fp != NULL;
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE void
-StackSpace::pushInvokeFrame(JSContext *cx, const CallArgs &args,
-                            InvokeFrameGuard *fg)
-{
-    JS_ASSERT(firstUnused() == args.argv() + args.argc());
-
-    if (JS_UNLIKELY(!currentSegment->inContext())) {
-        cx->pushSegmentAndFrame(currentSegment, fg->regs_);
-    } else {
-        fg->prevRegs_ = cx->regs;
-        cx->setCurrentRegs(&fg->regs_);
-    }
-
-    fg->cx_ = cx;
-    JS_ASSERT(isCurrentAndActive(cx));
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE void
-StackSpace::popInvokeFrame(const InvokeFrameGuard &fg)
-{
-    JSContext *cx = fg.cx_;
-    JSStackFrame *fp = fg.regs_.fp;
-
-    PutActivationObjects(cx, fp);
-
-    JS_ASSERT(isCurrentAndActive(cx));
-    if (JS_UNLIKELY(currentSegment->getInitialFrame() == fp)) {
-        cx->popSegmentAndFrame();
-    } else {
-        JS_ASSERT(&fg.regs_ == cx->regs);
-        JS_ASSERT(fp->prev_ == fg.prevRegs_->fp);
-        JS_ASSERT(fp->prevpc() == fg.prevRegs_->pc);
-        cx->setCurrentRegs(fg.prevRegs_);
-    }
-}
-
-JS_ALWAYS_INLINE void
-InvokeFrameGuard::pop()
-{
-    JS_ASSERT(pushed());
-    cx_->stack().popInvokeFrame(*this);
-    cx_ = NULL;
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE JSStackFrame *
-StackSpace::getInlineFrame(JSContext *cx, Value *sp, uintN nactual,
-                           JSFunction *fun, JSScript *script, uint32 *flags) const
-{
-    JS_ASSERT(isCurrentAndActive(cx));
-    JS_ASSERT(cx->hasActiveSegment());
-    JS_ASSERT(cx->regs->sp == sp);
-
-    return getCallFrame(cx, sp, nactual, fun, script, flags, EnsureSpaceCheck());
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE JSStackFrame *
-StackSpace::getInlineFrameWithinLimit(JSContext *cx, Value *sp, uintN nactual,
-                                      JSFunction *fun, JSScript *script, uint32 *flags,
-                                      JSStackFrame *base, Value **limit) const
-{
-    JS_ASSERT(isCurrentAndActive(cx));
-    JS_ASSERT(cx->hasActiveSegment());
-    JS_ASSERT(cx->regs->sp == sp);
-
-    return getCallFrame(cx, sp, nactual, fun, script, flags, LimitCheck(base, limit));
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE void
-StackSpace::pushInlineFrame(JSContext *cx, JSScript *script, JSStackFrame *fp,
-                            JSFrameRegs *regs)
-{
-    JS_ASSERT(isCurrentAndActive(cx));
-    JS_ASSERT(cx->regs == regs && script == fp->script());
-
-    regs->fp = fp;
-    regs->pc = script->code;
-    regs->sp = fp->slots() + script->nfixed;
-}
-
-JS_REQUIRES_STACK JS_ALWAYS_INLINE void
-StackSpace::popInlineFrame(JSContext *cx, JSStackFrame *prev, Value *newsp)
-{
-    JSFrameRegs *regs = cx->regs;
-    JSStackFrame *fp = regs->fp;
-
-    JS_ASSERT(isCurrentAndActive(cx));
-    JS_ASSERT(cx->hasActiveSegment());
-    JS_ASSERT(fp->prev_ == prev);
-    JS_ASSERT(!fp->hasImacropc());
-    JS_ASSERT(prev->base() <= newsp && newsp <= fp->formalArgsEnd());
-
-    PutActivationObjects(cx, fp);
-
-    regs->pc = prev->pc(cx, fp);
-    regs->fp = prev;
-    regs->sp = newsp;
-}
-
-JS_ALWAYS_INLINE Value *
-StackSpace::getStackLimit(JSContext *cx)
-{
-    Value *sp = cx->regs->sp;
-    JS_ASSERT(sp == firstUnused());
-    Value *limit = sp + STACK_QUOTA;
-
-    /*
-     * Try to reserve the whole STACK_QUOTA. If that fails, though, just
-     * reserve the minimum required space: enough for the nslots + an
-     * additional stack frame.
-     */
-#ifdef XP_WIN
-    if (JS_LIKELY(limit <= commitEnd))
-        return limit;
-    if (ensureSpace(NULL /* don't report error */, sp, STACK_QUOTA))
-        return limit;
-    uintN minimum = cx->fp()->numSlots() + VALUES_PER_STACK_FRAME;
-    return ensureSpace(cx, sp, minimum) ? sp + minimum : NULL;
-#else
-    if (JS_LIKELY(limit <= end))
-        return limit;
-    uintN minimum = cx->fp()->numSlots() + VALUES_PER_STACK_FRAME;
-    return ensureSpace(cx, sp, minimum) ? sp + minimum : NULL;
-#endif
-}
-
-JS_REQUIRES_STACK inline
-FrameRegsIter::FrameRegsIter(JSContext *cx)
-  : cx(cx)
-{
-    curseg = cx->getCurrentSegment();
-    if (JS_UNLIKELY(!curseg || !curseg->isActive())) {
-        initSlow();
-        return;
-    }
-    JS_ASSERT(cx->regs->fp);
-    curfp = cx->regs->fp;
-    cursp = cx->regs->sp;
-    curpc = cx->regs->pc;
-    return;
-}
-
-inline FrameRegsIter &
-FrameRegsIter::operator++()
-{
-    JSStackFrame *fp = curfp;
-    JSStackFrame *prev = curfp = curfp->prev();
-    if (!prev)
-        return *this;
-
-    curpc = curfp->pc(cx, fp);
-
-    if (JS_UNLIKELY(fp == curseg->getInitialFrame())) {
-        incSlow(fp, prev);
-        return *this;
-    }
-
-    cursp = fp->formalArgsEnd();
-    return *this;
-}
-
 inline GSNCache *
 GetGSNCache(JSContext *cx)
 {
@@ -528,7 +108,7 @@ class CompartmentChecker
 
   public:
     explicit CompartmentChecker(JSContext *cx) : context(cx), compartment(cx->compartment) {
-        check(cx->hasfp() ? JS_GetGlobalForScopeChain(cx) : cx->globalObject);
+        check(cx->running() ? JS_GetGlobalForScopeChain(cx) : cx->globalObject);
         VOUCH_DOES_NOT_REQUIRE_STACK();
     }
 
@@ -613,7 +193,7 @@ class CompartmentChecker
         }
     }
 
-    void check(JSStackFrame *fp) {
+    void check(StackFrame *fp) {
         check(&fp->scopeChain());
     }
 };
@@ -811,6 +391,28 @@ CanLeaveTrace(JSContext *cx)
 
 }  /* namespace js */
 
+#ifdef JS_METHODJIT
+inline js::mjit::JaegerCompartment *JSContext::jaegerCompartment()
+{
+    return compartment->jaegerCompartment;
+}
+#endif
+
+inline bool
+JSContext::ensureGeneratorStackSpace()
+{
+    bool ok = genStack.reserve(genStack.length() + 1);
+    if (!ok)
+        js_ReportOutOfMemory(this);
+    return ok;
+}
+
+inline js::RegExpStatics *
+JSContext::regExpStatics()
+{
+    return js::RegExpStatics::extractFrom(js::GetGlobalForScopeChain(this));
+}
+
 inline void
 JSContext::setPendingException(js::Value v) {
     this->throwing = true;
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index f2a4e2e2bcad..60d44e1611df 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -222,7 +222,7 @@ JSCompartment::wrap(JSContext *cx, Value *vp)
      * This loses us some transparency, and is generally very cheesy.
      */
     JSObject *global;
-    if (cx->hasfp()) {
+    if (cx->running()) {
         global = cx->fp()->scopeChain().getGlobal();
     } else {
         global = cx->globalObject;
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 86b4bed1092c..69b726ba452c 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -136,6 +136,10 @@ struct TracerState
  */
 struct TraceNativeStorage
 {
+    /* Max number of stack slots/frame that may need to be restored in LeaveTree. */
+    static const size_t MAX_NATIVE_STACK_SLOTS  = 4096;
+    static const size_t MAX_CALL_STACK_ENTRIES  = 500;
+
     double stack_global_buf[MAX_NATIVE_STACK_SLOTS + GLOBAL_SLOTS_BUFFER_SIZE];
     FrameInfo *callstack_buf[MAX_CALL_STACK_ENTRIES];
 
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 5221cf37411a..8ea1188ed5f2 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -73,6 +73,8 @@
 
 #include "jsobjinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 
 /*
@@ -2106,13 +2108,13 @@ date_toJSON(JSContext *cx, uintN argc, Value *vp)
     /* Step 6. */
     LeaveTrace(cx);
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, 0, &args))
+    if (!cx->stack.pushInvokeArgs(cx, 0, &args))
         return false;
 
     args.calleev() = toISO;
     args.thisv().setObject(*obj);
 
-    if (!Invoke(cx, args, 0))
+    if (!Invoke(cx, args))
         return false;
     *vp = args.rval();
     return true;
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index fc9351cc6c7d..1708b00302e1 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -69,11 +69,13 @@
 
 #include "jsatominlines.h"
 #include "jsdbgapiinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
+#include "jsinterpinlines.h"
 #include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/Stack-inl.h"
+
 #include "jsautooplen.h"
 
 #include "methodjit/MethodJIT.h"
@@ -116,21 +118,21 @@ JS_SetRuntimeDebugMode(JSRuntime *rt, JSBool debug)
 namespace js {
 
 void
-ScriptDebugPrologue(JSContext *cx, JSStackFrame *fp)
+ScriptDebugPrologue(JSContext *cx, StackFrame *fp)
 {
     if (fp->isFramePushedByExecute()) {
         if (JSInterpreterHook hook = cx->debugHooks->executeHook)
-            fp->setHookData(hook(cx, fp, true, 0, cx->debugHooks->executeHookData));
+            fp->setHookData(hook(cx, Jsvalify(fp), true, 0, cx->debugHooks->executeHookData));
     } else {
         if (JSInterpreterHook hook = cx->debugHooks->callHook)
-            fp->setHookData(hook(cx, fp, true, 0, cx->debugHooks->callHookData));
+            fp->setHookData(hook(cx, Jsvalify(fp), true, 0, cx->debugHooks->callHookData));
     }
 
     Probes::enterJSFun(cx, fp->maybeFun(), fp->script());
 }
 
 bool
-ScriptDebugEpilogue(JSContext *cx, JSStackFrame *fp, bool okArg)
+ScriptDebugEpilogue(JSContext *cx, StackFrame *fp, bool okArg)
 {
     JSBool ok = okArg;
 
@@ -139,10 +141,10 @@ ScriptDebugEpilogue(JSContext *cx, JSStackFrame *fp, bool okArg)
     if (void *hookData = fp->maybeHookData()) {
         if (fp->isFramePushedByExecute()) {
             if (JSInterpreterHook hook = cx->debugHooks->executeHook)
-                hook(cx, fp, false, &ok, hookData);
+                hook(cx, Jsvalify(fp), false, &ok, hookData);
         } else {
             if (JSInterpreterHook hook = cx->debugHooks->callHook)
-                hook(cx, fp, false, &ok, hookData);
+                hook(cx, Jsvalify(fp), false, &ok, hookData);
         }
     }
 
@@ -1361,33 +1363,35 @@ JS_GetScriptPrincipals(JSContext *cx, JSScript *script)
 JS_PUBLIC_API(JSStackFrame *)
 JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp)
 {
-    *iteratorp = (*iteratorp == NULL) ? js_GetTopStackFrame(cx) : (*iteratorp)->prev();
+    StackFrame *fp = Valueify(*iteratorp);
+    *iteratorp = Jsvalify((fp == NULL) ? js_GetTopStackFrame(cx) : fp->prev());
     return *iteratorp;
 }
 
 JS_PUBLIC_API(JSScript *)
 JS_GetFrameScript(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->maybeScript();
+    return Valueify(fp)->maybeScript();
 }
 
 JS_PUBLIC_API(jsbytecode *)
 JS_GetFramePC(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->pc(cx);
+    return Valueify(fp)->pc(cx);
 }
 
 JS_PUBLIC_API(JSStackFrame *)
 JS_GetScriptedCaller(JSContext *cx, JSStackFrame *fp)
 {
-    return js_GetScriptedCaller(cx, fp);
+    return Jsvalify(js_GetScriptedCaller(cx, Valueify(fp)));
 }
 
 JS_PUBLIC_API(void *)
-JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp)
+JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fpArg)
 {
+    StackFrame *fp = Valueify(fpArg);
     if (fp->annotation() && fp->isScriptFrame()) {
-        JSPrincipals *principals = fp->principals(cx);
+        JSPrincipals *principals = fp->scopeChain().principals(cx);
 
         if (principals && principals->globalPrivilegesEnabled(cx, principals)) {
             /*
@@ -1404,7 +1408,7 @@ JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp)
 JS_PUBLIC_API(void)
 JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation)
 {
-    fp->setAnnotation(annotation);
+    Valueify(fp)->setAnnotation(annotation);
 }
 
 JS_PUBLIC_API(void *)
@@ -1412,7 +1416,7 @@ JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp)
 {
     JSPrincipals *principals;
 
-    principals = fp->principals(cx);
+    principals = Valueify(fp)->scopeChain().principals(cx);
     if (!principals)
         return NULL;
     return principals->getPrincipalArray(cx, principals);
@@ -1421,34 +1425,36 @@ JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp)
 JS_PUBLIC_API(JSBool)
 JS_IsScriptFrame(JSContext *cx, JSStackFrame *fp)
 {
-    return !fp->isDummyFrame();
+    return !Valueify(fp)->isDummyFrame();
 }
 
 /* this is deprecated, use JS_GetFrameScopeChain instead */
 JS_PUBLIC_API(JSObject *)
 JS_GetFrameObject(JSContext *cx, JSStackFrame *fp)
 {
-    return &fp->scopeChain();
+    return &Valueify(fp)->scopeChain();
 }
 
 JS_PUBLIC_API(JSObject *)
-JS_GetFrameScopeChain(JSContext *cx, JSStackFrame *fp)
+JS_GetFrameScopeChain(JSContext *cx, JSStackFrame *fpArg)
 {
-    JS_ASSERT(cx->stack().contains(fp));
+    StackFrame *fp = Valueify(fpArg);
+    JS_ASSERT(cx->stack.contains(fp));
 
     js::AutoCompartment ac(cx, &fp->scopeChain());
     if (!ac.enter())
         return NULL;
 
     /* Force creation of argument and call objects if not yet created */
-    (void) JS_GetFrameCallObject(cx, fp);
+    (void) JS_GetFrameCallObject(cx, Jsvalify(fp));
     return GetScopeChain(cx, fp);
 }
 
 JS_PUBLIC_API(JSObject *)
-JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fp)
+JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fpArg)
 {
-    JS_ASSERT(cx->stack().contains(fp));
+    StackFrame *fp = Valueify(fpArg);
+    JS_ASSERT(cx->stack.contains(fp));
 
     if (!fp->isFunctionFrame())
         return NULL;
@@ -1467,8 +1473,9 @@ JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fp)
 }
 
 JS_PUBLIC_API(JSBool)
-JS_GetFrameThis(JSContext *cx, JSStackFrame *fp, jsval *thisv)
+JS_GetFrameThis(JSContext *cx, JSStackFrame *fpArg, jsval *thisv)
 {
+    StackFrame *fp = Valueify(fpArg);
     if (fp->isDummyFrame())
         return false;
 
@@ -1485,12 +1492,13 @@ JS_GetFrameThis(JSContext *cx, JSStackFrame *fp, jsval *thisv)
 JS_PUBLIC_API(JSFunction *)
 JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->maybeFun();
+    return Valueify(fp)->maybeFun();
 }
 
 JS_PUBLIC_API(JSObject *)
-JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp)
+JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fpArg)
 {
+    StackFrame *fp = Valueify(fpArg);
     if (!fp->isFunctionFrame())
         return NULL;
 
@@ -1502,13 +1510,13 @@ JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp)
 JS_PUBLIC_API(JSBool)
 JS_IsConstructorFrame(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->isConstructing();
+    return Valueify(fp)->isConstructing();
 }
 
 JS_PUBLIC_API(JSObject *)
 JS_GetFrameCalleeObject(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->maybeCallee();
+    return Valueify(fp)->maybeCallee();
 }
 
 JS_PUBLIC_API(JSBool)
@@ -1516,7 +1524,7 @@ JS_GetValidFrameCalleeObject(JSContext *cx, JSStackFrame *fp, jsval *vp)
 {
     Value v;
 
-    if (!fp->getValidCalleeObject(cx, &v))
+    if (!Valueify(fp)->getValidCalleeObject(cx, &v))
         return false;
     *vp = Jsvalify(v);
     return true;
@@ -1525,18 +1533,19 @@ JS_GetValidFrameCalleeObject(JSContext *cx, JSStackFrame *fp, jsval *vp)
 JS_PUBLIC_API(JSBool)
 JS_IsDebuggerFrame(JSContext *cx, JSStackFrame *fp)
 {
-    return fp->isDebuggerFrame();
+    return Valueify(fp)->isDebuggerFrame();
 }
 
 JS_PUBLIC_API(jsval)
 JS_GetFrameReturnValue(JSContext *cx, JSStackFrame *fp)
 {
-    return Jsvalify(fp->returnValue());
+    return Jsvalify(Valueify(fp)->returnValue());
 }
 
 JS_PUBLIC_API(void)
-JS_SetFrameReturnValue(JSContext *cx, JSStackFrame *fp, jsval rval)
+JS_SetFrameReturnValue(JSContext *cx, JSStackFrame *fpArg, jsval rval)
 {
+    StackFrame *fp = Valueify(fpArg);
 #ifdef JS_METHODJIT
     JS_ASSERT_IF(fp->isScriptFrame(), fp->script()->debugMode);
 #endif
@@ -1590,7 +1599,7 @@ JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
 /***************************************************************************/
 
 JS_PUBLIC_API(JSBool)
-JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
+JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fpArg,
                           const jschar *chars, uintN length,
                           const char *filename, uintN lineno,
                           jsval *rval)
@@ -1600,7 +1609,7 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
     if (!CheckDebugMode(cx))
         return false;
 
-    JSObject *scobj = JS_GetFrameScopeChain(cx, fp);
+    JSObject *scobj = JS_GetFrameScopeChain(cx, fpArg);
     if (!scobj)
         return false;
 
@@ -1614,7 +1623,8 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
      * we use a static level that will cause us not to attempt to optimize
      * variable references made by this frame.
      */
-    JSScript *script = Compiler::compileScript(cx, scobj, fp, fp->principals(cx),
+    StackFrame *fp = Valueify(fpArg);
+    JSScript *script = Compiler::compileScript(cx, scobj, fp, fp->scopeChain().principals(cx),
                                                TCF_COMPILE_N_GO, chars, length,
                                                filename, lineno, cx->findVersion(),
                                                NULL, UpvarCookie::UPVAR_LEVEL_LIMIT);
@@ -1622,7 +1632,8 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
     if (!script)
         return false;
 
-    bool ok = Execute(cx, *scobj, script, fp, JSFRAME_DEBUGGER | JSFRAME_EVAL, Valueify(rval));
+    uintN evalFlags = StackFrame::DEBUGGER | StackFrame::EVAL;
+    bool ok = Execute(cx, *scobj, script, fp, evalFlags, Valueify(rval));
 
     js_DestroyScript(cx, script);
     return ok;
@@ -2423,7 +2434,7 @@ jstv_Lineno(JSContext *cx, JSStackFrame *fp)
 JS_FRIEND_API(void)
 js::StoreTraceVisState(JSContext *cx, TraceVisState s, TraceVisExitReason r)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
     char *script_file = jstv_Filename(fp);
     JSHashNumber hash = JS_HashString(script_file);
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index 10b5570ed647..c26289658f49 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -2211,7 +2211,7 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
     }
 
     if (cookie.isFree()) {
-        JSStackFrame *caller = cg->parser->callerFrame;
+        StackFrame *caller = cg->parser->callerFrame;
         if (caller) {
             JS_ASSERT(cg->compileAndGo());
 
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 57f43d9f4adc..efa9da82413c 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -64,10 +64,10 @@
 #include "jsstaticcheck.h"
 #include "jswrapper.h"
 
-#include "jscntxtinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
@@ -267,7 +267,7 @@ InitExnPrivate(JSContext *cx, JSObject *exnObject, JSString *message,
     JSErrorReporter older;
     JSExceptionState *state;
     jsid callerid;
-    JSStackFrame *fp, *fpstop;
+    StackFrame *fp, *fpstop;
     size_t stackDepth, valueCount, size;
     JSBool overflow;
     JSExnPrivate *priv;
@@ -693,7 +693,7 @@ static JSBool
 Exception(JSContext *cx, uintN argc, Value *vp)
 {
     JSString *message, *filename;
-    JSStackFrame *fp;
+    StackFrame *fp;
 
     /*
      * ECMA ed. 3, 15.11.1 requires Error, etc., to construct even when
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 16a10befd34c..902d43626722 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -74,3 +74,9 @@ JS_UnwrapObject(JSObject *obj)
 {
     return obj->unwrap();
 }
+
+JS_FRIEND_API(JSObject *)
+JS_GetFrameScopeChainRaw(JSStackFrame *fp)
+{
+    return &Valueify(fp)->scopeChain();
+}
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index b3beecaa8c57..a2179e5983f4 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -54,6 +54,9 @@ JS_FindCompilationScope(JSContext *cx, JSObject *obj);
 extern JS_FRIEND_API(JSObject *)
 JS_UnwrapObject(JSObject *obj);
 
+extern JS_FRIEND_API(JSObject *)
+JS_GetFrameScopeChainRaw(JSStackFrame *fp);
+
 JS_END_EXTERN_C
 
 #endif /* jsfriendapi_h___ */
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index f155cc32581f..8c9b473f3376 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -86,12 +86,12 @@
 #endif
 
 #include "jsatominlines.h"
-#include "jscntxtinlines.h"
 #include "jsfuninlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
@@ -102,7 +102,7 @@ JSObject::getThrowTypeError() const
 }
 
 JSBool
-js_GetArgsValue(JSContext *cx, JSStackFrame *fp, Value *vp)
+js_GetArgsValue(JSContext *cx, StackFrame *fp, Value *vp)
 {
     JSObject *argsobj;
 
@@ -119,7 +119,7 @@ js_GetArgsValue(JSContext *cx, JSStackFrame *fp, Value *vp)
 }
 
 JSBool
-js_GetArgsProperty(JSContext *cx, JSStackFrame *fp, jsid id, Value *vp)
+js_GetArgsProperty(JSContext *cx, StackFrame *fp, jsid id, Value *vp)
 {
     JS_ASSERT(fp->isFunctionFrame());
 
@@ -233,7 +233,7 @@ struct STATIC_SKIP_INFERENCE PutArg
 };
 
 JSObject *
-js_GetArgsObject(JSContext *cx, JSStackFrame *fp)
+js_GetArgsObject(JSContext *cx, StackFrame *fp)
 {
     /*
      * We must be in a function activation; the function must be lightweight
@@ -273,7 +273,7 @@ js_GetArgsObject(JSContext *cx, JSStackFrame *fp)
 }
 
 void
-js_PutArgsObject(JSContext *cx, JSStackFrame *fp)
+js_PutArgsObject(StackFrame *fp)
 {
     JSObject &argsobj = fp->argsObj();
     if (argsobj.isNormalArguments()) {
@@ -357,7 +357,7 @@ args_delProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
 }
 
 static JS_REQUIRES_STACK JSObject *
-WrapEscapingClosure(JSContext *cx, JSStackFrame *fp, JSFunction *fun)
+WrapEscapingClosure(JSContext *cx, StackFrame *fp, JSFunction *fun)
 {
     JS_ASSERT(fun->optimizedClosure());
     JS_ASSERT(!fun->u.i.wrapper);
@@ -526,7 +526,7 @@ ArgGetter(JSContext *cx, JSObject *obj, jsid id, Value *vp)
         uintN arg = uintN(JSID_TO_INT(id));
         if (arg < obj->getArgsInitialLength()) {
             JS_ASSERT(!obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE));
-            if (JSStackFrame *fp = (JSStackFrame *) obj->getPrivate())
+            if (StackFrame *fp = (StackFrame *) obj->getPrivate())
                 *vp = fp->canonicalActualArg(arg);
             else
                 *vp = obj->getArgsElement(arg);
@@ -575,7 +575,7 @@ ArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
     if (JSID_IS_INT(id)) {
         uintN arg = uintN(JSID_TO_INT(id));
         if (arg < obj->getArgsInitialLength()) {
-            JSStackFrame *fp = (JSStackFrame *) obj->getPrivate();
+            StackFrame *fp = (StackFrame *) obj->getPrivate();
             if (fp) {
                 JSScript *script = fp->functionScript();
                 if (script->usesArguments)
@@ -798,13 +798,13 @@ args_finalize(JSContext *cx, JSObject *obj)
  * otherwise reachable. An executing generator is rooted by its invocation.  To
  * distinguish the two cases (which imply different access paths to the
  * generator object), we use the JSFRAME_FLOATING_GENERATOR flag, which is only
- * set on the JSStackFrame kept in the generator object's JSGenerator.
+ * set on the StackFrame kept in the generator object's JSGenerator.
  */
 static inline void
 MaybeMarkGenerator(JSTracer *trc, JSObject *obj)
 {
 #if JS_HAS_GENERATORS
-    JSStackFrame *fp = (JSStackFrame *) obj->getPrivate();
+    StackFrame *fp = (StackFrame *) obj->getPrivate();
     if (fp && fp->isFloatingGenerator()) {
         JSObject *genobj = js_FloatingFrameToGenerator(fp)->obj;
         MarkObject(trc, *genobj, "generator object");
@@ -838,7 +838,7 @@ args_trace(JSTracer *trc, JSObject *obj)
  *
  * The JSClass functions below collaborate to lazily reflect and synchronize
  * actual argument values, argument count, and callee function object stored
- * in a JSStackFrame with their corresponding property values in the frame's
+ * in a StackFrame with their corresponding property values in the frame's
  * arguments object.
  */
 Class js_ArgumentsClass = {
@@ -895,7 +895,7 @@ Class StrictArgumentsClass = {
 }
 
 /*
- * A Declarative Environment object stores its active JSStackFrame pointer in
+ * A Declarative Environment object stores its active StackFrame pointer in
  * its private slot, just as Call and Arguments objects do.
  */
 Class js_DeclEnvClass = {
@@ -930,7 +930,7 @@ CheckForEscapingClosure(JSContext *cx, JSObject *obj, Value *vp)
         if (fun->needsWrapper()) {
             LeaveTrace(cx);
 
-            JSStackFrame *fp = (JSStackFrame *) obj->getPrivate();
+            StackFrame *fp = (StackFrame *) obj->getPrivate();
             if (fp) {
                 JSObject *wrapper = WrapEscapingClosure(cx, fp, fun);
                 if (!wrapper)
@@ -993,7 +993,7 @@ NewCallObject(JSContext *cx, JSScript *script, JSObject &scopeChain, JSObject *c
 }
 
 static inline JSObject *
-NewDeclEnvObject(JSContext *cx, JSStackFrame *fp)
+NewDeclEnvObject(JSContext *cx, StackFrame *fp)
 {
     JSObject *envobj = js_NewGCObject(cx, FINALIZE_OBJECT2);
     if (!envobj)
@@ -1011,7 +1011,7 @@ NewDeclEnvObject(JSContext *cx, JSStackFrame *fp)
 namespace js {
 
 JSObject *
-CreateFunCallObject(JSContext *cx, JSStackFrame *fp)
+CreateFunCallObject(JSContext *cx, StackFrame *fp)
 {
     JS_ASSERT(fp->isNonEvalFunctionFrame());
     JS_ASSERT(!fp->hasCallObj());
@@ -1048,7 +1048,7 @@ CreateFunCallObject(JSContext *cx, JSStackFrame *fp)
 }
 
 JSObject *
-CreateEvalCallObject(JSContext *cx, JSStackFrame *fp)
+CreateEvalCallObject(JSContext *cx, StackFrame *fp)
 {
     JSObject *callobj = NewCallObject(cx, fp->script(), fp->scopeChain(), NULL);
     if (!callobj)
@@ -1083,7 +1083,7 @@ CopyValuesToCallObject(JSObject &callobj, uintN nargs, Value *argv, uintN nvars,
 }
 
 void
-js_PutCallObject(JSContext *cx, JSStackFrame *fp)
+js_PutCallObject(StackFrame *fp)
 {
     JSObject &callobj = fp->callObj();
     JS_ASSERT(callobj.getPrivate() == fp);
@@ -1094,7 +1094,7 @@ js_PutCallObject(JSContext *cx, JSStackFrame *fp)
     if (fp->hasArgsObj()) {
         if (!fp->hasOverriddenArgs())
             callobj.setCallObjArguments(ObjectValue(fp->argsObj()));
-        js_PutArgsObject(cx, fp);
+        js_PutArgsObject(fp);
     }
 
     JSScript *script = fp->script();
@@ -1160,7 +1160,7 @@ js_PutCallObject(JSContext *cx, JSStackFrame *fp)
 }
 
 JSBool JS_FASTCALL
-js_PutCallObjectOnTrace(JSContext *cx, JSObject *callobj, uint32 nargs, Value *argv,
+js_PutCallObjectOnTrace(JSObject *callobj, uint32 nargs, Value *argv,
                         uint32 nvars, Value *slots)
 {
     JS_ASSERT(callobj->isCall());
@@ -1173,7 +1173,7 @@ js_PutCallObjectOnTrace(JSContext *cx, JSObject *callobj, uint32 nargs, Value *a
     return true;
 }
 
-JS_DEFINE_CALLINFO_6(extern, BOOL, js_PutCallObjectOnTrace, CONTEXT, OBJECT, UINT32, VALUEPTR,
+JS_DEFINE_CALLINFO_5(extern, BOOL, js_PutCallObjectOnTrace, OBJECT, UINT32, VALUEPTR,
                      UINT32, VALUEPTR, 0, nanojit::ACCSET_STORE_ANY)
 
 namespace js {
@@ -1181,7 +1181,7 @@ namespace js {
 static JSBool
 GetCallArguments(JSContext *cx, JSObject *obj, jsid id, Value *vp)
 {
-    JSStackFrame *fp = obj->maybeCallObjStackFrame();
+    StackFrame *fp = obj->maybeCallObjStackFrame();
     if (fp && !fp->hasOverriddenArgs()) {
         JSObject *argsobj = js_GetArgsObject(cx, fp);
         if (!argsobj)
@@ -1196,7 +1196,7 @@ GetCallArguments(JSContext *cx, JSObject *obj, jsid id, Value *vp)
 static JSBool
 SetCallArguments(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
 {
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
+    if (StackFrame *fp = obj->maybeCallObjStackFrame())
         fp->setOverriddenArgs();
     obj->setCallObjArguments(*vp);
     return true;
@@ -1208,7 +1208,7 @@ GetCallArg(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     JS_ASSERT((int16) JSID_TO_INT(id) == JSID_TO_INT(id));
     uintN i = (uint16) JSID_TO_INT(id);
 
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
+    if (StackFrame *fp = obj->maybeCallObjStackFrame())
         *vp = fp->formalArg(i);
     else
         *vp = obj->callObjArg(i);
@@ -1222,7 +1222,7 @@ SetCallArg(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
     uintN i = (uint16) JSID_TO_INT(id);
 
     Value *argp;
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
+    if (StackFrame *fp = obj->maybeCallObjStackFrame())
         argp = &fp->formalArg(i);
     else
         argp = &obj->callObjArg(i);
@@ -1261,7 +1261,7 @@ GetCallVar(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     JS_ASSERT((int16) JSID_TO_INT(id) == JSID_TO_INT(id));
     uintN i = (uint16) JSID_TO_INT(id);
 
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
+    if (StackFrame *fp = obj->maybeCallObjStackFrame())
         *vp = fp->varSlot(i);
     else
         *vp = obj->callObjVar(i);
@@ -1302,7 +1302,7 @@ SetCallVar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
 #endif
 
     Value *varp;
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
+    if (StackFrame *fp = obj->maybeCallObjStackFrame())
         varp = &fp->varSlot(i);
     else
         varp = &obj->callObjVar(i);
@@ -1379,7 +1379,7 @@ static void
 call_trace(JSTracer *trc, JSObject *obj)
 {
     JS_ASSERT(obj->isCall());
-    if (JSStackFrame *fp = obj->maybeCallObjStackFrame()) {
+    if (StackFrame *fp = obj->maybeCallObjStackFrame()) {
         /*
          * FIXME: Hide copies of stack values rooted by fp from the Cycle
          * Collector, which currently lacks a non-stub Unlink implementation
@@ -1420,7 +1420,7 @@ JS_PUBLIC_DATA(Class) js_CallClass = {
 };
 
 bool
-JSStackFrame::getValidCalleeObject(JSContext *cx, Value *vp)
+StackFrame::getValidCalleeObject(JSContext *cx, Value *vp)
 {
     if (!isFunctionFrame()) {
         vp->setUndefined();
@@ -1584,7 +1584,7 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     JSFunction *fun = obj->getFunctionPrivate();
 
     /* Find fun's top-most activation record. */
-    JSStackFrame *fp;
+    StackFrame *fp;
     for (fp = js_GetTopStackFrame(cx);
          fp && (fp->maybeFun() != fun || fp->isEvalOrDebuggerFrame());
          fp = fp->prev()) {
@@ -2137,7 +2137,7 @@ js_fun_call(JSContext *cx, uintN argc, Value *vp)
 
     /* Allocate stack space for fval, obj, and the args. */
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc, &args))
         return JS_FALSE;
 
     /* Push fval, thisv, and the args. */
@@ -2145,7 +2145,7 @@ js_fun_call(JSContext *cx, uintN argc, Value *vp)
     args.thisv() = thisv;
     memcpy(args.argv(), argv, argc * sizeof *argv);
 
-    bool ok = Invoke(cx, args, 0);
+    bool ok = Invoke(cx, args);
     *vp = args.rval();
     return ok;
 }
@@ -2188,7 +2188,7 @@ js_fun_apply(JSContext *cx, uintN argc, Value *vp)
     uintN n = uintN(JS_MIN(length, JS_ARGS_LENGTH_MAX));
 
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, n, &args))
+    if (!cx->stack.pushInvokeArgs(cx, n, &args))
         return false;
 
     /* Push fval, obj, and aobj's elements as args. */
@@ -2200,7 +2200,7 @@ js_fun_apply(JSContext *cx, uintN argc, Value *vp)
         return false;
 
     /* Step 9. */
-    if (!Invoke(cx, args, 0))
+    if (!Invoke(cx, args))
         return false;
     *vp = args.rval();
     return true;
@@ -2301,7 +2301,7 @@ CallOrConstructBoundFunction(JSContext *cx, uintN argc, Value *vp)
     const Value &boundThis = obj->getBoundFunctionThis();
 
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc + argslen, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc + argslen, &args))
         return false;
 
     /* 15.3.4.5.1, 15.3.4.5.2 step 4. */
@@ -2314,7 +2314,7 @@ CallOrConstructBoundFunction(JSContext *cx, uintN argc, Value *vp)
     if (!constructing)
         args.thisv() = boundThis;
 
-    if (constructing ? !InvokeConstructor(cx, args) : !Invoke(cx, args, 0))
+    if (constructing ? !InvokeConstructor(cx, args) : !Invoke(cx, args))
         return false;
 
     *vp = args.rval();
@@ -2961,9 +2961,7 @@ js_DefineFunction(JSContext *cx, JSObject *obj, jsid id, Native native,
     return fun;
 }
 
-#if (JSV2F_CONSTRUCT & JSV2F_SEARCH_STACK)
-# error "JSINVOKE_CONSTRUCT and JSV2F_SEARCH_STACK are not disjoint!"
-#endif
+JS_STATIC_ASSERT((JSV2F_CONSTRUCT & JSV2F_SEARCH_STACK) == 0);
 
 JSFunction *
 js_ValueToFunction(JSContext *cx, const Value *vp, uintN flags)
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 3a90fda2b2eb..176627b07397 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -489,7 +489,7 @@ js_DefineFunction(JSContext *cx, JSObject *obj, jsid id, js::Native native,
  * fact that JSINVOKE_CONSTRUCT (aka JSFRAME_CONSTRUCTING) is 1, and test that
  * with #if/#error in jsfun.c.
  */
-#define JSV2F_CONSTRUCT         JSINVOKE_CONSTRUCT
+#define JSV2F_CONSTRUCT         ((uintN)js::INVOKE_CONSTRUCTOR)
 #define JSV2F_SEARCH_STACK      0x10000
 
 extern JSFunction *
@@ -508,19 +508,19 @@ extern JSObject * JS_FASTCALL
 js_CreateCallObjectOnTrace(JSContext *cx, JSFunction *fun, JSObject *callee, JSObject *scopeChain);
 
 extern void
-js_PutCallObject(JSContext *cx, JSStackFrame *fp);
+js_PutCallObject(js::StackFrame *fp);
 
 extern JSBool JS_FASTCALL
-js_PutCallObjectOnTrace(JSContext *cx, JSObject *scopeChain, uint32 nargs,
-                        js::Value *argv, uint32 nvars, js::Value *slots);
+js_PutCallObjectOnTrace(JSObject *scopeChain, uint32 nargs, js::Value *argv,
+                        uint32 nvars, js::Value *slots);
 
 namespace js {
 
 JSObject *
-CreateFunCallObject(JSContext *cx, JSStackFrame *fp);
+CreateFunCallObject(JSContext *cx, StackFrame *fp);
 
 JSObject *
-CreateEvalCallObject(JSContext *cx, JSStackFrame *fp);
+CreateEvalCallObject(JSContext *cx, StackFrame *fp);
 
 extern JSBool
 GetCallArg(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);
@@ -550,10 +550,10 @@ SetCallUpvar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, js::Value *vp
 } // namespace js
 
 extern JSBool
-js_GetArgsValue(JSContext *cx, JSStackFrame *fp, js::Value *vp);
+js_GetArgsValue(JSContext *cx, js::StackFrame *fp, js::Value *vp);
 
 extern JSBool
-js_GetArgsProperty(JSContext *cx, JSStackFrame *fp, jsid id, js::Value *vp);
+js_GetArgsProperty(JSContext *cx, js::StackFrame *fp, jsid id, js::Value *vp);
 
 /*
  * Get the arguments object for the given frame.  If the frame is strict mode
@@ -566,10 +566,10 @@ js_GetArgsProperty(JSContext *cx, JSStackFrame *fp, jsid id, js::Value *vp);
  *     function.
  */
 extern JSObject *
-js_GetArgsObject(JSContext *cx, JSStackFrame *fp);
+js_GetArgsObject(JSContext *cx, js::StackFrame *fp);
 
 extern void
-js_PutArgsObject(JSContext *cx, JSStackFrame *fp);
+js_PutArgsObject(js::StackFrame *fp);
 
 inline bool
 js_IsNamedLambda(JSFunction *fun) { return (fun->flags & JSFUN_LAMBDA) && fun->atom; }
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index b3c8580f63ea..0c8675e936d3 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -85,8 +85,6 @@
 #endif
 
 #include "jsprobes.h"
-#include "jscntxtinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jshashtable.h"
 #include "jsweakmap.h"
@@ -968,8 +966,8 @@ RecordNativeStackTopForGC(JSContext *cx)
 
 #ifdef JS_THREADSAFE
     /* Record the stack top here only if we are called from a request. */
-    JS_ASSERT(cx->thread->data.requestDepth >= ctd->requestThreshold);
-    if (cx->thread->data.requestDepth == ctd->requestThreshold)
+    JS_ASSERT(cx->thread()->data.requestDepth >= ctd->requestThreshold);
+    if (cx->thread()->data.requestDepth == ctd->requestThreshold)
         return;
 #endif
     ctd->recordStackTop();
@@ -1235,7 +1233,7 @@ bool
 CheckAllocation(JSContext *cx)
 {
 #ifdef JS_THREADSAFE
-    JS_ASSERT(cx->thread);
+    JS_ASSERT(cx->thread());
 #endif
     JS_ASSERT(!cx->runtime->gcRunning);
     return true;
@@ -1642,7 +1640,7 @@ gc_lock_traversal(const GCLocks::Entry &entry, JSTracer *trc)
 }
 
 void
-js_TraceStackFrame(JSTracer *trc, JSStackFrame *fp)
+js_TraceStackFrame(JSTracer *trc, StackFrame *fp)
 {
     MarkObject(trc, fp->scopeChain(), "scope chain");
     if (fp->isDummyFrame())
@@ -2622,9 +2620,9 @@ LetOtherGCFinish(JSContext *cx)
 {
     JSRuntime *rt = cx->runtime;
     JS_ASSERT(rt->gcThread);
-    JS_ASSERT(cx->thread != rt->gcThread);
+    JS_ASSERT(cx->thread() != rt->gcThread);
 
-    size_t requestDebit = cx->thread->data.requestDepth ? 1 : 0;
+    size_t requestDebit = cx->thread()->data.requestDepth ? 1 : 0;
     JS_ASSERT(requestDebit <= rt->requestCount);
 #ifdef JS_TRACER
     JS_ASSERT_IF(requestDebit == 0, !JS_ON_TRACE(cx));
@@ -2693,7 +2691,7 @@ AutoGCSession::AutoGCSession(JSContext *cx)
     JSRuntime *rt = cx->runtime;
 
 #ifdef JS_THREADSAFE
-    if (rt->gcThread && rt->gcThread != cx->thread)
+    if (rt->gcThread && rt->gcThread != cx->thread())
         LetOtherGCFinish(cx);
 #endif
 
@@ -2702,7 +2700,7 @@ AutoGCSession::AutoGCSession(JSContext *cx)
 #ifdef JS_THREADSAFE
     /* No other thread is in GC, so indicate that we're now in GC. */
     JS_ASSERT(!rt->gcThread);
-    rt->gcThread = cx->thread;
+    rt->gcThread = cx->thread();
 
     /*
      * Notify operation callbacks on other threads, which will give them a
@@ -2712,7 +2710,7 @@ AutoGCSession::AutoGCSession(JSContext *cx)
      */
     for (JSThread::Map::Range r = rt->threads.all(); !r.empty(); r.popFront()) {
         JSThread *thread = r.front().value;
-        if (thread != cx->thread)
+        if (thread != cx->thread())
             thread->data.triggerOperationCallback(rt);
     }
 
@@ -2722,7 +2720,7 @@ AutoGCSession::AutoGCSession(JSContext *cx)
      * JS_NOTIFY_REQUEST_DONE, which will wake us up, is only called on
      * rt->requestCount transitions to 0.
      */
-    size_t requestDebit = cx->thread->data.requestDepth ? 1 : 0;
+    size_t requestDebit = cx->thread()->data.requestDepth ? 1 : 0;
     JS_ASSERT(requestDebit <= rt->requestCount);
     if (requestDebit != rt->requestCount) {
         rt->requestCount -= requestDebit;
@@ -2750,7 +2748,7 @@ AutoGCSession::~AutoGCSession()
     JSRuntime *rt = context->runtime;
     rt->gcRunning = false;
 #ifdef JS_THREADSAFE
-    JS_ASSERT(rt->gcThread == context->thread);
+    JS_ASSERT(rt->gcThread == context->thread());
     rt->gcThread = NULL;
     JS_NOTIFY_GC_DONE(rt);
 #endif
@@ -2773,7 +2771,7 @@ GCUntilDone(JSContext *cx, JSCompartment *comp, JSGCInvocationKind gckind  GCTIM
         rt->gcPoke = true;
 #ifdef JS_THREADSAFE
         JS_ASSERT(rt->gcThread);
-        if (rt->gcThread != cx->thread) {
+        if (rt->gcThread != cx->thread()) {
             /* We do not return until another GC finishes. */
             LetOtherGCFinish(cx);
         }
@@ -2919,7 +2917,7 @@ SetProtoCheckingForCycles(JSContext *cx, JSObject *obj, JSObject *proto)
      * request.
      */
 #ifdef JS_THREADSAFE
-    JS_ASSERT(cx->thread->data.requestDepth);
+    JS_ASSERT(cx->thread()->data.requestDepth);
 
     /*
      * This is only necessary if AutoGCSession below would wait for GC to
@@ -3000,7 +2998,7 @@ TraceRuntime(JSTracer *trc)
         JSRuntime *rt = cx->runtime;
         AutoLockGC lock(rt);
 
-        if (rt->gcThread != cx->thread) {
+        if (rt->gcThread != cx->thread()) {
             AutoGCSession gcsession(cx);
             AutoUnlockGC unlock(rt);
             RecordNativeStackTopForGC(trc->context);
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index d4b1f9aea224..5bd8f566090f 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -821,7 +821,7 @@ extern JS_FRIEND_API(bool)
 js_GCThingIsMarked(void *thing, uintN color);
 
 extern void
-js_TraceStackFrame(JSTracer *trc, JSStackFrame *fp);
+js_TraceStackFrame(JSTracer *trc, js::StackFrame *fp);
 
 namespace js {
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 91df9d9da51d..2ab8b859358b 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -80,7 +80,6 @@
 #include "methodjit/Logging.h"
 #endif
 #include "jsatominlines.h"
-#include "jscntxtinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsprobes.h"
@@ -90,6 +89,8 @@
 #include "jsstrinlines.h"
 #include "jsopcodeinlines.h"
 
+#include "vm/Stack-inl.h"
+
 #if JS_HAS_XML_SUPPORT
 #include "jsxml.h"
 #endif
@@ -106,39 +107,10 @@ using namespace js::gc;
 /* jsinvoke_cpp___ indicates inclusion from jsinvoke.cpp. */
 #if !JS_LONE_INTERPRET ^ defined jsinvoke_cpp___
 
-#ifdef DEBUG
-JSObject *const JSStackFrame::sInvalidScopeChain = (JSObject *)0xbeef;
-#endif
-
-jsbytecode *
-JSStackFrame::pc(JSContext *cx, JSStackFrame *next)
-{
-    JS_ASSERT_IF(next, next->prev_ == this);
-
-    StackSegment *seg = cx->stack().containingSegment(this);
-    JSFrameRegs *regs = seg->getCurrentRegs();
-    if (regs->fp == this)
-        return regs->pc;
-
-    if (!next)
-        next = seg->computeNextFrame(this);
-
-    if (next->flags_ & JSFRAME_HAS_PREVPC)
-        return next->prevpc_;
-
-#if defined(JS_METHODJIT) && defined(JS_MONOIC)
-    js::mjit::JITScript *jit = script()->getJIT(isConstructing());
-    return jit->nativeToPC(next->ncode_);
-#else
-    JS_NOT_REACHED("Unknown PC for frame");
-    return NULL;
-#endif
-}
-
 JSObject *
 js::GetScopeChain(JSContext *cx)
 {
-    JSStackFrame *fp = js_GetTopStackFrame(cx);
+    StackFrame *fp = js_GetTopStackFrame(cx);
     if (!fp) {
         /*
          * There is no code active on this context. In place of an actual
@@ -170,7 +142,7 @@ js::GetScopeChain(JSContext *cx)
  * require bytecode scanning appears below.
  */
 JSObject *
-js::GetBlockChain(JSContext *cx, JSStackFrame *fp)
+js::GetBlockChain(JSContext *cx, StackFrame *fp)
 {
     if (!fp->isScriptFrame())
         return NULL;
@@ -219,7 +191,7 @@ js::GetBlockChain(JSContext *cx, JSStackFrame *fp)
  * |oplen| is the length of opcode at the current PC.
  */
 JSObject *
-js::GetBlockChainFast(JSContext *cx, JSStackFrame *fp, JSOp op, size_t oplen)
+js::GetBlockChainFast(JSContext *cx, StackFrame *fp, JSOp op, size_t oplen)
 {
     /* Assume that we're in a script frame. */
     jsbytecode *pc = fp->pc(cx);
@@ -269,7 +241,7 @@ js::GetBlockChainFast(JSContext *cx, JSStackFrame *fp, JSOp op, size_t oplen)
  * some other cases --- entering 'with' blocks, for example.
  */
 static JSObject *
-GetScopeChainFull(JSContext *cx, JSStackFrame *fp, JSObject *blockChain)
+GetScopeChainFull(JSContext *cx, StackFrame *fp, JSObject *blockChain)
 {
     JSObject *sharedBlock = blockChain;
 
@@ -389,13 +361,13 @@ GetScopeChainFull(JSContext *cx, JSStackFrame *fp, JSObject *blockChain)
 }
 
 JSObject *
-js::GetScopeChain(JSContext *cx, JSStackFrame *fp)
+js::GetScopeChain(JSContext *cx, StackFrame *fp)
 {
     return GetScopeChainFull(cx, fp, GetBlockChain(cx, fp));
 }
 
 JSObject *
-js::GetScopeChainFast(JSContext *cx, JSStackFrame *fp, JSOp op, size_t oplen)
+js::GetScopeChainFast(JSContext *cx, StackFrame *fp, JSOp op, size_t oplen)
 {
     return GetScopeChainFull(cx, fp, GetBlockChainFast(cx, fp, op, oplen));
 }
@@ -573,10 +545,10 @@ js_OnUnknownMethod(JSContext *cx, Value *vp)
 }
 
 static JS_REQUIRES_STACK JSBool
-NoSuchMethod(JSContext *cx, uintN argc, Value *vp, uint32 flags)
+NoSuchMethod(JSContext *cx, uintN argc, Value *vp)
 {
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, 2, &args))
+    if (!cx->stack.pushInvokeArgs(cx, 2, &args))
         return JS_FALSE;
 
     JS_ASSERT(vp[0].isObject());
@@ -591,9 +563,7 @@ NoSuchMethod(JSContext *cx, uintN argc, Value *vp, uint32 flags)
     if (!argsobj)
         return JS_FALSE;
     args[1].setObject(*argsobj);
-    JSBool ok = (flags & JSINVOKE_CONSTRUCT)
-                ? InvokeConstructor(cx, args)
-                : Invoke(cx, args, flags);
+    JSBool ok = Invoke(cx, args);
     vp[0] = args.rval();
     return ok;
 }
@@ -603,7 +573,7 @@ NoSuchMethod(JSContext *cx, uintN argc, Value *vp, uint32 flags)
 namespace js {
 
 JS_REQUIRES_STACK bool
-RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp)
+RunScript(JSContext *cx, JSScript *script, StackFrame *fp)
 {
     JS_ASSERT(script);
     JS_ASSERT(fp == cx->fp());
@@ -640,7 +610,7 @@ RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp)
  * when done.  Then push the return value.
  */
 JS_REQUIRES_STACK bool
-Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
+Invoke(JSContext *cx, const CallArgs &argsRef, ConstructOption option)
 {
     /* N.B. Must be kept in sync with InvokeSessionGuard::start/invoke */
 
@@ -648,7 +618,7 @@ Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
     JS_ASSERT(args.argc() <= JS_ARGS_LENGTH_MAX);
 
     if (args.calleev().isPrimitive()) {
-        js_ReportIsNotFunction(cx, &args.calleev(), flags & JSINVOKE_FUNFLAGS);
+        js_ReportIsNotFunction(cx, &args.calleev(), ToReportFlags(option));
         return false;
     }
 
@@ -659,11 +629,11 @@ Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
     if (JS_UNLIKELY(clasp != &js_FunctionClass)) {
 #if JS_HAS_NO_SUCH_METHOD
         if (JS_UNLIKELY(clasp == &js_NoSuchMethodClass))
-            return NoSuchMethod(cx, args.argc(), args.base(), 0);
+            return NoSuchMethod(cx, args.argc(), args.base());
 #endif
-        JS_ASSERT_IF(flags & JSINVOKE_CONSTRUCT, !clasp->construct);
+        JS_ASSERT_IF(option == INVOKE_CONSTRUCTOR, !clasp->construct);
         if (!clasp->call) {
-            js_ReportIsNotFunction(cx, &args.calleev(), flags);
+            js_ReportIsNotFunction(cx, &args.calleev(), ToReportFlags(option));
             return false;
         }
         return CallJSNative(cx, clasp->call, args.argc(), args.base());
@@ -671,14 +641,14 @@ Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
 
     /* Invoke native functions. */
     JSFunction *fun = callee.getFunctionPrivate();
-    JS_ASSERT_IF(flags & JSINVOKE_CONSTRUCT, !fun->isConstructor());
+    JS_ASSERT_IF(option == INVOKE_CONSTRUCTOR, !fun->isConstructor());
     if (fun->isNative())
         return CallJSNative(cx, fun->u.n.native, args.argc(), args.base());
 
     /* Handle the empty-script special case. */
     JSScript *script = fun->script();
     if (JS_UNLIKELY(script->isEmpty())) {
-        if (flags & JSINVOKE_CONSTRUCT) {
+        if (option == INVOKE_CONSTRUCTOR) {
             JSObject *obj = js_CreateThisForFunction(cx, &callee);
             if (!obj)
                 return false;
@@ -690,17 +660,18 @@ Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
     }
 
     /* Get pointer to new frame/slots, prepare arguments. */
+    uint32 flags = ToFrameFlags(option);
     InvokeFrameGuard frame;
-    if (JS_UNLIKELY(!cx->stack().getInvokeFrame(cx, args, fun, script, &flags, &frame)))
+    StackFrame *fp = cx->stack.getInvokeFrame(cx, args, fun, script, &flags, &frame);
+    if (!fp)
         return false;
 
     /* Initialize frame, locals. */
-    JSStackFrame *fp = frame.fp();
     fp->initCallFrame(cx, callee, fun, args.argc(), flags);
     SetValueRangeToUndefined(fp->slots(), script->nfixed);
 
     /* Officially push fp. frame's destructor pops. */
-    cx->stack().pushInvokeFrame(cx, args, &frame);
+    cx->stack.pushInvokeFrame(args, &frame);
 
     /* Now that the new frame is rooted, maybe create a call object. */
     if (fun->isHeavyweight() && !CreateFunCallObject(cx, fp))
@@ -714,8 +685,7 @@ Invoke(JSContext *cx, const CallArgs &argsRef, uint32 flags)
     }
 
     args.rval() = fp->returnValue();
-    JS_ASSERT_IF(ok && (flags & JSINVOKE_CONSTRUCT), !args.rval().isPrimitive());
-
+    JS_ASSERT_IF(ok && option == INVOKE_CONSTRUCTOR, !args.rval().isPrimitive());
     return ok;
 }
 
@@ -729,7 +699,7 @@ InvokeSessionGuard::start(JSContext *cx, const Value &calleev, const Value &this
 #endif
 
     /* Always push arguments, regardless of optimized/normal invoke. */
-    StackSpace &stack = cx->stack();
+    ContextStack &stack = cx->stack;
     if (!stack.pushInvokeArgs(cx, argc, &args_))
         return false;
 
@@ -762,9 +732,9 @@ InvokeSessionGuard::start(JSContext *cx, const Value &calleev, const Value &this
         uint32 flags = 0;
         if (!stack.getInvokeFrame(cx, args_, fun, script_, &flags, &frame_))
             return false;
-        JSStackFrame *fp = frame_.fp();
+        StackFrame *fp = frame_.fp();
         fp->initCallFrame(cx, calleev.toObject(), fun, argc, flags);
-        stack.pushInvokeFrame(cx, args_, &frame_);
+        stack.pushInvokeFrame(args_, &frame_);
 
 #ifdef JS_METHODJIT
         /* Hoist dynamic checks from RunScript. */
@@ -777,7 +747,7 @@ InvokeSessionGuard::start(JSContext *cx, const Value &calleev, const Value &this
 
         /* Hoist dynamic checks from CheckStackAndEnterMethodJIT. */
         JS_CHECK_RECURSION(cx, return false);
-        stackLimit_ = stack.getStackLimit(cx);
+        stackLimit_ = stack.space().getStackLimit(cx);
         if (!stackLimit_)
             return false;
 
@@ -814,7 +784,7 @@ ExternalInvoke(JSContext *cx, const Value &thisv, const Value &fval,
     LeaveTrace(cx);
 
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc, &args))
         return false;
 
     args.calleev() = fval;
@@ -833,7 +803,7 @@ ExternalInvoke(JSContext *cx, const Value &thisv, const Value &fval,
         args.thisv().setObject(*thisp);
     }
 
-    if (!Invoke(cx, args, 0))
+    if (!Invoke(cx, args))
         return false;
 
     *rval = args.rval();
@@ -847,7 +817,7 @@ ExternalInvokeConstructor(JSContext *cx, const Value &fval, uintN argc, Value *a
     LeaveTrace(cx);
 
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc, &args))
         return false;
 
     args.calleev() = fval;
@@ -880,9 +850,9 @@ ExternalGetOrSet(JSContext *cx, JSObject *obj, jsid id, const Value &fval,
 JS_STATIC_ASSERT(SHARP_NSLOTS == 2);
 
 static JS_NEVER_INLINE bool
-InitSharpSlots(JSContext *cx, JSStackFrame *fp)
+InitSharpSlots(JSContext *cx, StackFrame *fp)
 {
-    JSStackFrame *prev = fp->prev();
+    StackFrame *prev = fp->prev();
     JSScript *script = fp->script();
     JS_ASSERT(script->nfixed >= SHARP_NSLOTS);
 
@@ -906,7 +876,7 @@ InitSharpSlots(JSContext *cx, JSStackFrame *fp)
 
 bool
 Execute(JSContext *cx, JSObject &chain, JSScript *script,
-        JSStackFrame *prev, uintN flags, Value *result)
+        StackFrame *prev, uintN flags, Value *result)
 {
     JS_ASSERT_IF(prev, !prev->isDummyFrame());
     JS_ASSERT_IF(prev, prev->compartment() == cx->compartment);
@@ -927,7 +897,7 @@ Execute(JSContext *cx, JSObject &chain, JSScript *script,
      * the frame is rooted.
      */
     ExecuteFrameGuard frame;
-    if (!cx->stack().getExecuteFrame(cx, script, &frame))
+    if (!cx->stack.getExecuteFrame(cx, script, &frame))
         return false;
 
     /* Initialize fixed slots (GVAR ops expect NULL). */
@@ -941,8 +911,8 @@ Execute(JSContext *cx, JSObject &chain, JSScript *script,
 
         /* NB: prev may not be in cx->currentSegment. */
         initialVarObj = (prev == cx->maybefp())
-                        ? &prev->varobj(cx)
-                        : &prev->varobj(cx->stack().containingSegment(prev));
+                        ? &cx->stack.currentVarObj()
+                        : &cx->stack.space().varObjForFrame(prev);
     } else {
         /* The scope chain could be anything, so innerize just in case. */
         JSObject *innerizedChain = &chain;
@@ -980,7 +950,7 @@ Execute(JSContext *cx, JSObject &chain, JSScript *script,
     }
 
     /* Officially push the frame. ~FrameGuard pops. */
-    cx->stack().pushExecuteFrame(cx, initialVarObj, &frame);
+    cx->stack.pushExecuteFrame(initialVarObj, &frame);
 
 #if JS_HAS_SHARP_VARS
     if (script->hasSharps && !InitSharpSlots(cx, frame.fp()))
@@ -1264,7 +1234,7 @@ InvokeConstructor(JSContext *cx, const CallArgs &argsRef)
             if (!fun->isInterpretedConstructor())
                 goto error;
 
-            if (!Invoke(cx, args, JSINVOKE_CONSTRUCT))
+            if (!Invoke(cx, args, INVOKE_CONSTRUCTOR))
                 return false;
 
             JS_ASSERT(args.rval().isObject());
@@ -1289,7 +1259,7 @@ InvokeConstructorWithGivenThis(JSContext *cx, JSObject *thisobj, const Value &fv
     LeaveTrace(cx);
 
     InvokeArgsGuard args;
-    if (!cx->stack().pushInvokeArgs(cx, argc, &args))
+    if (!cx->stack.pushInvokeArgs(cx, argc, &args))
         return JS_FALSE;
 
     args.calleev() = fval;
@@ -1309,7 +1279,7 @@ InvokeConstructorWithGivenThis(JSContext *cx, JSObject *thisobj, const Value &fv
         ok = CallJSNativeConstructor(cx, clasp->construct, args.argc(), args.base());
     } else {
         args.thisv().setObjectOrNull(thisobj);
-        ok = Invoke(cx, args, JSINVOKE_CONSTRUCT);
+        ok = Invoke(cx, args, INVOKE_CONSTRUCTOR);
     }
 
     *rval = args.rval();
@@ -1347,8 +1317,8 @@ ValueToId(JSContext *cx, const Value &v, jsid *idp)
 JS_STATIC_INTERPRET JS_REQUIRES_STACK JSBool
 js_EnterWith(JSContext *cx, jsint stackIndex, JSOp op, size_t oplen)
 {
-    JSStackFrame *fp = cx->fp();
-    Value *sp = cx->regs->sp;
+    StackFrame *fp = cx->fp();
+    Value *sp = cx->regs().sp;
     JS_ASSERT(stackIndex < 0);
     JS_ASSERT(fp->base() <= sp + stackIndex);
 
@@ -1416,9 +1386,9 @@ js_UnwindScope(JSContext *cx, jsint stackDepth, JSBool normalUnwind)
     Class *clasp;
 
     JS_ASSERT(stackDepth >= 0);
-    JS_ASSERT(cx->fp()->base() + stackDepth <= cx->regs->sp);
+    JS_ASSERT(cx->fp()->base() + stackDepth <= cx->regs().sp);
 
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     for (;;) {
         clasp = js_IsActiveWithOrBlock(cx, &fp->scopeChain(), stackDepth);
         if (!clasp)
@@ -1431,7 +1401,7 @@ js_UnwindScope(JSContext *cx, jsint stackDepth, JSBool normalUnwind)
         }
     }
 
-    cx->regs->sp = fp->base() + stackDepth;
+    cx->regs().sp = fp->base() + stackDepth;
     return normalUnwind;
 }
 
@@ -1464,7 +1434,7 @@ js::GetUpvar(JSContext *cx, uintN closureLevel, UpvarCookie cookie)
     const uintN targetLevel = closureLevel - cookie.level();
     JS_ASSERT(targetLevel < UpvarCookie::UPVAR_LEVEL_LIMIT);
 
-    JSStackFrame *fp = cx->findFrameAtLevel(targetLevel);
+    StackFrame *fp = cx->stack.findFrameAtLevel(targetLevel);
     uintN slot = cookie.slot();
     Value *vp;
 
@@ -1490,15 +1460,15 @@ JS_STATIC_INTERPRET JS_REQUIRES_STACK void
 js_LogOpcode(JSContext *cx)
 {
     FILE *logfp;
-    JSStackFrame *fp;
-    JSFrameRegs *regs;
+    StackFrame *fp;
+    FrameRegs *regs;
     intN ndefs, n, nuses;
     JSOp op;
 
     logfp = (FILE *) cx->logfp;
     JS_ASSERT(logfp);
     fp = cx->fp();
-    regs = cx->regs;
+    regs = &cx->regs();
 
     /*
      * Operations in prologues don't produce interesting values, and
@@ -1900,7 +1870,7 @@ namespace reprmeter {
 #define PUSH_OBJECT_OR_NULL(obj) do { regs.sp++->setObjectOrNull(obj); assertSameCompartment(cx, regs.sp[-1]); } while (0)
 #define PUSH_HOLE()              regs.sp++->setMagic(JS_ARRAY_HOLE)
 #define POP_COPY_TO(v)           v = *--regs.sp
-#define POP_RETURN_VALUE()       regs.fp->setReturnValue(*--regs.sp)
+#define POP_RETURN_VALUE()       regs.fp()->setReturnValue(*--regs.sp)
 
 #define POP_BOOLEAN(cx, vp, b)                                                \
     JS_BEGIN_MACRO                                                            \
@@ -2015,7 +1985,7 @@ CanIncDecWithoutOverflow(int32_t i)
     JS_END_MACRO
 
 static bool
-AssertValidPropertyCacheHit(JSContext *cx, JSScript *script, JSFrameRegs& regs,
+AssertValidPropertyCacheHit(JSContext *cx, JSScript *script, FrameRegs& regs,
                             ptrdiff_t pcoff, JSObject *start, JSObject *found,
                             PropertyCacheEntry *entry)
 {
@@ -2163,7 +2133,7 @@ IteratorNext(JSContext *cx, JSObject *iterobj, Value *rval)
 namespace js {
 
 JS_REQUIRES_STACK JS_NEVER_INLINE bool
-Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInterpMode interpMode)
+Interpret(JSContext *cx, StackFrame *entryFrame, uintN inlineCallCount, InterpMode interpMode)
 {
 #ifdef MOZ_TRACEVIS
     TraceVisStateObj tvso(cx, S_INTERP);
@@ -2288,7 +2258,7 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
 
 #define LOAD_ATOM(PCOFF, atom)                                                \
     JS_BEGIN_MACRO                                                            \
-        JS_ASSERT(regs.fp->hasImacropc()                                      \
+        JS_ASSERT(regs.fp()->hasImacropc()                                    \
                   ? atoms == COMMON_ATOMS_START(&rt->atomState) &&            \
                     GET_INDEX(regs.pc + PCOFF) < js_common_atom_count         \
                   : (size_t)(atoms - script->atomMap.vector) <                \
@@ -2317,22 +2287,22 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
     JS_BEGIN_MACRO                                                            \
         useMethodJIT = cx->methodJitEnabled &&                                \
             interpMode == JSINTERP_NORMAL &&                                  \
-            script->getJITStatus(regs.fp->isConstructing()) != JITScript_Invalid; \
+            script->getJITStatus(regs.fp()->isConstructing()) != JITScript_Invalid; \
     JS_END_MACRO
 
 #define MONITOR_BRANCH_METHODJIT()                                            \
     JS_BEGIN_MACRO                                                            \
         mjit::CompileStatus status =                                          \
-            mjit::CanMethodJITAtBranch(cx, script, regs.fp, regs.pc);         \
+            mjit::CanMethodJITAtBranch(cx, script, regs.fp(), regs.pc);       \
         if (status == mjit::Compile_Error)                                    \
             goto error;                                                       \
         if (status == mjit::Compile_Okay) {                                   \
             void *ncode =                                                     \
-                script->nativeCodeForPC(regs.fp->isConstructing(), regs.pc);  \
+                script->nativeCodeForPC(regs.fp()->isConstructing(), regs.pc);\
             interpReturnOK = mjit::JaegerShotAtSafePoint(cx, ncode);          \
             if (inlineCallCount)                                              \
                 goto jit_return;                                              \
-            regs.fp->setFinishedInInterpreter();                              \
+            regs.fp()->setFinishedInInterpreter();                            \
             goto leave_on_safe_point;                                         \
         }                                                                     \
         if (status == mjit::Compile_Abort) {                                  \
@@ -2369,10 +2339,10 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
 
 #define RESTORE_INTERP_VARS()                                                 \
     JS_BEGIN_MACRO                                                            \
-        script = regs.fp->script();                                           \
-        argv = regs.fp->maybeFormalArgs();                                    \
-        atoms = FrameAtomBase(cx, regs.fp);                                   \
-        JS_ASSERT(cx->regs == &regs);                                         \
+        script = regs.fp()->script();                                         \
+        argv = regs.fp()->maybeFormalArgs();                                  \
+        atoms = FrameAtomBase(cx, regs.fp());                                 \
+        JS_ASSERT(&cx->regs() == &regs);                                      \
         if (cx->isExceptionPending())                                         \
             goto error;                                                       \
     JS_END_MACRO
@@ -2426,8 +2396,8 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
         JS_ASSERT_IF(leaveOnSafePoint, !TRACE_RECORDER(cx));                  \
         JS_ASSERT_IF(leaveOnSafePoint, !TRACE_PROFILER(cx));                  \
         JS_ASSERT_IF(leaveOnSafePoint, interpMode != JSINTERP_NORMAL);        \
-        if (leaveOnSafePoint && !regs.fp->hasImacropc() &&                    \
-            script->maybeNativeCodeForPC(regs.fp->isConstructing(), regs.pc)) { \
+        if (leaveOnSafePoint && !regs.fp()->hasImacropc() &&                  \
+            script->maybeNativeCodeForPC(regs.fp()->isConstructing(), regs.pc)) { \
             JS_ASSERT(!TRACE_RECORDER(cx));                                   \
             interpReturnOK = true;                                            \
             goto leave_on_safe_point;                                         \
@@ -2463,28 +2433,28 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
             ENABLE_INTERRUPTS();                                              \
     JS_END_MACRO
 
-    JSFrameRegs regs = *cx->regs;
+    FrameRegs regs = cx->regs();
 
     /* Repoint cx->regs to a local variable for faster access. */
     struct InterpExitGuard {
         JSContext *cx;
-        const JSFrameRegs &regs;
-        JSFrameRegs *prevContextRegs;
-        InterpExitGuard(JSContext *cx, JSFrameRegs &regs)
-          : cx(cx), regs(regs), prevContextRegs(cx->regs) {
-            cx->setCurrentRegs(&regs);
+        const FrameRegs &regs;
+        FrameRegs *prevContextRegs;
+        InterpExitGuard(JSContext *cx, FrameRegs &regs)
+          : cx(cx), regs(regs), prevContextRegs(&cx->regs()) {
+            cx->stack.repointRegs(&regs);
         }
         ~InterpExitGuard() {
-            JS_ASSERT(cx->regs == &regs);
+            JS_ASSERT(&cx->regs() == &regs);
             *prevContextRegs = regs;
-            cx->setCurrentRegs(prevContextRegs);
+            cx->stack.repointRegs(prevContextRegs);
         }
     } interpGuard(cx, regs);
 
     /* Copy in hot values that change infrequently. */
     JSRuntime *const rt = cx->runtime;
-    JSScript *script = regs.fp->script();
-    Value *argv = regs.fp->maybeFormalArgs();
+    JSScript *script = regs.fp()->script();
+    Value *argv = regs.fp()->maybeFormalArgs();
     CHECK_INTERRUPT_HANDLER();
 
 #if defined(JS_TRACER) && defined(JS_METHODJIT)
@@ -2495,7 +2465,7 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
 #endif
 
     if (!entryFrame)
-        entryFrame = regs.fp;
+        entryFrame = regs.fp();
 
     /*
      * Initialize the index segment register used by LOAD_ATOM and
@@ -2507,10 +2477,10 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
     JSAtom **atoms = script->atomMap.vector;
 
 #if JS_HAS_GENERATORS
-    if (JS_UNLIKELY(regs.fp->isGeneratorFrame())) {
-        JS_ASSERT(interpGuard.prevContextRegs == &cx->generatorFor(regs.fp)->regs);
+    if (JS_UNLIKELY(regs.fp()->isGeneratorFrame())) {
+        JS_ASSERT(interpGuard.prevContextRegs == &cx->generatorFor(regs.fp())->regs);
         JS_ASSERT((size_t) (regs.pc - script->code) <= script->length);
-        JS_ASSERT((size_t) (regs.sp - regs.fp->base()) <= StackDepth(script));
+        JS_ASSERT((size_t) (regs.sp - regs.fp()->base()) <= StackDepth(script));
 
         /*
          * To support generator_throw and to catch ignored exceptions,
@@ -2537,14 +2507,14 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
         AbortRecording(cx, "attempt to reenter interpreter while recording");
     }
 
-    if (regs.fp->hasImacropc())
+    if (regs.fp()->hasImacropc())
         atoms = COMMON_ATOMS_START(&rt->atomState);
 #endif
 
     /* Don't call the script prologue if executing between Method and Trace JIT. */
     if (interpMode == JSINTERP_NORMAL) {
-        JS_ASSERT_IF(!regs.fp->isGeneratorFrame(), regs.pc == script->code);
-        if (!ScriptPrologueOrGeneratorResume(cx, regs.fp))
+        JS_ASSERT_IF(!regs.fp()->isGeneratorFrame(), regs.pc == script->code);
+        if (!ScriptPrologueOrGeneratorResume(cx, regs.fp()))
             goto error;
     }
 
@@ -2646,7 +2616,7 @@ Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount, JSInte
               case JSTRAP_CONTINUE:
                 break;
               case JSTRAP_RETURN:
-                regs.fp->setReturnValue(rval);
+                regs.fp()->setReturnValue(rval);
                 interpReturnOK = JS_TRUE;
                 goto forced_return;
               case JSTRAP_THROW:
@@ -2773,18 +2743,18 @@ BEGIN_CASE(JSOP_POPN)
 {
     regs.sp -= GET_UINT16(regs.pc);
 #ifdef DEBUG
-    JS_ASSERT(regs.fp->base() <= regs.sp);
-    JSObject *obj = GetBlockChain(cx, regs.fp);
+    JS_ASSERT(regs.fp()->base() <= regs.sp);
+    JSObject *obj = GetBlockChain(cx, regs.fp());
     JS_ASSERT_IF(obj,
                  OBJ_BLOCK_DEPTH(cx, obj) + OBJ_BLOCK_COUNT(cx, obj)
-                 <= (size_t) (regs.sp - regs.fp->base()));
-    for (obj = &regs.fp->scopeChain(); obj; obj = obj->getParent()) {
+                 <= (size_t) (regs.sp - regs.fp()->base()));
+    for (obj = &regs.fp()->scopeChain(); obj; obj = obj->getParent()) {
         Class *clasp = obj->getClass();
         if (clasp != &js_BlockClass && clasp != &js_WithClass)
             continue;
-        if (obj->getPrivate() != js_FloatingFrameIfGenerator(cx, regs.fp))
+        if (obj->getPrivate() != js_FloatingFrameIfGenerator(cx, regs.fp()))
             break;
-        JS_ASSERT(regs.fp->base() + OBJ_BLOCK_DEPTH(cx, obj)
+        JS_ASSERT(regs.fp()->base() + OBJ_BLOCK_DEPTH(cx, obj)
                              + ((clasp == &js_BlockClass)
                                 ? OBJ_BLOCK_COUNT(cx, obj)
                                 : 1)
@@ -2812,11 +2782,11 @@ BEGIN_CASE(JSOP_ENTERWITH)
      * We set sp[-1] to the current "with" object to help asserting the
      * enter/leave balance in [leavewith].
      */
-    regs.sp[-1].setObject(regs.fp->scopeChain());
+    regs.sp[-1].setObject(regs.fp()->scopeChain());
 END_CASE(JSOP_ENTERWITH)
 
 BEGIN_CASE(JSOP_LEAVEWITH)
-    JS_ASSERT(regs.sp[-1].toObject() == regs.fp->scopeChain());
+    JS_ASSERT(regs.sp[-1].toObject() == regs.fp()->scopeChain());
     regs.sp--;
     js_LeaveWith(cx);
 END_CASE(JSOP_LEAVEWITH)
@@ -2835,16 +2805,16 @@ BEGIN_CASE(JSOP_STOP)
     CHECK_BRANCH();
 
 #ifdef JS_TRACER
-    if (regs.fp->hasImacropc()) {
+    if (regs.fp()->hasImacropc()) {
         /*
          * If we are at the end of an imacro, return to its caller in the
          * current frame.
          */
         JS_ASSERT(op == JSOP_STOP);
-        JS_ASSERT((uintN)(regs.sp - regs.fp->slots()) <= script->nslots);
-        jsbytecode *imacpc = regs.fp->imacropc();
+        JS_ASSERT((uintN)(regs.sp - regs.fp()->slots()) <= script->nslots);
+        jsbytecode *imacpc = regs.fp()->imacropc();
         regs.pc = imacpc + js_CodeSpec[*imacpc].length;
-        regs.fp->clearImacropc();
+        regs.fp()->clearImacropc();
         LEAVE_ON_SAFE_POINT();
         atoms = script->atomMap.vector;
         op = JSOp(*regs.pc);
@@ -2853,25 +2823,24 @@ BEGIN_CASE(JSOP_STOP)
 #endif
 
     interpReturnOK = true;
-    if (entryFrame != regs.fp)
+    if (entryFrame != regs.fp())
   inline_return:
     {
-        JS_ASSERT(!js_IsActiveWithOrBlock(cx, &regs.fp->scopeChain(), 0));
-        interpReturnOK = ScriptEpilogue(cx, regs.fp, interpReturnOK);
+        JS_ASSERT(!regs.fp()->hasImacropc());
+        JS_ASSERT(!js_IsActiveWithOrBlock(cx, &regs.fp()->scopeChain(), 0));
+        interpReturnOK = ScriptEpilogue(cx, regs.fp(), interpReturnOK);
         CHECK_INTERRUPT_HANDLER();
 
         /* The JIT inlines ScriptEpilogue. */
 #ifdef JS_METHODJIT
   jit_return:
 #endif
-        Value *newsp = regs.fp->actualArgs() - 1;
-        newsp[-1] = regs.fp->returnValue();
-        cx->stack().popInlineFrame(cx, regs.fp->prev(), newsp);
+        cx->stack.popInlineFrame();
 
-        /* Sync interpreter registers. */
-        script = regs.fp->script();
-        argv = regs.fp->maybeFormalArgs();
-        atoms = FrameAtomBase(cx, regs.fp);
+        /* Sync interpreter locals. */
+        script = regs.fp()->script();
+        argv = regs.fp()->maybeFormalArgs();
+        atoms = FrameAtomBase(cx, regs.fp());
 
         /* Resume execution in the calling frame. */
         RESET_USE_METHODJIT();
@@ -2886,7 +2855,7 @@ BEGIN_CASE(JSOP_STOP)
         }
         goto error;
     } else {
-        JS_ASSERT(regs.sp == regs.fp->base());
+        JS_ASSERT(regs.sp == regs.fp()->base());
     }
     interpReturnOK = true;
     goto exit;
@@ -3069,7 +3038,7 @@ END_CASE(JSOP_IN)
 
 BEGIN_CASE(JSOP_ITER)
 {
-    JS_ASSERT(regs.sp > regs.fp->base());
+    JS_ASSERT(regs.sp > regs.fp()->base());
     uintN flags = regs.pc[1];
     if (!js_ValueToIterator(cx, flags, &regs.sp[-1]))
         goto error;
@@ -3080,7 +3049,7 @@ END_CASE(JSOP_ITER)
 
 BEGIN_CASE(JSOP_MOREITER)
 {
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     JS_ASSERT(regs.sp[-1].isObject());
     PUSH_NULL();
     bool cond;
@@ -3093,7 +3062,7 @@ END_CASE(JSOP_MOREITER)
 
 BEGIN_CASE(JSOP_ENDITER)
 {
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     bool ok = !!js_CloseIterator(cx, &regs.sp[-1].toObject());
     regs.sp--;
     if (!ok)
@@ -3103,9 +3072,9 @@ END_CASE(JSOP_ENDITER)
 
 BEGIN_CASE(JSOP_FORARG)
 {
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     uintN slot = GET_ARGNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numFormalArgs());
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
     JS_ASSERT(regs.sp[-1].isObject());
     if (!IteratorNext(cx, &regs.sp[-1].toObject(), &argv[slot]))
         goto error;
@@ -3114,11 +3083,11 @@ END_CASE(JSOP_FORARG)
 
 BEGIN_CASE(JSOP_FORLOCAL)
 {
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     uintN slot = GET_SLOTNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numSlots());
+    JS_ASSERT(slot < regs.fp()->numSlots());
     JS_ASSERT(regs.sp[-1].isObject());
-    if (!IteratorNext(cx, &regs.sp[-1].toObject(), &regs.fp->slots()[slot]))
+    if (!IteratorNext(cx, &regs.sp[-1].toObject(), &regs.fp()->slots()[slot]))
         goto error;
 }
 END_CASE(JSOP_FORLOCAL)
@@ -3126,7 +3095,7 @@ END_CASE(JSOP_FORLOCAL)
 BEGIN_CASE(JSOP_FORNAME)
 BEGIN_CASE(JSOP_FORGNAME)
 {
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     JSAtom *atom;
     LOAD_ATOM(0, atom);
     jsid id = ATOM_TO_JSID(atom);
@@ -3148,7 +3117,7 @@ END_CASE(JSOP_FORNAME)
 
 BEGIN_CASE(JSOP_FORPROP)
 {
-    JS_ASSERT(regs.sp - 2 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 2 >= regs.fp()->base());
     JSAtom *atom;
     LOAD_ATOM(0, atom);
     jsid id = ATOM_TO_JSID(atom);
@@ -3173,7 +3142,7 @@ BEGIN_CASE(JSOP_FORELEM)
      * side expression evaluation and assignment. This opcode exists solely to
      * help the decompiler.
      */
-    JS_ASSERT(regs.sp - 1 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 1 >= regs.fp()->base());
     JS_ASSERT(regs.sp[-1].isObject());
     PUSH_NULL();
     if (!IteratorNext(cx, &regs.sp[-2].toObject(), &regs.sp[-1]))
@@ -3182,7 +3151,7 @@ END_CASE(JSOP_FORELEM)
 
 BEGIN_CASE(JSOP_DUP)
 {
-    JS_ASSERT(regs.sp > regs.fp->base());
+    JS_ASSERT(regs.sp > regs.fp()->base());
     const Value &rref = regs.sp[-1];
     PUSH_COPY(rref);
 }
@@ -3190,7 +3159,7 @@ END_CASE(JSOP_DUP)
 
 BEGIN_CASE(JSOP_DUP2)
 {
-    JS_ASSERT(regs.sp - 2 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 2 >= regs.fp()->base());
     const Value &lref = regs.sp[-2];
     const Value &rref = regs.sp[-1];
     PUSH_COPY(lref);
@@ -3200,7 +3169,7 @@ END_CASE(JSOP_DUP2)
 
 BEGIN_CASE(JSOP_SWAP)
 {
-    JS_ASSERT(regs.sp - 2 >= regs.fp->base());
+    JS_ASSERT(regs.sp - 2 >= regs.fp()->base());
     Value &lref = regs.sp[-2];
     Value &rref = regs.sp[-1];
     lref.swap(rref);
@@ -3210,7 +3179,7 @@ END_CASE(JSOP_SWAP)
 BEGIN_CASE(JSOP_PICK)
 {
     jsint i = regs.pc[1];
-    JS_ASSERT(regs.sp - (i+1) >= regs.fp->base());
+    JS_ASSERT(regs.sp - (i+1) >= regs.fp()->base());
     Value lval = regs.sp[-(i+1)];
     memmove(regs.sp - (i+1), regs.sp - i, sizeof(Value)*i);
     regs.sp[-1] = lval;
@@ -3282,7 +3251,7 @@ BEGIN_CASE(JSOP_SETCONST)
 {
     JSAtom *atom;
     LOAD_ATOM(0, atom);
-    JSObject &obj = regs.fp->varobj(cx);
+    JSObject &obj = cx->stack.currentVarObj();
     const Value &ref = regs.sp[-1];
     if (!obj.defineProperty(cx, ATOM_TO_JSID(atom), ref,
                             PropertyStub, StrictPropertyStub,
@@ -3311,7 +3280,7 @@ END_CASE(JSOP_ENUMCONSTELEM)
 #endif
 
 BEGIN_CASE(JSOP_BINDGNAME)
-    PUSH_OBJECT(*regs.fp->scopeChain().getGlobal());
+    PUSH_OBJECT(*regs.fp()->scopeChain().getGlobal());
 END_CASE(JSOP_BINDGNAME)
 
 BEGIN_CASE(JSOP_BINDNAME)
@@ -3334,7 +3303,7 @@ BEGIN_CASE(JSOP_BINDNAME)
          * the rhs. We desire such resolve hook equivalence between the two
          * forms.
          */
-        obj = &regs.fp->scopeChain();
+        obj = &regs.fp()->scopeChain();
         if (!obj->getParent())
             break;
 
@@ -3348,7 +3317,7 @@ BEGIN_CASE(JSOP_BINDNAME)
         }
 
         jsid id = ATOM_TO_JSID(atom);
-        obj = js_FindIdentifierBase(cx, &regs.fp->scopeChain(), id);
+        obj = js_FindIdentifierBase(cx, &regs.fp()->scopeChain(), id);
         if (!obj)
             goto error;
     } while (0);
@@ -3357,8 +3326,8 @@ BEGIN_CASE(JSOP_BINDNAME)
 END_CASE(JSOP_BINDNAME)
 
 BEGIN_CASE(JSOP_IMACOP)
-    JS_ASSERT(JS_UPTRDIFF(regs.fp->imacropc(), script->code) < script->length);
-    op = JSOp(*regs.fp->imacropc());
+    JS_ASSERT(JS_UPTRDIFF(regs.fp()->imacropc(), script->code) < script->length);
+    op = JSOp(*regs.fp()->imacropc());
     DO_OP();
 
 #define BITWISE_OP(OP)                                                        \
@@ -3853,7 +3822,7 @@ BEGIN_CASE(JSOP_DECGNAME)
 BEGIN_CASE(JSOP_GNAMEINC)
 BEGIN_CASE(JSOP_GNAMEDEC)
 {
-    obj = &regs.fp->scopeChain();
+    obj = &regs.fp()->scopeChain();
     if (js_CodeSpec[op].format & JOF_GNAME)
         obj = obj->getGlobal();
 
@@ -3971,7 +3940,7 @@ BEGIN_CASE(JSOP_ARGINC)
 
   do_arg_incop:
     slot = GET_ARGNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numFormalArgs());
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
     METER_SLOT_OP(op, slot);
     vp = argv + slot;
     goto do_int_fast_incop;
@@ -3992,9 +3961,9 @@ BEGIN_CASE(JSOP_LOCALINC)
    */
   do_local_incop:
     slot = GET_SLOTNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numSlots());
+    JS_ASSERT(slot < regs.fp()->numSlots());
     METER_SLOT_OP(op, slot);
-    vp = regs.fp->slots() + slot;
+    vp = regs.fp()->slots() + slot;
 
   do_int_fast_incop:
     int32_t tmp;
@@ -4014,16 +3983,16 @@ BEGIN_CASE(JSOP_LOCALINC)
 }
 
 BEGIN_CASE(JSOP_THIS)
-    if (!ComputeThis(cx, regs.fp))
+    if (!ComputeThis(cx, regs.fp()))
         goto error;
-    PUSH_COPY(regs.fp->thisValue());
+    PUSH_COPY(regs.fp()->thisValue());
 END_CASE(JSOP_THIS)
 
 BEGIN_CASE(JSOP_UNBRANDTHIS)
 {
-    if (!ComputeThis(cx, regs.fp))
+    if (!ComputeThis(cx, regs.fp()))
         goto error;
-    Value &thisv = regs.fp->thisValue();
+    Value &thisv = regs.fp()->thisValue();
     if (thisv.isObject()) {
         JSObject *obj = &thisv.toObject();
         if (obj->isNative())
@@ -4038,17 +4007,17 @@ END_CASE(JSOP_UNBRANDTHIS)
     jsint i;
 
 BEGIN_CASE(JSOP_GETTHISPROP)
-    if (!ComputeThis(cx, regs.fp))
+    if (!ComputeThis(cx, regs.fp()))
         goto error;
     i = 0;
-    PUSH_COPY(regs.fp->thisValue());
+    PUSH_COPY(regs.fp()->thisValue());
     goto do_getprop_body;
 
 BEGIN_CASE(JSOP_GETARGPROP)
 {
     i = ARGNO_LEN;
     uint32 slot = GET_ARGNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numFormalArgs());
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
     PUSH_COPY(argv[slot]);
     goto do_getprop_body;
 }
@@ -4058,7 +4027,7 @@ BEGIN_CASE(JSOP_GETLOCALPROP)
     i = SLOTNO_LEN;
     uint32 slot = GET_SLOTNO(regs.pc);
     JS_ASSERT(slot < script->nslots);
-    PUSH_COPY(regs.fp->slots()[slot]);
+    PUSH_COPY(regs.fp()->slots()[slot]);
     goto do_getprop_body;
 }
 
@@ -4097,7 +4066,7 @@ BEGIN_CASE(JSOP_GETXPROP)
                     JS_ASSERT(entry->vword.isShape());
                     const Shape *shape = entry->vword.toShape();
                     NATIVE_GET(cx, obj, obj2, shape,
-                               regs.fp->hasImacropc() ? JSGET_NO_METHOD_BARRIER : JSGET_METHOD_BARRIER,
+                               regs.fp()->hasImacropc() ? JSGET_NO_METHOD_BARRIER : JSGET_METHOD_BARRIER,
                                &rval);
                 }
                 break;
@@ -4106,7 +4075,7 @@ BEGIN_CASE(JSOP_GETXPROP)
             jsid id = ATOM_TO_JSID(atom);
             if (JS_LIKELY(!aobj->getOps()->getProperty)
                 ? !js_GetPropertyHelper(cx, obj, id,
-                                        (regs.fp->hasImacropc() ||
+                                        (regs.fp()->hasImacropc() ||
                                          regs.pc[JSOP_GETPROP_LENGTH + i] == JSOP_IFEQ)
                                         ? JSGET_CACHE_RESULT | JSGET_NO_METHOD_BARRIER
                                         : JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
@@ -4240,7 +4209,7 @@ BEGIN_CASE(JSOP_CALLPROP)
 END_CASE(JSOP_CALLPROP)
 
 BEGIN_CASE(JSOP_UNBRAND)
-    JS_ASSERT(regs.sp - regs.fp->slots() >= 1);
+    JS_ASSERT(regs.sp - regs.fp()->slots() >= 1);
     regs.sp[-1].toObject().unbrand(cx);
 END_CASE(JSOP_UNBRAND)
 
@@ -4256,7 +4225,7 @@ BEGIN_CASE(JSOP_SETMETHOD)
     JSObject *obj;
     VALUE_TO_OBJECT(cx, &lref, obj);
 
-    JS_ASSERT_IF(op == JSOP_SETGNAME, obj == regs.fp->scopeChain().getGlobal());
+    JS_ASSERT_IF(op == JSOP_SETGNAME, obj == regs.fp()->scopeChain().getGlobal());
 
     do {
         PropertyCache *cache = &JS_PROPERTY_CACHE(cx);
@@ -4440,7 +4409,7 @@ BEGIN_CASE(JSOP_GETELEM)
             if (arg < obj->getArgsInitialLength()) {
                 copyFrom = obj->addressOfArgsElement(arg);
                 if (!copyFrom->isMagic(JS_ARGS_HOLE)) {
-                    if (JSStackFrame *afp = (JSStackFrame *) obj->getPrivate())
+                    if (StackFrame *afp = (StackFrame *) obj->getPrivate())
                         copyFrom = &afp->canonicalActualArg(arg);
                     goto end_getelem;
                 }
@@ -4559,7 +4528,7 @@ BEGIN_CASE(JSOP_NEW)
     /* Get immediate argc and find the constructor function. */
     argc = GET_ARGC(regs.pc);
     vp = regs.sp - (2 + argc);
-    JS_ASSERT(vp >= regs.fp->base());
+    JS_ASSERT(vp >= regs.fp()->base());
     /*
      * Assign lval, callee, and newfun exactly as the code at inline_call: expects to
      * find them, to avoid nesting a js_Interpret call via js_InvokeConstructor.
@@ -4576,12 +4545,12 @@ BEGIN_CASE(JSOP_NEW)
                 goto end_new;
             }
 
-            flags = JSFRAME_CONSTRUCTING;
+            flags = StackFrame::CONSTRUCTING;
             goto inline_call;
         }
     }
 
-    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
+    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
         goto error;
     regs.sp = vp + 1;
     CHECK_INTERRUPT_HANDLER();
@@ -4596,7 +4565,7 @@ BEGIN_CASE(JSOP_EVAL)
     argc = GET_ARGC(regs.pc);
     vp = regs.sp - (argc + 2);
 
-    if (!IsBuiltinEvalForScope(&regs.fp->scopeChain(), *vp))
+    if (!IsBuiltinEvalForScope(&regs.fp()->scopeChain(), *vp))
         goto call_using_invoke;
 
     if (!DirectEval(cx, CallArgsFromVp(argc, vp)))
@@ -4629,15 +4598,15 @@ BEGIN_CASE(JSOP_FUNCALL)
             }
 
             /* Restrict recursion of lightweight functions. */
-            if (JS_UNLIKELY(inlineCallCount >= JS_MAX_INLINE_CALL_COUNT)) {
+            if (JS_UNLIKELY(inlineCallCount >= StackSpace::MAX_INLINE_CALLS)) {
                 js_ReportOverRecursed(cx);
                 goto error;
             }
 
             /* Get pointer to new frame/slots, prepare arguments. */
-            StackSpace &stack = cx->stack();
-            JSStackFrame *newfp = stack.getInlineFrame(cx, regs.sp, argc, newfun,
-                                                       newscript, &flags);
+            ContextStack &stack = cx->stack;
+            StackFrame *newfp = stack.getInlineFrame(cx, regs.sp, argc, newfun,
+                                                     newscript, &flags);
             if (JS_UNLIKELY(!newfp))
                 goto error;
 
@@ -4646,16 +4615,16 @@ BEGIN_CASE(JSOP_FUNCALL)
             SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
 
             /* Officially push the frame. */
-            stack.pushInlineFrame(cx, newscript, newfp, &regs);
+            stack.pushInlineFrame(newscript, newfp, regs);
 
             /* Refresh interpreter locals. */
-            JS_ASSERT(newfp == regs.fp);
+            JS_ASSERT(newfp == regs.fp());
             script = newscript;
-            argv = regs.fp->formalArgsEnd() - newfun->nargs;
+            argv = regs.fp()->formalArgsEnd() - newfun->nargs;
             atoms = script->atomMap.vector;
 
             /* Now that the new frame is rooted, maybe create a call object. */
-            if (newfun->isHeavyweight() && !CreateFunCallObject(cx, regs.fp))
+            if (newfun->isHeavyweight() && !CreateFunCallObject(cx, regs.fp()))
                 goto error;
 
             RESET_USE_METHODJIT();
@@ -4671,7 +4640,7 @@ BEGIN_CASE(JSOP_FUNCALL)
             mjit::CompileRequest request = (interpMode == JSINTERP_NORMAL)
                                            ? mjit::CompileRequest_Interpreter
                                            : mjit::CompileRequest_JIT;
-            mjit::CompileStatus status = mjit::CanMethodJIT(cx, script, regs.fp, request);
+            mjit::CompileStatus status = mjit::CanMethodJIT(cx, script, regs.fp(), request);
             if (status == mjit::Compile_Error)
                 goto error;
             if (!TRACE_RECORDER(cx) && !TRACE_PROFILER(cx) && status == mjit::Compile_Okay) {
@@ -4681,7 +4650,7 @@ BEGIN_CASE(JSOP_FUNCALL)
             }
 #endif
 
-            if (!ScriptPrologue(cx, regs.fp))
+            if (!ScriptPrologue(cx, regs.fp()))
                 goto error;
 
             CHECK_INTERRUPT_HANDLER();
@@ -4703,7 +4672,7 @@ BEGIN_CASE(JSOP_FUNCALL)
 
   call_using_invoke:
     bool ok;
-    ok = Invoke(cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0);
+    ok = Invoke(cx, InvokeArgsAlreadyOnTheStack(argc, vp));
     regs.sp = vp + 1;
     CHECK_INTERRUPT_HANDLER();
     if (!ok)
@@ -4737,7 +4706,7 @@ BEGIN_CASE(JSOP_CALLGNAME)
 BEGIN_CASE(JSOP_NAME)
 BEGIN_CASE(JSOP_CALLNAME)
 {
-    JSObject *obj = &regs.fp->scopeChain();
+    JSObject *obj = &regs.fp()->scopeChain();
 
     const Shape *shape;
     Value rval;
@@ -4841,7 +4810,7 @@ END_CASE(JSOP_RESETBASE)
 
 BEGIN_CASE(JSOP_DOUBLE)
 {
-    JS_ASSERT(!regs.fp->hasImacropc());
+    JS_ASSERT(!regs.fp()->hasImacropc());
     double dbl;
     LOAD_DOUBLE(0, dbl);
     PUSH_DOUBLE(dbl);
@@ -4876,7 +4845,7 @@ BEGIN_CASE(JSOP_REGEXP)
      */
     jsatomid index = GET_FULL_INDEX(0);
     JSObject *proto;
-    if (!js_GetClassPrototype(cx, &regs.fp->scopeChain(), JSProto_RegExp, &proto))
+    if (!js_GetClassPrototype(cx, &regs.fp()->scopeChain(), JSProto_RegExp, &proto))
         goto error;
     JS_ASSERT(proto);
     JSObject *obj = js_CloneRegExpObject(cx, script->getRegExp(index), proto);
@@ -4997,7 +4966,7 @@ BEGIN_CASE(JSOP_LOOKUPSWITCH)
      * JSOP_LOOKUPSWITCH and JSOP_LOOKUPSWITCHX are never used if any atom
      * index in it would exceed 64K limit.
      */
-    JS_ASSERT(!regs.fp->hasImacropc());
+    JS_ASSERT(!regs.fp()->hasImacropc());
     JS_ASSERT(atoms == script->atomMap.vector);
     jsbytecode *pc2 = regs.pc;
 
@@ -5066,7 +5035,7 @@ BEGIN_CASE(JSOP_TRAP)
       case JSTRAP_ERROR:
         goto error;
       case JSTRAP_RETURN:
-        regs.fp->setReturnValue(rval);
+        regs.fp()->setReturnValue(rval);
         interpReturnOK = JS_TRUE;
         goto forced_return;
       case JSTRAP_THROW:
@@ -5086,7 +5055,7 @@ BEGIN_CASE(JSOP_TRAP)
 BEGIN_CASE(JSOP_ARGUMENTS)
 {
     Value rval;
-    if (!js_GetArgsValue(cx, regs.fp, &rval))
+    if (!js_GetArgsValue(cx, regs.fp(), &rval))
         goto error;
     PUSH_COPY(rval);
 }
@@ -5096,7 +5065,7 @@ BEGIN_CASE(JSOP_ARGSUB)
 {
     jsid id = INT_TO_JSID(GET_ARGNO(regs.pc));
     Value rval;
-    if (!js_GetArgsProperty(cx, regs.fp, id, &rval))
+    if (!js_GetArgsProperty(cx, regs.fp(), id, &rval))
         goto error;
     PUSH_COPY(rval);
 }
@@ -5106,7 +5075,7 @@ BEGIN_CASE(JSOP_ARGCNT)
 {
     jsid id = ATOM_TO_JSID(rt->atomState.lengthAtom);
     Value rval;
-    if (!js_GetArgsProperty(cx, regs.fp, id, &rval))
+    if (!js_GetArgsProperty(cx, regs.fp(), id, &rval))
         goto error;
     PUSH_COPY(rval);
 }
@@ -5116,7 +5085,7 @@ BEGIN_CASE(JSOP_GETARG)
 BEGIN_CASE(JSOP_CALLARG)
 {
     uint32 slot = GET_ARGNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numFormalArgs());
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
     METER_SLOT_OP(op, slot);
     PUSH_COPY(argv[slot]);
     if (op == JSOP_CALLARG)
@@ -5127,7 +5096,7 @@ END_CASE(JSOP_GETARG)
 BEGIN_CASE(JSOP_SETARG)
 {
     uint32 slot = GET_ARGNO(regs.pc);
-    JS_ASSERT(slot < regs.fp->numFormalArgs());
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
     METER_SLOT_OP(op, slot);
     argv[slot] = regs.sp[-1];
 }
@@ -5137,7 +5106,7 @@ BEGIN_CASE(JSOP_GETLOCAL)
 {
     uint32 slot = GET_SLOTNO(regs.pc);
     JS_ASSERT(slot < script->nslots);
-    PUSH_COPY(regs.fp->slots()[slot]);
+    PUSH_COPY(regs.fp()->slots()[slot]);
 }
 END_CASE(JSOP_GETLOCAL)
 
@@ -5145,7 +5114,7 @@ BEGIN_CASE(JSOP_CALLLOCAL)
 {
     uint32 slot = GET_SLOTNO(regs.pc);
     JS_ASSERT(slot < script->nslots);
-    PUSH_COPY(regs.fp->slots()[slot]);
+    PUSH_COPY(regs.fp()->slots()[slot]);
     PUSH_UNDEFINED();
 }
 END_CASE(JSOP_CALLLOCAL)
@@ -5154,14 +5123,14 @@ BEGIN_CASE(JSOP_SETLOCAL)
 {
     uint32 slot = GET_SLOTNO(regs.pc);
     JS_ASSERT(slot < script->nslots);
-    regs.fp->slots()[slot] = regs.sp[-1];
+    regs.fp()->slots()[slot] = regs.sp[-1];
 }
 END_SET_CASE(JSOP_SETLOCAL)
 
 BEGIN_CASE(JSOP_GETUPVAR_DBG)
 BEGIN_CASE(JSOP_CALLUPVAR_DBG)
 {
-    JSFunction *fun = regs.fp->fun();
+    JSFunction *fun = regs.fp()->fun();
     JS_ASSERT(FUN_KIND(fun) == JSFUN_INTERPRETED);
     JS_ASSERT(fun->u.i.wrapper);
 
@@ -5202,7 +5171,7 @@ END_CASE(JSOP_GETUPVAR_DBG)
 BEGIN_CASE(JSOP_GETFCSLOT)
 BEGIN_CASE(JSOP_CALLFCSLOT)
 {
-    JS_ASSERT(regs.fp->isNonEvalFunctionFrame());
+    JS_ASSERT(regs.fp()->isNonEvalFunctionFrame());
     uintN index = GET_UINT16(regs.pc);
     JSObject *obj = &argv[-2].toObject();
 
@@ -5218,7 +5187,7 @@ BEGIN_CASE(JSOP_CALLGLOBAL)
 {
     uint32 slot = GET_SLOTNO(regs.pc);
     slot = script->getGlobalSlot(slot);
-    JSObject *obj = regs.fp->scopeChain().getGlobal();
+    JSObject *obj = regs.fp()->scopeChain().getGlobal();
     JS_ASSERT(obj->containsSlot(slot));
     PUSH_COPY(obj->getSlot(slot));
     if (op == JSOP_CALLGLOBAL)
@@ -5232,10 +5201,10 @@ BEGIN_CASE(JSOP_DEFVAR)
     uint32 index = GET_INDEX(regs.pc);
     JSAtom *atom = atoms[index];
 
-    JSObject *obj = &regs.fp->varobj(cx);
+    JSObject *obj = &cx->stack.currentVarObj();
     JS_ASSERT(!obj->getOps()->defineProperty);
     uintN attrs = JSPROP_ENUMERATE;
-    if (!regs.fp->isEvalFrame())
+    if (!regs.fp()->isEvalFrame())
         attrs |= JSPROP_PERMANENT;
 
     /* Lookup id in order to check for redeclaration problems. */
@@ -5292,11 +5261,11 @@ BEGIN_CASE(JSOP_DEFFUN)
          * FIXME: bug 476950, although debugger users may also demand some kind
          * of scope link for debugger-assisted eval-in-frame.
          */
-        obj2 = &regs.fp->scopeChain();
+        obj2 = &regs.fp()->scopeChain();
     } else {
         JS_ASSERT(!fun->isFlatClosure());
 
-        obj2 = GetScopeChainFast(cx, regs.fp, JSOP_DEFFUN, JSOP_DEFFUN_LENGTH);
+        obj2 = GetScopeChainFast(cx, regs.fp(), JSOP_DEFFUN, JSOP_DEFFUN_LENGTH);
         if (!obj2)
             goto error;
     }
@@ -5320,7 +5289,7 @@ BEGIN_CASE(JSOP_DEFFUN)
      * ECMA requires functions defined when entering Eval code to be
      * impermanent.
      */
-    uintN attrs = regs.fp->isEvalFrame()
+    uintN attrs = regs.fp()->isEvalFrame()
                   ? JSPROP_ENUMERATE
                   : JSPROP_ENUMERATE | JSPROP_PERMANENT;
 
@@ -5329,7 +5298,7 @@ BEGIN_CASE(JSOP_DEFFUN)
      * current scope chain even for the case of function expression statements
      * and functions defined by eval inside let or with blocks.
      */
-    JSObject *parent = &regs.fp->varobj(cx);
+    JSObject *parent = &cx->stack.currentVarObj();
 
     /* ES5 10.5 (NB: with subsequent errata). */
     jsid id = ATOM_TO_JSID(fun->atom);
@@ -5396,11 +5365,11 @@ BEGIN_CASE(JSOP_DEFFUN_DBGFC)
 
     Value rval = ObjectValue(*obj);
 
-    uintN attrs = regs.fp->isEvalFrame()
+    uintN attrs = regs.fp()->isEvalFrame()
                   ? JSPROP_ENUMERATE
                   : JSPROP_ENUMERATE | JSPROP_PERMANENT;
 
-    JSObject &parent = regs.fp->varobj(cx);
+    JSObject &parent = cx->stack.currentVarObj();
 
     jsid id = ATOM_TO_JSID(fun->atom);
     if (!CheckRedeclaration(cx, &parent, id, attrs))
@@ -5430,11 +5399,11 @@ BEGIN_CASE(JSOP_DEFLOCALFUN)
     JSObject *obj = FUN_OBJECT(fun);
 
     if (FUN_NULL_CLOSURE(fun)) {
-        obj = CloneFunctionObject(cx, fun, &regs.fp->scopeChain());
+        obj = CloneFunctionObject(cx, fun, &regs.fp()->scopeChain());
         if (!obj)
             goto error;
     } else {
-        JSObject *parent = GetScopeChainFast(cx, regs.fp, JSOP_DEFLOCALFUN,
+        JSObject *parent = GetScopeChainFast(cx, regs.fp(), JSOP_DEFLOCALFUN,
                                              JSOP_DEFLOCALFUN_LENGTH);
         if (!parent)
             goto error;
@@ -5453,7 +5422,7 @@ BEGIN_CASE(JSOP_DEFLOCALFUN)
     uint32 slot = GET_SLOTNO(regs.pc);
     TRACE_2(DefLocalFunSetSlot, slot, obj);
 
-    regs.fp->slots()[slot].setObject(*obj);
+    regs.fp()->slots()[slot].setObject(*obj);
 }
 END_CASE(JSOP_DEFLOCALFUN)
 
@@ -5469,7 +5438,7 @@ BEGIN_CASE(JSOP_DEFLOCALFUN_FC)
     uint32 slot = GET_SLOTNO(regs.pc);
     TRACE_2(DefLocalFunSetSlot, slot, obj);
 
-    regs.fp->slots()[slot].setObject(*obj);
+    regs.fp()->slots()[slot].setObject(*obj);
 }
 END_CASE(JSOP_DEFLOCALFUN_FC)
 
@@ -5483,7 +5452,7 @@ BEGIN_CASE(JSOP_DEFLOCALFUN_DBGFC)
         goto error;
 
     uint32 slot = GET_SLOTNO(regs.pc);
-    regs.fp->slots()[slot].setObject(*obj);
+    regs.fp()->slots()[slot].setObject(*obj);
 }
 END_CASE(JSOP_DEFLOCALFUN_DBGFC)
 
@@ -5498,7 +5467,7 @@ BEGIN_CASE(JSOP_LAMBDA)
     do {
         JSObject *parent;
         if (FUN_NULL_CLOSURE(fun)) {
-            parent = &regs.fp->scopeChain();
+            parent = &regs.fp()->scopeChain();
 
             if (obj->getParent() == parent) {
                 jsbytecode *pc2 = AdvanceOverBlockchainOp(regs.pc + JSOP_LAMBDA_LENGTH);
@@ -5592,7 +5561,7 @@ BEGIN_CASE(JSOP_LAMBDA)
             }
 #endif
         } else {
-            parent = GetScopeChainFast(cx, regs.fp, JSOP_LAMBDA, JSOP_LAMBDA_LENGTH);
+            parent = GetScopeChainFast(cx, regs.fp(), JSOP_LAMBDA, JSOP_LAMBDA_LENGTH);
             if (!parent)
                 goto error;
         }
@@ -5633,7 +5602,7 @@ BEGIN_CASE(JSOP_LAMBDA_DBGFC)
 END_CASE(JSOP_LAMBDA_DBGFC)
 
 BEGIN_CASE(JSOP_CALLEE)
-    JS_ASSERT(regs.fp->isNonEvalFunctionFrame());
+    JS_ASSERT(regs.fp()->isNonEvalFunctionFrame());
     PUSH_COPY(argv[-2]);
 END_CASE(JSOP_CALLEE)
 
@@ -5677,7 +5646,7 @@ BEGIN_CASE(JSOP_SETTER)
 
       case JSOP_INITPROP:
       {
-        JS_ASSERT(regs.sp - regs.fp->base() >= 2);
+        JS_ASSERT(regs.sp - regs.fp()->base() >= 2);
         rval = regs.sp[-1];
         i = -1;
         JSAtom *atom;
@@ -5688,7 +5657,7 @@ BEGIN_CASE(JSOP_SETTER)
       default:
         JS_ASSERT(op2 == JSOP_INITELEM);
 
-        JS_ASSERT(regs.sp - regs.fp->base() >= 3);
+        JS_ASSERT(regs.sp - regs.fp()->base() >= 3);
         rval = regs.sp[-1];
         id = JSID_VOID;
         i = -2;
@@ -5809,7 +5778,7 @@ END_CASE(JSOP_NEWOBJECT)
 BEGIN_CASE(JSOP_ENDINIT)
 {
     /* FIXME remove JSOP_ENDINIT bug 588522 */
-    JS_ASSERT(regs.sp - regs.fp->base() >= 1);
+    JS_ASSERT(regs.sp - regs.fp()->base() >= 1);
     JS_ASSERT(regs.sp[-1].isObject());
 }
 END_CASE(JSOP_ENDINIT)
@@ -5818,7 +5787,7 @@ BEGIN_CASE(JSOP_INITPROP)
 BEGIN_CASE(JSOP_INITMETHOD)
 {
     /* Load the property's initial value into rval. */
-    JS_ASSERT(regs.sp - regs.fp->base() >= 2);
+    JS_ASSERT(regs.sp - regs.fp()->base() >= 2);
     Value rval = regs.sp[-1];
 
     /* Load the object being initialized into lval/obj. */
@@ -5891,7 +5860,7 @@ END_CASE(JSOP_INITPROP);
 BEGIN_CASE(JSOP_INITELEM)
 {
     /* Pop the element's value into rval. */
-    JS_ASSERT(regs.sp - regs.fp->base() >= 3);
+    JS_ASSERT(regs.sp - regs.fp()->base() >= 3);
     const Value &rref = regs.sp[-1];
 
     /* Find the object being initialized at top of stack. */
@@ -5929,8 +5898,8 @@ END_CASE(JSOP_INITELEM)
 BEGIN_CASE(JSOP_DEFSHARP)
 {
     uint32 slot = GET_UINT16(regs.pc);
-    JS_ASSERT(slot + 1 < regs.fp->numFixed());
-    const Value &lref = regs.fp->slots()[slot];
+    JS_ASSERT(slot + 1 < regs.fp()->numFixed());
+    const Value &lref = regs.fp()->slots()[slot];
     JSObject *obj;
     if (lref.isObject()) {
         obj = &lref.toObject();
@@ -5939,7 +5908,7 @@ BEGIN_CASE(JSOP_DEFSHARP)
         obj = NewDenseEmptyArray(cx);
         if (!obj)
             goto error;
-        regs.fp->slots()[slot].setObject(*obj);
+        regs.fp()->slots()[slot].setObject(*obj);
     }
     jsint i = (jsint) GET_UINT16(regs.pc + UINT16_LEN);
     jsid id = INT_TO_JSID(i);
@@ -5959,14 +5928,14 @@ END_CASE(JSOP_DEFSHARP)
 BEGIN_CASE(JSOP_USESHARP)
 {
     uint32 slot = GET_UINT16(regs.pc);
-    JS_ASSERT(slot + 1 < regs.fp->numFixed());
-    const Value &lref = regs.fp->slots()[slot];
+    JS_ASSERT(slot + 1 < regs.fp()->numFixed());
+    const Value &lref = regs.fp()->slots()[slot];
     jsint i = (jsint) GET_UINT16(regs.pc + UINT16_LEN);
     Value rval;
     if (lref.isUndefined()) {
         rval.setUndefined();
     } else {
-        JSObject *obj = &regs.fp->slots()[slot].toObject();
+        JSObject *obj = &regs.fp()->slots()[slot].toObject();
         jsid id = INT_TO_JSID(i);
         if (!obj->getProperty(cx, id, &rval))
             goto error;
@@ -5986,8 +5955,8 @@ END_CASE(JSOP_USESHARP)
 BEGIN_CASE(JSOP_SHARPINIT)
 {
     uint32 slot = GET_UINT16(regs.pc);
-    JS_ASSERT(slot + 1 < regs.fp->numFixed());
-    Value *vp = &regs.fp->slots()[slot];
+    JS_ASSERT(slot + 1 < regs.fp()->numFixed());
+    Value *vp = &regs.fp()->slots()[slot];
     Value rval = vp[1];
 
     /*
@@ -6092,10 +6061,10 @@ BEGIN_CASE(JSOP_SETLOCALPOP)
      * The stack must have a block with at least one local slot below the
      * exception object.
      */
-    JS_ASSERT((size_t) (regs.sp - regs.fp->base()) >= 2);
+    JS_ASSERT((size_t) (regs.sp - regs.fp()->base()) >= 2);
     uint32 slot = GET_UINT16(regs.pc);
     JS_ASSERT(slot + 1 < script->nslots);
-    POP_COPY_TO(regs.fp->slots()[slot]);
+    POP_COPY_TO(regs.fp()->slots()[slot]);
 }
 END_CASE(JSOP_SETLOCALPOP)
 
@@ -6104,7 +6073,7 @@ BEGIN_CASE(JSOP_IFPRIMTOP)
      * If the top of stack is of primitive type, jump to our target. Otherwise
      * advance to the next opcode.
      */
-    JS_ASSERT(regs.sp > regs.fp->base());
+    JS_ASSERT(regs.sp > regs.fp()->base());
     if (regs.sp[-1].isPrimitive()) {
         len = GET_JUMP_OFFSET(regs.pc);
         BRANCH(len);
@@ -6112,7 +6081,7 @@ BEGIN_CASE(JSOP_IFPRIMTOP)
 END_CASE(JSOP_IFPRIMTOP)
 
 BEGIN_CASE(JSOP_PRIMTOP)
-    JS_ASSERT(regs.sp > regs.fp->base());
+    JS_ASSERT(regs.sp > regs.fp()->base());
     if (regs.sp[-1].isObject()) {
         jsint i = GET_INT8(regs.pc);
         js_ReportValueError2(cx, JSMSG_CANT_CONVERT_TO, -2, regs.sp[-2], NULL,
@@ -6156,7 +6125,7 @@ BEGIN_CASE(JSOP_DEBUGGER)
         case JSTRAP_CONTINUE:
             break;
         case JSTRAP_RETURN:
-            regs.fp->setReturnValue(rval);
+            regs.fp()->setReturnValue(rval);
             interpReturnOK = JS_TRUE;
             goto forced_return;
         case JSTRAP_THROW:
@@ -6461,10 +6430,10 @@ BEGIN_CASE(JSOP_ENTERBLOCK)
     JSObject *obj;
     LOAD_OBJECT(0, obj);
     JS_ASSERT(obj->isStaticBlock());
-    JS_ASSERT(regs.fp->base() + OBJ_BLOCK_DEPTH(cx, obj) == regs.sp);
+    JS_ASSERT(regs.fp()->base() + OBJ_BLOCK_DEPTH(cx, obj) == regs.sp);
     Value *vp = regs.sp + OBJ_BLOCK_COUNT(cx, obj);
     JS_ASSERT(regs.sp < vp);
-    JS_ASSERT(vp <= regs.fp->slots() + script->nslots);
+    JS_ASSERT(vp <= regs.fp()->slots() + script->nslots);
     SetValueRangeToUndefined(regs.sp, vp);
     regs.sp = vp;
 
@@ -6476,12 +6445,12 @@ BEGIN_CASE(JSOP_ENTERBLOCK)
      * anything else we should have popped off fp->scopeChain when we left its
      * static scope.
      */
-    JSObject *obj2 = &regs.fp->scopeChain();
+    JSObject *obj2 = &regs.fp()->scopeChain();
     Class *clasp;
     while ((clasp = obj2->getClass()) == &js_WithClass)
         obj2 = obj2->getParent();
     if (clasp == &js_BlockClass &&
-        obj2->getPrivate() == js_FloatingFrameIfGenerator(cx, regs.fp)) {
+        obj2->getPrivate() == js_FloatingFrameIfGenerator(cx, regs.fp())) {
         JSObject *youngestProto = obj2->getProto();
         JS_ASSERT(youngestProto->isStaticBlock());
         JSObject *parent = obj;
@@ -6507,7 +6476,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
      * cloned onto fp->scopeChain, clear its private data, move its locals from
      * the stack into the clone, and pop it off the chain.
      */
-    JSObject &obj = regs.fp->scopeChain();
+    JSObject &obj = regs.fp()->scopeChain();
     if (obj.getProto() == blockChain) {
         JS_ASSERT(obj.isClonedBlock());
         if (!js_PutBlockObject(cx, JS_TRUE))
@@ -6520,10 +6489,10 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
         vp = &regs.sp[-1];
     regs.sp -= GET_UINT16(regs.pc);
     if (op == JSOP_LEAVEBLOCKEXPR) {
-        JS_ASSERT(regs.fp->base() + blockDepth == regs.sp - 1);
+        JS_ASSERT(regs.fp()->base() + blockDepth == regs.sp - 1);
         regs.sp[-1] = *vp;
     } else {
-        JS_ASSERT(regs.fp->base() + blockDepth == regs.sp);
+        JS_ASSERT(regs.fp()->base() + blockDepth == regs.sp);
     }
 }
 END_CASE(JSOP_LEAVEBLOCK)
@@ -6536,24 +6505,24 @@ BEGIN_CASE(JSOP_GENERATOR)
     JSObject *obj = js_NewGenerator(cx);
     if (!obj)
         goto error;
-    JS_ASSERT(!regs.fp->hasCallObj() && !regs.fp->hasArgsObj());
-    regs.fp->setReturnValue(ObjectValue(*obj));
+    JS_ASSERT(!regs.fp()->hasCallObj() && !regs.fp()->hasArgsObj());
+    regs.fp()->setReturnValue(ObjectValue(*obj));
     interpReturnOK = true;
-    if (entryFrame != regs.fp)
+    if (entryFrame != regs.fp())
         goto inline_return;
     goto exit;
 }
 
 BEGIN_CASE(JSOP_YIELD)
     JS_ASSERT(!cx->isExceptionPending());
-    JS_ASSERT(regs.fp->isNonEvalFunctionFrame());
-    if (cx->generatorFor(regs.fp)->state == JSGEN_CLOSING) {
+    JS_ASSERT(regs.fp()->isNonEvalFunctionFrame());
+    if (cx->generatorFor(regs.fp())->state == JSGEN_CLOSING) {
         js_ReportValueError(cx, JSMSG_BAD_GENERATOR_YIELD,
                             JSDVG_SEARCH_STACK, argv[-2], NULL);
         goto error;
     }
-    regs.fp->setReturnValue(regs.sp[-1]);
-    regs.fp->setYielding();
+    regs.fp()->setReturnValue(regs.sp[-1]);
+    regs.fp()->setYielding();
     regs.pc += JSOP_YIELD_LENGTH;
     interpReturnOK = JS_TRUE;
     goto exit;
@@ -6563,7 +6532,7 @@ BEGIN_CASE(JSOP_ARRAYPUSH)
     uint32 slot = GET_UINT16(regs.pc);
     JS_ASSERT(script->nfixed <= slot);
     JS_ASSERT(slot < script->nslots);
-    JSObject *obj = &regs.fp->slots()[slot].toObject();
+    JSObject *obj = &regs.fp()->slots()[slot].toObject();
     if (!js_ArrayCompPush(cx, obj, regs.sp[-1]))
         goto error;
     regs.sp--;
@@ -6639,16 +6608,16 @@ END_CASE(JSOP_ARRAYPUSH)
 #endif /* !JS_THREADED_INTERP */
 
   error:
-    JS_ASSERT(cx->regs == &regs);
+    JS_ASSERT(&cx->regs() == &regs);
 #ifdef JS_TRACER
-    if (regs.fp->hasImacropc() && cx->isExceptionPending()) {
+    if (regs.fp()->hasImacropc() && cx->isExceptionPending()) {
         // Handle exceptions as if they came from the imacro-calling pc.
-        regs.pc = regs.fp->imacropc();
-        regs.fp->clearImacropc();
+        regs.pc = regs.fp()->imacropc();
+        regs.fp()->clearImacropc();
     }
 #endif
 
-    JS_ASSERT(size_t((regs.fp->hasImacropc() ? regs.fp->imacropc() : regs.pc) - script->code) <
+    JS_ASSERT(size_t((regs.fp()->hasImacropc() ? regs.fp()->imacropc() : regs.pc) - script->code) <
               script->length);
 
 #ifdef JS_TRACER
@@ -6687,7 +6656,7 @@ END_CASE(JSOP_ARRAYPUSH)
                 goto error;
               case JSTRAP_RETURN:
                 cx->clearPendingException();
-                regs.fp->setReturnValue(rval);
+                regs.fp()->setReturnValue(rval);
                 interpReturnOK = JS_TRUE;
                 goto forced_return;
               case JSTRAP_THROW:
@@ -6730,7 +6699,7 @@ END_CASE(JSOP_ARRAYPUSH)
              * with the stack depth exceeding the current one and this
              * condition is what we use to filter them out.
              */
-            if (tn->stackDepth > regs.sp - regs.fp->base())
+            if (tn->stackDepth > regs.sp - regs.fp()->base())
                 continue;
 
             /*
@@ -6741,7 +6710,7 @@ END_CASE(JSOP_ARRAYPUSH)
             regs.pc = (script)->main + tn->start + tn->length;
 
             JSBool ok = js_UnwindScope(cx, tn->stackDepth, JS_TRUE);
-            JS_ASSERT(regs.sp == regs.fp->base() + tn->stackDepth);
+            JS_ASSERT(regs.sp == regs.fp()->base() + tn->stackDepth);
             if (!ok) {
                 /*
                  * Restart the handler search with updated pc and stack depth
@@ -6779,7 +6748,7 @@ END_CASE(JSOP_ARRAYPUSH)
 
               case JSTRY_ITER: {
                 /* This is similar to JSOP_ENDITER in the interpreter loop. */
-                JS_ASSERT(js_GetOpcode(cx, regs.fp->script(), regs.pc) == JSOP_ENDITER);
+                JS_ASSERT(js_GetOpcode(cx, regs.fp()->script(), regs.pc) == JSOP_ENDITER);
                 Value v = cx->getPendingException();
                 cx->clearPendingException();
                 ok = js_CloseIterator(cx, &regs.sp[-1].toObject());
@@ -6802,7 +6771,7 @@ END_CASE(JSOP_ARRAYPUSH)
                         cx->getPendingException().isMagic(JS_GENERATOR_CLOSING))) {
             cx->clearPendingException();
             interpReturnOK = JS_TRUE;
-            regs.fp->clearReturnValue();
+            regs.fp()->clearReturnValue();
         }
 #endif
     }
@@ -6816,18 +6785,18 @@ END_CASE(JSOP_ARRAYPUSH)
      * interpReturnOK set to true bypassing any finally blocks.
      */
     interpReturnOK &= js_UnwindScope(cx, 0, interpReturnOK || cx->isExceptionPending());
-    JS_ASSERT(regs.sp == regs.fp->base());
+    JS_ASSERT(regs.sp == regs.fp()->base());
 
 #ifdef DEBUG
     cx->logPrevPc = NULL;
 #endif
 
-    if (entryFrame != regs.fp)
+    if (entryFrame != regs.fp())
         goto inline_return;
 
   exit:
-    interpReturnOK = ScriptEpilogueOrGeneratorYield(cx, regs.fp, interpReturnOK);
-    regs.fp->setFinishedInInterpreter();
+    interpReturnOK = ScriptEpilogueOrGeneratorYield(cx, regs.fp(), interpReturnOK);
+    regs.fp()->setFinishedInInterpreter();
 
     /*
      * At this point we are inevitably leaving an interpreted function or a
@@ -6840,7 +6809,7 @@ END_CASE(JSOP_ARRAYPUSH)
      * error case and for a normal return, the code jumps directly to parent's
      * frame pc.
      */
-    JS_ASSERT(entryFrame == regs.fp);
+    JS_ASSERT(entryFrame == regs.fp());
 
 #ifdef JS_TRACER
     JS_ASSERT_IF(interpReturnOK && interpMode == JSINTERP_RECORD, !TRACE_RECORDER(cx));
@@ -6852,7 +6821,7 @@ END_CASE(JSOP_ARRAYPUSH)
 # endif
 #endif
 
-    JS_ASSERT_IF(!regs.fp->isGeneratorFrame(), !js_IsActiveWithOrBlock(cx, &regs.fp->scopeChain(), 0));
+    JS_ASSERT_IF(!regs.fp()->isGeneratorFrame(), !js_IsActiveWithOrBlock(cx, &regs.fp()->scopeChain(), 0));
 
     return interpReturnOK;
 
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 60ddb8be9e61..998f28c12aa9 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -45,807 +45,19 @@
  */
 #include "jsprvtd.h"
 #include "jspubtd.h"
-#include "jsfun.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jsvalue.h"
 
-struct JSFrameRegs
-{
-    STATIC_SKIP_INFERENCE
-    js::Value       *sp;                  /* stack pointer */
-    jsbytecode      *pc;                  /* program counter */
-    JSStackFrame    *fp;                  /* active frame */
-};
-
-/* Flags to toggle js::Interpret() execution. */
-enum JSInterpMode
-{
-    JSINTERP_NORMAL            =     0, /* interpreter is running normally */
-    JSINTERP_RECORD            =     1, /* interpreter has been started to record/run traces */
-    JSINTERP_SAFEPOINT         =     2, /* interpreter should leave on a method JIT safe point */
-    JSINTERP_PROFILE           =     3  /* interpreter should profile a loop */
-};
-
-/* Flags used in JSStackFrame::flags_ */
-enum JSFrameFlags
-{
-    /* Primary frame type */
-    JSFRAME_GLOBAL             =      0x1, /* frame pushed for a global script */
-    JSFRAME_FUNCTION           =      0x2, /* frame pushed for a scripted call */
-    JSFRAME_DUMMY              =      0x4, /* frame pushed for bookkeeping */
-
-    /* Frame subtypes */
-    JSFRAME_EVAL               =      0x8, /* frame pushed for eval() or debugger eval */
-    JSFRAME_DEBUGGER           =     0x10, /* frame pushed for debugger eval */
-    JSFRAME_GENERATOR          =     0x20, /* frame is associated with a generator */
-    JSFRAME_FLOATING_GENERATOR =     0x40, /* frame is is in generator obj, not on stack */
-    JSFRAME_CONSTRUCTING       =     0x80, /* frame is for a constructor invocation */
-
-    /* Temporary frame states */
-    JSFRAME_YIELDING           =    0x200, /* js::Interpret dispatched JSOP_YIELD */
-    JSFRAME_FINISHED_IN_INTERP =    0x400, /* set if frame finished in Interpret() */
-
-    /* Concerning function arguments */
-    JSFRAME_OVERRIDE_ARGS      =   0x1000, /* overridden arguments local variable */
-    JSFRAME_OVERFLOW_ARGS      =   0x2000, /* numActualArgs > numFormalArgs */
-    JSFRAME_UNDERFLOW_ARGS     =   0x4000, /* numActualArgs < numFormalArgs */
-
-    /* Lazy frame initialization */
-    JSFRAME_HAS_IMACRO_PC      =   0x8000, /* frame has imacpc value available */
-    JSFRAME_HAS_CALL_OBJ       =  0x10000, /* frame has a callobj reachable from scopeChain_ */
-    JSFRAME_HAS_ARGS_OBJ       =  0x20000, /* frame has an argsobj in JSStackFrame::args */
-    JSFRAME_HAS_HOOK_DATA      =  0x40000, /* frame has hookData_ set */
-    JSFRAME_HAS_ANNOTATION     =  0x80000, /* frame has annotation_ set */
-    JSFRAME_HAS_RVAL           = 0x100000, /* frame has rval_ set */
-    JSFRAME_HAS_SCOPECHAIN     = 0x200000, /* frame has scopeChain_ set */
-    JSFRAME_HAS_PREVPC         = 0x400000  /* frame has prevpc_ set */
-};
-
-namespace js { namespace mjit { struct JITScript; } }
-
-/*
- * A stack frame is a part of a stack segment (see js::StackSegment) which is
- * on the per-thread VM stack (see js::StackSpace).
- */
-struct JSStackFrame
-{
-  private:
-    mutable uint32      flags_;         /* bits described by JSFrameFlags */
-    union {                             /* describes what code is executing in a */
-        JSScript        *script;        /*   global frame */
-        JSFunction      *fun;           /*   function frame, pre GetScopeChain */
-    } exec;
-    union {                             /* describes the arguments of a function */
-        uintN           nactual;        /*   pre GetArgumentsObject */
-        JSObject        *obj;           /*   post GetArgumentsObject */
-        JSScript        *script;        /* eval has no args, but needs a script */
-    } args;
-    mutable JSObject    *scopeChain_;   /* current scope chain */
-    JSStackFrame        *prev_;         /* previous cx->regs->fp */
-    void                *ncode_;        /* return address for method JIT */
-
-    /* Lazily initialized */
-    js::Value           rval_;          /* return value of the frame */
-    jsbytecode          *prevpc_;       /* pc of previous frame*/
-    jsbytecode          *imacropc_;     /* pc of macro caller */
-    void                *hookData_;     /* closure returned by call hook */
-    void                *annotation_;   /* perhaps remove with bug 546848 */
-
-    friend class js::StackSpace;
-    friend class js::FrameRegsIter;
-    friend struct JSContext;
-
-    inline void initPrev(JSContext *cx);
-
-  public:
-    /*
-     * Stack frame sort (see JSStackFrame comment above)
-     *
-     * A stack frame may have one of three types, which determines which
-     * members of the frame may be accessed and other invariants:
-     *
-     *  global frame:   execution of global code or an eval in global code
-     *  function frame: execution of function code or an eval in a function
-     *  dummy frame:    bookkeeping frame (read: hack)
-     *
-     */
-
-    bool isFunctionFrame() const {
-        return !!(flags_ & JSFRAME_FUNCTION);
-    }
-
-    bool isGlobalFrame() const {
-        return !!(flags_ & JSFRAME_GLOBAL);
-    }
-
-    bool isDummyFrame() const {
-        return !!(flags_ & JSFRAME_DUMMY);
-    }
-
-    bool isScriptFrame() const {
-        bool retval = !!(flags_ & (JSFRAME_FUNCTION | JSFRAME_GLOBAL));
-        JS_ASSERT(retval == !isDummyFrame());
-        return retval;
-    }
-
-    /*
-     * Eval frames
-     *
-     * As noted above, global and function frames may optionally be 'eval
-     * frames'. Eval code shares its parent's arguments which means that the
-     * arg-access members of JSStackFrame may not be used for eval frames.
-     * Search for 'hasArgs' below for more details.
-     *
-     * A further sub-classification of eval frames is whether the frame was
-     * pushed for an ES5 strict-mode eval().
-     */
-
-    bool isEvalFrame() const {
-        JS_ASSERT_IF(flags_ & JSFRAME_EVAL, isScriptFrame());
-        return flags_ & JSFRAME_EVAL;
-    }
-
-    bool isNonEvalFunctionFrame() const {
-        return (flags_ & (JSFRAME_FUNCTION | JSFRAME_EVAL)) == JSFRAME_FUNCTION;
-    }
-
-    bool isStrictEvalFrame() const {
-        return isEvalFrame() && script()->strictModeCode;
-    }
-
-    bool isNonStrictEvalFrame() const {
-        return isEvalFrame() && !script()->strictModeCode;
-    }
-
-    /*
-     * Frame initialization
-     *
-     * After acquiring a pointer to an uninitialized stack frame on the VM
-     * stack from js::StackSpace, these members are used to initialize the
-     * stack frame before officially pushing the frame into the context.
-     * Collecting frame initialization into a set of inline helpers allows
-     * simpler reasoning and makes call-optimization easier.
-     */
-
-    /* Used for Invoke, Interpret, trace-jit LeaveTree, and method-jit stubs. */
-    inline void initCallFrame(JSContext *cx, JSObject &callee, JSFunction *fun,
-                              uint32 nactual, uint32 flags);
-
-    /* Used for SessionInvoke. */
-    inline void resetInvokeCallFrame();
-
-    /* Called by method-jit stubs and serve as a specification for jit-code. */
-    inline void initCallFrameCallerHalf(JSContext *cx, uint32 flags, void *ncode);
-    inline void initCallFrameEarlyPrologue(JSFunction *fun, uint32 nactual);
-    inline void initCallFrameLatePrologue();
-
-    /* Used for eval. */
-    inline void initEvalFrame(JSContext *cx, JSScript *script, JSStackFrame *prev,
-                              uint32 flags);
-    inline void initGlobalFrame(JSScript *script, JSObject &chain, uint32 flags);
-
-    /* Used when activating generators. */
-    inline void stealFrameAndSlots(js::Value *vp, JSStackFrame *otherfp,
-                                   js::Value *othervp, js::Value *othersp);
-
-    /* Perhaps one fine day we will remove dummy frames. */
-    inline void initDummyFrame(JSContext *cx, JSObject &chain);
-
-    /*
-     * Previous frame
-     *
-     * A frame's 'prev' frame is either null or the previous frame pointed to
-     * by cx->regs->fp when this frame was pushed. Often, given two prev-linked
-     * frames, the next-frame is a function or eval that was called by the
-     * prev-frame, but not always: the prev-frame may have called a native that
-     * reentered the VM through JS_CallFunctionValue on the same context
-     * (without calling JS_SaveFrameChain) which pushed the next-frame. Thus,
-     * 'prev' has little semantic meaning and basically just tells the VM what
-     * to set cx->regs->fp to when this frame is popped.
-     */
-
-    JSStackFrame *prev() const {
-        return prev_;
-    }
-
-    inline void resetGeneratorPrev(JSContext *cx);
-
-    /*
-     * Frame slots
-     *
-     * A frame's 'slots' are the fixed slots associated with the frame (like
-     * local variables) followed by an expression stack holding temporary
-     * values. A frame's 'base' is the base of the expression stack.
-     */
-
-    js::Value *slots() const {
-        return (js::Value *)(this + 1);
-    }
-
-    js::Value *base() const {
-        return slots() + script()->nfixed;
-    }
-
-    js::Value &varSlot(uintN i) {
-        JS_ASSERT(i < script()->nfixed);
-        JS_ASSERT_IF(maybeFun(), i < script()->bindings.countVars());
-        return slots()[i];
-    }
-
-    /*
-     * Script
-     *
-     * All function and global frames have an associated JSScript which holds
-     * the bytecode being executed for the frame.
-     */
-
-    /*
-     * Get the frame's current bytecode, assuming |this| is in |cx|.
-     * next is frame whose prev == this, NULL if not known or if this == cx->fp().
-     */
-    jsbytecode *pc(JSContext *cx, JSStackFrame *next = NULL);
-
-    jsbytecode *prevpc() {
-        JS_ASSERT((prev_ != NULL) && (flags_ & JSFRAME_HAS_PREVPC));
-        return prevpc_;
-    }
-
-    JSScript *script() const {
-        JS_ASSERT(isScriptFrame());
-        return isFunctionFrame()
-               ? isEvalFrame() ? args.script : fun()->script()
-               : exec.script;
-    }
-
-    JSScript *functionScript() const {
-        JS_ASSERT(isFunctionFrame());
-        return isEvalFrame() ? args.script : fun()->script();
-    }
-
-    JSScript *globalScript() const {
-        JS_ASSERT(isGlobalFrame());
-        return exec.script;
-    }
-
-    JSScript *maybeScript() const {
-        return isScriptFrame() ? script() : NULL;
-    }
-
-    size_t numFixed() const {
-        return script()->nfixed;
-    }
-
-    size_t numSlots() const {
-        return script()->nslots;
-    }
-
-    size_t numGlobalVars() const {
-        JS_ASSERT(isGlobalFrame());
-        return exec.script->nfixed;
-    }
-
-    /*
-     * Function
-     *
-     * All function frames have an associated interpreted JSFunction.
-     */
-
-    JSFunction* fun() const {
-        JS_ASSERT(isFunctionFrame());
-        return exec.fun;
-    }
-
-    JSFunction* maybeFun() const {
-        return isFunctionFrame() ? fun() : NULL;
-    }
-
-    /*
-     * Arguments
-     *
-     * Only non-eval function frames have arguments. A frame follows its
-     * arguments contiguously in memory. The arguments pushed by the caller are
-     * the 'actual' arguments. The declared arguments of the callee are the
-     * 'formal' arguments. When the caller passes less or equal actual
-     * arguments, the actual and formal arguments are the same array (but with
-     * different extents). When the caller passes too many arguments, the
-     * formal subset of the actual arguments is copied onto the top of the
-     * stack. This allows the engine to maintain a jit-time constant offset of
-     * arguments from the frame pointer. Since the formal subset of the actual
-     * arguments is potentially on the stack twice, it is important for all
-     * reads/writes to refer to the same canonical memory location.
-     *
-     * An arguments object (the object returned by the 'arguments' keyword) is
-     * lazily created, so a given function frame may or may not have one.
-     */
-
-    /* True if this frame has arguments. Contrast with hasArgsObj. */
-    bool hasArgs() const {
-        return isNonEvalFunctionFrame();
-    }
-
-    uintN numFormalArgs() const {
-        JS_ASSERT(hasArgs());
-        return fun()->nargs;
-    }
-
-    js::Value &formalArg(uintN i) const {
-        JS_ASSERT(i < numFormalArgs());
-        return formalArgs()[i];
-    }
-
-    js::Value *formalArgs() const {
-        JS_ASSERT(hasArgs());
-        return (js::Value *)this - numFormalArgs();
-    }
-
-    js::Value *formalArgsEnd() const {
-        JS_ASSERT(hasArgs());
-        return (js::Value *)this;
-    }
-
-    js::Value *maybeFormalArgs() const {
-        return (flags_ & (JSFRAME_FUNCTION | JSFRAME_EVAL)) == JSFRAME_FUNCTION
-               ? formalArgs()
-               : NULL;
-    }
-
-    inline uintN numActualArgs() const;
-    inline js::Value *actualArgs() const;
-    inline js::Value *actualArgsEnd() const;
-
-    inline js::Value &canonicalActualArg(uintN i) const;
-
-    /*
-     * Apply 'op' to each arg of the specified type. Stop if 'op' returns
-     * false. Return 'true' iff all 'op' calls returned true.
-     */
-    template <class Op> inline bool forEachCanonicalActualArg(Op op);
-    template <class Op> inline bool forEachFormalArg(Op op);
-
-    inline void clearMissingArgs();
-
-    bool hasArgsObj() const {
-        return !!(flags_ & JSFRAME_HAS_ARGS_OBJ);
-    }
-
-    JSObject &argsObj() const {
-        JS_ASSERT(hasArgsObj());
-        JS_ASSERT(!isEvalFrame());
-        return *args.obj;
-    }
-
-    JSObject *maybeArgsObj() const {
-        return hasArgsObj() ? &argsObj() : NULL;
-    }
-
-    inline void setArgsObj(JSObject &obj);
-
-    /*
-     * This value
-     *
-     * Every frame has a this value although, until 'this' is computed, the
-     * value may not be the semantically-correct 'this' value.
-     *
-     * The 'this' value is stored before the formal arguments for function
-     * frames and directly before the frame for global frames. The *Args
-     * members assert !isEvalFrame(), so we implement specialized inline
-     * methods for accessing 'this'. When the caller has static knowledge that
-     * a frame is a function or global frame, 'functionThis' and 'globalThis',
-     * respectively, allow more efficient access.
-     */
-
-    js::Value &functionThis() const {
-        JS_ASSERT(isFunctionFrame());
-        if (isEvalFrame())
-            return ((js::Value *)this)[-1];
-        return formalArgs()[-1];
-    }
-
-    JSObject &constructorThis() const {
-        JS_ASSERT(hasArgs());
-        return formalArgs()[-1].toObject();
-    }
-
-    js::Value &globalThis() const {
-        JS_ASSERT(isGlobalFrame());
-        return ((js::Value *)this)[-1];
-    }
-
-    js::Value &thisValue() const {
-        if (flags_ & (JSFRAME_EVAL | JSFRAME_GLOBAL))
-            return ((js::Value *)this)[-1];
-        return formalArgs()[-1];
-    }
-
-    /*
-     * Callee
-     *
-     * Only function frames have a callee. An eval frame in a function has the
-     * same caller as its containing function frame.
-     */
-
-    js::Value &calleev() const {
-        JS_ASSERT(isFunctionFrame());
-        if (isEvalFrame())
-            return ((js::Value *)this)[-2];
-        return formalArgs()[-2];
-    }
-
-    JSObject &callee() const {
-        JS_ASSERT(isFunctionFrame());
-        return calleev().toObject();
-    }
-
-    JSObject *maybeCallee() const {
-        return isFunctionFrame() ? &callee() : NULL;
-    }
-
-    js::CallReceiver callReceiver() const {
-        return js::CallReceiverFromArgv(formalArgs());
-    }
-
-    /*
-     * getValidCalleeObject is a fallible getter to compute the correct callee
-     * function object, which may require deferred cloning due to the JSObject
-     * methodReadBarrier. For a non-function frame, return true with *vp set
-     * from calleev, which may not be an object (it could be undefined).
-     */
-    bool getValidCalleeObject(JSContext *cx, js::Value *vp);
-
-    /*
-     * Scope chain
-     *
-     * Every frame has a scopeChain which, when traversed via the 'parent' link
-     * to the root, indicates the current global object. A 'call object' is a
-     * node on a scope chain representing a function's activation record. A
-     * call object is used for dynamically-scoped name lookup and lexically-
-     * scoped upvar access. The call object holds the values of locals and
-     * arguments when a function returns (and its stack frame is popped). For
-     * performance reasons, call objects are created lazily for 'lightweight'
-     * functions, i.e., functions which are not statically known to require a
-     * call object. Thus, a given function frame may or may not have a call
-     * object. When a function does have a call object, it is found by walking
-     * up the scope chain until the first call object. Thus, it is important,
-     * when setting the scope chain, to indicate whether the new scope chain
-     * contains a new call object and thus changes the 'hasCallObj' state.
-     *
-     * NB: 'fp->hasCallObj()' implies that fp->callObj() needs to be 'put' when
-     * the frame is popped. Since the scope chain of a non-strict eval frame
-     * contains the call object of the parent (function) frame, it is possible
-     * to have:
-     *   !fp->hasCall() && fp->scopeChain().isCall()
-     */
-
-    JSObject &scopeChain() const {
-        JS_ASSERT_IF(!(flags_ & JSFRAME_HAS_SCOPECHAIN), isFunctionFrame());
-        if (!(flags_ & JSFRAME_HAS_SCOPECHAIN)) {
-            scopeChain_ = callee().getParent();
-            flags_ |= JSFRAME_HAS_SCOPECHAIN;
-        }
-        return *scopeChain_;
-    }
-
-    bool hasCallObj() const {
-        bool ret = !!(flags_ & JSFRAME_HAS_CALL_OBJ);
-        JS_ASSERT_IF(ret, !isNonStrictEvalFrame());
-        return ret;
-    }
-
-    inline JSObject &callObj() const;
-    inline void setScopeChainNoCallObj(JSObject &obj);
-    inline void setScopeChainWithOwnCallObj(JSObject &obj);
-
-    inline void markActivationObjectsAsPut();
-
-    /*
-     * Frame compartment
-     *
-     * A stack frame's compartment is the frame's containing context's
-     * compartment when the frame was pushed.
-     */
-
-    JSCompartment *compartment() const {
-        JS_ASSERT_IF(isScriptFrame(), scopeChain().compartment() == script()->compartment);
-        return scopeChain().compartment();
-    }
-
-    inline JSPrincipals *principals(JSContext *cx) const;
-
-    /*
-     * Imacropc
-     *
-     * A frame's IMacro pc is the bytecode address when an imacro started
-     * executing (guaranteed non-null). An imacro does not push a frame, so
-     * when the imacro finishes, the frame's IMacro pc becomes the current pc.
-     */
-
-    bool hasImacropc() const {
-        return flags_ & JSFRAME_HAS_IMACRO_PC;
-    }
-
-    jsbytecode *imacropc() const {
-        JS_ASSERT(hasImacropc());
-        return imacropc_;
-    }
-
-    jsbytecode *maybeImacropc() const {
-        return hasImacropc() ? imacropc() : NULL;
-    }
-
-    void clearImacropc() {
-        flags_ &= ~JSFRAME_HAS_IMACRO_PC;
-    }
-
-    void setImacropc(jsbytecode *pc) {
-        JS_ASSERT(pc);
-        JS_ASSERT(!(flags_ & JSFRAME_HAS_IMACRO_PC));
-        imacropc_ = pc;
-        flags_ |= JSFRAME_HAS_IMACRO_PC;
-    }
-
-    /* Annotation (will be removed after bug 546848) */
-
-    void* annotation() const {
-        return (flags_ & JSFRAME_HAS_ANNOTATION) ? annotation_ : NULL;
-    }
-
-    void setAnnotation(void *annot) {
-        flags_ |= JSFRAME_HAS_ANNOTATION;
-        annotation_ = annot;
-    }
-
-    /* Debugger hook data */
-
-    bool hasHookData() const {
-        return !!(flags_ & JSFRAME_HAS_HOOK_DATA);
-    }
-
-    void* hookData() const {
-        JS_ASSERT(hasHookData());
-        return hookData_;
-    }
-
-    void* maybeHookData() const {
-        return hasHookData() ? hookData_ : NULL;
-    }
-
-    void setHookData(void *v) {
-        hookData_ = v;
-        flags_ |= JSFRAME_HAS_HOOK_DATA;
-    }
-
-    /* Return value */
-
-    const js::Value &returnValue() {
-        if (!(flags_ & JSFRAME_HAS_RVAL))
-            rval_.setUndefined();
-        return rval_;
-    }
-
-    void markReturnValue() {
-        flags_ |= JSFRAME_HAS_RVAL;
-    }
-
-    void setReturnValue(const js::Value &v) {
-        rval_ = v;
-        markReturnValue();
-    }
-
-    void clearReturnValue() {
-        rval_.setUndefined();
-        markReturnValue();
-    }
-
-    /* Native-code return address */
-
-    void *nativeReturnAddress() const {
-        return ncode_;
-    }
-
-    void setNativeReturnAddress(void *addr) {
-        ncode_ = addr;
-    }
-
-    void **addressOfNativeReturnAddress() {
-        return &ncode_;
-    }
-
-    /*
-     * Generator-specific members
-     *
-     * A non-eval function frame may optionally be the activation of a
-     * generator. For the most part, generator frames act like ordinary frames.
-     * For exceptions, see js_FloatingFrameIfGenerator.
-     */
-
-    bool isGeneratorFrame() const {
-        return !!(flags_ & JSFRAME_GENERATOR);
-    }
-
-    bool isFloatingGenerator() const {
-        JS_ASSERT_IF(flags_ & JSFRAME_FLOATING_GENERATOR, isGeneratorFrame());
-        return !!(flags_ & JSFRAME_FLOATING_GENERATOR);
-    }
-
-    void initFloatingGenerator() {
-        JS_ASSERT(!(flags_ & JSFRAME_GENERATOR));
-        flags_ |= (JSFRAME_GENERATOR | JSFRAME_FLOATING_GENERATOR);
-    }
-
-    void unsetFloatingGenerator() {
-        flags_ &= ~JSFRAME_FLOATING_GENERATOR;
-    }
-
-    void setFloatingGenerator() {
-        flags_ |= JSFRAME_FLOATING_GENERATOR;
-    }
-
-    /*
-     * js::Execute pushes both global and function frames (since eval() in a
-     * function pushes a frame with isFunctionFrame() && isEvalFrame()). Most
-     * code should not care where a frame was pushed, but if it is necessary to
-     * pick out frames pushed by js::Execute, this is the right query:
-     */
-
-    bool isFramePushedByExecute() const {
-        return !!(flags_ & (JSFRAME_GLOBAL | JSFRAME_EVAL));
-    }
-
-    /*
-     * Other flags
-     */
-
-    bool isConstructing() const {
-        return !!(flags_ & JSFRAME_CONSTRUCTING);
-    }
-
-    uint32 isConstructingFlag() const {
-        JS_ASSERT(isFunctionFrame());
-        JS_ASSERT((flags_ & ~(JSFRAME_CONSTRUCTING | JSFRAME_FUNCTION)) == 0);
-        return flags_;
-    }
-
-    bool isDebuggerFrame() const {
-        return !!(flags_ & JSFRAME_DEBUGGER);
-    }
-
-    bool isEvalOrDebuggerFrame() const {
-        return !!(flags_ & (JSFRAME_EVAL | JSFRAME_DEBUGGER));
-    }
-
-    bool hasOverriddenArgs() const {
-        return !!(flags_ & JSFRAME_OVERRIDE_ARGS);
-    }
-
-    bool hasOverflowArgs() const {
-        return !!(flags_ & JSFRAME_OVERFLOW_ARGS);
-    }
-
-    void setOverriddenArgs() {
-        flags_ |= JSFRAME_OVERRIDE_ARGS;
-    }
-
-    bool isYielding() {
-        return !!(flags_ & JSFRAME_YIELDING);
-    }
-
-    void setYielding() {
-        flags_ |= JSFRAME_YIELDING;
-    }
-
-    void clearYielding() {
-        flags_ &= ~JSFRAME_YIELDING;
-    }
-
-    void setFinishedInInterpreter() {
-        flags_ |= JSFRAME_FINISHED_IN_INTERP;
-    }
-
-    bool finishedInInterpreter() const {
-        return !!(flags_ & JSFRAME_FINISHED_IN_INTERP);
-    }
-
-    /*
-     * Variables object accessors
-     *
-     * A stack frame's 'varobj' refers to the 'variables object' (ES3 term)
-     * associated with the Execution Context's VariableEnvironment (ES5 10.3).
-     *
-     * To compute the frame's varobj, the caller must supply the segment
-     * containing the frame (see js::StackSegment comment). As an abbreviation,
-     * the caller may pass the context if the frame is contained in that
-     * context's active segment.
-     */
-
-    inline JSObject &varobj(js::StackSegment *seg) const;
-    inline JSObject &varobj(JSContext *cx) const;
-
-    /* Access to privates from the jits. */
-
-    static size_t offsetOfFlags() {
-        return offsetof(JSStackFrame, flags_);
-    }
-
-    static size_t offsetOfExec() {
-        return offsetof(JSStackFrame, exec);
-    }
-
-    void *addressOfArgs() {
-        return &args;
-    }
-
-    static size_t offsetOfScopeChain() {
-        return offsetof(JSStackFrame, scopeChain_);
-    }
-
-    JSObject **addressOfScopeChain() {
-        JS_ASSERT(flags_ & JSFRAME_HAS_SCOPECHAIN);
-        return &scopeChain_;
-    }
-
-    static size_t offsetOfPrev() {
-        return offsetof(JSStackFrame, prev_);
-    }
-
-    static size_t offsetOfReturnValue() {
-        return offsetof(JSStackFrame, rval_);
-    }
-
-    static ptrdiff_t offsetOfncode() {
-        return offsetof(JSStackFrame, ncode_);
-    }
-
-    static ptrdiff_t offsetOfCallee(JSFunction *fun) {
-        JS_ASSERT(fun != NULL);
-        return -(fun->nargs + 2) * sizeof(js::Value);
-    }
-
-    static ptrdiff_t offsetOfThis(JSFunction *fun) {
-        return fun == NULL
-               ? -1 * ptrdiff_t(sizeof(js::Value))
-               : -(fun->nargs + 1) * ptrdiff_t(sizeof(js::Value));
-    }
-
-    static ptrdiff_t offsetOfFormalArg(JSFunction *fun, uintN i) {
-        JS_ASSERT(i < fun->nargs);
-        return (-(int)fun->nargs + i) * sizeof(js::Value);
-    }
-
-    static size_t offsetOfFixed(uintN i) {
-        return sizeof(JSStackFrame) + i * sizeof(js::Value);
-    }
-
-    /* Workaround for static asserts on private members. */
-
-    void staticAsserts() {
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_) % sizeof(js::Value) == 0);
-        JS_STATIC_ASSERT(sizeof(JSStackFrame) % sizeof(js::Value) == 0);
-    }
-
-#ifdef JS_METHODJIT
-    js::mjit::JITScript *jit() {
-        return script()->getJIT(isConstructing());
-    }
-#endif
-
-    void methodjitStaticAsserts();
-
-#ifdef DEBUG
-    /* Poison scopeChain value set before a frame is flushed. */
-    static JSObject *const sInvalidScopeChain;
-#endif
-};
+#include "vm/Stack.h"
 
 namespace js {
 
-static const size_t VALUES_PER_STACK_FRAME = sizeof(JSStackFrame) / sizeof(Value);
+extern JSObject *
+GetBlockChain(JSContext *cx, StackFrame *fp);
 
 extern JSObject *
-GetBlockChain(JSContext *cx, JSStackFrame *fp);
-
-extern JSObject *
-GetBlockChainFast(JSContext *cx, JSStackFrame *fp, JSOp op, size_t oplen);
+GetBlockChainFast(JSContext *cx, StackFrame *fp, JSOp op, size_t oplen);
 
 extern JSObject *
 GetScopeChain(JSContext *cx);
@@ -858,10 +70,10 @@ GetScopeChain(JSContext *cx);
  * must reflect at runtime.
  */
 extern JSObject *
-GetScopeChain(JSContext *cx, JSStackFrame *fp);
+GetScopeChain(JSContext *cx, StackFrame *fp);
 
 extern JSObject *
-GetScopeChainFast(JSContext *cx, JSStackFrame *fp, JSOp op, size_t oplen);
+GetScopeChainFast(JSContext *cx, StackFrame *fp, JSOp op, size_t oplen);
 
 /*
  * Report an error that the this value passed as |this| in the given arguments
@@ -881,16 +93,6 @@ ReportIncompatibleMethod(JSContext *cx, Value *vp, Class *clasp);
 template <typename T>
 bool GetPrimitiveThis(JSContext *cx, Value *vp, T *v);
 
-inline void
-PutActivationObjects(JSContext *cx, JSStackFrame *fp)
-{
-    /* The order is important since js_PutCallObject does js_PutArgsObject. */
-    if (fp->hasCallObj())
-        js_PutCallObject(cx, fp);
-    else if (fp->hasArgsObj())
-        js_PutArgsObject(cx, fp);
-}
-
 /*
  * ScriptPrologue/ScriptEpilogue must be called in pairs. ScriptPrologue
  * must be called before the script executes. ScriptEpilogue must be called
@@ -898,10 +100,10 @@ PutActivationObjects(JSContext *cx, JSStackFrame *fp)
  */
 
 inline bool
-ScriptPrologue(JSContext *cx, JSStackFrame *fp, JSScript *script);
+ScriptPrologue(JSContext *cx, StackFrame *fp, JSScript *script);
 
 inline bool
-ScriptEpilogue(JSContext *cx, JSStackFrame *fp, bool ok);
+ScriptEpilogue(JSContext *cx, StackFrame *fp, bool ok);
 
 /*
  * It is not valid to call ScriptPrologue when a generator is resumed or to
@@ -911,18 +113,18 @@ ScriptEpilogue(JSContext *cx, JSStackFrame *fp, bool ok);
  */
 
 inline bool
-ScriptPrologueOrGeneratorResume(JSContext *cx, JSStackFrame *fp);
+ScriptPrologueOrGeneratorResume(JSContext *cx, StackFrame *fp);
 
 inline bool
-ScriptEpilogueOrGeneratorYield(JSContext *cx, JSStackFrame *fp, bool ok);
+ScriptEpilogueOrGeneratorYield(JSContext *cx, StackFrame *fp, bool ok);
 
 /* Implemented in jsdbgapi: */
 
 extern void
-ScriptDebugPrologue(JSContext *cx, JSStackFrame *fp);
+ScriptDebugPrologue(JSContext *cx, StackFrame *fp);
 
 extern bool
-ScriptDebugEpilogue(JSContext *cx, JSStackFrame *fp, bool ok);
+ScriptDebugEpilogue(JSContext *cx, StackFrame *fp, bool ok);
 
 /*
  * For a given |call|, convert null/undefined |this| into the global object for
@@ -940,18 +142,40 @@ BoxNonStrictThis(JSContext *cx, const CallReceiver &call);
  * an optimization to avoid global-this computation).
  */
 inline bool
-ComputeThis(JSContext *cx, JSStackFrame *fp);
+ComputeThis(JSContext *cx, StackFrame *fp);
+
+/*
+ * Choose enumerator values so that the enum can be passed used directly as the
+ * stack frame flags.
+ */
+enum ConstructOption {
+    INVOKE_NORMAL = 0,
+    INVOKE_CONSTRUCTOR = StackFrame::CONSTRUCTING
+};
+JS_STATIC_ASSERT(INVOKE_CONSTRUCTOR != INVOKE_NORMAL);
+
+static inline uintN
+ToReportFlags(ConstructOption option)
+{
+    return (uintN)option;
+}
+
+static inline uint32
+ToFrameFlags(ConstructOption option)
+{
+    return (uintN)option;
+}
 
 /*
  * The js::InvokeArgumentsGuard passed to js_Invoke must come from an
  * immediately-enclosing successful call to js::StackSpace::pushInvokeArgs,
- * i.e., there must have been no un-popped pushes to cx->stack(). Furthermore,
+ * i.e., there must have been no un-popped pushes to cx->stack. Furthermore,
  * |args.getvp()[0]| should be the callee, |args.getvp()[1]| should be |this|,
  * and the range [args.getvp() + 2, args.getvp() + 2 + args.getArgc()) should
  * be initialized actual arguments.
  */
 extern JS_REQUIRES_STACK bool
-Invoke(JSContext *cx, const CallArgs &args, uint32 flags);
+Invoke(JSContext *cx, const CallArgs &args, ConstructOption option = INVOKE_NORMAL);
 
 /*
  * Natives like sort/forEach/replace call Invoke repeatedly with the same
@@ -979,29 +203,9 @@ Invoke(JSContext *cx, const CallArgs &args, uint32 flags);
  */
 class InvokeSessionGuard;
 
-/*
- * Consolidated js_Invoke flags simply rename certain JSFRAME_* flags, so that
- * we can share bits stored in JSStackFrame.flags and passed to:
- *
- *   js_Invoke
- *   js_InternalInvoke
- *   js_ValueToFunction
- *   js_ValueToFunctionObject
- *   js_ValueToCallableObject
- *   js_ReportIsNotFunction
- *
- * See jsfun.h for the latter four and flag renaming macros.
- */
-#define JSINVOKE_CONSTRUCT      JSFRAME_CONSTRUCTING
-
-/*
- * Mask to isolate construct and iterator flags for use with jsfun.h functions.
- */
-#define JSINVOKE_FUNFLAGS       JSINVOKE_CONSTRUCT
-
 /*
  * "External" calls may come from C or C++ code using a JSContext on which no
- * JS is running (!cx->fp), so they may need to push a dummy JSStackFrame.
+ * JS is running (!cx->fp), so they may need to push a dummy StackFrame.
  */
 
 extern bool
@@ -1037,17 +241,26 @@ ExternalInvokeConstructor(JSContext *cx, const Value &fval, uintN argc, Value *a
  */
 extern JS_FORCES_STACK bool
 Execute(JSContext *cx, JSObject &chain, JSScript *script,
-        JSStackFrame *prev, uintN flags, Value *result);
+        StackFrame *prev, uintN flags, Value *result);
+
+/* Flags to toggle js::Interpret() execution. */
+enum InterpMode
+{
+    JSINTERP_NORMAL    = 0, /* interpreter is running normally */
+    JSINTERP_RECORD    = 1, /* interpreter has been started to record/run traces */
+    JSINTERP_SAFEPOINT = 2, /* interpreter should leave on a method JIT safe point */
+    JSINTERP_PROFILE   = 3  /* interpreter should profile a loop */
+};
 
 /*
  * Execute the caller-initialized frame for a user-defined script or function
  * pointed to by cx->fp until completion or error.
  */
 extern JS_REQUIRES_STACK JS_NEVER_INLINE bool
-Interpret(JSContext *cx, JSStackFrame *stopFp, uintN inlineCallCount = 0, JSInterpMode mode = JSINTERP_NORMAL);
+Interpret(JSContext *cx, StackFrame *stopFp, uintN inlineCallCount = 0, InterpMode mode = JSINTERP_NORMAL);
 
 extern JS_REQUIRES_STACK bool
-RunScript(JSContext *cx, JSScript *script, JSStackFrame *fp);
+RunScript(JSContext *cx, JSScript *script, StackFrame *fp);
 
 extern bool
 CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs);
@@ -1102,8 +315,6 @@ GetUpvar(JSContext *cx, uintN level, js::UpvarCookie cookie);
 # endif
 #endif
 
-#define JS_MAX_INLINE_CALL_COUNT 3000
-
 #if !JS_LONE_INTERPRET
 # define JS_STATIC_INTERPRET    static
 #else
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 2b735c031575..276dfa32e9e8 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -52,425 +52,7 @@
 
 #include "jsfuninlines.h"
 
-inline void
-JSStackFrame::initPrev(JSContext *cx)
-{
-    JS_ASSERT(flags_ & JSFRAME_HAS_PREVPC);
-    if (JSFrameRegs *regs = cx->regs) {
-        prev_ = regs->fp;
-        prevpc_ = regs->pc;
-        JS_ASSERT_IF(!prev_->isDummyFrame() && !prev_->hasImacropc(),
-                     uint32(prevpc_ - prev_->script()->code) < prev_->script()->length);
-    } else {
-        prev_ = NULL;
-#ifdef DEBUG
-        prevpc_ = (jsbytecode *)0xbadc;
-#endif
-    }
-}
-
-inline void
-JSStackFrame::resetGeneratorPrev(JSContext *cx)
-{
-    flags_ |= JSFRAME_HAS_PREVPC;
-    initPrev(cx);
-}
-
-inline void
-JSStackFrame::initCallFrame(JSContext *cx, JSObject &callee, JSFunction *fun,
-                            uint32 nactual, uint32 flagsArg)
-{
-    JS_ASSERT((flagsArg & ~(JSFRAME_CONSTRUCTING |
-                            JSFRAME_OVERFLOW_ARGS |
-                            JSFRAME_UNDERFLOW_ARGS)) == 0);
-    JS_ASSERT(fun == callee.getFunctionPrivate());
-
-    /* Initialize stack frame members. */
-    flags_ = JSFRAME_FUNCTION | JSFRAME_HAS_PREVPC | JSFRAME_HAS_SCOPECHAIN | flagsArg;
-    exec.fun = fun;
-    args.nactual = nactual;  /* only need to write if over/under-flow */
-    scopeChain_ = callee.getParent();
-    initPrev(cx);
-    JS_ASSERT(!hasImacropc());
-    JS_ASSERT(!hasHookData());
-    JS_ASSERT(annotation() == NULL);
-    JS_ASSERT(!hasCallObj());
-}
-
-inline void
-JSStackFrame::resetInvokeCallFrame()
-{
-    /* Undo changes to frame made during execution; see initCallFrame */
-
-    JS_ASSERT(!(flags_ & ~(JSFRAME_FUNCTION |
-                           JSFRAME_OVERFLOW_ARGS |
-                           JSFRAME_UNDERFLOW_ARGS |
-                           JSFRAME_OVERRIDE_ARGS |
-                           JSFRAME_HAS_PREVPC |
-                           JSFRAME_HAS_RVAL |
-                           JSFRAME_HAS_SCOPECHAIN |
-                           JSFRAME_HAS_ANNOTATION |
-                           JSFRAME_HAS_HOOK_DATA |
-                           JSFRAME_HAS_CALL_OBJ |
-                           JSFRAME_HAS_ARGS_OBJ |
-                           JSFRAME_FINISHED_IN_INTERP)));
-
-    /*
-     * Since the stack frame is usually popped after PutActivationObjects,
-     * these bits aren't cleared. The activation objects must have actually
-     * been put, though.
-     */
-    JS_ASSERT_IF(flags_ & JSFRAME_HAS_CALL_OBJ, callObj().getPrivate() == NULL);
-    JS_ASSERT_IF(flags_ & JSFRAME_HAS_ARGS_OBJ, argsObj().getPrivate() == NULL);
-
-    flags_ &= JSFRAME_FUNCTION |
-              JSFRAME_OVERFLOW_ARGS |
-              JSFRAME_HAS_PREVPC |
-              JSFRAME_UNDERFLOW_ARGS;
-
-    JS_ASSERT(exec.fun == callee().getFunctionPrivate());
-    scopeChain_ = callee().getParent();
-}
-
-inline void
-JSStackFrame::initCallFrameCallerHalf(JSContext *cx, uint32 flagsArg,
-                                      void *ncode)
-{
-    JS_ASSERT((flagsArg & ~(JSFRAME_CONSTRUCTING |
-                            JSFRAME_FUNCTION |
-                            JSFRAME_OVERFLOW_ARGS |
-                            JSFRAME_UNDERFLOW_ARGS)) == 0);
-
-    flags_ = JSFRAME_FUNCTION | flagsArg;
-    prev_ = cx->regs->fp;
-    ncode_ = ncode;
-}
-
-/*
- * The "early prologue" refers to the members that are stored for the benefit
- * of slow paths before initializing the rest of the members.
- */
-inline void
-JSStackFrame::initCallFrameEarlyPrologue(JSFunction *fun, uint32 nactual)
-{
-    exec.fun = fun;
-    if (flags_ & (JSFRAME_OVERFLOW_ARGS | JSFRAME_UNDERFLOW_ARGS))
-        args.nactual = nactual;
-}
-
-/*
- * The "late prologue" refers to the members that are stored after having
- * checked for stack overflow and formal/actual arg mismatch.
- */
-inline void
-JSStackFrame::initCallFrameLatePrologue()
-{
-    SetValueRangeToUndefined(slots(), script()->nfixed);
-}
-
-inline void
-JSStackFrame::initEvalFrame(JSContext *cx, JSScript *script, JSStackFrame *prev, uint32 flagsArg)
-{
-    JS_ASSERT(flagsArg & JSFRAME_EVAL);
-    JS_ASSERT((flagsArg & ~(JSFRAME_EVAL | JSFRAME_DEBUGGER)) == 0);
-    JS_ASSERT(prev->isScriptFrame());
-
-    /* Copy (callee, thisv). */
-    js::Value *dstvp = (js::Value *)this - 2;
-    js::Value *srcvp = prev->hasArgs()
-                       ? prev->formalArgs() - 2
-                       : (js::Value *)prev - 2;
-    dstvp[0] = srcvp[0];
-    dstvp[1] = srcvp[1];
-    JS_ASSERT_IF(prev->isFunctionFrame(),
-                 dstvp[0].toObject().isFunction());
-
-    /* Initialize stack frame members. */
-    flags_ = flagsArg | JSFRAME_HAS_PREVPC | JSFRAME_HAS_SCOPECHAIN |
-             (prev->flags_ & (JSFRAME_FUNCTION | JSFRAME_GLOBAL));
-    if (isFunctionFrame()) {
-        exec = prev->exec;
-        args.script = script;
-    } else {
-        exec.script = script;
-    }
-
-    scopeChain_ = &prev->scopeChain();
-    prev_ = prev;
-    prevpc_ = prev->pc(cx);
-    JS_ASSERT(!hasImacropc());
-    JS_ASSERT(!hasHookData());
-    setAnnotation(prev->annotation());
-}
-
-inline void
-JSStackFrame::initGlobalFrame(JSScript *script, JSObject &chain, uint32 flagsArg)
-{
-    JS_ASSERT((flagsArg & ~(JSFRAME_EVAL | JSFRAME_DEBUGGER)) == 0);
-
-    /* Initialize (callee, thisv). */
-    js::Value *vp = (js::Value *)this - 2;
-    vp[0].setUndefined();
-    vp[1].setUndefined();  /* Set after frame pushed using thisObject */
-
-    /* Initialize stack frame members. */
-    flags_ = flagsArg | JSFRAME_GLOBAL | JSFRAME_HAS_PREVPC | JSFRAME_HAS_SCOPECHAIN;
-    exec.script = script;
-    args.script = (JSScript *)0xbad;
-    scopeChain_ = &chain;
-    prev_ = NULL;
-    JS_ASSERT(!hasImacropc());
-    JS_ASSERT(!hasHookData());
-    JS_ASSERT(annotation() == NULL);
-}
-
-inline void
-JSStackFrame::initDummyFrame(JSContext *cx, JSObject &chain)
-{
-    js::PodZero(this);
-    flags_ = JSFRAME_DUMMY | JSFRAME_HAS_PREVPC | JSFRAME_HAS_SCOPECHAIN;
-    initPrev(cx);
-    chain.isGlobal();
-    setScopeChainNoCallObj(chain);
-}
-
-inline void
-JSStackFrame::stealFrameAndSlots(js::Value *vp, JSStackFrame *otherfp,
-                                 js::Value *othervp, js::Value *othersp)
-{
-    JS_ASSERT(vp == (js::Value *)this - (otherfp->formalArgsEnd() - othervp));
-    JS_ASSERT(othervp == otherfp->actualArgs() - 2);
-    JS_ASSERT(othersp >= otherfp->slots());
-    JS_ASSERT(othersp <= otherfp->base() + otherfp->numSlots());
-
-    PodCopy(vp, othervp, othersp - othervp);
-    JS_ASSERT(vp == this->actualArgs() - 2);
-
-    /* Catch bad-touching of non-canonical args (e.g., generator_trace). */
-    if (otherfp->hasOverflowArgs())
-        Debug_SetValueRangeToCrashOnTouch(othervp, othervp + 2 + otherfp->numFormalArgs());
-
-    /*
-     * Repoint Call, Arguments, Block and With objects to the new live frame.
-     * Call and Arguments are done directly because we have pointers to them.
-     * Block and With objects are done indirectly through 'liveFrame'. See
-     * js_LiveFrameToFloating comment in jsiter.h.
-     */
-    if (hasCallObj()) {
-        JSObject &obj = callObj();
-        obj.setPrivate(this);
-        otherfp->flags_ &= ~JSFRAME_HAS_CALL_OBJ;
-        if (js_IsNamedLambda(fun())) {
-            JSObject *env = obj.getParent();
-            JS_ASSERT(env->getClass() == &js_DeclEnvClass);
-            env->setPrivate(this);
-        }
-    }
-    if (hasArgsObj()) {
-        JSObject &args = argsObj();
-        JS_ASSERT(args.isArguments());
-        if (args.isNormalArguments())
-            args.setPrivate(this);
-        else
-            JS_ASSERT(!args.getPrivate());
-        otherfp->flags_ &= ~JSFRAME_HAS_ARGS_OBJ;
-    }
-}
-
-inline js::Value &
-JSStackFrame::canonicalActualArg(uintN i) const
-{
-    if (i < numFormalArgs())
-        return formalArg(i);
-    JS_ASSERT(i < numActualArgs());
-    return actualArgs()[i];
-}
-
-template <class Op>
-inline bool
-JSStackFrame::forEachCanonicalActualArg(Op op)
-{
-    uintN nformal = fun()->nargs;
-    js::Value *formals = formalArgsEnd() - nformal;
-    uintN nactual = numActualArgs();
-    if (nactual <= nformal) {
-        uintN i = 0;
-        js::Value *actualsEnd = formals + nactual;
-        for (js::Value *p = formals; p != actualsEnd; ++p, ++i) {
-            if (!op(i, p))
-                return false;
-        }
-    } else {
-        uintN i = 0;
-        js::Value *formalsEnd = formalArgsEnd();
-        for (js::Value *p = formals; p != formalsEnd; ++p, ++i) {
-            if (!op(i, p))
-                return false;
-        }
-        js::Value *actuals = formalsEnd - (nactual + 2);
-        js::Value *actualsEnd = formals - 2;
-        for (js::Value *p = actuals; p != actualsEnd; ++p, ++i) {
-            if (!op(i, p))
-                return false;
-        }
-    }
-    return true;
-}
-
-template <class Op>
-inline bool
-JSStackFrame::forEachFormalArg(Op op)
-{
-    js::Value *formals = formalArgsEnd() - fun()->nargs;
-    js::Value *formalsEnd = formalArgsEnd();
-    uintN i = 0;
-    for (js::Value *p = formals; p != formalsEnd; ++p, ++i) {
-        if (!op(i, p))
-            return false;
-    }
-    return true;
-}
-
-namespace js {
-
-struct CopyTo
-{
-    Value *dst;
-    CopyTo(Value *dst) : dst(dst) {}
-    bool operator()(uintN, Value *src) {
-        *dst++ = *src;
-        return true;
-    }
-};
-
-}
-
-JS_ALWAYS_INLINE void
-JSStackFrame::clearMissingArgs()
-{
-    if (flags_ & JSFRAME_UNDERFLOW_ARGS)
-        SetValueRangeToUndefined(formalArgs() + numActualArgs(), formalArgsEnd());
-}
-
-inline JSObject &
-JSStackFrame::varobj(js::StackSegment *seg) const
-{
-    JS_ASSERT(seg->contains(this));
-    return isFunctionFrame() ? callObj() : seg->getInitialVarObj();
-}
-
-inline JSObject &
-JSStackFrame::varobj(JSContext *cx) const
-{
-    JS_ASSERT(cx->activeSegment()->contains(this));
-    return isFunctionFrame() ? callObj() : cx->activeSegment()->getInitialVarObj();
-}
-
-inline uintN
-JSStackFrame::numActualArgs() const
-{
-    JS_ASSERT(hasArgs());
-    if (JS_UNLIKELY(flags_ & (JSFRAME_OVERFLOW_ARGS | JSFRAME_UNDERFLOW_ARGS)))
-        return hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
-    return numFormalArgs();
-}
-
-inline js::Value *
-JSStackFrame::actualArgs() const
-{
-    JS_ASSERT(hasArgs());
-    js::Value *argv = formalArgs();
-    if (JS_UNLIKELY(flags_ & JSFRAME_OVERFLOW_ARGS)) {
-        uintN nactual = hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
-        return argv - (2 + nactual);
-    }
-    return argv;
-}
-
-inline js::Value *
-JSStackFrame::actualArgsEnd() const
-{
-    JS_ASSERT(hasArgs());
-    if (JS_UNLIKELY(flags_ & JSFRAME_OVERFLOW_ARGS))
-        return formalArgs() - 2;
-    return formalArgs() + numActualArgs();
-}
-
-inline void
-JSStackFrame::setArgsObj(JSObject &obj)
-{
-    JS_ASSERT_IF(hasArgsObj(), &obj == args.obj);
-    JS_ASSERT_IF(!hasArgsObj(), numActualArgs() == obj.getArgsInitialLength());
-    args.obj = &obj;
-    flags_ |= JSFRAME_HAS_ARGS_OBJ;
-}
-
-inline void
-JSStackFrame::setScopeChainNoCallObj(JSObject &obj)
-{
-#ifdef DEBUG
-    JS_ASSERT(&obj != NULL);
-    if (&obj != sInvalidScopeChain) {
-        if (hasCallObj()) {
-            JSObject *pobj = &obj;
-            while (pobj && pobj->getPrivate() != this)
-                pobj = pobj->getParent();
-            JS_ASSERT(pobj);
-        } else {
-            for (JSObject *pobj = &obj; pobj; pobj = pobj->getParent())
-                JS_ASSERT_IF(pobj->isCall(), pobj->getPrivate() != this);
-        }
-    }
-#endif
-    scopeChain_ = &obj;
-    flags_ |= JSFRAME_HAS_SCOPECHAIN;
-}
-
-inline void
-JSStackFrame::setScopeChainWithOwnCallObj(JSObject &obj)
-{
-    JS_ASSERT(&obj != NULL);
-    JS_ASSERT(!hasCallObj() && obj.isCall() && obj.getPrivate() == this);
-    scopeChain_ = &obj;
-    flags_ |= JSFRAME_HAS_SCOPECHAIN | JSFRAME_HAS_CALL_OBJ;
-}
-
-inline JSObject &
-JSStackFrame::callObj() const
-{
-    JS_ASSERT_IF(isNonEvalFunctionFrame() || isStrictEvalFrame(), hasCallObj());
-
-    JSObject *pobj = &scopeChain();
-    while (JS_UNLIKELY(pobj->getClass() != &js_CallClass)) {
-        JS_ASSERT(js::IsCacheableNonGlobalScope(pobj) || pobj->isWith());
-        pobj = pobj->getParent();
-    }
-    return *pobj;
-}
-
-inline void
-JSStackFrame::markActivationObjectsAsPut()
-{
-    if (flags_ & (JSFRAME_HAS_ARGS_OBJ | JSFRAME_HAS_CALL_OBJ)) {
-        if (hasArgsObj() && !argsObj().getPrivate()) {
-            args.nactual = args.obj->getArgsInitialLength();
-            flags_ &= ~JSFRAME_HAS_ARGS_OBJ;
-        }
-        if (hasCallObj() && !callObj().getPrivate()) {
-            /*
-             * For function frames, the call object may or may not have have an
-             * enclosing DeclEnv object, so we use the callee's parent, since
-             * it was the initial scope chain. For global (strict) eval frames,
-             * there is no calle, but the call object's parent is the initial
-             * scope chain.
-             */
-            scopeChain_ = isFunctionFrame()
-                          ? callee().getParent()
-                          : scopeChain_->getParent();
-            flags_ &= ~JSFRAME_HAS_CALL_OBJ;
-        }
-    }
-}
+#include "vm/Stack-inl.h"
 
 namespace js {
 
@@ -548,12 +130,11 @@ InvokeSessionGuard::invoke(JSContext *cx) const
 #else
     if (!optimized())
 #endif
-        return Invoke(cx, args_, 0);
+        return Invoke(cx, args_);
 
     /* Clear any garbage left from the last Invoke. */
-    JSStackFrame *fp = frame_.fp();
+    StackFrame *fp = frame_.fp();
     fp->clearMissingArgs();
-    PutActivationObjects(cx, frame_.fp());
     fp->resetInvokeCallFrame();
     SetValueRangeToUndefined(fp->slots(), script_->nfixed);
 
@@ -563,7 +144,7 @@ InvokeSessionGuard::invoke(JSContext *cx) const
         Probes::enterJSFun(cx, fp->fun(), script_);
 #ifdef JS_METHODJIT
         ok = mjit::EnterMethodJIT(cx, fp, code, stackLimit_);
-        cx->regs->pc = stop_;
+        cx->regs().pc = stop_;
 #else
         cx->regs->pc = script_->code;
         ok = Interpret(cx, cx->fp());
@@ -606,7 +187,7 @@ class PrimitiveBehavior<double> {
 } // namespace detail
 
 template <typename T>
-bool
+inline bool
 GetPrimitiveThis(JSContext *cx, Value *vp, T *v)
 {
     typedef detail::PrimitiveBehavior<T> Behavior;
@@ -704,7 +285,7 @@ ComputeImplicitThis(JSContext *cx, JSObject *obj, const Value &funval, Value *vp
 }
 
 inline bool
-ComputeThis(JSContext *cx, JSStackFrame *fp)
+ComputeThis(JSContext *cx, StackFrame *fp)
 {
     Value &thisv = fp->thisValue();
     if (thisv.isObject())
@@ -761,7 +342,7 @@ ValuePropertyBearer(JSContext *cx, const Value &v, int spindex)
 }
 
 inline bool
-ScriptPrologue(JSContext *cx, JSStackFrame *fp)
+ScriptPrologue(JSContext *cx, StackFrame *fp)
 {
     JS_ASSERT_IF(fp->isNonEvalFunctionFrame() && fp->fun()->isHeavyweight(), fp->hasCallObj());
 
@@ -778,7 +359,7 @@ ScriptPrologue(JSContext *cx, JSStackFrame *fp)
 }
 
 inline bool
-ScriptEpilogue(JSContext *cx, JSStackFrame *fp, bool ok)
+ScriptEpilogue(JSContext *cx, StackFrame *fp, bool ok)
 {
     if (cx->compartment->debugMode)
         ok = ScriptDebugEpilogue(cx, fp, ok);
@@ -797,7 +378,7 @@ ScriptEpilogue(JSContext *cx, JSStackFrame *fp, bool ok)
 }
 
 inline bool
-ScriptPrologueOrGeneratorResume(JSContext *cx, JSStackFrame *fp)
+ScriptPrologueOrGeneratorResume(JSContext *cx, StackFrame *fp)
 {
     if (!fp->isGeneratorFrame())
         return ScriptPrologue(cx, fp);
@@ -807,7 +388,7 @@ ScriptPrologueOrGeneratorResume(JSContext *cx, JSStackFrame *fp)
 }
 
 inline bool
-ScriptEpilogueOrGeneratorYield(JSContext *cx, JSStackFrame *fp, bool ok)
+ScriptEpilogueOrGeneratorYield(JSContext *cx, StackFrame *fp, bool ok)
 {
     if (!fp->isYielding())
         return ScriptEpilogue(cx, fp, ok);
@@ -816,6 +397,6 @@ ScriptEpilogueOrGeneratorYield(JSContext *cx, JSStackFrame *fp, bool ok)
     return ok;
 }
 
-}
+}  /* namespace js */
 
 #endif /* jsinterpinlines_h__ */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 1f312571ced3..0b4da51ce94e 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -65,6 +65,7 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsproxy.h"
+#include "jsscan.h"
 #include "jsscope.h"
 #include "jsscript.h"
 #include "jsstaticcheck.h"
@@ -74,11 +75,11 @@
 #include "jsxml.h"
 #endif
 
-#include "jscntxtinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
@@ -1091,7 +1092,7 @@ generator_trace(JSTracer *trc, JSObject *obj)
     if (gen->state == JSGEN_RUNNING || gen->state == JSGEN_CLOSING)
         return;
 
-    JSStackFrame *fp = gen->floatingFrame();
+    StackFrame *fp = gen->floatingFrame();
     JS_ASSERT(gen->liveFrame() == fp);
 
     /*
@@ -1134,17 +1135,10 @@ Class js_GeneratorClass = {
     }
 };
 
-static inline void
-RebaseRegsFromTo(JSFrameRegs *regs, JSStackFrame *from, JSStackFrame *to)
-{
-    regs->fp = to;
-    regs->sp = to->slots() + (regs->sp - from->slots());
-}
-
 /*
  * Called from the JSOP_GENERATOR case in the interpreter, with fp referring
  * to the frame by which the generator function was activated.  Create a new
- * JSGenerator object, which contains its own JSStackFrame that we populate
+ * JSGenerator object, which contains its own StackFrame that we populate
  * from *fp.  We know that upon return, the JSOP_GENERATOR opcode will return
  * from the activation in fp, so we can steal away fp->callobj and fp->argsobj
  * if they are non-null.
@@ -1156,8 +1150,8 @@ js_NewGenerator(JSContext *cx)
     if (!obj)
         return NULL;
 
-    JSStackFrame *stackfp = cx->fp();
-    JS_ASSERT(stackfp->base() == cx->regs->sp);
+    StackFrame *stackfp = cx->fp();
+    JS_ASSERT(stackfp->base() == cx->regs().sp);
     JS_ASSERT(stackfp->actualArgs() <= stackfp->formalArgs());
 
     /* Load and compute stack slot counts. */
@@ -1177,7 +1171,7 @@ js_NewGenerator(JSContext *cx)
 
     /* Cut up floatingStack space. */
     Value *genvp = gen->floatingStack;
-    JSStackFrame *genfp = reinterpret_cast<JSStackFrame *>(genvp + vplen);
+    StackFrame *genfp = reinterpret_cast<StackFrame *>(genvp + vplen);
 
     /* Initialize JSGenerator. */
     gen->obj = obj;
@@ -1186,11 +1180,11 @@ js_NewGenerator(JSContext *cx)
     gen->floating = genfp;
 
     /* Initialize regs stored in generator. */
-    gen->regs = *cx->regs;
-    RebaseRegsFromTo(&gen->regs, stackfp, genfp);
+    gen->regs = cx->regs();
+    gen->regs.rebaseFromTo(stackfp, genfp);
 
     /* Copy frame off the stack. */
-    genfp->stealFrameAndSlots(genvp, stackfp, stackvp, cx->regs->sp);
+    genfp->stealFrameAndSlots(genvp, stackfp, stackvp, cx->regs().sp);
     genfp->initFloatingGenerator();
 
     obj->setPrivate(gen);
@@ -1198,7 +1192,7 @@ js_NewGenerator(JSContext *cx)
 }
 
 JSGenerator *
-js_FloatingFrameToGenerator(JSStackFrame *fp)
+js_FloatingFrameToGenerator(StackFrame *fp)
 {
     JS_ASSERT(fp->isGeneratorFrame() && fp->isFloatingGenerator());
     char *floatingStackp = (char *)(fp->actualArgs() - 2);
@@ -1258,11 +1252,11 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
         break;
     }
 
-    JSStackFrame *genfp = gen->floatingFrame();
+    StackFrame *genfp = gen->floatingFrame();
     Value *genvp = gen->floatingStack;
     uintN vplen = genfp->formalArgsEnd() - genvp;
 
-    JSStackFrame *stackfp;
+    StackFrame *stackfp;
     Value *stackvp;
     JSBool ok;
     {
@@ -1271,7 +1265,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
          * the code before pushExecuteFrame must not reenter the interpreter.
          */
         GeneratorFrameGuard frame;
-        if (!cx->stack().getGeneratorFrame(cx, vplen, genfp->numSlots(), &frame)) {
+        if (!cx->stack.getGeneratorFrame(cx, vplen, genfp->numSlots(), &frame)) {
             gen->state = JSGEN_CLOSED;
             return JS_FALSE;
         }
@@ -1282,11 +1276,11 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
         stackfp->stealFrameAndSlots(stackvp, genfp, genvp, gen->regs.sp);
         stackfp->resetGeneratorPrev(cx);
         stackfp->unsetFloatingGenerator();
-        RebaseRegsFromTo(&gen->regs, genfp, stackfp);
+        gen->regs.rebaseFromTo(genfp, stackfp);
         MUST_FLOW_THROUGH("restore");
 
         /* Officially push frame. frame's destructor pops. */
-        cx->stack().pushGeneratorFrame(cx, &gen->regs, &frame);
+        cx->stack.pushGeneratorFrame(gen->regs, &frame);
 
         cx->enterGenerator(gen);   /* OOM check above. */
         JSObject *enumerators = cx->enumerators;
@@ -1306,7 +1300,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, JSObject *obj,
         genfp->setFloatingGenerator();
     }
     MUST_FLOW_LABEL(restore)
-    RebaseRegsFromTo(&gen->regs, stackfp, genfp);
+    gen->regs.rebaseFromTo(stackfp, genfp);
 
     if (gen->floatingFrame()->isYielding()) {
         /* Yield cannot fail, throw or be called on closing. */
diff --git a/js/src/jsiter.h b/js/src/jsiter.h
index 9ae01d356f45..41086e0dbe59 100644
--- a/js/src/jsiter.h
+++ b/js/src/jsiter.h
@@ -181,19 +181,19 @@ typedef enum JSGeneratorState {
 struct JSGenerator {
     JSObject            *obj;
     JSGeneratorState    state;
-    JSFrameRegs         regs;
+    js::FrameRegs       regs;
     JSObject            *enumerators;
-    JSStackFrame        *floating;
+    js::StackFrame      *floating;
     js::Value           floatingStack[1];
 
-    JSStackFrame *floatingFrame() {
+    js::StackFrame *floatingFrame() {
         return floating;
     }
 
-    JSStackFrame *liveFrame() {
+    js::StackFrame *liveFrame() {
         JS_ASSERT((state == JSGEN_RUNNING || state == JSGEN_CLOSING) ==
-                  (regs.fp != floatingFrame()));
-        return regs.fp;
+                  (regs.fp() != floatingFrame()));
+        return regs.fp();
     }
 };
 
@@ -211,10 +211,10 @@ js_NewGenerator(JSContext *cx);
  * Block and With objects must "normalize" to and from the floating/live frames
  * in the case of generators using the following functions.
  */
-inline JSStackFrame *
-js_FloatingFrameIfGenerator(JSContext *cx, JSStackFrame *fp)
+inline js::StackFrame *
+js_FloatingFrameIfGenerator(JSContext *cx, js::StackFrame *fp)
 {
-    JS_ASSERT(cx->stack().contains(fp));
+    JS_ASSERT(cx->stack.contains(fp));
     if (JS_UNLIKELY(fp->isGeneratorFrame()))
         return cx->generatorFor(fp)->floatingFrame();
     return fp;
@@ -222,10 +222,10 @@ js_FloatingFrameIfGenerator(JSContext *cx, JSStackFrame *fp)
 
 /* Given a floating frame, given the JSGenerator containing it. */
 extern JSGenerator *
-js_FloatingFrameToGenerator(JSStackFrame *fp);
+js_FloatingFrameToGenerator(js::StackFrame *fp);
 
-inline JSStackFrame *
-js_LiveFrameIfGenerator(JSStackFrame *fp)
+inline js::StackFrame *
+js_LiveFrameIfGenerator(js::StackFrame *fp)
 {
     return fp->isGeneratorFrame() ? js_FloatingFrameToGenerator(fp)->liveFrame() : fp;
 }
diff --git a/js/src/jslock.h b/js/src/jslock.h
index e62b393f3949..909871c81e10 100644
--- a/js/src/jslock.h
+++ b/js/src/jslock.h
@@ -81,7 +81,7 @@ typedef struct JSThinLock {
     JSFatLock   *fat;
 } JSThinLock;
 
-#define CX_THINLOCK_ID(cx)       ((jsword)(cx)->thread)
+#define CX_THINLOCK_ID(cx)       ((jsword)(cx)->thread())
 #define CURRENT_THREAD_IS_ME(me) (((JSThread *)me)->id == js_CurrentThreadId())
 
 typedef PRLock JSLock;
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 91ad0ee2a74e..98a5848e0390 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -959,7 +959,7 @@ EvalCacheHash(JSContext *cx, JSLinearString *str)
 }
 
 static JS_ALWAYS_INLINE JSScript *
-EvalCacheLookup(JSContext *cx, JSLinearString *str, JSStackFrame *caller, uintN staticLevel,
+EvalCacheLookup(JSContext *cx, JSLinearString *str, StackFrame *caller, uintN staticLevel,
                 JSPrincipals *principals, JSObject &scopeobj, JSScript **bucket)
 {
     /*
@@ -1082,7 +1082,7 @@ class EvalScriptGuard
         }
     }
 
-    void lookupInEvalCache(JSStackFrame *caller, uintN staticLevel,
+    void lookupInEvalCache(StackFrame *caller, uintN staticLevel,
                            JSPrincipals *principals, JSObject &scopeobj) {
         if (JSScript *found = EvalCacheLookup(cx_, str_, caller, staticLevel,
                                               principals, scopeobj, bucket_)) {
@@ -1120,7 +1120,7 @@ class EvalScriptGuard
 enum EvalType { DIRECT_EVAL, INDIRECT_EVAL };
 
 static bool
-EvalKernel(JSContext *cx, const CallArgs &call, EvalType evalType, JSStackFrame *caller,
+EvalKernel(JSContext *cx, const CallArgs &call, EvalType evalType, StackFrame *caller,
            JSObject &scopeobj)
 {
     JS_ASSERT((evalType == INDIRECT_EVAL) == (caller == NULL));
@@ -1235,7 +1235,7 @@ EvalKernel(JSContext *cx, const CallArgs &call, EvalType evalType, JSStackFrame
         esg.setNewScript(compiled);
     }
 
-    return Execute(cx, scopeobj, esg.script(), caller, JSFRAME_EVAL, &call.rval());
+    return Execute(cx, scopeobj, esg.script(), caller, StackFrame::EVAL, &call.rval());
 }
 
 /*
@@ -1247,7 +1247,7 @@ static inline bool
 WarnOnTooManyArgs(JSContext *cx, const CallArgs &call)
 {
     if (call.argc() > 1) {
-        if (JSStackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
+        if (StackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
             if (!caller->script()->warnedAboutTwoArgumentEval) {
                 static const char TWO_ARGUMENT_WARNING[] =
                     "Support for eval(code, scopeObject) has been removed. "
@@ -1286,10 +1286,10 @@ bool
 DirectEval(JSContext *cx, const CallArgs &call)
 {
     /* Direct eval can assume it was called from an interpreted frame. */
-    JSStackFrame *caller = cx->fp();
+    StackFrame *caller = cx->fp();
     JS_ASSERT(caller->isScriptFrame());
     JS_ASSERT(IsBuiltinEvalForScope(&caller->scopeChain(), call.calleev()));
-    JS_ASSERT(*cx->regs->pc == JSOP_EVAL);
+    JS_ASSERT(*cx->regs().pc == JSOP_EVAL);
 
     AutoFunctionCallProbe callProbe(cx, call.callee().getFunctionPrivate(), caller->script());
 
@@ -1339,8 +1339,8 @@ PrincipalsForCompiledCode(const CallArgs &call, JSContext *cx)
 
 #ifdef DEBUG
     if (calleePrincipals) {
-        if (JSStackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
-            if (JSPrincipals *callerPrincipals = caller->principals(cx)) {
+        if (StackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
+            if (JSPrincipals *callerPrincipals = caller->scopeChain().principals(cx)) {
                 JS_ASSERT(callerPrincipals->subsume(callerPrincipals, calleePrincipals));
             }
         }
@@ -1360,8 +1360,8 @@ obj_watch_handler(JSContext *cx, JSObject *obj, jsid id, jsval old,
 {
     JSObject *callable = (JSObject *) closure;
     if (JSPrincipals *watcher = callable->principals(cx)) {
-        if (JSStackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
-            if (JSPrincipals *subject = caller->principals(cx)) {
+        if (StackFrame *caller = js_GetScriptedCaller(cx, NULL)) {
+            if (JSPrincipals *subject = caller->scopeChain().principals(cx)) {
                 if (!watcher->subsume(watcher, subject)) {
                     /* Silently don't call the watch handler. */
                     return JS_TRUE;
@@ -3110,8 +3110,8 @@ js_InferFlags(JSContext *cx, uintN defaultFlags)
     uint32 format;
     uintN flags = 0;
 
-    JSStackFrame *const fp = js_GetTopStackFrame(cx);
-    if (!fp || !(pc = cx->regs->pc))
+    StackFrame *const fp = js_GetTopStackFrame(cx);
+    if (!fp || !(pc = cx->regs().pc))
         return defaultFlags;
     cs = &js_CodeSpec[js_GetOpcode(cx, fp->script(), pc)];
     format = cs->format;
@@ -3239,7 +3239,7 @@ js_NewWithObject(JSContext *cx, JSObject *proto, JSObject *parent, jsint depth)
     if (!obj)
         return NULL;
 
-    JSStackFrame *priv = js_FloatingFrameIfGenerator(cx, cx->fp());
+    StackFrame *priv = js_FloatingFrameIfGenerator(cx, cx->fp());
 
     EmptyShape *emptyWithShape = EmptyShape::getEmptyWithShape(cx);
     if (!emptyWithShape)
@@ -3281,7 +3281,7 @@ js_NewBlockObject(JSContext *cx)
 }
 
 JSObject *
-js_CloneBlockObject(JSContext *cx, JSObject *proto, JSStackFrame *fp)
+js_CloneBlockObject(JSContext *cx, JSObject *proto, StackFrame *fp)
 {
     JS_ASSERT(proto->isStaticBlock());
 
@@ -3292,7 +3292,7 @@ js_CloneBlockObject(JSContext *cx, JSObject *proto, JSStackFrame *fp)
     if (!clone)
         return NULL;
 
-    JSStackFrame *priv = js_FloatingFrameIfGenerator(cx, fp);
+    StackFrame *priv = js_FloatingFrameIfGenerator(cx, fp);
 
     /* The caller sets parent on its own. */
     clone->initClonedBlock(cx, proto, priv);
@@ -3309,7 +3309,7 @@ js_CloneBlockObject(JSContext *cx, JSObject *proto, JSStackFrame *fp)
 JS_REQUIRES_STACK JSBool
 js_PutBlockObject(JSContext *cx, JSBool normalUnwind)
 {
-    JSStackFrame *const fp = cx->fp();
+    StackFrame *const fp = cx->fp();
     JSObject *obj = &fp->scopeChain();
     JS_ASSERT(obj->isClonedBlock());
     JS_ASSERT(obj->getPrivate() == js_FloatingFrameIfGenerator(cx, cx->fp()));
@@ -3320,8 +3320,8 @@ js_PutBlockObject(JSContext *cx, JSBool normalUnwind)
 
     /* The block and its locals must be on the current stack for GC safety. */
     uintN depth = OBJ_BLOCK_DEPTH(cx, obj);
-    JS_ASSERT(depth <= size_t(cx->regs->sp - fp->base()));
-    JS_ASSERT(count <= size_t(cx->regs->sp - fp->base() - depth));
+    JS_ASSERT(depth <= size_t(cx->regs().sp - fp->base()));
+    JS_ASSERT(count <= size_t(cx->regs().sp - fp->base() - depth));
 
     /* See comments in CheckDestructuring from jsparse.cpp. */
     JS_ASSERT(count >= 1);
@@ -3350,7 +3350,7 @@ block_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     uintN index = (uintN) JSID_TO_INT(id);
     JS_ASSERT(index < OBJ_BLOCK_COUNT(cx, obj));
 
-    JSStackFrame *fp = (JSStackFrame *) obj->getPrivate();
+    StackFrame *fp = (StackFrame *) obj->getPrivate();
     if (fp) {
         fp = js_LiveFrameIfGenerator(fp);
         index += fp->numFixed() + OBJ_BLOCK_DEPTH(cx, obj);
@@ -3371,7 +3371,7 @@ block_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *v
     uintN index = (uintN) JSID_TO_INT(id);
     JS_ASSERT(index < OBJ_BLOCK_COUNT(cx, obj));
 
-    JSStackFrame *fp = (JSStackFrame *) obj->getPrivate();
+    StackFrame *fp = (StackFrame *) obj->getPrivate();
     if (fp) {
         fp = js_LiveFrameIfGenerator(fp);
         index += fp->numFixed() + OBJ_BLOCK_DEPTH(cx, obj);
@@ -4227,7 +4227,7 @@ JSBool
 js_FindClassObject(JSContext *cx, JSObject *start, JSProtoKey protoKey,
                    Value *vp, Class *clasp)
 {
-    JSStackFrame *fp;
+    StackFrame *fp;
     JSObject *obj, *cobj, *pobj;
     jsid id;
     JSProperty *prop;
@@ -4945,7 +4945,7 @@ js_LookupPropertyWithFlagsInline(JSContext *cx, JSObject *obj, jsid id, uintN fl
              * Non-native objects must have either non-native lookup results,
              * or else native results from the non-native's prototype chain.
              *
-             * See JSStackFrame::getValidCalleeObject, where we depend on this
+             * See StackFrame::getValidCalleeObject, where we depend on this
              * fact to force a prototype-delegated joined method accessed via
              * arguments.callee through the delegating |this| object's method
              * read barrier.
@@ -5459,7 +5459,7 @@ js_GetMethod(JSContext *cx, JSObject *obj, jsid id, uintN getHow, Value *vp)
 JS_FRIEND_API(bool)
 js_CheckUndeclaredVarAssignment(JSContext *cx, JSString *propname)
 {
-    JSStackFrame *const fp = js_GetTopStackFrame(cx);
+    StackFrame *const fp = js_GetTopStackFrame(cx);
     if (!fp)
         return true;
 
@@ -5873,7 +5873,7 @@ js_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, Value *rval, JSBool str
                 JSFunction *fun = GET_FUNCTION_PRIVATE(cx, funobj);
 
                 if (fun != funobj) {
-                    for (JSStackFrame *fp = cx->maybefp(); fp; fp = fp->prev()) {
+                    for (StackFrame *fp = cx->maybefp(); fp; fp = fp->prev()) {
                         if (fp->isFunctionFrame() &&
                             fp->callee() == fun->compiledFunObj() &&
                             fp->thisValue().isObject())
@@ -6157,7 +6157,7 @@ js_GetClassPrototype(JSContext *cx, JSObject *scopeobj, JSProtoKey protoKey,
 
     if (protoKey != JSProto_Null) {
         if (!scopeobj) {
-            if (cx->hasfp())
+            if (cx->running())
                 scopeobj = &cx->fp()->scopeChain();
             if (!scopeobj) {
                 scopeobj = cx->globalObject;
@@ -6858,7 +6858,7 @@ MaybeDumpValue(const char *name, const Value &v)
 }
 
 JS_FRIEND_API(void)
-js_DumpStackFrame(JSContext *cx, JSStackFrame *start)
+js_DumpStackFrame(JSContext *cx, StackFrame *start)
 {
     /* This should only called during live debugging. */
     VOUCH_DOES_NOT_REQUIRE_STACK();
@@ -6875,9 +6875,9 @@ js_DumpStackFrame(JSContext *cx, JSStackFrame *start)
     }
 
     for (; !i.done(); ++i) {
-        JSStackFrame *const fp = i.fp();
+        StackFrame *const fp = i.fp();
 
-        fprintf(stderr, "JSStackFrame at %p\n", (void *) fp);
+        fprintf(stderr, "StackFrame at %p\n", (void *) fp);
         if (fp->isFunctionFrame()) {
             fprintf(stderr, "callee fun: ");
             dumpValue(ObjectValue(fp->callee()));
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 6ea319198ed5..648b8e62a2db 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -477,7 +477,7 @@ struct JSObject : js::gc::Cell {
 
     /* Functions for setting up scope chain object maps and shapes. */
     void initCall(JSContext *cx, const js::Bindings &bindings, JSObject *parent);
-    void initClonedBlock(JSContext *cx, JSObject *proto, JSStackFrame *priv);
+    void initClonedBlock(JSContext *cx, JSObject *proto, js::StackFrame *priv);
     void setBlockOwnShape(JSContext *cx);
 
     void deletingShapeChange(JSContext *cx, const js::Shape &shape);
@@ -916,7 +916,7 @@ struct JSObject : js::gc::Cell {
     inline bool callIsForEval() const;
 
     /* The stack frame for this Call object, if the frame is still active. */
-    inline JSStackFrame *maybeCallObjStackFrame() const;
+    inline js::StackFrame *maybeCallObjStackFrame() const;
 
     /*
      * The callee function if this Call object was created for a function
@@ -1416,7 +1416,7 @@ inline bool JSObject::isBlock() const  { return getClass() == &js_BlockClass; }
 /*
  * Block scope object macros.  The slots reserved by js_BlockClass are:
  *
- *   private              JSStackFrame *    active frame pointer or null
+ *   private              StackFrame *      active frame pointer or null
  *   JSSLOT_BLOCK_DEPTH   int               depth of block slots in frame
  *
  * After JSSLOT_BLOCK_DEPTH come one or more slots for the block locals.
@@ -1424,7 +1424,7 @@ inline bool JSObject::isBlock() const  { return getClass() == &js_BlockClass; }
  * A With object is like a Block object, in that both have one reserved slot
  * telling the stack depth of the relevant slots (the slot whose value is the
  * object named in the with statement, the slots containing the block's local
- * variables); and both have a private slot referring to the JSStackFrame in
+ * variables); and both have a private slot referring to the StackFrame in
  * whose activation they were created (or null if the with or block object
  * outlives the frame).
  */
@@ -1480,7 +1480,7 @@ extern JSObject *
 js_NewBlockObject(JSContext *cx);
 
 extern JSObject *
-js_CloneBlockObject(JSContext *cx, JSObject *proto, JSStackFrame *fp);
+js_CloneBlockObject(JSContext *cx, JSObject *proto, js::StackFrame *fp);
 
 extern JS_REQUIRES_STACK JSBool
 js_PutBlockObject(JSContext *cx, JSBool normalUnwind);
@@ -1912,7 +1912,7 @@ JS_FRIEND_API(void) js_DumpAtom(JSAtom *atom);
 JS_FRIEND_API(void) js_DumpObject(JSObject *obj);
 JS_FRIEND_API(void) js_DumpValue(const js::Value &val);
 JS_FRIEND_API(void) js_DumpId(jsid id);
-JS_FRIEND_API(void) js_DumpStackFrame(JSContext *cx, JSStackFrame *start = NULL);
+JS_FRIEND_API(void) js_DumpStackFrame(JSContext *cx, js::StackFrame *start = NULL);
 #endif
 
 extern uintN
@@ -1922,7 +1922,6 @@ js_InferFlags(JSContext *cx, uintN defaultFlags);
 JSBool
 js_Object(JSContext *cx, uintN argc, js::Value *vp);
 
-
 namespace js {
 
 extern bool
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 7b70d47cf58d..4d45959307d1 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -169,7 +169,7 @@ JSObject::initCall(JSContext *cx, const js::Bindings &bindings, JSObject *parent
  * shape.
  */
 inline void
-JSObject::initClonedBlock(JSContext *cx, JSObject *proto, JSStackFrame *frame)
+JSObject::initClonedBlock(JSContext *cx, JSObject *proto, js::StackFrame *frame)
 {
     init(cx, &js_BlockClass, proto, NULL, frame, false);
 
@@ -509,11 +509,11 @@ JSObject::callIsForEval() const
     return getSlot(JSSLOT_CALL_CALLEE).isNull();
 }
 
-inline JSStackFrame *
+inline js::StackFrame *
 JSObject::maybeCallObjStackFrame() const
 {
     JS_ASSERT(isCall());
-    return reinterpret_cast<JSStackFrame *>(getPrivate());
+    return reinterpret_cast<js::StackFrame *>(getPrivate());
 }
 
 inline void
@@ -881,12 +881,6 @@ JSObject::principals(JSContext *cx)
     return compPrincipals;
 }
 
-inline JSPrincipals *
-JSStackFrame::principals(JSContext *cx) const
-{
-    return scopeChain().principals(cx);
-}
-
 inline uint32
 JSObject::slotSpan() const
 {
@@ -1222,7 +1216,7 @@ NewBuiltinClassInstance(JSContext *cx, Class *clasp, gc::FinalizeKind kind)
 
     /* NB: inline-expanded and specialized version of js_GetClassPrototype. */
     JSObject *global;
-    if (!cx->hasfp()) {
+    if (!cx->running()) {
         global = cx->globalObject;
         OBJ_TO_INNER_OBJECT(cx, global);
         if (!global)
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 8271ccfabd86..98f1f104da70 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -67,6 +67,8 @@
 #include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
@@ -336,14 +338,14 @@ PreprocessValue(JSContext *cx, JSObject *holder, jsid key, Value *vp, StringifyC
 
             LeaveTrace(cx);
             InvokeArgsGuard args;
-            if (!cx->stack().pushInvokeArgs(cx, 1, &args))
+            if (!cx->stack.pushInvokeArgs(cx, 1, &args))
                 return false;
 
             args.calleev() = toJSON;
             args.thisv() = *vp;
             args[0] = StringValue(keyStr);
 
-            if (!Invoke(cx, args, 0))
+            if (!Invoke(cx, args))
                 return false;
             *vp = args.rval();
         }
@@ -359,7 +361,7 @@ PreprocessValue(JSContext *cx, JSObject *holder, jsid key, Value *vp, StringifyC
 
         LeaveTrace(cx);
         InvokeArgsGuard args;
-        if (!cx->stack().pushInvokeArgs(cx, 2, &args))
+        if (!cx->stack.pushInvokeArgs(cx, 2, &args))
             return false;
 
         args.calleev() = ObjectValue(*scx->replacer);
@@ -367,7 +369,7 @@ PreprocessValue(JSContext *cx, JSObject *holder, jsid key, Value *vp, StringifyC
         args[0] = StringValue(keyStr);
         args[1] = *vp;
 
-        if (!Invoke(cx, args, 0))
+        if (!Invoke(cx, args))
             return false;
         *vp = args.rval();
     }
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 764d43e65d43..74fa354cdc35 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -72,7 +72,6 @@
 #include "jsstaticcheck.h"
 #include "jsvector.h"
 
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 #include "jscntxtinlines.h"
@@ -311,7 +310,7 @@ js_DumpPC(JSContext *cx)
     void *mark = JS_ARENA_MARK(&cx->tempPool);
     Sprinter sprinter;
     INIT_SPRINTER(cx, &sprinter, &cx->tempPool, 0);
-    JSBool ok = js_DisassembleAtPC(cx, cx->fp()->script(), true, cx->regs->pc, &sprinter);
+    JSBool ok = js_DisassembleAtPC(cx, cx->fp()->script(), true, cx->regs().pc, &sprinter);
     fprintf(stdout, "%s", sprinter.base);
     JS_ARENA_RELEASE(&cx->tempPool, mark);
     return ok;
@@ -2053,7 +2052,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
         token = CodeToken[op];
 
         if (pc + oplen == jp->dvgfence) {
-            JSStackFrame *fp;
+            StackFrame *fp;
             uint32 format, mode, type;
 
             /*
@@ -2915,7 +2914,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                      * object that's not a constructor, causing us to be
                      * called with an intervening frame on the stack.
                      */
-                    JSStackFrame *fp = js_GetTopStackFrame(cx);
+                    StackFrame *fp = js_GetTopStackFrame(cx);
                     if (fp) {
                         while (!fp->isEvalFrame())
                             fp = fp->prev();
@@ -5088,7 +5087,7 @@ char *
 js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v_in,
                            JSString *fallback)
 {
-    JSStackFrame *fp;
+    StackFrame *fp;
     JSScript *script;
     jsbytecode *pc;
 
@@ -5100,12 +5099,12 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v_in,
 
     LeaveTrace(cx);
     
-    if (!cx->regs || !cx->regs->fp || !cx->regs->fp->isScriptFrame())
+    if (!cx->running() || !cx->fp()->isScriptFrame())
         goto do_fallback;
 
-    fp = cx->regs->fp;
+    fp = cx->fp();
     script = fp->script();
-    pc = fp->hasImacropc() ? fp->imacropc() : cx->regs->pc;
+    pc = fp->hasImacropc() ? fp->imacropc() : cx->regs().pc;
     JS_ASSERT(script->code <= pc && pc < script->code + script->length);
 
     if (pc < script->main)
@@ -5139,7 +5138,7 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v_in,
              * it that caused exception, see bug 328664.
              */
             Value *stackBase = fp->base();
-            Value *sp = cx->regs->sp;
+            Value *sp = cx->regs().sp;
             do {
                 if (sp == stackBase) {
                     pcdepth = -1;
@@ -5167,11 +5166,10 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v_in,
     }
 
     {
-        jsbytecode* basepc = cx->regs->pc;
+        jsbytecode* basepc = cx->regs().pc;
         jsbytecode* savedImacropc = fp->maybeImacropc();
         if (savedImacropc) {
-            JS_ASSERT(cx->hasfp());
-            cx->regs->pc = savedImacropc;
+            cx->regs().pc = savedImacropc;
             fp->clearImacropc();
         }
 
@@ -5186,8 +5184,7 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v_in,
             name = DecompileExpression(cx, script, fp->maybeFun(), pc);
 
         if (savedImacropc) {
-            JS_ASSERT(cx->hasfp());
-            cx->regs->pc = basepc;
+            cx->regs().pc = basepc;
             fp->setImacropc(savedImacropc);
         }
 
@@ -5467,7 +5464,7 @@ ReconstructImacroPCStack(JSContext *cx, JSScript *script,
      * Begin with a recursive call back to ReconstructPCStack to pick up
      * the state-of-the-world at the *start* of the imacro.
      */
-    JSStackFrame *fp = js_GetScriptedCaller(cx, NULL);
+    StackFrame *fp = js_GetScriptedCaller(cx, NULL);
     JS_ASSERT(fp->hasImacropc());
     intN pcdepth = ReconstructPCStack(cx, script, fp->imacropc(), pcstack);
     if (pcdepth < 0)
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 5be592aef89d..b2a941c6447e 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -91,7 +91,6 @@
 #endif
 
 #include "jsatominlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsregexpinlines.h"
 #include "jsscriptinlines.h"
@@ -185,14 +184,14 @@ JSParseNode::clear()
     pn_parens = false;
 }
 
-Parser::Parser(JSContext *cx, JSPrincipals *prin, JSStackFrame *cfp)
+Parser::Parser(JSContext *cx, JSPrincipals *prin, StackFrame *cfp)
   : js::AutoGCRooter(cx, PARSER),
     context(cx),
     aleFreeList(NULL),
     tokenStream(cx),
     principals(NULL),
     callerFrame(cfp),
-    callerVarObj(cfp ? &cfp->varobj(cx->stack().containingSegment(cfp)) : NULL),
+    callerVarObj(cfp ? &cx->stack.space().varObjForFrame(cfp) : NULL),
     nodeList(NULL),
     functionCount(0),
     traceListHead(NULL),
@@ -891,13 +890,13 @@ SetStaticLevel(JSTreeContext *tc, uintN staticLevel)
 /*
  * Compile a top-level script.
  */
-Compiler::Compiler(JSContext *cx, JSPrincipals *prin, JSStackFrame *cfp)
+Compiler::Compiler(JSContext *cx, JSPrincipals *prin, StackFrame *cfp)
   : parser(cx, prin, cfp)
 {
 }
 
 JSScript *
-Compiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *callerFrame,
+Compiler::compileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerFrame,
                         JSPrincipals *principals, uint32 tcflags,
                         const jschar *chars, size_t length,
                         const char *filename, uintN lineno, JSVersion version,
@@ -8762,7 +8761,7 @@ Parser::primaryExpr(TokenKind tt, JSBool afterDot)
             return NULL;
 
         JSObject *obj;
-        if (context->hasfp()) {
+        if (context->running()) {
             obj = RegExp::createObject(context, context->regExpStatics(),
                                        tokenStream.getTokenbuf().begin(),
                                        tokenStream.getTokenbuf().length(),
diff --git a/js/src/jsparse.h b/js/src/jsparse.h
index a3ed2e3b81d1..12cd6bd99d16 100644
--- a/js/src/jsparse.h
+++ b/js/src/jsparse.h
@@ -1048,14 +1048,14 @@ namespace js {
 
 struct Parser : private js::AutoGCRooter
 {
-    JSContext           * const context; /* FIXME Bug 551291: use AutoGCRooter::context? */
+    JSContext           *const context; /* FIXME Bug 551291: use AutoGCRooter::context? */
     JSAtomListElement   *aleFreeList;
     void                *tempFreeList[NUM_TEMP_FREELISTS];
     TokenStream         tokenStream;
     void                *tempPoolMark;  /* initial JSContext.tempPool mark */
     JSPrincipals        *principals;    /* principals associated with source */
-    JSStackFrame *const callerFrame;    /* scripted caller frame for eval and dbgapi */
-    JSObject     *const callerVarObj;   /* callerFrame's varObj */
+    StackFrame          *const callerFrame;  /* scripted caller frame for eval and dbgapi */
+    JSObject            *const callerVarObj; /* callerFrame's varObj */
     JSParseNode         *nodeList;      /* list of recyclable parse-node structs */
     uint32              functionCount;  /* number of functions in current unit */
     JSObjectBox         *traceListHead; /* list of parsed object for GC tracing */
@@ -1065,7 +1065,7 @@ struct Parser : private js::AutoGCRooter
     /* Root atoms and objects allocated for the parsed tree. */
     js::AutoKeepAtoms   keepAtoms;
 
-    Parser(JSContext *cx, JSPrincipals *prin = NULL, JSStackFrame *cfp = NULL);
+    Parser(JSContext *cx, JSPrincipals *prin = NULL, StackFrame *cfp = NULL);
     ~Parser();
 
     friend void js::AutoGCRooter::trace(JSTracer *trc);
@@ -1238,7 +1238,7 @@ struct Compiler
     Parser parser;
     GlobalScope *globalScope;
 
-    Compiler(JSContext *cx, JSPrincipals *prin = NULL, JSStackFrame *cfp = NULL);
+    Compiler(JSContext *cx, JSPrincipals *prin = NULL, StackFrame *cfp = NULL);
 
     /*
      * Initialize a compiler. Parameters are passed on to init parser.
@@ -1255,7 +1255,7 @@ struct Compiler
                         const char *filename, uintN lineno, JSVersion version);
 
     static JSScript *
-    compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *callerFrame,
+    compileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerFrame,
                   JSPrincipals *principals, uint32 tcflags,
                   const jschar *chars, size_t length,
                   const char *filename, uintN lineno, JSVersion version,
diff --git a/js/src/jspropertycache.cpp b/js/src/jspropertycache.cpp
index f0c95b6064da..a387d32ef83b 100644
--- a/js/src/jspropertycache.cpp
+++ b/js/src/jspropertycache.cpp
@@ -135,7 +135,7 @@ PropertyCache::fill(JSContext *cx, JSObject *obj, uintN scopeIndex, uintN protoI
      * Optimize the cached vword based on our parameters and the current pc's
      * opcode format flags.
      */
-    pc = cx->regs->pc;
+    pc = cx->regs().pc;
     op = js_GetOpcode(cx, cx->fp()->script(), pc);
     cs = &js_CodeSpec[op];
     kshape = 0;
@@ -324,7 +324,7 @@ PropertyCache::fullTest(JSContext *cx, jsbytecode *pc, JSObject **objp, JSObject
     JSObject *obj, *pobj, *tmp;
     uint32 vcap;
 
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
     JS_ASSERT(this == &JS_PROPERTY_CACHE(cx));
     JS_ASSERT(uintN((fp->hasImacropc() ? fp->imacropc() : pc) - fp->script()->code)
diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h
index a67c0914cd35..edd3b1e0378b 100644
--- a/js/src/jsprvtd.h
+++ b/js/src/jsprvtd.h
@@ -138,12 +138,18 @@ class ExecuteArgsGuard;
 class InvokeFrameGuard;
 class InvokeArgsGuard;
 class InvokeSessionGuard;
+class StringBuffer;
 class TraceRecorder;
 struct TraceMonitor;
-class StackSpace;
+
+class FrameRegs;
+class StackFrame;
 class StackSegment;
+class StackSpace;
+class ContextStack;
 class FrameRegsIter;
-class StringBuffer;
+class CallReceiver;
+class CallArgs;
 
 struct Compiler;
 struct Parser;
diff --git a/js/src/jsscopeinlines.h b/js/src/jsscopeinlines.h
index fdd20c4faf8c..bab18c51de61 100644
--- a/js/src/jsscopeinlines.h
+++ b/js/src/jsscopeinlines.h
@@ -49,8 +49,8 @@
 #include "jsscope.h"
 #include "jsgc.h"
 
-#include "jsgcinlines.h"
 #include "jscntxtinlines.h"
+#include "jsgcinlines.h"
 #include "jsobjinlines.h"
 
 inline void
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index ac625b62ac47..0dd911e698a8 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -68,7 +68,6 @@
 #endif
 #include "methodjit/MethodJIT.h"
 
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
@@ -1225,7 +1224,7 @@ JSScript::NewScript(JSContext *cx, uint32 length, uint32 nsrcnotes, uint32 natom
 
     script->compartment = cx->compartment;
 #ifdef CHECK_SCRIPT_OWNER
-    script->owner = cx->thread;
+    script->owner = cx->thread();
 #endif
 
     JS_APPEND_LINK(&script->links, &cx->compartment->scripts);
@@ -1470,7 +1469,7 @@ DestroyScript(JSContext *cx, JSScript *script)
         JS_PROPERTY_CACHE(cx).purgeForScript(cx, script);
 
 #ifdef CHECK_SCRIPT_OWNER
-        JS_ASSERT(script->owner == cx->thread);
+        JS_ASSERT(script->owner == cx->thread());
 #endif
     }
 
@@ -1646,7 +1645,7 @@ js_GetSrcNoteCached(JSContext *cx, JSScript *script, jsbytecode *pc)
 }
 
 uintN
-js_FramePCToLineNumber(JSContext *cx, JSStackFrame *fp)
+js_FramePCToLineNumber(JSContext *cx, StackFrame *fp)
 {
     return js_PCToLineNumber(cx, fp->script(),
                              fp->hasImacropc() ? fp->imacropc() : fp->pc(cx));
@@ -1662,7 +1661,7 @@ js_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc)
     jssrcnote *sn;
     JSSrcNoteType type;
 
-    /* Cope with JSStackFrame.pc value prior to entering js_Interpret. */
+    /* Cope with StackFrame.pc value prior to entering js_Interpret. */
     if (!pc)
         return 0;
 
@@ -1767,12 +1766,12 @@ js_GetScriptLineExtent(JSScript *script)
 const char *
 js::CurrentScriptFileAndLineSlow(JSContext *cx, uintN *linenop)
 {
-    if (!cx->hasfp()) {
+    if (!cx->running()) {
         *linenop = 0;
         return NULL;
     }
 
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     while (fp->isDummyFrame())
         fp = fp->prev();
 
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 12bcdca212d2..ed7dd8dad765 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -738,7 +738,7 @@ js_GetSrcNoteCached(JSContext *cx, JSScript *script, jsbytecode *pc);
  * fp->imacpc may be non-null, indicating an active imacro.
  */
 extern uintN
-js_FramePCToLineNumber(JSContext *cx, JSStackFrame *fp);
+js_FramePCToLineNumber(JSContext *cx, js::StackFrame *fp);
 
 extern uintN
 js_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h
index 63fe4a5d9afe..8af35211b36a 100644
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -102,9 +102,9 @@ inline const char *
 CurrentScriptFileAndLine(JSContext *cx, uintN *linenop, LineOption opt)
 {
     if (opt == CALLED_FROM_JSOP_EVAL) {
-        JS_ASSERT(*cx->regs->pc == JSOP_EVAL);
-        JS_ASSERT(*(cx->regs->pc + JSOP_EVAL_LENGTH) == JSOP_LINENO);
-        *linenop = GET_UINT16(cx->regs->pc + JSOP_EVAL_LENGTH);
+        JS_ASSERT(*cx->regs().pc == JSOP_EVAL);
+        JS_ASSERT(*(cx->regs().pc + JSOP_EVAL_LENGTH) == JSOP_LINENO);
+        *linenop = GET_UINT16(cx->regs().pc + JSOP_EVAL_LENGTH);
         return cx->fp()->script()->filename;
     }
 
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 947a96029bbc..c5176428ede9 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -76,7 +76,6 @@
 #include "jsvector.h"
 #include "jsversion.h"
 
-#include "jscntxtinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsregexpinlines.h"
@@ -2452,7 +2451,7 @@ str_replace_flat_lambda(JSContext *cx, uintN argc, Value *vp, ReplaceData &rdata
 
     /* lambda(matchStr, matchStart, textstr) */
     static const uint32 lambdaArgc = 3;
-    if (!cx->stack().pushInvokeArgs(cx, lambdaArgc, &rdata.singleShot))
+    if (!cx->stack.pushInvokeArgs(cx, lambdaArgc, &rdata.singleShot))
         return false;
 
     CallArgs &args = rdata.singleShot;
@@ -2464,7 +2463,7 @@ str_replace_flat_lambda(JSContext *cx, uintN argc, Value *vp, ReplaceData &rdata
     sp[1].setInt32(fm.match());
     sp[2].setString(rdata.str);
 
-    if (!Invoke(cx, rdata.singleShot, 0))
+    if (!Invoke(cx, rdata.singleShot))
         return false;
 
     JSString *repstr = js_ValueToString(cx, args.rval());
diff --git a/js/src/jsstrinlines.h b/js/src/jsstrinlines.h
index 674b0552da5b..a4f2c49cebc5 100644
--- a/js/src/jsstrinlines.h
+++ b/js/src/jsstrinlines.h
@@ -43,8 +43,8 @@
 #include "jsatom.h"
 #include "jsstr.h"
 
-#include "jscntxtinlines.h"
 #include "jsgcinlines.h"
+#include "jscntxtinlines.h"
 
 namespace js {
 
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 6e1315ee8b38..582d4bd5bb73 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -92,6 +92,8 @@
 #include "jscntxtinlines.h"
 #include "jsopcodeinlines.h"
 
+#include "vm/Stack-inl.h"
+
 #ifdef JS_METHODJIT
 #include "methodjit/MethodJIT.h"
 #endif
@@ -425,12 +427,6 @@ ValueToTypeChar(const Value &v)
 /* Max number of slots in a table-switch. */
 #define MAX_TABLE_SWITCH 256
 
-/* Max memory needed to rebuild the interpreter stack when falling off trace. */
-#define MAX_INTERP_STACK_BYTES                                                \
-    (MAX_NATIVE_STACK_SLOTS * sizeof(Value) +                                 \
-     MAX_CALL_STACK_ENTRIES * sizeof(JSInlineFrame) +                         \
-     sizeof(JSInlineFrame)) /* possibly slow native frame at top of stack */
-
 /* Max number of branches per tree. */
 #define MAX_BRANCHES 32
 
@@ -1226,7 +1222,7 @@ getCoercedType(const Value &v)
 }
 
 static inline JSValueType
-getFrameObjPtrTraceType(void *p, JSStackFrame *fp)
+getFrameObjPtrTraceType(void *p, StackFrame *fp)
 {
     if (p == fp->addressOfScopeChain()) {
         JS_ASSERT(*(JSObject **)p != NULL);
@@ -1272,7 +1268,7 @@ static JS_REQUIRES_STACK inline int
 GlobalSlotHash(JSContext* cx, unsigned slot)
 {
     uintptr_t h = HASH_SEED;
-    JSStackFrame* fp = cx->fp();
+    StackFrame* fp = cx->fp();
 
     while (fp->prev())
         fp = fp->prev();
@@ -1321,7 +1317,7 @@ Oracle::markStackSlotUndemotable(JSContext* cx, unsigned slot, const void* pc)
 JS_REQUIRES_STACK void
 Oracle::markStackSlotUndemotable(JSContext* cx, unsigned slot)
 {
-    markStackSlotUndemotable(cx, slot, cx->regs->pc);
+    markStackSlotUndemotable(cx, slot, cx->regs().pc);
 }
 
 /* Consult with the oracle whether we shouldn't demote a certain slot. */
@@ -1334,7 +1330,7 @@ Oracle::isStackSlotUndemotable(JSContext* cx, unsigned slot, const void* pc) con
 JS_REQUIRES_STACK bool
 Oracle::isStackSlotUndemotable(JSContext* cx, unsigned slot) const
 {
-    return isStackSlotUndemotable(cx, slot, cx->regs->pc);
+    return isStackSlotUndemotable(cx, slot, cx->regs().pc);
 }
 
 /* Tell the oracle that a certain slot at a certain bytecode location should not be demoted. */
@@ -1632,7 +1628,7 @@ TreeFragment::initialize(JSContext* cx, SlotList *globalSlots, bool speculate)
     /* Capture the coerced type of each active slot in the type map. */
     this->typeMap.captureTypes(cx, globalObj, *globalSlots, 0 /* callDepth */, speculate);
     this->nStackTypes = this->typeMap.length() - globalSlots->length();
-    this->spOffsetAtEntry = cx->regs->sp - cx->fp()->base();
+    this->spOffsetAtEntry = cx->regs().sp - cx->fp()->base();
 
 #ifdef DEBUG
     this->treeFileName = cx->fp()->script()->filename;
@@ -1646,7 +1642,7 @@ TreeFragment::initialize(JSContext* cx, SlotList *globalSlots, bool speculate)
     this->sideExits.clear();
 
     /* Determine the native frame layout at the entry point. */
-    this->nativeStackBase = (nStackTypes - (cx->regs->sp - cx->fp()->base())) *
+    this->nativeStackBase = (nStackTypes - (cx->regs().sp - cx->fp()->base())) *
                              sizeof(double);
     this->maxNativeStackSlots = nStackTypes;
     this->maxCallDepth = 0;
@@ -1727,7 +1723,7 @@ fcallinfo(LIns *ins)
 }
 
 /*
- * JSStackFrame::numActualArgs is only defined for function frames. Since the
+ * StackFrame::numActualArgs is only defined for function frames. Since the
  * actual arguments of the entry frame are kept on trace, argc is included in
  * the tuple identifying a fragment so that two fragments for the same loop but
  * recorded with different number of actual arguments are treated as two
@@ -1737,13 +1733,13 @@ fcallinfo(LIns *ins)
 static inline uintN
 entryFrameArgc(JSContext *cx)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     return fp->hasArgs() ? fp->numActualArgs() : 0;
 }
 
 template <typename Visitor>
 static JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-VisitStackAndArgs(Visitor &visitor, JSStackFrame *fp, JSStackFrame *next, Value *stack)
+VisitStackAndArgs(Visitor &visitor, StackFrame *fp, StackFrame *next, Value *stack)
 {
     if (JS_LIKELY(!next->hasOverflowArgs()))
         return visitor.visitStackSlots(stack, next->formalArgsEnd() - stack, fp);
@@ -1752,7 +1748,7 @@ VisitStackAndArgs(Visitor &visitor, JSStackFrame *fp, JSStackFrame *next, Value
      * In the case of nactual > nformal, the formals are copied by the VM onto
      * the top of the stack. We only want to mark the formals once, so we
      * carefully mark only the canonical actual arguments (as defined by
-     * JSStackFrame::canonicalActualArg).
+     * StackFrame::canonicalActualArg).
      */
     uintN nactual = next->numActualArgs();
     Value *actuals = next->actualArgs();
@@ -1767,7 +1763,7 @@ VisitStackAndArgs(Visitor &visitor, JSStackFrame *fp, JSStackFrame *next, Value
 }
 
 /*
- * Visit the values in the given JSStackFrame that the tracer cares about. This
+ * Visit the values in the given StackFrame that the tracer cares about. This
  * visitor function is (implicitly) the primary definition of the native stack
  * area layout. There are a few other independent pieces of code that must be
  * maintained to assume the same layout. They are marked like this:
@@ -1776,8 +1772,8 @@ VisitStackAndArgs(Visitor &visitor, JSStackFrame *fp, JSStackFrame *next, Value
  */
 template <typename Visitor>
 static JS_REQUIRES_STACK bool
-VisitFrameSlots(Visitor &visitor, JSContext *cx, unsigned depth, JSStackFrame *fp,
-                JSStackFrame *next)
+VisitFrameSlots(Visitor &visitor, JSContext *cx, unsigned depth, StackFrame *fp,
+                StackFrame *next)
 {
     JS_ASSERT_IF(!next, cx->fp() == fp);
 
@@ -1790,7 +1786,7 @@ VisitFrameSlots(Visitor &visitor, JSContext *cx, unsigned depth, JSStackFrame *f
             Value *base = fp->slots() + fp->globalScript()->nfixed;
             if (next)
                 return VisitStackAndArgs(visitor, fp, next, base);
-            return visitor.visitStackSlots(base, cx->regs->sp - base, fp);
+            return visitor.visitStackSlots(base, cx->regs().sp - base, fp);
         }
 
         if (JS_UNLIKELY(fp->isEvalFrame())) {
@@ -1817,10 +1813,10 @@ VisitFrameSlots(Visitor &visitor, JSContext *cx, unsigned depth, JSStackFrame *f
     JS_ASSERT(fp->isFunctionFrame());
 
     /*
-     * We keep two members of JSStackFrame on trace: the args obj pointer and
+     * We keep two members of StackFrame on trace: the args obj pointer and
      * the scope chain pointer. The visitor must take care not to treat these
      * as js::Value-typed variables, since they are unboxed pointers.
-     * Moreover, JSStackFrame compresses the args obj pointer with nactual, so
+     * Moreover, StackFrame compresses the args obj pointer with nactual, so
      * fp->addressOfArgs() is not really a JSObject**: the visitor must treat
      * !fp->hasArgsObj() as a null args obj pointer. Hence, visitFrameObjPtr
      * is only passed a void *.
@@ -1835,7 +1831,7 @@ VisitFrameSlots(Visitor &visitor, JSContext *cx, unsigned depth, JSStackFrame *f
     visitor.setStackSlotKind("slots");
     if (next)
         return VisitStackAndArgs(visitor, fp, next, fp->slots());
-    return visitor.visitStackSlots(fp->slots(), cx->regs->sp - fp->slots(), fp);
+    return visitor.visitStackSlots(fp->slots(), cx->regs().sp - fp->slots(), fp);
 }
 
 // Number of native frame slots used for 'special' values between args and vars.
@@ -1938,7 +1934,7 @@ public:
     {}
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         if (mDone)
             return false;
         if (mStop && size_t(((const Value *)mStop) - vp) < count) {
@@ -1951,7 +1947,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         if (mDone)
             return false;
         if (mStop && mStop == p) {
@@ -1972,7 +1968,7 @@ public:
 };
 
 static JS_REQUIRES_STACK JS_ALWAYS_INLINE unsigned
-CountStackAndArgs(JSStackFrame *next, Value *stack)
+CountStackAndArgs(StackFrame *next, Value *stack)
 {
     if (JS_LIKELY(!next->hasOverflowArgs()))
         return (Value *)next - stack;
@@ -1982,7 +1978,7 @@ CountStackAndArgs(JSStackFrame *next, Value *stack)
 }
 
 static JS_ALWAYS_INLINE uintN
-NumSlotsBeforeFixed(JSStackFrame *fp)
+NumSlotsBeforeFixed(StackFrame *fp)
 {
     uintN numArgs = fp->isEvalFrame() ? 0 : Max(fp->numActualArgs(), fp->numFormalArgs());
     return 2 + numArgs + SPECIAL_FRAME_SLOTS;
@@ -1997,8 +1993,8 @@ NumSlotsBeforeFixed(JSStackFrame *fp)
 JS_REQUIRES_STACK unsigned
 NativeStackSlots(JSContext *cx, unsigned callDepth)
 {
-    JSStackFrame *fp = cx->fp();
-    JSStackFrame *next = NULL;
+    StackFrame *fp = cx->fp();
+    StackFrame *next = NULL;
     unsigned slots = 0;
     unsigned depth = callDepth;
 
@@ -2008,7 +2004,7 @@ NativeStackSlots(JSContext *cx, unsigned callDepth)
         if (next)
             slots += CountStackAndArgs(next, fp->slots());
         else
-            slots += cx->regs->sp - fp->slots();
+            slots += cx->regs().sp - fp->slots();
     }
 
     Value *start;
@@ -2021,7 +2017,7 @@ NativeStackSlots(JSContext *cx, unsigned callDepth)
     if (next)
         slots += CountStackAndArgs(next, start);
     else
-        slots += cx->regs->sp - start;
+        slots += cx->regs().sp - start;
 
 #ifdef DEBUG
     CountSlotsVisitor visitor;
@@ -2060,7 +2056,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, int count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, int count, StackFrame* fp) {
         for (int i = 0; i < count; ++i) {
             JSValueType type = getCoercedType(vp[i]);
             if (type == JSVAL_TYPE_INT32 && (!mOracle || mOracle->isStackSlotUndemotable(mCx, length())))
@@ -2075,7 +2071,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         JSValueType type = getFrameObjPtrTraceType(p, fp);
         debug_only_printf(LC_TMTracer,
                           "capture type %s%d: %c\n",
@@ -2279,7 +2275,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, TraceMonitor *tm,
 {
     JS_ASSERT(globalObj == cx->fp()->scopeChain().getGlobal());
     JS_ASSERT(globalObj->hasOwnShape());
-    JS_ASSERT(cx->regs->pc == (jsbytecode*)fragment->ip);
+    JS_ASSERT(cx->regs().pc == (jsbytecode*)fragment->ip);
 
 #ifdef JS_METHODJIT
     if (TRACE_PROFILER(cx))
@@ -2634,7 +2630,7 @@ TraceRecorder::nativeStackOffsetImpl(const void* p) const
     if (!visitor.stopped()) {
         const Value *vp = (const Value *)p;
         JS_ASSERT(size_t(vp - cx->fp()->slots()) < cx->fp()->numSlots());
-        offset += size_t(vp - cx->regs->sp) * sizeof(double);
+        offset += size_t(vp - cx->regs().sp) * sizeof(double);
     }
     return offset;
 }
@@ -3026,7 +3022,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, int count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, int count, StackFrame* fp) {
         for (int i = 0; i < count; ++i) {
             debug_only_printf(LC_TMTracer, "%s%d: ", stackSlotKind(), i);
             ValueToNative(*vp++, *mTypeMap++, mStack++);
@@ -3035,7 +3031,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         debug_only_printf(LC_TMTracer, "%s%d: ", stackSlotKind(), 0);
         if (p == fp->addressOfScopeChain())
             *(JSObject **)mStack = &fp->scopeChain();
@@ -3113,7 +3109,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         JS_ASSERT(JS_THREAD_DATA(mCx)->waiveGCQuota);
         for (size_t i = 0; i < count; ++i) {
             debug_only_printf(LC_TMTracer, "%s%u=", stackSlotKind(), unsigned(i));
@@ -3126,7 +3122,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         JS_ASSERT(JS_THREAD_DATA(mCx)->waiveGCQuota);
         debug_only_printf(LC_TMTracer, "%s%u=", stackSlotKind(), 0);
         JSObject *frameobj = *(JSObject **)mStack;
@@ -3155,7 +3151,7 @@ public:
                 !frameobj->getPrivate() &&
                 fp->maybeCallee() == frameobj->getCallObjCallee())
             {
-                JS_ASSERT(&fp->scopeChain() == JSStackFrame::sInvalidScopeChain);
+                JS_ASSERT(&fp->scopeChain() == StackFrame::sInvalidScopeChain);
                 frameobj->setPrivate(fp);
                 fp->setScopeChainWithOwnCallObj(*frameobj);
             } else {
@@ -3274,7 +3270,7 @@ GetUpvarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth,
      * then we simply get the value from the interpreter state.
      */
     JS_ASSERT(upvarLevel < UpvarCookie::UPVAR_LEVEL_LIMIT);
-    JSStackFrame* fp = cx->findFrameAtLevel(upvarLevel);
+    StackFrame* fp = cx->stack.findFrameAtLevel(upvarLevel);
     Value v = T::interp_get(fp, slot);
     JSValueType type = getCoercedType(v);
     ValueToNative(v, type, result);
@@ -3283,7 +3279,7 @@ GetUpvarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth,
 
 // For this traits type, 'slot' is the argument index, which may be -2 for callee.
 struct UpvarArgTraits {
-    static Value interp_get(JSStackFrame* fp, int32 slot) {
+    static Value interp_get(StackFrame* fp, int32 slot) {
         return fp->formalArg(slot);
     }
 
@@ -3300,7 +3296,7 @@ GetUpvarArgOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDept
 
 // For this traits type, 'slot' is an index into the local slots array.
 struct UpvarVarTraits {
-    static Value interp_get(JSStackFrame* fp, int32 slot) {
+    static Value interp_get(StackFrame* fp, int32 slot) {
         return fp->slots()[slot];
     }
 
@@ -3321,7 +3317,7 @@ GetUpvarVarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDept
  * the only one that can have no function.)
  */
 struct UpvarStackTraits {
-    static Value interp_get(JSStackFrame* fp, int32 slot) {
+    static Value interp_get(StackFrame* fp, int32 slot) {
         return fp->slots()[slot + fp->numFixed()];
     }
 
@@ -3390,7 +3386,7 @@ GetFromClosure(JSContext* cx, JSObject* call, const ClosureVarInfo* cv, double*
 
     // We already guarded on trace that we aren't touching an outer tree's entry frame
     VOUCH_DOES_NOT_REQUIRE_STACK();
-    JSStackFrame* fp = (JSStackFrame*) call->getPrivate();
+    StackFrame* fp = (StackFrame*) call->getPrivate();
     JS_ASSERT(fp != cx->fp());
 
     Value v;
@@ -3416,7 +3412,7 @@ struct ArgClosureTraits
 {
     // Get the right frame slots to use our slot index with.
     // See also UpvarArgTraits.
-    static inline Value get_slot(JSStackFrame* fp, unsigned slot) {
+    static inline Value get_slot(StackFrame* fp, unsigned slot) {
         JS_ASSERT(slot < fp->numFormalArgs());
         return fp->formalArg(slot);
     }
@@ -3449,7 +3445,7 @@ GetClosureArg(JSContext* cx, JSObject* callee, const ClosureVarInfo* cv, double*
 struct VarClosureTraits
 {
     // See also UpvarVarTraits.
-    static inline Value get_slot(JSStackFrame* fp, unsigned slot) {
+    static inline Value get_slot(StackFrame* fp, unsigned slot) {
         JS_ASSERT(slot < fp->fun()->script()->bindings.countVars());
         return fp->slots()[slot];
     }
@@ -3504,7 +3500,7 @@ FlushNativeStackFrame(JSContext* cx, unsigned callDepth, const JSValueType* mp,
 /* Emit load instructions onto the trace that read the initial stack state. */
 JS_REQUIRES_STACK void
 TraceRecorder::importImpl(Address addr, const void* p, JSValueType t,
-                          const char *prefix, uintN index, JSStackFrame *fp)
+                          const char *prefix, uintN index, StackFrame *fp)
 {
     LIns* ins;
     if (t == JSVAL_TYPE_INT32) { /* demoted */
@@ -3582,7 +3578,7 @@ TraceRecorder::importImpl(Address addr, const void* p, JSValueType t,
 
 JS_REQUIRES_STACK void
 TraceRecorder::import(Address addr, const Value* p, JSValueType t,
-                      const char *prefix, uintN index, JSStackFrame *fp)
+                      const char *prefix, uintN index, StackFrame *fp)
 {
     return importImpl(addr, p, t, prefix, index, fp);
 }
@@ -3593,7 +3589,7 @@ class ImportBoxedStackSlotVisitor : public SlotVisitorBase
     LIns *mBase;
     ptrdiff_t mStackOffset;
     JSValueType *mTypemap;
-    JSStackFrame *mFp;
+    StackFrame *mFp;
 public:
     ImportBoxedStackSlotVisitor(TraceRecorder &recorder,
                                 LIns *base,
@@ -3606,7 +3602,7 @@ public:
     {}
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         for (size_t i = 0; i < count; ++i) {
             if (*mTypemap == JSVAL_TYPE_BOXED) {
                 mRecorder.import(StackAddress(mBase, mStackOffset), vp, JSVAL_TYPE_BOXED,
@@ -3624,7 +3620,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame *fp) {
+    visitFrameObjPtr(void* p, StackFrame *fp) {
         JS_ASSERT(*mTypemap != JSVAL_TYPE_BOXED);
         mTypemap++;
         mStackOffset += sizeof(double);
@@ -3684,7 +3680,7 @@ TraceRecorder::import(TreeFragment* tree, LIns* sp, unsigned stackSlots, unsigne
 JS_REQUIRES_STACK bool
 TraceRecorder::isValidSlot(JSObject *obj, const Shape* shape)
 {
-    uint32 setflags = (js_CodeSpec[*cx->regs->pc].format & (JOF_SET | JOF_INCDEC | JOF_FOR));
+    uint32 setflags = (js_CodeSpec[*cx->regs().pc].format & (JOF_SET | JOF_INCDEC | JOF_FOR));
 
     if (setflags) {
         if (!shape->hasDefaultSetter())
@@ -3894,7 +3890,7 @@ TraceRecorder::get(const Value *p)
 bool
 TraceRecorder::isValidFrameObjPtr(void *p)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     for (; fp; fp = fp->prev()) {
         if (fp->addressOfScopeChain() == p || fp->addressOfArgs() == p)
             return true;
@@ -4038,7 +4034,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         /* N.B. vp may actually point to a JSObject*. */
         for (size_t i = 0; i < count; ++i) {
             LIns *ins = mRecorder.get(vp);
@@ -4060,7 +4056,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         JS_ASSERT(*mTypeMap != JSVAL_TYPE_BOXED);
         ++mTypeMap;
         ++mSlotnum;
@@ -4126,14 +4122,14 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         for (size_t i = 0; i < count; ++i)
             *mTypeMap++ = mRecorder.determineSlotType(vp++);
         return true;
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         *mTypeMap++ = getFrameObjPtrTraceType(p, fp);
         return true;
     }
@@ -4150,7 +4146,7 @@ TreevisLogExit(JSContext* cx, VMSideExit* exit)
 {
     debug_only_printf(LC_TMTreeVis, "TREEVIS ADDEXIT EXIT=%p TYPE=%s FRAG=%p PC=%p FILE=\"%s\""
                       " LINE=%d OFFS=%d", (void*)exit, getExitName(exit->exitType),
-                      (void*)exit->from, (void*)cx->regs->pc, cx->fp()->script()->filename,
+                      (void*)exit->from, (void*)cx->regs().pc, cx->fp()->script()->filename,
                       js_FramePCToLineNumber(cx, cx->fp()), FramePCOffset(cx, cx->fp()));
     debug_only_print0(LC_TMTreeVis, " STACK=\"");
     for (unsigned i = 0; i < exit->numStackSlots; i++)
@@ -4165,9 +4161,9 @@ TreevisLogExit(JSContext* cx, VMSideExit* exit)
 JS_REQUIRES_STACK VMSideExit*
 TraceRecorder::snapshot(ExitType exitType)
 {
-    JSStackFrame* const fp = cx->fp();
-    JSFrameRegs* const regs = cx->regs;
-    jsbytecode* pc = regs->pc;
+    StackFrame* const fp = cx->fp();
+    FrameRegs& regs = cx->regs();
+    jsbytecode* pc = regs.pc;
 
     /*
      * Check for a return-value opcode that needs to restart at the next
@@ -4186,7 +4182,7 @@ TraceRecorder::snapshot(ExitType exitType)
         JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_FUNAPPLY || *pc == JSOP_FUNCALL ||
                   *pc == JSOP_NEW || *pc == JSOP_SETPROP || *pc == JSOP_SETNAME);
         pc += cs.length;
-        regs->pc = pc;
+        regs.pc = pc;
         MUST_FLOW_THROUGH("restore_pc");
     }
 
@@ -4233,7 +4229,7 @@ TraceRecorder::snapshot(ExitType exitType)
     if (pendingUnboxSlot ||
         (pendingSpecializedNative && (pendingSpecializedNative->flags & JSTN_UNBOX_AFTER))) {
         unsigned pos = stackSlots - 1;
-        if (pendingUnboxSlot == cx->regs->sp - 2)
+        if (pendingUnboxSlot == regs.sp - 2)
             pos = stackSlots - 2;
         typemap[pos] = JSVAL_TYPE_BOXED;
     } else if (pendingSpecializedNative &&
@@ -4247,7 +4243,7 @@ TraceRecorder::snapshot(ExitType exitType)
     /* Now restore the the original pc (after which early returns are ok). */
     if (resumeAfter) {
         MUST_FLOW_LABEL(restore_pc);
-        regs->pc = pc - cs.length;
+        regs.pc = pc - cs.length;
     } else {
         /*
          * If we take a snapshot on a goto, advance to the target address. This
@@ -4489,7 +4485,7 @@ TraceRecorder::compile()
         ResetJIT(cx, traceMonitor, FR_DEEP_BAIL);
         return ARECORD_ABORTED;
     }
-    if (tree->maxNativeStackSlots >= MAX_NATIVE_STACK_SLOTS) {
+    if (tree->maxNativeStackSlots >= TraceNativeStorage::MAX_NATIVE_STACK_SLOTS) {
         debug_only_print0(LC_TMTracer, "Blacklist: excessive stack use.\n");
         Blacklist((jsbytecode*)tree->ip);
         return ARECORD_STOP;
@@ -4785,7 +4781,7 @@ class DefaultSlotMap : public SlotMap
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp)
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp)
     {
         for (size_t i = 0; i < count; i++)
             addSlot(&vp[i]);
@@ -4793,7 +4789,7 @@ class DefaultSlotMap : public SlotMap
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp)
+    visitFrameObjPtr(void* p, StackFrame* fp)
     {
         addSlot(getFrameObjPtrTraceType(p, fp));
         return true;
@@ -4865,7 +4861,7 @@ TraceRecorder::closeLoop()
      * to be in an imacro here and the opcode should be either JSOP_TRACE or, in
      * case this loop was blacklisted in the meantime, JSOP_NOTRACE.
      */
-    JS_ASSERT(*cx->regs->pc == JSOP_TRACE || *cx->regs->pc == JSOP_NOTRACE);
+    JS_ASSERT(*cx->regs().pc == JSOP_TRACE || *cx->regs().pc == JSOP_NOTRACE);
     JS_ASSERT(!cx->fp()->hasImacropc());
 
     if (callDepth != 0) {
@@ -5233,14 +5229,14 @@ class ClearSlotsVisitor : public SlotVisitorBase
     {}
 
     JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame *) {
+    visitStackSlots(Value *vp, size_t count, StackFrame *) {
         for (Value *vpend = vp + count; vp != vpend; ++vp)
             tracker.set(vp, NULL);
         return true;
     }
 
     JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void *p, JSStackFrame *) {
+    visitFrameObjPtr(void *p, StackFrame *) {
         tracker.set(p, NULL);
         return true;
     }
@@ -5455,15 +5451,15 @@ TraceRecorder::checkTraceEnd(jsbytecode *pc)
          * pointer and pretend we have reached the loop header.
          */
         if (pendingLoop) {
-            JS_ASSERT(!cx->fp()->hasImacropc() && (pc == cx->regs->pc || pc == cx->regs->pc + 1));
-            JSFrameRegs orig = *cx->regs;
+            JS_ASSERT(!cx->fp()->hasImacropc() && (pc == cx->regs().pc || pc == cx->regs().pc + 1));
+            FrameRegs orig = cx->regs();
 
-            cx->regs->pc = (jsbytecode*)tree->ip;
-            cx->regs->sp = cx->fp()->base() + tree->spOffsetAtEntry;
+            cx->regs().pc = (jsbytecode*)tree->ip;
+            cx->regs().sp = cx->fp()->base() + tree->spOffsetAtEntry;
 
             JSContext* localcx = cx;
             AbortableRecordingStatus ars = closeLoop();
-            *localcx->regs = orig;
+            localcx->regs() = orig;
             return ars;
         }
 
@@ -5610,7 +5606,7 @@ SynthesizeFrame(JSContext* cx, const FrameInfo& fi, JSObject* callee)
     VOUCH_DOES_NOT_REQUIRE_STACK();
 
     /* Assert that we have a correct sp distance from cx->fp()->slots in fi. */
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
     JS_ASSERT_IF(!fi.imacpc,
                  js_ReconstructStackDepth(cx, fp->script(), fi.pc) ==
                  uintN(fi.spdist - fp->numFixed()));
@@ -5620,22 +5616,19 @@ SynthesizeFrame(JSContext* cx, const FrameInfo& fi, JSObject* callee)
     JSScript* newscript = newfun->script();
 
     /* Fill in the prev-frame's sp. */
-    JSFrameRegs *regs = cx->regs;
-    regs->sp = fp->slots() + fi.spdist;
-    regs->pc = fi.pc;
+    FrameRegs &regs = cx->regs();
+    regs.sp = fp->slots() + fi.spdist;
+    regs.pc = fi.pc;
     if (fi.imacpc)
         fp->setImacropc(fi.imacpc);
 
     /* Set argc/flags then mimic JSOP_CALL. */
     uintN argc = fi.get_argc();
-    uint32 flags = fi.is_constructing ()
-                   ? JSFRAME_CONSTRUCTING | JSFRAME_CONSTRUCTING
-                   : 0;
+    uint32 flags = fi.is_constructing() ? StackFrame::CONSTRUCTING : 0;
 
     /* Get pointer to new/frame/slots, prepare arguments. */
-    StackSpace &stack = cx->stack();
-    JSStackFrame *newfp = stack.getInlineFrame(cx, regs->sp, argc, newfun,
-                                               newscript, &flags);
+    StackFrame *newfp = cx->stack.getInlineFrame(cx, regs.sp, argc, newfun,
+                                                 newscript, &flags);
 
     /* Initialize frame; do not need to initialize locals. */
     newfp->initCallFrame(cx, *callee, newfun, argc, flags);
@@ -5651,18 +5644,18 @@ SynthesizeFrame(JSContext* cx, const FrameInfo& fi, JSObject* callee)
 
     /* These should be initialized by FlushNativeStackFrame. */
     newfp->thisValue().setMagic(JS_THIS_POISON);
-    newfp->setScopeChainNoCallObj(*JSStackFrame::sInvalidScopeChain);
+    newfp->setScopeChainNoCallObj(*StackFrame::sInvalidScopeChain);
 #endif
 
     /* Officially push the frame. */
-    stack.pushInlineFrame(cx, newscript, newfp, cx->regs);
+    cx->stack.pushInlineFrame(newscript, newfp, cx->regs());
 
     /* Call object will be set by FlushNativeStackFrame. */
 
     /* Call the debugger hook if present. */
     JSInterpreterHook hook = cx->debugHooks->callHook;
     if (hook) {
-        newfp->setHookData(hook(cx, newfp, JS_TRUE, 0,
+        newfp->setHookData(hook(cx, Jsvalify(newfp), JS_TRUE, 0,
                                 cx->debugHooks->callHookData));
     }
 }
@@ -5838,11 +5831,11 @@ CreateBranchFragment(JSContext* cx, TraceMonitor* tm, TreeFragment* root, VMSide
                           ? (++(tm->lastFragID)) : 0;
     )
 
-    VMFragment* f = new (*tm->dataAlloc) VMFragment(cx->regs->pc verbose_only(, profFragID));
+    VMFragment* f = new (*tm->dataAlloc) VMFragment(cx->regs().pc verbose_only(, profFragID));
 
     debug_only_printf(LC_TMTreeVis, "TREEVIS CREATEBRANCH ROOT=%p FRAG=%p PC=%p FILE=\"%s\""
                       " LINE=%d ANCHOR=%p OFFS=%d\n",
-                      (void*)root, (void*)f, (void*)cx->regs->pc, cx->fp()->script()->filename,
+                      (void*)root, (void*)f, (void*)cx->regs().pc, cx->fp()->script()->filename,
                       js_FramePCToLineNumber(cx, cx->fp()), (void*)anchor,
                       FramePCOffset(cx, cx->fp()));
     verbose_only( tm->branches = new (*tm->dataAlloc) Seq<Fragment*>(f, tm->branches); )
@@ -5899,7 +5892,7 @@ AttemptToExtendTree(JSContext* cx, TraceMonitor* tm, VMSideExit* anchor, VMSideE
          * might extend along separate paths (i.e. after the loop edge, and after a
          * return statement).
          */
-        c->ip = cx->regs->pc;
+        c->ip = cx->regs().pc;
         JS_ASSERT(c->root == f);
     }
 
@@ -5983,7 +5976,7 @@ TraceRecorder::recordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCall
 
     JS_ASSERT(r->fragment && !r->fragment->lastIns);
     TreeFragment* root = r->fragment->root;
-    TreeFragment* first = LookupOrAddLoop(tm, cx->regs->pc, root->globalObj,
+    TreeFragment* first = LookupOrAddLoop(tm, cx->regs().pc, root->globalObj,
                                           root->globalShape, entryFrameArgc(cx));
 
     /*
@@ -6119,9 +6112,9 @@ TraceRecorder::attemptTreeCall(TreeFragment* f, uintN& inlineCallCount)
       case MUL_ZERO_EXIT:
       case OVERFLOW_EXIT:
         if (lr->exitType == MUL_ZERO_EXIT)
-            traceMonitor->oracle->markInstructionSlowZeroTest(cx->regs->pc);
+            traceMonitor->oracle->markInstructionSlowZeroTest(cx->regs().pc);
         else
-            traceMonitor->oracle->markInstructionUndemotable(cx->regs->pc);
+            traceMonitor->oracle->markInstructionUndemotable(cx->regs().pc);
         /* FALL THROUGH */
       case BRANCH_EXIT:
         /* Abort recording the outer tree, extend the inner tree. */
@@ -6177,7 +6170,7 @@ IsEntryTypeCompatible(const Value &v, JSValueType type)
 }
 
 static inline bool
-IsFrameObjPtrTypeCompatible(void *p, JSStackFrame *fp, JSValueType type)
+IsFrameObjPtrTypeCompatible(void *p, StackFrame *fp, JSValueType type)
 {
     debug_only_printf(LC_TMTracer, "%c/%c ", TypeToChar(type),
                       (p == fp->addressOfScopeChain() || fp->hasArgsObj())
@@ -6231,7 +6224,7 @@ public:
      */
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         for (size_t i = 0; i < count; ++i) {
             debug_only_printf(LC_TMTracer, "%s%u=", stackSlotKind(), unsigned(i));
             if (!IsEntryTypeCompatible(*vp, *mTypeMap)) {
@@ -6250,7 +6243,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame* fp) {
+    visitFrameObjPtr(void* p, StackFrame* fp) {
         debug_only_printf(LC_TMTracer, "%s%u=", stackSlotKind(), 0);
         if (!IsFrameObjPtrTypeCompatible(p, fp, *mTypeMap))
             mOk = false;
@@ -6321,7 +6314,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitStackSlots(Value *vp, size_t count, JSStackFrame* fp) {
+    visitStackSlots(Value *vp, size_t count, StackFrame* fp) {
         for (size_t i = 0; i < count; ++i) {
             if (!mOk)
                 break;
@@ -6331,7 +6324,7 @@ public:
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
-    visitFrameObjPtr(void* p, JSStackFrame *fp) {
+    visitFrameObjPtr(void* p, StackFrame *fp) {
         debug_only_printf(LC_TMTracer, "%s%d=", stackSlotKind(), 0);
         JS_ASSERT(*(uint8_t*)mTypeMap != 0xCD);
         return mOk = IsFrameObjPtrTypeCompatible(p, fp, *mTypeMap++);
@@ -6412,8 +6405,8 @@ TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
     callstackBase(tm->storage->callstack()),
     sor(callstackBase),
     rp(callstackBase),
-    eor(callstackBase + JS_MIN(MAX_CALL_STACK_ENTRIES,
-                               JS_MAX_INLINE_CALL_COUNT - inlineCallCount)),
+    eor(callstackBase + JS_MIN(TraceNativeStorage::MAX_CALL_STACK_ENTRIES,
+                               StackSpace::MAX_INLINE_CALLS - inlineCallCount)),
     lastTreeExitGuard(NULL),
     lastTreeCallGuard(NULL),
     rpAtLastTreeCall(NULL),
@@ -6442,7 +6435,7 @@ TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
     JS_ASSERT(JS_THREAD_DATA(cx)->profilingCompartment == NULL);
     JS_THREAD_DATA(cx)->onTraceCompartment = cx->compartment;
 
-    JS_ASSERT(eos == stackBase + MAX_NATIVE_STACK_SLOTS);
+    JS_ASSERT(eos == stackBase + TraceNativeStorage::MAX_NATIVE_STACK_SLOTS);
     JS_ASSERT(sp < eos);
 
     /*
@@ -6450,15 +6443,15 @@ TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
      * EnterFrame. It is okay to have a 0-frame restriction since the JIT
      * might not need any frames.
      */
-    JS_ASSERT(inlineCallCount <= JS_MAX_INLINE_CALL_COUNT);
+    JS_ASSERT(inlineCallCount <= StackSpace::MAX_INLINE_CALLS);
 
 #ifdef DEBUG
     /*
      * Cannot 0xCD-fill global frame since it may overwrite a bailed outer
      * ExecuteTree's 0xdeadbeefdeadbeef marker.
      */
-    memset(tm->storage->stack(), 0xCD, MAX_NATIVE_STACK_SLOTS * sizeof(double));
-    memset(tm->storage->callstack(), 0xCD, MAX_CALL_STACK_ENTRIES * sizeof(FrameInfo*));
+    memset(tm->storage->stack(), 0xCD, TraceNativeStorage::MAX_NATIVE_STACK_SLOTS * sizeof(double));
+    memset(tm->storage->callstack(), 0xCD, TraceNativeStorage::MAX_CALL_STACK_ENTRIES * sizeof(FrameInfo*));
 #endif
 }
 
@@ -6560,8 +6553,8 @@ ExecuteTree(JSContext* cx, TraceMonitor* tm, TreeFragment* f, uintN& inlineCallC
 #endif
     JS_ASSERT(f->root == f && f->code());
 
-    if (!ScopeChainCheck(cx, f) || !cx->stack().ensureEnoughSpaceToEnterTrace() ||
-        inlineCallCount + f->maxCallDepth > JS_MAX_INLINE_CALL_COUNT) {
+    if (!ScopeChainCheck(cx, f) || !cx->stack.space().ensureEnoughSpaceToEnterTrace() ||
+        inlineCallCount + f->maxCallDepth > StackSpace::MAX_INLINE_CALLS) {
         *lrp = NULL;
         return true;
     }
@@ -6621,7 +6614,7 @@ ExecuteTree(JSContext* cx, TraceMonitor* tm, TreeFragment* f, uintN& inlineCallC
     f->iters += iters;
 
 #ifdef DEBUG
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     const char *prefix = "";
     if (iters == LOOP_COUNT_MAX)
         prefix = ">";
@@ -6632,7 +6625,7 @@ ExecuteTree(JSContext* cx, TraceMonitor* tm, TreeFragment* f, uintN& inlineCallC
                       getExitName(lr->exitType),
                       fp->script()->filename,
                       js_FramePCToLineNumber(cx, fp),
-                      js_CodeName[fp->hasImacropc() ? *fp->imacropc() : *cx->regs->pc]);
+                      js_CodeName[fp->hasImacropc() ? *fp->imacropc() : *cx->regs().pc]);
 #endif
     
 #ifdef JS_METHODJIT
@@ -6752,7 +6745,7 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
              * ExecuteTree. We are about to return to the interpreter. Adjust
              * the top stack frame to resume on the next op.
              */
-            JSFrameRegs* regs = cx->regs;
+            FrameRegs* regs = &cx->regs();
             JSOp op = (JSOp) *regs->pc;
 
             /*
@@ -6811,17 +6804,17 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
          * Flush the slots for cx->fp() (which will become cx->fp()->prev after
          * SynthesizeFrame). Since a frame's arguments (including callee
          * and thisv) are part of the frame, we only want to flush up to the
-         * next frame's arguments, so set cx->regs->sp to to not include said
+         * next frame's arguments, so set cx->regs().sp to to not include said
          * arguments. The upcoming call to SynthesizeFrame will reset regs->sp
          * to its correct value.
          */
-        cx->regs->sp = cx->fp()->slots() + (fi->spdist - (2 + fi->get_argc()));
+        cx->regs().sp = cx->fp()->slots() + (fi->spdist - (2 + fi->get_argc()));
         int slots = FlushNativeStackFrame(cx, 0 /* callDepth */, fi->get_typemap(), stack);
 
         /* Finish initializing cx->fp() and push a new cx->fp(). */
         SynthesizeFrame(cx, *fi, callee);
 #ifdef DEBUG
-        JSStackFrame* fp = cx->fp();
+        StackFrame* fp = cx->fp();
         debug_only_printf(LC_TMTracer,
                           "synthesized deep frame for %s:%u@%u, slots=%d, fi=%p\n",
                           fp->script()->filename,
@@ -6856,7 +6849,7 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
         SynthesizeFrame(cx, *callstack[n], callee);
         ++*state.inlineCallCountp;
 #ifdef DEBUG
-        JSStackFrame* fp = cx->fp();
+        StackFrame* fp = cx->fp();
         debug_only_printf(LC_TMTracer,
                           "synthesized shallow frame for %s:%u@%u\n",
                           fp->script()->filename, js_FramePCToLineNumber(cx, fp),
@@ -6869,20 +6862,20 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
      * entered into).  These are our final values for sp and pc since
      * SynthesizeFrame has already taken care of all frames in between.
      */
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
 
     /*
      * If we are not exiting from an inlined frame, the state->sp is spbase.
      * Otherwise spbase is whatever slots frames around us consume.
      */
-    cx->regs->pc = innermost->pc;
+    cx->regs().pc = innermost->pc;
     if (innermost->imacpc)
         fp->setImacropc(innermost->imacpc);
     else
         fp->clearImacropc();
 
     /*
-     * Set cx->regs->regs for the top frame. Since the top frame does not have a
+     * Set cx->regs().regs for the top frame. Since the top frame does not have a
      * FrameInfo (a FrameInfo is only pushed for calls), we basically need to
      * compute the offset from fp->slots() to the top of the stack based on the
      * number of native slots allocated for this function.
@@ -6897,12 +6890,12 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
         /* A frame's native slots includes args and frame ptrs, so strip them off. */
         slotOffset -= NumSlotsBeforeFixed(fp);
     }
-    cx->regs->sp = fp->slots() + slotOffset;
+    cx->regs().sp = fp->slots() + slotOffset;
 
     /* Assert that we computed sp correctly. */
     JS_ASSERT_IF(!fp->hasImacropc(),
                  fp->slots() + fp->numFixed() +
-                 js_ReconstructStackDepth(cx, fp->script(), cx->regs->pc) == cx->regs->sp);
+                 js_ReconstructStackDepth(cx, fp->script(), cx->regs().pc) == cx->regs().sp);
 
 #ifdef EXECUTE_TREE_TIMER
     uint64 cycles = rdtsc() - state.startTime;
@@ -6915,10 +6908,10 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
                       fp->script()->filename,
                       js_FramePCToLineNumber(cx, fp),
                       FramePCOffset(cx, fp),
-                      js_CodeName[fp->hasImacropc() ? *fp->imacropc() : *cx->regs->pc],
+                      js_CodeName[fp->hasImacropc() ? *fp->imacropc() : *cx->regs().pc],
                       (void*)lr,
                       getExitName(lr->exitType),
-                      (long long int)(cx->regs->sp - fp->base()),
+                      (long long int)(cx->regs().sp - fp->base()),
                       calldepth,
                       (unsigned long long int)cycles);
 
@@ -6961,7 +6954,7 @@ LeaveTree(TraceMonitor *tm, TracerState& state, VMSideExit* lr)
     }
 
     /* Write back interned globals. */
-    JS_ASSERT(state.eos == state.stackBase + MAX_NATIVE_STACK_SLOTS);
+    JS_ASSERT(state.eos == state.stackBase + TraceNativeStorage::MAX_NATIVE_STACK_SLOTS);
     JSObject* globalObj = outermostTree->globalObj;
     FlushNativeGlobalFrame(cx, globalObj, state.eos, ngslots, gslots, globalTypeMap);
 
@@ -6997,7 +6990,7 @@ TraceRecorder::assertInsideLoop()
     if (callDepth > 0)
         return;
 
-    jsbytecode *pc = cx->regs->fp->hasImacropc() ? cx->regs->fp->imacropc() : cx->regs->pc;
+    jsbytecode *pc = cx->fp()->hasImacropc() ? cx->fp()->imacropc() : cx->regs().pc;
     jsbytecode *beg = (jsbytecode *)tree->ip;
     jsbytecode *end = GetLoopBottom(cx, beg);
 
@@ -7020,7 +7013,7 @@ RecordLoopEdge(JSContext* cx, TraceMonitor* tm, uintN& inlineCallCount)
     /* Is the recorder currently active? */
     if (tm->recorder) {
         tm->recorder->assertInsideLoop();
-        jsbytecode* pc = cx->regs->pc;
+        jsbytecode* pc = cx->regs().pc;
         if (pc == tm->recorder->tree->ip) {
             AbortableRecordingStatus status = tm->recorder->closeLoop();
             if (status != ARECORD_COMPLETED) {
@@ -7045,7 +7038,7 @@ RecordLoopEdge(JSContext* cx, TraceMonitor* tm, uintN& inlineCallCount)
              * interpreter and do not attempt to trigger or record a new tree at
              * this location.
              */
-            if (pc != cx->regs->pc) {
+            if (pc != cx->regs().pc) {
 #ifdef MOZ_TRACEVIS
                 tvso.r = R_INNER_SIDE_EXIT;
 #endif
@@ -7064,7 +7057,7 @@ RecordLoopEdge(JSContext* cx, TraceMonitor* tm, uintN& inlineCallCount)
     SlotList* globalSlots = NULL;
 
     if (!CheckGlobalObjectShape(cx, tm, globalObj, &globalShape, &globalSlots)) {
-        Backoff(tm, cx->regs->pc);
+        Backoff(tm, cx->regs().pc);
         return MONITOR_NOT_RECORDING;
     }
 
@@ -7076,7 +7069,7 @@ RecordLoopEdge(JSContext* cx, TraceMonitor* tm, uintN& inlineCallCount)
         return MONITOR_NOT_RECORDING;
     }
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     uint32 argc = entryFrameArgc(cx);
 
     TreeFragment* f = LookupOrAddLoop(tm, pc, globalObj, globalShape, argc);
@@ -7168,9 +7161,9 @@ RecordLoopEdge(JSContext* cx, TraceMonitor* tm, uintN& inlineCallCount)
       case MUL_ZERO_EXIT:
       case OVERFLOW_EXIT:
         if (lr->exitType == MUL_ZERO_EXIT)
-            tm->oracle->markInstructionSlowZeroTest(cx->regs->pc);
+            tm->oracle->markInstructionSlowZeroTest(cx->regs().pc);
         else
-            tm->oracle->markInstructionUndemotable(cx->regs->pc);
+            tm->oracle->markInstructionUndemotable(cx->regs().pc);
         /* FALL THROUGH */
       case BRANCH_EXIT:
         rv = AttemptToExtendTree(cx, tm, lr, NULL, NULL, NULL
@@ -7284,9 +7277,9 @@ TraceRecorder::monitorRecording(JSOp op)
             INIT_SPRINTER(cx, &sprinter, &cx->tempPool, 0);
 
             debug_only_print0(LC_TMRecorder, "\n");
-            js_Disassemble1(cx, cx->fp()->script(), cx->regs->pc,
+            js_Disassemble1(cx, cx->fp()->script(), cx->regs().pc,
                             cx->fp()->hasImacropc()
-                                ? 0 : cx->regs->pc - cx->fp()->script()->code,
+                                ? 0 : cx->regs().pc - cx->fp()->script()->code,
                             !cx->fp()->hasImacropc(), &sprinter);
 
             fprintf(stdout, "%s", sprinter.base);
@@ -7923,7 +7916,7 @@ TraceRecorder::varval(unsigned n) const
 JS_REQUIRES_STACK Value&
 TraceRecorder::stackval(int n) const
 {
-    return cx->regs->sp[n];
+    return cx->regs().sp[n];
 }
 
 JS_REQUIRES_STACK void
@@ -7973,7 +7966,7 @@ TraceRecorder::entryScopeChain() const
 JS_REQUIRES_STACK LIns*
 TraceRecorder::entryFrameIns() const
 {
-    return w.ldpFrameFp(w.ldpContextField(regs));
+    return w.ldpFrameFp(w.ldpContextRegs(cx_ins));
 }
 
 /*
@@ -7981,11 +7974,11 @@ TraceRecorder::entryFrameIns() const
  * trace. |depthp| is an optional outparam: if it is non-null, it will be
  * filled in with the depth of the call object's frame relevant to cx->fp().
  */
-JS_REQUIRES_STACK JSStackFrame*
+JS_REQUIRES_STACK StackFrame*
 TraceRecorder::frameIfInRange(JSObject* obj, unsigned* depthp) const
 {
-    JSStackFrame* ofp = (JSStackFrame*) obj->getPrivate();
-    JSStackFrame* fp = cx->fp();
+    StackFrame* ofp = (StackFrame*) obj->getPrivate();
+    StackFrame* fp = cx->fp();
     for (unsigned depth = 0; depth <= callDepth; ++depth) {
         if (fp == ofp) {
             if (depthp)
@@ -8021,7 +8014,7 @@ TraceRecorder::scopeChainProp(JSObject* chainHead, Value*& vp, LIns*& ins, NameR
 
     TraceMonitor &localtm = *traceMonitor;
 
-    JSAtom* atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom* atom = atoms[GET_INDEX(cx->regs().pc)];
     JSObject* obj2;
     JSProperty* prop;
     JSObject *obj = chainHead;
@@ -8087,7 +8080,7 @@ TraceRecorder::callProp(JSObject* obj, JSProperty* prop, jsid id, Value*& vp,
 {
     Shape *shape = (Shape*) prop;
 
-    JSOp op = JSOp(*cx->regs->pc);
+    JSOp op = JSOp(*cx->regs().pc);
     uint32 setflags = (js_CodeSpec[op].format & (JOF_SET | JOF_INCDEC | JOF_FOR));
     if (setflags && !shape->writable())
         RETURN_STOP("writing to a read-only property");
@@ -8095,7 +8088,7 @@ TraceRecorder::callProp(JSObject* obj, JSProperty* prop, jsid id, Value*& vp,
     uintN slot = uint16(shape->shortid);
 
     vp = NULL;
-    JSStackFrame* cfp = (JSStackFrame*) obj->getPrivate();
+    StackFrame* cfp = (StackFrame*) obj->getPrivate();
     if (cfp) {
         if (shape->getterOp() == GetCallArg) {
             JS_ASSERT(slot < cfp->numFormalArgs());
@@ -8115,7 +8108,7 @@ TraceRecorder::callProp(JSObject* obj, JSProperty* prop, jsid id, Value*& vp,
 
         if (frameIfInRange(obj)) {
             // At this point we are guaranteed to be looking at an active call oject
-            // whose properties are stored in the corresponding JSStackFrame.
+            // whose properties are stored in the corresponding StackFrame.
             ins = get(vp);
             nr.tracked = true;
             return RECORD_CONTINUE;
@@ -8276,7 +8269,7 @@ TraceRecorder::tryToDemote(LOpcode op, jsdouble v0, jsdouble v1, LIns* s0, LIns*
      * z = d0 * d1 with 0 <= (d0|d1) <= 0xffff guarantees z <= fffe0001). 
      */
 
-    if (!oracle || oracle->isInstructionUndemotable(cx->regs->pc) ||
+    if (!oracle || oracle->isInstructionUndemotable(cx->regs().pc) ||
         !IsPromotedInt32(s0) || !IsPromotedInt32(s1))
     {
       undemotable:
@@ -8362,7 +8355,7 @@ TraceRecorder::tryToDemote(LOpcode op, jsdouble v0, jsdouble v1, LIns* s0, LIns*
              * if either argument is negative. If this ever fails, we recompile with
              * a stronger, but slower, guard.
              */
-            if (v0 < 0.0 || v1 < 0.0 || oracle->isInstructionSlowZeroTest(cx->regs->pc)) {
+            if (v0 < 0.0 || v1 < 0.0 || oracle->isInstructionSlowZeroTest(cx->regs().pc)) {
                 if (!exit)
                     exit = snapshot(OVERFLOW_EXIT);
 
@@ -8620,11 +8613,11 @@ TraceRecorder::callImacro(jsbytecode* imacro)
 JS_REQUIRES_STACK RecordingStatus
 TraceRecorder::callImacroInfallibly(jsbytecode* imacro)
 {
-    JSStackFrame* fp = cx->fp();
+    StackFrame* fp = cx->fp();
     JS_ASSERT(!fp->hasImacropc());
-    JSFrameRegs* regs = cx->regs;
-    fp->setImacropc(regs->pc);
-    regs->pc = imacro;
+    FrameRegs& regs = cx->regs();
+    fp->setImacropc(regs.pc);
+    regs.pc = imacro;
     updateAtoms();
     return RECORD_IMACRO;
 }
@@ -8659,7 +8652,7 @@ TraceRecorder::ifop()
         return ARECORD_STOP;
     }
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     emitIf(pc, cond, x);
     return checkTraceEnd(pc);
 }
@@ -8721,7 +8714,7 @@ TraceRecorder::inc(const Value &v, LIns*& v_ins, Value &v_out, jsint incr, bool
     LIns* v_after;
     CHECK_STATUS(incHelper(v, v_ins, v_out, v_after, incr));
 
-    const JSCodeSpec& cs = js_CodeSpec[*cx->regs->pc];
+    const JSCodeSpec& cs = js_CodeSpec[*cx->regs().pc];
     JS_ASSERT(cs.ndefs == 1);
     stack(-cs.nuses, pre ? v_after : v_ins);
     v_ins = v_after;
@@ -9060,7 +9053,7 @@ TraceRecorder::equalityHelper(Value& l, Value& r, LIns* l_ins, LIns* r_ins,
         cond = !cond;
     }
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
 
     /*
      * Don't guard if the same path is always taken.  If it isn't, we have to
@@ -9195,7 +9188,7 @@ TraceRecorder::relational(LOpcode op, bool tryBranchAfterCond)
     }
     x = w.ins2(op, l_ins, r_ins);
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
 
     /*
      * Don't guard if the same path is always taken.  If it isn't, we have to
@@ -9421,7 +9414,7 @@ TraceRecorder::forgetGuardedShapes()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2, PCVal& pcval)
 {
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     JS_ASSERT(*pc != JSOP_INITPROP && *pc != JSOP_INITMETHOD &&
               *pc != JSOP_SETNAME && *pc != JSOP_SETPROP && *pc != JSOP_SETMETHOD);
 
@@ -9509,7 +9502,7 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2
     // enough to share mutable objects on the scope or proto chain, but we
     // don't care about such insane embeddings. Anyway, the (scope, proto)
     // entry->vcap coordinates must reach obj2 from aobj at this point.
-    JS_ASSERT(cx->thread->data.requestDepth);
+    JS_ASSERT(cx->thread()->data.requestDepth);
 #endif
 
     return InjectStatus(guardPropertyCacheHit(obj_ins, aobj, obj2, entry, pcval));
@@ -9534,7 +9527,7 @@ TraceRecorder::guardPropertyCacheHit(LIns* obj_ins,
         if (entry->adding())
             RETURN_STOP("adding a property to the global object");
 
-        JSOp op = js_GetOpcode(cx, cx->fp()->script(), cx->regs->pc);
+        JSOp op = js_GetOpcode(cx, cx->fp()->script(), cx->regs().pc);
         if (JOF_OPMODE(op) != JOF_NAME) {
             guard(true,
                   w.name(w.eqp(obj_ins, w.immpObjGC(globalObj)), "guard_global"),
@@ -9945,7 +9938,7 @@ TraceRecorder::unbox_int_id(LIns *id_ins)
 JS_REQUIRES_STACK RecordingStatus
 TraceRecorder::getThis(LIns*& this_ins)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
     if (fp->isGlobalFrame()) {
         // Top-level code. It is an invariant of the interpreter that fp->thisv
@@ -10131,7 +10124,7 @@ TraceRecorder::clearReturningFrameFromNativeTracker()
      */
     ClearSlotsVisitor visitor(nativeFrameTracker);
     VisitStackSlots(visitor, cx, 0);
-    Value *vp = cx->regs->sp;
+    Value *vp = cx->regs().sp;
     Value *vpend = cx->fp()->slots() + cx->fp()->script()->nslots;
     for (; vp < vpend; ++vp)
         nativeFrameTracker.set(vp, NULL);
@@ -10158,7 +10151,7 @@ class BoxArg
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::putActivationObjects()
 {
-    JSStackFrame *const fp = cx->fp();
+    StackFrame *const fp = cx->fp();
     bool have_args = fp->hasArgsObj() && !fp->argsObj().isStrictArguments();
     bool have_call = fp->isFunctionFrame() && fp->fun()->isHeavyweight();
 
@@ -10173,7 +10166,7 @@ TraceRecorder::putActivationObjects()
          * abort.  (In the case where the record-time property name is not
          * "arguments" but a later run-time property name is, we wouldn't have
          * emitted the call to js_PutArgumentsOnTrace(), and js_GetArgsValue()
-         * will deep bail asking for the top JSStackFrame.)
+         * will deep bail asking for the top StackFrame.)
          */
         RETURN_STOP_A("dodgy arguments access");
     }
@@ -10217,7 +10210,7 @@ TraceRecorder::putActivationObjects()
 
         LIns* scopeChain_ins = getFrameObjPtr(fp->addressOfScopeChain());
         LIns* args[] = { slots_ins, w.nameImmi(nslots), args_ins,
-                         w.nameImmi(fp->numFormalArgs()), scopeChain_ins, cx_ins };
+                         w.nameImmi(fp->numFormalArgs()), scopeChain_ins };
         w.call(&js_PutCallObjectOnTrace_ci, args);
     }
 
@@ -10227,7 +10220,7 @@ TraceRecorder::putActivationObjects()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_EnterFrame()
 {
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
 
     if (++callDepth >= MAX_CALLDEPTH)
         RETURN_STOP_A("exceeded maximum call depth");
@@ -10349,10 +10342,10 @@ TraceRecorder::record_EnterFrame()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_LeaveFrame()
 {
-    debug_only_stmt(JSStackFrame *fp = cx->fp();)
+    debug_only_stmt(StackFrame *fp = cx->fp();)
 
     JS_ASSERT(js_CodeSpec[js_GetOpcode(cx, fp->script(),
-              cx->regs->pc)].length == JSOP_CALL_LENGTH);
+              cx->regs().pc)].length == JSOP_CALL_LENGTH);
 
     if (callDepth-- <= 0)
         RETURN_STOP_A("returned out of a loop we started tracing");
@@ -10381,7 +10374,7 @@ TraceRecorder::record_JSOP_POPV()
     // trace JSOP_EVAL or leaving the frame where tracing started.
     LIns *fp_ins = entryFrameIns();
     box_value_into(rval, get(&rval), StackFrameAddress(fp_ins,
-                                                       JSStackFrame::offsetOfReturnValue()));
+                                                       StackFrame::offsetOfReturnValue()));
     return ARECORD_CONTINUE;
 }
 
@@ -10431,7 +10424,7 @@ TraceRecorder::record_JSOP_RETURN()
 
     /* If we inlined this function call, make the return value available to the caller code. */
     Value& rval = stackval(-1);
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     if (fp->isConstructing() && rval.isPrimitive()) {
         rval_ins = get(&fp->thisValue());
     } else {
@@ -10456,7 +10449,7 @@ TraceRecorder::record_JSOP_GOTO()
      * generate an always-taken loop exit guard.  For other downward gotos
      * (like if/else) continue recording.
      */
-    jssrcnote* sn = js_GetSrcNote(cx->fp()->script(), cx->regs->pc);
+    jssrcnote* sn = js_GetSrcNote(cx->fp()->script(), cx->regs().pc);
 
     if (sn) {
         if (SN_TYPE(sn) == SRC_BREAK) {
@@ -10477,7 +10470,7 @@ TraceRecorder::record_JSOP_GOTO()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_IFEQ()
 {
-    trackCfgMerges(cx->regs->pc);
+    trackCfgMerges(cx->regs().pc);
     return ifop();
 }
 
@@ -10503,7 +10496,7 @@ TraceRecorder::newArguments(LIns* callee_ins)
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARGUMENTS()
 {
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
 
     /* In an eval, 'arguments' will be a BINDNAME, which we don't trace. */
     JS_ASSERT(!fp->isEvalFrame());
@@ -10578,8 +10571,8 @@ TraceRecorder::record_JSOP_SWAP()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_PICK()
 {
-    Value* sp = cx->regs->sp;
-    jsint n = cx->regs->pc[1];
+    Value* sp = cx->regs().sp;
+    jsint n = cx->regs().pc[1];
     JS_ASSERT(sp - (n+1) >= cx->fp()->base());
     LIns* top = get(sp - (n+1));
     for (jsint i = 0; i < n; ++i)
@@ -10767,7 +10760,7 @@ TraceRecorder::record_JSOP_NEG()
          * we're not a double that's zero.
          */
         if (oracle &&
-            !oracle->isInstructionUndemotable(cx->regs->pc) &&
+            !oracle->isInstructionUndemotable(cx->regs().pc) &&
             IsPromotedInt32(a) &&
             (!v.isInt32() || v.toInt32() != 0) &&
             (!v.isDouble() || v.toDouble() != 0) &&
@@ -11118,8 +11111,8 @@ JS_REQUIRES_STACK RecordingStatus
 TraceRecorder::callSpecializedNative(JSNativeTraceInfo *trcinfo, uintN argc,
                                      bool constructing)
 {
-    JSStackFrame* const fp = cx->fp();
-    jsbytecode *pc = cx->regs->pc;
+    StackFrame* const fp = cx->fp();
+    jsbytecode *pc = cx->regs().pc;
 
     Value& fval = stackval(0 - (2 + argc));
     Value& tval = stackval(0 - (1 + argc));
@@ -11368,7 +11361,7 @@ TraceRecorder::callNative(uintN argc, JSOp mode)
                  * the result array, which can be expensive.  This requires
                  * that RegExp.prototype.test() hasn't been changed;  we check this.
                  */
-                if (!CallResultEscapes(cx->regs->pc)) {
+                if (!CallResultEscapes(cx->regs().pc)) {
                     JSObject* proto;
                     jsid id = ATOM_TO_JSID(cx->runtime->atomState.testAtom);
                     /* Get RegExp.prototype.test() and check it hasn't been changed. */
@@ -11608,7 +11601,7 @@ TraceRecorder::functionCall(uintN argc, JSOp mode)
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_NEW()
 {
-    uintN argc = GET_ARGC(cx->regs->pc);
+    uintN argc = GET_ARGC(cx->regs().pc);
     cx->assertValidStackDepth(argc + 2);
     return InjectStatus(functionCall(argc, JSOP_NEW));
 }
@@ -11675,7 +11668,7 @@ TraceRecorder::record_JSOP_DELPROP()
     if (&lval.toObject() == globalObj)
         RETURN_STOP_A("JSOP_DELPROP on global property");
 
-    JSAtom* atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom* atom = atoms[GET_INDEX(cx->regs().pc)];
 
     enterDeepBailCall();
     LIns* args[] = { strictModeCode_ins, w.immpAtomGC(atom), get(&lval), cx_ins };
@@ -12085,7 +12078,7 @@ TraceRecorder::record_AddProperty(JSObject *obj)
 
     // On trace, call js_Add{,Atom}Property to do the dirty work.
     LIns* args[] = { w.immpShapeGC(shape), obj_ins, cx_ins };
-    jsbytecode op = *cx->regs->pc;
+    jsbytecode op = *cx->regs().pc;
     bool isDefinitelyAtom = (op == JSOP_SETPROP);
     const CallInfo *ci = isDefinitelyAtom ? &js_AddAtomProperty_ci : &js_AddProperty_ci;
     LIns* ok_ins = w.call(ci, args);
@@ -12125,7 +12118,7 @@ TraceRecorder::setCallProp(JSObject *callobj, LIns *callobj_ins, const Shape *sh
                            LIns *v_ins, const Value &v)
 {
     // Set variables in on-trace-stack call objects by updating the tracker.
-    JSStackFrame *fp = frameIfInRange(callobj);
+    StackFrame *fp = frameIfInRange(callobj);
     if (fp) {
         if (shape->setterOp() == SetCallArg) {
             JS_ASSERT(shape->hasShortID());
@@ -12171,8 +12164,8 @@ TraceRecorder::setCallProp(JSObject *callobj, LIns *callobj_ins, const Shape *sh
         return RECORD_CONTINUE;
     }
 
-    // This is the hard case: we have a JSStackFrame private, but it's not in
-    // range.  During trace execution we may or may not have a JSStackFrame
+    // This is the hard case: we have a StackFrame private, but it's not in
+    // range.  During trace execution we may or may not have a StackFrame
     // anymore.  Call the standard builtins, which handle that situation.
 
     // Set variables in off-trace-stack call objects by calling standard builtins.
@@ -12214,7 +12207,7 @@ TraceRecorder::setProperty(JSObject* obj, LIns* obj_ins, const Value &v, LIns* v
 {
     *deferredp = false;
 
-    JSAtom *atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom *atom = atoms[GET_INDEX(cx->regs().pc)];
     jsid id = ATOM_TO_JSID(atom);
 
     if (obj->getOps()->setProperty)
@@ -12250,7 +12243,7 @@ TraceRecorder::setProperty(JSObject* obj, LIns* obj_ins, const Value &v, LIns* v
 
     // Handle setting an existing own property.
     if (pobj == obj) {
-        if (*cx->regs->pc == JSOP_SETMETHOD) {
+        if (*cx->regs().pc == JSOP_SETMETHOD) {
             if (shape->isMethod() && shape->methodObject() == v.toObject())
                 return RECORD_CONTINUE;
             RETURN_STOP("setmethod: property exists");
@@ -12329,7 +12322,7 @@ TraceRecorder::recordInitPropertyOp(jsbytecode op)
     Value& v = stackval(-1);
     LIns* v_ins = get(&v);
 
-    JSAtom* atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom* atom = atoms[GET_INDEX(cx->regs().pc)];
     jsid id = js_CheckForStringIndex(ATOM_TO_JSID(atom));
 
     // If obj already has this property (because JSOP_NEWOBJECT already set its
@@ -12403,7 +12396,7 @@ TraceRecorder::finishGetProp(LIns* obj_ins, LIns* vp_ins, LIns* ok_ins, Value* o
     JS_ASSERT(vp_ins->isop(LIR_allocp));
     LIns* result_ins = w.lddAlloc(vp_ins);
     set(outp, result_ins);
-    if (js_CodeSpec[*cx->regs->pc].format & JOF_CALLOP)
+    if (js_CodeSpec[*cx->regs().pc].format & JOF_CALLOP)
         set(outp + 1, obj_ins);
 
     // We need to guard on ok_ins, but this requires a snapshot of the state
@@ -12630,7 +12623,7 @@ TraceRecorder::getPropertyById(LIns* obj_ins, Value* outp)
 {
     // Find the atom.
     JSAtom* atom;
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     const JSCodeSpec& cs = js_CodeSpec[*pc];
     if (*pc == JSOP_LENGTH) {
         atom = cx->runtime->atomState.lengthAtom;
@@ -12713,8 +12706,8 @@ TraceRecorder::getPropertyWithScriptGetter(JSObject *obj, LIns* obj_ins, const S
     // the interpreter state and the tracker in the same way. This adjustment
     // is noted in imacros.jsasm with .fixup tags.
     Value getter = shape->getterValue();
-    Value*& sp = cx->regs->sp;
-    switch (*cx->regs->pc) {
+    Value*& sp = cx->regs().sp;
+    switch (*cx->regs().pc) {
       case JSOP_GETPROP:
         sp++;
         sp[-1] = sp[-2];
@@ -12840,7 +12833,7 @@ TraceRecorder::guardNotHole(LIns *argsobj_ins, LIns *idx_ins)
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETELEM()
 {
-    bool call = *cx->regs->pc == JSOP_CALLELEM;
+    bool call = *cx->regs().pc == JSOP_CALLELEM;
 
     Value& idx = stackval(-1);
     Value& lval = stackval(-2);
@@ -12888,7 +12881,7 @@ TraceRecorder::record_JSOP_GETELEM()
 
         // Only trace reading arguments out of active, tracked frame
         unsigned depth;
-        JSStackFrame *afp = guardArguments(obj, obj_ins, &depth);
+        StackFrame *afp = guardArguments(obj, obj_ins, &depth);
         if (afp) {
             Value* vp = &afp->canonicalActualArg(int_idx);
             if (idx_ins->isImmD()) {
@@ -13134,7 +13127,7 @@ TraceRecorder::setElem(int lval_spindex, int idx_spindex, int v_spindex)
         if (!idx.isPrimitive())
             RETURN_STOP_A("non-primitive index");
         CHECK_STATUS_A(initOrSetPropertyByName(obj_ins, &idx, &v,
-                                             *cx->regs->pc == JSOP_INITELEM));
+                                             *cx->regs().pc == JSOP_INITELEM));
     } else if (OkToTraceTypedArrays && js_IsTypedArray(obj)) {
         // Fast path: assigning to element of typed array.
         VMSideExit* branchExit = snapshot(BRANCH_EXIT);
@@ -13240,7 +13233,7 @@ TraceRecorder::setElem(int lval_spindex, int idx_spindex, int v_spindex)
         }
     } else if (idx.toInt32() < 0 || !obj->isDenseArray()) {
         CHECK_STATUS_A(initOrSetPropertyByIndex(obj_ins, idx_ins, &v,
-                                                *cx->regs->pc == JSOP_INITELEM));
+                                                *cx->regs().pc == JSOP_INITELEM));
     } else {
         // Fast path: assigning to element of dense array.
         VMSideExit* branchExit = snapshot(BRANCH_EXIT);
@@ -13308,7 +13301,7 @@ TraceRecorder::setElem(int lval_spindex, int idx_spindex, int v_spindex)
         box_value_into(v, v_ins, dslotAddr);
     }
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     if (*pc == JSOP_SETELEM && pc[JSOP_SETELEM_LENGTH] != JSOP_POP)
         set(&lval, v_ins);
 
@@ -13420,7 +13413,7 @@ TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, Value& v)
      */
     uint32 level = script->staticLevel - cookie.level();
     uint32 cookieSlot = cookie.slot();
-    JSStackFrame* fp = cx->findFrameAtLevel(level);
+    StackFrame* fp = cx->stack.findFrameAtLevel(level);
     const CallInfo* ci;
     int32 slot;
     if (!fp->isFunctionFrame() || fp->isEvalFrame()) {
@@ -13489,7 +13482,7 @@ TraceRecorder::record_JSOP_GETFCSLOT()
 
     LIns* upvars_ins = w.getObjPrivatizedSlot(callee_ins, JSObject::JSSLOT_FLAT_CLOSURE_UPVARS);
 
-    unsigned index = GET_UINT16(cx->regs->pc);
+    unsigned index = GET_UINT16(cx->regs().pc);
     LIns *v_ins = unbox_value(callee.getFlatClosureUpvar(index),
                               FCSlotsAddress(upvars_ins, index),
                               snapshot(BRANCH_EXIT));
@@ -13531,7 +13524,7 @@ TraceRecorder::guardCallee(Value& callee)
      *
      * As long as we guard on parent scope, we are guaranteed when recording
      * variable accesses for a Call object having no private data that we can
-     * emit code that avoids checking for an active JSStackFrame for the Call
+     * emit code that avoids checking for an active StackFrame for the Call
      * object (which would hold fresh variable values -- the Call object's
      * slots would be stale until the stack frame is popped). This is because
      * Call objects can't pick up a new stack frame in their private slot once
@@ -13570,12 +13563,12 @@ TraceRecorder::guardCallee(Value& callee)
  * the current trace and is guaranteed to refer to the same frame on trace for
  * all later executions.
  */
-JS_REQUIRES_STACK JSStackFrame *
+JS_REQUIRES_STACK StackFrame *
 TraceRecorder::guardArguments(JSObject *obj, LIns* obj_ins, unsigned *depthp)
 {
     JS_ASSERT(obj->isArguments());
 
-    JSStackFrame *afp = frameIfInRange(obj, depthp);
+    StackFrame *afp = frameIfInRange(obj, depthp);
     if (!afp)
         return NULL;
 
@@ -13645,7 +13638,7 @@ TraceRecorder::interpretedFunctionCall(Value& fval, JSFunction* fun, uintN argc,
     if (fval.toObject().getGlobal() != globalObj)
         RETURN_STOP("JSOP_CALL or JSOP_NEW crosses global scopes");
 
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
 
     if (constructing) {
         LIns* thisobj_ins;
@@ -13665,9 +13658,9 @@ TraceRecorder::interpretedFunctionCall(Value& fval, JSFunction* fun, uintN argc,
     JS_ASSERT(argc < FrameInfo::CONSTRUCTING_FLAG);
 
     tree->gcthings.addUnique(fval);
-    fi->pc = cx->regs->pc;
+    fi->pc = cx->regs().pc;
     fi->imacpc = fp->maybeImacropc();
-    fi->spdist = cx->regs->sp - fp->slots();
+    fi->spdist = cx->regs().sp - fp->slots();
     fi->set_argc(uint16(argc), constructing);
     fi->callerHeight = stackSlots - (2 + argc);
     fi->callerArgc = fp->hasArgs() ? fp->numActualArgs() : 0;
@@ -13696,7 +13689,7 @@ TraceRecorder::interpretedFunctionCall(Value& fval, JSFunction* fun, uintN argc,
  * We implement JSOP_FUNAPPLY/JSOP_FUNCALL using imacros
  */
 static inline JSOp
-GetCallMode(JSStackFrame *fp)
+GetCallMode(StackFrame *fp)
 {
     if (fp->hasImacropc()) {
         JSOp op = (JSOp) *fp->imacropc();
@@ -13709,7 +13702,7 @@ GetCallMode(JSStackFrame *fp)
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_CALL()
 {
-    uintN argc = GET_ARGC(cx->regs->pc);
+    uintN argc = GET_ARGC(cx->regs().pc);
     cx->assertValidStackDepth(argc + 2);
     return InjectStatus(functionCall(argc, GetCallMode(cx->fp())));
 }
@@ -13747,11 +13740,11 @@ TraceRecorder::record_JSOP_FUNCALL()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_FUNAPPLY()
 {
-    jsbytecode *pc = cx->regs->pc;
+    jsbytecode *pc = cx->regs().pc;
     uintN argc = GET_ARGC(pc);
     cx->assertValidStackDepth(argc + 2);
 
-    Value* vp = cx->regs->sp - (argc + 2);
+    Value* vp = cx->regs().sp - (argc + 2);
     jsuint length = 0;
     JSObject* aobj = NULL;
     LIns* aobj_ins = NULL;
@@ -13805,7 +13798,7 @@ TraceRecorder::record_JSOP_FUNAPPLY()
                   BRANCH_EXIT);
         } else if (aobj->isArguments()) {
             unsigned depth;
-            JSStackFrame *afp = guardArguments(aobj, aobj_ins, &depth);
+            StackFrame *afp = guardArguments(aobj, aobj_ins, &depth);
             if (!afp)
                 RETURN_STOP_A("can't reach arguments object's frame");
             if (aobj->isArgsLengthOverridden())
@@ -13836,7 +13829,7 @@ TraceRecorder::record_NativeCallComplete()
 
 #ifdef DEBUG
     JS_ASSERT(pendingSpecializedNative);
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_FUNCALL || *pc == JSOP_FUNAPPLY ||
               *pc == JSOP_NEW || *pc == JSOP_SETPROP);
 #endif
@@ -13900,7 +13893,7 @@ TraceRecorder::record_NativeCallComplete()
          * value is actually currently associated with that location, and that we are talking
          * about the top of the stack here, which is where we expected boxed values.
          */
-        JS_ASSERT(&v == &cx->regs->sp[-1] && get(&v) == v_ins);
+        JS_ASSERT(&v == &cx->regs().sp[-1] && get(&v) == v_ins);
         set(&v, unbox_value(v, AllocSlotsAddress(native_rval_ins), snapshot(BRANCH_EXIT)));
     } else if (pendingSpecializedNative->flags &
                (JSTN_RETURN_NULLABLE_STR | JSTN_RETURN_NULLABLE_OBJ)) {
@@ -13927,7 +13920,7 @@ JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::name(Value*& vp, LIns*& ins, NameResult& nr)
 {
     JSObject* obj = &cx->fp()->scopeChain();
-    JSOp op = JSOp(*cx->regs->pc);
+    JSOp op = JSOp(*cx->regs().pc);
     if (js_CodeSpec[op].format & JOF_GNAME)
         obj = obj->getGlobal();
     if (obj != globalObj)
@@ -14063,7 +14056,7 @@ JS_REQUIRES_STACK RecordingStatus
 TraceRecorder::propTail(JSObject* obj, LIns* obj_ins, JSObject* obj2, PCVal pcval,
                         uint32 *slotp, LIns** v_insp, Value *outp)
 {
-    const JSCodeSpec& cs = js_CodeSpec[*cx->regs->pc];
+    const JSCodeSpec& cs = js_CodeSpec[*cx->regs().pc];
     uint32 setflags = (cs.format & (JOF_INCDEC | JOF_FOR));
     JS_ASSERT(!(cs.format & JOF_SET));
 
@@ -14304,7 +14297,7 @@ TraceRecorder::typedArrayElement(Value& oval, Value& ival, Value*& vp, LIns*& v_
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::getProp(JSObject* obj, LIns* obj_ins)
 {
-    JSOp op = JSOp(*cx->regs->pc);
+    JSOp op = JSOp(*cx->regs().pc);
     const JSCodeSpec& cs = js_CodeSpec[op];
 
     JS_ASSERT(cs.ndefs == 1);
@@ -14334,7 +14327,7 @@ TraceRecorder::record_JSOP_NAME()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_DOUBLE()
 {
-    double d = consts[GET_INDEX(cx->regs->pc)].toDouble();
+    double d = consts[GET_INDEX(cx->regs().pc)].toDouble();
     stack(0, w.immd(d));
     return ARECORD_CONTINUE;
 }
@@ -14342,7 +14335,7 @@ TraceRecorder::record_JSOP_DOUBLE()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_STRING()
 {
-    JSAtom* atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom* atom = atoms[GET_INDEX(cx->regs().pc)];
     stack(0, w.immpAtomGC(atom));
     return ARECORD_CONTINUE;
 }
@@ -14432,9 +14425,9 @@ TraceRecorder::record_JSOP_STRICTNE()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_OBJECT()
 {
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
     JSScript* script = fp->script();
-    unsigned index = atoms - script->atomMap.vector + GET_INDEX(cx->regs->pc);
+    unsigned index = atoms - script->atomMap.vector + GET_INDEX(cx->regs().pc);
 
     JSObject* obj;
     obj = script->getObject(index);
@@ -14457,35 +14450,35 @@ TraceRecorder::record_JSOP_TRAP()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETARG()
 {
-    stack(0, arg(GET_ARGNO(cx->regs->pc)));
+    stack(0, arg(GET_ARGNO(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_SETARG()
 {
-    arg(GET_ARGNO(cx->regs->pc), stack(-1));
+    arg(GET_ARGNO(cx->regs().pc), stack(-1));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETLOCAL()
 {
-    stack(0, var(GET_SLOTNO(cx->regs->pc)));
+    stack(0, var(GET_SLOTNO(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_SETLOCAL()
 {
-    var(GET_SLOTNO(cx->regs->pc), stack(-1));
+    var(GET_SLOTNO(cx->regs().pc), stack(-1));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_UINT16()
 {
-    stack(0, w.immd(GET_UINT16(cx->regs->pc)));
+    stack(0, w.immd(GET_UINT16(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
@@ -14495,7 +14488,7 @@ TraceRecorder::record_JSOP_NEWINIT()
     initDepth++;
     hadNewInit = true;
 
-    JSProtoKey key = JSProtoKey(cx->regs->pc[1]);
+    JSProtoKey key = JSProtoKey(cx->regs().pc[1]);
 
     LIns* proto_ins;
     CHECK_STATUS_A(getClassPrototype(key, proto_ins));
@@ -14521,7 +14514,7 @@ TraceRecorder::record_JSOP_NEWARRAY()
     LIns* proto_ins;
     CHECK_STATUS_A(getClassPrototype(JSProto_Array, proto_ins));
 
-    unsigned count = GET_UINT24(cx->regs->pc);
+    unsigned count = GET_UINT24(cx->regs().pc);
     LIns *args[] = { proto_ins, w.immi(count), cx_ins };
     LIns *v_ins = w.call(&NewDenseAllocatedArray_ci, args);
 
@@ -14606,49 +14599,49 @@ TraceRecorder::record_JSOP_USESHARP()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INCARG()
 {
-    return InjectStatus(inc(argval(GET_ARGNO(cx->regs->pc)), 1));
+    return InjectStatus(inc(argval(GET_ARGNO(cx->regs().pc)), 1));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INCLOCAL()
 {
-    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs->pc)), 1));
+    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs().pc)), 1));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_DECARG()
 {
-    return InjectStatus(inc(argval(GET_ARGNO(cx->regs->pc)), -1));
+    return InjectStatus(inc(argval(GET_ARGNO(cx->regs().pc)), -1));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_DECLOCAL()
 {
-    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs->pc)), -1));
+    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs().pc)), -1));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARGINC()
 {
-    return InjectStatus(inc(argval(GET_ARGNO(cx->regs->pc)), 1, false));
+    return InjectStatus(inc(argval(GET_ARGNO(cx->regs().pc)), 1, false));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_LOCALINC()
 {
-    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs->pc)), 1, false));
+    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs().pc)), 1, false));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARGDEC()
 {
-    return InjectStatus(inc(argval(GET_ARGNO(cx->regs->pc)), -1, false));
+    return InjectStatus(inc(argval(GET_ARGNO(cx->regs().pc)), -1, false));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_LOCALDEC()
 {
-    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs->pc)), -1, false));
+    return InjectStatus(inc(varval(GET_SLOTNO(cx->regs().pc)), -1, false));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
@@ -14684,7 +14677,7 @@ TraceRecorder::record_JSOP_ITER()
     RETURN_IF_XML_A(v);
 
     LIns *obj_ins = get(&v);
-    jsuint flags = cx->regs->pc[1];
+    jsuint flags = cx->regs().pc[1];
 
     enterDeepBailCall();
 
@@ -14700,7 +14693,7 @@ TraceRecorder::record_JSOP_ITER()
     // unknown type in *vp (it can be either a function or a non-function
     // object). Use the same mechanism as finishGetProp to arrange for
     // LeaveTree to deal with this value.
-    pendingUnboxSlot = cx->regs->sp - 1;
+    pendingUnboxSlot = cx->regs().sp - 1;
     set(pendingUnboxSlot, w.name(w.lddAlloc(vp_ins), "iterval"));
 
     leaveDeepBailCall();
@@ -14927,7 +14920,7 @@ TraceRecorder::record_JSOP_FORARG()
 {
     LIns* v_ins;
     CHECK_STATUS_A(unboxNextValue(v_ins));
-    arg(GET_ARGNO(cx->regs->pc), v_ins);
+    arg(GET_ARGNO(cx->regs().pc), v_ins);
     return ARECORD_CONTINUE;
 }
 
@@ -14936,7 +14929,7 @@ TraceRecorder::record_JSOP_FORLOCAL()
 {
     LIns* v_ins;
     CHECK_STATUS_A(unboxNextValue(v_ins));
-    var(GET_SLOTNO(cx->regs->pc), v_ins);
+    var(GET_SLOTNO(cx->regs().pc), v_ins);
     return ARECORD_CONTINUE;
 }
 
@@ -15052,14 +15045,14 @@ JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_BINDNAME()
 {
     TraceMonitor *localtm = traceMonitor;
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
     JSObject *obj;
 
     if (!fp->isFunctionFrame()) {
         obj = &fp->scopeChain();
 
 #ifdef DEBUG
-        JSStackFrame *fp2 = fp;
+        StackFrame *fp2 = fp;
 #endif
 
         /*
@@ -15122,7 +15115,7 @@ TraceRecorder::record_JSOP_BINDNAME()
     LIns *obj_ins = w.ldpObjParent(get(callee));
 
     // Find the target object.
-    JSAtom *atom = atoms[GET_INDEX(cx->regs->pc)];
+    JSAtom *atom = atoms[GET_INDEX(cx->regs().pc)];
     jsid id = ATOM_TO_JSID(atom);
     JSObject *obj2 = js_FindIdentifierBase(cx, &fp->scopeChain(), id);
     if (!obj2)
@@ -15233,7 +15226,7 @@ TraceRecorder::record_JSOP_IN()
      * The interpreter fuses comparisons and the following branch, so we have
      * to do that here as well.
      */
-    jsbytecode *pc = cx->regs->pc;
+    jsbytecode *pc = cx->regs().pc;
     fuseIf(pc + 1, cond, x);
 
     /* If the branch was to a loop header, we may need to close it. */
@@ -15401,7 +15394,7 @@ TraceRecorder::record_JSOP_DEFVAR()
 jsatomid
 TraceRecorder::getFullIndex(ptrdiff_t pcoff)
 {
-    jsatomid index = GET_INDEX(cx->regs->pc + pcoff);
+    jsatomid index = GET_INDEX(cx->regs().pc + pcoff);
     index += atoms - cx->fp()->script()->atomMap.vector;
     return index;
 }
@@ -15427,7 +15420,7 @@ TraceRecorder::record_JSOP_LAMBDA()
      * must agree with the corresponding break-from-do-while(0) logic there.
      */
     if (FUN_NULL_CLOSURE(fun) && FUN_OBJECT(fun)->getParent() == &cx->fp()->scopeChain()) {
-        jsbytecode *pc2 = AdvanceOverBlockchainOp(cx->regs->pc + JSOP_LAMBDA_LENGTH);
+        jsbytecode *pc2 = AdvanceOverBlockchainOp(cx->regs().pc + JSOP_LAMBDA_LENGTH);
         JSOp op2 = JSOp(*pc2);
 
         if (op2 == JSOP_INITMETHOD) {
@@ -15458,7 +15451,7 @@ TraceRecorder::record_JSOP_LAMBDA()
                  * so regs.sp[1 - (iargc + 2)], and not regs.sp[-(iargc + 2)],
                  * is the callee for this JSOP_CALL.
                  */
-                const Value &cref = cx->regs->sp[1 - (iargc + 2)];
+                const Value &cref = cx->regs().sp[1 - (iargc + 2)];
                 JSObject *callee;
 
                 if (IsFunctionObject(cref, &callee)) {
@@ -15556,7 +15549,7 @@ TraceRecorder::record_JSOP_CALLEE()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_SETLOCALPOP()
 {
-    var(GET_SLOTNO(cx->regs->pc), stack(-1));
+    var(GET_SLOTNO(cx->regs().pc), stack(-1));
     return ARECORD_CONTINUE;
 }
 
@@ -15597,7 +15590,7 @@ TraceRecorder::record_JSOP_NOP()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARGSUB()
 {
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
 
     /*
      * The arguments object or its absence in the frame is part of the typemap,
@@ -15606,7 +15599,7 @@ TraceRecorder::record_JSOP_ARGSUB()
      * extent ARGCNT are emitted to avoid arguments object creation.
      */
     if (!fp->hasArgsObj() && !fp->fun()->isHeavyweight()) {
-        uintN slot = GET_ARGNO(cx->regs->pc);
+        uintN slot = GET_ARGNO(cx->regs().pc);
         if (slot >= fp->numActualArgs())
             RETURN_STOP_A("can't trace out-of-range arguments");
 
@@ -15630,7 +15623,7 @@ TraceRecorder::guardArgsLengthNotAssigned(LIns* argsobj_ins)
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARGCNT()
 {
-    JSStackFrame * const fp = cx->fp();
+    StackFrame * const fp = cx->fp();
 
     if (fp->fun()->flags & JSFUN_HEAVYWEIGHT)
         RETURN_STOP_A("can't trace heavyweight JSOP_ARGCNT");
@@ -15779,9 +15772,9 @@ TraceRecorder::record_JSOP_RETRVAL()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_REGEXP()
 {
-    JSStackFrame* const fp = cx->fp();
+    StackFrame* const fp = cx->fp();
     JSScript* script = fp->script();
-    unsigned index = atoms - script->atomMap.vector + GET_INDEX(cx->regs->pc);
+    unsigned index = atoms - script->atomMap.vector + GET_INDEX(cx->regs().pc);
 
     LIns* proto_ins;
     CHECK_STATUS_A(getClassPrototype(JSProto_RegExp, proto_ins));
@@ -16021,14 +16014,14 @@ TraceRecorder::record_JSOP_DELDESC()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_UINT24()
 {
-    stack(0, w.immd(GET_UINT24(cx->regs->pc)));
+    stack(0, w.immd(GET_UINT24(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INDEXBASE()
 {
-    atoms += GET_INDEXBASE(cx->regs->pc);
+    atoms += GET_INDEXBASE(cx->regs().pc);
     return ARECORD_CONTINUE;
 }
 
@@ -16055,7 +16048,7 @@ TraceRecorder::record_JSOP_CALLELEM()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_STOP()
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
     /* A return from callDepth 0 terminates the current loop, except for recursion. */
     if (callDepth == 0 && !fp->hasImacropc()) {
@@ -16067,7 +16060,7 @@ TraceRecorder::record_JSOP_STOP()
         /*
          * End of imacro, so return true to the interpreter immediately. The
          * interpreter's JSOP_STOP case will return from the imacro, back to
-         * the pc after the calling op, still in the same JSStackFrame.
+         * the pc after the calling op, still in the same StackFrame.
          */
         updateAtoms(fp->script());
         return ARECORD_CONTINUE;
@@ -16158,9 +16151,9 @@ TraceRecorder::record_JSOP_YIELD()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_ARRAYPUSH()
 {
-    uint32_t slot = GET_UINT16(cx->regs->pc);
+    uint32_t slot = GET_UINT16(cx->regs().pc);
     JS_ASSERT(cx->fp()->numFixed() <= slot);
-    JS_ASSERT(cx->fp()->slots() + slot < cx->regs->sp - 1);
+    JS_ASSERT(cx->fp()->slots() + slot < cx->regs().sp - 1);
     Value &arrayval = cx->fp()->slots()[slot];
     JS_ASSERT(arrayval.isObject());
     LIns *array_ins = get(&arrayval);
@@ -16186,7 +16179,7 @@ JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_LEAVEBLOCKEXPR()
 {
     LIns* v_ins = stack(-1);
-    int n = -1 - GET_UINT16(cx->regs->pc);
+    int n = -1 - GET_UINT16(cx->regs().pc);
     stack(n, v_ins);
     return ARECORD_CONTINUE;
 }
@@ -16213,13 +16206,13 @@ TraceRecorder::record_JSOP_GETTHISPROP()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETARGPROP()
 {
-    return getProp(argval(GET_ARGNO(cx->regs->pc)));
+    return getProp(argval(GET_ARGNO(cx->regs().pc)));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETLOCALPROP()
 {
-    return getProp(varval(GET_SLOTNO(cx->regs->pc)));
+    return getProp(varval(GET_SLOTNO(cx->regs().pc)));
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
@@ -16246,7 +16239,7 @@ TraceRecorder::record_JSOP_INDEXBASE3()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_CALLLOCAL()
 {
-    uintN slot = GET_SLOTNO(cx->regs->pc);
+    uintN slot = GET_SLOTNO(cx->regs().pc);
     stack(0, var(slot));
     stack(1, w.immiUndefined());
     return ARECORD_CONTINUE;
@@ -16255,7 +16248,7 @@ TraceRecorder::record_JSOP_CALLLOCAL()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_CALLARG()
 {
-    uintN slot = GET_ARGNO(cx->regs->pc);
+    uintN slot = GET_ARGNO(cx->regs().pc);
     stack(0, arg(slot));
     stack(1, w.immiUndefined());
     return ARECORD_CONTINUE;
@@ -16271,14 +16264,14 @@ TraceRecorder::record_JSOP_BINDGNAME()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INT8()
 {
-    stack(0, w.immd(GET_INT8(cx->regs->pc)));
+    stack(0, w.immd(GET_INT8(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INT32()
 {
-    stack(0, w.immd(GET_INT32(cx->regs->pc)));
+    stack(0, w.immd(GET_INT32(cx->regs().pc)));
     return ARECORD_CONTINUE;
 }
 
@@ -16298,7 +16291,7 @@ TraceRecorder::record_JSOP_LENGTH()
 
     if (obj->isArguments()) {
         unsigned depth;
-        JSStackFrame *afp = guardArguments(obj, obj_ins, &depth);
+        StackFrame *afp = guardArguments(obj, obj_ins, &depth);
         if (!afp)
             RETURN_STOP_A("can't reach arguments object's frame");
 
@@ -16383,7 +16376,7 @@ JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_UNBRANDTHIS()
 {
     /* In case of primitive this, do nothing. */
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     if (fp->fun()->inStrictMode() && !fp->thisValue().isObject())
         return ARECORD_CONTINUE;
 
@@ -16407,7 +16400,7 @@ TraceRecorder::record_JSOP_SHARPINIT()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_GETGLOBAL()
 {
-    uint32 slot = cx->fp()->script()->getGlobalSlot(GET_SLOTNO(cx->regs->pc));
+    uint32 slot = cx->fp()->script()->getGlobalSlot(GET_SLOTNO(cx->regs().pc));
     if (!lazilyImportGlobalSlot(slot))
          RETURN_STOP_A("lazy import of global slot failed");
 
@@ -16418,7 +16411,7 @@ TraceRecorder::record_JSOP_GETGLOBAL()
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_CALLGLOBAL()
 {
-    uint32 slot = cx->fp()->script()->getGlobalSlot(GET_SLOTNO(cx->regs->pc));
+    uint32 slot = cx->fp()->script()->getGlobalSlot(GET_SLOTNO(cx->regs().pc));
     if (!lazilyImportGlobalSlot(slot))
          RETURN_STOP_A("lazy import of global slot failed");
 
@@ -16641,8 +16634,8 @@ JS_REQUIRES_STACK TracePointAction
 RecordTracePoint(JSContext* cx, TraceMonitor* tm,
                  uintN& inlineCallCount, bool* blacklist, bool execAllowed)
 {
-    JSStackFrame* fp = cx->fp();
-    jsbytecode* pc = cx->regs->pc;
+    StackFrame* fp = cx->fp();
+    jsbytecode* pc = cx->regs().pc;
 
     JS_ASSERT(!tm->recorder);
     JS_ASSERT(!tm->profile);
@@ -16695,9 +16688,9 @@ RecordTracePoint(JSContext* cx, TraceMonitor* tm,
               case MUL_ZERO_EXIT:
               case OVERFLOW_EXIT:
                 if (lr->exitType == MUL_ZERO_EXIT)
-                    tm->oracle->markInstructionSlowZeroTest(cx->regs->pc);
+                    tm->oracle->markInstructionSlowZeroTest(cx->regs().pc);
                 else
-                    tm->oracle->markInstructionUndemotable(cx->regs->pc);
+                    tm->oracle->markInstructionUndemotable(cx->regs().pc);
                 /* FALL THROUGH */
               case BRANCH_EXIT:
                 if (!AttemptToExtendTree(cx, tm, lr, NULL, NULL, NULL))
@@ -16746,7 +16739,7 @@ RecordTracePoint(JSContext* cx, TraceMonitor* tm,
     return TPA_RanStuff;
 }
 
-LoopProfile::LoopProfile(TraceMonitor *tm, JSStackFrame *entryfp,
+LoopProfile::LoopProfile(TraceMonitor *tm, StackFrame *entryfp,
                          jsbytecode *top, jsbytecode *bottom)
     : traceMonitor(tm),
       entryScript(entryfp->script()),
@@ -16782,13 +16775,13 @@ LoopProfile::reset()
 MonitorResult
 LoopProfile::profileLoopEdge(JSContext* cx, uintN& inlineCallCount)
 {
-    if (cx->regs->pc == top) {
+    if (cx->regs().pc == top) {
         debug_only_print0(LC_TMProfiler, "Profiling complete (edge)\n");
         decide(cx);
     } else {
         /* Record an inner loop invocation. */
-        JSStackFrame *fp = cx->fp();
-        jsbytecode *pc = cx->regs->pc;
+        StackFrame *fp = cx->fp();
+        jsbytecode *pc = cx->regs().pc;
         bool found = false;
 
         /* We started with the most deeply nested one first, since it gets hit most often.*/
@@ -16814,7 +16807,7 @@ static const uintN MAX_PROFILE_OPS = 4096;
 static jsbytecode *
 GetLoopBottom(JSContext *cx)
 {
-    return GetLoopBottom(cx, cx->regs->pc);
+    return GetLoopBottom(cx, cx->regs().pc);
 }
 
 static LoopProfile *
@@ -16842,7 +16835,7 @@ LookupOrAddProfile(JSContext *cx, TraceMonitor *tm, void** traceData, uintN *tra
     if (*traceData && *traceEpoch == tm->flushEpoch) {
         prof = (LoopProfile *)*traceData;
     } else {
-        jsbytecode* pc = cx->regs->pc;
+        jsbytecode* pc = cx->regs().pc;
         jsbytecode* bottom = GetLoopBottom(cx);
         if (!bottom)
             return NULL;
@@ -16853,7 +16846,7 @@ LookupOrAddProfile(JSContext *cx, TraceMonitor *tm, void** traceData, uintN *tra
     }
 #else
     LoopProfileMap &table = *tm->loopProfiles;
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     if (LoopProfileMap::AddPtr p = table.lookupForAdd(pc)) {
         prof = p->value;
     } else {
@@ -16910,7 +16903,7 @@ MonitorTracePoint(JSContext *cx, uintN& inlineCallCount, bool* blacklist,
     if (TRACE_PROFILER(cx))
         return TPA_Nothing;
 
-    jsbytecode* pc = cx->regs->pc;
+    jsbytecode* pc = cx->regs().pc;
     LoopProfile *prof = LookupOrAddProfile(cx, tm, traceData, traceEpoch);
     if (!prof) {
         *blacklist = true;
@@ -16921,7 +16914,7 @@ MonitorTracePoint(JSContext *cx, uintN& inlineCallCount, bool* blacklist,
     if (prof->hits < PROFILE_HOTLOOP)
         return TPA_Nothing;
 
-    AutoRetBlacklist autoRetBlacklist(cx->regs->pc, blacklist);
+    AutoRetBlacklist autoRetBlacklist(cx->regs().pc, blacklist);
 
     if (prof->profiled) {
         if (prof->traceOK) {
@@ -16963,7 +16956,7 @@ MonitorTracePoint(JSContext *cx, uintN& inlineCallCount, bool* blacklist,
  */
 template<class T>
 static inline bool
-PCWithinLoop(JSStackFrame *fp, jsbytecode *pc, T& loop)
+PCWithinLoop(StackFrame *fp, jsbytecode *pc, T& loop)
 {
     return fp > loop.entryfp || (fp == loop.entryfp && pc >= loop.top && pc <= loop.bottom);
 }
@@ -16981,8 +16974,8 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         return ProfComplete;
     }
 
-    jsbytecode *pc = cx->regs->pc;
-    JSStackFrame *fp = cx->fp();
+    jsbytecode *pc = cx->regs().pc;
+    StackFrame *fp = cx->fp();
     JSScript *script = fp->script();
 
     if (!PCWithinLoop(fp, pc, *this)) {
@@ -17020,8 +17013,8 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
     }
 
     if (op == JSOP_ADD || op == JSOP_SUB || op == JSOP_MUL || op == JSOP_DIV) {
-        Value& v1 = cx->regs->sp[-1];
-        Value& v2 = cx->regs->sp[-2];
+        Value& v1 = cx->regs().sp[-1];
+        Value& v2 = cx->regs().sp[-2];
 
         /* If either operand is a double, treat it as a floating-point op. */
         if (v1.isDouble() || v2.isDouble())
@@ -17046,7 +17039,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         increment(OP_NEW);
 
     if (op == JSOP_GETELEM || op == JSOP_SETELEM) {
-        Value& lval = cx->regs->sp[op == JSOP_GETELEM ? -2 : -3];
+        Value& lval = cx->regs().sp[op == JSOP_GETELEM ? -2 : -3];
         if (lval.isObject() && js_IsTypedArray(&lval.toObject()))
             increment(OP_TYPED_ARRAY);
         else if (lval.isObject() && lval.toObject().isDenseArray() && op == JSOP_GETELEM)
@@ -17059,7 +17052,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         /* Try to see if it's a scripted getter, which is faster in the tracer. */
         Value v = UndefinedValue();
         if (op == JSOP_GETPROP || op == JSOP_CALLPROP) {
-            v = cx->regs->sp[-1];
+            v = cx->regs().sp[-1];
         } else if (op == JSOP_GETARGPROP) {
             uint32 slot = GET_ARGNO(pc);
             JS_ASSERT(slot < fp->numFormalArgs());
@@ -17089,8 +17082,8 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
     if (op == JSOP_CALL) {
         increment(OP_CALL);
 
-        uintN argc = GET_ARGC(cx->regs->pc);
-        Value &v = cx->regs->sp[-((int)argc + 2)];
+        uintN argc = GET_ARGC(cx->regs().pc);
+        Value &v = cx->regs().sp[-((int)argc + 2)];
         JSObject *callee;
         if (IsFunctionObject(v, &callee)) {
             JSFunction *fun = callee->getFunctionPrivate();
@@ -17125,7 +17118,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
     }
 
     /* These are the places where the interpreter skips over branches. */
-    jsbytecode *testPC = cx->regs->pc;
+    jsbytecode *testPC = cx->regs().pc;
     if (op == JSOP_EQ || op == JSOP_NE || op == JSOP_LT || op == JSOP_GT
         || op == JSOP_LE || op == JSOP_GE || op == JSOP_IN || op == JSOP_MOREITER)
     {
@@ -17133,9 +17126,9 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         ptrdiff_t oplen = cs->length;
         JS_ASSERT(oplen != -1);
 
-        if (cx->regs->pc - script->code + oplen < ptrdiff_t(script->length))
-            if (cx->regs->pc[oplen] == JSOP_IFEQ || cx->regs->pc[oplen] == JSOP_IFNE)
-                testPC = cx->regs->pc + oplen;
+        if (cx->regs().pc - script->code + oplen < ptrdiff_t(script->length))
+            if (cx->regs().pc[oplen] == JSOP_IFEQ || cx->regs().pc[oplen] == JSOP_IFNE)
+                testPC = cx->regs().pc + oplen;
     }
 
     /* Check if we're exiting the loop being profiled. */
@@ -17151,7 +17144,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         }
 
         if (testPC + len == top && (op == JSOP_LT || op == JSOP_LE)
-            && cx->regs->sp[-2].isInt32() && cx->regs->sp[-2].toInt32() < 16)
+            && cx->regs().sp[-2].isInt32() && cx->regs().sp[-2].toInt32() < 16)
         {
             maybeShortLoop = true;
         }
@@ -17170,7 +17163,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
     }
 
     if (op == JSOP_INT8) {
-        stackPush(StackValue(true, GET_INT8(cx->regs->pc)));
+        stackPush(StackValue(true, GET_INT8(cx->regs().pc)));
     } else if (op == JSOP_STRING) {
         stackPush(StackValue(true));
     } else if (op == JSOP_TYPEOF || op == JSOP_TYPEOFEXPR) {
@@ -17180,7 +17173,7 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
         StackValue v2 = stackAt(-2);
         stackPush(StackValue(v1.isConst && v2.isConst));
     } else if (op == JSOP_AND) {
-        bool b = !!js_ValueToBoolean(cx->regs->sp[-1]);
+        bool b = !!js_ValueToBoolean(cx->regs().sp[-1]);
         StackValue v = stackAt(-1);
         if (b)
             stackPop();
@@ -17369,7 +17362,7 @@ LoopProfile::decide(JSContext *cx)
 }
 
 JS_REQUIRES_STACK MonitorResult
-MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, JSInterpMode interpMode)
+MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, InterpMode interpMode)
 {
     TraceMonitor *tm = JS_TRACE_MONITOR_FROM_CONTEXT(cx);
     if (interpMode == JSINTERP_PROFILE && tm->profile)
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 69868ac089b1..004015e20d5d 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -653,7 +653,7 @@ public:
     JSScript *entryScript;
 
     /* The stack frame where we started profiling. Only valid while profiling! */
-    JSStackFrame *entryfp;
+    StackFrame *entryfp;
 
     /* The bytecode locations of the loop header and the back edge. */
     jsbytecode *top, *bottom;
@@ -716,12 +716,12 @@ public:
      * and how many iterations we execute it.
      */
     struct InnerLoop {
-        JSStackFrame *entryfp;
+        StackFrame *entryfp;
         jsbytecode *top, *bottom;
         uintN iters;
 
         InnerLoop() {}
-        InnerLoop(JSStackFrame *entryfp, jsbytecode *top, jsbytecode *bottom)
+        InnerLoop(StackFrame *entryfp, jsbytecode *top, jsbytecode *bottom)
             : entryfp(entryfp), top(top), bottom(bottom), iters(0) {}
     };
 
@@ -772,7 +772,7 @@ public:
             return StackValue(false);
     }
     
-    LoopProfile(TraceMonitor *tm, JSStackFrame *entryfp, jsbytecode *top, jsbytecode *bottom);
+    LoopProfile(TraceMonitor *tm, StackFrame *entryfp, jsbytecode *top, jsbytecode *bottom);
 
     void reset();
 
@@ -1188,9 +1188,9 @@ class TraceRecorder
     JS_REQUIRES_STACK ptrdiff_t nativespOffsetImpl(const void* p) const;
     JS_REQUIRES_STACK ptrdiff_t nativespOffset(const Value* p) const;
     JS_REQUIRES_STACK void importImpl(tjit::Address addr, const void* p, JSValueType t,
-                                      const char *prefix, uintN index, JSStackFrame *fp);
+                                      const char *prefix, uintN index, StackFrame *fp);
     JS_REQUIRES_STACK void import(tjit::Address addr, const Value* p, JSValueType t,
-                                  const char *prefix, uintN index, JSStackFrame *fp);
+                                  const char *prefix, uintN index, StackFrame *fp);
     JS_REQUIRES_STACK void import(TreeFragment* tree, nanojit::LIns* sp, unsigned stackSlots,
                                   unsigned callDepth, unsigned ngslots, JSValueType* typeMap);
     void trackNativeStackUse(unsigned slots);
@@ -1265,7 +1265,7 @@ class TraceRecorder
     JS_REQUIRES_STACK nanojit::LIns* scopeChain();
     JS_REQUIRES_STACK nanojit::LIns* entryScopeChain() const;
     JS_REQUIRES_STACK nanojit::LIns* entryFrameIns() const;
-    JS_REQUIRES_STACK JSStackFrame* frameIfInRange(JSObject* obj, unsigned* depthp = NULL) const;
+    JS_REQUIRES_STACK StackFrame* frameIfInRange(JSObject* obj, unsigned* depthp = NULL) const;
     JS_REQUIRES_STACK RecordingStatus traverseScopeChain(JSObject *obj, nanojit::LIns *obj_ins, JSObject *obj2, nanojit::LIns *&obj2_ins);
     JS_REQUIRES_STACK AbortableRecordingStatus scopeChainProp(JSObject* obj, Value*& vp, nanojit::LIns*& ins, NameResult& nr, JSObject **scopeObjp = NULL);
     JS_REQUIRES_STACK RecordingStatus callProp(JSObject* obj, JSProperty* shape, jsid id, Value*& vp, nanojit::LIns*& ins, NameResult& nr);
@@ -1482,8 +1482,8 @@ class TraceRecorder
     JS_REQUIRES_STACK RecordingStatus createThis(JSObject& ctor, nanojit::LIns* ctor_ins,
                                                  nanojit::LIns** thisobj_insp);
     JS_REQUIRES_STACK RecordingStatus guardCallee(Value& callee);
-    JS_REQUIRES_STACK JSStackFrame      *guardArguments(JSObject *obj, nanojit::LIns* obj_ins,
-                                                        unsigned *depthp);
+    JS_REQUIRES_STACK StackFrame *guardArguments(JSObject *obj, nanojit::LIns* obj_ins,
+                                                 unsigned *depthp);
     JS_REQUIRES_STACK nanojit::LIns* guardArgsLengthNotAssigned(nanojit::LIns* argsobj_ins);
     JS_REQUIRES_STACK void guardNotHole(nanojit::LIns* argsobj_ins, nanojit::LIns* ids_ins);
     JS_REQUIRES_STACK RecordingStatus getClassPrototype(JSObject* ctor,
@@ -1683,7 +1683,7 @@ class TraceRecorder
 #define TRACE_2(x,a,b)          TRACE_ARGS(x, (a, b))
 
 extern JS_REQUIRES_STACK MonitorResult
-MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, JSInterpMode interpMode);
+MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, InterpMode interpMode);
 
 extern JS_REQUIRES_STACK TracePointAction
 RecordTracePoint(JSContext*, uintN& inlineCallCount, bool* blacklist);
diff --git a/js/src/jsvalue.h b/js/src/jsvalue.h
index ce542f4cb931..295e17b02b70 100644
--- a/js/src/jsvalue.h
+++ b/js/src/jsvalue.h
@@ -1241,87 +1241,5 @@ Debug_SetValueRangeToCrashOnTouch(Value *vec, size_t len)
 #endif
 }
 
-/*
- * Abstracts the layout of the (callee,this) receiver pair that is passed to
- * natives and scripted functions.
- */
-class CallReceiver
-{
-#ifdef DEBUG
-    mutable bool usedRval_;
-#endif
-  protected:
-    Value *argv_;
-    CallReceiver() {}
-    CallReceiver(Value *argv) : argv_(argv) {
-#ifdef DEBUG
-        usedRval_ = false;
-#endif
-    }
-
-  public:
-    friend CallReceiver CallReceiverFromVp(Value *);
-    friend CallReceiver CallReceiverFromArgv(Value *);
-    Value *base() const { return argv_ - 2; }
-    JSObject &callee() const { JS_ASSERT(!usedRval_); return argv_[-2].toObject(); }
-    Value &calleev() const { JS_ASSERT(!usedRval_); return argv_[-2]; }
-    Value &thisv() const { return argv_[-1]; }
-
-    Value &rval() const {
-#ifdef DEBUG
-        usedRval_ = true;
-#endif
-        return argv_[-2];
-    }
-
-    void calleeHasBeenReset() const {
-#ifdef DEBUG
-        usedRval_ = false;
-#endif
-    }
-};
-
-JS_ALWAYS_INLINE CallReceiver
-CallReceiverFromVp(Value *vp)
-{
-    return CallReceiver(vp + 2);
-}
-
-JS_ALWAYS_INLINE CallReceiver
-CallReceiverFromArgv(Value *argv)
-{
-    return CallReceiver(argv);
-}
-
-/*
- * Abstracts the layout of the stack passed to natives from the engine and from
- * natives to js::Invoke.
- */
-class CallArgs : public CallReceiver
-{
-    uintN argc_;
-  protected:
-    CallArgs() {}
-    CallArgs(uintN argc, Value *argv) : CallReceiver(argv), argc_(argc) {}
-  public:
-    friend CallArgs CallArgsFromVp(uintN, Value *);
-    friend CallArgs CallArgsFromArgv(uintN, Value *);
-    Value &operator[](unsigned i) const { JS_ASSERT(i < argc_); return argv_[i]; }
-    Value *argv() const { return argv_; }
-    uintN argc() const { return argc_; }
-};
-
-JS_ALWAYS_INLINE CallArgs
-CallArgsFromVp(uintN argc, Value *vp)
-{
-    return CallArgs(argc, vp + 2);
-}
-
-JS_ALWAYS_INLINE CallArgs
-CallArgsFromArgv(uintN argc, Value *argv)
-{
-    return CallArgs(argc, argv);
-}
-
 }      /* namespace js */
 #endif /* jsvalue_h__ */
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 14d83a39181b..0e0577658d09 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -385,7 +385,7 @@ AutoCompartment::enter()
         JS_ASSERT(scopeChain->isNative());
 
         frame.construct();
-        if (!context->stack().pushDummyFrame(context, *scopeChain, &frame.ref())) {
+        if (!context->stack.pushDummyFrame(context, *scopeChain, &frame.ref())) {
             context->compartment = origin;
             return false;
         }
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 23514ff0a50e..22c0cc70d5b5 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -165,7 +165,7 @@ class AutoCompartment
     JSCompartment * const destination;
   private:
     LazilyConstructed<DummyFrameGuard> frame;
-    JSFrameRegs regs;
+    FrameRegs regs;
     AutoStringRooter input;
     bool entered;
 
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index f806a6460812..d2a2eb67499f 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -57,7 +57,6 @@
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsgcmark.h"
-#include "jsinterp.h"
 #include "jslock.h"
 #include "jsnum.h"
 #include "jsobj.h"
@@ -72,11 +71,11 @@
 #include "jsvector.h"
 
 #include "jsatominlines.h"
-#include "jscntxtinlines.h"
-#include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
+#include "vm/Stack-inl.h"
+
 #ifdef DEBUG
 #include <string.h>     /* for #ifdef DEBUG memset calls */
 #endif
@@ -1745,7 +1744,7 @@ ParseXMLSource(JSContext *cx, JSString *src)
     filename = NULL;
     lineno = 1;
     if (!i.done()) {
-        JSStackFrame *fp = i.fp();
+        StackFrame *fp = i.fp();
         op = (JSOp) *i.pc();
         if (op == JSOP_TOXML || op == JSOP_TOXMLLIST) {
             filename = fp->script()->filename;
@@ -7307,8 +7306,7 @@ js_SetDefaultXMLNamespace(JSContext *cx, const Value &v)
     if (!ns)
         return JS_FALSE;
 
-    JSStackFrame *fp = js_GetTopStackFrame(cx);
-    JSObject &varobj = fp->varobj(cx);
+    JSObject &varobj = cx->stack.currentVarObj();
     if (!varobj.defineProperty(cx, JS_DEFAULT_XML_NAMESPACE_ID, ObjectValue(*ns),
                                PropertyStub, StrictPropertyStub, JSPROP_PERMANENT)) {
         return JS_FALSE;
@@ -7386,7 +7384,7 @@ js_ValueToXMLString(JSContext *cx, const Value &v)
 JSBool
 js_GetAnyName(JSContext *cx, jsid *idp)
 {
-    JSObject *global = cx->hasfp() ? cx->fp()->scopeChain().getGlobal() : cx->globalObject;
+    JSObject *global = cx->running() ? cx->fp()->scopeChain().getGlobal() : cx->globalObject;
     Value v = global->getReservedSlot(JSProto_AnyName);
     if (v.isUndefined()) {
         JSObject *obj = NewNonFunction<WithProto::Given>(cx, &js_AnyNameClass, NULL, global);
@@ -7627,7 +7625,7 @@ js_StepXMLListFilter(JSContext *cx, JSBool initialized)
     JSXMLFilter *filter;
 
     LeaveTrace(cx);
-    sp = Jsvalify(cx->regs->sp);
+    sp = Jsvalify(cx->regs().sp);
     if (!initialized) {
         /*
          * We haven't iterated yet, so initialize the filter based on the
diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h
index 400e373a932b..0d404c67860d 100644
--- a/js/src/methodjit/BaseAssembler.h
+++ b/js/src/methodjit/BaseAssembler.h
@@ -589,7 +589,7 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         if (frameDepth >= 0) {
             // sp = fp->slots() + frameDepth
             // regs->sp = sp
-            addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(jsval)),
+            addPtr(Imm32(sizeof(StackFrame) + frameDepth * sizeof(jsval)),
                    JSFrameReg,
                    ClobberInCall);
             storePtr(ClobberInCall, FrameAddress(offsetof(VMFrame, regs.sp)));
@@ -605,11 +605,11 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = JSC::SparcRegist
         setupInfallibleVMFrame(frameDepth);
 
         /* regs->fp = fp */
-        storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+        storePtr(JSFrameReg, FrameAddress(VMFrame::offsetOfFp));
 
         /* PC -> regs->pc :( */
         storePtr(ImmPtr(pc),
-                 FrameAddress(offsetof(VMFrame, regs) + offsetof(JSFrameRegs, pc)));
+                 FrameAddress(offsetof(VMFrame, regs) + offsetof(FrameRegs, pc)));
     }
 
     // An infallible VM call is a stub call (taking a VMFrame & and one
@@ -753,7 +753,7 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc  = Assembler::JSPar
 struct FrameFlagsAddress : JSC::MacroAssembler::Address
 {
     FrameFlagsAddress()
-      : Address(JSFrameReg, JSStackFrame::offsetOfFlags())
+      : Address(JSFrameReg, StackFrame::offsetOfFlags())
     {}
 };
 
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index b1d3615fd6fd..f480869fb0f8 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -83,7 +83,7 @@ static const char *OpcodeNames[] = {
 };
 #endif
 
-mjit::Compiler::Compiler(JSContext *cx, JSStackFrame *fp)
+mjit::Compiler::Compiler(JSContext *cx, StackFrame *fp)
   : BaseCompiler(cx),
     fp(fp),
     script(fp->script()),
@@ -239,7 +239,7 @@ mjit::Compiler::~Compiler()
 }
 
 CompileStatus JS_NEVER_INLINE
-mjit::TryCompile(JSContext *cx, JSStackFrame *fp)
+mjit::TryCompile(JSContext *cx, StackFrame *fp)
 {
     JS_ASSERT(cx->fp() == fp);
 
@@ -294,7 +294,7 @@ mjit::Compiler::generatePrologue()
         Label fastPath = masm.label();
 
         /* Store this early on so slow paths can access it. */
-        masm.storePtr(ImmPtr(fun), Address(JSFrameReg, JSStackFrame::offsetOfExec()));
+        masm.storePtr(ImmPtr(fun), Address(JSFrameReg, StackFrame::offsetOfExec()));
 
         {
             /*
@@ -312,8 +312,8 @@ mjit::Compiler::generatePrologue()
                 stubcc.masm.move(JSParamReg_Argc, Registers::ArgReg1);
 
             /* Slow path - call the arity check function. Returns new fp. */
-            stubcc.masm.storePtr(ImmPtr(fun), Address(JSFrameReg, JSStackFrame::offsetOfExec()));
-            stubcc.masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+            stubcc.masm.storePtr(ImmPtr(fun), Address(JSFrameReg, StackFrame::offsetOfExec()));
+            stubcc.masm.storePtr(JSFrameReg, FrameAddress(VMFrame::offsetOfFp));
             OOL_STUBCALL(stubs::FixupArity);
             stubcc.masm.move(Registers::ReturnReg, JSFrameReg);
             stubcc.crossJump(stubcc.masm.jump(), fastPath);
@@ -343,7 +343,7 @@ mjit::Compiler::generatePrologue()
          */
         for (uint32 i = 0; i < script->nfixed; i++) {
             if (analysis->localHasUseBeforeDef(i) || addTraceHints) {
-                Address local(JSFrameReg, sizeof(JSStackFrame) + i * sizeof(Value));
+                Address local(JSFrameReg, sizeof(StackFrame) + i * sizeof(Value));
                 masm.storeValue(UndefinedValue(), local);
             }
         }
@@ -364,10 +364,11 @@ mjit::Compiler::generatePrologue()
              */
             RegisterID t0 = Registers::ReturnReg;
             Jump hasScope = masm.branchTest32(Assembler::NonZero,
-                                              FrameFlagsAddress(), Imm32(JSFRAME_HAS_SCOPECHAIN));
-            masm.loadPayload(Address(JSFrameReg, JSStackFrame::offsetOfCallee(fun)), t0);
+                                              FrameFlagsAddress(),
+                                              Imm32(StackFrame::HAS_SCOPECHAIN));
+            masm.loadPayload(Address(JSFrameReg, StackFrame::offsetOfCallee(fun)), t0);
             masm.loadPtr(Address(t0, offsetof(JSObject, parent)), t0);
-            masm.storePtr(t0, Address(JSFrameReg, JSStackFrame::offsetOfScopeChain()));
+            masm.storePtr(t0, Address(JSFrameReg, StackFrame::offsetOfScopeChain()));
             hasScope.linkTo(masm.label(), &masm);
         }
     }
@@ -968,12 +969,12 @@ mjit::Compiler::generateMethod()
           {
             RegisterID reg = frame.allocReg();
             masm.load32(FrameFlagsAddress(), reg);
-            masm.or32(Imm32(JSFRAME_HAS_RVAL), reg);
+            masm.or32(Imm32(StackFrame::HAS_RVAL), reg);
             masm.store32(reg, FrameFlagsAddress());
             frame.freeReg(reg);
 
             FrameEntry *fe = frame.peek(-1);
-            frame.storeTo(fe, Address(JSFrameReg, JSStackFrame::offsetOfReturnValue()), true);
+            frame.storeTo(fe, Address(JSFrameReg, StackFrame::offsetOfReturnValue()), true);
             frame.pop();
           }
           END_CASE(JSOP_POPV)
@@ -2119,7 +2120,7 @@ mjit::Compiler::jsop_getglobal(uint32 index)
 void
 mjit::Compiler::emitFinalReturn(Assembler &masm)
 {
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfncode()), Registers::ReturnReg);
+    masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfNcode()), Registers::ReturnReg);
     masm.jump(Registers::ReturnReg);
 }
 
@@ -2166,8 +2167,8 @@ mjit::Compiler::loadReturnValue(Assembler *masm, FrameEntry *fe)
         if (analysis->usesReturnValue()) {
             Jump rvalClear = masm->branchTest32(Assembler::Zero,
                                                FrameFlagsAddress(),
-                                               Imm32(JSFRAME_HAS_RVAL));
-            Address rvalAddress(JSFrameReg, JSStackFrame::offsetOfReturnValue());
+                                               Imm32(StackFrame::HAS_RVAL));
+            Address rvalAddress(JSFrameReg, StackFrame::offsetOfReturnValue());
             masm->loadValueAsComponents(rvalAddress, typeReg, dataReg);
             rvalClear.linkTo(masm->label(), masm);
         }
@@ -2184,7 +2185,7 @@ mjit::Compiler::fixPrimitiveReturn(Assembler *masm, FrameEntry *fe)
     JS_ASSERT(isConstructing);
 
     bool ool = (masm != &this->masm);
-    Address thisv(JSFrameReg, JSStackFrame::offsetOfThis(fun));
+    Address thisv(JSFrameReg, StackFrame::offsetOfThis(fun));
 
     // We can just load |thisv| if either of the following is true:
     //  (1) There is no explicit return value, AND fp->rval is not used.
@@ -2256,8 +2257,8 @@ mjit::Compiler::emitReturn(FrameEntry *fe)
         } else {
             /* if (hasCallObj() || hasArgsObj()) */
             Jump putObjs = masm.branchTest32(Assembler::NonZero,
-                                             Address(JSFrameReg, JSStackFrame::offsetOfFlags()),
-                                             Imm32(JSFRAME_HAS_CALL_OBJ | JSFRAME_HAS_ARGS_OBJ));
+                                             Address(JSFrameReg, StackFrame::offsetOfFlags()),
+                                             Imm32(StackFrame::HAS_CALL_OBJ | StackFrame::HAS_ARGS_OBJ));
             stubcc.linkExit(putObjs, Uses(frame.frameSlots()));
 
             stubcc.leave();
@@ -2338,7 +2339,7 @@ mjit::Compiler::interruptCheckHelper()
      * interrupt is on another thread.
      */
     stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, cx)), reg);
-    stubcc.masm.loadPtr(Address(reg, offsetof(JSContext, thread)), reg);
+    stubcc.masm.loadPtr(Address(reg, JSContext::threadOffset()), reg);
     Address flag(reg, offsetof(JSThread, data.interruptFlags));
     Jump noInterrupt = stubcc.masm.branchTest32(Assembler::Zero, flag);
 #endif
@@ -2377,16 +2378,16 @@ mjit::Compiler::emitUncachedCall(uint32 argc, bool callingNew)
 
     Jump notCompiled = masm.branchTestPtr(Assembler::Zero, r0, r0);
 
-    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+    masm.loadPtr(FrameAddress(VMFrame::offsetOfFp), JSFrameReg);
     callPatch.hasFastNcode = true;
     callPatch.fastNcodePatch =
         masm.storePtrWithPatch(ImmPtr(NULL),
-                               Address(JSFrameReg, JSStackFrame::offsetOfncode()));
+                               Address(JSFrameReg, StackFrame::offsetOfNcode()));
 
     masm.jump(r0);
     callPatch.joinPoint = masm.label();
     addReturnSite(callPatch.joinPoint, __LINE__);
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
+    masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfPrev()), JSFrameReg);
 
     frame.popn(argc + 2);
     frame.takeReg(JSReturnReg_Type);
@@ -2460,8 +2461,8 @@ mjit::Compiler::checkCallApplySpeculation(uint32 callImmArgc, uint32 speculatedA
         RegisterID r0 = Registers::ReturnReg;
         Jump notCompiled = stubcc.masm.branchTestPtr(Assembler::Zero, r0, r0);
 
-        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
-        Address ncodeAddr(JSFrameReg, JSStackFrame::offsetOfncode());
+        stubcc.masm.loadPtr(FrameAddress(VMFrame::offsetOfFp), JSFrameReg);
+        Address ncodeAddr(JSFrameReg, StackFrame::offsetOfNcode());
         uncachedCallPatch->hasSlowNcode = true;
         uncachedCallPatch->slowNcodePatch = stubcc.masm.storePtrWithPatch(ImmPtr(NULL), ncodeAddr);
 
@@ -2731,11 +2732,11 @@ mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
             stubcc.masm.move(Imm32(callIC.frameSize.staticArgc()), JSParamReg_Argc);
         else
             stubcc.masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), JSParamReg_Argc);
-        stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+        stubcc.masm.loadPtr(FrameAddress(VMFrame::offsetOfFp), JSFrameReg);
         callPatch.hasSlowNcode = true;
         callPatch.slowNcodePatch =
             stubcc.masm.storePtrWithPatch(ImmPtr(NULL),
-                                          Address(JSFrameReg, JSStackFrame::offsetOfncode()));
+                                          Address(JSFrameReg, StackFrame::offsetOfNcode()));
         stubcc.masm.jump(Registers::ReturnReg);
 
         /*
@@ -2764,7 +2765,7 @@ mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
 
     uint32 flags = 0;
     if (callingNew)
-        flags |= JSFRAME_CONSTRUCTING;
+        flags |= StackFrame::CONSTRUCTING;
 
     InlineFrameAssembler inlFrame(masm, callIC, flags);
     callPatch.hasFastNcode = true;
@@ -2775,7 +2776,7 @@ mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
     addReturnSite(callPatch.joinPoint, __LINE__);
     if (lowerFunCallOrApply)
         uncachedCallPatch.joinPoint = callIC.joinPoint;
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfPrev()), JSFrameReg);
+    masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfPrev()), JSFrameReg);
 
     /*
      * We've placed hotJump, joinPoint and hotPathLabel, and no other labels are located by offset
@@ -2818,7 +2819,7 @@ mjit::Compiler::inlineCallHelper(uint32 callImmArgc, bool callingNew)
 
 /*
  * This function must be called immediately after any instruction which could
- * cause a new JSStackFrame to be pushed and could lead to a new debug trap
+ * cause a new StackFrame to be pushed and could lead to a new debug trap
  * being set. This includes any API callbacks and any scripted or native call.
  */
 void
@@ -2830,7 +2831,7 @@ mjit::Compiler::addCallSite(const InternalCallSite &site)
 void
 mjit::Compiler::restoreFrameRegs(Assembler &masm)
 {
-    masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+    masm.loadPtr(FrameAddress(VMFrame::offsetOfFp), JSFrameReg);
 }
 
 bool
@@ -3163,7 +3164,7 @@ mjit::Compiler::jsop_callprop_generic(JSAtom *atom)
      * since a sync will be needed for the upcoming call.
      */
     uint32 thisvSlot = frame.localSlots();
-    Address thisv = Address(JSFrameReg, sizeof(JSStackFrame) + thisvSlot * sizeof(Value));
+    Address thisv = Address(JSFrameReg, sizeof(StackFrame) + thisvSlot * sizeof(Value));
 
 #if defined JS_NUNBOX32
     masm.storeValueFromComponents(pic.typeReg, pic.objReg, thisv);
@@ -3622,7 +3623,7 @@ mjit::Compiler::jsop_bindname(JSAtom *atom, bool usePropCache)
     pic.fastPathStart = masm.label();
 
     Address parent(pic.objReg, offsetof(JSObject, parent));
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfScopeChain()), pic.objReg);
+    masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfScopeChain()), pic.objReg);
 
     pic.shapeGuard = masm.label();
     Jump inlineJump = masm.branchPtr(Assembler::NotEqual, parent, ImmPtr(0));
@@ -3689,7 +3690,7 @@ void
 mjit::Compiler::jsop_bindname(JSAtom *atom, bool usePropCache)
 {
     RegisterID reg = frame.allocReg();
-    Address scopeChain(JSFrameReg, JSStackFrame::offsetOfScopeChain());
+    Address scopeChain(JSFrameReg, StackFrame::offsetOfScopeChain());
     masm.loadPtr(scopeChain, reg);
 
     Address address(reg, offsetof(JSObject, parent));
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index 95d807497f5b..f9a7d95b639a 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -326,7 +326,7 @@ class Compiler : public BaseCompiler
         size_t offsetIndex;
     };
 
-    JSStackFrame *fp;
+    StackFrame *fp;
     JSScript *script;
     JSObject *scopeChain;
     JSObject *globalObj;
@@ -372,7 +372,7 @@ class Compiler : public BaseCompiler
     // follows interpreter usage in JSOP_LENGTH.
     enum { LengthAtomIndex = uint32(-2) };
 
-    Compiler(JSContext *cx, JSStackFrame *fp);
+    Compiler(JSContext *cx, StackFrame *fp);
     ~Compiler();
 
     CompileStatus compile();
diff --git a/js/src/methodjit/FrameState-inl.h b/js/src/methodjit/FrameState-inl.h
index 7764a3fb9392..3010ecb17dcd 100644
--- a/js/src/methodjit/FrameState-inl.h
+++ b/js/src/methodjit/FrameState-inl.h
@@ -733,13 +733,13 @@ FrameState::addressOf(const FrameEntry *fe) const
 {
     int32 frameOffset = 0;
     if (fe >= locals)
-        frameOffset = JSStackFrame::offsetOfFixed(uint32(fe - locals));
+        frameOffset = StackFrame::offsetOfFixed(uint32(fe - locals));
     else if (fe >= args)
-        frameOffset = JSStackFrame::offsetOfFormalArg(fun, uint32(fe - args));
+        frameOffset = StackFrame::offsetOfFormalArg(fun, uint32(fe - args));
     else if (fe == this_)
-        frameOffset = JSStackFrame::offsetOfThis(fun);
+        frameOffset = StackFrame::offsetOfThis(fun);
     else if (fe == callee_)
-        frameOffset = JSStackFrame::offsetOfCallee(fun);
+        frameOffset = StackFrame::offsetOfCallee(fun);
     JS_ASSERT(frameOffset);
     return Address(JSFrameReg, frameOffset);
 }
diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h
index c7f214bf780a..b95016bd02f2 100644
--- a/js/src/methodjit/FrameState.h
+++ b/js/src/methodjit/FrameState.h
@@ -741,13 +741,13 @@ class FrameState
     void assertValidRegisterState() const;
 #endif
 
-    // Return an address, relative to the JSStackFrame, that represents where
+    // Return an address, relative to the StackFrame, that represents where
     // this FrameEntry is stored in memory. Note that this is its canonical
     // address, not its backing store. There is no guarantee that the memory
     // is coherent.
     Address addressOf(const FrameEntry *fe) const;
 
-    // Returns an address, relative to the JSStackFrame, that represents where
+    // Returns an address, relative to the StackFrame, that represents where
     // this FrameEntry is backed in memory. This is not necessarily its
     // canonical address, but the address for which the payload has been synced
     // to memory. The caller guarantees that the payload has been synced.
diff --git a/js/src/methodjit/InlineFrameAssembler.h b/js/src/methodjit/InlineFrameAssembler.h
index 0e60478a7ac9..4a00c9ab67ea 100644
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -62,7 +62,7 @@ struct AdjustedFrame {
 
 /*
  * This is used for emitting code to inline callee-side frame creation and
- * should jit code equivalent to JSStackFrame::initCallFrameCallerHalf.
+ * should jit code equivalent to StackFrame::initCallFrameCallerHalf.
  *
  * Once finished, JSFrameReg is advanced to be the new fp.
  */
@@ -105,23 +105,23 @@ class InlineFrameAssembler {
 
     DataLabelPtr assemble(void *ncode)
     {
-        JS_ASSERT((flags & ~JSFRAME_CONSTRUCTING) == 0);
+        JS_ASSERT((flags & ~StackFrame::CONSTRUCTING) == 0);
 
-        /* Generate JSStackFrame::initCallFrameCallerHalf. */
+        /* Generate StackFrame::initCallFrameCallerHalf. */
 
         DataLabelPtr ncodePatch;
         if (frameSize.isStatic()) {
             uint32 frameDepth = frameSize.staticLocalSlots();
-            AdjustedFrame newfp(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
+            AdjustedFrame newfp(sizeof(StackFrame) + frameDepth * sizeof(Value));
 
-            Address flagsAddr = newfp.addrOf(JSStackFrame::offsetOfFlags());
-            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
-            Address prevAddr = newfp.addrOf(JSStackFrame::offsetOfPrev());
+            Address flagsAddr = newfp.addrOf(StackFrame::offsetOfFlags());
+            masm.store32(Imm32(StackFrame::FUNCTION | flags), flagsAddr);
+            Address prevAddr = newfp.addrOf(StackFrame::offsetOfPrev());
             masm.storePtr(JSFrameReg, prevAddr);
-            Address ncodeAddr = newfp.addrOf(JSStackFrame::offsetOfncode());
+            Address ncodeAddr = newfp.addrOf(StackFrame::offsetOfNcode());
             ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
 
-            masm.addPtr(Imm32(sizeof(JSStackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
+            masm.addPtr(Imm32(sizeof(StackFrame) + frameDepth * sizeof(Value)), JSFrameReg);
         } else {
             /*
              * If the frame size is dynamic, then the fast path generated by
@@ -134,11 +134,11 @@ class InlineFrameAssembler {
             RegisterID newfp = tempRegs.takeAnyReg();
             masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.sp)), newfp);
 
-            Address flagsAddr(newfp, JSStackFrame::offsetOfFlags());
-            masm.store32(Imm32(JSFRAME_FUNCTION | flags), flagsAddr);
-            Address prevAddr(newfp, JSStackFrame::offsetOfPrev());
+            Address flagsAddr(newfp, StackFrame::offsetOfFlags());
+            masm.store32(Imm32(StackFrame::FUNCTION | flags), flagsAddr);
+            Address prevAddr(newfp, StackFrame::offsetOfPrev());
             masm.storePtr(JSFrameReg, prevAddr);
-            Address ncodeAddr(newfp, JSStackFrame::offsetOfncode());
+            Address ncodeAddr(newfp, StackFrame::offsetOfNcode());
             ncodePatch = masm.storePtrWithPatch(ImmPtr(ncode), ncodeAddr);
 
             masm.move(newfp, JSFrameReg);
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 34816b113dbd..d65a4bb1b6c4 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -81,13 +81,13 @@ using ic::Repatcher;
 static jsbytecode *
 FindExceptionHandler(JSContext *cx)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     JSScript *script = fp->script();
 
 top:
     if (cx->isExceptionPending() && JSScript::isValidOffset(script->trynotesOffset)) {
         // The PC is updated before every stub call, so we can use it here.
-        unsigned offset = cx->regs->pc - script->main;
+        unsigned offset = cx->regs().pc - script->main;
 
         JSTryNoteArray *tnarray = script->trynotes();
         for (unsigned i = 0; i < tnarray->length; ++i) {
@@ -110,12 +110,12 @@ top:
             //       bytecode compiler cannot throw, so this is not possible.
             if (offset - tn->start > tn->length)
                 continue;
-            if (tn->stackDepth > cx->regs->sp - fp->base())
+            if (tn->stackDepth > cx->regs().sp - fp->base())
                 continue;
 
             jsbytecode *pc = script->main + tn->start + tn->length;
             JSBool ok = js_UnwindScope(cx, tn->stackDepth, JS_TRUE);
-            JS_ASSERT(cx->regs->sp == fp->base() + tn->stackDepth);
+            JS_ASSERT(cx->regs().sp == fp->base() + tn->stackDepth);
 
             switch (tn->kind) {
                 case JSTRY_CATCH:
@@ -139,9 +139,9 @@ top:
                    * Push (true, exception) pair for finally to indicate that
                    * [retsub] should rethrow the exception.
                    */
-                  cx->regs->sp[0].setBoolean(true);
-                  cx->regs->sp[1] = cx->getPendingException();
-                  cx->regs->sp += 2;
+                  cx->regs().sp[0].setBoolean(true);
+                  cx->regs().sp[1] = cx->getPendingException();
+                  cx->regs().sp += 2;
                   cx->clearPendingException();
                   return pc;
 
@@ -157,8 +157,8 @@ top:
                   Value v = cx->getPendingException();
                   JS_ASSERT(js_GetOpcode(cx, fp->script(), pc) == JSOP_ENDITER);
                   cx->clearPendingException();
-                  ok = !!js_CloseIterator(cx, &cx->regs->sp[-1].toObject());
-                  cx->regs->sp -= 1;
+                  ok = !!js_CloseIterator(cx, &cx->regs().sp[-1].toObject());
+                  cx->regs().sp -= 1;
                   if (!ok)
                       goto top;
                   cx->setPendingException(v);
@@ -176,16 +176,9 @@ top:
 static void
 InlineReturn(VMFrame &f)
 {
-    JSContext *cx = f.cx;
-    JSStackFrame *fp = f.regs.fp;
-
     JS_ASSERT(f.fp() != f.entryfp);
-
-    JS_ASSERT(!js_IsActiveWithOrBlock(cx, &fp->scopeChain(), 0));
-
-    Value *newsp = fp->actualArgs() - 1;
-    newsp[-1] = fp->returnValue();
-    cx->stack().popInlineFrame(cx, fp->prev(), newsp);
+    JS_ASSERT(!js_IsActiveWithOrBlock(f.cx, &f.fp()->scopeChain(), 0));
+    f.cx->stack.popInlineFrame();
 }
 
 void JS_FASTCALL
@@ -193,7 +186,7 @@ stubs::SlowCall(VMFrame &f, uint32 argc)
 {
     Value *vp = f.regs.sp - (argc + 2);
 
-    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
+    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
         THROW();
 }
 
@@ -203,7 +196,7 @@ stubs::SlowNew(VMFrame &f, uint32 argc)
     JSContext *cx = f.cx;
     Value *vp = f.regs.sp - (argc + 2);
 
-    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
+    if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
         THROW();
 }
 
@@ -212,11 +205,9 @@ stubs::SlowNew(VMFrame &f, uint32 argc)
  * on fp->exec.fun.
  */
 static inline void
-RemovePartialFrame(JSContext *cx, JSStackFrame *fp)
+RemovePartialFrame(JSContext *cx, StackFrame *fp)
 {
-    JSStackFrame *prev = fp->prev();
-    Value *newsp = (Value *)fp;
-    cx->stack().popInlineFrame(cx, prev, newsp);
+    cx->stack.popInlineFrame();
 }
 
 /*
@@ -229,7 +220,8 @@ stubs::HitStackQuota(VMFrame &f)
     /* Include space to push another frame. */
     uintN nvals = f.fp()->script()->nslots + VALUES_PER_STACK_FRAME;
     JS_ASSERT(f.regs.sp == f.fp()->base());
-    if (f.cx->stack().bumpCommitAndLimit(f.entryfp, f.regs.sp, nvals, &f.stackLimit))
+    StackSpace &space = f.cx->stack.space();
+    if (space.bumpLimitWithinQuota(NULL, f.entryfp, f.regs.sp, nvals, &f.stackLimit))
         return;
 
     /* Remove the current partially-constructed frame before throwing. */
@@ -246,7 +238,7 @@ void * JS_FASTCALL
 stubs::FixupArity(VMFrame &f, uint32 nactual)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *oldfp = f.fp();
+    StackFrame *oldfp = f.fp();
 
     JS_ASSERT(nactual != oldfp->numFormalArgs());
 
@@ -261,13 +253,12 @@ stubs::FixupArity(VMFrame &f, uint32 nactual)
     void *ncode          = oldfp->nativeReturnAddress();
 
     /* Pop the inline frame. */
-    f.fp() = oldfp->prev();
-    f.regs.sp = (Value*) oldfp;
+    f.regs.popPartialFrame((Value *)oldfp);
 
     /* Reserve enough space for a callee frame. */
-    JSStackFrame *newfp = cx->stack().getInlineFrameWithinLimit(cx, (Value*) oldfp, nactual,
-                                                                fun, fun->script(), &flags,
-                                                                f.entryfp, &f.stackLimit);
+    StackFrame *newfp = cx->stack.getInlineFrameWithinLimit(cx, (Value*) oldfp, nactual,
+                                                            fun, fun->script(), &flags,
+                                                            f.entryfp, &f.stackLimit);
     if (!newfp) {
         /*
          * The PC is not coherent with the current frame, so fix it up for
@@ -295,7 +286,7 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
      * compile though because we could throw, so get a full, adjusted frame.
      */
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 
     /*
      * Since we can only use members set by initCallFrameCallerHalf,
@@ -312,7 +303,7 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     fp->initCallFrameEarlyPrologue(fun, nactual);
 
     if (nactual != fp->numFormalArgs()) {
-        fp = (JSStackFrame *)FixupArity(f, nactual);
+        fp = (StackFrame *)FixupArity(f, nactual);
         if (!fp)
             return NULL;
     }
@@ -321,9 +312,7 @@ stubs::CompileFunction(VMFrame &f, uint32 nactual)
     fp->initCallFrameLatePrologue();
 
     /* These would have been initialized by the prologue. */
-    f.regs.fp = fp;
-    f.regs.sp = fp->base();
-    f.regs.pc = script->code;
+    f.regs.prepareToRun(fp, script);
 
     if (fun->isHeavyweight() && !js::CreateFunCallObject(cx, fp))
         THROWV(NULL);
@@ -352,10 +341,9 @@ UncachedInlineCall(VMFrame &f, uint32 flags, void **pret, bool *unjittable, uint
     JSScript *newscript = newfun->script();
 
     /* Get pointer to new frame/slots, prepare arguments. */
-    StackSpace &stack = cx->stack();
-    JSStackFrame *newfp = stack.getInlineFrameWithinLimit(cx, f.regs.sp, argc,
-                                                          newfun, newscript, &flags,
-                                                          f.entryfp, &f.stackLimit);
+    StackFrame *newfp = cx->stack.getInlineFrameWithinLimit(cx, f.regs.sp, argc,
+                                                            newfun, newscript, &flags,
+                                                            f.entryfp, &f.stackLimit);
     if (JS_UNLIKELY(!newfp))
         return false;
 
@@ -364,8 +352,8 @@ UncachedInlineCall(VMFrame &f, uint32 flags, void **pret, bool *unjittable, uint
     SetValueRangeToUndefined(newfp->slots(), newscript->nfixed);
 
     /* Officially push the frame. */
-    stack.pushInlineFrame(cx, newscript, newfp, &f.regs);
-    JS_ASSERT(newfp == f.regs.fp);
+    cx->stack.pushInlineFrame(newscript, newfp, f.regs);
+    JS_ASSERT(newfp == f.fp());
 
     /* Scope with a call object parented by callee's parent. */
     if (newfun->isHeavyweight() && !js::CreateFunCallObject(cx, newfp))
@@ -414,10 +402,10 @@ stubs::UncachedNewHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
     /* Try to do a fast inline call before the general Invoke path. */
     if (IsFunctionObject(*vp, &ucr->fun) && ucr->fun->isInterpretedConstructor()) {
         ucr->callee = &vp->toObject();
-        if (!UncachedInlineCall(f, JSFRAME_CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
+        if (!UncachedInlineCall(f, StackFrame::CONSTRUCTING, &ucr->codeAddr, &ucr->unjittable, argc))
             THROW();
     } else {
-        if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(vp, argc)))
+        if (!InvokeConstructor(cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
             THROW();
     }
 }
@@ -435,13 +423,13 @@ stubs::Eval(VMFrame &f, uint32 argc)
 {
     Value *vp = f.regs.sp - (argc + 2);
 
-    if (!IsBuiltinEvalForScope(&f.regs.fp->scopeChain(), *vp)) {
-        if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
+    if (!IsBuiltinEvalForScope(&f.fp()->scopeChain(), *vp)) {
+        if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
             THROW();
         return;
     }
 
-    JS_ASSERT(f.regs.fp == f.cx->fp());
+    JS_ASSERT(f.fp() == f.cx->fp());
     if (!DirectEval(f.cx, CallArgsFromVp(argc, vp)))
         THROW();
 
@@ -473,7 +461,7 @@ stubs::UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
         }
     }
 
-    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(vp, argc), 0))
+    if (!Invoke(f.cx, InvokeArgsAlreadyOnTheStack(argc, vp)))
         THROW();
 
     return;
@@ -483,7 +471,7 @@ void JS_FASTCALL
 stubs::PutActivationObjects(VMFrame &f)
 {
     JS_ASSERT(f.fp()->hasCallObj() || f.fp()->hasArgsObj());
-    js::PutActivationObjects(f.cx, f.fp());
+    f.fp()->putActivationObjects();
 }
 
 extern "C" void *
@@ -508,13 +496,13 @@ js_InternalThrow(VMFrame &f)
     }
 
     // Make sure sp is up to date.
-    JS_ASSERT(cx->regs == &f.regs);
+    JS_ASSERT(&cx->regs() == &f.regs);
 
     // Call the throw hook if necessary
     JSThrowHook handler = f.cx->debugHooks->throwHook;
     if (handler) {
         Value rval;
-        switch (handler(cx, cx->fp()->script(), cx->regs->pc, Jsvalify(&rval),
+        switch (handler(cx, cx->fp()->script(), cx->regs().pc, Jsvalify(&rval),
                         cx->debugHooks->throwHookData)) {
           case JSTRAP_ERROR:
             cx->clearPendingException();
@@ -555,16 +543,16 @@ js_InternalThrow(VMFrame &f)
         if (f.entryfp == f.fp())
             break;
 
-        JS_ASSERT(f.regs.sp == cx->regs->sp);
+        JS_ASSERT(f.regs.sp == cx->regs().sp);
         InlineReturn(f);
     }
 
-    JS_ASSERT(f.regs.sp == cx->regs->sp);
+    JS_ASSERT(f.regs.sp == cx->regs().sp);
 
     if (!pc)
         return NULL;
 
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     JSScript *script = fp->script();
     return script->nativeCodeForPC(fp->isConstructing(), pc);
 }
@@ -581,7 +569,7 @@ void JS_FASTCALL
 stubs::CreateThis(VMFrame &f, JSObject *proto)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
     JSObject *callee = &fp->callee();
     JSObject *obj = js_CreateThisForFunctionWithProto(cx, callee, proto);
     if (!obj)
@@ -610,7 +598,7 @@ stubs::ScriptDebugEpilogue(VMFrame &f)
  * handler in the process.
  */
 static inline bool
-HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostFrame = true)
+HandleErrorInExcessFrame(VMFrame &f, StackFrame *stopFp, bool searchedTopmostFrame = true)
 {
     JSContext *cx = f.cx;
 
@@ -621,7 +609,7 @@ HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostF
      *
      * Note that this also guarantees ScriptEpilogue() has been called.
      */
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     if (searchedTopmostFrame) {
         /*
          * This is a special case meaning that fp->finishedInInterpreter() is
@@ -647,7 +635,7 @@ HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostF
 
         /* Clear imacros. */
         if (fp->hasImacropc()) {
-            cx->regs->pc = fp->imacropc();
+            cx->regs().pc = fp->imacropc();
             fp->clearImacropc();
         }
         JS_ASSERT(!fp->hasImacropc());
@@ -656,7 +644,7 @@ HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostF
         if (cx->isExceptionPending()) {
             jsbytecode *pc = FindExceptionHandler(cx);
             if (pc) {
-                cx->regs->pc = pc;
+                cx->regs().pc = pc;
                 returnOK = true;
                 break;
             }
@@ -672,7 +660,7 @@ HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostF
         InlineReturn(f);
     }
 
-    JS_ASSERT(&f.regs == cx->regs);
+    JS_ASSERT(&f.regs == &cx->regs());
     JS_ASSERT_IF(!returnOK, cx->fp() == stopFp);
 
     return returnOK;
@@ -682,12 +670,12 @@ HandleErrorInExcessFrame(VMFrame &f, JSStackFrame *stopFp, bool searchedTopmostF
 static inline void *
 AtSafePoint(JSContext *cx)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     if (fp->hasImacropc())
         return NULL;
 
     JSScript *script = fp->script();
-    return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
+    return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs().pc);
 }
 
 /*
@@ -698,13 +686,13 @@ static inline JSBool
 PartialInterpret(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
 #ifdef DEBUG
     JSScript *script = fp->script();
     JS_ASSERT(!fp->finishedInInterpreter());
     JS_ASSERT(fp->hasImacropc() ||
-              !script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc));
+              !script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs().pc));
 #endif
 
     JSBool ok = JS_TRUE;
@@ -726,7 +714,7 @@ JS_STATIC_ASSERT(JSOP_NOP == 0);
 static inline bool
 FrameIsFinished(JSContext *cx)
 {
-    JSOp op = JSOp(*cx->regs->pc);
+    JSOp op = JSOp(*cx->regs().pc);
     return (op == JSOP_RETURN ||
             op == JSOP_RETRVAL ||
             op == JSOP_STOP)
@@ -739,12 +727,12 @@ FrameIsFinished(JSContext *cx)
 static inline void
 AdvanceReturnPC(JSContext *cx)
 {
-    JS_ASSERT(*cx->regs->pc == JSOP_CALL ||
-              *cx->regs->pc == JSOP_NEW ||
-              *cx->regs->pc == JSOP_EVAL ||
-              *cx->regs->pc == JSOP_FUNCALL ||
-              *cx->regs->pc == JSOP_FUNAPPLY);
-    cx->regs->pc += JSOP_CALL_LENGTH;
+    JS_ASSERT(*cx->regs().pc == JSOP_CALL ||
+              *cx->regs().pc == JSOP_NEW ||
+              *cx->regs().pc == JSOP_EVAL ||
+              *cx->regs().pc == JSOP_FUNCALL ||
+              *cx->regs().pc == JSOP_FUNAPPLY);
+    cx->regs().pc += JSOP_CALL_LENGTH;
 }
 
 
@@ -756,7 +744,7 @@ AdvanceReturnPC(JSContext *cx)
  * (and faster) to finish frames in C++ even if at a safe point here.
  */
 static bool
-HandleFinishedFrame(VMFrame &f, JSStackFrame *entryFrame)
+HandleFinishedFrame(VMFrame &f, StackFrame *entryFrame)
 {
     JSContext *cx = f.cx;
 
@@ -791,7 +779,7 @@ HandleFinishedFrame(VMFrame &f, JSStackFrame *entryFrame)
      */
     bool returnOK = true;
     if (!cx->fp()->finishedInInterpreter()) {
-        if (JSOp(*cx->regs->pc) == JSOP_RETURN)
+        if (JSOp(*cx->regs().pc) == JSOP_RETURN)
             cx->fp()->setReturnValue(f.regs.sp[-1]);
 
         returnOK = ScriptEpilogue(cx, cx->fp(), true);
@@ -821,10 +809,10 @@ HandleFinishedFrame(VMFrame &f, JSStackFrame *entryFrame)
  *        pushed by a call, that has method JIT'd code.
  */
 static bool
-EvaluateExcessFrame(VMFrame &f, JSStackFrame *entryFrame)
+EvaluateExcessFrame(VMFrame &f, StackFrame *entryFrame)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
 
     /*
      * A "finished" frame is when the interpreter rested on a STOP,
@@ -851,7 +839,7 @@ EvaluateExcessFrame(VMFrame &f, JSStackFrame *entryFrame)
  * always leave f.regs.fp == entryFrame.
  */
 static bool
-FinishExcessFrames(VMFrame &f, JSStackFrame *entryFrame)
+FinishExcessFrames(VMFrame &f, StackFrame *entryFrame)
 {
     JSContext *cx = f.cx;
 
@@ -940,7 +928,7 @@ RunTracer(VMFrame &f)
 #endif
 {
     JSContext *cx = f.cx;
-    JSStackFrame *entryFrame = f.fp();
+    StackFrame *entryFrame = f.fp();
     TracePointAction tpa;
 
     /* :TODO: nuke PIC? */
@@ -989,7 +977,6 @@ RunTracer(VMFrame &f)
     // error failures correctly.
     JS_ASSERT_IF(cx->isExceptionPending(), tpa == TPA_Error);
 
-	f.fp() = cx->fp();
     JS_ASSERT(f.fp() == cx->fp());
     switch (tpa) {
       case TPA_Nothing:
diff --git a/js/src/methodjit/MachineRegs.h b/js/src/methodjit/MachineRegs.h
index 7a18bce7a777..64443bb84743 100644
--- a/js/src/methodjit/MachineRegs.h
+++ b/js/src/methodjit/MachineRegs.h
@@ -63,7 +63,7 @@ struct Registers {
     static const RegisterID ScratchReg = JSC::X86Registers::r11;
 #endif
 
-    // Register that homes the current JSStackFrame.
+    // Register that homes the current StackFrame.
 #if defined(JS_CPU_X86) || defined(JS_CPU_X64)
     static const RegisterID JSFrameReg = JSC::X86Registers::ebx;
 #elif defined(JS_CPU_ARM)
diff --git a/js/src/methodjit/MethodJIT-inl.h b/js/src/methodjit/MethodJIT-inl.h
index 8f392ff4b047..d5ecbb1ea799 100644
--- a/js/src/methodjit/MethodJIT-inl.h
+++ b/js/src/methodjit/MethodJIT-inl.h
@@ -57,7 +57,7 @@ static const size_t CALLS_BEFORE_COMPILE = 16;
 static const size_t BACKEDGES_BEFORE_COMPILE = 16;
 
 static inline CompileStatus
-CanMethodJIT(JSContext *cx, JSScript *script, JSStackFrame *fp, CompileRequest request)
+CanMethodJIT(JSContext *cx, JSScript *script, StackFrame *fp, CompileRequest request)
 {
     if (!cx->methodJitEnabled)
         return Compile_Abort;
@@ -81,7 +81,7 @@ CanMethodJIT(JSContext *cx, JSScript *script, JSStackFrame *fp, CompileRequest r
  * methodjit. If so, we compile the given function.
  */
 static inline CompileStatus
-CanMethodJITAtBranch(JSContext *cx, JSScript *script, JSStackFrame *fp, jsbytecode *pc)
+CanMethodJITAtBranch(JSContext *cx, JSScript *script, StackFrame *fp, jsbytecode *pc)
 {
     if (!cx->methodJitEnabled)
         return Compile_Abort;
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index c2af0ec5f0f7..8a96b86dfab7 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -62,20 +62,20 @@ js::mjit::CompilerAllocPolicy::CompilerAllocPolicy(JSContext *cx, Compiler &comp
 {
 }
 void
-JSStackFrame::methodjitStaticAsserts()
+StackFrame::methodjitStaticAsserts()
 {
         /* Static assert for x86 trampolines in MethodJIT.cpp. */
 #if defined(JS_CPU_X86)
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_)     == 0x18);
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_) + 4 == 0x1C);
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, ncode_)    == 0x14);
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_)     == 0x18);
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_) + 4 == 0x1C);
+        JS_STATIC_ASSERT(offsetof(StackFrame, ncode_)    == 0x14);
         /* ARM uses decimal literals. */
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_)     == 24);
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_) + 4 == 28);
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, ncode_)    == 20);
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_)     == 24);
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_) + 4 == 28);
+        JS_STATIC_ASSERT(offsetof(StackFrame, ncode_)    == 20);
 #elif defined(JS_CPU_X64)
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, rval_)     == 0x30);
-        JS_STATIC_ASSERT(offsetof(JSStackFrame, ncode_)    == 0x28);
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_)     == 0x30);
+        JS_STATIC_ASSERT(offsetof(StackFrame, ncode_)    == 0x28);
 #endif
 }
 
@@ -119,7 +119,7 @@ extern "C" void JS_FASTCALL
 PushActiveVMFrame(VMFrame &f)
 {
     f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f);
-    f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn));
+    f.regs.fp()->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn));
 }
 
 extern "C" void JS_FASTCALL
@@ -131,7 +131,8 @@ PopActiveVMFrame(VMFrame &f)
 extern "C" void JS_FASTCALL
 SetVMFrameRegs(VMFrame &f)
 {
-    f.cx->setCurrentRegs(&f.regs);
+    /* Restored on exit from EnterMethodJIT. */
+    f.cx->stack.repointRegs(&f.regs);
 }
 
 #if defined(__APPLE__) || (defined(XP_WIN) && !defined(JS_CPU_X64)) || defined(XP_OS2)
@@ -140,7 +141,7 @@ SetVMFrameRegs(VMFrame &f)
 # define SYMBOL_STRING(name) #name
 #endif
 
-JS_STATIC_ASSERT(offsetof(JSFrameRegs, sp) == 0);
+JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
 
 #if defined(__linux__) && defined(JS_CPU_X64)
 # define SYMBOL_STRING_RELOC(name) #name "@plt"
@@ -179,7 +180,7 @@ JS_STATIC_ASSERT(sizeof(VMFrame) % 16 == 0);
  *    *** DANGER ***
  */
 JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58);
-JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
+JS_STATIC_ASSERT(VMFrame::offsetOfFp == 0x38);
 
 JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
 JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
@@ -284,7 +285,7 @@ SYMBOL_STRING(JaegerThrowpoline) ":"        "\n"
  *    *** DANGER ***
  */
 JS_STATIC_ASSERT(offsetof(VMFrame, savedEBX) == 0x2c);
-JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
+JS_STATIC_ASSERT((VMFrame::offsetOfFp) == 0x1C);
 
 asm (
 ".text\n"
@@ -370,7 +371,7 @@ JS_STATIC_ASSERT(offsetof(VMFrame, savedLR) ==          (4*19));
 JS_STATIC_ASSERT(offsetof(VMFrame, entryfp) ==          (4*10));
 JS_STATIC_ASSERT(offsetof(VMFrame, stackLimit) ==       (4*9));
 JS_STATIC_ASSERT(offsetof(VMFrame, cx) ==               (4*8));
-JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) ==          (4*7));
+JS_STATIC_ASSERT(VMFrame::offsetOfFp ==                 (4*7));
 JS_STATIC_ASSERT(offsetof(VMFrame, unused) ==           (4*4));
 JS_STATIC_ASSERT(offsetof(VMFrame, previous) ==         (4*3));
 
@@ -520,11 +521,11 @@ SYMBOL_STRING(JaegerStubVeneer) ":"         "\n"
  *    *** DANGER ***
  */
 JS_STATIC_ASSERT(offsetof(VMFrame, savedEBX) == 0x2c);
-JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
+JS_STATIC_ASSERT(VMFrame::offsetOfFp == 0x1C);
 
 extern "C" {
 
-    __declspec(naked) JSBool JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code,
+    __declspec(naked) JSBool JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code,
                                               Value *stackLimit)
     {
         __asm {
@@ -615,7 +616,7 @@ extern "C" {
  *    *** DANGER ***
  */
 JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58);
-JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
+JS_STATIC_ASSERT(VMFrame::offsetOfFp == 0x38);
 JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
 JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
 
@@ -660,10 +661,10 @@ JaegerCompartment::Finish()
 }
 
 extern "C" JSBool
-JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLimit);
+JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code, Value *stackLimit);
 
 JSBool
-mjit::EnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLimit)
+mjit::EnterMethodJIT(JSContext *cx, StackFrame *fp, void *code, Value *stackLimit)
 {
 #ifdef JS_METHODJIT_SPEW
     Profiler prof;
@@ -674,8 +675,8 @@ mjit::EnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLi
     prof.start();
 #endif
 
-    JS_ASSERT(cx->regs->fp  == fp);
-    JSFrameRegs *oldRegs = cx->regs;
+    JS_ASSERT(cx->fp() == fp);
+    FrameRegs &oldRegs = cx->regs();
 
     JSBool ok;
     {
@@ -684,7 +685,8 @@ mjit::EnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLi
         ok = JaegerTrampoline(cx, fp, code, stackLimit);
     }
 
-    cx->setCurrentRegs(oldRegs);
+    /* Undo repointRegs in SetVMFrameRegs. */
+    cx->stack.repointRegs(&oldRegs);
     JS_ASSERT(fp == cx->fp());
 
     /* The trampoline wrote the return value but did not set the HAS_RVAL flag. */
@@ -702,11 +704,11 @@ mjit::EnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLi
 }
 
 static inline JSBool
-CheckStackAndEnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code)
+CheckStackAndEnterMethodJIT(JSContext *cx, StackFrame *fp, void *code)
 {
     JS_CHECK_RECURSION(cx, return false);
 
-    Value *stackLimit = cx->stack().getStackLimit(cx);
+    Value *stackLimit = cx->stack.space().getStackLimit(cx);
     if (!stackLimit)
         return false;
 
@@ -716,7 +718,7 @@ CheckStackAndEnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code)
 JSBool
 mjit::JaegerShot(JSContext *cx)
 {
-    JSStackFrame *fp = cx->fp();
+    StackFrame *fp = cx->fp();
     JSScript *script = fp->script();
     JITScript *jit = script->getJIT(fp->isConstructing());
 
@@ -725,7 +727,7 @@ mjit::JaegerShot(JSContext *cx)
         AbortRecording(cx, "attempt to enter method JIT while recording");
 #endif
 
-    JS_ASSERT(cx->regs->pc == script->code);
+    JS_ASSERT(cx->regs().pc == script->code);
 
     return CheckStackAndEnterMethodJIT(cx, cx->fp(), jit->invokeEntry);
 }
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index e1741e95731f..5b4dd457de16 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -107,10 +107,10 @@ struct VMFrame
 
     VMFrame      *previous;
     void         *unused;
-    JSFrameRegs  regs;
+    FrameRegs    regs;
     JSContext    *cx;
     Value        *stackLimit;
-    JSStackFrame *entryfp;
+    StackFrame   *entryfp;
 
 #if defined(JS_CPU_X86)
     void *savedEBX;
@@ -178,8 +178,13 @@ struct VMFrame
 
     JSRuntime *runtime() { return cx->runtime; }
 
-    JSStackFrame *&fp() { return regs.fp; }
+    StackFrame *fp() { return regs.fp(); }
     mjit::JITScript *jit() { return fp()->jit(); }
+
+    static const size_t offsetOfFp = 5 * sizeof(void *) + FrameRegs::offsetOfFp;
+    static void staticAssert() {
+        JS_STATIC_ASSERT(offsetOfFp == offsetof(VMFrame, regs) + FrameRegs::offsetOfFp);
+    }
 };
 
 #ifdef JS_CPU_ARM
@@ -425,7 +430,7 @@ struct JITScript {
  * Execute the given mjit code. This is a low-level call and callers must
  * provide the same guarantees as JaegerShot/CheckStackAndEnterMethodJIT.
  */
-JSBool EnterMethodJIT(JSContext *cx, JSStackFrame *fp, void *code, Value *stackLimit);
+JSBool EnterMethodJIT(JSContext *cx, StackFrame *fp, void *code, Value *stackLimit);
 
 /* Execute a method that has been JIT compiled. */
 JSBool JaegerShot(JSContext *cx);
@@ -445,7 +450,7 @@ void JS_FASTCALL
 ProfileStubCall(VMFrame &f);
 
 CompileStatus JS_NEVER_INLINE
-TryCompile(JSContext *cx, JSStackFrame *fp);
+TryCompile(JSContext *cx, StackFrame *fp);
 
 void
 ReleaseScriptCode(JSContext *cx, JSScript *script);
diff --git a/js/src/methodjit/MonoIC.cpp b/js/src/methodjit/MonoIC.cpp
index d3db5ecfecb5..8d072baabbb1 100644
--- a/js/src/methodjit/MonoIC.cpp
+++ b/js/src/methodjit/MonoIC.cpp
@@ -652,7 +652,7 @@ class CallCompiler : public BaseCompiler
         Jump hasCode = masm.branchPtr(Assembler::Above, t0, ImmPtr(JS_UNJITTABLE_SCRIPT));
 
         /* Try and compile. On success we get back the nmap pointer. */
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+        masm.storePtr(JSFrameReg, FrameAddress(VMFrame::offsetOfFp));
         void *compilePtr = JS_FUNC_TO_DATA_PTR(void *, stubs::CompileFunction);
         if (ic.frameSize.isStatic()) {
             masm.move(Imm32(ic.frameSize.staticArgc()), Registers::ArgReg1);
@@ -661,7 +661,7 @@ class CallCompiler : public BaseCompiler
             masm.load32(FrameAddress(offsetof(VMFrame, u.call.dynamicArgc)), Registers::ArgReg1);
             masm.fallibleVMCall(compilePtr, script->code, -1);
         }
-        masm.loadPtr(FrameAddress(offsetof(VMFrame, regs.fp)), JSFrameReg);
+        masm.loadPtr(FrameAddress(VMFrame::offsetOfFp), JSFrameReg);
 
         Jump notCompiled = masm.branchTestPtr(Assembler::Zero, Registers::ReturnReg,
                                               Registers::ReturnReg);
@@ -777,7 +777,7 @@ class CallCompiler : public BaseCompiler
         JITScript *jit = f.jit();
 
         /* Snapshot the frameDepth before SplatApplyArgs modifies it. */
-        uintN initialFrameDepth = f.regs.sp - f.regs.fp->slots();
+        uintN initialFrameDepth = f.regs.sp - f.regs.fp()->slots();
 
         /*
          * SplatApplyArgs has not been called, so we call it here before
@@ -785,7 +785,7 @@ class CallCompiler : public BaseCompiler
          */
         Value *vp;
         if (ic.frameSize.isStatic()) {
-            JS_ASSERT(f.regs.sp - f.regs.fp->slots() == (int)ic.frameSize.staticLocalSlots());
+            JS_ASSERT(f.regs.sp - f.regs.fp()->slots() == (int)ic.frameSize.staticLocalSlots());
             vp = f.regs.sp - (2 + ic.frameSize.staticArgc());
         } else {
             JS_ASSERT(*f.regs.pc == JSOP_FUNAPPLY && GET_ARGC(f.regs.pc) == 2);
@@ -839,18 +839,18 @@ class CallCompiler : public BaseCompiler
         RegisterID t0 = tempRegs.takeAnyReg();
 
         /* Store pc. */
-        masm.storePtr(ImmPtr(cx->regs->pc),
+        masm.storePtr(ImmPtr(cx->regs().pc),
                        FrameAddress(offsetof(VMFrame, regs.pc)));
 
         /* Store sp (if not already set by ic::SplatApplyArgs). */
         if (ic.frameSize.isStatic()) {
-            uint32 spOffset = sizeof(JSStackFrame) + initialFrameDepth * sizeof(Value);
+            uint32 spOffset = sizeof(StackFrame) + initialFrameDepth * sizeof(Value);
             masm.addPtr(Imm32(spOffset), JSFrameReg, t0);
             masm.storePtr(t0, FrameAddress(offsetof(VMFrame, regs.sp)));
         }
 
         /* Store fp. */
-        masm.storePtr(JSFrameReg, FrameAddress(offsetof(VMFrame, regs.fp)));
+        masm.storePtr(JSFrameReg, FrameAddress(VMFrame::offsetOfFp));
 
         /* Grab cx. */
 #ifdef JS_CPU_X86
@@ -868,7 +868,7 @@ class CallCompiler : public BaseCompiler
 #endif
         MaybeRegisterID argcReg;
         if (ic.frameSize.isStatic()) {
-            uint32 vpOffset = sizeof(JSStackFrame) + (vp - f.regs.fp->slots()) * sizeof(Value);
+            uint32 vpOffset = sizeof(StackFrame) + (vp - f.regs.fp()->slots()) * sizeof(Value);
             masm.addPtr(Imm32(vpOffset), JSFrameReg, vpReg);
         } else {
             argcReg = tempRegs.takeAnyReg();
@@ -972,7 +972,7 @@ class CallCompiler : public BaseCompiler
         JSObject *callee = ucr.callee;
         JS_ASSERT(callee);
 
-        uint32 flags = callingNew ? JSFRAME_CONSTRUCTING : 0;
+        uint32 flags = callingNew ? StackFrame::CONSTRUCTING : 0;
 
         if (!ic.hit) {
             ic.hit = true;
@@ -1036,7 +1036,6 @@ ic::NativeNew(VMFrame &f, CallICInfo *ic)
 }
 
 static const unsigned MANY_ARGS = 1024;
-static const unsigned MIN_SPACE = 500;
 
 static bool
 BumpStackFull(VMFrame &f, uintN inc)
@@ -1045,12 +1044,8 @@ BumpStackFull(VMFrame &f, uintN inc)
     if (inc < MANY_ARGS) {
         if (f.regs.sp + inc < f.stackLimit)
             return true;
-        StackSpace &stack = f.cx->stack();
-        if (!stack.bumpCommitAndLimit(f.entryfp, f.regs.sp, inc, &f.stackLimit)) {
-            js_ReportOverRecursed(f.cx);
-            return false;
-        }
-        return true;
+        StackSpace &space = f.cx->stack.space();
+        return space.bumpLimitWithinQuota(f.cx, f.entryfp, f.regs.sp, inc, &f.stackLimit);
     }
 
     /*
@@ -1065,20 +1060,8 @@ BumpStackFull(VMFrame &f, uintN inc)
      * However, since each apply call must consume at least MANY_ARGS slots,
      * this sequence will quickly reach the end of the stack and OOM.
      */
-
-    uintN incWithSpace = inc + MIN_SPACE;
-    Value *bumpedWithSpace = f.regs.sp + incWithSpace;
-    if (bumpedWithSpace < f.stackLimit)
-        return true;
-
-    StackSpace &stack = f.cx->stack();
-    if (stack.bumpCommitAndLimit(f.entryfp, f.regs.sp, incWithSpace, &f.stackLimit))
-        return true;
-
-    if (!stack.ensureSpace(f.cx, f.regs.sp, incWithSpace))
-        return false;
-    f.stackLimit = bumpedWithSpace;
-    return true;
+    StackSpace &space = f.cx->stack.space();
+    return space.bumpLimit(f.cx, f.entryfp, f.regs.sp, inc, &f.stackLimit);
 }
 
 static JS_ALWAYS_INLINE bool
@@ -1117,7 +1100,7 @@ ic::SplatApplyArgs(VMFrame &f)
         Value *vp = f.regs.sp - 3;
         JS_ASSERT(JS_CALLEE(cx, vp).toObject().getFunctionPrivate()->u.n.native == js_fun_apply);
 
-        JSStackFrame *fp = f.regs.fp;
+        StackFrame *fp = f.regs.fp();
         if (!fp->hasOverriddenArgs()) {
             uintN n;
             if (!fp->hasArgsObj()) {
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index 1c7c39544cab..5f003b3b2570 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -404,8 +404,8 @@ class SetPropCompiler : public PICStubCompiler
 
             {
                 Address addr(pic.shapeReg, shape->setterOp() == SetCallArg
-                                           ? JSStackFrame::offsetOfFormalArg(fun, slot)
-                                           : JSStackFrame::offsetOfFixed(slot));
+                                           ? StackFrame::offsetOfFormalArg(fun, slot)
+                                           : StackFrame::offsetOfFixed(slot));
                 masm.storeValue(pic.u.vr, addr);
                 skipOver = masm.jump();
             }
@@ -907,7 +907,7 @@ class GetPropCompiler : public PICStubCompiler
          * up in the fast path, or put this offset in PICInfo?
          */
         uint32 thisvOffset = uint32(f.regs.sp - f.fp()->slots()) - 1;
-        Address thisv(JSFrameReg, sizeof(JSStackFrame) + thisvOffset * sizeof(Value));
+        Address thisv(JSFrameReg, sizeof(StackFrame) + thisvOffset * sizeof(Value));
         masm.storeValueFromComponents(ImmType(JSVAL_TYPE_STRING),
                                       pic.objReg, thisv);
 
@@ -1247,7 +1247,7 @@ class ScopeNameCompiler : public PICStubCompiler
 
         /* For GETXPROP, the object is already in objReg. */
         if (pic.kind == ic::PICInfo::NAME)
-            masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfScopeChain()), pic.objReg);
+            masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfScopeChain()), pic.objReg);
 
         JS_ASSERT(obj == getprop.holder);
         JS_ASSERT(getprop.holder == scopeChain->getGlobal());
@@ -1315,7 +1315,7 @@ class ScopeNameCompiler : public PICStubCompiler
 
         /* For GETXPROP, the object is already in objReg. */
         if (pic.kind == ic::PICInfo::NAME)
-            masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfScopeChain()), pic.objReg);
+            masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfScopeChain()), pic.objReg);
 
         JS_ASSERT(obj == getprop.holder);
         JS_ASSERT(getprop.holder != scopeChain->getGlobal());
@@ -1352,8 +1352,8 @@ class ScopeNameCompiler : public PICStubCompiler
 
         /* Not-escaped case. */
         {
-            Address addr(pic.shapeReg, kind == ARG ? JSStackFrame::offsetOfFormalArg(fun, slot)
-                                                   : JSStackFrame::offsetOfFixed(slot));
+            Address addr(pic.shapeReg, kind == ARG ? StackFrame::offsetOfFormalArg(fun, slot)
+                                                   : StackFrame::offsetOfFixed(slot));
             masm.loadPayload(addr, pic.objReg);
             masm.loadTypeTag(addr, pic.shapeReg);
             skipOver = masm.jump();
@@ -1459,7 +1459,7 @@ class ScopeNameCompiler : public PICStubCompiler
             /* Kludge to allow (typeof foo == "undefined") tests. */
             disable("property not found");
             if (pic.kind == ic::PICInfo::NAME) {
-                JSOp op2 = js_GetOpcode(cx, script, cx->regs->pc + JSOP_NAME_LENGTH);
+                JSOp op2 = js_GetOpcode(cx, script, cx->regs().pc + JSOP_NAME_LENGTH);
                 if (op2 == JSOP_TYPEOF) {
                     vp->setUndefined();
                     return true;
@@ -1531,7 +1531,7 @@ class BindNameCompiler : public PICStubCompiler
         BindNameLabels &labels = pic.bindNameLabels();
 
         /* Guard on the shape of the scope chain. */
-        masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfScopeChain()), pic.objReg);
+        masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfScopeChain()), pic.objReg);
         masm.loadShape(pic.objReg, pic.shapeReg);
         Jump firstShape = masm.branch32(Assembler::NotEqual, pic.shapeReg,
                                         Imm32(scopeChain->shape()));
@@ -1751,7 +1751,7 @@ void JS_FASTCALL
 ic::CallProp(VMFrame &f, ic::PICInfo *pic)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     JSScript *script = f.fp()->script();
 
@@ -2102,8 +2102,8 @@ GetElementIC::attachGetProp(JSContext *cx, JSObject *obj, const Value &v, jsid i
 
     if (op == JSOP_CALLELEM) {
         // Emit a write of |obj| to the top of the stack, before we lose it.
-        Value *thisVp = &cx->regs->sp[-1];
-        Address thisSlot(JSFrameReg, JSStackFrame::offsetOfFixed(thisVp - cx->fp()->slots()));
+        Value *thisVp = &cx->regs().sp[-1];
+        Address thisSlot(JSFrameReg, StackFrame::offsetOfFixed(thisVp - cx->fp()->slots()));
         masm.storeValueFromComponents(ImmType(JSVAL_TYPE_OBJECT), objReg, thisSlot);
     }
 
diff --git a/js/src/methodjit/RematInfo.h b/js/src/methodjit/RematInfo.h
index 3279e763426c..caba92daed01 100644
--- a/js/src/methodjit/RematInfo.h
+++ b/js/src/methodjit/RematInfo.h
@@ -88,7 +88,7 @@ struct StateRemat {
     // representation in a struct or union. This prevents bloating the IC
     // structs by an extra 8 bytes in some cases. 16 bits are needed to encode
     // the largest local:
-    //   ((UINT16_LIMIT - 1) * sizeof(Value) + sizeof(JSStackFrame),
+    //   ((UINT16_LIMIT - 1) * sizeof(Value) + sizeof(StackFrame),
     // And an extra bit for the sign on arguments.
 #define MIN_STATE_REMAT_BITS        21
 
@@ -96,7 +96,7 @@ struct StateRemat {
     bool inRegister() const { return offset_ >= 0 &&
                                      offset_ <= int32(JSC::MacroAssembler::TotalRegisters); }
     bool inMemory() const {
-        return offset_ >= int32(sizeof(JSStackFrame)) ||
+        return offset_ >= int32(sizeof(StackFrame)) ||
                offset_ < 0;
     }
 
diff --git a/js/src/methodjit/Retcon.cpp b/js/src/methodjit/Retcon.cpp
index e081b92ec499..05dd2e1e07e9 100644
--- a/js/src/methodjit/Retcon.cpp
+++ b/js/src/methodjit/Retcon.cpp
@@ -123,8 +123,8 @@ Recompiler::recompile()
     Vector<PatchableAddress> normalPatches(cx);
     Vector<PatchableAddress> ctorPatches(cx);
 
-    JSStackFrame *firstCtorFrame = NULL;
-    JSStackFrame *firstNormalFrame = NULL;
+    StackFrame *firstCtorFrame = NULL;
+    StackFrame *firstNormalFrame = NULL;
 
     // Find all JIT'd stack frames to account for return addresses that will
     // need to be patched after recompilation.
@@ -133,8 +133,8 @@ Recompiler::recompile()
          f = f->previous) {
 
         // Scan all frames owned by this VMFrame.
-        JSStackFrame *end = f->entryfp->prev();
-        for (JSStackFrame *fp = f->fp(); fp != end; fp = fp->prev()) {
+        StackFrame *end = f->entryfp->prev();
+        for (StackFrame *fp = f->fp(); fp != end; fp = fp->prev()) {
             // Remember the latest frame for each type of JIT'd code, so the
             // compiler will have a frame to re-JIT from.
             if (!firstCtorFrame && fp->script() == script && fp->isConstructing())
@@ -198,7 +198,7 @@ Recompiler::saveTraps(JITScript *jit, Vector<CallSite> *sites)
 }
 
 bool
-Recompiler::recompile(JSStackFrame *fp, Vector<PatchableAddress> &patches,
+Recompiler::recompile(StackFrame *fp, Vector<PatchableAddress> &patches,
                       Vector<CallSite> &sites)
 {
     /* If we get this far, the script is live, and we better be safe to re-jit. */
diff --git a/js/src/methodjit/Retcon.h b/js/src/methodjit/Retcon.h
index afdf8f197bd1..582a8167581a 100644
--- a/js/src/methodjit/Retcon.h
+++ b/js/src/methodjit/Retcon.h
@@ -98,7 +98,7 @@ private:
     
     PatchableAddress findPatch(JITScript *jit, void **location);
     void applyPatch(Compiler& c, PatchableAddress& toPatch);
-    bool recompile(JSStackFrame *fp, Vector<PatchableAddress> &patches,
+    bool recompile(StackFrame *fp, Vector<PatchableAddress> &patches,
                    Vector<CallSite> &sites);
     bool saveTraps(JITScript *jit, Vector<CallSite> *sites);
 };
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index f75be169f6ae..0b88920369c3 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -411,7 +411,7 @@ void JS_FASTCALL
 stubs::GetElem(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value &lref = regs.sp[-2];
     Value &rref = regs.sp[-1];
@@ -451,7 +451,7 @@ stubs::GetElem(VMFrame &f)
             if (arg < obj->getArgsInitialLength()) {
                 copyFrom = obj->addressOfArgsElement(arg);
                 if (!copyFrom->isMagic()) {
-                    if (JSStackFrame *afp = (JSStackFrame *) obj->getPrivate())
+                    if (StackFrame *afp = (StackFrame *) obj->getPrivate())
                         copyFrom = &afp->canonicalActualArg(arg);
                     goto end_getelem;
                 }
@@ -496,7 +496,7 @@ void JS_FASTCALL
 stubs::CallElem(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     /* Find the object on which to look for |this|'s properties. */
     Value thisv = regs.sp[-2];
@@ -531,7 +531,7 @@ void JS_FASTCALL
 stubs::SetElem(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value &objval = regs.sp[-3];
     Value &idval  = regs.sp[-2];
@@ -691,7 +691,7 @@ stubs::DefFun(VMFrame &f, JSFunction *fun)
     JSObject *obj2;
 
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 
     /*
      * A top-level function defined in Global or Eval code (see ECMA-262
@@ -744,7 +744,7 @@ stubs::DefFun(VMFrame &f, JSFunction *fun)
      * current scope chain even for the case of function expression statements
      * and functions defined by eval inside let or with blocks.
      */
-    JSObject *parent = &fp->varobj(cx);
+    JSObject *parent = &cx->stack.currentVarObj();
 
     /* ES5 10.5 (NB: with subsequent errata). */
     jsid id = ATOM_TO_JSID(fun->atom);
@@ -811,7 +811,7 @@ template void JS_FASTCALL stubs::DefFun<false>(VMFrame &f, JSFunction *fun);
 #define RELATIONAL(OP)                                                        \
     JS_BEGIN_MACRO                                                            \
         JSContext *cx = f.cx;                                                 \
-        JSFrameRegs &regs = f.regs;                                           \
+        FrameRegs &regs = f.regs;                                             \
         Value rval = regs.sp[-1];                                             \
         Value lval = regs.sp[-2];                                             \
         bool cond;                                                            \
@@ -879,7 +879,7 @@ static inline bool
 StubEqualityOp(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value rval = regs.sp[-1];
     Value lval = regs.sp[-2];
@@ -1006,7 +1006,7 @@ void JS_FASTCALL
 stubs::Add(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
     Value rval = regs.sp[-1];
     Value lval = regs.sp[-2];
 
@@ -1078,7 +1078,7 @@ void JS_FASTCALL
 stubs::Sub(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
     double d1, d2;
     if (!ValueToNumber(cx, regs.sp[-2], &d1) ||
         !ValueToNumber(cx, regs.sp[-1], &d2)) {
@@ -1092,7 +1092,7 @@ void JS_FASTCALL
 stubs::Mul(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
     double d1, d2;
     if (!ValueToNumber(cx, regs.sp[-2], &d1) ||
         !ValueToNumber(cx, regs.sp[-1], &d2)) {
@@ -1107,7 +1107,7 @@ stubs::Div(VMFrame &f)
 {
     JSContext *cx = f.cx;
     JSRuntime *rt = cx->runtime;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     double d1, d2;
     if (!ValueToNumber(cx, regs.sp[-2], &d1) ||
@@ -1139,7 +1139,7 @@ void JS_FASTCALL
 stubs::Mod(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value &lref = regs.sp[-2];
     Value &rref = regs.sp[-1];
@@ -1202,7 +1202,7 @@ void JS_FASTCALL
 stubs::Trap(VMFrame &f, uint32 trapTypes)
 {
     Value rval;
-    jsbytecode *pc = f.cx->regs->pc;
+    jsbytecode *pc = f.cx->regs().pc;
 
     /*
      * Trap may be called for a single-step interrupt trap and/or a
@@ -1296,7 +1296,7 @@ void JS_FASTCALL
 stubs::InitElem(VMFrame &f, uint32 last)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     /* Pop the element's value into rval. */
     JS_ASSERT(regs.sp - f.fp()->base() >= 3);
@@ -1836,7 +1836,7 @@ static bool JS_FASTCALL
 InlineGetProp(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value *vp = &f.regs.sp[-1];
     JSObject *obj = ValueToObject(f.cx, vp);
@@ -1913,7 +1913,7 @@ void JS_FASTCALL
 stubs::CallProp(VMFrame &f, JSAtom *origAtom)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     Value lval;
     lval = regs.sp[-1];
@@ -2005,7 +2005,7 @@ stubs::CallProp(VMFrame &f, JSAtom *origAtom)
 void JS_FASTCALL
 stubs::Length(VMFrame &f)
 {
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
     Value *vp = &regs.sp[-1];
 
     if (vp->isString()) {
@@ -2042,7 +2042,7 @@ InitPropOrMethod(VMFrame &f, JSAtom *atom, JSOp op)
 {
     JSContext *cx = f.cx;
     JSRuntime *rt = cx->runtime;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     /* Load the property's initial value into rval. */
     JS_ASSERT(regs.sp - f.fp()->base() >= 2);
@@ -2224,7 +2224,7 @@ JSBool JS_FASTCALL
 stubs::InstanceOf(VMFrame &f)
 {
     JSContext *cx = f.cx;
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 
     const Value &rref = regs.sp[-1];
     if (rref.isPrimitive()) {
@@ -2263,7 +2263,7 @@ stubs::ArgCnt(VMFrame &f)
 {
     JSContext *cx = f.cx;
     JSRuntime *rt = cx->runtime;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 
     jsid id = ATOM_TO_JSID(rt->atomState.lengthAtom);
     f.regs.sp++;
@@ -2274,9 +2274,9 @@ stubs::ArgCnt(VMFrame &f)
 void JS_FASTCALL
 stubs::EnterBlock(VMFrame &f, JSObject *obj)
 {
-    JSFrameRegs &regs = f.regs;
+    FrameRegs &regs = f.regs;
 #ifdef DEBUG
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 #endif
 
     JS_ASSERT(obj->isStaticBlock());
@@ -2316,7 +2316,7 @@ void JS_FASTCALL
 stubs::LeaveBlock(VMFrame &f, JSObject *blockChain)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 
 #ifdef DEBUG
     JS_ASSERT(blockChain->isStaticBlock());
@@ -2552,9 +2552,9 @@ void JS_FASTCALL
 stubs::DefVarOrConst(VMFrame &f, JSAtom *atom)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
+    StackFrame *fp = f.fp();
 
-    JSObject *obj = &fp->varobj(cx);
+    JSObject *obj = &cx->stack.currentVarObj();
     JS_ASSERT(!obj->getOps()->defineProperty);
     uintN attrs = JSPROP_ENUMERATE;
     if (!fp->isEvalFrame())
@@ -2598,9 +2598,8 @@ void JS_FASTCALL
 stubs::SetConst(VMFrame &f, JSAtom *atom)
 {
     JSContext *cx = f.cx;
-    JSStackFrame *fp = f.fp();
 
-    JSObject *obj = &fp->varobj(cx);
+    JSObject *obj = &cx->stack.currentVarObj();
     const Value &ref = f.regs.sp[-1];
     if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), ref,
                              PropertyStub, StrictPropertyStub,
diff --git a/js/src/methodjit/TrampolineCompiler.cpp b/js/src/methodjit/TrampolineCompiler.cpp
index a822c0fc4739..a6ac9d709f0e 100644
--- a/js/src/methodjit/TrampolineCompiler.cpp
+++ b/js/src/methodjit/TrampolineCompiler.cpp
@@ -118,20 +118,20 @@ TrampolineCompiler::generateForceReturn(Assembler &masm)
 {
     /* if (hasArgsObj() || hasCallObj()) stubs::PutActivationObjects() */
     Jump noActObjs = masm.branchTest32(Assembler::Zero, FrameFlagsAddress(),
-                                       Imm32(JSFRAME_HAS_CALL_OBJ | JSFRAME_HAS_ARGS_OBJ));
+                                       Imm32(StackFrame::HAS_CALL_OBJ | StackFrame::HAS_ARGS_OBJ));
     masm.fallibleVMCall(JS_FUNC_TO_DATA_PTR(void *, stubs::PutActivationObjects), NULL, 0);
     noActObjs.linkTo(masm.label(), &masm);
 
     /* Store any known return value */
     masm.loadValueAsComponents(UndefinedValue(), JSReturnReg_Type, JSReturnReg_Data);
     Jump rvalClear = masm.branchTest32(Assembler::Zero,
-                                       FrameFlagsAddress(), Imm32(JSFRAME_HAS_RVAL));
-    Address rvalAddress(JSFrameReg, JSStackFrame::offsetOfReturnValue());
+                                       FrameFlagsAddress(), Imm32(StackFrame::HAS_RVAL));
+    Address rvalAddress(JSFrameReg, StackFrame::offsetOfReturnValue());
     masm.loadValueAsComponents(rvalAddress, JSReturnReg_Type, JSReturnReg_Data);
     rvalClear.linkTo(masm.label(), &masm);
 
     /* Return to the caller */
-    masm.loadPtr(Address(JSFrameReg, JSStackFrame::offsetOfncode()), Registers::ReturnReg);
+    masm.loadPtr(Address(JSFrameReg, StackFrame::offsetOfNcode()), Registers::ReturnReg);
     masm.jump(Registers::ReturnReg);
     return true;
 }
diff --git a/js/src/methodjit/TrampolineMasmX64.asm b/js/src/methodjit/TrampolineMasmX64.asm
index 037ace7022c1..054f7a80a8b9 100644
--- a/js/src/methodjit/TrampolineMasmX64.asm
+++ b/js/src/methodjit/TrampolineMasmX64.asm
@@ -43,7 +43,7 @@ extern PopActiveVMFrame:PROC
 
 .CODE
 
-; JSBool JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code,
+; JSBool JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code,
 ;                         Value *stackLimit, void *safePoint);
 JaegerTrampoline PROC FRAME
     push    rbp
diff --git a/js/src/methodjit/TrampolineMingwX64.s b/js/src/methodjit/TrampolineMingwX64.s
index 056aab9c1e3a..95a47ac45db3 100644
--- a/js/src/methodjit/TrampolineMingwX64.s
+++ b/js/src/methodjit/TrampolineMingwX64.s
@@ -44,7 +44,7 @@
 .text
 .intel_syntax noprefix
 
-# JSBool JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code,
+# JSBool JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code,
 #                         Value *stackLimit, void *safePoint)#
 .globl JaegerTrampoline
 .def JaegerTrampoline
diff --git a/js/src/methodjit/TrampolineSUNWX64.s b/js/src/methodjit/TrampolineSUNWX64.s
index 114ea466dcac..ae415d30be92 100644
--- a/js/src/methodjit/TrampolineSUNWX64.s
+++ b/js/src/methodjit/TrampolineSUNWX64.s
@@ -37,8 +37,8 @@
 
 .text
 
-/ JSBool JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code,
-/                        JSFrameRegs *regs, uintptr_t inlineCallCount)
+/ JSBool JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code,
+/                         FrameRegs *regs, uintptr_t inlineCallCount)
 .global JaegerTrampoline
 .type   JaegerTrampoline, @function
 JaegerTrampoline:
diff --git a/js/src/methodjit/TrampolineSUNWX86.s b/js/src/methodjit/TrampolineSUNWX86.s
index e3920f54e5e8..292046f18395 100644
--- a/js/src/methodjit/TrampolineSUNWX86.s
+++ b/js/src/methodjit/TrampolineSUNWX86.s
@@ -37,8 +37,8 @@
 
 .text
 
-/ JSBool JaegerTrampoline(JSContext *cx, JSStackFrame *fp, void *code,
-/                        JSFrameRegs *regs, uintptr_t inlineCallCount)
+/ JSBool JaegerTrampoline(JSContext *cx, StackFrame *fp, void *code,
+/                         FrameRegs *regs, uintptr_t inlineCallCount)
 .global JaegerTrampoline
 .type   JaegerTrampoline, @function
 JaegerTrampoline:
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 6bfffbb8b8e7..7517e0539928 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1800,7 +1800,7 @@ GetTrapArgs(JSContext *cx, uintN argc, jsval *argv, JSScript **scriptp,
     uintN intarg;
     JSScript *script;
 
-    *scriptp = JS_GetScriptedCaller(cx, NULL)->script();
+    *scriptp = JS_GetFrameScript(cx, JS_GetScriptedCaller(cx, NULL));
     *ip = 0;
     if (argc != 0) {
         v = argv[0];
@@ -1823,11 +1823,12 @@ GetTrapArgs(JSContext *cx, uintN argc, jsval *argv, JSScript **scriptp,
 }
 
 static JSTrapStatus
-TrapHandler(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval,
+TrapHandler(JSContext *cx, JSScript *, jsbytecode *pc, jsval *rval,
             jsval closure)
 {
     JSString *str = JSVAL_TO_STRING(closure);
     JSStackFrame *caller = JS_GetScriptedCaller(cx, NULL);
+    JSScript *script = JS_GetFrameScript(cx, caller);
 
     size_t length;
     const jschar *chars = JS_GetStringCharsAndLength(cx, str, &length);
@@ -1835,8 +1836,8 @@ TrapHandler(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval,
         return JSTRAP_ERROR;
 
     if (!JS_EvaluateUCInStackFrame(cx, caller, chars, length,
-                                   caller->script()->filename,
-                                   caller->script()->lineno,
+                                   script->filename,
+                                   script->lineno,
                                    rval)) {
         return JSTRAP_ERROR;
     }
@@ -1938,7 +1939,7 @@ LineToPC(JSContext *cx, uintN argc, jsval *vp)
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_LINE2PC_USAGE);
         return JS_FALSE;
     }
-    script = JS_GetScriptedCaller(cx, NULL)->script();
+    script = JS_GetFrameScript(cx, JS_GetScriptedCaller(cx, NULL));
     if (!GetTrapArgs(cx, argc, JS_ARGV(cx, vp), &script, &i))
         return JS_FALSE;
     lineno = (i == 0) ? script->lineno : (uintN)i;
@@ -3573,6 +3574,8 @@ EvalInContext(JSContext *cx, uintN argc, jsval *vp)
         return true;
 
     JSStackFrame *fp = JS_GetScriptedCaller(cx, NULL);
+    JSScript *script = JS_GetFrameScript(cx, fp);
+    jsbytecode *pc = JS_GetFramePC(cx, fp);
     {
         JSAutoEnterCompartment ac;
         uintN flags;
@@ -3591,8 +3594,8 @@ EvalInContext(JSContext *cx, uintN argc, jsval *vp)
             return false;
         }
         if (!JS_EvaluateUCScript(cx, sobj, src, srclen,
-                                 fp->script()->filename,
-                                 JS_PCToLineNumber(cx, fp->script(), fp->pc(cx)),
+                                 script->filename,
+                                 JS_PCToLineNumber(cx, script, pc),
                                  vp)) {
             return false;
         }
@@ -3618,7 +3621,7 @@ EvalInFrame(JSContext *cx, uintN argc, jsval *vp)
                         ? !!(JSVAL_TO_BOOLEAN(argv[2]))
                         : false;
 
-    JS_ASSERT(cx->hasfp());
+    JS_ASSERT(cx->running());
 
     FrameRegsIter fi(cx);
     for (uint32 i = 0; i < upCount; ++i, ++fi) {
@@ -3626,8 +3629,8 @@ EvalInFrame(JSContext *cx, uintN argc, jsval *vp)
             break;
     }
 
-    JSStackFrame *const fp = fi.fp();
-    if (!JS_IsScriptFrame(cx, fp)) {
+    StackFrame *const fp = fi.fp();
+    if (!fp->isScriptFrame()) {
         JS_ReportError(cx, "cannot eval in non-script frame");
         return JS_FALSE;
     }
@@ -3641,7 +3644,7 @@ EvalInFrame(JSContext *cx, uintN argc, jsval *vp)
     if (!chars)
         return JS_FALSE;
 
-    JSBool ok = JS_EvaluateUCInStackFrame(cx, fp, chars, length,
+    JSBool ok = JS_EvaluateUCInStackFrame(cx, Jsvalify(fp), chars, length,
                                           fp->script()->filename,
                                           JS_PCToLineNumber(cx, fp->script(),
                                                             fi.pc()),
@@ -4463,7 +4466,6 @@ Snarf(JSContext *cx, uintN argc, jsval *vp)
 {
     JSString *str;
     const char *pathname;
-    JSStackFrame *fp;
 
     if (!argc)
         return JS_FALSE;
@@ -4476,10 +4478,11 @@ Snarf(JSContext *cx, uintN argc, jsval *vp)
         return JS_FALSE;
 
     /* Get the currently executing script's name. */
-    fp = JS_GetScriptedCaller(cx, NULL);
-    JS_ASSERT(fp && fp->script()->filename);
+    JSStackFrame *fp = JS_GetScriptedCaller(cx, NULL);
+    JSScript *script = JS_GetFrameScript(cx, fp);
+    JS_ASSERT(fp && script->filename);
 #ifdef XP_UNIX
-    pathname = MakeAbsolutePathname(cx, fp->script()->filename, filename.ptr());
+    pathname = MakeAbsolutePathname(cx, script->filename, filename.ptr());
     if (!pathname)
         return JS_FALSE;
 #else
diff --git a/js/src/tracejit/Writer.cpp b/js/src/tracejit/Writer.cpp
index cbd9d27c35e3..c91797d95a20 100644
--- a/js/src/tracejit/Writer.cpp
+++ b/js/src/tracejit/Writer.cpp
@@ -370,17 +370,17 @@ void ValidateWriter::checkAccSet(LOpcode op, LIns *base, int32_t disp, AccSet ac
 
       case ACCSET_FRAMEREGS:
         // base = ldp.cx ...[offsetof(JSContext, regs)]
-        // ins  = ldp.regs base[<disp within JSFrameRegs>]
+        // ins  = ldp.regs base[<disp within FrameRegs>]
         ok = op == LIR_ldp &&
-             dispWithin(JSFrameRegs) && 
-             match(base, LIR_ldp, ACCSET_CX, offsetof(JSContext, regs));
+             dispWithin(FrameRegs) && 
+             match(base, LIR_ldp, ACCSET_CX, offsetof(JSContext, stack) + ContextStack::offsetOfRegs());
         break;
 
       case ACCSET_STACKFRAME:
-        // base = ldp.regs ...[offsetof(JSFrameRegs, fp)]
-        // ins  = {ld,st}X.sf base[<disp within JSStackFrame>]
-        ok = dispWithin(JSStackFrame) && 
-             match(base, LIR_ldp, ACCSET_FRAMEREGS, offsetof(JSFrameRegs, fp));
+        // base = ldp.regs ...[offsetof(FrameRegs, fp)]
+        // ins  = {ld,st}X.sf base[<disp within StackFrame>]
+        ok = dispWithin(StackFrame) && 
+             match(base, LIR_ldp, ACCSET_FRAMEREGS, FrameRegs::offsetOfFp);
         break;
 
       case ACCSET_RUNTIME:
diff --git a/js/src/tracejit/Writer.h b/js/src/tracejit/Writer.h
index ed35ef6debb1..d9531d025a9f 100644
--- a/js/src/tracejit/Writer.h
+++ b/js/src/tracejit/Writer.h
@@ -106,8 +106,8 @@ enum LC_TMBits {
  * - ACCSET_EOS:           The globals area.
  * - ACCSET_ALLOC:         All memory blocks allocated with LIR_allocp (in
  *                         other words, this region is the AR space).
- * - ACCSET_FRAMEREGS:     All JSFrameRegs structs.
- * - ACCSET_STACKFRAME:    All JSStackFrame objects.
+ * - ACCSET_FRAMEREGS:     All FrameRegs structs.
+ * - ACCSET_STACKFRAME:    All StackFrame objects.
  * - ACCSET_RUNTIME:       The JSRuntime object.
  * - ACCSET_OBJ_CLASP:     The 'clasp'    field of all JSObjects.
  * - ACCSET_OBJ_FLAGS:     The 'flags'    field of all JSObjects.
@@ -427,6 +427,10 @@ class Writer
     #define ldpConstContextField(fieldname) \
         name(w.ldpContextFieldHelper(cx_ins, offsetof(JSContext, fieldname), LOAD_CONST), \
              #fieldname)
+    nj::LIns *ldpContextRegs(nj::LIns *cx) const {
+        int32 offset = offsetof(JSContext, stack) + ContextStack::offsetOfRegs();
+        return name(ldpContextFieldHelper(cx, offset, nj::LOAD_NORMAL),"regs");
+    }
 
     nj::LIns *stContextField(nj::LIns *value, nj::LIns *cx, int32 offset) const {
         return lir->insStore(value, cx, offset, ACCSET_CX);
@@ -457,11 +461,11 @@ class Writer
     }
 
     nj::LIns *ldpFrameFp(nj::LIns *regs) const {
-        return lir->insLoad(nj::LIR_ldp, regs, offsetof(JSFrameRegs, fp), ACCSET_FRAMEREGS);
+        return lir->insLoad(nj::LIR_ldp, regs, FrameRegs::offsetOfFp, ACCSET_FRAMEREGS);
     }
 
     nj::LIns *ldpStackFrameScopeChain(nj::LIns *frame) const {
-        return lir->insLoad(nj::LIR_ldp, frame, JSStackFrame::offsetOfScopeChain(),
+        return lir->insLoad(nj::LIR_ldp, frame, StackFrame::offsetOfScopeChain(),
                             ACCSET_STACKFRAME);
     }
 
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
new file mode 100644
index 000000000000..5ad22be1055b
--- /dev/null
+++ b/js/src/vm/Stack-inl.h
@@ -0,0 +1,1084 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Luke Wagner <luke@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef Stack_inl_h__
+#define Stack_inl_h__
+
+#include "Stack.h"
+
+namespace js {
+
+/*****************************************************************************/
+
+/* See VM stack layout comment in Stack.h. */
+class StackSegment
+{
+    /* The context to which this segment belongs. */
+    ContextStack        *stack_;
+
+    /* Link for JSContext segment stack mentioned in big comment above. */
+    StackSegment        *previousInContext_;
+
+    /* Link for StackSpace segment stack mentioned in StackSpace comment. */
+    StackSegment        *previousInMemory_;
+
+    /* The first frame executed in this segment. null iff cx is null */
+    StackFrame          *initialFrame_;
+
+    /* If this segment is suspended, |cx->regs| when it was suspended. */
+    FrameRegs           *suspendedRegs_;
+
+    /* The varobj on entry to initialFrame. */
+    JSObject            *initialVarObj_;
+
+    /* Whether this segment was suspended by JS_SaveFrameChain. */
+    bool                saved_;
+
+    /* Align at 8 bytes on all platforms. */
+#if JS_BITS_PER_WORD == 32
+    void                *padding;
+#endif
+
+    /*
+     * To make isActive a single null-ness check, this non-null constant is
+     * assigned to suspendedRegs when empty.
+     */
+#define NON_NULL_SUSPENDED_REGS ((FrameRegs *)0x1)
+
+  public:
+    StackSegment()
+      : stack_(NULL), previousInContext_(NULL), previousInMemory_(NULL),
+        initialFrame_(NULL), suspendedRegs_(NON_NULL_SUSPENDED_REGS),
+        initialVarObj_(NULL), saved_(false)
+    {
+        JS_ASSERT(empty());
+    }
+
+    /* Safe casts guaranteed by the contiguous-stack layout. */
+
+    Value *valueRangeBegin() const {
+        return (Value *)(this + 1);
+    }
+
+    /*
+     * The set of fields provided by a segment depend on its state. In addition
+     * to the "active" and "suspended" states described in Stack.h, segments
+     * have a third state: empty. An empty segment contains no frames and is
+     * pushed for the purpose of preparing the args to Invoke. Invoke args
+     * requires special handling because anything can happen between pushing
+     * Invoke args and calling Invoke. Since an empty segment contains no
+     * frames, it cannot become the "current segment" of a ContextStack (for
+     * various arcane and hopefully temporary reasons). Thus, an empty segment
+     * is pushed onto the StackSpace but only pushed onto a ContextStack when it
+     * gets its first frame pushed from js::Invoke.
+     *
+     * Finally, (to support JS_SaveFrameChain/JS_RestoreFrameChain) a suspended
+     * segment may or may not be "saved". Normally, when the active segment is
+     * popped, the previous segment (which is necessarily suspended) becomes
+     * active. If the previous segment was saved, however, then it stays
+     * suspended until it is made active by a call to JS_RestoreFrameChain. This
+     * is why a context may have a current segment, but not an active segment.
+     * Hopefully, this feature will be removed.
+     */
+
+    bool empty() const {
+        JS_ASSERT(!!stack_ == !!initialFrame_);
+        JS_ASSERT_IF(!stack_, suspendedRegs_ == NON_NULL_SUSPENDED_REGS && !saved_);
+        return !stack_;
+    }
+
+    bool isActive() const {
+        JS_ASSERT_IF(!suspendedRegs_, stack_ && !saved_);
+        JS_ASSERT_IF(!stack_, suspendedRegs_ == NON_NULL_SUSPENDED_REGS);
+        return !suspendedRegs_;
+    }
+
+    bool isSuspended() const {
+        JS_ASSERT_IF(!stack_ || !suspendedRegs_, !saved_);
+        JS_ASSERT_IF(!stack_, suspendedRegs_ == NON_NULL_SUSPENDED_REGS);
+        return stack_ && suspendedRegs_;
+    }
+
+    /* Substate of suspended, queryable in any state. */
+
+    bool isSaved() const {
+        JS_ASSERT_IF(saved_, isSuspended());
+        return saved_;
+    }
+
+    /* Transitioning between empty <--> isActive */
+
+    void joinContext(ContextStack &stack, StackFrame &frame) {
+        JS_ASSERT(empty());
+        stack_ = &stack;
+        initialFrame_ = &frame;
+        suspendedRegs_ = NULL;
+        JS_ASSERT(isActive());
+    }
+
+    void leaveContext() {
+        JS_ASSERT(isActive());
+        stack_ = NULL;
+        initialFrame_ = NULL;
+        suspendedRegs_ = NON_NULL_SUSPENDED_REGS;
+        JS_ASSERT(empty());
+    }
+
+    ContextStack &stack() const {
+        JS_ASSERT(!empty());
+        return *stack_;
+    }
+
+    ContextStack *maybeStack() const {
+        return stack_;
+    }
+
+#undef NON_NULL_SUSPENDED_REGS
+
+    /* Transitioning between isActive <--> isSuspended */
+
+    void suspend(FrameRegs &regs) {
+        JS_ASSERT(isActive());
+        JS_ASSERT(contains(regs.fp()));
+        suspendedRegs_ = &regs;
+        JS_ASSERT(isSuspended());
+    }
+
+    void resume() {
+        JS_ASSERT(isSuspended());
+        suspendedRegs_ = NULL;
+        JS_ASSERT(isActive());
+    }
+
+    /* When isSuspended, transitioning isSaved <--> !isSaved */
+
+    void save(FrameRegs &regs) {
+        JS_ASSERT(!isSuspended());
+        suspend(regs);
+        saved_ = true;
+        JS_ASSERT(isSaved());
+    }
+
+    void restore() {
+        JS_ASSERT(isSaved());
+        saved_ = false;
+        resume();
+        JS_ASSERT(!isSuspended());
+    }
+
+    /* Data available when !empty */
+
+    StackFrame *initialFrame() const {
+        JS_ASSERT(!empty());
+        return initialFrame_;
+    }
+
+    FrameRegs &currentRegs() const {
+        JS_ASSERT(!empty());
+        return isActive() ? stack_->regs() : suspendedRegs();
+    }
+
+    StackFrame *currentFrame() const {
+        return currentRegs().fp();
+    }
+
+    StackFrame *currentFrameOrNull() const {
+        return empty() ? NULL : currentFrame();
+    }
+
+    /* Data available when isSuspended. */
+
+    FrameRegs &suspendedRegs() const {
+        JS_ASSERT(isSuspended());
+        return *suspendedRegs_;
+    }
+
+    StackFrame *suspendedFrame() const {
+        return suspendedRegs_->fp();
+    }
+
+    /* JSContext / js::StackSpace bookkeeping. */
+
+    void setPreviousInContext(StackSegment *seg) {
+        previousInContext_ = seg;
+    }
+
+    StackSegment *previousInContext() const  {
+        return previousInContext_;
+    }
+
+    void setPreviousInMemory(StackSegment *seg) {
+        previousInMemory_ = seg;
+    }
+
+    StackSegment *previousInMemory() const  {
+        return previousInMemory_;
+    }
+
+    void setInitialVarObj(JSObject *obj) {
+        JS_ASSERT(!empty());
+        initialVarObj_ = obj;
+    }
+
+    bool hasInitialVarObj() {
+        JS_ASSERT(!empty());
+        return initialVarObj_ != NULL;
+    }
+
+    JSObject &initialVarObj() const {
+        JS_ASSERT(!empty() && initialVarObj_);
+        return *initialVarObj_;
+    }
+
+    bool contains(const StackFrame *fp) const;
+
+    StackFrame *computeNextFrame(StackFrame *fp) const;
+};
+
+static const size_t VALUES_PER_STACK_SEGMENT = sizeof(StackSegment) / sizeof(Value);
+JS_STATIC_ASSERT(sizeof(StackSegment) % sizeof(Value) == 0);
+
+/*****************************************************************************/
+
+inline void
+StackFrame::initPrev(JSContext *cx)
+{
+    JS_ASSERT(flags_ & HAS_PREVPC);
+    if (FrameRegs *regs = cx->maybeRegs()) {
+        prev_ = regs->fp();
+        prevpc_ = regs->pc;
+        JS_ASSERT_IF(!prev_->isDummyFrame() && !prev_->hasImacropc(),
+                     uint32(prevpc_ - prev_->script()->code) < prev_->script()->length);
+    } else {
+        prev_ = NULL;
+#ifdef DEBUG
+        prevpc_ = (jsbytecode *)0xbadc;
+#endif
+    }
+}
+
+inline void
+StackFrame::resetGeneratorPrev(JSContext *cx)
+{
+    flags_ |= HAS_PREVPC;
+    initPrev(cx);
+}
+
+inline void
+StackFrame::initCallFrame(JSContext *cx, JSObject &callee, JSFunction *fun,
+                          uint32 nactual, uint32 flagsArg)
+{
+    JS_ASSERT((flagsArg & ~(CONSTRUCTING |
+                            OVERFLOW_ARGS |
+                            UNDERFLOW_ARGS)) == 0);
+    JS_ASSERT(fun == callee.getFunctionPrivate());
+
+    /* Initialize stack frame members. */
+    flags_ = FUNCTION | HAS_PREVPC | HAS_SCOPECHAIN | flagsArg;
+    exec.fun = fun;
+    args.nactual = nactual;  /* only need to write if over/under-flow */
+    scopeChain_ = callee.getParent();
+    initPrev(cx);
+    JS_ASSERT(!hasImacropc());
+    JS_ASSERT(!hasHookData());
+    JS_ASSERT(annotation() == NULL);
+    JS_ASSERT(!hasCallObj());
+}
+
+inline void
+StackFrame::resetInvokeCallFrame()
+{
+    /* Undo changes to frame made during execution; see initCallFrame */
+
+    putActivationObjects();
+
+    JS_ASSERT(!(flags_ & ~(FUNCTION |
+                           OVERFLOW_ARGS |
+                           UNDERFLOW_ARGS |
+                           OVERRIDE_ARGS |
+                           HAS_PREVPC |
+                           HAS_RVAL |
+                           HAS_SCOPECHAIN |
+                           HAS_ANNOTATION |
+                           HAS_HOOK_DATA |
+                           HAS_CALL_OBJ |
+                           HAS_ARGS_OBJ |
+                           FINISHED_IN_INTERP)));
+
+    /*
+     * Since the stack frame is usually popped after PutActivationObjects,
+     * these bits aren't cleared. The activation objects must have actually
+     * been put, though.
+     */
+    JS_ASSERT_IF(flags_ & HAS_CALL_OBJ, callObj().getPrivate() == NULL);
+    JS_ASSERT_IF(flags_ & HAS_ARGS_OBJ, argsObj().getPrivate() == NULL);
+
+    flags_ &= FUNCTION |
+              OVERFLOW_ARGS |
+              HAS_PREVPC |
+              UNDERFLOW_ARGS;
+
+    JS_ASSERT(exec.fun == callee().getFunctionPrivate());
+    scopeChain_ = callee().getParent();
+}
+
+inline void
+StackFrame::initCallFrameCallerHalf(JSContext *cx, uint32 flagsArg,
+                                    void *ncode)
+{
+    JS_ASSERT((flagsArg & ~(CONSTRUCTING |
+                            FUNCTION |
+                            OVERFLOW_ARGS |
+                            UNDERFLOW_ARGS)) == 0);
+
+    flags_ = FUNCTION | flagsArg;
+    prev_ = cx->fp();
+    ncode_ = ncode;
+}
+
+/*
+ * The "early prologue" refers to the members that are stored for the benefit
+ * of slow paths before initializing the rest of the members.
+ */
+inline void
+StackFrame::initCallFrameEarlyPrologue(JSFunction *fun, uint32 nactual)
+{
+    exec.fun = fun;
+    if (flags_ & (OVERFLOW_ARGS | UNDERFLOW_ARGS))
+        args.nactual = nactual;
+}
+
+/*
+ * The "late prologue" refers to the members that are stored after having
+ * checked for stack overflow and formal/actual arg mismatch.
+ */
+inline void
+StackFrame::initCallFrameLatePrologue()
+{
+    SetValueRangeToUndefined(slots(), script()->nfixed);
+}
+
+inline void
+StackFrame::initEvalFrame(JSContext *cx, JSScript *script, StackFrame *prev, uint32 flagsArg)
+{
+    JS_ASSERT(flagsArg & EVAL);
+    JS_ASSERT((flagsArg & ~(EVAL | DEBUGGER)) == 0);
+    JS_ASSERT(prev->isScriptFrame());
+
+    /* Copy (callee, thisv). */
+    Value *dstvp = (Value *)this - 2;
+    Value *srcvp = prev->hasArgs()
+                   ? prev->formalArgs() - 2
+                   : (Value *)prev - 2;
+    dstvp[0] = srcvp[0];
+    dstvp[1] = srcvp[1];
+    JS_ASSERT_IF(prev->isFunctionFrame(),
+                 dstvp[0].toObject().isFunction());
+
+    /* Initialize stack frame members. */
+    flags_ = flagsArg | HAS_PREVPC | HAS_SCOPECHAIN |
+             (prev->flags_ & (FUNCTION | GLOBAL));
+    if (isFunctionFrame()) {
+        exec = prev->exec;
+        args.script = script;
+    } else {
+        exec.script = script;
+    }
+
+    scopeChain_ = &prev->scopeChain();
+    prev_ = prev;
+    prevpc_ = prev->pc(cx);
+    JS_ASSERT(!hasImacropc());
+    JS_ASSERT(!hasHookData());
+    setAnnotation(prev->annotation());
+}
+
+inline void
+StackFrame::initGlobalFrame(JSScript *script, JSObject &chain, uint32 flagsArg)
+{
+    JS_ASSERT((flagsArg & ~(EVAL | DEBUGGER)) == 0);
+
+    /* Initialize (callee, thisv). */
+    Value *vp = (Value *)this - 2;
+    vp[0].setUndefined();
+    vp[1].setUndefined();  /* Set after frame pushed using thisObject */
+
+    /* Initialize stack frame members. */
+    flags_ = flagsArg | GLOBAL | HAS_PREVPC | HAS_SCOPECHAIN;
+    exec.script = script;
+    args.script = (JSScript *)0xbad;
+    scopeChain_ = &chain;
+    prev_ = NULL;
+    JS_ASSERT(!hasImacropc());
+    JS_ASSERT(!hasHookData());
+    JS_ASSERT(annotation() == NULL);
+}
+
+inline void
+StackFrame::initDummyFrame(JSContext *cx, JSObject &chain)
+{
+    PodZero(this);
+    flags_ = DUMMY | HAS_PREVPC | HAS_SCOPECHAIN;
+    initPrev(cx);
+    chain.isGlobal();
+    setScopeChainNoCallObj(chain);
+}
+
+inline void
+StackFrame::stealFrameAndSlots(Value *vp, StackFrame *otherfp,
+                               Value *othervp, Value *othersp)
+{
+    JS_ASSERT(vp == (Value *)this - (otherfp->formalArgsEnd() - othervp));
+    JS_ASSERT(othervp == otherfp->actualArgs() - 2);
+    JS_ASSERT(othersp >= otherfp->slots());
+    JS_ASSERT(othersp <= otherfp->base() + otherfp->numSlots());
+
+    PodCopy(vp, othervp, othersp - othervp);
+    JS_ASSERT(vp == this->actualArgs() - 2);
+
+    /* Catch bad-touching of non-canonical args (e.g., generator_trace). */
+    if (otherfp->hasOverflowArgs())
+        Debug_SetValueRangeToCrashOnTouch(othervp, othervp + 2 + otherfp->numFormalArgs());
+
+    /*
+     * Repoint Call, Arguments, Block and With objects to the new live frame.
+     * Call and Arguments are done directly because we have pointers to them.
+     * Block and With objects are done indirectly through 'liveFrame'. See
+     * js_LiveFrameToFloating comment in jsiter.h.
+     */
+    if (hasCallObj()) {
+        JSObject &obj = callObj();
+        obj.setPrivate(this);
+        otherfp->flags_ &= ~HAS_CALL_OBJ;
+        if (js_IsNamedLambda(fun())) {
+            JSObject *env = obj.getParent();
+            JS_ASSERT(env->getClass() == &js_DeclEnvClass);
+            env->setPrivate(this);
+        }
+    }
+    if (hasArgsObj()) {
+        JSObject &args = argsObj();
+        JS_ASSERT(args.isArguments());
+        if (args.isNormalArguments())
+            args.setPrivate(this);
+        else
+            JS_ASSERT(!args.getPrivate());
+        otherfp->flags_ &= ~HAS_ARGS_OBJ;
+    }
+}
+
+inline Value &
+StackFrame::canonicalActualArg(uintN i) const
+{
+    if (i < numFormalArgs())
+        return formalArg(i);
+    JS_ASSERT(i < numActualArgs());
+    return actualArgs()[i];
+}
+
+template <class Op>
+inline bool
+StackFrame::forEachCanonicalActualArg(Op op)
+{
+    uintN nformal = fun()->nargs;
+    Value *formals = formalArgsEnd() - nformal;
+    uintN nactual = numActualArgs();
+    if (nactual <= nformal) {
+        uintN i = 0;
+        Value *actualsEnd = formals + nactual;
+        for (Value *p = formals; p != actualsEnd; ++p, ++i) {
+            if (!op(i, p))
+                return false;
+        }
+    } else {
+        uintN i = 0;
+        Value *formalsEnd = formalArgsEnd();
+        for (Value *p = formals; p != formalsEnd; ++p, ++i) {
+            if (!op(i, p))
+                return false;
+        }
+        Value *actuals = formalsEnd - (nactual + 2);
+        Value *actualsEnd = formals - 2;
+        for (Value *p = actuals; p != actualsEnd; ++p, ++i) {
+            if (!op(i, p))
+                return false;
+        }
+    }
+    return true;
+}
+
+template <class Op>
+inline bool
+StackFrame::forEachFormalArg(Op op)
+{
+    Value *formals = formalArgsEnd() - fun()->nargs;
+    Value *formalsEnd = formalArgsEnd();
+    uintN i = 0;
+    for (Value *p = formals; p != formalsEnd; ++p, ++i) {
+        if (!op(i, p))
+            return false;
+    }
+    return true;
+}
+
+struct CopyTo
+{
+    Value *dst;
+    CopyTo(Value *dst) : dst(dst) {}
+    bool operator()(uintN, Value *src) {
+        *dst++ = *src;
+        return true;
+    }
+};
+
+JS_ALWAYS_INLINE void
+StackFrame::clearMissingArgs()
+{
+    if (flags_ & UNDERFLOW_ARGS)
+        SetValueRangeToUndefined(formalArgs() + numActualArgs(), formalArgsEnd());
+}
+
+inline uintN
+StackFrame::numActualArgs() const
+{
+    JS_ASSERT(hasArgs());
+    if (JS_UNLIKELY(flags_ & (OVERFLOW_ARGS | UNDERFLOW_ARGS)))
+        return hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
+    return numFormalArgs();
+}
+
+inline Value *
+StackFrame::actualArgs() const
+{
+    JS_ASSERT(hasArgs());
+    Value *argv = formalArgs();
+    if (JS_UNLIKELY(flags_ & OVERFLOW_ARGS)) {
+        uintN nactual = hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
+        return argv - (2 + nactual);
+    }
+    return argv;
+}
+
+inline Value *
+StackFrame::actualArgsEnd() const
+{
+    JS_ASSERT(hasArgs());
+    if (JS_UNLIKELY(flags_ & OVERFLOW_ARGS))
+        return formalArgs() - 2;
+    return formalArgs() + numActualArgs();
+}
+
+inline void
+StackFrame::setArgsObj(JSObject &obj)
+{
+    JS_ASSERT_IF(hasArgsObj(), &obj == args.obj);
+    JS_ASSERT_IF(!hasArgsObj(), numActualArgs() == obj.getArgsInitialLength());
+    args.obj = &obj;
+    flags_ |= HAS_ARGS_OBJ;
+}
+
+inline void
+StackFrame::setScopeChainNoCallObj(JSObject &obj)
+{
+#ifdef DEBUG
+    JS_ASSERT(&obj != NULL);
+    if (&obj != sInvalidScopeChain) {
+        if (hasCallObj()) {
+            JSObject *pobj = &obj;
+            while (pobj && pobj->getPrivate() != this)
+                pobj = pobj->getParent();
+            JS_ASSERT(pobj);
+        } else {
+            for (JSObject *pobj = &obj; pobj; pobj = pobj->getParent())
+                JS_ASSERT_IF(pobj->isCall(), pobj->getPrivate() != this);
+        }
+    }
+#endif
+    scopeChain_ = &obj;
+    flags_ |= HAS_SCOPECHAIN;
+}
+
+inline void
+StackFrame::setScopeChainWithOwnCallObj(JSObject &obj)
+{
+    JS_ASSERT(&obj != NULL);
+    JS_ASSERT(!hasCallObj() && obj.isCall() && obj.getPrivate() == this);
+    scopeChain_ = &obj;
+    flags_ |= HAS_SCOPECHAIN | HAS_CALL_OBJ;
+}
+
+inline JSObject &
+StackFrame::callObj() const
+{
+    JS_ASSERT_IF(isNonEvalFunctionFrame() || isStrictEvalFrame(), hasCallObj());
+
+    JSObject *pobj = &scopeChain();
+    while (JS_UNLIKELY(pobj->getClass() != &js_CallClass)) {
+        JS_ASSERT(IsCacheableNonGlobalScope(pobj) || pobj->isWith());
+        pobj = pobj->getParent();
+    }
+    return *pobj;
+}
+
+inline void
+StackFrame::putActivationObjects()
+{
+    if (flags_ & (HAS_ARGS_OBJ | HAS_CALL_OBJ)) {
+        /* NB: there is an ordering dependency here. */
+        if (hasCallObj())
+            js_PutCallObject(this);
+        else if (hasArgsObj())
+            js_PutArgsObject(this);
+    }
+}
+
+inline void
+StackFrame::markActivationObjectsAsPut()
+{
+    if (flags_ & (HAS_ARGS_OBJ | HAS_CALL_OBJ)) {
+        if (hasArgsObj() && !argsObj().getPrivate()) {
+            args.nactual = args.obj->getArgsInitialLength();
+            flags_ &= ~HAS_ARGS_OBJ;
+        }
+        if (hasCallObj() && !callObj().getPrivate()) {
+            /*
+             * For function frames, the call object may or may not have have an
+             * enclosing DeclEnv object, so we use the callee's parent, since
+             * it was the initial scope chain. For global (strict) eval frames,
+             * there is no calle, but the call object's parent is the initial
+             * scope chain.
+             */
+            scopeChain_ = isFunctionFrame()
+                          ? callee().getParent()
+                          : scopeChain_->getParent();
+            flags_ &= ~HAS_CALL_OBJ;
+        }
+    }
+}
+
+/*****************************************************************************/
+
+JS_ALWAYS_INLINE void
+StackSpace::pushOverride(Value *top, StackOverride *prev)
+{
+    *prev = override_;
+
+    override_.top = top;
+#ifdef DEBUG
+    override_.seg = seg_;
+    override_.frame = seg_->currentFrameOrNull();
+#endif
+
+    JS_ASSERT(prev->top < override_.top);
+}
+
+JS_ALWAYS_INLINE void
+StackSpace::popOverride(const StackOverride &prev)
+{
+    JS_ASSERT(prev.top < override_.top);
+
+    JS_ASSERT_IF(seg_->empty(), override_.frame == NULL);
+    JS_ASSERT_IF(!seg_->empty(), override_.frame == seg_->currentFrame());
+    JS_ASSERT(override_.seg == seg_);
+
+    override_ = prev;
+}
+
+JS_ALWAYS_INLINE Value *
+StackSpace::activeFirstUnused() const
+{
+    JS_ASSERT(seg_->isActive());
+
+    Value *max = Max(seg_->stack().regs().sp, override_.top);
+    JS_ASSERT(max == firstUnused());
+    return max;
+}
+
+JS_ALWAYS_INLINE bool
+StackSpace::ensureEnoughSpaceToEnterTrace()
+{
+    ptrdiff_t needed = TraceNativeStorage::MAX_NATIVE_STACK_SLOTS +
+                       TraceNativeStorage::MAX_CALL_STACK_ENTRIES * VALUES_PER_STACK_FRAME;
+#ifdef XP_WIN
+    return ensureSpace(NULL, firstUnused(), needed);
+#else
+    return end_ - firstUnused() > needed;
+#endif
+}
+
+STATIC_POSTCONDITION(!return || ubound(from) >= nvals)
+JS_ALWAYS_INLINE bool
+StackSpace::ensureSpace(JSContext *maybecx, Value *from, ptrdiff_t nvals) const
+{
+    JS_ASSERT(from >= firstUnused());
+#ifdef XP_WIN
+    JS_ASSERT(from <= commitEnd_);
+    if (commitEnd_ - from < nvals)
+        return bumpCommit(maybecx, from, nvals);
+    return true;
+#else
+    if (end_ - from < nvals) {
+        js_ReportOutOfScriptQuota(maybecx);
+        return false;
+    }
+    return true;
+#endif
+}
+
+inline Value *
+StackSpace::getStackLimit(JSContext *cx)
+{
+    FrameRegs &regs = cx->regs();
+    uintN minSpace = regs.fp()->numSlots() + VALUES_PER_STACK_FRAME;
+    Value *sp = regs.sp;
+    Value *required = sp + minSpace;
+    Value *desired = sp + STACK_QUOTA;
+#ifdef XP_WIN
+    if (required <= commitEnd_)
+        return Min(commitEnd_, desired);
+    if (!bumpCommit(cx, sp, minSpace))
+        return NULL;
+    JS_ASSERT(commitEnd_ >= required);
+    return commitEnd_;
+#else
+    if (required <= end_)
+        return Min(end_, desired);
+    js_ReportOutOfScriptQuota(cx);
+    return NULL;
+#endif
+}
+
+/*****************************************************************************/
+
+JS_ALWAYS_INLINE bool
+ContextStack::isCurrentAndActive() const
+{
+    assertSegmentsInSync();
+    return seg_ && seg_->isActive() && seg_ == space().currentSegment();
+}
+
+namespace detail {
+
+struct OOMCheck
+{
+    JS_ALWAYS_INLINE bool
+    operator()(JSContext *cx, StackSpace &space, Value *from, uintN nvals)
+    {
+        return space.ensureSpace(cx, from, nvals);
+    }
+};
+
+struct LimitCheck
+{
+    StackFrame *base;
+    Value **limit;
+
+    LimitCheck(StackFrame *base, Value **limit) : base(base), limit(limit) {}
+
+    JS_ALWAYS_INLINE bool
+    operator()(JSContext *cx, StackSpace &space, Value *from, uintN nvals)
+    {
+        /*
+         * Include an extra sizeof(StackFrame) to satisfy the method-jit
+         * stackLimit invariant.
+         */
+        nvals += VALUES_PER_STACK_FRAME;
+
+        JS_ASSERT(from < *limit);
+        if (*limit - from >= ptrdiff_t(nvals))
+            return true;
+        return space.bumpLimitWithinQuota(cx, base, from, nvals, limit);
+    }
+};
+
+}  /* namespace detail */
+
+template <class Check>
+JS_ALWAYS_INLINE StackFrame *
+ContextStack::getCallFrame(JSContext *cx, Value *firstUnused, uintN nactual,
+                           JSFunction *fun, JSScript *script, uint32 *flags,
+                           Check check) const
+{
+    JS_ASSERT(fun->script() == script);
+    JS_ASSERT(space().firstUnused() == firstUnused);
+
+    uintN nvals = VALUES_PER_STACK_FRAME + script->nslots;
+    uintN nformal = fun->nargs;
+
+    /* Maintain layout invariant: &formalArgs[0] == ((Value *)fp) - nformal. */
+
+    if (nactual == nformal) {
+        if (JS_UNLIKELY(!check(cx, space(), firstUnused, nvals)))
+            return NULL;
+        return reinterpret_cast<StackFrame *>(firstUnused);
+    }
+
+    if (nactual < nformal) {
+        *flags |= StackFrame::UNDERFLOW_ARGS;
+        uintN nmissing = nformal - nactual;
+        if (JS_UNLIKELY(!check(cx, space(), firstUnused, nmissing + nvals)))
+            return NULL;
+        SetValueRangeToUndefined(firstUnused, nmissing);
+        return reinterpret_cast<StackFrame *>(firstUnused + nmissing);
+    }
+
+    *flags |= StackFrame::OVERFLOW_ARGS;
+    uintN ncopy = 2 + nformal;
+    if (JS_UNLIKELY(!check(cx, space(), firstUnused, ncopy + nvals)))
+        return NULL;
+
+    Value *dst = firstUnused;
+    Value *src = firstUnused - (2 + nactual);
+    PodCopy(dst, src, ncopy);
+    Debug_SetValueRangeToCrashOnTouch(src, ncopy);
+    return reinterpret_cast<StackFrame *>(firstUnused + ncopy);
+}
+
+JS_ALWAYS_INLINE StackFrame *
+ContextStack::getInlineFrame(JSContext *cx, Value *sp, uintN nactual,
+                             JSFunction *fun, JSScript *script, uint32 *flags) const
+{
+    JS_ASSERT(isCurrentAndActive());
+    JS_ASSERT(cx->regs().sp == sp);
+
+    return getCallFrame(cx, sp, nactual, fun, script, flags, detail::OOMCheck());
+}
+
+JS_ALWAYS_INLINE StackFrame *
+ContextStack::getInlineFrameWithinLimit(JSContext *cx, Value *sp, uintN nactual,
+                                        JSFunction *fun, JSScript *script, uint32 *flags,
+                                        StackFrame *fp, Value **limit) const
+{
+    JS_ASSERT(isCurrentAndActive());
+    JS_ASSERT(cx->regs().sp == sp);
+
+    return getCallFrame(cx, sp, nactual, fun, script, flags, detail::LimitCheck(fp, limit));
+}
+
+JS_ALWAYS_INLINE void
+ContextStack::pushInlineFrame(JSScript *script, StackFrame *fp, FrameRegs &regs)
+{
+    JS_ASSERT(isCurrentAndActive());
+    JS_ASSERT(regs_ == &regs && script == fp->script());
+
+    regs.prepareToRun(fp, script);
+}
+
+JS_ALWAYS_INLINE void
+ContextStack::popInlineFrame()
+{
+    JS_ASSERT(isCurrentAndActive());
+
+    StackFrame *fp = regs_->fp();
+    fp->putActivationObjects();
+
+    Value *newsp = fp->actualArgs() - 1;
+    JS_ASSERT(newsp >= fp->prev()->base());
+
+    newsp[-1] = fp->returnValue();
+    regs_->popFrame(newsp);
+}
+
+JS_ALWAYS_INLINE bool
+ContextStack::pushInvokeArgs(JSContext *cx, uintN argc, InvokeArgsGuard *argsGuard)
+{
+    if (!isCurrentAndActive())
+        return pushInvokeArgsSlow(cx, argc, argsGuard);
+
+    Value *start = space().activeFirstUnused();
+    uintN vplen = 2 + argc;
+    if (!space().ensureSpace(cx, start, vplen))
+        return false;
+
+    Value *vp = start;
+    ImplicitCast<CallArgs>(*argsGuard) = CallArgsFromVp(argc, vp);
+
+    /*
+     * Use stack override to root vp until the frame is pushed. Don't need to
+     * MakeRangeGCSafe: the VM stack is conservatively marked.
+     */
+    space().pushOverride(vp + vplen, &argsGuard->prevOverride_);
+
+    argsGuard->stack_ = this;
+    return true;
+}
+
+JS_ALWAYS_INLINE void
+ContextStack::popInvokeArgs(const InvokeArgsGuard &argsGuard)
+{
+    if (argsGuard.seg_) {
+        popInvokeArgsSlow(argsGuard);
+        return;
+    }
+
+    JS_ASSERT(isCurrentAndActive());
+    space().popOverride(argsGuard.prevOverride_);
+}
+
+JS_ALWAYS_INLINE
+InvokeArgsGuard::~InvokeArgsGuard()
+{
+    if (JS_UNLIKELY(!pushed()))
+        return;
+    stack_->popInvokeArgs(*this);
+}
+
+JS_ALWAYS_INLINE StackFrame *
+ContextStack::getInvokeFrame(JSContext *cx, const CallArgs &args,
+                             JSFunction *fun, JSScript *script,
+                             uint32 *flags, InvokeFrameGuard *frameGuard) const
+{
+    uintN argc = args.argc();
+    Value *start = args.argv() + argc;
+    JS_ASSERT(start == space().firstUnused());
+    StackFrame *fp = getCallFrame(cx, start, argc, fun, script, flags, detail::OOMCheck());
+    if (!fp)
+        return NULL;
+
+    frameGuard->regs_.prepareToRun(fp, script);
+    return fp;
+}
+
+JS_ALWAYS_INLINE void
+ContextStack::pushInvokeFrame(const CallArgs &args, InvokeFrameGuard *frameGuard)
+{
+    JS_ASSERT(space().firstUnused() == args.argv() + args.argc());
+
+    if (JS_UNLIKELY(space().seg_->empty())) {
+        pushInvokeFrameSlow(frameGuard);
+        return;
+    }
+
+    frameGuard->prevRegs_ = regs_;
+    regs_ = &frameGuard->regs_;
+    JS_ASSERT(isCurrentAndActive());
+
+    frameGuard->stack_ = this;
+}
+
+JS_ALWAYS_INLINE void
+ContextStack::popInvokeFrame(const InvokeFrameGuard &frameGuard)
+{
+    JS_ASSERT(isCurrentAndActive());
+    JS_ASSERT(&frameGuard.regs_ == regs_);
+
+    if (JS_UNLIKELY(seg_->initialFrame() == regs_->fp())) {
+        popInvokeFrameSlow(frameGuard);
+        return;
+    }
+
+    regs_->fp()->putActivationObjects();
+    regs_ = frameGuard.prevRegs_;
+}
+
+JS_ALWAYS_INLINE void
+InvokeFrameGuard::pop()
+{
+    JS_ASSERT(pushed());
+    stack_->popInvokeFrame(*this);
+    stack_ = NULL;
+}
+
+JS_ALWAYS_INLINE
+InvokeFrameGuard::~InvokeFrameGuard()
+{
+    if (pushed())
+        pop();
+}
+
+JS_ALWAYS_INLINE JSObject &
+ContextStack::currentVarObj() const
+{
+    if (regs_->fp()->hasCallObj())
+        return regs_->fp()->callObj();
+    return seg_->initialVarObj();
+}
+
+inline StackFrame *
+ContextStack::findFrameAtLevel(uintN targetLevel) const
+{
+    StackFrame *fp = regs_->fp();
+    while (true) {
+        JS_ASSERT(fp && fp->isScriptFrame());
+        if (fp->script()->staticLevel == targetLevel)
+            break;
+        fp = fp->prev();
+    }
+    return fp;
+}
+
+/*****************************************************************************/
+
+inline
+FrameRegsIter::FrameRegsIter(JSContext *cx)
+  : cx_(cx)
+{
+    seg_ = cx->stack.currentSegment();
+    if (JS_UNLIKELY(!seg_ || !seg_->isActive())) {
+        initSlow();
+        return;
+    }
+    fp_ = cx->fp();
+    sp_ = cx->regs().sp;
+    pc_ = cx->regs().pc;
+    return;
+}
+
+inline FrameRegsIter &
+FrameRegsIter::operator++()
+{
+    StackFrame *oldfp = fp_;
+    fp_ = fp_->prev();
+    if (!fp_)
+        return *this;
+
+    if (JS_UNLIKELY(oldfp == seg_->initialFrame())) {
+        incSlow(oldfp);
+        return *this;
+    }
+
+    pc_ = oldfp->prevpc();
+    sp_ = oldfp->formalArgsEnd();
+    return *this;
+}
+
+} /* namespace js */
+
+#endif /* Stack_inl_h__ */
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
new file mode 100644
index 000000000000..7738a1f98793
--- /dev/null
+++ b/js/src/vm/Stack.cpp
@@ -0,0 +1,739 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Luke Wagner <luke@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "jsgcmark.h"
+#include "methodjit/MethodJIT.h"
+#include "Stack.h"
+
+#include "jsgcinlines.h"
+#include "jsobjinlines.h"
+
+#include "Stack-inl.h"
+
+/* Includes to get to low-level memory-mapping functionality. */
+#ifdef XP_WIN
+# include "jswin.h"
+#elif defined(XP_OS2)
+# define INCL_DOSMEMMGR
+# include <os2.h>
+#else
+# include <unistd.h>
+# include <sys/mman.h>
+# if !defined(MAP_ANONYMOUS)
+#  if defined(MAP_ANON)
+#   define MAP_ANONYMOUS MAP_ANON
+#  else
+#   define MAP_ANONYMOUS 0
+#  endif
+# endif
+#endif
+
+using namespace js;
+
+/*****************************************************************************/
+
+#ifdef DEBUG
+JSObject *const StackFrame::sInvalidScopeChain = (JSObject *)0xbeef;
+#endif
+
+jsbytecode *
+StackFrame::prevpcSlow()
+{
+    JS_ASSERT(!(flags_ & HAS_PREVPC));
+#if defined(JS_METHODJIT) && defined(JS_MONOIC)
+    StackFrame *p = prev();
+    js::mjit::JITScript *jit = p->script()->getJIT(p->isConstructing());
+    prevpc_ = jit->nativeToPC(ncode_);
+    flags_ |= HAS_PREVPC;
+    return prevpc_;
+#else
+    JS_NOT_REACHED("Unknown PC for frame");
+    return NULL;
+#endif
+}
+
+jsbytecode *
+StackFrame::pc(JSContext *cx, StackFrame *next)
+{
+    JS_ASSERT_IF(next, next->prev() == this);
+
+    StackSegment &seg = cx->stack.space().containingSegment(this);
+    FrameRegs &regs = seg.currentRegs();
+    if (regs.fp() == this)
+        return regs.pc;
+    if (!next)
+        next = seg.computeNextFrame(this);
+    return next->prevpc();
+}
+
+/*****************************************************************************/
+
+JS_REQUIRES_STACK bool
+StackSegment::contains(const StackFrame *fp) const
+{
+    JS_ASSERT(!empty());
+
+    if (fp < initialFrame_)
+        return false;
+
+    StackFrame *start;
+    if (isActive())
+        start = stack_->fp();
+    else
+        start = suspendedRegs_->fp();
+
+    if (fp > start)
+        return false;
+
+#ifdef DEBUG
+    bool found = false;
+    StackFrame *stop = initialFrame_->prev();
+    for (StackFrame *f = start; !found && f != stop; f = f->prev()) {
+        if (f == fp) {
+            found = true;
+            break;
+        }
+    }
+    JS_ASSERT(found);
+#endif
+
+    return true;
+}
+
+StackFrame *
+StackSegment::computeNextFrame(StackFrame *fp) const
+{
+    JS_ASSERT(contains(fp));
+    JS_ASSERT(fp != currentFrame());
+
+    StackFrame *next = currentFrame();
+    StackFrame *prev;
+    while ((prev = next->prev()) != fp)
+        next = prev;
+    return next;
+}
+
+/*****************************************************************************/
+
+StackSpace::StackSpace()
+  : base_(NULL),
+#ifdef XP_WIN
+    commitEnd_(NULL),
+#endif
+    end_(NULL),
+    seg_(NULL)
+{
+    override_.top = NULL;
+#ifdef DEBUG
+    override_.seg = NULL;
+    override_.frame = NULL;
+#endif
+}
+
+bool
+StackSpace::init()
+{
+    void *p;
+#ifdef XP_WIN
+    p = VirtualAlloc(NULL, CAPACITY_BYTES, MEM_RESERVE, PAGE_READWRITE);
+    if (!p)
+        return false;
+    void *check = VirtualAlloc(p, COMMIT_BYTES, MEM_COMMIT, PAGE_READWRITE);
+    if (p != check)
+        return false;
+    base_ = reinterpret_cast<Value *>(p);
+    commitEnd_ = base_ + COMMIT_VALS;
+    end_ = base_ + CAPACITY_VALS;
+#elif defined(XP_OS2)
+    if (DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY) &&
+        DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE))
+        return false;
+    base_ = reinterpret_cast<Value *>(p);
+    end_ = base_ + CAPACITY_VALS;
+#else
+    JS_ASSERT(CAPACITY_BYTES % getpagesize() == 0);
+    p = mmap(NULL, CAPACITY_BYTES, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    if (p == MAP_FAILED)
+        return false;
+    base_ = reinterpret_cast<Value *>(p);
+    end_ = base_ + CAPACITY_VALS;
+#endif
+    return true;
+}
+
+StackSpace::~StackSpace()
+{
+    JS_ASSERT(!seg_);
+    if (!base_)
+        return;
+#ifdef XP_WIN
+    VirtualFree(base_, (commitEnd_ - base_) * sizeof(Value), MEM_DECOMMIT);
+    VirtualFree(base_, 0, MEM_RELEASE);
+#elif defined(XP_OS2)
+    DosFreeMem(base_);
+#else
+#ifdef SOLARIS
+    munmap((caddr_t)base_, CAPACITY_BYTES);
+#else
+    munmap(base_, CAPACITY_BYTES);
+#endif
+#endif
+}
+
+Value *
+StackSpace::firstUnused() const
+{
+    if (!seg_) {
+        JS_ASSERT(override_.top == NULL);
+        return base_;
+    }
+    if (!seg_->empty()) {
+        Value *sp = seg_->currentRegs().sp;
+        if (override_.top > sp) {
+            JS_ASSERT(override_.seg == seg_);
+            JS_ASSERT_IF(seg_->isActive(), override_.frame == seg_->stack().fp());
+            JS_ASSERT_IF(!seg_->isActive(), override_.frame == seg_->suspendedFrame());
+            return override_.top;
+        }
+        return sp;
+    }
+    JS_ASSERT(override_.seg == seg_);
+    return override_.top;
+}
+
+StackSegment &
+StackSpace::containingSegment(const StackFrame *target) const
+{
+    for (StackSegment *s = seg_; s; s = s->previousInMemory()) {
+        if (s->contains(target))
+            return *s;
+    }
+    JS_NOT_REACHED("frame not in stack space");
+    return *(StackSegment *)NULL;
+}
+
+JSObject &
+StackSpace::varObjForFrame(const StackFrame *fp)
+{
+    if (fp->hasCallObj())
+        return fp->callObj();
+    return containingSegment(fp).initialVarObj();
+}
+
+void
+StackSpace::mark(JSTracer *trc)
+{
+    /*
+     * JIT code can leave values in an incoherent (i.e., unsafe for precise
+     * marking) state, hence MarkStackRangeConservatively.
+     */
+    Value *end = firstUnused();
+    for (StackSegment *seg = seg_; seg; seg = seg->previousInMemory()) {
+        STATIC_ASSERT(ubound(end) >= 0);
+        if (seg->empty()) {
+            /* Mark slots/args trailing off segment. */
+            MarkStackRangeConservatively(trc, seg->valueRangeBegin(), end);
+        } else {
+            /* This may be the only pointer to the initialVarObj. */
+            if (seg->hasInitialVarObj())
+                gc::MarkObject(trc, seg->initialVarObj(), "varobj");
+
+            /* Mark slots/args trailing off of the last stack frame. */
+            StackFrame *fp = seg->currentFrame();
+            MarkStackRangeConservatively(trc, fp->slots(), end);
+
+            /* Mark stack frames and slots/args between stack frames. */
+            StackFrame *initial = seg->initialFrame();
+            for (StackFrame *f = fp; f != initial; f = f->prev()) {
+                js_TraceStackFrame(trc, f);
+                MarkStackRangeConservatively(trc, f->prev()->slots(), (Value *)f);
+            }
+
+            /* Mark initial stack frame and leading args. */
+            js_TraceStackFrame(trc, initial);
+            MarkStackRangeConservatively(trc, seg->valueRangeBegin(), (Value *)initial);
+        }
+        end = (Value *)seg;
+    }
+}
+
+#ifdef XP_WIN
+JS_FRIEND_API(bool)
+StackSpace::bumpCommit(JSContext *maybecx, Value *from, ptrdiff_t nvals) const
+{
+    if (end_ - from < nvals) {
+        js_ReportOutOfScriptQuota(maybecx);
+        return false;
+    }
+
+    Value *newCommit = commitEnd_;
+    Value *request = from + nvals;
+
+    /* Use a dumb loop; will probably execute once. */
+    JS_ASSERT((end_ - newCommit) % COMMIT_VALS == 0);
+    do {
+        newCommit += COMMIT_VALS;
+        JS_ASSERT((end_ - newCommit) >= 0);
+    } while (newCommit < request);
+
+    /* The cast is safe because CAPACITY_BYTES is small. */
+    int32 size = static_cast<int32>(newCommit - commitEnd_) * sizeof(Value);
+
+    if (!VirtualAlloc(commitEnd_, size, MEM_COMMIT, PAGE_READWRITE)) {
+        js_ReportOutOfScriptQuota(maybecx);
+        return false;
+    }
+
+    commitEnd_ = newCommit;
+    return true;
+}
+#endif
+
+bool
+StackSpace::bumpLimitWithinQuota(JSContext *maybecx, StackFrame *fp, Value *sp,
+                                 uintN nvals, Value **limit) const
+{
+    JS_ASSERT(sp >= firstUnused());
+    JS_ASSERT(sp + nvals >= *limit);
+#ifdef XP_WIN
+    Value *quotaEnd = (Value *)fp + STACK_QUOTA;
+    if (sp + nvals < quotaEnd) {
+        if (!ensureSpace(NULL, sp, nvals))
+            goto fail;
+        *limit = Min(quotaEnd, commitEnd_);
+        return true;
+    }
+  fail:
+#endif
+    js_ReportOverRecursed(maybecx);
+    return false;
+}
+
+bool
+StackSpace::bumpLimit(JSContext *cx, StackFrame *fp, Value *sp,
+                      uintN nvals, Value **limit) const
+{
+    JS_ASSERT(*limit > base_);
+    JS_ASSERT(sp < *limit);
+
+    /*
+     * Ideally, we would only ensure space for 'nvals', not 'nvals + remain',
+     * since this is ~500K. However, this whole call should be a rare case: some
+     * script is passing a obscene number of args to 'apply' and we are just
+     * trying to keep the stack limit heuristic from breaking the script.
+     */
+    Value *quota = (Value *)fp + STACK_QUOTA;
+    uintN remain = quota - sp;
+    uintN inc = nvals + remain;
+    if (!ensureSpace(NULL, sp, inc))
+        return false;
+    *limit = sp + inc;
+    return true;
+}
+
+void
+StackSpace::popSegment()
+{
+    JS_ASSERT(seg_->empty());
+    seg_ = seg_->previousInMemory();
+}
+
+void
+StackSpace::pushSegment(StackSegment &seg)
+{
+    JS_ASSERT(seg.empty());
+    seg.setPreviousInMemory(seg_);
+    seg_ = &seg;
+}
+
+/*****************************************************************************/
+
+ContextStack::ContextStack(JSContext *cx)
+  : regs_(NULL),
+    seg_(NULL),
+    space_(&JS_THREAD_DATA(cx)->stackSpace),
+    cx_(cx)
+{
+    threadReset();
+}
+
+ContextStack::~ContextStack()
+{
+    JS_ASSERT(!regs_);
+    JS_ASSERT(!seg_);
+}
+
+void
+ContextStack::threadReset()
+{
+#ifdef JS_THREADSAFE
+    if (cx_->thread())
+        space_ = &JS_THREAD_DATA(cx_)->stackSpace;
+    else
+        space_ = NULL;
+#else
+    space_ = &JS_THREAD_DATA(cx_)->stackSpace;
+#endif
+}
+
+#ifdef DEBUG
+void
+ContextStack::assertSegmentsInSync() const
+{
+    if (regs_) {
+        JS_ASSERT(seg_->isActive());
+        if (StackSegment *prev = seg_->previousInContext())
+            JS_ASSERT(!prev->isActive());
+    } else {
+        JS_ASSERT_IF(seg_, !seg_->isActive());
+    }
+}
+
+void
+ContextStack::assertSpaceInSync() const
+{
+    JS_ASSERT(space_);
+    JS_ASSERT(space_ == &JS_THREAD_DATA(cx_)->stackSpace);
+}
+
+bool
+ContextStack::contains(const StackFrame *fp) const
+{
+    return &space().containingSegment(fp).stack() == this;
+}
+#endif
+
+void
+ContextStack::saveActiveSegment()
+{
+    JS_ASSERT(regs_);
+    seg_->save(*regs_);
+    regs_ = NULL;
+    cx_->resetCompartment();
+}
+
+void
+ContextStack::restoreSegment()
+{
+    regs_ = &seg_->suspendedRegs();
+    seg_->restore();
+    cx_->resetCompartment();
+}
+
+bool
+ContextStack::getSegmentAndFrame(JSContext *cx, uintN vplen, uintN nslots,
+                                 FrameGuard *frameGuard) const
+{
+    Value *start = space().firstUnused();
+    uintN nvals = VALUES_PER_STACK_SEGMENT + vplen + VALUES_PER_STACK_FRAME + nslots;
+    if (!space().ensureSpace(cx, start, nvals))
+        return false;
+
+    StackSegment *seg = new(start) StackSegment;
+    Value *vp = seg->valueRangeBegin();
+
+    frameGuard->seg_ = seg;
+    frameGuard->vp_ = vp;
+    frameGuard->fp_ = reinterpret_cast<StackFrame *>(vp + vplen);
+    return true;
+}
+
+void
+ContextStack::pushSegmentAndFrameImpl(FrameRegs &regs, StackSegment &seg)
+{
+    JS_ASSERT(&seg == space().currentSegment());
+
+    if (regs_)
+        seg_->suspend(*regs_);
+    regs_ = &regs;
+
+    seg.setPreviousInContext(seg_);
+    seg_ = &seg;
+    seg.joinContext(*this, *regs.fp());
+}
+
+void
+ContextStack::pushSegmentAndFrame(FrameRegs &regs, FrameGuard *frameGuard)
+{
+    space().pushSegment(*frameGuard->seg_);
+    pushSegmentAndFrameImpl(regs, *frameGuard->seg_);
+    frameGuard->stack_ = this;
+}
+
+void
+ContextStack::popSegmentAndFrameImpl()
+{
+    JS_ASSERT(isCurrentAndActive());
+    JS_ASSERT(&seg_->stack() == this);
+    JS_ASSERT(seg_->initialFrame() == regs_->fp());
+
+    regs_->fp()->putActivationObjects();
+
+    seg_->leaveContext();
+    seg_ = seg_->previousInContext();
+    if (seg_) {
+        if (seg_->isSaved()) {
+            regs_ = NULL;
+        } else {
+            regs_ = &seg_->suspendedRegs();
+            seg_->resume();
+        }
+    } else {
+        JS_ASSERT(regs_->fp()->prev() == NULL);
+        regs_ = NULL;
+    }
+}
+
+void
+ContextStack::popSegmentAndFrame()
+{
+    popSegmentAndFrameImpl();
+    space().popSegment();
+    notifyIfNoCodeRunning();
+}
+
+FrameGuard::~FrameGuard()
+{
+    if (!pushed())
+        return;
+    JS_ASSERT(stack_->currentSegment() == seg_);
+    JS_ASSERT(stack_->currentSegment()->currentFrame() == fp_);
+    stack_->popSegmentAndFrame();
+}
+
+bool
+ContextStack::getExecuteFrame(JSContext *cx, JSScript *script,
+                              ExecuteFrameGuard *frameGuard) const
+{
+    if (!getSegmentAndFrame(cx, 2, script->nslots, frameGuard))
+        return false;
+    frameGuard->regs_.prepareToRun(frameGuard->fp(), script);
+    return true;
+}
+
+void
+ContextStack::pushExecuteFrame(JSObject *initialVarObj,
+                               ExecuteFrameGuard *frameGuard)
+{
+    pushSegmentAndFrame(frameGuard->regs_, frameGuard);
+    frameGuard->seg_->setInitialVarObj(initialVarObj);
+}
+
+bool
+ContextStack::pushDummyFrame(JSContext *cx, JSObject &scopeChain,
+                             DummyFrameGuard *frameGuard)
+{
+    if (!getSegmentAndFrame(cx, 0 /*vplen*/, 0 /*nslots*/, frameGuard))
+        return false;
+
+    StackFrame *fp = frameGuard->fp();
+    fp->initDummyFrame(cx, scopeChain);
+    frameGuard->regs_.initDummyFrame(fp);
+
+    pushSegmentAndFrame(frameGuard->regs_, frameGuard);
+    return true;
+}
+
+bool
+ContextStack::getGeneratorFrame(JSContext *cx, uintN vplen, uintN nslots,
+                                GeneratorFrameGuard *frameGuard)
+{
+    /* The regs will be set by SendToGenerator. */
+    return getSegmentAndFrame(cx, vplen, nslots, frameGuard);
+}
+
+void
+ContextStack::pushGeneratorFrame(FrameRegs &regs,
+                                 GeneratorFrameGuard *frameGuard)
+{
+    JS_ASSERT(regs.fp() == frameGuard->fp());
+    JS_ASSERT(regs.fp()->prev() == regs_->fp());
+
+    pushSegmentAndFrame(regs, frameGuard);
+}
+
+bool
+ContextStack::pushInvokeArgsSlow(JSContext *cx, uintN argc,
+                                 InvokeArgsGuard *argsGuard)
+{
+    /*
+     * Either there is no code running on this context or its not at the top of
+     * the contiguous stack. Either way, push a new empty segment which will
+     * root the args for invoke and later contain the frame pushed by Invoke.
+     */
+    JS_ASSERT(!isCurrentAndActive());
+
+    Value *start = space().firstUnused();
+    size_t vplen = 2 + argc;
+    ptrdiff_t nvals = VALUES_PER_STACK_SEGMENT + vplen;
+    if (!space().ensureSpace(cx, start, nvals))
+        return false;
+
+    StackSegment *seg = new(start) StackSegment;
+    argsGuard->seg_ = seg;
+
+    Value *vp = seg->valueRangeBegin();
+    ImplicitCast<CallArgs>(*argsGuard) = CallArgsFromVp(argc, vp);
+
+    /*
+     * Use stack override to root vp until the frame is pushed. Don't need to
+     * MakeRangeGCSafe: the VM stack is conservatively marked.
+     */
+    space().pushSegment(*seg);
+    space().pushOverride(vp + vplen, &argsGuard->prevOverride_);
+
+    argsGuard->stack_ = this;
+    return true;
+}
+
+void
+ContextStack::popInvokeArgsSlow(const InvokeArgsGuard &argsGuard)
+{
+    JS_ASSERT(space().currentSegment()->empty());
+
+    space().popOverride(argsGuard.prevOverride_);
+    space().popSegment();
+    notifyIfNoCodeRunning();
+}
+
+void
+ContextStack::pushInvokeFrameSlow(InvokeFrameGuard *frameGuard)
+{
+    JS_ASSERT(space().seg_->empty());
+    pushSegmentAndFrameImpl(frameGuard->regs_, *space().seg_);
+    frameGuard->stack_ = this;
+}
+
+void
+ContextStack::popInvokeFrameSlow(const InvokeFrameGuard &frameGuard)
+{
+    JS_ASSERT(frameGuard.regs_.fp() == seg_->initialFrame());
+    popSegmentAndFrameImpl();
+}
+
+/*
+ * NB: this function can call out and observe the stack (e.g., through GC), so
+ * it should only be called from a consistent stack state.
+ */
+void
+ContextStack::notifyIfNoCodeRunning()
+{
+    if (regs_)
+        return;
+
+    cx_->resetCompartment();
+    cx_->maybeMigrateVersionOverride();
+}
+
+/*****************************************************************************/
+
+void
+FrameRegsIter::initSlow()
+{
+    if (!seg_) {
+        fp_ = NULL;
+        sp_ = NULL;
+        pc_ = NULL;
+        return;
+    }
+
+    JS_ASSERT(seg_->isSuspended());
+    fp_ = seg_->suspendedFrame();
+    sp_ = seg_->suspendedRegs().sp;
+    pc_ = seg_->suspendedRegs().pc;
+}
+
+/*
+ * Using the invariant described in the js::StackSegment comment, we know that,
+ * when a pair of prev-linked stack frames are in the same segment, the
+ * first frame's address is the top of the prev-frame's stack, modulo missing
+ * arguments.
+ */
+void
+FrameRegsIter::incSlow(StackFrame *oldfp)
+{
+    JS_ASSERT(oldfp == seg_->initialFrame());
+    JS_ASSERT(fp_ == oldfp->prev());
+
+    /*
+     * Segments from arbitrary context stacks can interleave so we must do a
+     * linear scan over segments in this context stack. Furthermore, 'prev' can
+     * be any frame in the segment (not only the suspendedFrame), so we must
+     * scan each stack frame in each segment. Fortunately, this is not hot code.
+     */
+    seg_ = seg_->previousInContext();
+    sp_ = seg_->suspendedRegs().sp;
+    pc_ = seg_->suspendedRegs().pc;
+    StackFrame *f = seg_->suspendedFrame();
+    while (f != fp_) {
+        if (f == seg_->initialFrame()) {
+            seg_ = seg_->previousInContext();
+            sp_ = seg_->suspendedRegs().sp;
+            pc_ = seg_->suspendedRegs().pc;
+            f = seg_->suspendedFrame();
+        } else {
+            sp_ = f->formalArgsEnd();
+            pc_ = f->prevpc();
+            f = f->prev();
+        }
+    }
+}
+
+/*****************************************************************************/
+
+AllFramesIter::AllFramesIter(JSContext *cx)
+  : seg_(cx->stack.currentSegment()),
+    fp_(seg_ ? seg_->currentFrame() : NULL)
+{
+}
+
+AllFramesIter&
+AllFramesIter::operator++()
+{
+    JS_ASSERT(!done());
+    if (fp_ == seg_->initialFrame()) {
+        seg_ = seg_->previousInMemory();
+        fp_ = seg_ ? seg_->currentFrame() : NULL;
+    } else {
+        fp_ = fp_->prev();
+    }
+    return *this;
+}
+
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
new file mode 100644
index 000000000000..b45d12793efe
--- /dev/null
+++ b/js/src/vm/Stack.h
@@ -0,0 +1,1449 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=79 ft=cpp:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is SpiderMonkey JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Luke Wagner <luke@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef Stack_h__
+#define Stack_h__
+
+#include "jsfun.h"
+
+namespace js {
+
+class StackFrame;
+class FrameRegs;
+class StackSegment;
+class StackSpace;
+class ContextStack;
+
+class InvokeArgsGuard;
+class InvokeFrameGuard;
+class FrameGuard;
+class ExecuteFrameGuard;
+class DummyFrameGuard;
+class GeneratorFrameGuard;
+
+namespace mjit { struct JITScript; }
+namespace detail { struct OOMCheck; }
+
+/*
+ * VM stack layout
+ *
+ * SpiderMonkey uses a per-thread stack to store the activation records,
+ * parameters, locals, and expression temporaries for the stack of actively
+ * executing scripts, functions and generators. The per-thread stack is owned
+ * by the StackSpace object stored in the thread's ThreadData.
+ *
+ * The per-thread stack is subdivided into contiguous segments of memory which
+ * have a memory layout invariant that allows fixed offsets to be used for stack
+ * access (by the JIT) as well as fast call/return. This memory layout is
+ * encapsulated by a set of types that describe different regions of memory:
+ * StackSegment, StackFrame, FrameRegs and CallArgs. To avoid calling into C++,
+ * the JIT compiler generates code that simulates C++ stack operations.
+ *
+ * The memory layout of a segment looks like:
+ *
+ *                            current regs
+ *     .------------------------------------------------------.
+ *     |                  current frame                       |
+ *     |   .-------------------------------------.            V
+ *     |   |    initial frame                    |        FrameRegs
+ *     |   |   .------------.                    |            |
+ *     |   |   |            V                    V            V
+ * |StackSegment| slots |StackFrame| slots |StackFrame| slots |
+ *                        |      ^           |
+ *           ? <----------'      `-----------'
+ *                 prev               prev
+ *
+ * A segment starts with a fixed-size header (js::StackSegment) which logically
+ * describes the segment, links it to the rest of the stack, and points to the
+ * first and last frames in the segment.
+ *
+ * Each script activation (global or function code) is given a fixed-size header
+ * (js::StackFrame) which is associated with the values (called "slots") before
+ * and after it. The frame contains bookkeeping information about the activation
+ * and links to the previous frame.
+ *
+ * The slots preceeding a (function) StackFrame in memory are the arguments of
+ * the call. The slots after a StackFrame in memory are its locals followed
+ * by its expression stack. There is no clean line between the arguments of a
+ * frame and the expression stack of the previous frame since the top slots of
+ * the expression become the arguments of a call. There are also layout
+ * invariants concerning the arguments and StackFrame; see "Arguments" comment
+ * in StackFrame for more details.
+ *
+ * The top of a segment's current frame's expression stack is pointed to by the
+ * segment's "current regs", which contains the stack pointer 'sp'. In the
+ * interpreter, sp is adjusted as individual values are pushed and popped from
+ * the stack and the FrameRegs struct (pointed by the StackSegment) is a local
+ * var of js::Interpret. JIT code simulates this by lazily updating FrameRegs
+ * when calling from JIT code into the VM. Ideally, we'd like to remove all
+ * dependence on FrameRegs outside the interpreter.
+ *
+ * A call to a native (C++) function does not push a frame. Instead, an array
+ * of values (possibly from the top of a calling frame's expression stack) is
+ * passed to the native. The layout of this array is abstracted by js::CallArgs.
+ * Note that, between any two StackFrames there may be any number of native
+ * calls, so the meaning of 'prev' is not 'directly called by'.
+ *
+ * An additional feature (perhaps not for much longer: bug 650361) is that
+ * multiple independent "contexts" can interleave (LIFO) on a single contiguous
+ * stack. "Independent" here means that neither context sees the other's frames.
+ * Concretely, an embedding may enter the JS engine on cx1 and then, from a
+ * native called by the JS engine, reenter the VM on cx2. Changing from cx1 to
+ * cx2 causes cx1's segment to be "suspended" and a new segment started to be
+ * started for cx2. These two segments are linked from the perspective of
+ * StackSpace, since they are adjacent on the thread's stack, but not from the
+ * perspective of cx1 and cx2. Thus, each segment has two prev-links:
+ * previousInMemory and previousInContext. A context's apparent stack is
+ * encapsulated and managed by the js::ContextStack object stored in JSContext.
+ * ContextStack is the primary interface to the rest of the engine for pushing
+ * and popping args (for js::Invoke calls) and frames.
+ */
+
+/*****************************************************************************/
+
+class CallReceiver
+{
+#ifdef DEBUG
+    mutable bool usedRval_;
+#endif
+  protected:
+    Value *argv_;
+    CallReceiver() {}
+    CallReceiver(Value *argv) : argv_(argv) {
+#ifdef DEBUG
+        usedRval_ = false;
+#endif
+    }
+
+  public:
+    friend CallReceiver CallReceiverFromVp(Value *);
+    friend CallReceiver CallReceiverFromArgv(Value *);
+    Value *base() const { return argv_ - 2; }
+    JSObject &callee() const { JS_ASSERT(!usedRval_); return argv_[-2].toObject(); }
+    Value &calleev() const { JS_ASSERT(!usedRval_); return argv_[-2]; }
+    Value &thisv() const { return argv_[-1]; }
+
+    Value &rval() const {
+#ifdef DEBUG
+        usedRval_ = true;
+#endif
+        return argv_[-2];
+    }
+
+    void calleeHasBeenReset() const {
+#ifdef DEBUG
+        usedRval_ = false;
+#endif
+    }
+};
+
+JS_ALWAYS_INLINE CallReceiver
+CallReceiverFromVp(Value *vp)
+{
+    return CallReceiver(vp + 2);
+}
+
+JS_ALWAYS_INLINE CallReceiver
+CallReceiverFromArgv(Value *argv)
+{
+    return CallReceiver(argv);
+}
+
+/*****************************************************************************/
+
+class CallArgs : public CallReceiver
+{
+    uintN argc_;
+  protected:
+    CallArgs() {}
+    CallArgs(uintN argc, Value *argv) : CallReceiver(argv), argc_(argc) {}
+  public:
+    friend CallArgs CallArgsFromVp(uintN, Value *);
+    friend CallArgs CallArgsFromArgv(uintN, Value *);
+    Value &operator[](unsigned i) const { JS_ASSERT(i < argc_); return argv_[i]; }
+    Value *argv() const { return argv_; }
+    uintN argc() const { return argc_; }
+};
+
+JS_ALWAYS_INLINE CallArgs
+CallArgsFromVp(uintN argc, Value *vp)
+{
+    return CallArgs(argc, vp + 2);
+}
+
+JS_ALWAYS_INLINE CallArgs
+CallArgsFromArgv(uintN argc, Value *argv)
+{
+    return CallArgs(argc, argv);
+}
+
+/*****************************************************************************/
+
+class StackFrame
+{
+  public:
+    enum Flags {
+        /* Primary frame type */
+        GLOBAL             =        0x1,  /* frame pushed for a global script */
+        FUNCTION           =        0x2,  /* frame pushed for a scripted call */
+        DUMMY              =        0x4,  /* frame pushed for bookkeeping */
+
+        /* Frame subtypes */
+        EVAL               =        0x8,  /* frame pushed for eval() or debugger eval */
+        DEBUGGER           =       0x10,  /* frame pushed for debugger eval */
+        GENERATOR          =       0x20,  /* frame is associated with a generator */
+        FLOATING_GENERATOR =       0x40,  /* frame is is in generator obj, not on stack */
+        CONSTRUCTING       =       0x80,  /* frame is for a constructor invocation */
+
+        /* Temporary frame states */
+        YIELDING           =      0x100,  /* js::Interpret dispatched JSOP_YIELD */
+        FINISHED_IN_INTERP =      0x200,  /* set if frame finished in Interpret() */
+
+        /* Concerning function arguments */
+        OVERRIDE_ARGS      =      0x400,  /* overridden arguments local variable */
+        OVERFLOW_ARGS      =      0x800,  /* numActualArgs > numFormalArgs */
+        UNDERFLOW_ARGS     =     0x1000,  /* numActualArgs < numFormalArgs */
+
+        /* Lazy frame initialization */
+        HAS_IMACRO_PC      =     0x2000,  /* frame has imacpc value available */
+        HAS_CALL_OBJ       =     0x4000,  /* frame has a callobj reachable from scopeChain_ */
+        HAS_ARGS_OBJ       =     0x8000,  /* frame has an argsobj in StackFrame::args */
+        HAS_HOOK_DATA      =    0x10000,  /* frame has hookData_ set */
+        HAS_ANNOTATION     =    0x20000,  /* frame has annotation_ set */
+        HAS_RVAL           =    0x40000,  /* frame has rval_ set */
+        HAS_SCOPECHAIN     =    0x80000,  /* frame has scopeChain_ set */
+        HAS_PREVPC         =   0x100000   /* frame has prevpc_ set */
+    };
+
+  private:
+    mutable uint32      flags_;         /* bits described by Flags */
+    union {                             /* describes what code is executing in a */
+        JSScript        *script;        /*   global frame */
+        JSFunction      *fun;           /*   function frame, pre GetScopeChain */
+    } exec;
+    union {                             /* describes the arguments of a function */
+        uintN           nactual;        /*   pre GetArgumentsObject */
+        JSObject        *obj;           /*   post GetArgumentsObject */
+        JSScript        *script;        /* eval has no args, but needs a script */
+    } args;
+    mutable JSObject    *scopeChain_;   /* current scope chain */
+    StackFrame          *prev_;         /* previous cx->regs->fp */
+    void                *ncode_;        /* return address for method JIT */
+
+    /* Lazily initialized */
+    js::Value           rval_;          /* return value of the frame */
+    jsbytecode          *prevpc_;       /* pc of previous frame*/
+    jsbytecode          *imacropc_;     /* pc of macro caller */
+    void                *hookData_;     /* closure returned by call hook */
+    void                *annotation_;   /* perhaps remove with bug 546848 */
+
+    static void staticAsserts() {
+        JS_STATIC_ASSERT(offsetof(StackFrame, rval_) % sizeof(js::Value) == 0);
+        JS_STATIC_ASSERT(sizeof(StackFrame) % sizeof(js::Value) == 0);
+    }
+
+    inline void initPrev(JSContext *cx);
+    jsbytecode *prevpcSlow();
+
+  public:
+    /*
+     * Frame initialization
+     *
+     * After acquiring a pointer to an uninitialized stack frame on the VM
+     * stack from StackSpace, these members are used to initialize the stack
+     * frame before officially pushing the frame into the context.
+     */
+
+    /* Used for Invoke, Interpret, trace-jit LeaveTree, and method-jit stubs. */
+    inline void initCallFrame(JSContext *cx, JSObject &callee, JSFunction *fun,
+                              uint32 nactual, uint32 flags);
+
+    /* Used for SessionInvoke. */
+    inline void resetInvokeCallFrame();
+
+    /* Called by method-jit stubs and serve as a specification for jit-code. */
+    inline void initCallFrameCallerHalf(JSContext *cx, uint32 flags, void *ncode);
+    inline void initCallFrameEarlyPrologue(JSFunction *fun, uint32 nactual);
+    inline void initCallFrameLatePrologue();
+
+    /* Used for eval. */
+    inline void initEvalFrame(JSContext *cx, JSScript *script, StackFrame *prev,
+                              uint32 flags);
+    inline void initGlobalFrame(JSScript *script, JSObject &chain, uint32 flags);
+
+    /* Used when activating generators. */
+    inline void stealFrameAndSlots(js::Value *vp, StackFrame *otherfp,
+                                   js::Value *othervp, js::Value *othersp);
+
+    /* Perhaps one fine day we will remove dummy frames. */
+    inline void initDummyFrame(JSContext *cx, JSObject &chain);
+
+    /*
+     * Stack frame type
+     *
+     * A stack frame may have one of three types, which determines which
+     * members of the frame may be accessed and other invariants:
+     *
+     *  global frame:   execution of global code or an eval in global code
+     *  function frame: execution of function code or an eval in a function
+     *  dummy frame:    bookkeeping frame (to be removed in bug 625199)
+     */
+
+    bool isFunctionFrame() const {
+        return !!(flags_ & FUNCTION);
+    }
+
+    bool isGlobalFrame() const {
+        return !!(flags_ & GLOBAL);
+    }
+
+    bool isDummyFrame() const {
+        return !!(flags_ & DUMMY);
+    }
+
+    bool isScriptFrame() const {
+        bool retval = !!(flags_ & (FUNCTION | GLOBAL));
+        JS_ASSERT(retval == !isDummyFrame());
+        return retval;
+    }
+
+    /*
+     * Eval frames
+     *
+     * As noted above, global and function frames may optionally be 'eval
+     * frames'. Eval code shares its parent's arguments which means that the
+     * arg-access members of StackFrame may not be used for eval frames.
+     * Search for 'hasArgs' below for more details.
+     *
+     * A further sub-classification of eval frames is whether the frame was
+     * pushed for an ES5 strict-mode eval().
+     */
+
+    bool isEvalFrame() const {
+        JS_ASSERT_IF(flags_ & EVAL, isScriptFrame());
+        return flags_ & EVAL;
+    }
+
+    bool isNonEvalFunctionFrame() const {
+        return (flags_ & (FUNCTION | EVAL)) == FUNCTION;
+    }
+
+    inline bool isStrictEvalFrame() const {
+        return isEvalFrame() && script()->strictModeCode;
+    }
+
+    bool isNonStrictEvalFrame() const {
+        return isEvalFrame() && !script()->strictModeCode;
+    }
+
+    /*
+     * Previous frame
+     *
+     * A frame's 'prev' frame is either null or the previous frame pointed to
+     * by cx->regs->fp when this frame was pushed. Often, given two prev-linked
+     * frames, the next-frame is a function or eval that was called by the
+     * prev-frame, but not always: the prev-frame may have called a native that
+     * reentered the VM through JS_CallFunctionValue on the same context
+     * (without calling JS_SaveFrameChain) which pushed the next-frame. Thus,
+     * 'prev' has little semantic meaning and basically just tells the VM what
+     * to set cx->regs->fp to when this frame is popped.
+     */
+
+    StackFrame *prev() const {
+        return prev_;
+    }
+
+    inline void resetGeneratorPrev(JSContext *cx);
+
+    /*
+     * Frame slots
+     *
+     * A frame's 'slots' are the fixed slots associated with the frame (like
+     * local variables) followed by an expression stack holding temporary
+     * values. A frame's 'base' is the base of the expression stack.
+     */
+
+    js::Value *slots() const {
+        return (js::Value *)(this + 1);
+    }
+
+    js::Value *base() const {
+        return slots() + script()->nfixed;
+    }
+
+    js::Value &varSlot(uintN i) {
+        JS_ASSERT(i < script()->nfixed);
+        JS_ASSERT_IF(maybeFun(), i < script()->bindings.countVars());
+        return slots()[i];
+    }
+
+    /*
+     * Script
+     *
+     * All function and global frames have an associated JSScript which holds
+     * the bytecode being executed for the frame.
+     */
+
+    /*
+     * Get the frame's current bytecode, assuming |this| is in |cx|.
+     * next is frame whose prev == this, NULL if not known or if this == cx->fp().
+     */
+    jsbytecode *pc(JSContext *cx, StackFrame *next = NULL);
+
+    jsbytecode *prevpc() {
+        if (flags_ & HAS_PREVPC)
+            return prevpc_;
+        return prevpcSlow();
+    }
+
+    JSScript *script() const {
+        JS_ASSERT(isScriptFrame());
+        return isFunctionFrame()
+               ? isEvalFrame() ? args.script : fun()->script()
+               : exec.script;
+    }
+
+    JSScript *functionScript() const {
+        JS_ASSERT(isFunctionFrame());
+        return isEvalFrame() ? args.script : fun()->script();
+    }
+
+    JSScript *globalScript() const {
+        JS_ASSERT(isGlobalFrame());
+        return exec.script;
+    }
+
+    JSScript *maybeScript() const {
+        return isScriptFrame() ? script() : NULL;
+    }
+
+    size_t numFixed() const {
+        return script()->nfixed;
+    }
+
+    size_t numSlots() const {
+        return script()->nslots;
+    }
+
+    size_t numGlobalVars() const {
+        JS_ASSERT(isGlobalFrame());
+        return exec.script->nfixed;
+    }
+
+    /*
+     * Function
+     *
+     * All function frames have an associated interpreted JSFunction.
+     */
+
+    JSFunction* fun() const {
+        JS_ASSERT(isFunctionFrame());
+        return exec.fun;
+    }
+
+    JSFunction* maybeFun() const {
+        return isFunctionFrame() ? fun() : NULL;
+    }
+
+    /*
+     * Arguments
+     *
+     * Only non-eval function frames have arguments. A frame follows its
+     * arguments contiguously in memory. The arguments pushed by the caller are
+     * the 'actual' arguments. The declared arguments of the callee are the
+     * 'formal' arguments. When the caller passes less or equal actual
+     * arguments, the actual and formal arguments are the same array (but with
+     * different extents). When the caller passes too many arguments, the
+     * formal subset of the actual arguments is copied onto the top of the
+     * stack. This allows the engine to maintain a jit-time constant offset of
+     * arguments from the frame pointer. Since the formal subset of the actual
+     * arguments is potentially on the stack twice, it is important for all
+     * reads/writes to refer to the same canonical memory location.
+     *
+     * An arguments object (the object returned by the 'arguments' keyword) is
+     * lazily created, so a given function frame may or may not have one.
+     */
+
+    /* True if this frame has arguments. Contrast with hasArgsObj. */
+    bool hasArgs() const {
+        return isNonEvalFunctionFrame();
+    }
+
+    uintN numFormalArgs() const {
+        JS_ASSERT(hasArgs());
+        return fun()->nargs;
+    }
+
+    js::Value &formalArg(uintN i) const {
+        JS_ASSERT(i < numFormalArgs());
+        return formalArgs()[i];
+    }
+
+    js::Value *formalArgs() const {
+        JS_ASSERT(hasArgs());
+        return (js::Value *)this - numFormalArgs();
+    }
+
+    js::Value *formalArgsEnd() const {
+        JS_ASSERT(hasArgs());
+        return (js::Value *)this;
+    }
+
+    js::Value *maybeFormalArgs() const {
+        return (flags_ & (FUNCTION | EVAL)) == FUNCTION
+               ? formalArgs()
+               : NULL;
+    }
+
+    inline uintN numActualArgs() const;
+    inline js::Value *actualArgs() const;
+    inline js::Value *actualArgsEnd() const;
+
+    inline js::Value &canonicalActualArg(uintN i) const;
+    template <class Op> inline bool forEachCanonicalActualArg(Op op);
+    template <class Op> inline bool forEachFormalArg(Op op);
+
+    inline void clearMissingArgs();
+
+    bool hasArgsObj() const {
+        return !!(flags_ & HAS_ARGS_OBJ);
+    }
+
+    JSObject &argsObj() const {
+        JS_ASSERT(hasArgsObj());
+        JS_ASSERT(!isEvalFrame());
+        return *args.obj;
+    }
+
+    JSObject *maybeArgsObj() const {
+        return hasArgsObj() ? &argsObj() : NULL;
+    }
+
+    inline void setArgsObj(JSObject &obj);
+
+    /*
+     * This value
+     *
+     * Every frame has a this value although, until 'this' is computed, the
+     * value may not be the semantically-correct 'this' value.
+     *
+     * The 'this' value is stored before the formal arguments for function
+     * frames and directly before the frame for global frames. The *Args
+     * members assert !isEvalFrame(), so we implement specialized inline
+     * methods for accessing 'this'. When the caller has static knowledge that
+     * a frame is a function or global frame, 'functionThis' and 'globalThis',
+     * respectively, allow more efficient access.
+     */
+
+    js::Value &functionThis() const {
+        JS_ASSERT(isFunctionFrame());
+        if (isEvalFrame())
+            return ((js::Value *)this)[-1];
+        return formalArgs()[-1];
+    }
+
+    JSObject &constructorThis() const {
+        JS_ASSERT(hasArgs());
+        return formalArgs()[-1].toObject();
+    }
+
+    js::Value &globalThis() const {
+        JS_ASSERT(isGlobalFrame());
+        return ((js::Value *)this)[-1];
+    }
+
+    js::Value &thisValue() const {
+        if (flags_ & (EVAL | GLOBAL))
+            return ((js::Value *)this)[-1];
+        return formalArgs()[-1];
+    }
+
+    /*
+     * Callee
+     *
+     * Only function frames have a callee. An eval frame in a function has the
+     * same caller as its containing function frame.
+     */
+
+    js::Value &calleev() const {
+        JS_ASSERT(isFunctionFrame());
+        if (isEvalFrame())
+            return ((js::Value *)this)[-2];
+        return formalArgs()[-2];
+    }
+
+    JSObject &callee() const {
+        JS_ASSERT(isFunctionFrame());
+        return calleev().toObject();
+    }
+
+    JSObject *maybeCallee() const {
+        return isFunctionFrame() ? &callee() : NULL;
+    }
+
+    js::CallReceiver callReceiver() const {
+        return js::CallReceiverFromArgv(formalArgs());
+    }
+
+    /*
+     * getValidCalleeObject is a fallible getter to compute the correct callee
+     * function object, which may require deferred cloning due to the JSObject
+     * methodReadBarrier. For a non-function frame, return true with *vp set
+     * from calleev, which may not be an object (it could be undefined).
+     */
+    bool getValidCalleeObject(JSContext *cx, js::Value *vp);
+
+    /*
+     * Scope chain
+     *
+     * Every frame has a scopeChain which, when traversed via the 'parent' link
+     * to the root, indicates the current global object. A 'call object' is a
+     * node on a scope chain representing a function's activation record. A
+     * call object is used for dynamically-scoped name lookup and lexically-
+     * scoped upvar access. The call object holds the values of locals and
+     * arguments when a function returns (and its stack frame is popped). For
+     * performance reasons, call objects are created lazily for 'lightweight'
+     * functions, i.e., functions which are not statically known to require a
+     * call object. Thus, a given function frame may or may not have a call
+     * object. When a function does have a call object, it is found by walking
+     * up the scope chain until the first call object. Thus, it is important,
+     * when setting the scope chain, to indicate whether the new scope chain
+     * contains a new call object and thus changes the 'hasCallObj' state.
+     *
+     * NB: 'fp->hasCallObj()' implies that fp->callObj() needs to be 'put' when
+     * the frame is popped. Since the scope chain of a non-strict eval frame
+     * contains the call object of the parent (function) frame, it is possible
+     * to have:
+     *   !fp->hasCall() && fp->scopeChain().isCall()
+     */
+
+    JSObject &scopeChain() const {
+        JS_ASSERT_IF(!(flags_ & HAS_SCOPECHAIN), isFunctionFrame());
+        if (!(flags_ & HAS_SCOPECHAIN)) {
+            scopeChain_ = callee().getParent();
+            flags_ |= HAS_SCOPECHAIN;
+        }
+        return *scopeChain_;
+    }
+
+    bool hasCallObj() const {
+        bool ret = !!(flags_ & HAS_CALL_OBJ);
+        JS_ASSERT_IF(ret, !isNonStrictEvalFrame());
+        return ret;
+    }
+
+    inline JSObject &callObj() const;
+    inline void setScopeChainNoCallObj(JSObject &obj);
+    inline void setScopeChainWithOwnCallObj(JSObject &obj);
+
+    /*
+     * NB: putActivationObjects does not mark activation objects as having been
+     * put (since the frame is about to be popped).
+     */
+    inline void putActivationObjects();
+    inline void markActivationObjectsAsPut();
+
+    /*
+     * Frame compartment
+     *
+     * A stack frame's compartment is the frame's containing context's
+     * compartment when the frame was pushed.
+     */
+
+    JSCompartment *compartment() const {
+        JS_ASSERT_IF(isScriptFrame(), scopeChain().compartment() == script()->compartment);
+        return scopeChain().compartment();
+    }
+
+    /*
+     * Imacropc
+     *
+     * A frame's IMacro pc is the bytecode address when an imacro started
+     * executing (guaranteed non-null). An imacro does not push a frame, so
+     * when the imacro finishes, the frame's IMacro pc becomes the current pc.
+     */
+
+    bool hasImacropc() const {
+        return flags_ & HAS_IMACRO_PC;
+    }
+
+    jsbytecode *imacropc() const {
+        JS_ASSERT(hasImacropc());
+        return imacropc_;
+    }
+
+    jsbytecode *maybeImacropc() const {
+        return hasImacropc() ? imacropc() : NULL;
+    }
+
+    void clearImacropc() {
+        flags_ &= ~HAS_IMACRO_PC;
+    }
+
+    void setImacropc(jsbytecode *pc) {
+        JS_ASSERT(pc);
+        JS_ASSERT(!(flags_ & HAS_IMACRO_PC));
+        imacropc_ = pc;
+        flags_ |= HAS_IMACRO_PC;
+    }
+
+    /* Annotation (will be removed after bug 546848) */
+
+    void* annotation() const {
+        return (flags_ & HAS_ANNOTATION) ? annotation_ : NULL;
+    }
+
+    void setAnnotation(void *annot) {
+        flags_ |= HAS_ANNOTATION;
+        annotation_ = annot;
+    }
+
+    /* Debugger hook data */
+
+    bool hasHookData() const {
+        return !!(flags_ & HAS_HOOK_DATA);
+    }
+
+    void* hookData() const {
+        JS_ASSERT(hasHookData());
+        return hookData_;
+    }
+
+    void* maybeHookData() const {
+        return hasHookData() ? hookData_ : NULL;
+    }
+
+    void setHookData(void *v) {
+        hookData_ = v;
+        flags_ |= HAS_HOOK_DATA;
+    }
+
+    /* Return value */
+
+    const js::Value &returnValue() {
+        if (!(flags_ & HAS_RVAL))
+            rval_.setUndefined();
+        return rval_;
+    }
+
+    void markReturnValue() {
+        flags_ |= HAS_RVAL;
+    }
+
+    void setReturnValue(const js::Value &v) {
+        rval_ = v;
+        markReturnValue();
+    }
+
+    void clearReturnValue() {
+        rval_.setUndefined();
+        markReturnValue();
+    }
+
+    /* Native-code return address */
+
+    void *nativeReturnAddress() const {
+        return ncode_;
+    }
+
+    void setNativeReturnAddress(void *addr) {
+        ncode_ = addr;
+    }
+
+    void **addressOfNativeReturnAddress() {
+        return &ncode_;
+    }
+
+    /*
+     * Generator-specific members
+     *
+     * A non-eval function frame may optionally be the activation of a
+     * generator. For the most part, generator frames act like ordinary frames.
+     * For exceptions, see js_FloatingFrameIfGenerator.
+     */
+
+    bool isGeneratorFrame() const {
+        return !!(flags_ & GENERATOR);
+    }
+
+    bool isFloatingGenerator() const {
+        JS_ASSERT_IF(flags_ & FLOATING_GENERATOR, isGeneratorFrame());
+        return !!(flags_ & FLOATING_GENERATOR);
+    }
+
+    void initFloatingGenerator() {
+        JS_ASSERT(!(flags_ & GENERATOR));
+        flags_ |= (GENERATOR | FLOATING_GENERATOR);
+    }
+
+    void unsetFloatingGenerator() {
+        flags_ &= ~FLOATING_GENERATOR;
+    }
+
+    void setFloatingGenerator() {
+        flags_ |= FLOATING_GENERATOR;
+    }
+
+    /*
+     * js::Execute pushes both global and function frames (since eval() in a
+     * function pushes a frame with isFunctionFrame() && isEvalFrame()). Most
+     * code should not care where a frame was pushed, but if it is necessary to
+     * pick out frames pushed by js::Execute, this is the right query:
+     */
+
+    bool isFramePushedByExecute() const {
+        return !!(flags_ & (GLOBAL | EVAL));
+    }
+
+    /*
+     * Other flags
+     */
+
+    bool isConstructing() const {
+        return !!(flags_ & CONSTRUCTING);
+    }
+
+    uint32 isConstructingFlag() const {
+        JS_ASSERT(isFunctionFrame());
+        JS_ASSERT((flags_ & ~(CONSTRUCTING | FUNCTION)) == 0);
+        return flags_;
+    }
+
+    bool isDebuggerFrame() const {
+        return !!(flags_ & DEBUGGER);
+    }
+
+    bool isEvalOrDebuggerFrame() const {
+        return !!(flags_ & (EVAL | DEBUGGER));
+    }
+
+    bool hasOverriddenArgs() const {
+        return !!(flags_ & OVERRIDE_ARGS);
+    }
+
+    bool hasOverflowArgs() const {
+        return !!(flags_ & OVERFLOW_ARGS);
+    }
+
+    void setOverriddenArgs() {
+        flags_ |= OVERRIDE_ARGS;
+    }
+
+    bool isYielding() {
+        return !!(flags_ & YIELDING);
+    }
+
+    void setYielding() {
+        flags_ |= YIELDING;
+    }
+
+    void clearYielding() {
+        flags_ &= ~YIELDING;
+    }
+
+    void setFinishedInInterpreter() {
+        flags_ |= FINISHED_IN_INTERP;
+    }
+
+    bool finishedInInterpreter() const {
+        return !!(flags_ & FINISHED_IN_INTERP);
+    }
+
+#ifdef DEBUG
+    /* Poison scopeChain value set before a frame is flushed. */
+    static JSObject *const sInvalidScopeChain;
+#endif
+
+  public:
+    /* Public, but only for JIT use: */
+
+    static size_t offsetOfFlags() {
+        return offsetof(StackFrame, flags_);
+    }
+
+    static size_t offsetOfExec() {
+        return offsetof(StackFrame, exec);
+    }
+
+    void *addressOfArgs() {
+        return &args;
+    }
+
+    static size_t offsetOfScopeChain() {
+        return offsetof(StackFrame, scopeChain_);
+    }
+
+    JSObject **addressOfScopeChain() {
+        JS_ASSERT(flags_ & HAS_SCOPECHAIN);
+        return &scopeChain_;
+    }
+
+    static size_t offsetOfPrev() {
+        return offsetof(StackFrame, prev_);
+    }
+
+    static size_t offsetOfReturnValue() {
+        return offsetof(StackFrame, rval_);
+    }
+
+    static ptrdiff_t offsetOfNcode() {
+        return offsetof(StackFrame, ncode_);
+    }
+
+    static ptrdiff_t offsetOfCallee(JSFunction *fun) {
+        JS_ASSERT(fun != NULL);
+        return -(fun->nargs + 2) * sizeof(js::Value);
+    }
+
+    static ptrdiff_t offsetOfThis(JSFunction *fun) {
+        return fun == NULL
+               ? -1 * ptrdiff_t(sizeof(js::Value))
+               : -(fun->nargs + 1) * ptrdiff_t(sizeof(js::Value));
+    }
+
+    static ptrdiff_t offsetOfFormalArg(JSFunction *fun, uintN i) {
+        JS_ASSERT(i < fun->nargs);
+        return (-(int)fun->nargs + i) * sizeof(js::Value);
+    }
+
+    static size_t offsetOfFixed(uintN i) {
+        return sizeof(StackFrame) + i * sizeof(js::Value);
+    }
+
+#ifdef JS_METHODJIT
+    js::mjit::JITScript *jit() {
+        return script()->getJIT(isConstructing());
+    }
+#endif
+
+    void methodjitStaticAsserts();
+};
+
+static const size_t VALUES_PER_STACK_FRAME = sizeof(StackFrame) / sizeof(Value);
+
+inline StackFrame *          Valueify(JSStackFrame *fp) { return (StackFrame *)fp; }
+static inline JSStackFrame * Jsvalify(StackFrame *fp)   { return (JSStackFrame *)fp; }
+
+/*****************************************************************************/
+
+class FrameRegs
+{
+  public:
+    Value *sp;
+    jsbytecode *pc;
+  private:
+    StackFrame *fp_;
+  public:
+    StackFrame *fp() const { return fp_; }
+
+    /* For jit use (need constant): */
+    static const size_t offsetOfFp = 2 * sizeof(void *);
+    static void staticAssert() {
+        JS_STATIC_ASSERT(offsetOfFp == offsetof(FrameRegs, fp_));
+    }
+
+    /* For generator: */
+    void rebaseFromTo(StackFrame *from, StackFrame *to) {
+        fp_ = to;
+        sp = to->slots() + (sp - from->slots());
+    }
+
+    /* For ContextStack: */
+    void popFrame(Value *newsp) {
+        pc = fp_->prevpc();
+        sp = newsp;
+        fp_ = fp_->prev();
+    }
+
+    /* For FixupArity: */
+    void popPartialFrame(Value *newsp) {
+        sp = newsp;
+        fp_ = fp_->prev();
+    }
+
+    /* For stubs::CompileFunction, ContextStack: */
+    void prepareToRun(StackFrame *fp, JSScript *script) {
+        pc = script->code;
+        sp = fp->slots() + script->nfixed;
+        fp_ = fp;
+    }
+
+    /* For pushDummyFrame: */
+    void initDummyFrame(StackFrame *fp) {
+        pc = NULL;
+        sp = fp->slots();
+        fp_ = fp;
+    }
+};
+
+/*****************************************************************************/
+
+struct StackOverride
+{
+    Value         *top;
+#ifdef DEBUG
+    StackSegment  *seg;
+    StackFrame    *frame;
+#endif
+};
+
+/*****************************************************************************/
+
+class StackSpace
+{
+    Value         *base_;
+#ifdef XP_WIN
+    mutable Value *commitEnd_;
+#endif
+    Value *end_;
+    StackSegment  *seg_;
+    StackOverride override_;
+
+    static const size_t CAPACITY_VALS  = 512 * 1024;
+    static const size_t CAPACITY_BYTES = CAPACITY_VALS * sizeof(Value);
+    static const size_t COMMIT_VALS    = 16 * 1024;
+    static const size_t COMMIT_BYTES   = COMMIT_VALS * sizeof(Value);
+
+    static void staticAsserts() {
+        JS_STATIC_ASSERT(CAPACITY_VALS % COMMIT_VALS == 0);
+    }
+
+#ifdef XP_WIN
+    JS_FRIEND_API(bool) bumpCommit(JSContext *maybecx, Value *from, ptrdiff_t nvals) const;
+#endif
+
+    friend class ContextStack;
+    friend struct detail::OOMCheck;
+    inline bool ensureSpace(JSContext *maybecx, Value *from, ptrdiff_t nvals) const;
+    void pushSegment(StackSegment &seg);
+    void popSegment();
+    inline void pushOverride(Value *top, StackOverride *prev);
+    inline void popOverride(const StackOverride &prev);
+
+  public:
+    StackSpace();
+    bool init();
+    ~StackSpace();
+
+    /* See stack layout comment above. */
+    StackSegment *currentSegment() const { return seg_; }
+    Value *firstUnused() const;
+
+    /* Optimization of firstUnused when currentSegment() is known active. */
+    inline Value *activeFirstUnused() const;
+
+    /* Get the segment containing the target frame. */
+    StackSegment &containingSegment(const StackFrame *target) const;
+
+    /*
+     * Retrieve the 'variables object' (ES3 term) associated with the given
+     * frame's Execution Context's VariableEnvironment (ES5 10.3).
+     */
+    JSObject &varObjForFrame(const StackFrame *fp);
+
+    /*
+     * LeaveTree requires stack allocation to rebuild the stack. There is no
+     * good way to handle an OOM for these allocations, so this function checks
+     * that OOM cannot occur using the size of the TraceNativeStorage as a
+     * conservative upper bound.
+     */
+    inline bool ensureEnoughSpaceToEnterTrace();
+
+    /*
+     * If we let infinite recursion go until it hit the end of the contiguous
+     * stack, it would take a long time. As a heuristic, we kill scripts which
+     * go deeper than MAX_INLINE_CALLS. Note: this heuristic only applies to a
+     * single activation of the VM. If a script reenters, the call count gets
+     * reset. This is ok because we will quickly hit the C recursion limit.
+     */
+    static const size_t MAX_INLINE_CALLS = 3000;
+
+    /*
+     * SunSpider and v8bench have roughly an average of 9 slots per script. Our
+     * heuristic for a quick over-recursion check uses a generous slot count
+     * based on this estimate. We take this frame size and multiply it by the
+     * old recursion limit from the interpreter. Worst case, if an average size
+     * script (<=9 slots) over recurses, it'll effectively be the same as having
+     * increased the old inline call count to <= 5,000.
+     */
+    static const size_t STACK_QUOTA = MAX_INLINE_CALLS * (VALUES_PER_STACK_FRAME + 18);
+
+    /*
+     * In the mjit, we'd like to collapse two "overflow" checks into one:
+     *  - the MAX_INLINE_CALLS check (see above comment)
+     *  - the stack OOM check (or, on Windows, the commit/OOM check) This
+     * function produces a 'limit' pointer that satisfies both these checks.
+     * (The STACK_QUOTA comment explains how this limit simulates checking
+     * MAX_INLINE_CALLS.) This limit is guaranteed to have at least enough space
+     * for cx->fp()->nslots() plus an extra stack frame (which is the min
+     * requirement for entering mjit code) or else an error is reported and NULL
+     * is returned. When the stack grows past the returned limit, the script may
+     * still be within quota, but more memory needs to be committed. This is
+     * handled by bumpLimitWithinQuota.
+     */
+    inline Value *getStackLimit(JSContext *cx);
+
+    /*
+     * Try to bump the limit, staying within |base + STACK_QUOTA|, by
+     * committing more pages of the contiguous stack.
+     *  base: the frame on which execution started
+     *  from: the current top of the stack
+     *  nvals: requested space above 'from'
+     *  *limit: receives bumped new limit
+     */
+    bool bumpLimitWithinQuota(JSContext *maybecx, StackFrame *base, Value *from, uintN nvals, Value **limit) const;
+
+    /*
+     * Raise the given limit without considering quota.
+     * See comment in BumpStackFull.
+     */
+    bool bumpLimit(JSContext *cx, StackFrame *base, Value *from, uintN nvals, Value **limit) const;
+
+    /* Called during GC: mark segments, frames, and slots under firstUnused. */
+    void mark(JSTracer *trc);
+};
+
+/*****************************************************************************/
+
+class ContextStack
+{
+    FrameRegs *regs_;
+    StackSegment *seg_;
+    StackSpace *space_;
+    JSContext *cx_;
+
+    /*
+     * This is the collecting-point for code that wants to know when there is
+     * no JS active. Note that "no JS active" does not mean the stack is empty
+     * because of JS_(Save|Restore)FrameChain. If code really wants to know
+     * when the stack is empty, test |cx->stack.empty()|.
+     */
+    void notifyIfNoCodeRunning();
+
+    /*
+     * Return whether this ContextStack is running code at the top of the
+     * contiguous stack. This is a precondition for extending the current
+     * segment by pushing stack frames or overrides etc.
+     */
+    inline bool isCurrentAndActive() const;
+
+#ifdef DEBUG
+    void assertSegmentsInSync() const;
+    void assertSpaceInSync() const;
+#else
+    void assertSegmentsInSync() const {}
+    void assertSpaceInSync() const {}
+#endif
+
+    friend class FrameGuard;
+    bool getSegmentAndFrame(JSContext *cx, uintN vplen, uintN nslots,
+                            FrameGuard *frameGuard) const;
+    void pushSegmentAndFrame(FrameRegs &regs, FrameGuard *frameGuard);
+    void pushSegmentAndFrameImpl(FrameRegs &regs, StackSegment &seg);
+    void popSegmentAndFrame();
+    void popSegmentAndFrameImpl();
+
+    template <class Check>
+    inline StackFrame *getCallFrame(JSContext *cx, Value *sp, uintN nactual,
+                                    JSFunction *fun, JSScript *script, uint32 *pflags,
+                                    Check check) const;
+
+    friend class InvokeArgsGuard;
+    bool pushInvokeArgsSlow(JSContext *cx, uintN argc, InvokeArgsGuard *argsGuard);
+    void popInvokeArgsSlow(const InvokeArgsGuard &argsGuard);
+    inline void popInvokeArgs(const InvokeArgsGuard &argsGuard);
+
+    friend class InvokeFrameGuard;
+    void pushInvokeFrameSlow(InvokeFrameGuard *frameGuard);
+    void popInvokeFrameSlow(const InvokeFrameGuard &frameGuard);
+    inline void popInvokeFrame(const InvokeFrameGuard &frameGuard);
+
+  public:
+    ContextStack(JSContext *cx);
+    ~ContextStack();
+
+    /*
+     * A context is "empty" if it has no code, running or suspended, on its
+     * stack. Running code can be stopped (via JS_SaveFrameChain) which leads
+     * to the state |!cx->empty() && cx->running()|.
+     */
+    bool empty() const           { JS_ASSERT_IF(regs_, seg_); return !seg_; }
+    bool running() const         { JS_ASSERT_IF(regs_, regs_->fp()); return !!regs_; }
+
+    /* Current regs of the current segment (see VM stack layout comment). */
+    FrameRegs &regs() const      { JS_ASSERT(regs_); return *regs_; }
+
+    /* Convenience helpers. */
+    FrameRegs *maybeRegs() const { return regs_; }
+    StackFrame *fp() const       { return regs_->fp(); }
+    StackFrame *maybefp() const  { return regs_ ? regs_->fp() : NULL; }
+
+    /* The StackSpace currently hosting this ContextStack. */
+    StackSpace &space() const    { assertSpaceInSync(); return *space_; }
+
+    /*
+     * To avoid indirection, ContextSpace caches a pointers to the StackSpace.
+     * This must be kept coherent with cx->thread->data.space by calling
+     * 'threadReset' whenver cx->thread changes.
+     */
+    void threadReset();
+
+    /*
+     * As an optimization, the interpreter/mjit can operate on a local
+     * FrameRegs instance repoint the ContextStack to this local instance.
+     */
+    void repointRegs(FrameRegs *regs) {
+        JS_ASSERT_IF(regs, regs->fp());
+        regs_ = regs;
+    }
+
+    /* Return the current segment, which may or may not be active. */
+    js::StackSegment *currentSegment() const {
+        assertSegmentsInSync();
+        return seg_;
+    }
+
+    /* This is an optimization of StackSpace::varObjForFrame. */
+    inline JSObject &currentVarObj() const;
+
+    /* Search the call stack for the nearest frame with static level targetLevel. */
+    inline StackFrame *findFrameAtLevel(uintN targetLevel) const;
+
+#ifdef DEBUG
+    /* Return whether the given frame is in this context's stack. */
+    bool contains(const StackFrame *fp) const;
+#endif
+
+    /* Mark the top segment as suspended, without pushing a new one. */
+    void saveActiveSegment();
+
+    /* Undoes calls to suspendActiveSegment. */
+    void restoreSegment();
+
+    /*
+     * For the five sets of stack operations below:
+     *  - The boolean-valued functions call js_ReportOutOfScriptQuota on OOM.
+     *  - The "get*Frame" functions do not change any global state, they just
+     *    check OOM and return pointers to an uninitialized frame with the
+     *    requested missing arguments/slots. Only once the "push*Frame"
+     *    function has been called is global state updated. Thus, between
+     *    "get*Frame" and "push*Frame", the frame and slots are unrooted.
+     *  - Functions taking "*Guard" arguments will use the guard's destructor
+     *    to pop the stack. The caller must ensure the guard has the
+     *    appropriate lifetime.
+     */
+
+    /*
+     * pushInvokeArgs allocates |argc + 2| rooted values that will be passed as
+     * the arguments to Invoke. A single allocation can be used for multiple
+     * Invoke calls. The InvokeArgumentsGuard passed to Invoke must come from
+     * an immediately-enclosing (stack-wise) call to pushInvokeArgs.
+     */
+    bool pushInvokeArgs(JSContext *cx, uintN argc, InvokeArgsGuard *ag);
+
+    /* These functions are called inside Invoke, not Invoke clients. */
+    inline StackFrame *
+    getInvokeFrame(JSContext *cx, const CallArgs &args,
+                   JSFunction *fun, JSScript *script, uint32 *flags,
+                   InvokeFrameGuard *frameGuard) const;
+    void pushInvokeFrame(const CallArgs &args,
+                         InvokeFrameGuard *frameGuard);
+
+    /* These functions are called inside Execute, not Execute clients. */
+    bool getExecuteFrame(JSContext *cx, JSScript *script,
+                         ExecuteFrameGuard *frameGuard) const;
+    void pushExecuteFrame(JSObject *initialVarObj,
+                          ExecuteFrameGuard *frameGuard);
+
+    /* These functions are called inside SendToGenerator. */
+    bool getGeneratorFrame(JSContext *cx, uintN vplen, uintN nslots,
+                           GeneratorFrameGuard *frameGuard);
+    void pushGeneratorFrame(FrameRegs &regs,
+                            GeneratorFrameGuard *frameGuard);
+
+    /* Pushes a StackFrame::isDummyFrame. */
+    bool pushDummyFrame(JSContext *cx, JSObject &scopeChain,
+                        DummyFrameGuard *frameGuard);
+
+    /*
+     * An "inline frame" may only be pushed from within the top, active
+     * segment. This is the case for calls made inside mjit code and Interpret.
+     * The *WithinLimit variant stays within the stack quota using the given
+     * limit (see StackSpace::getStackLimit).
+     */
+    inline StackFrame *
+    getInlineFrame(JSContext *cx, Value *sp, uintN nactual,
+                   JSFunction *fun, JSScript *script, uint32 *flags) const;
+    inline StackFrame *
+    getInlineFrameWithinLimit(JSContext *cx, Value *sp, uintN nactual,
+                              JSFunction *fun, JSScript *script, uint32 *flags,
+                              StackFrame *base, Value **limit) const;
+    inline void pushInlineFrame(JSScript *script, StackFrame *fp, FrameRegs &regs);
+    inline void popInlineFrame();
+
+    /* For jit use: */
+    static size_t offsetOfRegs() { return offsetof(ContextStack, regs_); }
+};
+
+/*****************************************************************************/
+
+class InvokeArgsGuard : public CallArgs
+{
+    friend class ContextStack;
+    ContextStack     *stack_;  /* null implies nothing pushed */
+    StackSegment     *seg_;    /* null implies no segment pushed */
+    StackOverride    prevOverride_;
+  public:
+    InvokeArgsGuard() : stack_(NULL), seg_(NULL) {}
+    ~InvokeArgsGuard();
+    bool pushed() const { return stack_ != NULL; }
+};
+
+/*
+ * This type can be used to call Invoke when the arguments have already been
+ * pushed onto the stack as part of normal execution.
+ */
+struct InvokeArgsAlreadyOnTheStack : CallArgs
+{
+    InvokeArgsAlreadyOnTheStack(uintN argc, Value *vp) : CallArgs(argc, vp + 2) {}
+};
+
+class InvokeFrameGuard
+
+{
+    friend class ContextStack;
+    ContextStack *stack_;  /* null implies nothing pushed */
+    FrameRegs regs_;
+    FrameRegs *prevRegs_;
+  public:
+    InvokeFrameGuard() : stack_(NULL) {}
+    ~InvokeFrameGuard();
+    bool pushed() const { return stack_ != NULL; }
+    void pop();
+    StackFrame *fp() const { return regs_.fp(); }
+};
+
+/* Reusable base; not for direct use. */
+class FrameGuard
+{
+    friend class ContextStack;
+    ContextStack *stack_;  /* null implies nothing pushed */
+    StackSegment *seg_;
+    Value *vp_;
+    StackFrame *fp_;
+  public:
+    FrameGuard() : stack_(NULL), vp_(NULL), fp_(NULL) {}
+    ~FrameGuard();
+    bool pushed() const { return stack_ != NULL; }
+    StackSegment *segment() const { return seg_; }
+    Value *vp() const { return vp_; }
+    StackFrame *fp() const { return fp_; }
+};
+
+class ExecuteFrameGuard : public FrameGuard
+{
+    friend class ContextStack;
+    FrameRegs regs_;
+};
+
+class DummyFrameGuard : public FrameGuard
+{
+    friend class ContextStack;
+    FrameRegs regs_;
+};
+
+class GeneratorFrameGuard : public FrameGuard
+{};
+
+/*****************************************************************************/
+
+/*
+ * While |cx->fp|'s pc/sp are available in |cx->regs|, to compute the saved
+ * value of pc/sp for any other frame, it is necessary to know about that
+ * frame's next-frame. This iterator maintains this information when walking
+ * a chain of stack frames starting at |cx->fp|.
+ *
+ * Usage:
+ *   for (FrameRegsIter i(cx); !i.done(); ++i)
+ *     ... i.fp() ... i.sp() ... i.pc()
+ */
+class FrameRegsIter
+{
+    JSContext    *cx_;
+    StackSegment *seg_;
+    StackFrame   *fp_;
+    Value        *sp_;
+    jsbytecode   *pc_;
+
+    void initSlow();
+    void incSlow(StackFrame *oldfp);
+
+  public:
+    inline FrameRegsIter(JSContext *cx);
+
+    bool done() const { return fp_ == NULL; }
+    inline FrameRegsIter &operator++();
+
+    StackFrame *fp() const { return fp_; }
+    Value *sp() const { return sp_; }
+    jsbytecode *pc() const { return pc_; }
+};
+
+/*
+ * Utility class for iteration over all active stack frames.
+ */
+class AllFramesIter
+{
+public:
+    AllFramesIter(JSContext *cx);
+
+    bool done() const { return fp_ == NULL; }
+    AllFramesIter& operator++();
+
+    StackFrame *fp() const { return fp_; }
+
+private:
+    StackSegment *seg_;
+    StackFrame *fp_;
+};
+
+}  /* namespace js */
+
+#endif /* Stack_h__ */
diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp
index 6d9e5d587746..0ecf71ec2111 100644
--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/src/xpconnect/src/nsXPConnect.cpp
@@ -398,13 +398,14 @@ nsXPConnect::Collect()
     // cycle collection. So to compensate for JS_BeginRequest in
     // XPCCallContext::Init we disable the conservative scanner if that call
     // has started the request on this thread.
-    JS_ASSERT(cx->thread->data.requestDepth >= 1);
-    JS_ASSERT(!cx->thread->data.conservativeGC.requestThreshold);
-    if(cx->thread->data.requestDepth == 1)
-        cx->thread->data.conservativeGC.requestThreshold = 1;
+    js::ThreadData &threadData = cx->thread()->data;
+    JS_ASSERT(threadData.requestDepth >= 1);
+    JS_ASSERT(!threadData.conservativeGC.requestThreshold);
+    if(threadData.requestDepth == 1)
+        threadData.conservativeGC.requestThreshold = 1;
     JS_GC(cx);
-    if(cx->thread->data.requestDepth == 1)
-        cx->thread->data.conservativeGC.requestThreshold = 0;
+    if(threadData.requestDepth == 1)
+        threadData.conservativeGC.requestThreshold = 0;
 }
 
 NS_IMETHODIMP
@@ -2612,7 +2613,7 @@ nsXPConnect::Push(JSContext * cx)
              bool runningJS = false;
              for (PRUint32 i = 0; i < stack->Length(); ++i) {
                  JSContext *cx = (*stack)[i].cx;
-                 if (cx && cx->getCurrentSegment()) {
+                 if (cx && !cx->stack.empty()) {
                      runningJS = true;
                      break;
                  }
diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 874b9508ce1e..44821331d65f 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -3626,9 +3626,9 @@ public:
     {
         if(cx)
         {
-            NS_ASSERTION(cx->thread, "Uh, JS context w/o a thread?");
+            NS_ASSERTION(cx->thread(), "Uh, JS context w/o a thread?");
 
-            if(cx->thread == sMainJSThread)
+            if(cx->thread() == sMainJSThread)
                 return sMainThreadData;
         }
         else if(sMainThreadData && sMainThreadData->mThread == PR_GetCurrentThread())
@@ -3733,7 +3733,7 @@ public:
         {sMainJSThread = nsnull; sMainThreadData = nsnull;}
 
     static PRBool IsMainThread(JSContext *cx)
-        { return cx->thread == sMainJSThread; }
+        { return cx->thread() == sMainJSThread; }
 
 private:
     XPCPerThreadData();
diff --git a/js/src/xpconnect/src/xpcstack.cpp b/js/src/xpconnect/src/xpcstack.cpp
index c0376c20634f..c737da277529 100644
--- a/js/src/xpconnect/src/xpcstack.cpp
+++ b/js/src/xpconnect/src/xpcstack.cpp
@@ -141,9 +141,10 @@ XPCJSStackFrame::CreateStack(JSContext* cx, JSStackFrame* fp,
     {
         NS_ADDREF(self);
 
-        if(fp->prev())
+        JSStackFrame *tmp = fp;
+        if(JSStackFrame *prev = JS_FrameIterator(cx, &tmp))
         {
-            if(NS_FAILED(CreateStack(cx, fp->prev(),
+            if(NS_FAILED(CreateStack(cx, prev,
                          (XPCJSStackFrame**) &self->mCaller)))
                 failed = JS_TRUE;
         }
diff --git a/js/src/xpconnect/src/xpcthreadcontext.cpp b/js/src/xpconnect/src/xpcthreadcontext.cpp
index 398ac4855cdd..9bc580edda84 100644
--- a/js/src/xpconnect/src/xpcthreadcontext.cpp
+++ b/js/src/xpconnect/src/xpcthreadcontext.cpp
@@ -498,7 +498,7 @@ XPCPerThreadData::GetDataImpl(JSContext *cx)
 
     if(cx && !sMainJSThread && NS_IsMainThread())
     {
-        sMainJSThread = cx->thread;
+        sMainJSThread = cx->thread();
 
         sMainThreadData = data;
 
diff --git a/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
index 25d4fa366a94..24218d14a7f9 100644
--- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -575,7 +575,7 @@ GetContextFromObject(JSObject *obj)
     if(xpcc)
     {
         JSContext *cx = xpcc->GetJSContext();
-        if(cx->thread->id == js_CurrentThreadId())
+        if(cx->thread()->id == js_CurrentThreadId())
             return cx;
     }
 
diff --git a/js/src/xpconnect/wrappers/AccessCheck.cpp b/js/src/xpconnect/wrappers/AccessCheck.cpp
index f058c587e6af..22e896d7dbff 100644
--- a/js/src/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/src/xpconnect/wrappers/AccessCheck.cpp
@@ -49,6 +49,7 @@
 #include "FilteringWrapper.h"
 #include "WrapperFactory.h"
 
+#include "jsfriendapi.h"
 #include "jsstr.h"
 
 namespace xpc {
@@ -240,13 +241,13 @@ AccessCheck::documentDomainMakesSameOrigin(JSContext *cx, JSObject *obj)
     JSStackFrame *fp = nsnull;
     JS_FrameIterator(cx, &fp);
     if (fp) {
-        while (fp->isDummyFrame()) {
+        while (!JS_IsScriptFrame(cx, fp)) {
             if (!JS_FrameIterator(cx, &fp))
                 break;
         }
 
         if (fp)
-            scope = &fp->scopeChain();
+            scope = JS_GetFrameScopeChainRaw(fp);
     }
 
     if (!scope)

From 841c5efc7067995ab9274e8def7646a723ca5368 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 26 Apr 2011 13:39:59 -0700
Subject: [PATCH 501/509] Fix --disable-methodjit bustage (r=red)

---
 js/src/jsinterpinlines.h | 2 +-
 js/src/jstracer.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 276dfa32e9e8..9b1ec580afe2 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -146,7 +146,7 @@ InvokeSessionGuard::invoke(JSContext *cx) const
         ok = mjit::EnterMethodJIT(cx, fp, code, stackLimit_);
         cx->regs().pc = stop_;
 #else
-        cx->regs->pc = script_->code;
+        cx->regs().pc = script_->code;
         ok = Interpret(cx, cx->fp());
 #endif
         Probes::exitJSFun(cx, fp->fun(), script_);
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 582d4bd5bb73..ec67ba19a588 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -17387,7 +17387,7 @@ AbortProfiling(JSContext *cx)
 #else /* JS_METHODJIT */
 
 JS_REQUIRES_STACK MonitorResult
-MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, JSInterpMode interpMode)
+MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, InterpMode interpMode)
 {
     TraceMonitor *tm = JS_TRACE_MONITOR_FROM_CONTEXT(cx);
     return RecordLoopEdge(cx, tm, inlineCallCount);

From e059c006c3d80224101962f6a6640a8e76c68d92 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 26 Apr 2011 14:34:09 -0700
Subject: [PATCH 502/509] Fix linker error. I fixed this in the patch I pushed
 to try but seem to have lost it in the meantime (r=burning-windows)

---
 js/src/jscntxt.cpp | 2 +-
 js/src/jscntxt.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index e8a2283d85cb..2b6a2c681a6a 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -829,7 +829,7 @@ js_ReportOutOfScriptQuota(JSContext *maybecx)
         JS_ReportErrorNumber(maybecx, js_GetErrorMessage, NULL, JSMSG_SCRIPT_STACK_QUOTA);
 }
 
-void
+JS_FRIEND_API(void)
 js_ReportOverRecursed(JSContext *maybecx)
 {
     if (maybecx)
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index d87a2d1a60eb..4461ff3dd080 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -2265,7 +2265,8 @@ js_ReportOutOfMemory(JSContext *cx);
 void
 js_ReportOutOfScriptQuota(JSContext *maybecx);
 
-extern void
+/* JS_CHECK_RECURSION is used outside JS, so JS_FRIEND_API. */
+JS_FRIEND_API(void)
 js_ReportOverRecursed(JSContext *maybecx);
 
 extern JS_FRIEND_API(void)

From 433bca89fe7ebde87fd6e7c867f1cb1354837388 Mon Sep 17 00:00:00 2001
From: Chris Leary <cdleary@mozilla.com>
Date: Tue, 26 Apr 2011 12:11:11 -0700
Subject: [PATCH 503/509] Passing bug 646184 crashtest assertion. (r=dbaron)

---
 content/base/crashtests/crashtests.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
index 17db02d99676..1014af154939 100644
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -89,4 +89,4 @@ load 628599-1.html
 load 637214-1.svg
 load 637214-2.svg
 load 642022-1.html
-asserts(1) load 646184.html # Bug 651842
+load 646184.html

From 63ee7fd726db3f58e5a2b5abe6a834e16e611247 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 26 Apr 2011 16:05:58 -0400
Subject: [PATCH 504/509] Bug 650574 - No recursion checks converting a cyclic
 object to source, if the object's toSource hooks are built-in functions. 
 r=luke

--HG--
extra : rebase_source : 1d94c30c3a7335b1124e19020b8244a1de32aab3
---
 js/src/jsstr.cpp                              |  2 ++
 js/src/tests/ecma_5/extensions/jstests.list   |  1 +
 .../extensions/toSource-infinite-recursion.js | 34 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 js/src/tests/ecma_5/extensions/toSource-infinite-recursion.js

diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index c5176428ede9..07379675433c 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -3905,6 +3905,8 @@ js::ValueToStringBufferSlow(JSContext *cx, const Value &arg, StringBuffer &sb)
 JS_FRIEND_API(JSString *)
 js_ValueToSource(JSContext *cx, const Value &v)
 {
+    JS_CHECK_RECURSION(cx, return NULL);
+
     if (v.isUndefined())
         return cx->runtime->atomState.void0Atom;
     if (v.isString())
diff --git a/js/src/tests/ecma_5/extensions/jstests.list b/js/src/tests/ecma_5/extensions/jstests.list
index 3132c8e908e4..b269bfa739eb 100644
--- a/js/src/tests/ecma_5/extensions/jstests.list
+++ b/js/src/tests/ecma_5/extensions/jstests.list
@@ -23,6 +23,7 @@ script regress-bug629723.js
 script strict-function-statements.js
 script strict-option-redeclared-parameter.js
 script string-literal-getter-setter-decompilation.js
+script toSource-infinite-recursion.js
 script uneval-strict-functions.js
 script watch-array-length.js
 script watch-inherited-property.js
diff --git a/js/src/tests/ecma_5/extensions/toSource-infinite-recursion.js b/js/src/tests/ecma_5/extensions/toSource-infinite-recursion.js
new file mode 100644
index 000000000000..2ddcaa7529e4
--- /dev/null
+++ b/js/src/tests/ecma_5/extensions/toSource-infinite-recursion.js
@@ -0,0 +1,34 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 650574;
+var summary = 'Check for too-deep stack when converting a value to source';
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+try
+{
+  var e = Error('');
+  e.fileName = e;
+  e.toSource();
+  throw new Error("should have thrown");
+}
+catch (e)
+{
+  assertEq(e instanceof InternalError, true,
+           "should have thrown for over-recursion");
+}
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");

From 2ff89504078ef096b79cbd1c017ab4203bd7b8b8 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Mon, 18 Apr 2011 16:50:46 -0400
Subject: [PATCH 505/509] Bug 635389 - Check for overrecursion in functions
 that might need it.  r=jorendorff

--HG--
extra : rebase_source : 72d6f2c915a4aa19e9820ea4f66039f75421c32d
---
 js/src/jsarray.cpp                            |  8 +++-
 .../extensions/array-toString-recursion.js    | 46 +++++++++++++++++++
 js/src/tests/ecma_5/extensions/jstests.list   |  1 +
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 js/src/tests/ecma_5/extensions/array-toString-recursion.js

diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index cf7f23bf785b..6043e0117029 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1312,8 +1312,6 @@ static JSBool
 array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
                    JSString *sepstr, Value *rval)
 {
-    JS_CHECK_RECURSION(cx, return false);
-
     static const jschar comma = ',';
     const jschar *sep;
     size_t seplen;
@@ -1395,6 +1393,8 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
 static JSBool
 array_toString(JSContext *cx, uintN argc, Value *vp)
 {
+    JS_CHECK_RECURSION(cx, return false);
+
     JSObject *obj = ToObject(cx, &vp[1]);
     if (!obj)
         return false;
@@ -1429,6 +1429,8 @@ array_toString(JSContext *cx, uintN argc, Value *vp)
 static JSBool
 array_toLocaleString(JSContext *cx, uintN argc, Value *vp)
 {
+    JS_CHECK_RECURSION(cx, return false);
+
     JSObject *obj = ToObject(cx, &vp[1]);
     if (!obj)
         return false;
@@ -1526,6 +1528,8 @@ InitArrayObject(JSContext *cx, JSObject *obj, jsuint length, const Value *vector
 static JSBool
 array_join(JSContext *cx, uintN argc, Value *vp)
 {
+    JS_CHECK_RECURSION(cx, return false);
+
     JSString *str;
     if (argc == 0 || vp[2].isUndefined()) {
         str = NULL;
diff --git a/js/src/tests/ecma_5/extensions/array-toString-recursion.js b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
new file mode 100644
index 000000000000..aa5d856c3bf4
--- /dev/null
+++ b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
@@ -0,0 +1,46 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 635389;
+var summary = 'Infinite recursion via [].{toString,toLocaleString,join}';
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+try
+{
+  var x = [];
+  x.join = Array.prototype.toString;
+  "" + x;
+  throw new Error("should have thrown");
+}
+catch (e)
+{
+  assertEq(e instanceof InternalError, true,
+           "should have thrown for over-recursion");
+}
+
+try
+{
+  var x = { toString: Array.prototype.toString, join: Array.prototype.toString };
+  "" + x;
+  throw new Error("should have thrown");
+}
+catch (e)
+{
+  assertEq(e instanceof InternalError, true,
+           "should have thrown for over-recursion");
+}
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");
diff --git a/js/src/tests/ecma_5/extensions/jstests.list b/js/src/tests/ecma_5/extensions/jstests.list
index b269bfa739eb..bcd7fa0185b4 100644
--- a/js/src/tests/ecma_5/extensions/jstests.list
+++ b/js/src/tests/ecma_5/extensions/jstests.list
@@ -9,6 +9,7 @@ script bug352085.js
 script bug472534.js
 script bug496985.js
 script bug566661.js
+script array-toString-recursion.js
 skip-if(!xulRuntime.shell) script cross-global-eval-is-indirect.js # needs newGlobal()
 script eval-native-callback-is-indirect.js
 script extension-methods-reject-null-undefined-this.js

From 4b6928b810c5b98cfdd11c87a97423ba6c654cbe Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 18 Mar 2011 17:57:18 -0700
Subject: [PATCH 506/509] Bug 512266 - JSON.stringify for various special
 characters should produce the corresponding one-character escapes.  r=pbiggar

--HG--
extra : rebase_source : a76fb038143bd053ee9e30ae29e99d3c2e91c528
---
 js/src/json.cpp                               | 121 ++++++----
 js/src/tests/ecma_5/JSON/jstests.list         |   1 +
 .../ecma_5/JSON/stringify-special-escapes.js  | 227 ++++++++++++++++++
 3 files changed, 296 insertions(+), 53 deletions(-)
 create mode 100644 js/src/tests/ecma_5/JSON/stringify-special-escapes.js

diff --git a/js/src/json.cpp b/js/src/json.cpp
index 98f1f104da70..4d2a2f76e16e 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -181,47 +181,75 @@ js_TryJSON(JSContext *cx, Value *vp)
 }
 
 
-static const char quote = '\"';
-static const char backslash = '\\';
-static const char unicodeEscape[] = "\\u00";
-
-static JSBool
-write_string(JSContext *cx, StringBuffer &sb, const jschar *buf, uint32 len)
+static inline bool IsQuoteSpecialCharacter(jschar c)
 {
-    if (!sb.append(quote))
-        return JS_FALSE;
+    JS_STATIC_ASSERT('\b' < ' ');
+    JS_STATIC_ASSERT('\f' < ' ');
+    JS_STATIC_ASSERT('\n' < ' ');
+    JS_STATIC_ASSERT('\r' < ' ');
+    JS_STATIC_ASSERT('\t' < ' ');
+    return c == '"' || c == '\\' || c < ' ';
+}
 
-    uint32 mark = 0;
-    uint32 i;
-    for (i = 0; i < len; ++i) {
-        if (buf[i] == quote || buf[i] == backslash) {
-            if (!sb.append(&buf[mark], i - mark) || !sb.append(backslash) ||
-                !sb.append(buf[i])) {
-                return JS_FALSE;
-            }
-            mark = i + 1;
-        } else if (buf[i] <= 31 || buf[i] == 127) {
-            if (!sb.append(&buf[mark], i - mark) ||
-                !sb.append(unicodeEscape)) {
-                return JS_FALSE;
-            }
-            char ubuf[3];
-            size_t len = JS_snprintf(ubuf, sizeof(ubuf), "%.2x", buf[i]);
-            JS_ASSERT(len == 2);
-            jschar wbuf[3];
-            size_t wbufSize = JS_ARRAY_LENGTH(wbuf);
-            if (!js_InflateStringToBuffer(cx, ubuf, len, wbuf, &wbufSize) ||
-                !sb.append(wbuf, wbufSize)) {
-                return JS_FALSE;
-            }
-            mark = i + 1;
+/* ES5 15.12.3 Quote. */
+static bool
+Quote(JSContext *cx, StringBuffer &sb, JSString *str)
+{
+    JS::Anchor<JSString *> anchor(str);
+    size_t len = str->length();
+    const jschar *buf = str->getChars(cx);
+    if (!buf)
+        return false;
+
+    /* Step 1. */
+    if (!sb.append('"'))
+        return false;
+
+    /* Step 2. */
+    for (size_t i = 0; i < len; ++i) {
+        /* Batch-append maximal character sequences containing no escapes. */
+        size_t mark = i;
+        do {
+            if (IsQuoteSpecialCharacter(buf[i]))
+                break;
+        } while (++i < len);
+        if (i > mark) {
+            if (!sb.append(&buf[mark], i - mark))
+                return false;
+            if (i == len)
+                break;
+        }
+
+        jschar c = buf[i];
+        if (c == '"' || c == '\\') {
+            if (!sb.append('\\') || !sb.append(c))
+                return false;
+        } else if (c == '\b' || c == '\f' || c == '\n' || c == '\r' || c == '\t') {
+           jschar abbrev = (c == '\b')
+                         ? 'b'
+                         : (c == '\f')
+                         ? 'f'
+                         : (c == '\n')
+                         ? 'n'
+                         : (c == '\r')
+                         ? 'r'
+                         : 't';
+           if (!sb.append('\\') || !sb.append(abbrev))
+               return false;
+           mark = i + 1;
+        } else {
+            JS_ASSERT(c < ' ');
+            if (!sb.append("\\u00"))
+                return false;
+            JS_ASSERT((c >> 4) < 10);
+            uint8 x = c >> 4, y = c % 16;
+            if (!sb.append('0' + x) || !sb.append(y < 10 ? '0' + y : 'a' + (y - 10)))
+                return false;
         }
     }
 
-    if (mark < len && !sb.append(&buf[mark], len - mark))
-        return JS_FALSE;
-
-    return sb.append(quote);
+    /* Steps 3-4. */
+    return sb.append('"');
 }
 
 class StringifyContext
@@ -493,18 +521,11 @@ JO(JSContext *cx, JSObject *obj, StringifyContext *scx)
         if (!WriteIndent(cx, scx, scx->depth))
             return JS_FALSE;
 
-        // Be careful below: this string is weakly rooted!
-        JSString *s = js_ValueToString(cx, IdToValue(id));
+        JSString *s = IdToString(cx, id);
         if (!s)
             return JS_FALSE;
 
-        JS::Anchor<JSString *> anchor(s);
-        size_t length = s->length();
-        const jschar *chars = s->getChars(cx);
-        if (!chars)
-            return JS_FALSE;
-
-        if (!write_string(cx, scx->sb, chars, length) ||
+        if (!Quote(cx, scx->sb, s) ||
             !scx->sb.append(':') ||
             !(scx->gap.empty() || scx->sb.append(' ')) ||
             !Str(cx, outputValue, scx)) {
@@ -613,14 +634,8 @@ Str(JSContext *cx, const Value &v, StringifyContext *scx)
      */
 
     /* Step 8. */
-    if (v.isString()) {
-        JSString *str = v.toString();
-        size_t length = str->length();
-        const jschar *chars = str->getChars(cx);
-        if (!chars)
-            return false;
-        return write_string(cx, scx->sb, chars, length);
-    }
+    if (v.isString())
+        return Quote(cx, scx->sb, v.toString());
 
     /* Step 5. */
     if (v.isNull())
diff --git a/js/src/tests/ecma_5/JSON/jstests.list b/js/src/tests/ecma_5/JSON/jstests.list
index 9ac0dd285892..0a15762932ea 100644
--- a/js/src/tests/ecma_5/JSON/jstests.list
+++ b/js/src/tests/ecma_5/JSON/jstests.list
@@ -17,6 +17,7 @@ script stringify-ignore-noncallable-toJSON.js
 script stringify-primitives.js
 script stringify-replacer.js
 script stringify-replacer-with-array-indexes.js
+script stringify-special-escapes.js
 script stringify-toJSON-arguments.js
 script trailing-comma.js
 
diff --git a/js/src/tests/ecma_5/JSON/stringify-special-escapes.js b/js/src/tests/ecma_5/JSON/stringify-special-escapes.js
new file mode 100644
index 000000000000..cf3d8c28e0bc
--- /dev/null
+++ b/js/src/tests/ecma_5/JSON/stringify-special-escapes.js
@@ -0,0 +1,227 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+
+var gTestfile = 'stringify-special-escapes.js';
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 512266;
+var summary =
+  "JSON.stringify of \\b\\f\\n\\r\\t should use one-character escapes, not hex";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+assertEq(JSON.stringify("\u0000"), '"\\u0000"');
+assertEq(JSON.stringify("\u0001"), '"\\u0001"');
+assertEq(JSON.stringify("\u0002"), '"\\u0002"');
+assertEq(JSON.stringify("\u0003"), '"\\u0003"');
+assertEq(JSON.stringify("\u0004"), '"\\u0004"');
+assertEq(JSON.stringify("\u0005"), '"\\u0005"');
+assertEq(JSON.stringify("\u0006"), '"\\u0006"');
+assertEq(JSON.stringify("\u0007"), '"\\u0007"');
+assertEq(JSON.stringify("\u0008"), '"\\b"');
+assertEq(JSON.stringify("\u0009"), '"\\t"');
+assertEq(JSON.stringify("\u000A"), '"\\n"');
+assertEq(JSON.stringify("\u000B"), '"\\u000b"');
+assertEq(JSON.stringify("\u000C"), '"\\f"');
+assertEq(JSON.stringify("\u000D"), '"\\r"');
+assertEq(JSON.stringify("\u000E"), '"\\u000e"');
+assertEq(JSON.stringify("\u000F"), '"\\u000f"');
+assertEq(JSON.stringify("\u0010"), '"\\u0010"');
+assertEq(JSON.stringify("\u0011"), '"\\u0011"');
+assertEq(JSON.stringify("\u0012"), '"\\u0012"');
+assertEq(JSON.stringify("\u0013"), '"\\u0013"');
+assertEq(JSON.stringify("\u0014"), '"\\u0014"');
+assertEq(JSON.stringify("\u0015"), '"\\u0015"');
+assertEq(JSON.stringify("\u0016"), '"\\u0016"');
+assertEq(JSON.stringify("\u0017"), '"\\u0017"');
+assertEq(JSON.stringify("\u0018"), '"\\u0018"');
+assertEq(JSON.stringify("\u0019"), '"\\u0019"');
+assertEq(JSON.stringify("\u001A"), '"\\u001a"');
+assertEq(JSON.stringify("\u001B"), '"\\u001b"');
+assertEq(JSON.stringify("\u001C"), '"\\u001c"');
+assertEq(JSON.stringify("\u001D"), '"\\u001d"');
+assertEq(JSON.stringify("\u001E"), '"\\u001e"');
+assertEq(JSON.stringify("\u001F"), '"\\u001f"');
+assertEq(JSON.stringify("\u0020"), '" "');
+
+assertEq(JSON.stringify("\\u0000"), '"\\\\u0000"');
+assertEq(JSON.stringify("\\u0001"), '"\\\\u0001"');
+assertEq(JSON.stringify("\\u0002"), '"\\\\u0002"');
+assertEq(JSON.stringify("\\u0003"), '"\\\\u0003"');
+assertEq(JSON.stringify("\\u0004"), '"\\\\u0004"');
+assertEq(JSON.stringify("\\u0005"), '"\\\\u0005"');
+assertEq(JSON.stringify("\\u0006"), '"\\\\u0006"');
+assertEq(JSON.stringify("\\u0007"), '"\\\\u0007"');
+assertEq(JSON.stringify("\\u0008"), '"\\\\u0008"');
+assertEq(JSON.stringify("\\u0009"), '"\\\\u0009"');
+assertEq(JSON.stringify("\\u000A"), '"\\\\u000A"');
+assertEq(JSON.stringify("\\u000B"), '"\\\\u000B"');
+assertEq(JSON.stringify("\\u000C"), '"\\\\u000C"');
+assertEq(JSON.stringify("\\u000D"), '"\\\\u000D"');
+assertEq(JSON.stringify("\\u000E"), '"\\\\u000E"');
+assertEq(JSON.stringify("\\u000F"), '"\\\\u000F"');
+assertEq(JSON.stringify("\\u0010"), '"\\\\u0010"');
+assertEq(JSON.stringify("\\u0011"), '"\\\\u0011"');
+assertEq(JSON.stringify("\\u0012"), '"\\\\u0012"');
+assertEq(JSON.stringify("\\u0013"), '"\\\\u0013"');
+assertEq(JSON.stringify("\\u0014"), '"\\\\u0014"');
+assertEq(JSON.stringify("\\u0015"), '"\\\\u0015"');
+assertEq(JSON.stringify("\\u0016"), '"\\\\u0016"');
+assertEq(JSON.stringify("\\u0017"), '"\\\\u0017"');
+assertEq(JSON.stringify("\\u0018"), '"\\\\u0018"');
+assertEq(JSON.stringify("\\u0019"), '"\\\\u0019"');
+assertEq(JSON.stringify("\\u001A"), '"\\\\u001A"');
+assertEq(JSON.stringify("\\u001B"), '"\\\\u001B"');
+assertEq(JSON.stringify("\\u001C"), '"\\\\u001C"');
+assertEq(JSON.stringify("\\u001D"), '"\\\\u001D"');
+assertEq(JSON.stringify("\\u001E"), '"\\\\u001E"');
+assertEq(JSON.stringify("\\u001F"), '"\\\\u001F"');
+assertEq(JSON.stringify("\\u0020"), '"\\\\u0020"');
+
+
+assertEq(JSON.stringify("a\u0000"), '"a\\u0000"');
+assertEq(JSON.stringify("a\u0001"), '"a\\u0001"');
+assertEq(JSON.stringify("a\u0002"), '"a\\u0002"');
+assertEq(JSON.stringify("a\u0003"), '"a\\u0003"');
+assertEq(JSON.stringify("a\u0004"), '"a\\u0004"');
+assertEq(JSON.stringify("a\u0005"), '"a\\u0005"');
+assertEq(JSON.stringify("a\u0006"), '"a\\u0006"');
+assertEq(JSON.stringify("a\u0007"), '"a\\u0007"');
+assertEq(JSON.stringify("a\u0008"), '"a\\b"');
+assertEq(JSON.stringify("a\u0009"), '"a\\t"');
+assertEq(JSON.stringify("a\u000A"), '"a\\n"');
+assertEq(JSON.stringify("a\u000B"), '"a\\u000b"');
+assertEq(JSON.stringify("a\u000C"), '"a\\f"');
+assertEq(JSON.stringify("a\u000D"), '"a\\r"');
+assertEq(JSON.stringify("a\u000E"), '"a\\u000e"');
+assertEq(JSON.stringify("a\u000F"), '"a\\u000f"');
+assertEq(JSON.stringify("a\u0010"), '"a\\u0010"');
+assertEq(JSON.stringify("a\u0011"), '"a\\u0011"');
+assertEq(JSON.stringify("a\u0012"), '"a\\u0012"');
+assertEq(JSON.stringify("a\u0013"), '"a\\u0013"');
+assertEq(JSON.stringify("a\u0014"), '"a\\u0014"');
+assertEq(JSON.stringify("a\u0015"), '"a\\u0015"');
+assertEq(JSON.stringify("a\u0016"), '"a\\u0016"');
+assertEq(JSON.stringify("a\u0017"), '"a\\u0017"');
+assertEq(JSON.stringify("a\u0018"), '"a\\u0018"');
+assertEq(JSON.stringify("a\u0019"), '"a\\u0019"');
+assertEq(JSON.stringify("a\u001A"), '"a\\u001a"');
+assertEq(JSON.stringify("a\u001B"), '"a\\u001b"');
+assertEq(JSON.stringify("a\u001C"), '"a\\u001c"');
+assertEq(JSON.stringify("a\u001D"), '"a\\u001d"');
+assertEq(JSON.stringify("a\u001E"), '"a\\u001e"');
+assertEq(JSON.stringify("a\u001F"), '"a\\u001f"');
+assertEq(JSON.stringify("a\u0020"), '"a "');
+
+assertEq(JSON.stringify("a\\u0000"), '"a\\\\u0000"');
+assertEq(JSON.stringify("a\\u0001"), '"a\\\\u0001"');
+assertEq(JSON.stringify("a\\u0002"), '"a\\\\u0002"');
+assertEq(JSON.stringify("a\\u0003"), '"a\\\\u0003"');
+assertEq(JSON.stringify("a\\u0004"), '"a\\\\u0004"');
+assertEq(JSON.stringify("a\\u0005"), '"a\\\\u0005"');
+assertEq(JSON.stringify("a\\u0006"), '"a\\\\u0006"');
+assertEq(JSON.stringify("a\\u0007"), '"a\\\\u0007"');
+assertEq(JSON.stringify("a\\u0008"), '"a\\\\u0008"');
+assertEq(JSON.stringify("a\\u0009"), '"a\\\\u0009"');
+assertEq(JSON.stringify("a\\u000A"), '"a\\\\u000A"');
+assertEq(JSON.stringify("a\\u000B"), '"a\\\\u000B"');
+assertEq(JSON.stringify("a\\u000C"), '"a\\\\u000C"');
+assertEq(JSON.stringify("a\\u000D"), '"a\\\\u000D"');
+assertEq(JSON.stringify("a\\u000E"), '"a\\\\u000E"');
+assertEq(JSON.stringify("a\\u000F"), '"a\\\\u000F"');
+assertEq(JSON.stringify("a\\u0010"), '"a\\\\u0010"');
+assertEq(JSON.stringify("a\\u0011"), '"a\\\\u0011"');
+assertEq(JSON.stringify("a\\u0012"), '"a\\\\u0012"');
+assertEq(JSON.stringify("a\\u0013"), '"a\\\\u0013"');
+assertEq(JSON.stringify("a\\u0014"), '"a\\\\u0014"');
+assertEq(JSON.stringify("a\\u0015"), '"a\\\\u0015"');
+assertEq(JSON.stringify("a\\u0016"), '"a\\\\u0016"');
+assertEq(JSON.stringify("a\\u0017"), '"a\\\\u0017"');
+assertEq(JSON.stringify("a\\u0018"), '"a\\\\u0018"');
+assertEq(JSON.stringify("a\\u0019"), '"a\\\\u0019"');
+assertEq(JSON.stringify("a\\u001A"), '"a\\\\u001A"');
+assertEq(JSON.stringify("a\\u001B"), '"a\\\\u001B"');
+assertEq(JSON.stringify("a\\u001C"), '"a\\\\u001C"');
+assertEq(JSON.stringify("a\\u001D"), '"a\\\\u001D"');
+assertEq(JSON.stringify("a\\u001E"), '"a\\\\u001E"');
+assertEq(JSON.stringify("a\\u001F"), '"a\\\\u001F"');
+assertEq(JSON.stringify("a\\u0020"), '"a\\\\u0020"');
+
+
+assertEq(JSON.stringify("\u0000Q"), '"\\u0000Q"');
+assertEq(JSON.stringify("\u0001Q"), '"\\u0001Q"');
+assertEq(JSON.stringify("\u0002Q"), '"\\u0002Q"');
+assertEq(JSON.stringify("\u0003Q"), '"\\u0003Q"');
+assertEq(JSON.stringify("\u0004Q"), '"\\u0004Q"');
+assertEq(JSON.stringify("\u0005Q"), '"\\u0005Q"');
+assertEq(JSON.stringify("\u0006Q"), '"\\u0006Q"');
+assertEq(JSON.stringify("\u0007Q"), '"\\u0007Q"');
+assertEq(JSON.stringify("\u0008Q"), '"\\bQ"');
+assertEq(JSON.stringify("\u0009Q"), '"\\tQ"');
+assertEq(JSON.stringify("\u000AQ"), '"\\nQ"');
+assertEq(JSON.stringify("\u000BQ"), '"\\u000bQ"');
+assertEq(JSON.stringify("\u000CQ"), '"\\fQ"');
+assertEq(JSON.stringify("\u000DQ"), '"\\rQ"');
+assertEq(JSON.stringify("\u000EQ"), '"\\u000eQ"');
+assertEq(JSON.stringify("\u000FQ"), '"\\u000fQ"');
+assertEq(JSON.stringify("\u0010Q"), '"\\u0010Q"');
+assertEq(JSON.stringify("\u0011Q"), '"\\u0011Q"');
+assertEq(JSON.stringify("\u0012Q"), '"\\u0012Q"');
+assertEq(JSON.stringify("\u0013Q"), '"\\u0013Q"');
+assertEq(JSON.stringify("\u0014Q"), '"\\u0014Q"');
+assertEq(JSON.stringify("\u0015Q"), '"\\u0015Q"');
+assertEq(JSON.stringify("\u0016Q"), '"\\u0016Q"');
+assertEq(JSON.stringify("\u0017Q"), '"\\u0017Q"');
+assertEq(JSON.stringify("\u0018Q"), '"\\u0018Q"');
+assertEq(JSON.stringify("\u0019Q"), '"\\u0019Q"');
+assertEq(JSON.stringify("\u001AQ"), '"\\u001aQ"');
+assertEq(JSON.stringify("\u001BQ"), '"\\u001bQ"');
+assertEq(JSON.stringify("\u001CQ"), '"\\u001cQ"');
+assertEq(JSON.stringify("\u001DQ"), '"\\u001dQ"');
+assertEq(JSON.stringify("\u001EQ"), '"\\u001eQ"');
+assertEq(JSON.stringify("\u001FQ"), '"\\u001fQ"');
+assertEq(JSON.stringify("\u0020Q"), '" Q"');
+
+assertEq(JSON.stringify("\\u0000Q"), '"\\\\u0000Q"');
+assertEq(JSON.stringify("\\u0001Q"), '"\\\\u0001Q"');
+assertEq(JSON.stringify("\\u0002Q"), '"\\\\u0002Q"');
+assertEq(JSON.stringify("\\u0003Q"), '"\\\\u0003Q"');
+assertEq(JSON.stringify("\\u0004Q"), '"\\\\u0004Q"');
+assertEq(JSON.stringify("\\u0005Q"), '"\\\\u0005Q"');
+assertEq(JSON.stringify("\\u0006Q"), '"\\\\u0006Q"');
+assertEq(JSON.stringify("\\u0007Q"), '"\\\\u0007Q"');
+assertEq(JSON.stringify("\\u0008Q"), '"\\\\u0008Q"');
+assertEq(JSON.stringify("\\u0009Q"), '"\\\\u0009Q"');
+assertEq(JSON.stringify("\\u000AQ"), '"\\\\u000AQ"');
+assertEq(JSON.stringify("\\u000BQ"), '"\\\\u000BQ"');
+assertEq(JSON.stringify("\\u000CQ"), '"\\\\u000CQ"');
+assertEq(JSON.stringify("\\u000DQ"), '"\\\\u000DQ"');
+assertEq(JSON.stringify("\\u000EQ"), '"\\\\u000EQ"');
+assertEq(JSON.stringify("\\u000FQ"), '"\\\\u000FQ"');
+assertEq(JSON.stringify("\\u0010Q"), '"\\\\u0010Q"');
+assertEq(JSON.stringify("\\u0011Q"), '"\\\\u0011Q"');
+assertEq(JSON.stringify("\\u0012Q"), '"\\\\u0012Q"');
+assertEq(JSON.stringify("\\u0013Q"), '"\\\\u0013Q"');
+assertEq(JSON.stringify("\\u0014Q"), '"\\\\u0014Q"');
+assertEq(JSON.stringify("\\u0015Q"), '"\\\\u0015Q"');
+assertEq(JSON.stringify("\\u0016Q"), '"\\\\u0016Q"');
+assertEq(JSON.stringify("\\u0017Q"), '"\\\\u0017Q"');
+assertEq(JSON.stringify("\\u0018Q"), '"\\\\u0018Q"');
+assertEq(JSON.stringify("\\u0019Q"), '"\\\\u0019Q"');
+assertEq(JSON.stringify("\\u001AQ"), '"\\\\u001AQ"');
+assertEq(JSON.stringify("\\u001BQ"), '"\\\\u001BQ"');
+assertEq(JSON.stringify("\\u001CQ"), '"\\\\u001CQ"');
+assertEq(JSON.stringify("\\u001DQ"), '"\\\\u001DQ"');
+assertEq(JSON.stringify("\\u001EQ"), '"\\\\u001EQ"');
+assertEq(JSON.stringify("\\u001FQ"), '"\\\\u001FQ"');
+assertEq(JSON.stringify("\\u0020Q"), '"\\\\u0020Q"');
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");

From 6651742a726c4d72cf56bf01f883dc1801c9ba4f Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Sat, 2 Apr 2011 11:33:20 -0700
Subject: [PATCH 507/509] Bug 647385 - Implement a ToInteger helper that
 corresponds to the spec method (rather than inlining its contents everywhere
 it can be trivially used).  Also fixes a couple bugs in one place that should
 have used ToInteger but didn't.  r=cdleary

---
 js/src/js.msg                                 |  2 +-
 js/src/jsarray.cpp                            | 23 ++++------
 js/src/jsnum.cpp                              | 24 +++++------
 js/src/jsnum.h                                | 20 +++++++++
 js/src/json.cpp                               |  5 +--
 js/src/jsregexp.cpp                           | 11 +----
 js/src/jsstr.cpp                              | 42 ++++++-------------
 js/src/tests/ecma_5/Number/jstests.list       |  1 +
 .../ecma_5/Number/toString-radix-handling.js  | 37 ++++++++++++++++
 9 files changed, 96 insertions(+), 69 deletions(-)
 create mode 100644 js/src/tests/ecma_5/Number/toString-radix-handling.js

diff --git a/js/src/js.msg b/js/src/js.msg
index 36de8ed00625..957e3496ef94 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -112,7 +112,7 @@ MSG_DEF(JSMSG_BAD_SHARP_DEF,           29, 1, JSEXN_ERR, "invalid sharp variable
 MSG_DEF(JSMSG_BAD_SHARP_USE,           30, 1, JSEXN_ERR, "invalid sharp variable use #{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, 1, JSEXN_ERR, "illegal radix {0}")
+MSG_DEF(JSMSG_BAD_RADIX,               33, 0, JSEXN_RANGEERR, "radix must be an integer at least 2 and no greater than 36")
 MSG_DEF(JSMSG_PAREN_BEFORE_LET,        34, 0, JSEXN_SYNTAXERR, "missing ( before let head")
 MSG_DEF(JSMSG_CANT_CONVERT,            35, 1, JSEXN_ERR, "can't convert {0} to an integer")
 MSG_DEF(JSMSG_CYCLIC_VALUE,            36, 1, JSEXN_TYPEERR, "cyclic {0} value")
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 6043e0117029..bf5dad120b44 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2400,9 +2400,8 @@ array_splice(JSContext *cx, uintN argc, Value *vp)
 
     /* Convert the first argument into a starting index. */
     jsdouble d;
-    if (!ValueToNumber(cx, *argv, &d))
+    if (!ToInteger(cx, *argv, &d))
         return JS_FALSE;
-    d = js_DoubleToInteger(d);
     if (d < 0) {
         d += length;
         if (d < 0)
@@ -2420,9 +2419,8 @@ array_splice(JSContext *cx, uintN argc, Value *vp)
         count = delta;
         end = length;
     } else {
-        if (!ValueToNumber(cx, *argv, &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
+        if (!ToInteger(cx, *argv, &d))
+            return false;
         if (d < 0)
             d = 0;
         else if (d > delta)
@@ -2644,9 +2642,8 @@ array_slice(JSContext *cx, uintN argc, Value *vp)
 
     if (argc > 0) {
         jsdouble d;
-        if (!ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
+        if (!ToInteger(cx, argv[0], &d))
+            return false;
         if (d < 0) {
             d += length;
             if (d < 0)
@@ -2657,9 +2654,8 @@ array_slice(JSContext *cx, uintN argc, Value *vp)
         begin = (jsuint)d;
 
         if (argc > 1 && !argv[1].isUndefined()) {
-            if (!ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-            d = js_DoubleToInteger(d);
+            if (!ToInteger(cx, argv[1], &d))
+                return false;
             if (d < 0) {
                 d += length;
                 if (d < 0)
@@ -2727,9 +2723,8 @@ array_indexOfHelper(JSContext *cx, JSBool isLast, uintN argc, Value *vp)
         jsdouble start;
 
         tosearch = vp[2];
-        if (!ValueToNumber(cx, vp[3], &start))
-            return JS_FALSE;
-        start = js_DoubleToInteger(start);
+        if (!ToInteger(cx, vp[3], &start))
+            return false;
         if (start < 0) {
             start += length;
             if (start < 0) {
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 6b48af02a851..73fb0c0942ba 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -700,19 +700,18 @@ num_toString(JSContext *cx, uintN argc, Value *vp)
     if (!GetPrimitiveThis(cx, vp, &d))
         return false;
 
-    int32_t base = 10;
+    int32 base = 10;
     if (argc != 0 && !vp[2].isUndefined()) {
-        if (!ValueToECMAInt32(cx, vp[2], &base))
-            return JS_FALSE;
+        jsdouble d2;
+        if (!ToInteger(cx, vp[2], &d2))
+            return false;
 
-        if (base < 2 || base > 36) {
-            ToCStringBuf cbuf;
-            char *numStr = IntToCString(&cbuf, base);   /* convert the base itself to a string */
-            JS_ASSERT(numStr);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_RADIX,
-                                 numStr);
-            return JS_FALSE;
+        if (d2 < 2 || d2 > 36) {
+            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_RADIX);
+            return false;
         }
+
+        base = int32(d2);
     }
     JSString *str = js_NumberToStringWithBase(cx, d, base);
     if (!str) {
@@ -874,9 +873,8 @@ num_to(JSContext *cx, JSDToStrMode zeroArgMode, JSDToStrMode oneArgMode,
         precision = 0.0;
         oneArgMode = zeroArgMode;
     } else {
-        if (!ValueToNumber(cx, vp[2], &precision))
-            return JS_FALSE;
-        precision = js_DoubleToInteger(precision);
+        if (!ToInteger(cx, vp[2], &precision))
+            return false;
         if (precision < precisionMin || precision > precisionMax) {
             ToCStringBuf cbuf;
             numStr = IntToCString(&cbuf, jsint(precision));
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 7b38f192422d..5d06bc2f3447 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -703,6 +703,26 @@ StringToNumberType(JSContext *cx, JSString *str, T *result)
     *result = NumberTraits<T>::toSelfType(d);
     return true;
 }
+
+/* ES5 9.4 ToInteger. */
+static inline bool
+ToInteger(JSContext *cx, const js::Value &v, jsdouble *dp)
+{
+    if (v.isInt32()) {
+        *dp = v.toInt32();
+        return true;
+    }
+    if (v.isDouble()) {
+        *dp = v.toDouble();
+    } else {
+        extern bool ValueToNumberSlow(JSContext *cx, js::Value v, double *dp);
+        if (!ValueToNumberSlow(cx, v, dp))
+            return false;
+    }
+    *dp = js_DoubleToInteger(*dp);
+    return true;
 }
 
+} /* namespace js */
+
 #endif /* jsnum_h___ */
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 4d2a2f76e16e..1412a3899eb3 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -275,9 +275,8 @@ public:
             if (gap.length() > 10)
                 gap.resize(10);
         } else if (gapValue.value().isNumber()) {
-            jsdouble d = gapValue.value().isInt32()
-                         ? gapValue.value().toInt32()
-                         : js_DoubleToInteger(gapValue.value().toDouble());
+            jsdouble d;
+            JS_ALWAYS_TRUE(ToInteger(cx, gapValue.value(), &d));
             d = JS_MIN(10, d);
             if (d >= 1 && !gap.appendN(' ', uint32(d)))
                 return false;
diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp
index 40ca19a25fd1..0df8ae536a47 100644
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@@ -678,15 +678,8 @@ ExecuteRegExp(JSContext *cx, ExecType execType, uintN argc, Value *vp)
 
     /* Step 5. */
     jsdouble i;
-    if (lastIndex.isInt32()) {
-        i = lastIndex.toInt32();
-    } else {
-        if (lastIndex.isDouble())
-            i = lastIndex.toDouble();
-        else if (!ValueToNumber(cx, lastIndex, &i))
-            return false;
-        i = js_DoubleToInteger(i);
-    }
+    if (!ToInteger(cx, lastIndex, &i))
+        return false;
 
     /* Steps 6-7 (with sticky extension). */
     if (!re->global() && !re->sticky())
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 07379675433c..b23127e85ce2 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -881,11 +881,8 @@ ValueToIntegerRange(JSContext *cx, const Value &v, int32 *out)
         *out = v.toInt32();
     } else {
         double d;
-
-        if (!ValueToNumber(cx, v, &d))
+        if (!ToInteger(cx, v, &d))
             return false;
-
-        d = js_DoubleToInteger(d);
         if (d > INT32_MAX)
             *out = INT32_MAX;
         else if (d < INT32_MIN)
@@ -1085,14 +1082,9 @@ js_str_charAt(JSContext *cx, uintN argc, Value *vp)
         if (!str)
             return false;
 
-        double d;
-        if (argc == 0) {
-            d = 0.0;
-        } else {
-            if (!ValueToNumber(cx, vp[2], &d))
-                return false;
-            d = js_DoubleToInteger(d);
-        }
+        double d = 0.0;
+        if (argc > 0 && !ToInteger(cx, vp[2], &d))
+            return false;
 
         if (d < 0 || str->length() <= d)
             goto out_of_range;
@@ -1125,14 +1117,9 @@ js_str_charCodeAt(JSContext *cx, uintN argc, Value *vp)
         if (!str)
             return false;
 
-        double d;
-        if (argc == 0) {
-            d = 0.0;
-        } else {
-            if (!ValueToNumber(cx, vp[2], &d))
-                return false;
-            d = js_DoubleToInteger(d);
-        }
+        double d = 0.0;
+        if (argc > 0 && !ToInteger(cx, vp[2], &d))
+            return false;
 
         if (d < 0 || str->length() <= d)
             goto out_of_range;
@@ -1467,9 +1454,8 @@ str_indexOf(JSContext *cx, uintN argc, Value *vp)
             }
         } else {
             jsdouble d;
-            if (!ValueToNumber(cx, vp[3], &d))
-                return JS_FALSE;
-            d = js_DoubleToInteger(d);
+            if (!ToInteger(cx, vp[3], &d))
+                return false;
             if (d <= 0) {
                 start = 0;
             } else if (d > textlen) {
@@ -2994,9 +2980,8 @@ str_slice(JSContext *cx, uintN argc, Value *vp)
     if (argc != 0) {
         double begin, end, length;
 
-        if (!ValueToNumber(cx, vp[2], &begin))
-            return JS_FALSE;
-        begin = js_DoubleToInteger(begin);
+        if (!ToInteger(cx, vp[2], &begin))
+            return false;
         length = str->length();
         if (begin < 0) {
             begin += length;
@@ -3009,9 +2994,8 @@ str_slice(JSContext *cx, uintN argc, Value *vp)
         if (argc == 1 || vp[3].isUndefined()) {
             end = length;
         } else {
-            if (!ValueToNumber(cx, vp[3], &end))
-                return JS_FALSE;
-            end = js_DoubleToInteger(end);
+            if (!ToInteger(cx, vp[3], &end))
+                return false;
             if (end < 0) {
                 end += length;
                 if (end < 0)
diff --git a/js/src/tests/ecma_5/Number/jstests.list b/js/src/tests/ecma_5/Number/jstests.list
index b08bee3790ee..1542e21f00d6 100644
--- a/js/src/tests/ecma_5/Number/jstests.list
+++ b/js/src/tests/ecma_5/Number/jstests.list
@@ -1,2 +1,3 @@
 url-prefix ../../jsreftest.html?test=ecma_5/Number/
 script 15.7.4.2.js
+script toString-radix-handling.js
diff --git a/js/src/tests/ecma_5/Number/toString-radix-handling.js b/js/src/tests/ecma_5/Number/toString-radix-handling.js
new file mode 100644
index 000000000000..dd91675a27ca
--- /dev/null
+++ b/js/src/tests/ecma_5/Number/toString-radix-handling.js
@@ -0,0 +1,37 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommonn.org/licenses/publicdomain/
+ */
+
+var BUGNUMBER = 647385;
+var summary =
+  "Number.prototype.toString should use ToInteger on the radix and should " +
+  "throw a RangeError if the radix is bad";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+function test(r)
+{
+  try
+  {
+    5..toString(r);
+    throw "should have thrown";
+  }
+  catch (e)
+  {
+    assertEq(e instanceof RangeError, true, "expected a RangeError, got " + e);
+  }
+}
+test(Math.pow(2, 32) + 10);
+test(55);
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");

From fd6f6143749cb1537e4943f90ed417f7beb62ba8 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Fri, 22 Apr 2011 04:38:24 +0930
Subject: [PATCH 508/509] Bug 564577 - __noSuchMethod__ no longer invoked for
 defined non-function properties (r=igor)

---
 js/src/jsinterp.cpp                           |  4 +-
 js/src/methodjit/PolyIC.cpp                   |  4 +-
 js/src/methodjit/StubCalls.cpp                |  4 +-
 js/src/tests/js1_5/extensions/jstests.list    |  1 +
 .../tests/js1_5/extensions/regress-564577.js  | 79 +++++++++++++++++++
 5 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 js/src/tests/js1_5/extensions/regress-564577.js

diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 2ab8b859358b..fb2c1a5b856b 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4198,7 +4198,7 @@ BEGIN_CASE(JSOP_CALLPROP)
         }
     }
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
+    if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
         LOAD_ATOM(0, atom);
         regs.sp[-2].setString(atom);
         if (!js_OnUnknownMethod(cx, regs.sp - 2))
@@ -4458,7 +4458,7 @@ BEGIN_CASE(JSOP_CALLELEM)
         goto error;
 
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(regs.sp[-2].isUndefined()) && thisv.isObject()) {
+    if (JS_UNLIKELY(regs.sp[-2].isPrimitive()) && thisv.isObject()) {
         /* For js_OnUnknownMethod, sp[-2] is the index, and sp[-1] is the object missing it. */
         regs.sp[-2] = regs.sp[-1];
         regs.sp[-1].setObject(*thisObj);
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index 5f003b3b2570..4dc89e596315 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -1850,7 +1850,7 @@ ic::CallProp(VMFrame &f, ic::PICInfo *pic)
     }
 
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
+    if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
         regs.sp[-2].setString(pic->atom);
         if (!js_OnUnknownMethod(cx, regs.sp - 2))
             THROW();
@@ -2369,7 +2369,7 @@ ic::CallElement(VMFrame &f, ic::GetElementIC *ic)
         THROW();
 
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(f.regs.sp[-2].isUndefined()) && thisv.isObject()) {
+    if (JS_UNLIKELY(f.regs.sp[-2].isPrimitive()) && thisv.isObject()) {
         f.regs.sp[-2] = f.regs.sp[-1];
         f.regs.sp[-1].setObject(*thisObj);
         if (!js_OnUnknownMethod(cx, f.regs.sp - 2))
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 0b88920369c3..c6ce87246497 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -514,7 +514,7 @@ stubs::CallElem(VMFrame &f)
         THROW();
 
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(regs.sp[-2].isUndefined()) && thisv.isObject()) {
+    if (JS_UNLIKELY(regs.sp[-2].isPrimitive()) && thisv.isObject()) {
         regs.sp[-2] = regs.sp[-1];
         regs.sp[-1].setObject(*thisObj);
         if (!js_OnUnknownMethod(cx, regs.sp - 2))
@@ -1994,7 +1994,7 @@ stubs::CallProp(VMFrame &f, JSAtom *origAtom)
         }
     }
 #if JS_HAS_NO_SUCH_METHOD
-    if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
+    if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
         regs.sp[-2].setString(origAtom);
         if (!js_OnUnknownMethod(cx, regs.sp - 2))
             THROW();
diff --git a/js/src/tests/js1_5/extensions/jstests.list b/js/src/tests/js1_5/extensions/jstests.list
index 3816c033c536..1953e18cf6cd 100644
--- a/js/src/tests/js1_5/extensions/jstests.list
+++ b/js/src/tests/js1_5/extensions/jstests.list
@@ -223,3 +223,4 @@ script scope-001.js
 fails-if(Android) script toLocaleFormat-01.js
 fails-if(xulRuntime.OS=="WINNT") script toLocaleFormat-02.js
 script regress-543839.js
+script regress-564577.js
diff --git a/js/src/tests/js1_5/extensions/regress-564577.js b/js/src/tests/js1_5/extensions/regress-564577.js
new file mode 100644
index 000000000000..64edacdfec60
--- /dev/null
+++ b/js/src/tests/js1_5/extensions/regress-564577.js
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ * Contributor: Matthew Draper <matthew@trebex.net>
+ */
+
+var gTestfile = 'regress-564577.js';
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 564577;
+var summary = '__noSuchMethod__ when property exists';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+ 
+  var o = {
+    aaa: undefined,
+    bbb: null,
+    ccc: 77,
+    ddd: 'foo',
+    eee: {},
+    fff: /./,
+    __noSuchMethod__: function (id, args)
+    {
+      return(id + '('+args.join(',')+') ' + this[id]);
+    }
+  };
+
+  status = summary + ' ' + inSection(1) + ' ';
+  actual = o.aaa();
+  expect = 'aaa() undefined';
+  reportCompare(expect, actual, status);
+
+  status = summary + ' ' + inSection(2) + ' ';
+  actual = o.bbb();
+  expect = 'bbb() null';
+  reportCompare(expect, actual, status);
+
+  status = summary + ' ' + inSection(3) + ' ';
+  actual = o.ccc();
+  expect = 'ccc() 77';
+  reportCompare(expect, actual, status);
+
+  status = summary + ' ' + inSection(4) + ' ';
+  actual = o.ddd();
+  expect = 'ddd() foo';
+  reportCompare(expect, actual, status);
+
+  status = summary + ' ' + inSection(5) + ' ';
+  try {
+    actual = o.eee();
+  } catch(e) {
+    actual = e + '';
+  }
+  expect = 'TypeError: o.eee is not a function';
+  reportCompare(expect, actual, status);
+
+  status = summary + ' ' + inSection(6) + ' ';
+  try {
+    actual = o.fff('xyz') + '';
+  } catch(e) {
+    actual = e + '';
+  }
+  expect = 'TypeError: o.fff is not a function';
+  reportCompare(expect, actual, status);
+
+  exitFunc('test');
+}

From 003f619b7f54c6c818ff8d8d5890b43a385d2ccc Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Wed, 27 Apr 2011 04:13:56 -0700
Subject: [PATCH 509/509] Bug 642772: Don't recreate a class during
 enumeration, if it has been deleted (r=bhackett)

In SM, classes are lazily resolved. If we detect that a class about to be used
has not yet been resolved, then we resolve it. However, the way that we decided
that they were resolved was broken. If the global object had a String property,
then it had been resolved. So what happened when we deleted the String
property? Well, it got resolved again.

Instead of using the String property of the global object, we now use the
contructor slot on the global object. This works fine for String, but some
classes don't have a constructor, like Math and JSON. For those classes, we set
the constructor slot to True. In either case, we can now tell that a class is
resolved if the constructor slot in not Undefined.
---
 js/src/jit-test/tests/basic/bug642772-1.js |  19 ++++
 js/src/jit-test/tests/basic/bug642772-2.js | 104 +++++++++++++++++++++
 js/src/jit-test/tests/basic/bug642772-3.js |   5 +
 js/src/jsapi.cpp                           |  18 ++--
 js/src/jsmath.cpp                          |   3 +
 js/src/jsobj.cpp                           |  31 ++++++
 js/src/jsobj.h                             |   7 ++
 js/src/json.cpp                            |   2 +
 js/src/jsproxy.cpp                         |   3 +
 js/src/jsreflect.cpp                       |   2 +
 js/src/shell/js.cpp                        |   3 +-
 js/src/tests/js1_8_5/regress/jstests.list  |   2 +-
 12 files changed, 189 insertions(+), 10 deletions(-)
 create mode 100644 js/src/jit-test/tests/basic/bug642772-1.js
 create mode 100644 js/src/jit-test/tests/basic/bug642772-2.js
 create mode 100644 js/src/jit-test/tests/basic/bug642772-3.js

diff --git a/js/src/jit-test/tests/basic/bug642772-1.js b/js/src/jit-test/tests/basic/bug642772-1.js
new file mode 100644
index 000000000000..b7dc483fcc5e
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug642772-1.js
@@ -0,0 +1,19 @@
+var n1 = Number.prototype.toFixed;
+var s1 = String.prototype.split;
+delete Number;
+delete String;
+
+var n2 = (5).toFixed;
+var s2 = ("foo").split;
+
+// Check enumeration doesn't resurrect deleted standard classes
+for (x in this) {}
+
+// Ensure the prototypes are shared.
+var n3 = (5).toFixed;
+var s3 = ("foo").split;
+
+assertEq(s1, s2);
+assertEq(s1, s3);
+assertEq(n1, n2);
+assertEq(n1, n3);
diff --git a/js/src/jit-test/tests/basic/bug642772-2.js b/js/src/jit-test/tests/basic/bug642772-2.js
new file mode 100644
index 000000000000..cd7c4004b1fa
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug642772-2.js
@@ -0,0 +1,104 @@
+function failWrapper(callback) {
+    try {
+        callback(); // this should fail
+        throw "test-error"; // and if it didn't we have a problem`
+    } catch (e) {
+        if (e == "test-error")
+            throw ("Testing error when running " + callback.toString());
+    }
+}
+
+
+print ("Deleting standard classes");
+delete Function;
+delete Object;
+delete Array;
+delete Boolean;
+delete JSON;
+delete Date;
+delete Math;
+delete Number;
+delete String;
+delete Regexp;
+delete XML;
+delete Reflect;
+delete Proxy;
+delete Error;
+delete Iterator;
+delete Generator;
+delete StopIteration;
+delete Float32Array;
+delete Float64Array;
+delete Int16Array;
+delete Int32Array;
+delete Int32Array;
+delete Uint16Array;
+delete Uint32Array;
+delete Uint8Array;
+delete Uint8ClampedArray;
+delete Weakmap;
+
+
+print ("Accessing standard classes shouldn't recreate them");
+failWrapper(function () { Function; });
+failWrapper(function () { Object; });
+failWrapper(function () { Array; });
+failWrapper(function () { Boolean; });
+failWrapper(function () { JSON; });
+failWrapper(function () { Date; });
+failWrapper(function () { Math; });
+failWrapper(function () { Number; });
+failWrapper(function () { String; });
+failWrapper(function () { Regexp; });
+failWrapper(function () { XML; });
+failWrapper(function () { Reflect; });
+failWrapper(function () { Proxy; });
+failWrapper(function () { Error; });
+failWrapper(function () { Iterator; });
+failWrapper(function () { Generator; });
+failWrapper(function () { StopIteration; });
+failWrapper(function () { Float32Array; });
+failWrapper(function () { Float64Array; });
+failWrapper(function () { Int16Array; });
+failWrapper(function () { Int32Array; });
+failWrapper(function () { Int32Array; });
+failWrapper(function () { Uint16Array; });
+failWrapper(function () { Uint32Array; });
+failWrapper(function () { Uint8Array; });
+failWrapper(function () { Uint8ClampedArray; });
+failWrapper(function () { Weakmap; });
+
+
+print ("Enumerate over the global object");
+for (c in this) {}
+
+print ("That shouldn't have recreated the standard classes either");
+failWrapper(function () { Function; });
+failWrapper(function () { Object; });
+failWrapper(function () { Array; });
+failWrapper(function () { Boolean; });
+failWrapper(function () { JSON; });
+failWrapper(function () { Date; });
+failWrapper(function () { Math; });
+failWrapper(function () { Number; });
+failWrapper(function () { String; });
+failWrapper(function () { Regexp; });
+failWrapper(function () { XML; });
+failWrapper(function () { Reflect; });
+failWrapper(function () { Proxy; });
+failWrapper(function () { Error; });
+failWrapper(function () { Iterator; });
+failWrapper(function () { Generator; });
+failWrapper(function () { StopIteration; });
+failWrapper(function () { Float32Array; });
+failWrapper(function () { Float64Array; });
+failWrapper(function () { Int16Array; });
+failWrapper(function () { Int32Array; });
+failWrapper(function () { Int32Array; });
+failWrapper(function () { Uint16Array; });
+failWrapper(function () { Uint32Array; });
+failWrapper(function () { Uint8Array; });
+failWrapper(function () { Uint8ClampedArray; });
+failWrapper(function () { Weakmap; });
+
+print ("success");
diff --git a/js/src/jit-test/tests/basic/bug642772-3.js b/js/src/jit-test/tests/basic/bug642772-3.js
new file mode 100644
index 000000000000..a722569b4573
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug642772-3.js
@@ -0,0 +1,5 @@
+// Catch memory leaks when enumerating over the global object.
+
+for (let z = 1; z <= 16000; ++z) {
+  for each (y in this);
+}
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index f686989f59fd..197abdef9de7 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1774,8 +1774,7 @@ JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsid id, JSBool *resolved)
         if (stdnm->clasp->flags & JSCLASS_IS_ANONYMOUS)
             return JS_TRUE;
 
-        JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(stdnm->clasp);
-        if (obj->getReservedSlot(key).isObject())
+        if (IsStandardClassResolved(obj, stdnm->clasp))
             return JS_TRUE;
 
         if (!stdnm->init(cx, obj))
@@ -1796,7 +1795,10 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj)
     assertSameCompartment(cx, obj);
     rt = cx->runtime;
 
-    /* Check whether we need to bind 'undefined' and define it if so. */
+    /*
+     * Check whether we need to bind 'undefined' and define it if so.
+     * Since ES5 15.1.1.3 undefined can't be deleted.
+     */
     atom = rt->atomState.typeAtoms[JSTYPE_VOID];
     if (!obj->nativeContains(ATOM_TO_JSID(atom)) &&
         !obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
@@ -1805,12 +1807,12 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj)
         return JS_FALSE;
     }
 
-    /* Initialize any classes that have not been resolved yet. */
+    /* Initialize any classes that have not been initialized yet. */
     for (i = 0; standard_class_atoms[i].init; i++) {
-        atom = OFFSET_TO_ATOM(rt, standard_class_atoms[i].atomOffset);
-        if (!obj->nativeContains(ATOM_TO_JSID(atom)) &&
-            !standard_class_atoms[i].init(cx, obj)) {
-            return JS_FALSE;
+        if (!js::IsStandardClassResolved(obj, standard_class_atoms[i].clasp) &&
+            !standard_class_atoms[i].init(cx, obj))
+        {
+                return JS_FALSE;
         }
     }
 
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index a5dfcdd7e5b7..8901c7e3a962 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -881,5 +881,8 @@ js_InitMathClass(JSContext *cx, JSObject *obj)
         return NULL;
     if (!JS_DefineConstDoubles(cx, Math, math_constants))
         return NULL;
+
+    MarkStandardClassInitializedNoProto(obj, &js_MathClass);
+
     return Math;
 }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 98a5848e0390..c1baeafc700a 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3976,6 +3976,37 @@ bad:
     return NULL;
 }
 
+/*
+ * Lazy standard classes need a way to indicate if they have been initialized.
+ * Otherwise, when we delete them, we might accidentally recreate them via a
+ * lazy initialization. We use the presence of a ctor or proto in the
+ * globalObject's slot to indicate that they've been constructed, but this only
+ * works for classes which have a proto and ctor. Classes which don't have one
+ * can call MarkStandardClassInitializedNoProto(), and we can always check
+ * whether a class is initialized by calling IsStandardClassResolved().
+ */
+bool
+IsStandardClassResolved(JSObject *obj, js::Class *clasp)
+{
+    JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(clasp);
+
+    /* If the constructor is undefined, then it hasn't been initialized. */
+    return (obj->getReservedSlot(key) != UndefinedValue());
+}
+
+void
+MarkStandardClassInitializedNoProto(JSObject* obj, js::Class *clasp)
+{
+    JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(clasp);
+
+    /*
+     * We use True so that it's obvious what we're doing (instead of, say,
+     * Null, which might be miscontrued as an error in setting Undefined).
+     */
+    if (obj->getReservedSlot(key) == UndefinedValue())
+        obj->setSlot(key, BooleanValue(true));
+}
+
 }
 
 JSObject *
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 648b8e62a2db..794054041cbb 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1548,6 +1548,13 @@ DefineConstructorAndPrototype(JSContext *cx, JSObject *obj, JSProtoKey key, JSAt
                               Native constructor, uintN nargs,
                               JSPropertySpec *ps, JSFunctionSpec *fs,
                               JSPropertySpec *static_ps, JSFunctionSpec *static_fs);
+
+bool
+IsStandardClassResolved(JSObject *obj, js::Class *clasp);
+
+void
+MarkStandardClassInitializedNoProto(JSObject *obj, js::Class *clasp);
+
 }
 
 extern JSObject *
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 1412a3899eb3..463e6a2c5756 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -1413,5 +1413,7 @@ js_InitJSONClass(JSContext *cx, JSObject *obj)
     if (!JS_DefineFunctions(cx, JSON, json_static_methods))
         return NULL;
 
+    MarkStandardClassInitializedNoProto(obj, &js_JSONClass);
+
     return JSON;
 }
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index be30629ecdf9..75a4d782e87e 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -1459,5 +1459,8 @@ js_InitProxyClass(JSContext *cx, JSObject *obj)
     }
     if (!JS_DefineFunctions(cx, module, static_methods))
         return NULL;
+
+    MarkStandardClassInitializedNoProto(obj, &js_ProxyClass);
+
     return module;
 }
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index c793022178ae..a37b3aeb759d 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -3314,5 +3314,7 @@ js_InitReflectClass(JSContext *cx, JSObject *obj)
     if (!JS_DefineFunctions(cx, Reflect, static_methods))
         return NULL;
 
+    MarkStandardClassInitializedNoProto(obj, &js_ReflectClass);
+
     return Reflect;
 }
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 7517e0539928..1cb4d14379bd 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -3219,7 +3219,8 @@ ResolveClass(JSContext *cx, JSObject *obj, jsid id, JSBool *resolved)
 
     if (!*resolved) {
         if (JSID_IS_ATOM(id, CLASS_ATOM(cx, Reflect))) {
-            if (!js_InitReflectClass(cx, obj))
+            if (!IsStandardClassResolved(obj, &js_ReflectClass) &&
+                !js_InitReflectClass(cx, obj))
                 return JS_FALSE;
             *resolved = JS_TRUE;
         }
diff --git a/js/src/tests/js1_8_5/regress/jstests.list b/js/src/tests/js1_8_5/regress/jstests.list
index a4903f92b383..13cf253a7899 100644
--- a/js/src/tests/js1_8_5/regress/jstests.list
+++ b/js/src/tests/js1_8_5/regress/jstests.list
@@ -90,7 +90,7 @@ script regress-624199.js
 script regress-624547.js
 script regress-624968.js
 script regress-626436.js
-fails-if(xulRuntime.shell) script regress-633741.js
+script regress-633741.js
 script regress-634210-1.js
 script regress-634210-2.js
 script regress-634210-3.js